diff --git a/README.MD b/README.MD index b6e6144..439dda2 100644 --- a/README.MD +++ b/README.MD @@ -8,12 +8,12 @@ EndlessIDs is a modern rewrite of NotEnoughIDs which increases the limit even mo This mod also contains patches for the following mods: - AntiIDConflict -- GalactiCraft -- UndergroundBiomesConstructs -- More Fun Quicksand Mod -- WorldEdit - CoFH Lib - DragonAPI +- GalactiCraft +- More Fun Quicksand Mod +- UndergroundBiomesConstructs +- WorldEdit Mods not listed here may or may not work. A good rule of thumb is that the more invasive a mod is, the higher the chance it's broken without a patch once the IDs exceed 4096 and 32000. 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 7564fdd..d70b989 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/plugin/Mixin.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/plugin/Mixin.java @@ -14,65 +14,69 @@ import static com.falsepattern.lib.mixin.IMixin.PredicateHelpers.*; @RequiredArgsConstructor public enum Mixin implements IMixin { //region Minecraft - //region common - //region storage - AnvilChunkLoaderMixin(Side.COMMON, always(), "vanilla.storage.AnvilChunkLoaderMixin"), - ChunkMixin(Side.COMMON, always(), "vanilla.storage.ChunkMixin"), - ExtendedBlockStorageMixin(Side.COMMON, always(), "vanilla.storage.ExtendedBlockStorageMixin"), - ItemStackMixin(Side.COMMON, always(), "vanilla.storage.ItemStackMixin"), - //endregion storage - //region networking - PacketBufferMixin(Side.COMMON, always(), "vanilla.networking.PacketBufferMixin"), - S21PacketChunkDataMixin(Side.COMMON, always(), "vanilla.networking.S21PacketChunkDataMixin"), - S22PacketMultiBlockChangeMixin(Side.COMMON, always(), "vanilla.networking.S22PacketMultiBlockChangeMixin"), - S24PacketBlockActionMixin(Side.COMMON, always(), "vanilla.networking.S24PacketBlockActionMixin"), - S26PacketMapChunkBulkMixin(Side.COMMON, always(), "vanilla.networking.S26PacketMapChunkBulkMixin"), - //endregion networking - //region biome - BiomeGenBaseMixin(Side.COMMON, always(), "vanilla.biome.BiomeGenBaseMixin"), - //endregion biome - //region misc - BlockFireMixin(Side.COMMON, always(), "vanilla.misc.BlockFireMixin"), - DataWatcherMixin(Side.COMMON, condition(() -> IEConfig.extendDataWatcher), "vanilla.misc.DataWatcherMixin"), - ItemInWorldManagerMixin(Side.COMMON, always(), "vanilla.misc.ItemInWorldManagerMixin"), - StatListMixin(Side.COMMON, always(), "vanilla.misc.StatListMixin"), - WorldMixin(Side.COMMON, always(), "vanilla.misc.WorldMixin"), - //endregion misc - //region worldgen - ChunkProviderEndMixin(Side.COMMON, always(), "vanilla.worldgen.ChunkProviderEndMixin"), - ChunkProviderFlatMixin(Side.COMMON, always(), "vanilla.worldgen.ChunkProviderFlatMixin"), - ChunkProviderGenerateMixin(Side.COMMON, always(), "vanilla.worldgen.ChunkProviderGenerateMixin"), - ChunkProviderHellMixin(Side.COMMON, always(), "vanilla.worldgen.ChunkProviderHellMixin"), - GenLayerRiverMixMixin(Side.COMMON, always(), "vanilla.worldgen.GenLayerRiverMixMixin"), - GenLayerVoronoiZoomMixin(Side.COMMON, always(), "vanilla.worldgen.GenLayerVoronoiZoomMixin"), - //endregion worldgen - //endregion common - //region client - ChunkMixinClient(Side.CLIENT, always(), "vanilla.ChunkMixin"), - NetHandlerPlayClientMixin(Side.CLIENT, always(), "vanilla.NetHandlerPlayClientMixin"), - PlayerControllerMPMixin(Side.CLIENT, always(), "vanilla.PlayerControllerMPMixin"), - RenderGlobalMixin(Side.CLIENT, always(), "vanilla.RenderGlobalMixin"), - //endregion client + //region Minecraft->common + //region Minecraft->common->storage + AnvilChunkLoaderMixin(Side.COMMON, always(), "vanilla.storage.AnvilChunkLoaderMixin"), + ChunkMixin(Side.COMMON, always(), "vanilla.storage.ChunkMixin"), + ExtendedBlockStorageMixin(Side.COMMON, always(), "vanilla.storage.ExtendedBlockStorageMixin"), + ItemStackMixin(Side.COMMON, always(), "vanilla.storage.ItemStackMixin"), + //endregion Minecraft->common->storage + //region Minecraft->common->networking + PacketBufferMixin(Side.COMMON, always(), "vanilla.networking.PacketBufferMixin"), + S21PacketChunkDataMixin(Side.COMMON, always(), "vanilla.networking.S21PacketChunkDataMixin"), + S22PacketMultiBlockChangeMixin(Side.COMMON, always(), "vanilla.networking.S22PacketMultiBlockChangeMixin"), + S24PacketBlockActionMixin(Side.COMMON, always(), "vanilla.networking.S24PacketBlockActionMixin"), + S26PacketMapChunkBulkMixin(Side.COMMON, always(), "vanilla.networking.S26PacketMapChunkBulkMixin"), + //endregion Minecraft->common->networking + //region Minecraft->common->biome + BiomeGenBaseMixin(Side.COMMON, always(), "vanilla.biome.BiomeGenBaseMixin"), + //endregion Minecraft->common->biome + //region Minecraft->common->misc + BlockFireMixin(Side.COMMON, always(), "vanilla.misc.BlockFireMixin"), + DataWatcherMixin(Side.COMMON, condition(() -> IEConfig.extendDataWatcher), "vanilla.misc.DataWatcherMixin"), + ItemInWorldManagerMixin(Side.COMMON, always(), "vanilla.misc.ItemInWorldManagerMixin"), + StatListMixin(Side.COMMON, always(), "vanilla.misc.StatListMixin"), + WorldMixin(Side.COMMON, always(), "vanilla.misc.WorldMixin"), + //endregion Minecraft->common->misc + //region Minecraft->common->worldgen + ChunkProviderEndMixin(Side.COMMON, always(), "vanilla.worldgen.ChunkProviderEndMixin"), + ChunkProviderFlatMixin(Side.COMMON, always(), "vanilla.worldgen.ChunkProviderFlatMixin"), + ChunkProviderGenerateMixin(Side.COMMON, always(), "vanilla.worldgen.ChunkProviderGenerateMixin"), + ChunkProviderHellMixin(Side.COMMON, always(), "vanilla.worldgen.ChunkProviderHellMixin"), + GenLayerRiverMixMixin(Side.COMMON, always(), "vanilla.worldgen.GenLayerRiverMixMixin"), + GenLayerVoronoiZoomMixin(Side.COMMON, always(), "vanilla.worldgen.GenLayerVoronoiZoomMixin"), + //endregion Minecraft->common->worldgen + //endregion Minecraft->common + //region Minecraft->client + ChunkMixinClient(Side.CLIENT, always(), "vanilla.ChunkMixin"), + NetHandlerPlayClientMixin(Side.CLIENT, always(), "vanilla.NetHandlerPlayClientMixin"), + PlayerControllerMPMixin(Side.CLIENT, always(), "vanilla.PlayerControllerMPMixin"), + RenderGlobalMixin(Side.CLIENT, always(), "vanilla.RenderGlobalMixin"), + //endregion Minecraft->client //endregion Minecraft - //region GalactiCraftCore->common - ConfigManagerCoreMixin(Side.COMMON, require(TargetedMod.GALACTICRAFTCORE), "galacticraft.ConfigManagerCoreMixin"), - //endregion GalactiCraftCore->common - //region UBC->common - OreUBifierMixin(Side.COMMON, require(TargetedMod.UBC), "ubc.OreUBifierMixin"), - BiomeUndergroundDecoratorMixin(Side.COMMON, require(TargetedMod.UBC), "ubc.BiomeUndergroundDecoratorMixin"), - //endregion UBC->common //region CoFHLib->common - CofhBlockHelperMixin(Side.COMMON, require(TargetedMod.COFHLIB), "cofhlib.BlockHelperMixin"), + CoFHLibCofhBlockHelperMixin(Side.COMMON, require(TargetedMod.COFHLIB), "cofhlib.BlockHelperMixin"), //endregion CoFHLib->common //region DragonAPI->common - BlockPropertiesMixin(Side.COMMON, require(TargetedMod.DRAGONAPI), "dragonapi.BlockPropertiesMixin"), + DragonAPIBlockPropertiesMixin(Side.COMMON, require(TargetedMod.DRAGONAPI), "dragonapi.BlockPropertiesMixin"), //endregion DragonAPI->common + //region GalactiCraftCore->common + GalactiCraftCoreConfigManagerCoreMixin(Side.COMMON, + require(TargetedMod.GALACTICRAFTCORE), + "galacticraft.ConfigManagerCoreMixin"), + //endregion GalactiCraftCore->common //region MFQM->common - MFQMMixin(Side.COMMON, require(TargetedMod.MFQM), "mfqm.MFQMMixin"), - MFQMDataWatcherMixin(Side.COMMON, require(TargetedMod.MFQM).and(condition(() -> IEConfig.extendDataWatcher)), "mfqm.MFQMDataWatcherMixin"), + MFQMMixin(Side.COMMON, require(TargetedMod.MFQM), "mfqm.MFQMMixin"), + MFQMDataWatcherMixin(Side.COMMON, + require(TargetedMod.MFQM).and(condition(() -> IEConfig.extendDataWatcher)), + "mfqm.MFQMDataWatcherMixin"), //endregion MFQM->common + //region UBC->common + UBCOreUBifierMixin(Side.COMMON, require(TargetedMod.UBC), "ubc.OreUBifierMixin"), + UBCBiomeUndergroundDecoratorMixin(Side.COMMON, require(TargetedMod.UBC), "ubc.BiomeUndergroundDecoratorMixin"), + //endregion UBC->common //region WorldEdit->common - BaseBlockMixin(Side.COMMON, require(TargetedMod.WORLDEDIT), "worldedit.BaseBlockMixin"), + WorldEditBaseBlockMixin(Side.COMMON, require(TargetedMod.WORLDEDIT), "worldedit.BaseBlockMixin"), //endregion WorldEdit->common ; @Getter diff --git a/src/main/java/com/falsepattern/endlessids/mixin/plugin/TargetedMod.java b/src/main/java/com/falsepattern/endlessids/mixin/plugin/TargetedMod.java index 73961f9..5d5649d 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/plugin/TargetedMod.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/plugin/TargetedMod.java @@ -11,11 +11,11 @@ import static com.falsepattern.lib.mixin.ITargetedMod.PredicateHelpers.*; @RequiredArgsConstructor public enum TargetedMod implements ITargetedMod { - GALACTICRAFTCORE("GalactiCraftCore", false, startsWith("galacticraftcore")), - UBC("Underground Biomes Constructs", false, startsWith("undergroundbiomesconstructs-")), COFHLIB("CoFH Lib", false, startsWith("cofhlib-")), DRAGONAPI("DragonAPI", false, startsWith("dragonapi")), + GALACTICRAFTCORE("GalactiCraftCore", false, startsWith("galacticraftcore")), MFQM("More Fun Quicksand Mod", false, startsWith("morefunquicksandmod-")), + UBC("Underground Biomes Constructs", false, startsWith("undergroundbiomesconstructs-")), WORLDEDIT("WorldEdit", false, startsWith("worldedit-")), ;