diff --git a/src/main/java/com/falsepattern/endlessids/IEPlugin.java b/src/main/java/com/falsepattern/endlessids/IEPlugin.java index d8f847f..6d42517 100644 --- a/src/main/java/com/falsepattern/endlessids/IEPlugin.java +++ b/src/main/java/com/falsepattern/endlessids/IEPlugin.java @@ -1,10 +1,12 @@ package com.falsepattern.endlessids; import com.falsepattern.endlessids.asm.IETransformer; +import com.falsepattern.endlessids.config.GeneralConfig; import lombok.SneakyThrows; import lombok.val; import net.minecraft.launchwrapper.LaunchClassLoader; +import cpw.mods.fml.relauncher.FMLInjectionData; import cpw.mods.fml.relauncher.IFMLLoadingPlugin; import java.util.Map; @@ -27,6 +29,7 @@ public class IEPlugin implements IFMLLoadingPlugin { @SneakyThrows public String[] getASMTransformerClass() { + GeneralConfig.poke(); val cl = ((LaunchClassLoader) this.getClass().getClassLoader()); val field = cl.getClass().getDeclaredField("transformerExceptions"); field.setAccessible(true); @@ -42,6 +45,21 @@ public class IEPlugin implements IFMLLoadingPlugin { } public String getModContainerClass() { + if (GeneralConfig.extendBiome) { + FMLInjectionData.containers.add(Tags.GROUPNAME + ".containers.BiomeContainer"); + } + if (GeneralConfig.extendBlockItem) { + FMLInjectionData.containers.add(Tags.GROUPNAME + ".containers.BlockItemContainer"); + } + if (GeneralConfig.extendDataWatcher) { + FMLInjectionData.containers.add(Tags.GROUPNAME + ".containers.DataWatcherContainer"); + } + if (GeneralConfig.extendEnchantment) { + FMLInjectionData.containers.add(Tags.GROUPNAME + ".containers.EnchantmentContainer"); + } + if (GeneralConfig.extendPotion) { + FMLInjectionData.containers.add(Tags.GROUPNAME + ".containers.PotionContainer"); + } return null; } diff --git a/src/main/java/com/falsepattern/endlessids/asm/ClassEdit.java b/src/main/java/com/falsepattern/endlessids/asm/ClassEdit.java index 6caa514..1f31c2a 100644 --- a/src/main/java/com/falsepattern/endlessids/asm/ClassEdit.java +++ b/src/main/java/com/falsepattern/endlessids/asm/ClassEdit.java @@ -4,17 +4,21 @@ import com.falsepattern.endlessids.asm.transformer.ChunkProviderSuperPatcher; import com.falsepattern.endlessids.asm.transformer.DragonAPIModList; import com.falsepattern.endlessids.asm.transformer.FmlRegistry; import com.falsepattern.endlessids.asm.transformer.SpaceCoreModInfoGenerator; +import com.falsepattern.endlessids.config.GeneralConfig; +import lombok.val; import java.util.HashMap; import java.util.Map; +import java.util.function.BooleanSupplier; public enum ClassEdit { - ChunkProviderSuperPatcher(new ChunkProviderSuperPatcher()), - DragonAPIModList(new DragonAPIModList(), "Reika.DragonAPI.ModList"), + ChunkProviderSuperPatcher(new ChunkProviderSuperPatcher(), () -> GeneralConfig.extendBiome), + DragonAPIModList(new DragonAPIModList(), () -> true, "Reika.DragonAPI.ModList"), FmlRegistry(new FmlRegistry(), + () -> GeneralConfig.extendBlockItem, "cpw.mods.fml.common.registry.GameData", "cpw.mods.fml.common.registry.FMLControlledNamespacedRegistry"), - SpaceCoreModInfoGenerator(new SpaceCoreModInfoGenerator(), "com.spacechase0.minecraft.spacecore.mcp.ModInfoGenerator"); + SpaceCoreModInfoGenerator(new SpaceCoreModInfoGenerator(), () -> true, "com.spacechase0.minecraft.spacecore.mcp.ModInfoGenerator"); private static final Map editMap; @@ -28,15 +32,18 @@ public enum ClassEdit { } private final IClassNodeTransformer transformer; + private final BooleanSupplier cond; private final String[] classNames; - ClassEdit(final IClassNodeTransformer transformer, final String... classNames) { + ClassEdit(final IClassNodeTransformer transformer, BooleanSupplier cond, final String... classNames) { this.transformer = transformer; + this.cond = cond; this.classNames = classNames; } public static ClassEdit get(final String className) { - return ClassEdit.editMap.get(className); + val ret = ClassEdit.editMap.get(className); + return ret != null && ret.cond.getAsBoolean() ? ret : null; } public String getName() { diff --git a/src/main/java/com/falsepattern/endlessids/asm/transformer/ChunkProviderSuperPatcher.java b/src/main/java/com/falsepattern/endlessids/asm/transformer/ChunkProviderSuperPatcher.java index c60e792..f62e249 100644 --- a/src/main/java/com/falsepattern/endlessids/asm/transformer/ChunkProviderSuperPatcher.java +++ b/src/main/java/com/falsepattern/endlessids/asm/transformer/ChunkProviderSuperPatcher.java @@ -2,6 +2,7 @@ package com.falsepattern.endlessids.asm.transformer; import com.falsepattern.endlessids.asm.IClassNodeTransformer; import com.falsepattern.endlessids.asm.IETransformer; +import com.falsepattern.endlessids.config.GeneralConfig; import lombok.Data; import lombok.val; import lombok.var; @@ -142,6 +143,9 @@ public class ChunkProviderSuperPatcher implements IClassNodeTransformer { } public static boolean shouldPatch(final ClassNode cn) { + if (!GeneralConfig.extendBiome) { + return false; + } for (MethodNode method : cn.methods) { if (scanForBrokenCall(method)) { return true; diff --git a/src/main/java/com/falsepattern/endlessids/config/GeneralConfig.java b/src/main/java/com/falsepattern/endlessids/config/GeneralConfig.java index fbbc9ac..6d2e8b7 100644 --- a/src/main/java/com/falsepattern/endlessids/config/GeneralConfig.java +++ b/src/main/java/com/falsepattern/endlessids/config/GeneralConfig.java @@ -60,4 +60,8 @@ public class GeneralConfig { max = 12) @Config.DefaultInt(12) public static int countCorrectionBits; + + public static void poke() { + + } } diff --git a/src/main/java/com/falsepattern/endlessids/containers/BiomeContainer.java b/src/main/java/com/falsepattern/endlessids/containers/BiomeContainer.java new file mode 100644 index 0000000..e521c2f --- /dev/null +++ b/src/main/java/com/falsepattern/endlessids/containers/BiomeContainer.java @@ -0,0 +1,7 @@ +package com.falsepattern.endlessids.containers; + +public class BiomeContainer extends _Dummy { + public BiomeContainer() { + super("biome", "Biome"); + } +} diff --git a/src/main/java/com/falsepattern/endlessids/containers/BlockItemContainer.java b/src/main/java/com/falsepattern/endlessids/containers/BlockItemContainer.java new file mode 100644 index 0000000..1f26e9d --- /dev/null +++ b/src/main/java/com/falsepattern/endlessids/containers/BlockItemContainer.java @@ -0,0 +1,7 @@ +package com.falsepattern.endlessids.containers; + +public class BlockItemContainer extends _Dummy { + public BlockItemContainer() { + super("blockitem", "BlockItem"); + } +} diff --git a/src/main/java/com/falsepattern/endlessids/containers/DataWatcherContainer.java b/src/main/java/com/falsepattern/endlessids/containers/DataWatcherContainer.java new file mode 100644 index 0000000..ef174f8 --- /dev/null +++ b/src/main/java/com/falsepattern/endlessids/containers/DataWatcherContainer.java @@ -0,0 +1,7 @@ +package com.falsepattern.endlessids.containers; + +public class DataWatcherContainer extends _Dummy { + public DataWatcherContainer() { + super("datawatcher", "DataWatcher"); + } +} diff --git a/src/main/java/com/falsepattern/endlessids/containers/EnchantmentContainer.java b/src/main/java/com/falsepattern/endlessids/containers/EnchantmentContainer.java new file mode 100644 index 0000000..a860bb3 --- /dev/null +++ b/src/main/java/com/falsepattern/endlessids/containers/EnchantmentContainer.java @@ -0,0 +1,7 @@ +package com.falsepattern.endlessids.containers; + +public class EnchantmentContainer extends _Dummy { + public EnchantmentContainer() { + super("enchantment", "Enchantment"); + } +} diff --git a/src/main/java/com/falsepattern/endlessids/containers/PotionContainer.java b/src/main/java/com/falsepattern/endlessids/containers/PotionContainer.java new file mode 100644 index 0000000..13a44f5 --- /dev/null +++ b/src/main/java/com/falsepattern/endlessids/containers/PotionContainer.java @@ -0,0 +1,7 @@ +package com.falsepattern.endlessids.containers; + +public class PotionContainer extends _Dummy { + public PotionContainer() { + super("potion", "Potion"); + } +} diff --git a/src/main/java/com/falsepattern/endlessids/containers/_Dummy.java b/src/main/java/com/falsepattern/endlessids/containers/_Dummy.java new file mode 100644 index 0000000..c02c044 --- /dev/null +++ b/src/main/java/com/falsepattern/endlessids/containers/_Dummy.java @@ -0,0 +1,31 @@ +package com.falsepattern.endlessids.containers; + +import com.falsepattern.endlessids.Tags; +import com.google.common.eventbus.EventBus; +import lombok.val; + +import cpw.mods.fml.common.DummyModContainer; +import cpw.mods.fml.common.LoadController; +import cpw.mods.fml.common.ModMetadata; +import cpw.mods.fml.common.versioning.DefaultArtifactVersion; + +public class _Dummy extends DummyModContainer { + public _Dummy(String id, String name) { + super(createMetadata(id, name)); + } + + private static ModMetadata createMetadata(String id, String name) { + val meta = new ModMetadata(); + meta.modId = Tags.MODID + "_" + id; + meta.name = Tags.MODNAME + " " + name + " Module"; + meta.version = Tags.VERSION; + meta.dependencies.add(new DefaultArtifactVersion(Tags.MODID, Tags.VERSION)); + meta.parent = Tags.MODID; + return meta; + } + + @Override + public boolean registerBus(EventBus bus, LoadController controller) { + return true; + } +} diff --git a/src/main/java/com/falsepattern/endlessids/mixin/plugin/Mixin.java b/src/main/java/com/falsepattern/endlessids/mixin/plugin/Mixin.java index 2207638..aa636ea 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/plugin/Mixin.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/plugin/Mixin.java @@ -20,245 +20,226 @@ public enum Mixin implements IMixin { //region vanilla S21PacketChunkDataMixin(Side.COMMON, always(), "vanilla.S21PacketChunkDataMixin"), //endregion vanilla - //region AntiIDConflict - AIDCAntiIdConflictBaseMixin(Side.COMMON, require(TargetedMod.ANTIIDCONFLICT), - "antiidconflict.AntiIdConflictBaseMixin"), - AIDCBiomesGenBasePlaceholderMixin(Side.COMMON, require(TargetedMod.ANTIIDCONFLICT), - "antiidconflict.BiomeGenBasePlaceholderMixin"), + AIDCAntiIdConflictBaseMixin(Side.COMMON, require(TargetedMod.ANTIIDCONFLICT), "antiidconflict.AntiIdConflictBaseMixin"), + AIDCBiomesGenBasePlaceholderMixin(Side.COMMON, require(TargetedMod.ANTIIDCONFLICT), "antiidconflict.BiomeGenBasePlaceholderMixin"), AIDCBiomesManagerMixin(Side.COMMON, require(TargetedMod.ANTIIDCONFLICT), "antiidconflict.BiomesManagerMixin"), - AIDCDimensionsManagerMixin(Side.COMMON, require(TargetedMod.ANTIIDCONFLICT), - "antiidconflict.DimensionsManagerMixin"), - AIDCEnchantementsManagerMixin(Side.COMMON, require(TargetedMod.ANTIIDCONFLICT), - "antiidconflict.EnchantementsManagerMixin"), + AIDCDimensionsManagerMixin(Side.COMMON, require(TargetedMod.ANTIIDCONFLICT), "antiidconflict.DimensionsManagerMixin"), + AIDCEnchantementsManagerMixin(Side.COMMON, require(TargetedMod.ANTIIDCONFLICT), "antiidconflict.EnchantementsManagerMixin"), AIDCEntitiesManagerMixin(Side.COMMON, require(TargetedMod.ANTIIDCONFLICT), "antiidconflict.EntitiesManagerMixin"), AIDCPotionsManagerMixin(Side.COMMON, require(TargetedMod.ANTIIDCONFLICT), "antiidconflict.PotionsManagerMixin"), //endregion AntiIDConflict - //region biome //region vanilla - AnvilChunkLoaderMixinBiome(Side.COMMON, always(), "biome.vanilla.AnvilChunkLoaderMixin"), - BiomeDictionaryMixin(Side.COMMON, always(), "biome.vanilla.BiomeDictionaryMixin"), - BiomeGenBaseMixin(Side.COMMON, always(), "biome.vanilla.BiomeGenBaseMixin"), - ChunkMixin(Side.COMMON, always(), "biome.vanilla.ChunkMixin"), - GenLayerRiverMixMixin(Side.COMMON, avoid(TargetedMod.DRAGONAPI), "biome.vanilla.GenLayerRiverMixMixin"), - GenLayerVoronoiZoomMixin(Side.COMMON, always(), "biome.vanilla.GenLayerVoronoiZoomMixin"), - S21PacketChunkDataMixinBiome(Side.COMMON, always(), "biome.vanilla.S21PacketChunkDataMixin"), - S26PacketMapChunkBulkMixinBiome(Side.COMMON, always(), "biome.vanilla.S26PacketMapChunkBulkMixin"), + AnvilChunkLoaderMixinBiome(Side.COMMON, condition(() -> GeneralConfig.extendBiome), "biome.vanilla.AnvilChunkLoaderMixin"), + BiomeDictionaryMixin(Side.COMMON, condition(() -> GeneralConfig.extendBiome), "biome.vanilla.BiomeDictionaryMixin"), + BiomeGenBaseMixin(Side.COMMON, condition(() -> GeneralConfig.extendBiome), "biome.vanilla.BiomeGenBaseMixin"), + ChunkMixin(Side.COMMON, condition(() -> GeneralConfig.extendBiome), "biome.vanilla.ChunkMixin"), + GenLayerRiverMixMixin(Side.COMMON, condition(() -> GeneralConfig.extendBiome).and(avoid(TargetedMod.DRAGONAPI)), "biome.vanilla.GenLayerRiverMixMixin"), + GenLayerVoronoiZoomMixin(Side.COMMON, condition(() -> GeneralConfig.extendBiome), "biome.vanilla.GenLayerVoronoiZoomMixin"), + S21PacketChunkDataMixinBiome(Side.COMMON, condition(() -> GeneralConfig.extendBiome), "biome.vanilla.S21PacketChunkDataMixin"), + S26PacketMapChunkBulkMixinBiome(Side.COMMON, condition(() -> GeneralConfig.extendBiome), "biome.vanilla.S26PacketMapChunkBulkMixin"), //endregion vanilla //region AbyssalCraft - AbyssalCraftMixin(Side.COMMON, require(TargetedMod.ABYSSALCRAFT), "biome.abyssalcraft.AbyssalCraftMixin"), + AbyssalCraftMixin(Side.COMMON, condition(() -> GeneralConfig.extendBiome).and(require(TargetedMod.ABYSSALCRAFT)), "biome.abyssalcraft.AbyssalCraftMixin"), //endregion AbyssalCraft //region AntiqueAtlas - BiomeDetectorBaseMixin(Side.COMMON, require(TargetedMod.ANTIQUEATLAS), "biome.antiqueatlas.BiomeDetectorBaseMixin"), - BiomeDetectorNetherMixin(Side.COMMON, require(TargetedMod.ANTIQUEATLAS), "biome.antiqueatlas.BiomeDetectorNetherMixin"), + BiomeDetectorBaseMixin(Side.COMMON, condition(() -> GeneralConfig.extendBiome).and(require(TargetedMod.ANTIQUEATLAS)), "biome.antiqueatlas.BiomeDetectorBaseMixin"), + BiomeDetectorNetherMixin(Side.COMMON, condition(() -> GeneralConfig.extendBiome).and(require(TargetedMod.ANTIQUEATLAS)), "biome.antiqueatlas.BiomeDetectorNetherMixin"), //endregion AntiqueAtlas //region AdvancedRocketry - AdvancedRocketryMixin(Side.COMMON, require(TargetedMod.AROCKETRY), "biome.arocketry.AdvancedRocketryMixin"), - ARocketryChunkProviderSpaceMixin(Side.COMMON, require(TargetedMod.AROCKETRY), "biome.arocketry.ChunkProviderSpaceMixin"), + AdvancedRocketryMixin(Side.COMMON, condition(() -> GeneralConfig.extendBiome).and(require(TargetedMod.AROCKETRY)), "biome.arocketry.AdvancedRocketryMixin"), + ARocketryChunkProviderSpaceMixin(Side.COMMON, condition(() -> GeneralConfig.extendBiome).and(require(TargetedMod.AROCKETRY)), "biome.arocketry.ChunkProviderSpaceMixin"), //endregion AdvancedRocketry //region ATG - ATGBiomeConfigMixin(Side.COMMON, require(TargetedMod.ATG), "biome.atg.ATGBiomeConfigMixin"), - ATGBiomeManagerMixin(Side.COMMON, require(TargetedMod.ATG), "biome.atg.ATGBiomeManagerMixin"), - ATGWorldGenRocksMixin(Side.COMMON, require(TargetedMod.ATG), "biome.atg.ATGWorldGenRocksMixin"), + ATGBiomeConfigMixin(Side.COMMON, condition(() -> GeneralConfig.extendBiome).and(require(TargetedMod.ATG)), "biome.atg.ATGBiomeConfigMixin"), + ATGBiomeManagerMixin(Side.COMMON, condition(() -> GeneralConfig.extendBiome).and(require(TargetedMod.ATG)), "biome.atg.ATGBiomeManagerMixin"), + ATGWorldGenRocksMixin(Side.COMMON, condition(() -> GeneralConfig.extendBiome).and(require(TargetedMod.ATG)), "biome.atg.ATGWorldGenRocksMixin"), //endregion ATG //region BiomeTweaker - BiomeEventHandlerMixin(Side.COMMON, require(TargetedMod.BIOMETWEAKER), "biome.biometweaker.BiomeEventHandlerMixin"), + BiomeEventHandlerMixin(Side.COMMON, condition(() -> GeneralConfig.extendBiome).and(require(TargetedMod.BIOMETWEAKER)), "biome.biometweaker.BiomeEventHandlerMixin"), //endregion BiomeTweaker //region Biome Wand - BiomeWandItemMixin(Side.COMMON, require(TargetedMod.BIOMEWAND), "biome.biomewand.BiomeWandItemMixin"), + BiomeWandItemMixin(Side.COMMON, condition(() -> GeneralConfig.extendBiome).and(require(TargetedMod.BIOMEWAND)), "biome.biomewand.BiomeWandItemMixin"), //endregion Biome Wand //region BoP - BOPBiomeManagerMixin(Side.COMMON, require(TargetedMod.BOP), "biome.bop.BOPBiomeManagerMixin"), - BOPBiomesMixin(Side.COMMON, require(TargetedMod.BOP), "biome.bop.BOPBiomesMixin"), + BOPBiomeManagerMixin(Side.COMMON, condition(() -> GeneralConfig.extendBiome).and(require(TargetedMod.BOP)), "biome.bop.BOPBiomeManagerMixin"), + BOPBiomesMixin(Side.COMMON, condition(() -> GeneralConfig.extendBiome).and(require(TargetedMod.BOP)), "biome.bop.BOPBiomesMixin"), //endregion BoP //region Buildcraft - BuildcraftEnergyMixin(Side.COMMON, require(TargetedMod.BUILDCRAFT), "buildcraft.BuildcraftEnergyMixin"), + BuildcraftEnergyMixin(Side.COMMON, condition(() -> GeneralConfig.extendBiome).and(require(TargetedMod.BUILDCRAFT)), "buildcraft.BuildcraftEnergyMixin"), //endregion Buildcraft //region CompactMachines - CMCubeToolsMixin(Side.COMMON, require(TargetedMod.COMPACTMACHINES), "biome.compactmachines.CubeToolsMixin"), + CMCubeToolsMixin(Side.COMMON, condition(() -> GeneralConfig.extendBiome).and(require(TargetedMod.COMPACTMACHINES)), "biome.compactmachines.CubeToolsMixin"), //endregion CompactMachines //region DarkWorld - DarkWorldModBiomesMixin(Side.COMMON, require(TargetedMod.DARKWORLD), "biome.darkworld.ModBiomesMixin"), + DarkWorldModBiomesMixin(Side.COMMON, condition(() -> GeneralConfig.extendBiome).and(require(TargetedMod.DARKWORLD)), "biome.darkworld.ModBiomesMixin"), //endregion DarkWorld //region DragonAPI - DragonAPIGenLayerRiverMixVanillaMixin(Side.COMMON, require(TargetedMod.DRAGONAPI), "biome.dragonapi.vanilla.GenLayerRiverMixMixin"), - DragonAPIGenLayerRiverEventMixin(Side.COMMON, require(TargetedMod.DRAGONAPI), "biome.dragonapi.GenLayerRiverEventMixin"), - DragonAPIBiomeIDTypeMixin(Side.COMMON, require(TargetedMod.DRAGONAPI), "biome.dragonapi.IDTypeMixin"), - ReikaChunkHelperMixin(Side.COMMON, require(TargetedMod.DRAGONAPI), "biome.dragonapi.ReikaChunkHelperMixin"), - ReikaWorldHelperMixin(Side.COMMON, require(TargetedMod.DRAGONAPI), "biome.dragonapi.ReikaWorldHelperMixin"), + DragonAPIGenLayerRiverMixVanillaMixin(Side.COMMON, condition(() -> GeneralConfig.extendBiome).and(require(TargetedMod.DRAGONAPI)), "biome.dragonapi.vanilla.GenLayerRiverMixMixin"), + DragonAPIGenLayerRiverEventMixin(Side.COMMON, condition(() -> GeneralConfig.extendBiome).and(require(TargetedMod.DRAGONAPI)), "biome.dragonapi.GenLayerRiverEventMixin"), + DragonAPIBiomeIDTypeMixin(Side.COMMON, condition(() -> GeneralConfig.extendBiome).and(require(TargetedMod.DRAGONAPI)), "biome.dragonapi.IDTypeMixin"), + ReikaChunkHelperMixin(Side.COMMON, condition(() -> GeneralConfig.extendBiome).and(require(TargetedMod.DRAGONAPI)), "biome.dragonapi.ReikaChunkHelperMixin"), + ReikaWorldHelperMixin(Side.COMMON, condition(() -> GeneralConfig.extendBiome).and(require(TargetedMod.DRAGONAPI)), "biome.dragonapi.ReikaWorldHelperMixin"), //endregion DragonAPI //region EnhancedBiomes - EBBiomeIDsMixin(Side.COMMON, require(TargetedMod.EB), "biome.eb.BiomeIDsMixin"), - EBGenLayerArchipelagoEdgeMixin(Side.COMMON, require(TargetedMod.EB), "biome.eb.GenLayerArchipelagoEdgeMixin"), - EBGenLayerEBHillsMixin(Side.COMMON, require(TargetedMod.EB), "biome.eb.GenLayerEBHillsMixin"), - EBGenLayerEBRiverMixMixin(Side.COMMON, require(TargetedMod.EB), "biome.eb.GenLayerEBRiverMixMixin"), - EBGenLayerEBVoronoiZoomMixin(Side.COMMON, require(TargetedMod.EB), "biome.eb.GenLayerEBVoronoiZoomMixin"), + EBBiomeIDsMixin(Side.COMMON, condition(() -> GeneralConfig.extendBiome).and(require(TargetedMod.EB)), "biome.eb.BiomeIDsMixin"), + EBGenLayerArchipelagoEdgeMixin(Side.COMMON, condition(() -> GeneralConfig.extendBiome).and(require(TargetedMod.EB)), "biome.eb.GenLayerArchipelagoEdgeMixin"), + EBGenLayerEBHillsMixin(Side.COMMON, condition(() -> GeneralConfig.extendBiome).and(require(TargetedMod.EB)), "biome.eb.GenLayerEBHillsMixin"), + EBGenLayerEBRiverMixMixin(Side.COMMON, condition(() -> GeneralConfig.extendBiome).and(require(TargetedMod.EB)), "biome.eb.GenLayerEBRiverMixMixin"), + EBGenLayerEBVoronoiZoomMixin(Side.COMMON, condition(() -> GeneralConfig.extendBiome).and(require(TargetedMod.EB)), "biome.eb.GenLayerEBVoronoiZoomMixin"), //endregion EnhancedBiomes //region Enderlicious - EnderliciousBiomeConfigurationMixin(Side.COMMON, require(TargetedMod.ENDERLICIOUS), "biome.enderlicious.BiomeConfigurationMixin"), - EnderliciousEndChunkProviderMixin(Side.COMMON, require(TargetedMod.ENDERLICIOUS), "biome.enderlicious.EndChunkProviderMixin"), + EnderliciousBiomeConfigurationMixin(Side.COMMON, condition(() -> GeneralConfig.extendBiome).and(require(TargetedMod.ENDERLICIOUS)), "biome.enderlicious.BiomeConfigurationMixin"), + EnderliciousEndChunkProviderMixin(Side.COMMON, condition(() -> GeneralConfig.extendBiome).and(require(TargetedMod.ENDERLICIOUS)), "biome.enderlicious.EndChunkProviderMixin"), //endregion Enderlicious //region Erebus - ErebusModBiomesMixin(Side.COMMON, require(TargetedMod.EREBUS), "biome.erebus.ModBiomesMixin"), + ErebusModBiomesMixin(Side.COMMON, condition(() -> GeneralConfig.extendBiome).and(require(TargetedMod.EREBUS)), "biome.erebus.ModBiomesMixin"), //endregion Erebus //region ExtraPlanets - ExtraPlanetsConfigMixin(Side.COMMON, require(TargetedMod.EXTRAPLANETS), "biome.extraplanets.ConfigMixin"), + ExtraPlanetsConfigMixin(Side.COMMON, condition(() -> GeneralConfig.extendBiome).and(require(TargetedMod.EXTRAPLANETS)), "biome.extraplanets.ConfigMixin"), //endregion ExtraPlanets //region ExtraUtilities - ChunkProviderEndOfTimeMixin(Side.COMMON, require(TargetedMod.EXTRAUTILITIES), "biome.extrautilities.ChunkProviderEndOfTimeMixin"), + ChunkProviderEndOfTimeMixin(Side.COMMON, condition(() -> GeneralConfig.extendBiome).and(require(TargetedMod.EXTRAUTILITIES)), "biome.extrautilities.ChunkProviderEndOfTimeMixin"), //endregion ExtraUtilities //region Futurepack - FuturepackBiomeGenSpaceMixin(Side.COMMON, require(TargetedMod.FUTUREPACK), "biome.futurepack.BiomeGenSpaceMixin"), + FuturepackBiomeGenSpaceMixin(Side.COMMON, condition(() -> GeneralConfig.extendBiome).and(require(TargetedMod.FUTUREPACK)), "biome.futurepack.BiomeGenSpaceMixin"), //endregion Futurepack //region GalactiCraftCore - GalactiCraftConfigManagerCoreMixin(Side.COMMON, require(TargetedMod.GALACTICRAFTCORE), - "biome.galacticraft.ConfigManagerCoreMixin"), + GalactiCraftConfigManagerCoreMixin(Side.COMMON, condition(() -> GeneralConfig.extendBiome).and(require(TargetedMod.GALACTICRAFTCORE)), "biome.galacticraft.ConfigManagerCoreMixin"), //endregion GalactiCraftCore //region GalaxySpace - GSChunkProviderKuiperMixin(Side.COMMON, require(TargetedMod.GALAXYSPACE), "biome.galaxyspace.ChunkProviderKuiperMixin"), - GSChunkProviderMarsSSMixin(Side.COMMON, require(TargetedMod.GALAXYSPACE), "biome.galaxyspace.ChunkProviderMarsSSMixin"), - GSChunkProviderSpaceLakesMixin(Side.COMMON, require(TargetedMod.GALAXYSPACE), "biome.galaxyspace.ChunkProviderSpaceLakesMixin"), - GSChunkProviderVenusSSMixin(Side.COMMON, require(TargetedMod.GALAXYSPACE), "biome.galaxyspace.ChunkProviderVenusSSMixin"), + GSChunkProviderKuiperMixin(Side.COMMON, condition(() -> GeneralConfig.extendBiome).and(require(TargetedMod.GALAXYSPACE)), "biome.galaxyspace.ChunkProviderKuiperMixin"), + GSChunkProviderMarsSSMixin(Side.COMMON, condition(() -> GeneralConfig.extendBiome).and(require(TargetedMod.GALAXYSPACE)), "biome.galaxyspace.ChunkProviderMarsSSMixin"), + GSChunkProviderSpaceLakesMixin(Side.COMMON, condition(() -> GeneralConfig.extendBiome).and(require(TargetedMod.GALAXYSPACE)), "biome.galaxyspace.ChunkProviderSpaceLakesMixin"), + GSChunkProviderVenusSSMixin(Side.COMMON, condition(() -> GeneralConfig.extendBiome).and(require(TargetedMod.GALAXYSPACE)), "biome.galaxyspace.ChunkProviderVenusSSMixin"), //endregion GalaxySpace //region Highlands - HighlandsConfigMixin(Side.COMMON, require(TargetedMod.HIGHLANDS), "biome.highlands.ConfigMixin"), + HighlandsConfigMixin(Side.COMMON, condition(() -> GeneralConfig.extendBiome).and(require(TargetedMod.HIGHLANDS)), "biome.highlands.ConfigMixin"), //endregion Highlands //region ICG - ICGMysteriumPatchesFixesCaveMixin(Side.COMMON, require(TargetedMod.ICG), "biome.icg.MysteriumPatchesFixesCaveMixin"), + ICGMysteriumPatchesFixesCaveMixin(Side.COMMON, condition(() -> GeneralConfig.extendBiome).and(require(TargetedMod.ICG)), "biome.icg.MysteriumPatchesFixesCaveMixin"), //endregion ICG //region LOTR - LOTRBiomeVariantStorageMixin(Side.COMMON, require(TargetedMod.LOTR), "biome.lotr.LOTRBiomeVariantStorageMixin"), - LOTRChunkProviderMixin(Side.COMMON, require(TargetedMod.LOTR), "biome.lotr.LOTRChunkProviderMixin"), - LOTRChunkProviderUtumnoMixin(Side.COMMON, require(TargetedMod.LOTR), "biome.lotr.LOTRChunkProviderUtumnoMixin"), - LOTRPacketBiomeVariantsWatchHandlerMixin(Side.COMMON, require(TargetedMod.LOTR), - "biome.lotr.LOTRPacketBiomeVariantsWatchHandlerMixin"), - LOTRWorldChunkManagerMixin(Side.COMMON, require(TargetedMod.LOTR), "biome.lotr.LOTRWorldChunkManagerMixin"), + LOTRBiomeVariantStorageMixin(Side.COMMON, condition(() -> GeneralConfig.extendBiome).and(require(TargetedMod.LOTR)), "biome.lotr.LOTRBiomeVariantStorageMixin"), + LOTRChunkProviderMixin(Side.COMMON, condition(() -> GeneralConfig.extendBiome).and(require(TargetedMod.LOTR)), "biome.lotr.LOTRChunkProviderMixin"), + LOTRChunkProviderUtumnoMixin(Side.COMMON, condition(() -> GeneralConfig.extendBiome).and(require(TargetedMod.LOTR)), "biome.lotr.LOTRChunkProviderUtumnoMixin"), + LOTRPacketBiomeVariantsWatchHandlerMixin(Side.COMMON, condition(() -> GeneralConfig.extendBiome).and(require(TargetedMod.LOTR)), "biome.lotr.LOTRPacketBiomeVariantsWatchHandlerMixin"), + LOTRWorldChunkManagerMixin(Side.COMMON, condition(() -> GeneralConfig.extendBiome).and(require(TargetedMod.LOTR)), "biome.lotr.LOTRWorldChunkManagerMixin"), //endregion LOTR //region NaturesCompass - NaturesCompassBiomeUtilsMixin(Side.COMMON, require(TargetedMod.NATURESCOMPASS), "biome.naturescompass.BiomeUtilsMixin"), + NaturesCompassBiomeUtilsMixin(Side.COMMON, condition(() -> GeneralConfig.extendBiome).and(require(TargetedMod.NATURESCOMPASS)), "biome.naturescompass.BiomeUtilsMixin"), //endregion NaturesCompass //region Netherlicious - NetherliciousBiomeConfigurationMixin(Side.COMMON, require(TargetedMod.NETHERLICIOUS), - "biome.netherlicious.BiomeConfigurationMixin"), + NetherliciousBiomeConfigurationMixin(Side.COMMON, condition(() -> GeneralConfig.extendBiome).and(require(TargetedMod.NETHERLICIOUS)), "biome.netherlicious.BiomeConfigurationMixin"), //endregion Netherlicious //region NomadicTents - NomadicTentsTentChunkProviderMixin(Side.COMMON, require(TargetedMod.NOMADICTENTS), "biome.nomadictents.TentChunkProviderMixin"), + NomadicTentsTentChunkProviderMixin(Side.COMMON, condition(() -> GeneralConfig.extendBiome).and(require(TargetedMod.NOMADICTENTS)), "biome.nomadictents.TentChunkProviderMixin"), //endregion NomadicTents //region RandomThings - ItemBiomePainterMixin(Side.COMMON, require(TargetedMod.RANDOMTHINGS), "biome.randomthings.ItemBiomePainterMixin"), - MessagePaintBiomeMixin(Side.COMMON, require(TargetedMod.RANDOMTHINGS), "biome.randomthings.MessagePaintBiomeMixin"), + ItemBiomePainterMixin(Side.COMMON, condition(() -> GeneralConfig.extendBiome).and(require(TargetedMod.RANDOMTHINGS)), "biome.randomthings.ItemBiomePainterMixin"), + MessagePaintBiomeMixin(Side.COMMON, condition(() -> GeneralConfig.extendBiome).and(require(TargetedMod.RANDOMTHINGS)), "biome.randomthings.MessagePaintBiomeMixin"), //endregion RandomThings //region RTG - RTGChunkProviderRTGMixin(Side.COMMON, require(TargetedMod.RTG), "biome.rtg.ChunkProviderRTGMixin"), - RTGLandscapeGeneratorMixin(Side.COMMON, require(TargetedMod.RTG), "biome.rtg.LandscapeGeneratorMixin"), + RTGChunkProviderRTGMixin(Side.COMMON, condition(() -> GeneralConfig.extendBiome).and(require(TargetedMod.RTG)), "biome.rtg.ChunkProviderRTGMixin"), + RTGLandscapeGeneratorMixin(Side.COMMON, condition(() -> GeneralConfig.extendBiome).and(require(TargetedMod.RTG)), "biome.rtg.LandscapeGeneratorMixin"), //endregion RTG //region RWG - RWGChunkGeneratorRealisticMixin(Side.COMMON, require(TargetedMod.RWG), "biome.rwg.ChunkGeneratorRealisticMixin"), - RWGRealisticBiomeBaseMixin(Side.COMMON, require(TargetedMod.RWG), "biome.rwg.RealisticBiomeBaseMixin"), - RWGVillageMaterialsMixin(Side.COMMON, require(TargetedMod.RWG), "biome.rwg.VillageMaterialsMixin"), + RWGChunkGeneratorRealisticMixin(Side.COMMON, condition(() -> GeneralConfig.extendBiome).and(require(TargetedMod.RWG)), "biome.rwg.ChunkGeneratorRealisticMixin"), + RWGRealisticBiomeBaseMixin(Side.COMMON, condition(() -> GeneralConfig.extendBiome).and(require(TargetedMod.RWG)), "biome.rwg.RealisticBiomeBaseMixin"), + RWGVillageMaterialsMixin(Side.COMMON, condition(() -> GeneralConfig.extendBiome).and(require(TargetedMod.RWG)), "biome.rwg.VillageMaterialsMixin"), //endregion RWG //region Thaumcraft - ThaumcraftUtilsMixin(Side.COMMON, require(TargetedMod.THAUMCRAFT), "biome.thaumcraft.UtilsMixin"), + ThaumcraftUtilsMixin(Side.COMMON, condition(() -> GeneralConfig.extendBiome).and(require(TargetedMod.THAUMCRAFT)), "biome.thaumcraft.UtilsMixin"), //endregion Thaumcraft //region Tropicraft - GenLayerTropiVoronoiZoomMixin(Side.COMMON, require(TargetedMod.TROPICRAFT), - "biome.tropicraft.GenLayerTropiVoronoiZoomMixin"), + GenLayerTropiVoronoiZoomMixin(Side.COMMON, condition(() -> GeneralConfig.extendBiome).and(require(TargetedMod.TROPICRAFT)), "biome.tropicraft.GenLayerTropiVoronoiZoomMixin"), //endregion Tropicraft //region TwilightForest - TFBiomeBaseMixin(Side.COMMON, require(TargetedMod.TWILIGHTFOREST), "biome.twilightforest.TFBiomeBaseMixin"), + TFBiomeBaseMixin(Side.COMMON, condition(() -> GeneralConfig.extendBiome).and(require(TargetedMod.TWILIGHTFOREST)), "biome.twilightforest.TFBiomeBaseMixin"), //endregion TwilightForest //region Witchery - WitcheryWorldChunkManagerMirrorixin(Side.COMMON, require(TargetedMod.WITCHERY), "biome.witchery.WorldChunkManagerMirrorMixin"), + WitcheryWorldChunkManagerMirrorMixin(Side.COMMON, condition(() -> GeneralConfig.extendBiome).and(require(TargetedMod.WITCHERY)), "biome.witchery.WorldChunkManagerMirrorMixin"), //endregion Witchery - //endregion biome - //region blockitem //region vanilla - AnvilChunkLoaderMixinBlockItem(Side.COMMON, always(), "blockitem.vanilla.AnvilChunkLoaderMixin"), - BlockFireMixin(Side.COMMON, always(), "blockitem.vanilla.BlockFireMixin"), - ExtendedBlockStorageMixin(Side.COMMON, always(), "blockitem.vanilla.ExtendedBlockStorageMixin"), - ItemInWorldManagerMixin(Side.COMMON, always(), "blockitem.vanilla.ItemInWorldManagerMixin"), - ItemStackMixin(Side.COMMON, always(), "blockitem.vanilla.ItemStackMixin"), - PacketBufferMixin(Side.COMMON, always(), "blockitem.vanilla.PacketBufferMixin"), - S21PacketChunkDataMixinBlockItem(Side.COMMON, always(), "blockitem.vanilla.S21PacketChunkDataMixin"), - S22PacketMultiBlockChangeMixin(Side.COMMON, always(), "blockitem.vanilla.S22PacketMultiBlockChangeMixin"), - S24PacketBlockActionMixin(Side.COMMON, always(), "blockitem.vanilla.S24PacketBlockActionMixin"), - S26PacketMapChunkBulkMixinBlockItem(Side.COMMON, always(), "blockitem.vanilla.S26PacketMapChunkBulkMixin"), - StatListMixin(Side.COMMON, always(), "blockitem.vanilla.StatListMixin"), - WorldMixin(Side.COMMON, always(), "blockitem.vanilla.WorldMixin"), + AnvilChunkLoaderMixinBlockItem(Side.COMMON, condition(() -> GeneralConfig.extendBlockItem), "blockitem.vanilla.AnvilChunkLoaderMixin"), + BlockFireMixin(Side.COMMON, condition(() -> GeneralConfig.extendBlockItem), "blockitem.vanilla.BlockFireMixin"), + ExtendedBlockStorageMixin(Side.COMMON, condition(() -> GeneralConfig.extendBlockItem), "blockitem.vanilla.ExtendedBlockStorageMixin"), + ItemInWorldManagerMixin(Side.COMMON, condition(() -> GeneralConfig.extendBlockItem), "blockitem.vanilla.ItemInWorldManagerMixin"), + ItemStackMixin(Side.COMMON, condition(() -> GeneralConfig.extendBlockItem), "blockitem.vanilla.ItemStackMixin"), + PacketBufferMixin(Side.COMMON, condition(() -> GeneralConfig.extendBlockItem), "blockitem.vanilla.PacketBufferMixin"), + S21PacketChunkDataMixinBlockItem(Side.COMMON, condition(() -> GeneralConfig.extendBlockItem), "blockitem.vanilla.S21PacketChunkDataMixin"), + S22PacketMultiBlockChangeMixin(Side.COMMON, condition(() -> GeneralConfig.extendBlockItem), "blockitem.vanilla.S22PacketMultiBlockChangeMixin"), + S24PacketBlockActionMixin(Side.COMMON, condition(() -> GeneralConfig.extendBlockItem), "blockitem.vanilla.S24PacketBlockActionMixin"), + S26PacketMapChunkBulkMixinBlockItem(Side.COMMON, condition(() -> GeneralConfig.extendBlockItem), "blockitem.vanilla.S26PacketMapChunkBulkMixin"), + StatListMixin(Side.COMMON, condition(() -> GeneralConfig.extendBlockItem), "blockitem.vanilla.StatListMixin"), + WorldMixin(Side.COMMON, condition(() -> GeneralConfig.extendBlockItem), "blockitem.vanilla.WorldMixin"), //endregion vanilla //region CoFHLib - CoFHLibCofhBlockHelperMixin(Side.COMMON, require(TargetedMod.COFHLIB), "blockitem.cofhlib.BlockHelperMixin"), + CoFHLibCofhBlockHelperMixin(Side.COMMON, condition(() -> GeneralConfig.extendBlockItem).and(require(TargetedMod.COFHLIB)), "blockitem.cofhlib.BlockHelperMixin"), //endregion CoFHLib //region DragonAPI - DragonAPIBlockPropertiesMixin(Side.COMMON, require(TargetedMod.DRAGONAPI), "blockitem.dragonapi.BlockPropertiesMixin"), - DragonAPIBlockItemIDTypeMixin(Side.COMMON, require(TargetedMod.DRAGONAPI), "blockitem.dragonapi.IDTypeMixin"), + DragonAPIBlockPropertiesMixin(Side.COMMON, condition(() -> GeneralConfig.extendBlockItem).and(require(TargetedMod.DRAGONAPI)), "blockitem.dragonapi.BlockPropertiesMixin"), + DragonAPIBlockItemIDTypeMixin(Side.COMMON, condition(() -> GeneralConfig.extendBlockItem).and(require(TargetedMod.DRAGONAPI)), "blockitem.dragonapi.IDTypeMixin"), //endregion DragonAPI //region MFQM - MFQMMixin(Side.COMMON, require(TargetedMod.MFQM), "blockitem.mfqm.MFQMMixin"), + MFQMMixin(Side.COMMON, condition(() -> GeneralConfig.extendBlockItem).and(require(TargetedMod.MFQM)), "blockitem.mfqm.MFQMMixin"), //endregion MFQM //region WorldEdit - WorldEditBaseBlockMixin(Side.COMMON, require(TargetedMod.WORLDEDIT), "blockitem.worldedit.BaseBlockMixin"), + WorldEditBaseBlockMixin(Side.COMMON, condition(() -> GeneralConfig.extendBlockItem).and(require(TargetedMod.WORLDEDIT)), "blockitem.worldedit.BaseBlockMixin"), //endregion WorldEdit //region UBC - UBCOreUBifierMixin(Side.COMMON, require(TargetedMod.UBC), "blockitem.ubc.OreUBifierMixin"), - UBCBiomeUndergroundDecoratorMixin(Side.COMMON, require(TargetedMod.UBC), "blockitem.ubc.BiomeUndergroundDecoratorMixin"), + UBCOreUBifierMixin(Side.COMMON, condition(() -> GeneralConfig.extendBlockItem).and(require(TargetedMod.UBC)), "blockitem.ubc.OreUBifierMixin"), + UBCBiomeUndergroundDecoratorMixin(Side.COMMON, condition(() -> GeneralConfig.extendBlockItem).and(require(TargetedMod.UBC)), "blockitem.ubc.BiomeUndergroundDecoratorMixin"), //endregion UBC //endregion blockitem - //region datawatcher //region vanilla DataWatcherMixin(Side.COMMON, condition(() -> GeneralConfig.extendDataWatcher), "datawatcher.vanilla.DataWatcherMixin"), //endregion vanilla //region MFQM - MFQMDataWatcherMixin(Side.COMMON, require(TargetedMod.MFQM).and(condition(() -> GeneralConfig.extendDataWatcher)), - "datawatcher.mfqm.MFQMDataWatcherMixin"), + MFQMDataWatcherMixin(Side.COMMON, condition(() -> GeneralConfig.extendDataWatcher).and(require(TargetedMod.MFQM)), "datawatcher.mfqm.MFQMDataWatcherMixin"), //endregion MFQM //endregion datawatcher - //region enchantment //region vanilla - EnchantmentMixin(Side.COMMON, always(), "enchantment.vanilla.EnchantmentMixin"), + EnchantmentMixin(Side.COMMON, condition(() -> GeneralConfig.extendEnchantment), "enchantment.vanilla.EnchantmentMixin"), //endregion vanilla //endregion enchantment - //region potion //region vanilla - PotionEffectMixin(Side.COMMON, always(), "potion.vanilla.PotionEffectMixin"), - PotionMixin(Side.COMMON, always(), "potion.vanilla.PotionMixin"), - S1DPacketEntityEffectMixin(Side.COMMON, always(), "potion.vanilla.network.S1DPacketEntityEffectMixin"), - S1EPacketRemoveEntityEffectMixin(Side.COMMON, always(), "potion.vanilla.network.S1EPacketRemoveEntityEffectMixin"), + PotionEffectMixin(Side.COMMON, condition(() -> GeneralConfig.extendPotion), "potion.vanilla.PotionEffectMixin"), + PotionMixin(Side.COMMON, condition(() -> GeneralConfig.extendPotion), "potion.vanilla.PotionMixin"), + S1DPacketEntityEffectMixin(Side.COMMON, condition(() -> GeneralConfig.extendPotion), "potion.vanilla.network.S1DPacketEntityEffectMixin"), + S1EPacketRemoveEntityEffectMixin(Side.COMMON, condition(() -> GeneralConfig.extendPotion), "potion.vanilla.network.S1EPacketRemoveEntityEffectMixin"), //endregion vanilla //endregion potion - //endregion common //region client - //region biome //region vanilla - ChunkMixinClientBiome(Side.CLIENT, always(), "biome.vanilla.ChunkMixin"), + ChunkMixinClientBiome(Side.CLIENT, condition(() -> GeneralConfig.extendBiome), "biome.vanilla.ChunkMixin"), //endregion vanilla //region Biome Wand - BiomeWandItemClientMixin(Side.CLIENT, require(TargetedMod.BIOMEWAND), "biome.biomewand.BiomeWandItemMixin"), + BiomeWandItemClientMixin(Side.CLIENT, condition(() -> GeneralConfig.extendBiome).and(require(TargetedMod.BIOMEWAND)), "biome.biomewand.BiomeWandItemMixin"), //endregion Biome Wand //endregion biome - //region blockitem //region vanilla - ChunkMixinClientBlockItem(Side.CLIENT, always(), "blockitem.vanilla.ChunkMixin"), - NetHandlerPlayClientMixinBlockItem(Side.CLIENT, always(), "blockitem.vanilla.NetHandlerPlayClientMixin"), - PlayerControllerMPMixin(Side.CLIENT, always(), "blockitem.vanilla.PlayerControllerMPMixin"), - RenderGlobalMixin(Side.CLIENT, always(), "blockitem.vanilla.RenderGlobalMixin"), + ChunkMixinClientBlockItem(Side.CLIENT, condition(() -> GeneralConfig.extendBlockItem), "blockitem.vanilla.ChunkMixin"), + NetHandlerPlayClientMixinBlockItem(Side.CLIENT, condition(() -> GeneralConfig.extendBlockItem), "blockitem.vanilla.NetHandlerPlayClientMixin"), + PlayerControllerMPMixin(Side.CLIENT, condition(() -> GeneralConfig.extendBlockItem), "blockitem.vanilla.PlayerControllerMPMixin"), + RenderGlobalMixin(Side.CLIENT, condition(() -> GeneralConfig.extendBlockItem), "blockitem.vanilla.RenderGlobalMixin"), //endregion vanilla //endregion blockitem - //region potion - NetHandlerPlayClientMixinPotion(Side.CLIENT, always(), "potion.vanilla.NetHandlerPlayClientMixin"), + //region vanilla + NetHandlerPlayClientMixinPotion(Side.CLIENT, condition(() -> GeneralConfig.extendPotion), "potion.vanilla.NetHandlerPlayClientMixin"), + //endregion vanilla //endregion potion - //endregion client ; diff --git a/src/main/java/com/falsepattern/endlessids/patching/patches/common/Futurepack.java b/src/main/java/com/falsepattern/endlessids/patching/patches/common/Futurepack.java index aa8905d..9709225 100644 --- a/src/main/java/com/falsepattern/endlessids/patching/patches/common/Futurepack.java +++ b/src/main/java/com/falsepattern/endlessids/patching/patches/common/Futurepack.java @@ -1,5 +1,6 @@ package com.falsepattern.endlessids.patching.patches.common; +import com.falsepattern.endlessids.config.GeneralConfig; import com.falsepattern.endlessids.patching.Patch; public class Futurepack extends Patch { @@ -9,6 +10,9 @@ public class Futurepack extends Patch { @Override public boolean construct() throws Exception { + if (!GeneralConfig.extendBiome) { + return false; + } Class.forName("futurepack.common.dim.BiomeGenSpace"); return true; } diff --git a/src/main/java/com/falsepattern/endlessids/patching/patches/common/Tropicraft.java b/src/main/java/com/falsepattern/endlessids/patching/patches/common/Tropicraft.java index 5ee3f37..7919fea 100644 --- a/src/main/java/com/falsepattern/endlessids/patching/patches/common/Tropicraft.java +++ b/src/main/java/com/falsepattern/endlessids/patching/patches/common/Tropicraft.java @@ -1,5 +1,6 @@ package com.falsepattern.endlessids.patching.patches.common; +import com.falsepattern.endlessids.config.GeneralConfig; import com.falsepattern.endlessids.patching.Patch; public class Tropicraft extends Patch { @@ -9,6 +10,9 @@ public class Tropicraft extends Patch { @Override public boolean init() throws ClassNotFoundException { + if (!GeneralConfig.extendBiome) { + return false; + } Class.forName("net.tropicraft.world.biomes.BiomeGenTropicraft"); return true; }