Skip to content

Commit 4155494

Browse files
authored
Disable phosphor if supernova is present (#164)
1 parent 85b33af commit 4155494

3 files changed

Lines changed: 8 additions & 0 deletions

File tree

src/main/java/org/embeddedt/archaicfix/ArchaicFix.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,10 @@ public void onConstruct(FMLConstructionEvent event) {
5858
@EventHandler
5959
public void preinit(FMLPreInitializationEvent event)
6060
{
61+
if (ArchaicConfig.enablePhosphor && Loader.isModLoaded("supernova")) {
62+
ArchaicConfig.enablePhosphor = false;
63+
ArchaicLogger.LOGGER.info("Supernova detected, disabling Phosphor.");
64+
}
6165
if(Entity.nextEntityID == 0) {
6266
Entity.nextEntityID = 1;
6367
ArchaicLogger.LOGGER.info("Fixed MC-111480");

src/main/java/org/embeddedt/archaicfix/asm/Mixin.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ public enum Mixin implements IMixins {
7373
PHOSPHOR(new ArchaicBuilder()
7474
.setPhase(Phase.EARLY)
7575
.setApplyIf(() -> ArchaicConfig.enablePhosphor)
76+
.addExcludedMod(TargetedMod.SUPERNOVA)
7677
.addCommonMixins(
7778
"lighting.MixinAnvilChunkLoader",
7879
"lighting.MixinChunk",
@@ -88,11 +89,13 @@ public enum Mixin implements IMixins {
8889
PHOSPHOR_NO_CHUNKAPI(new ArchaicBuilder()
8990
.setPhase(Phase.LATE)
9091
.setApplyIf(() -> ArchaicConfig.enablePhosphor && !Loader.isModLoaded(TargetedMod.CHUNKAPI.ModID()))
92+
.addExcludedMod(TargetedMod.SUPERNOVA)
9193
.addCommonMixins("lighting.base.MixinAnvilChunkLoaderBase")),
9294
PHOSPHOR_FASTCRAFT(new ArchaicBuilder()
9395
.setPhase(Phase.EARLY)
9496
.setApplyIf(() -> ArchaicConfig.enablePhosphor)
9597
.addRequiredMod(TargetedMod.FASTCRAFT)
98+
.addExcludedMod(TargetedMod.SUPERNOVA)
9699
.addCommonMixins(
97100
"lighting.fastcraft.MixinChunk",
98101
"lighting.fastcraft.MixinChunkProviderServer",

src/main/java/org/embeddedt/archaicfix/asm/TargetedMod.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ public enum TargetedMod implements ITargetMod {
3030
OPTIFINE("optifine.OptiFineForgeTweaker", null),
3131
PROJECTE("ProjectE"),
3232
SHIPSMOD("cuchaz.ships.core.CoreModPlugin","cuchaz.ships"),
33+
SUPERNOVA("com.mitchej123.supernova.core.SupernovaCore", "supernova"),
3334
TC4TWEAKS("tc4tweak"),
3435
THERMALEXPANSION("ThermalExpansion"),
3536
THERMALFOUNDATION("ThermalFoundation"),

0 commit comments

Comments
 (0)