From 268a95414ccdbfc512121df7a3f8223a37a8109a Mon Sep 17 00:00:00 2001 From: FalsePattern <30945458+FalsePattern@users.noreply.github.com> Date: Tue, 28 Feb 2023 20:06:46 +0100 Subject: [PATCH] begin modularization --- .../biomewand/BiomeWandItemMixin.java | 8 +- .../vanilla/PlayerControllerMPMixin.java | 2 +- .../vanilla/RenderGlobalMixin.java | 2 +- .../abyssalcraft/AbyssalCraftMixin.java | 2 +- .../antiqueatlas/BiomeDetectorBaseMixin.java | 2 +- .../BiomeDetectorNetherMixin.java | 2 +- .../arocketry/AdvancedRocketryMixin.java | 2 +- .../arocketry/ChunkProviderSpaceMixin.java | 2 +- .../{ => biome}/atg/ATGBiomeConfigMixin.java | 2 +- .../{ => biome}/atg/ATGBiomeManagerMixin.java | 2 +- .../atg/ATGWorldGenRocksMixin.java | 2 +- .../biometweaker/BiomeEventHandlerMixin.java | 2 +- .../biomewand/BiomeWandItemMixin.java | 2 +- .../{ => biome}/bop/BOPBiomeManagerMixin.java | 2 +- .../{ => biome}/bop/BOPBiomesMixin.java | 2 +- .../buildcraft/BuildcraftEnergyMixin.java | 2 +- .../compactmachines/CubeToolsMixin.java | 2 +- .../{ => biome}/darkworld/ModBiomesMixin.java | 2 +- .../dragonapi/GenLayerRiverEventMixin.java | 2 +- .../common/biome/dragonapi/IDTypeMixin.java | 18 + .../dragonapi/ReikaChunkHelperMixin.java | 2 +- .../dragonapi/ReikaWorldHelperMixin.java | 2 +- .../vanilla/GenLayerRiverMixMixin.java | 2 +- .../common/{ => biome}/eb/BiomeIDsMixin.java | 2 +- .../eb/GenLayerArchipelagoEdgeMixin.java | 2 +- .../{ => biome}/eb/GenLayerEBHillsMixin.java | 2 +- .../eb/GenLayerEBRiverMixMixin.java | 2 +- .../eb/GenLayerEBVoronoiZoomMixin.java | 2 +- .../enderlicious/BiomeConfigurationMixin.java | 2 +- .../enderlicious/EndChunkProviderMixin.java | 3 +- .../{ => biome}/erebus/ModBiomesMixin.java | 3 +- .../{ => biome}/extraplanets/ConfigMixin.java | 2 +- .../ChunkProviderEndOfTimeMixin.java | 2 +- .../futurepack/BiomeGenSpaceMixin.java | 2 +- .../galacticraft/ChunkProviderOrbitMixin.java | 5 +- .../galacticraft/ConfigManagerCoreMixin.java | 2 +- .../galaxyspace/ChunkProviderKuiperMixin.java | 2 +- .../galaxyspace/ChunkProviderMarsSSMixin.java | 2 +- .../ChunkProviderSpaceLakesMixin.java | 2 +- .../ChunkProviderVenusSSMixin.java | 2 +- .../{ => biome}/highlands/ConfigMixin.java | 2 +- .../icg/MysteriumPatchesFixesCaveMixin.java | 2 +- .../lotr/LOTRBiomeVariantStorageMixin.java | 2 +- .../lotr/LOTRChunkProviderMixin.java | 2 +- .../lotr/LOTRChunkProviderUtumnoMixin.java | 2 +- .../LOTRPacketBiomeVariantsWatchHandler.java | 2 +- .../lotr/LOTRWorldChunkManagerMixin.java | 2 +- .../naturescompass/BiomeUtilsMixin.java | 2 +- .../BiomeConfigurationMixin.java | 2 +- .../nomadictents/TentChunkProviderMixin.java | 2 +- .../randomthings/ItemBiomePainterMixin.java | 2 +- .../randomthings/MessagePaintBiomeMixin.java | 2 +- .../rtg/ChunkProviderRTGMixin.java | 2 +- .../rtg/LandscapeGeneratorMixin.java | 2 +- .../rwg/ChunkGeneratorRealisticMixin.java | 2 +- .../rwg/RealisticBiomeBaseMixin.java | 2 +- .../rwg/VillageMaterialsMixin.java | 2 +- .../{ => biome}/thaumcraft/UtilsMixin.java | 2 +- .../GenLayerTropiVoronoiZoomMixin.java | 2 +- .../twilightforest/TFBiomeBaseMixin.java | 2 +- .../vanilla}/BiomeDictionaryMixin.java | 2 +- .../vanilla}/BiomeGenBaseMixin.java | 2 +- .../storage => biome/vanilla}/ChunkMixin.java | 2 +- .../vanilla}/GenLayerRiverMixMixin.java | 2 +- .../vanilla}/GenLayerVoronoiZoomMixin.java | 2 +- .../WorldChunkManagerMirrorMixin.java | 2 +- .../cofhlib/BlockHelperMixin.java | 2 +- .../dragonapi/BlockPropertiesMixin.java | 2 +- .../dragonapi/IDTypeMixin.java | 9 +- .../{ => blockitem}/mfqm/MFQMMixin.java | 2 +- .../ubc/BiomeUndergroundDecoratorMixin.java | 2 +- .../{ => blockitem}/ubc/OreUBifierMixin.java | 2 +- .../vanilla}/BlockFireMixin.java | 2 +- .../vanilla}/ExtendedBlockStorageMixin.java | 2 +- .../vanilla}/ItemInWorldManagerMixin.java | 2 +- .../vanilla}/ItemStackMixin.java | 2 +- .../vanilla}/PacketBufferMixin.java | 2 +- .../S22PacketMultiBlockChangeMixin.java | 2 +- .../vanilla}/S24PacketBlockActionMixin.java | 2 +- .../vanilla}/StatListMixin.java | 2 +- .../vanilla}/WorldMixin.java | 2 +- .../worldedit/BaseBlockMixin.java | 2 +- .../mfqm/MFQMDataWatcherMixin.java | 2 +- .../vanilla}/DataWatcherMixin.java | 2 +- .../vanilla}/EnchantmentMixin.java | 2 +- .../vanilla}/PotionEffectMixin.java | 2 +- .../vanilla}/PotionMixin.java | 2 +- .../network/S1DPacketEntityEffectMixin.java | 3 +- .../S1EPacketRemoveEntityEffectMixin.java | 2 +- .../endlessids/mixin/plugin/Mixin.java | 384 +++++++++--------- 90 files changed, 306 insertions(+), 291 deletions(-) rename src/main/java/com/falsepattern/endlessids/mixin/mixins/client/{ => biome}/biomewand/BiomeWandItemMixin.java (75%) rename src/main/java/com/falsepattern/endlessids/mixin/mixins/client/{ => blockitem}/vanilla/PlayerControllerMPMixin.java (90%) rename src/main/java/com/falsepattern/endlessids/mixin/mixins/client/{ => blockitem}/vanilla/RenderGlobalMixin.java (93%) rename src/main/java/com/falsepattern/endlessids/mixin/mixins/common/{ => biome}/abyssalcraft/AbyssalCraftMixin.java (97%) rename src/main/java/com/falsepattern/endlessids/mixin/mixins/common/{ => biome}/antiqueatlas/BiomeDetectorBaseMixin.java (95%) rename src/main/java/com/falsepattern/endlessids/mixin/mixins/common/{ => biome}/antiqueatlas/BiomeDetectorNetherMixin.java (94%) rename src/main/java/com/falsepattern/endlessids/mixin/mixins/common/{ => biome}/arocketry/AdvancedRocketryMixin.java (95%) rename src/main/java/com/falsepattern/endlessids/mixin/mixins/common/{ => biome}/arocketry/ChunkProviderSpaceMixin.java (92%) rename src/main/java/com/falsepattern/endlessids/mixin/mixins/common/{ => biome}/atg/ATGBiomeConfigMixin.java (91%) rename src/main/java/com/falsepattern/endlessids/mixin/mixins/common/{ => biome}/atg/ATGBiomeManagerMixin.java (91%) rename src/main/java/com/falsepattern/endlessids/mixin/mixins/common/{ => biome}/atg/ATGWorldGenRocksMixin.java (91%) rename src/main/java/com/falsepattern/endlessids/mixin/mixins/common/{ => biome}/biometweaker/BiomeEventHandlerMixin.java (96%) rename src/main/java/com/falsepattern/endlessids/mixin/mixins/common/{ => biome}/biomewand/BiomeWandItemMixin.java (98%) rename src/main/java/com/falsepattern/endlessids/mixin/mixins/common/{ => biome}/bop/BOPBiomeManagerMixin.java (94%) rename src/main/java/com/falsepattern/endlessids/mixin/mixins/common/{ => biome}/bop/BOPBiomesMixin.java (90%) rename src/main/java/com/falsepattern/endlessids/mixin/mixins/common/{ => biome}/buildcraft/BuildcraftEnergyMixin.java (90%) rename src/main/java/com/falsepattern/endlessids/mixin/mixins/common/{ => biome}/compactmachines/CubeToolsMixin.java (96%) rename src/main/java/com/falsepattern/endlessids/mixin/mixins/common/{ => biome}/darkworld/ModBiomesMixin.java (96%) rename src/main/java/com/falsepattern/endlessids/mixin/mixins/common/{ => biome}/dragonapi/GenLayerRiverEventMixin.java (90%) create mode 100644 src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/dragonapi/IDTypeMixin.java rename src/main/java/com/falsepattern/endlessids/mixin/mixins/common/{ => biome}/dragonapi/ReikaChunkHelperMixin.java (94%) rename src/main/java/com/falsepattern/endlessids/mixin/mixins/common/{ => biome}/dragonapi/ReikaWorldHelperMixin.java (97%) rename src/main/java/com/falsepattern/endlessids/mixin/mixins/common/{ => biome}/dragonapi/vanilla/GenLayerRiverMixMixin.java (89%) rename src/main/java/com/falsepattern/endlessids/mixin/mixins/common/{ => biome}/eb/BiomeIDsMixin.java (87%) rename src/main/java/com/falsepattern/endlessids/mixin/mixins/common/{ => biome}/eb/GenLayerArchipelagoEdgeMixin.java (92%) rename src/main/java/com/falsepattern/endlessids/mixin/mixins/common/{ => biome}/eb/GenLayerEBHillsMixin.java (95%) rename src/main/java/com/falsepattern/endlessids/mixin/mixins/common/{ => biome}/eb/GenLayerEBRiverMixMixin.java (93%) rename src/main/java/com/falsepattern/endlessids/mixin/mixins/common/{ => biome}/eb/GenLayerEBVoronoiZoomMixin.java (91%) rename src/main/java/com/falsepattern/endlessids/mixin/mixins/common/{ => biome}/enderlicious/BiomeConfigurationMixin.java (89%) rename src/main/java/com/falsepattern/endlessids/mixin/mixins/common/{ => biome}/enderlicious/EndChunkProviderMixin.java (92%) rename src/main/java/com/falsepattern/endlessids/mixin/mixins/common/{ => biome}/erebus/ModBiomesMixin.java (96%) rename src/main/java/com/falsepattern/endlessids/mixin/mixins/common/{ => biome}/extraplanets/ConfigMixin.java (92%) rename src/main/java/com/falsepattern/endlessids/mixin/mixins/common/{ => biome}/extrautilities/ChunkProviderEndOfTimeMixin.java (95%) rename src/main/java/com/falsepattern/endlessids/mixin/mixins/common/{ => biome}/futurepack/BiomeGenSpaceMixin.java (88%) rename src/main/java/com/falsepattern/endlessids/mixin/mixins/common/{ => biome}/galacticraft/ChunkProviderOrbitMixin.java (81%) rename src/main/java/com/falsepattern/endlessids/mixin/mixins/common/{ => biome}/galacticraft/ConfigManagerCoreMixin.java (94%) rename src/main/java/com/falsepattern/endlessids/mixin/mixins/common/{ => biome}/galaxyspace/ChunkProviderKuiperMixin.java (93%) rename src/main/java/com/falsepattern/endlessids/mixin/mixins/common/{ => biome}/galaxyspace/ChunkProviderMarsSSMixin.java (93%) rename src/main/java/com/falsepattern/endlessids/mixin/mixins/common/{ => biome}/galaxyspace/ChunkProviderSpaceLakesMixin.java (93%) rename src/main/java/com/falsepattern/endlessids/mixin/mixins/common/{ => biome}/galaxyspace/ChunkProviderVenusSSMixin.java (93%) rename src/main/java/com/falsepattern/endlessids/mixin/mixins/common/{ => biome}/highlands/ConfigMixin.java (89%) rename src/main/java/com/falsepattern/endlessids/mixin/mixins/common/{ => biome}/icg/MysteriumPatchesFixesCaveMixin.java (91%) rename src/main/java/com/falsepattern/endlessids/mixin/mixins/common/{ => biome}/lotr/LOTRBiomeVariantStorageMixin.java (98%) rename src/main/java/com/falsepattern/endlessids/mixin/mixins/common/{ => biome}/lotr/LOTRChunkProviderMixin.java (94%) rename src/main/java/com/falsepattern/endlessids/mixin/mixins/common/{ => biome}/lotr/LOTRChunkProviderUtumnoMixin.java (95%) rename src/main/java/com/falsepattern/endlessids/mixin/mixins/common/{ => biome}/lotr/LOTRPacketBiomeVariantsWatchHandler.java (96%) rename src/main/java/com/falsepattern/endlessids/mixin/mixins/common/{ => biome}/lotr/LOTRWorldChunkManagerMixin.java (96%) rename src/main/java/com/falsepattern/endlessids/mixin/mixins/common/{ => biome}/naturescompass/BiomeUtilsMixin.java (91%) rename src/main/java/com/falsepattern/endlessids/mixin/mixins/common/{ => biome}/netherlicious/BiomeConfigurationMixin.java (88%) rename src/main/java/com/falsepattern/endlessids/mixin/mixins/common/{ => biome}/nomadictents/TentChunkProviderMixin.java (92%) rename src/main/java/com/falsepattern/endlessids/mixin/mixins/common/{ => biome}/randomthings/ItemBiomePainterMixin.java (97%) rename src/main/java/com/falsepattern/endlessids/mixin/mixins/common/{ => biome}/randomthings/MessagePaintBiomeMixin.java (97%) rename src/main/java/com/falsepattern/endlessids/mixin/mixins/common/{ => biome}/rtg/ChunkProviderRTGMixin.java (95%) rename src/main/java/com/falsepattern/endlessids/mixin/mixins/common/{ => biome}/rtg/LandscapeGeneratorMixin.java (91%) rename src/main/java/com/falsepattern/endlessids/mixin/mixins/common/{ => biome}/rwg/ChunkGeneratorRealisticMixin.java (94%) rename src/main/java/com/falsepattern/endlessids/mixin/mixins/common/{ => biome}/rwg/RealisticBiomeBaseMixin.java (91%) rename src/main/java/com/falsepattern/endlessids/mixin/mixins/common/{ => biome}/rwg/VillageMaterialsMixin.java (91%) rename src/main/java/com/falsepattern/endlessids/mixin/mixins/common/{ => biome}/thaumcraft/UtilsMixin.java (95%) rename src/main/java/com/falsepattern/endlessids/mixin/mixins/common/{ => biome}/tropicraft/GenLayerTropiVoronoiZoomMixin.java (90%) rename src/main/java/com/falsepattern/endlessids/mixin/mixins/common/{ => biome}/twilightforest/TFBiomeBaseMixin.java (95%) rename src/main/java/com/falsepattern/endlessids/mixin/mixins/common/{vanilla/biome => biome/vanilla}/BiomeDictionaryMixin.java (92%) rename src/main/java/com/falsepattern/endlessids/mixin/mixins/common/{vanilla/biome => biome/vanilla}/BiomeGenBaseMixin.java (96%) rename src/main/java/com/falsepattern/endlessids/mixin/mixins/common/{vanilla/storage => biome/vanilla}/ChunkMixin.java (98%) rename src/main/java/com/falsepattern/endlessids/mixin/mixins/common/{vanilla/worldgen => biome/vanilla}/GenLayerRiverMixMixin.java (90%) rename src/main/java/com/falsepattern/endlessids/mixin/mixins/common/{vanilla/worldgen => biome/vanilla}/GenLayerVoronoiZoomMixin.java (90%) rename src/main/java/com/falsepattern/endlessids/mixin/mixins/common/{ => biome}/witchery/WorldChunkManagerMirrorMixin.java (92%) rename src/main/java/com/falsepattern/endlessids/mixin/mixins/common/{ => blockitem}/cofhlib/BlockHelperMixin.java (91%) rename src/main/java/com/falsepattern/endlessids/mixin/mixins/common/{ => blockitem}/dragonapi/BlockPropertiesMixin.java (90%) rename src/main/java/com/falsepattern/endlessids/mixin/mixins/common/{ => blockitem}/dragonapi/IDTypeMixin.java (66%) rename src/main/java/com/falsepattern/endlessids/mixin/mixins/common/{ => blockitem}/mfqm/MFQMMixin.java (96%) rename src/main/java/com/falsepattern/endlessids/mixin/mixins/common/{ => blockitem}/ubc/BiomeUndergroundDecoratorMixin.java (97%) rename src/main/java/com/falsepattern/endlessids/mixin/mixins/common/{ => blockitem}/ubc/OreUBifierMixin.java (91%) rename src/main/java/com/falsepattern/endlessids/mixin/mixins/common/{vanilla/misc => blockitem/vanilla}/BlockFireMixin.java (90%) rename src/main/java/com/falsepattern/endlessids/mixin/mixins/common/{vanilla/storage => blockitem/vanilla}/ExtendedBlockStorageMixin.java (97%) rename src/main/java/com/falsepattern/endlessids/mixin/mixins/common/{vanilla/misc => blockitem/vanilla}/ItemInWorldManagerMixin.java (90%) rename src/main/java/com/falsepattern/endlessids/mixin/mixins/common/{vanilla/storage => blockitem/vanilla}/ItemStackMixin.java (95%) rename src/main/java/com/falsepattern/endlessids/mixin/mixins/common/{vanilla/networking => blockitem/vanilla}/PacketBufferMixin.java (96%) rename src/main/java/com/falsepattern/endlessids/mixin/mixins/common/{vanilla/networking => blockitem/vanilla}/S22PacketMultiBlockChangeMixin.java (96%) rename src/main/java/com/falsepattern/endlessids/mixin/mixins/common/{vanilla/networking => blockitem/vanilla}/S24PacketBlockActionMixin.java (90%) rename src/main/java/com/falsepattern/endlessids/mixin/mixins/common/{vanilla/misc => blockitem/vanilla}/StatListMixin.java (90%) rename src/main/java/com/falsepattern/endlessids/mixin/mixins/common/{vanilla/misc => blockitem/vanilla}/WorldMixin.java (89%) rename src/main/java/com/falsepattern/endlessids/mixin/mixins/common/{ => blockitem}/worldedit/BaseBlockMixin.java (92%) rename src/main/java/com/falsepattern/endlessids/mixin/mixins/common/{ => datawatcher}/mfqm/MFQMDataWatcherMixin.java (93%) rename src/main/java/com/falsepattern/endlessids/mixin/mixins/common/{vanilla/misc => datawatcher/vanilla}/DataWatcherMixin.java (98%) rename src/main/java/com/falsepattern/endlessids/mixin/mixins/common/{vanilla/enchantment => enchantment/vanilla}/EnchantmentMixin.java (88%) rename src/main/java/com/falsepattern/endlessids/mixin/mixins/common/{vanilla/potion => potion/vanilla}/PotionEffectMixin.java (96%) rename src/main/java/com/falsepattern/endlessids/mixin/mixins/common/{vanilla/potion => potion/vanilla}/PotionMixin.java (92%) rename src/main/java/com/falsepattern/endlessids/mixin/mixins/common/{vanilla/potion => potion/vanilla}/network/S1DPacketEntityEffectMixin.java (95%) rename src/main/java/com/falsepattern/endlessids/mixin/mixins/common/{vanilla/potion => potion/vanilla}/network/S1EPacketRemoveEntityEffectMixin.java (95%) diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/client/biomewand/BiomeWandItemMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/client/biome/biomewand/BiomeWandItemMixin.java similarity index 75% rename from src/main/java/com/falsepattern/endlessids/mixin/mixins/client/biomewand/BiomeWandItemMixin.java rename to src/main/java/com/falsepattern/endlessids/mixin/mixins/client/biome/biomewand/BiomeWandItemMixin.java index a48fce7..414f0c4 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/client/biomewand/BiomeWandItemMixin.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/client/biome/biomewand/BiomeWandItemMixin.java @@ -1,19 +1,13 @@ -package com.falsepattern.endlessids.mixin.mixins.client.biomewand; +package com.falsepattern.endlessids.mixin.mixins.client.biome.biomewand; -import com.falsepattern.endlessids.mixin.helpers.IChunkMixin; -import com.spacechase0.minecraft.biomewand.BiomeWandMod; import com.spacechase0.minecraft.biomewand.item.BiomeWandItem; import lombok.val; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Overwrite; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagByte; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; -import net.minecraft.world.chunk.Chunk; @Mixin(value = BiomeWandItem.class, remap = false) diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/client/vanilla/PlayerControllerMPMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/client/blockitem/vanilla/PlayerControllerMPMixin.java similarity index 90% rename from src/main/java/com/falsepattern/endlessids/mixin/mixins/client/vanilla/PlayerControllerMPMixin.java rename to src/main/java/com/falsepattern/endlessids/mixin/mixins/client/blockitem/vanilla/PlayerControllerMPMixin.java index 9d1dbb6..5029fc8 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/client/vanilla/PlayerControllerMPMixin.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/client/blockitem/vanilla/PlayerControllerMPMixin.java @@ -1,4 +1,4 @@ -package com.falsepattern.endlessids.mixin.mixins.client.vanilla; +package com.falsepattern.endlessids.mixin.mixins.client.blockitem.vanilla; import com.falsepattern.endlessids.constants.ExtendedConstants; import com.falsepattern.endlessids.constants.VanillaConstants; diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/client/vanilla/RenderGlobalMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/client/blockitem/vanilla/RenderGlobalMixin.java similarity index 93% rename from src/main/java/com/falsepattern/endlessids/mixin/mixins/client/vanilla/RenderGlobalMixin.java rename to src/main/java/com/falsepattern/endlessids/mixin/mixins/client/blockitem/vanilla/RenderGlobalMixin.java index afb0877..330cc03 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/client/vanilla/RenderGlobalMixin.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/client/blockitem/vanilla/RenderGlobalMixin.java @@ -1,4 +1,4 @@ -package com.falsepattern.endlessids.mixin.mixins.client.vanilla; +package com.falsepattern.endlessids.mixin.mixins.client.blockitem.vanilla; import com.falsepattern.endlessids.constants.ExtendedConstants; import com.falsepattern.endlessids.constants.VanillaConstants; diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/abyssalcraft/AbyssalCraftMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/abyssalcraft/AbyssalCraftMixin.java similarity index 97% rename from src/main/java/com/falsepattern/endlessids/mixin/mixins/common/abyssalcraft/AbyssalCraftMixin.java rename to src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/abyssalcraft/AbyssalCraftMixin.java index a9855b1..6860cdb 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/abyssalcraft/AbyssalCraftMixin.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/abyssalcraft/AbyssalCraftMixin.java @@ -1,4 +1,4 @@ -package com.falsepattern.endlessids.mixin.mixins.common.abyssalcraft; +package com.falsepattern.endlessids.mixin.mixins.common.biome.abyssalcraft; import com.falsepattern.endlessids.PlaceholderBiome; import com.falsepattern.endlessids.constants.ExtendedConstants; diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/antiqueatlas/BiomeDetectorBaseMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/antiqueatlas/BiomeDetectorBaseMixin.java similarity index 95% rename from src/main/java/com/falsepattern/endlessids/mixin/mixins/common/antiqueatlas/BiomeDetectorBaseMixin.java rename to src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/antiqueatlas/BiomeDetectorBaseMixin.java index a5c825e..a1d9108 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/antiqueatlas/BiomeDetectorBaseMixin.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/antiqueatlas/BiomeDetectorBaseMixin.java @@ -1,4 +1,4 @@ -package com.falsepattern.endlessids.mixin.mixins.common.antiqueatlas; +package com.falsepattern.endlessids.mixin.mixins.common.biome.antiqueatlas; import com.falsepattern.endlessids.constants.ExtendedConstants; import com.falsepattern.endlessids.constants.VanillaConstants; diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/antiqueatlas/BiomeDetectorNetherMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/antiqueatlas/BiomeDetectorNetherMixin.java similarity index 94% rename from src/main/java/com/falsepattern/endlessids/mixin/mixins/common/antiqueatlas/BiomeDetectorNetherMixin.java rename to src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/antiqueatlas/BiomeDetectorNetherMixin.java index 84ea392..efc57d2 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/antiqueatlas/BiomeDetectorNetherMixin.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/antiqueatlas/BiomeDetectorNetherMixin.java @@ -1,4 +1,4 @@ -package com.falsepattern.endlessids.mixin.mixins.common.antiqueatlas; +package com.falsepattern.endlessids.mixin.mixins.common.biome.antiqueatlas; import com.falsepattern.endlessids.mixin.helpers.IChunkMixin; import com.falsepattern.endlessids.mixin.helpers.ShortUtil; diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/arocketry/AdvancedRocketryMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/arocketry/AdvancedRocketryMixin.java similarity index 95% rename from src/main/java/com/falsepattern/endlessids/mixin/mixins/common/arocketry/AdvancedRocketryMixin.java rename to src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/arocketry/AdvancedRocketryMixin.java index c9961df..4c6dbd7 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/arocketry/AdvancedRocketryMixin.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/arocketry/AdvancedRocketryMixin.java @@ -1,4 +1,4 @@ -package com.falsepattern.endlessids.mixin.mixins.common.arocketry; +package com.falsepattern.endlessids.mixin.mixins.common.biome.arocketry; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.Constant; diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/arocketry/ChunkProviderSpaceMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/arocketry/ChunkProviderSpaceMixin.java similarity index 92% rename from src/main/java/com/falsepattern/endlessids/mixin/mixins/common/arocketry/ChunkProviderSpaceMixin.java rename to src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/arocketry/ChunkProviderSpaceMixin.java index f7a693f..d018d95 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/arocketry/ChunkProviderSpaceMixin.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/arocketry/ChunkProviderSpaceMixin.java @@ -1,4 +1,4 @@ -package com.falsepattern.endlessids.mixin.mixins.common.arocketry; +package com.falsepattern.endlessids.mixin.mixins.common.biome.arocketry; import com.falsepattern.endlessids.mixin.helpers.BiomePatchHelper; import org.spongepowered.asm.mixin.Mixin; diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/atg/ATGBiomeConfigMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/atg/ATGBiomeConfigMixin.java similarity index 91% rename from src/main/java/com/falsepattern/endlessids/mixin/mixins/common/atg/ATGBiomeConfigMixin.java rename to src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/atg/ATGBiomeConfigMixin.java index f9164b2..856ba1e 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/atg/ATGBiomeConfigMixin.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/atg/ATGBiomeConfigMixin.java @@ -1,4 +1,4 @@ -package com.falsepattern.endlessids.mixin.mixins.common.atg; +package com.falsepattern.endlessids.mixin.mixins.common.biome.atg; import com.falsepattern.endlessids.constants.ExtendedConstants; import com.falsepattern.endlessids.constants.VanillaConstants; diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/atg/ATGBiomeManagerMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/atg/ATGBiomeManagerMixin.java similarity index 91% rename from src/main/java/com/falsepattern/endlessids/mixin/mixins/common/atg/ATGBiomeManagerMixin.java rename to src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/atg/ATGBiomeManagerMixin.java index 9ab48b0..6182f61 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/atg/ATGBiomeManagerMixin.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/atg/ATGBiomeManagerMixin.java @@ -1,4 +1,4 @@ -package com.falsepattern.endlessids.mixin.mixins.common.atg; +package com.falsepattern.endlessids.mixin.mixins.common.biome.atg; import com.falsepattern.endlessids.constants.ExtendedConstants; import com.falsepattern.endlessids.constants.VanillaConstants; diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/atg/ATGWorldGenRocksMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/atg/ATGWorldGenRocksMixin.java similarity index 91% rename from src/main/java/com/falsepattern/endlessids/mixin/mixins/common/atg/ATGWorldGenRocksMixin.java rename to src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/atg/ATGWorldGenRocksMixin.java index db9e2b0..12b9d3f 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/atg/ATGWorldGenRocksMixin.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/atg/ATGWorldGenRocksMixin.java @@ -1,4 +1,4 @@ -package com.falsepattern.endlessids.mixin.mixins.common.atg; +package com.falsepattern.endlessids.mixin.mixins.common.biome.atg; import com.falsepattern.endlessids.constants.ExtendedConstants; import com.falsepattern.endlessids.constants.VanillaConstants; diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biometweaker/BiomeEventHandlerMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/biometweaker/BiomeEventHandlerMixin.java similarity index 96% rename from src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biometweaker/BiomeEventHandlerMixin.java rename to src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/biometweaker/BiomeEventHandlerMixin.java index 2cf2eb3..a77d604 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biometweaker/BiomeEventHandlerMixin.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/biometweaker/BiomeEventHandlerMixin.java @@ -1,4 +1,4 @@ -package com.falsepattern.endlessids.mixin.mixins.common.biometweaker; +package com.falsepattern.endlessids.mixin.mixins.common.biome.biometweaker; import com.falsepattern.endlessids.constants.ExtendedConstants; import com.falsepattern.endlessids.constants.VanillaConstants; diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biomewand/BiomeWandItemMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/biomewand/BiomeWandItemMixin.java similarity index 98% rename from src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biomewand/BiomeWandItemMixin.java rename to src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/biomewand/BiomeWandItemMixin.java index 043e5f5..d2807a3 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biomewand/BiomeWandItemMixin.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/biomewand/BiomeWandItemMixin.java @@ -1,4 +1,4 @@ -package com.falsepattern.endlessids.mixin.mixins.common.biomewand; +package com.falsepattern.endlessids.mixin.mixins.common.biome.biomewand; import com.falsepattern.endlessids.PlaceholderBiome; import com.falsepattern.endlessids.mixin.helpers.IChunkMixin; diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/bop/BOPBiomeManagerMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/bop/BOPBiomeManagerMixin.java similarity index 94% rename from src/main/java/com/falsepattern/endlessids/mixin/mixins/common/bop/BOPBiomeManagerMixin.java rename to src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/bop/BOPBiomeManagerMixin.java index 192e5cf..2362bd0 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/bop/BOPBiomeManagerMixin.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/bop/BOPBiomeManagerMixin.java @@ -1,4 +1,4 @@ -package com.falsepattern.endlessids.mixin.mixins.common.bop; +package com.falsepattern.endlessids.mixin.mixins.common.biome.bop; import biomesoplenty.common.world.BOPBiomeManager; import com.falsepattern.endlessids.constants.ExtendedConstants; diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/bop/BOPBiomesMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/bop/BOPBiomesMixin.java similarity index 90% rename from src/main/java/com/falsepattern/endlessids/mixin/mixins/common/bop/BOPBiomesMixin.java rename to src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/bop/BOPBiomesMixin.java index d3e4bd0..a3a6679 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/bop/BOPBiomesMixin.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/bop/BOPBiomesMixin.java @@ -1,4 +1,4 @@ -package com.falsepattern.endlessids.mixin.mixins.common.bop; +package com.falsepattern.endlessids.mixin.mixins.common.biome.bop; import biomesoplenty.common.core.BOPBiomes; import biomesoplenty.common.world.BOPBiomeManager; diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/buildcraft/BuildcraftEnergyMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/buildcraft/BuildcraftEnergyMixin.java similarity index 90% rename from src/main/java/com/falsepattern/endlessids/mixin/mixins/common/buildcraft/BuildcraftEnergyMixin.java rename to src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/buildcraft/BuildcraftEnergyMixin.java index 5104c8f..f7b24c7 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/buildcraft/BuildcraftEnergyMixin.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/buildcraft/BuildcraftEnergyMixin.java @@ -1,4 +1,4 @@ -package com.falsepattern.endlessids.mixin.mixins.common.buildcraft; +package com.falsepattern.endlessids.mixin.mixins.common.biome.buildcraft; import buildcraft.BuildCraftEnergy; import com.falsepattern.endlessids.constants.ExtendedConstants; diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/compactmachines/CubeToolsMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/compactmachines/CubeToolsMixin.java similarity index 96% rename from src/main/java/com/falsepattern/endlessids/mixin/mixins/common/compactmachines/CubeToolsMixin.java rename to src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/compactmachines/CubeToolsMixin.java index 5a4aec9..4734042 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/compactmachines/CubeToolsMixin.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/compactmachines/CubeToolsMixin.java @@ -1,4 +1,4 @@ -package com.falsepattern.endlessids.mixin.mixins.common.compactmachines; +package com.falsepattern.endlessids.mixin.mixins.common.biome.compactmachines; import com.falsepattern.endlessids.mixin.helpers.IChunkMixin; import com.falsepattern.endlessids.mixin.stubpackage.org.dave.CompactMachines.tileentity.TileEntityMachine; diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/darkworld/ModBiomesMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/darkworld/ModBiomesMixin.java similarity index 96% rename from src/main/java/com/falsepattern/endlessids/mixin/mixins/common/darkworld/ModBiomesMixin.java rename to src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/darkworld/ModBiomesMixin.java index 5329ce8..ce4036b 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/darkworld/ModBiomesMixin.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/darkworld/ModBiomesMixin.java @@ -1,4 +1,4 @@ -package com.falsepattern.endlessids.mixin.mixins.common.darkworld; +package com.falsepattern.endlessids.mixin.mixins.common.biome.darkworld; import com.falsepattern.endlessids.config.DarkWorldIDConfig; import matthbo.mods.darkworld.init.ModBiomes; diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/dragonapi/GenLayerRiverEventMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/dragonapi/GenLayerRiverEventMixin.java similarity index 90% rename from src/main/java/com/falsepattern/endlessids/mixin/mixins/common/dragonapi/GenLayerRiverEventMixin.java rename to src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/dragonapi/GenLayerRiverEventMixin.java index 6922d24..07ce0a7 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/dragonapi/GenLayerRiverEventMixin.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/dragonapi/GenLayerRiverEventMixin.java @@ -1,4 +1,4 @@ -package com.falsepattern.endlessids.mixin.mixins.common.dragonapi; +package com.falsepattern.endlessids.mixin.mixins.common.biome.dragonapi; import Reika.DragonAPI.Instantiable.Event.GenLayerRiverEvent; import com.falsepattern.endlessids.constants.ExtendedConstants; diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/dragonapi/IDTypeMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/dragonapi/IDTypeMixin.java new file mode 100644 index 0000000..d6d4bec --- /dev/null +++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/dragonapi/IDTypeMixin.java @@ -0,0 +1,18 @@ +package com.falsepattern.endlessids.mixin.mixins.common.biome.dragonapi; + +import Reika.DragonAPI.Extras.IDType; +import com.falsepattern.endlessids.constants.ExtendedConstants; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.Constant; +import org.spongepowered.asm.mixin.injection.ModifyConstant; + +@Mixin(value = IDType.class, + remap = false) +public abstract class IDTypeMixin { + @ModifyConstant(method = "", + constant = @Constant(intValue = 254), + require = 1) + private static int extendBiomeIDs(int constant) { + return ExtendedConstants.biomeIDCount - 2; + } +} diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/dragonapi/ReikaChunkHelperMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/dragonapi/ReikaChunkHelperMixin.java similarity index 94% rename from src/main/java/com/falsepattern/endlessids/mixin/mixins/common/dragonapi/ReikaChunkHelperMixin.java rename to src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/dragonapi/ReikaChunkHelperMixin.java index 3212afd..957ebe9 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/dragonapi/ReikaChunkHelperMixin.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/dragonapi/ReikaChunkHelperMixin.java @@ -1,4 +1,4 @@ -package com.falsepattern.endlessids.mixin.mixins.common.dragonapi; +package com.falsepattern.endlessids.mixin.mixins.common.biome.dragonapi; import Reika.DragonAPI.Libraries.World.ReikaChunkHelper; import com.falsepattern.endlessids.EndlessIDs; diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/dragonapi/ReikaWorldHelperMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/dragonapi/ReikaWorldHelperMixin.java similarity index 97% rename from src/main/java/com/falsepattern/endlessids/mixin/mixins/common/dragonapi/ReikaWorldHelperMixin.java rename to src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/dragonapi/ReikaWorldHelperMixin.java index 5a9ef64..162d394 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/dragonapi/ReikaWorldHelperMixin.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/dragonapi/ReikaWorldHelperMixin.java @@ -1,4 +1,4 @@ -package com.falsepattern.endlessids.mixin.mixins.common.dragonapi; +package com.falsepattern.endlessids.mixin.mixins.common.biome.dragonapi; import Reika.DragonAPI.Libraries.World.ReikaWorldHelper; import com.falsepattern.endlessids.EndlessIDs; diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/dragonapi/vanilla/GenLayerRiverMixMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/dragonapi/vanilla/GenLayerRiverMixMixin.java similarity index 89% rename from src/main/java/com/falsepattern/endlessids/mixin/mixins/common/dragonapi/vanilla/GenLayerRiverMixMixin.java rename to src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/dragonapi/vanilla/GenLayerRiverMixMixin.java index 355de28..7941e91 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/dragonapi/vanilla/GenLayerRiverMixMixin.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/dragonapi/vanilla/GenLayerRiverMixMixin.java @@ -1,4 +1,4 @@ -package com.falsepattern.endlessids.mixin.mixins.common.dragonapi.vanilla; +package com.falsepattern.endlessids.mixin.mixins.common.biome.dragonapi.vanilla; import com.falsepattern.endlessids.constants.ExtendedConstants; import com.falsepattern.endlessids.constants.VanillaConstants; diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/eb/BiomeIDsMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/eb/BiomeIDsMixin.java similarity index 87% rename from src/main/java/com/falsepattern/endlessids/mixin/mixins/common/eb/BiomeIDsMixin.java rename to src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/eb/BiomeIDsMixin.java index 98dfcc1..6a216ec 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/eb/BiomeIDsMixin.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/eb/BiomeIDsMixin.java @@ -1,4 +1,4 @@ -package com.falsepattern.endlessids.mixin.mixins.common.eb; +package com.falsepattern.endlessids.mixin.mixins.common.biome.eb; import enhancedbiomes.world.biomestats.BiomeIDs; import org.spongepowered.asm.mixin.Mixin; diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/eb/GenLayerArchipelagoEdgeMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/eb/GenLayerArchipelagoEdgeMixin.java similarity index 92% rename from src/main/java/com/falsepattern/endlessids/mixin/mixins/common/eb/GenLayerArchipelagoEdgeMixin.java rename to src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/eb/GenLayerArchipelagoEdgeMixin.java index 4f36e2a..db5906c 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/eb/GenLayerArchipelagoEdgeMixin.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/eb/GenLayerArchipelagoEdgeMixin.java @@ -1,4 +1,4 @@ -package com.falsepattern.endlessids.mixin.mixins.common.eb; +package com.falsepattern.endlessids.mixin.mixins.common.biome.eb; import com.falsepattern.endlessids.constants.ExtendedConstants; import com.falsepattern.endlessids.constants.VanillaConstants; diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/eb/GenLayerEBHillsMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/eb/GenLayerEBHillsMixin.java similarity index 95% rename from src/main/java/com/falsepattern/endlessids/mixin/mixins/common/eb/GenLayerEBHillsMixin.java rename to src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/eb/GenLayerEBHillsMixin.java index b5badf1..faecd25 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/eb/GenLayerEBHillsMixin.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/eb/GenLayerEBHillsMixin.java @@ -1,4 +1,4 @@ -package com.falsepattern.endlessids.mixin.mixins.common.eb; +package com.falsepattern.endlessids.mixin.mixins.common.biome.eb; import com.falsepattern.endlessids.constants.ExtendedConstants; import com.falsepattern.endlessids.constants.VanillaConstants; diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/eb/GenLayerEBRiverMixMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/eb/GenLayerEBRiverMixMixin.java similarity index 93% rename from src/main/java/com/falsepattern/endlessids/mixin/mixins/common/eb/GenLayerEBRiverMixMixin.java rename to src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/eb/GenLayerEBRiverMixMixin.java index b6c1545..a9af251 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/eb/GenLayerEBRiverMixMixin.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/eb/GenLayerEBRiverMixMixin.java @@ -1,4 +1,4 @@ -package com.falsepattern.endlessids.mixin.mixins.common.eb; +package com.falsepattern.endlessids.mixin.mixins.common.biome.eb; import com.falsepattern.endlessids.constants.ExtendedConstants; import com.falsepattern.endlessids.constants.VanillaConstants; diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/eb/GenLayerEBVoronoiZoomMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/eb/GenLayerEBVoronoiZoomMixin.java similarity index 91% rename from src/main/java/com/falsepattern/endlessids/mixin/mixins/common/eb/GenLayerEBVoronoiZoomMixin.java rename to src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/eb/GenLayerEBVoronoiZoomMixin.java index bbf7103..67392ac 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/eb/GenLayerEBVoronoiZoomMixin.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/eb/GenLayerEBVoronoiZoomMixin.java @@ -1,4 +1,4 @@ -package com.falsepattern.endlessids.mixin.mixins.common.eb; +package com.falsepattern.endlessids.mixin.mixins.common.biome.eb; import com.falsepattern.endlessids.constants.ExtendedConstants; import com.falsepattern.endlessids.constants.VanillaConstants; diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/enderlicious/BiomeConfigurationMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/enderlicious/BiomeConfigurationMixin.java similarity index 89% rename from src/main/java/com/falsepattern/endlessids/mixin/mixins/common/enderlicious/BiomeConfigurationMixin.java rename to src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/enderlicious/BiomeConfigurationMixin.java index 2fe94d0..859bd3a 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/enderlicious/BiomeConfigurationMixin.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/enderlicious/BiomeConfigurationMixin.java @@ -1,4 +1,4 @@ -package com.falsepattern.endlessids.mixin.mixins.common.enderlicious; +package com.falsepattern.endlessids.mixin.mixins.common.biome.enderlicious; import DelirusCrux.Enderlicious.Common.Utility.Configuration.BiomeConfiguration; import org.spongepowered.asm.mixin.Mixin; diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/enderlicious/EndChunkProviderMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/enderlicious/EndChunkProviderMixin.java similarity index 92% rename from src/main/java/com/falsepattern/endlessids/mixin/mixins/common/enderlicious/EndChunkProviderMixin.java rename to src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/enderlicious/EndChunkProviderMixin.java index 1dc0f94..a4278b9 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/enderlicious/EndChunkProviderMixin.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/enderlicious/EndChunkProviderMixin.java @@ -1,7 +1,6 @@ -package com.falsepattern.endlessids.mixin.mixins.common.enderlicious; +package com.falsepattern.endlessids.mixin.mixins.common.biome.enderlicious; import DelirusCrux.Enderlicious.Dimension.EndChunkProvider; -import com.falsepattern.endlessids.mixin.helpers.BiomePatchHelper; import com.falsepattern.endlessids.mixin.helpers.IChunkMixin; import lombok.val; import org.spongepowered.asm.mixin.Mixin; diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/erebus/ModBiomesMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/erebus/ModBiomesMixin.java similarity index 96% rename from src/main/java/com/falsepattern/endlessids/mixin/mixins/common/erebus/ModBiomesMixin.java rename to src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/erebus/ModBiomesMixin.java index b99f65a..040aed8 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/erebus/ModBiomesMixin.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/erebus/ModBiomesMixin.java @@ -1,4 +1,4 @@ -package com.falsepattern.endlessids.mixin.mixins.common.erebus; +package com.falsepattern.endlessids.mixin.mixins.common.biome.erebus; import com.falsepattern.endlessids.PlaceholderBiome; import com.falsepattern.endlessids.constants.ExtendedConstants; @@ -10,7 +10,6 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Constant; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.ModifyConstant; -import org.spongepowered.asm.mixin.injection.ModifyVariable; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import net.minecraft.world.biome.BiomeGenBase; diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/extraplanets/ConfigMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/extraplanets/ConfigMixin.java similarity index 92% rename from src/main/java/com/falsepattern/endlessids/mixin/mixins/common/extraplanets/ConfigMixin.java rename to src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/extraplanets/ConfigMixin.java index 76714fe..572ca13 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/extraplanets/ConfigMixin.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/extraplanets/ConfigMixin.java @@ -1,4 +1,4 @@ -package com.falsepattern.endlessids.mixin.mixins.common.extraplanets; +package com.falsepattern.endlessids.mixin.mixins.common.biome.extraplanets; import com.mjr.extraplanets.Config; import org.spongepowered.asm.mixin.Mixin; diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/extrautilities/ChunkProviderEndOfTimeMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/extrautilities/ChunkProviderEndOfTimeMixin.java similarity index 95% rename from src/main/java/com/falsepattern/endlessids/mixin/mixins/common/extrautilities/ChunkProviderEndOfTimeMixin.java rename to src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/extrautilities/ChunkProviderEndOfTimeMixin.java index a635826..c65c47c 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/extrautilities/ChunkProviderEndOfTimeMixin.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/extrautilities/ChunkProviderEndOfTimeMixin.java @@ -1,4 +1,4 @@ -package com.falsepattern.endlessids.mixin.mixins.common.extrautilities; +package com.falsepattern.endlessids.mixin.mixins.common.biome.extrautilities; import com.falsepattern.endlessids.EndlessIDs; import com.falsepattern.endlessids.mixin.helpers.IChunkMixin; diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/futurepack/BiomeGenSpaceMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/futurepack/BiomeGenSpaceMixin.java similarity index 88% rename from src/main/java/com/falsepattern/endlessids/mixin/mixins/common/futurepack/BiomeGenSpaceMixin.java rename to src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/futurepack/BiomeGenSpaceMixin.java index f4ad426..f459c7a 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/futurepack/BiomeGenSpaceMixin.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/futurepack/BiomeGenSpaceMixin.java @@ -1,4 +1,4 @@ -package com.falsepattern.endlessids.mixin.mixins.common.futurepack; +package com.falsepattern.endlessids.mixin.mixins.common.biome.futurepack; import com.falsepattern.endlessids.config.FuturepackIDConfig; import futurepack.common.dim.BiomeGenSpace; diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/galacticraft/ChunkProviderOrbitMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/galacticraft/ChunkProviderOrbitMixin.java similarity index 81% rename from src/main/java/com/falsepattern/endlessids/mixin/mixins/common/galacticraft/ChunkProviderOrbitMixin.java rename to src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/galacticraft/ChunkProviderOrbitMixin.java index 7ff1c3e..ad63dca 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/galacticraft/ChunkProviderOrbitMixin.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/galacticraft/ChunkProviderOrbitMixin.java @@ -1,15 +1,12 @@ -package com.falsepattern.endlessids.mixin.mixins.common.galacticraft; +package com.falsepattern.endlessids.mixin.mixins.common.biome.galacticraft; import com.falsepattern.endlessids.mixin.helpers.BiomePatchHelper; -import futurepack.common.dim.ChunkProviderSpace; import micdoodle8.mods.galacticraft.core.world.gen.BiomeGenBaseOrbit; import micdoodle8.mods.galacticraft.core.world.gen.ChunkProviderOrbit; import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Redirect; -import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.chunk.Chunk; @Mixin(value = ChunkProviderOrbit.class, diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/galacticraft/ConfigManagerCoreMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/galacticraft/ConfigManagerCoreMixin.java similarity index 94% rename from src/main/java/com/falsepattern/endlessids/mixin/mixins/common/galacticraft/ConfigManagerCoreMixin.java rename to src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/galacticraft/ConfigManagerCoreMixin.java index a8c2d14..c83af27 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/galacticraft/ConfigManagerCoreMixin.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/galacticraft/ConfigManagerCoreMixin.java @@ -1,4 +1,4 @@ -package com.falsepattern.endlessids.mixin.mixins.common.galacticraft; +package com.falsepattern.endlessids.mixin.mixins.common.biome.galacticraft; import com.falsepattern.endlessids.constants.ExtendedConstants; import com.falsepattern.endlessids.constants.VanillaConstants; diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/galaxyspace/ChunkProviderKuiperMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/galaxyspace/ChunkProviderKuiperMixin.java similarity index 93% rename from src/main/java/com/falsepattern/endlessids/mixin/mixins/common/galaxyspace/ChunkProviderKuiperMixin.java rename to src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/galaxyspace/ChunkProviderKuiperMixin.java index 2a69df2..1a0ff24 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/galaxyspace/ChunkProviderKuiperMixin.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/galaxyspace/ChunkProviderKuiperMixin.java @@ -1,4 +1,4 @@ -package com.falsepattern.endlessids.mixin.mixins.common.galaxyspace; +package com.falsepattern.endlessids.mixin.mixins.common.biome.galaxyspace; import com.falsepattern.endlessids.mixin.helpers.BiomePatchHelper; import com.falsepattern.endlessids.mixin.helpers.GalaxySpaceHelper; diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/galaxyspace/ChunkProviderMarsSSMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/galaxyspace/ChunkProviderMarsSSMixin.java similarity index 93% rename from src/main/java/com/falsepattern/endlessids/mixin/mixins/common/galaxyspace/ChunkProviderMarsSSMixin.java rename to src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/galaxyspace/ChunkProviderMarsSSMixin.java index 5b40f80..8dfe4e0 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/galaxyspace/ChunkProviderMarsSSMixin.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/galaxyspace/ChunkProviderMarsSSMixin.java @@ -1,4 +1,4 @@ -package com.falsepattern.endlessids.mixin.mixins.common.galaxyspace; +package com.falsepattern.endlessids.mixin.mixins.common.biome.galaxyspace; import com.falsepattern.endlessids.mixin.helpers.BiomePatchHelper; import com.falsepattern.endlessids.mixin.helpers.GalaxySpaceHelper; diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/galaxyspace/ChunkProviderSpaceLakesMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/galaxyspace/ChunkProviderSpaceLakesMixin.java similarity index 93% rename from src/main/java/com/falsepattern/endlessids/mixin/mixins/common/galaxyspace/ChunkProviderSpaceLakesMixin.java rename to src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/galaxyspace/ChunkProviderSpaceLakesMixin.java index 6bc7cfe..c9e0e0c 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/galaxyspace/ChunkProviderSpaceLakesMixin.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/galaxyspace/ChunkProviderSpaceLakesMixin.java @@ -1,4 +1,4 @@ -package com.falsepattern.endlessids.mixin.mixins.common.galaxyspace; +package com.falsepattern.endlessids.mixin.mixins.common.biome.galaxyspace; import com.falsepattern.endlessids.mixin.helpers.BiomePatchHelper; import org.spongepowered.asm.mixin.Mixin; diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/galaxyspace/ChunkProviderVenusSSMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/galaxyspace/ChunkProviderVenusSSMixin.java similarity index 93% rename from src/main/java/com/falsepattern/endlessids/mixin/mixins/common/galaxyspace/ChunkProviderVenusSSMixin.java rename to src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/galaxyspace/ChunkProviderVenusSSMixin.java index d2edc56..b830e4b 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/galaxyspace/ChunkProviderVenusSSMixin.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/galaxyspace/ChunkProviderVenusSSMixin.java @@ -1,4 +1,4 @@ -package com.falsepattern.endlessids.mixin.mixins.common.galaxyspace; +package com.falsepattern.endlessids.mixin.mixins.common.biome.galaxyspace; import com.falsepattern.endlessids.mixin.helpers.BiomePatchHelper; import com.falsepattern.endlessids.mixin.helpers.GalaxySpaceHelper; diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/highlands/ConfigMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/highlands/ConfigMixin.java similarity index 89% rename from src/main/java/com/falsepattern/endlessids/mixin/mixins/common/highlands/ConfigMixin.java rename to src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/highlands/ConfigMixin.java index da80b19..05094e9 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/highlands/ConfigMixin.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/highlands/ConfigMixin.java @@ -1,4 +1,4 @@ -package com.falsepattern.endlessids.mixin.mixins.common.highlands; +package com.falsepattern.endlessids.mixin.mixins.common.biome.highlands; import highlands.Config; import org.spongepowered.asm.mixin.Mixin; diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/icg/MysteriumPatchesFixesCaveMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/icg/MysteriumPatchesFixesCaveMixin.java similarity index 91% rename from src/main/java/com/falsepattern/endlessids/mixin/mixins/common/icg/MysteriumPatchesFixesCaveMixin.java rename to src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/icg/MysteriumPatchesFixesCaveMixin.java index 8edbaef..e7425a3 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/icg/MysteriumPatchesFixesCaveMixin.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/icg/MysteriumPatchesFixesCaveMixin.java @@ -1,4 +1,4 @@ -package com.falsepattern.endlessids.mixin.mixins.common.icg; +package com.falsepattern.endlessids.mixin.mixins.common.biome.icg; import com.falsepattern.endlessids.constants.ExtendedConstants; import com.falsepattern.endlessids.constants.VanillaConstants; diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/lotr/LOTRBiomeVariantStorageMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/lotr/LOTRBiomeVariantStorageMixin.java similarity index 98% rename from src/main/java/com/falsepattern/endlessids/mixin/mixins/common/lotr/LOTRBiomeVariantStorageMixin.java rename to src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/lotr/LOTRBiomeVariantStorageMixin.java index 3bdf19a..944020c 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/lotr/LOTRBiomeVariantStorageMixin.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/lotr/LOTRBiomeVariantStorageMixin.java @@ -1,4 +1,4 @@ -package com.falsepattern.endlessids.mixin.mixins.common.lotr; +package com.falsepattern.endlessids.mixin.mixins.common.biome.lotr; import com.falsepattern.endlessids.mixin.helpers.LOTRBiomeVariantStorageShort; import lotr.common.world.biome.variant.LOTRBiomeVariantStorage; diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/lotr/LOTRChunkProviderMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/lotr/LOTRChunkProviderMixin.java similarity index 94% rename from src/main/java/com/falsepattern/endlessids/mixin/mixins/common/lotr/LOTRChunkProviderMixin.java rename to src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/lotr/LOTRChunkProviderMixin.java index d9834f0..6e98c71 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/lotr/LOTRChunkProviderMixin.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/lotr/LOTRChunkProviderMixin.java @@ -1,4 +1,4 @@ -package com.falsepattern.endlessids.mixin.mixins.common.lotr; +package com.falsepattern.endlessids.mixin.mixins.common.biome.lotr; import com.falsepattern.endlessids.mixin.helpers.LOTRBiomeVariantStorageShort; import lotr.common.world.LOTRChunkProvider; diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/lotr/LOTRChunkProviderUtumnoMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/lotr/LOTRChunkProviderUtumnoMixin.java similarity index 95% rename from src/main/java/com/falsepattern/endlessids/mixin/mixins/common/lotr/LOTRChunkProviderUtumnoMixin.java rename to src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/lotr/LOTRChunkProviderUtumnoMixin.java index f7f64c6..52d473d 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/lotr/LOTRChunkProviderUtumnoMixin.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/lotr/LOTRChunkProviderUtumnoMixin.java @@ -1,4 +1,4 @@ -package com.falsepattern.endlessids.mixin.mixins.common.lotr; +package com.falsepattern.endlessids.mixin.mixins.common.biome.lotr; import com.falsepattern.endlessids.mixin.helpers.LOTRBiomeVariantStorageShort; import lotr.common.world.LOTRChunkProviderUtumno; diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/lotr/LOTRPacketBiomeVariantsWatchHandler.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/lotr/LOTRPacketBiomeVariantsWatchHandler.java similarity index 96% rename from src/main/java/com/falsepattern/endlessids/mixin/mixins/common/lotr/LOTRPacketBiomeVariantsWatchHandler.java rename to src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/lotr/LOTRPacketBiomeVariantsWatchHandler.java index 1d2ad64..a6c343d 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/lotr/LOTRPacketBiomeVariantsWatchHandler.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/lotr/LOTRPacketBiomeVariantsWatchHandler.java @@ -1,4 +1,4 @@ -package com.falsepattern.endlessids.mixin.mixins.common.lotr; +package com.falsepattern.endlessids.mixin.mixins.common.biome.lotr; import com.falsepattern.endlessids.Hooks; import com.falsepattern.endlessids.mixin.helpers.LOTRBiomeVariantStorageShort; diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/lotr/LOTRWorldChunkManagerMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/lotr/LOTRWorldChunkManagerMixin.java similarity index 96% rename from src/main/java/com/falsepattern/endlessids/mixin/mixins/common/lotr/LOTRWorldChunkManagerMixin.java rename to src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/lotr/LOTRWorldChunkManagerMixin.java index a912b45..08d2887 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/lotr/LOTRWorldChunkManagerMixin.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/lotr/LOTRWorldChunkManagerMixin.java @@ -1,4 +1,4 @@ -package com.falsepattern.endlessids.mixin.mixins.common.lotr; +package com.falsepattern.endlessids.mixin.mixins.common.biome.lotr; import com.falsepattern.endlessids.mixin.helpers.LOTRBiomeVariantStorageShort; import lotr.common.world.LOTRWorldChunkManager; diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/naturescompass/BiomeUtilsMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/naturescompass/BiomeUtilsMixin.java similarity index 91% rename from src/main/java/com/falsepattern/endlessids/mixin/mixins/common/naturescompass/BiomeUtilsMixin.java rename to src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/naturescompass/BiomeUtilsMixin.java index 23e0fbe..50c6f37 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/naturescompass/BiomeUtilsMixin.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/naturescompass/BiomeUtilsMixin.java @@ -1,4 +1,4 @@ -package com.falsepattern.endlessids.mixin.mixins.common.naturescompass; +package com.falsepattern.endlessids.mixin.mixins.common.biome.naturescompass; import com.chaosthedude.naturescompass.util.BiomeUtils; import com.falsepattern.endlessids.PlaceholderBiome; diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/netherlicious/BiomeConfigurationMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/netherlicious/BiomeConfigurationMixin.java similarity index 88% rename from src/main/java/com/falsepattern/endlessids/mixin/mixins/common/netherlicious/BiomeConfigurationMixin.java rename to src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/netherlicious/BiomeConfigurationMixin.java index c1787b2..f00e83f 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/netherlicious/BiomeConfigurationMixin.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/netherlicious/BiomeConfigurationMixin.java @@ -1,4 +1,4 @@ -package com.falsepattern.endlessids.mixin.mixins.common.netherlicious; +package com.falsepattern.endlessids.mixin.mixins.common.biome.netherlicious; import DelirusCrux.Netherlicious.Utility.Configuration.BiomeConfiguration; import org.spongepowered.asm.mixin.Mixin; diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/nomadictents/TentChunkProviderMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/nomadictents/TentChunkProviderMixin.java similarity index 92% rename from src/main/java/com/falsepattern/endlessids/mixin/mixins/common/nomadictents/TentChunkProviderMixin.java rename to src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/nomadictents/TentChunkProviderMixin.java index 66d3965..aecbbe5 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/nomadictents/TentChunkProviderMixin.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/nomadictents/TentChunkProviderMixin.java @@ -1,4 +1,4 @@ -package com.falsepattern.endlessids.mixin.mixins.common.nomadictents; +package com.falsepattern.endlessids.mixin.mixins.common.biome.nomadictents; import com.falsepattern.endlessids.mixin.helpers.IChunkMixin; import com.yurtmod.dimension.TentChunkProvider; diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/randomthings/ItemBiomePainterMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/randomthings/ItemBiomePainterMixin.java similarity index 97% rename from src/main/java/com/falsepattern/endlessids/mixin/mixins/common/randomthings/ItemBiomePainterMixin.java rename to src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/randomthings/ItemBiomePainterMixin.java index 4d9cffe..330e5cc 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/randomthings/ItemBiomePainterMixin.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/randomthings/ItemBiomePainterMixin.java @@ -1,4 +1,4 @@ -package com.falsepattern.endlessids.mixin.mixins.common.randomthings; +package com.falsepattern.endlessids.mixin.mixins.common.biome.randomthings; import com.falsepattern.endlessids.mixin.helpers.IChunkMixin; import lumien.randomthings.Items.ItemBiomeCapsule; diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/randomthings/MessagePaintBiomeMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/randomthings/MessagePaintBiomeMixin.java similarity index 97% rename from src/main/java/com/falsepattern/endlessids/mixin/mixins/common/randomthings/MessagePaintBiomeMixin.java rename to src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/randomthings/MessagePaintBiomeMixin.java index c3d8cc4..c52998f 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/randomthings/MessagePaintBiomeMixin.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/randomthings/MessagePaintBiomeMixin.java @@ -1,4 +1,4 @@ -package com.falsepattern.endlessids.mixin.mixins.common.randomthings; +package com.falsepattern.endlessids.mixin.mixins.common.biome.randomthings; import com.falsepattern.endlessids.mixin.helpers.IChunkMixin; import lumien.randomthings.Items.ItemBiomeCapsule; diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/rtg/ChunkProviderRTGMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/rtg/ChunkProviderRTGMixin.java similarity index 95% rename from src/main/java/com/falsepattern/endlessids/mixin/mixins/common/rtg/ChunkProviderRTGMixin.java rename to src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/rtg/ChunkProviderRTGMixin.java index 01f4c30..f6f04d8 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/rtg/ChunkProviderRTGMixin.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/rtg/ChunkProviderRTGMixin.java @@ -1,4 +1,4 @@ -package com.falsepattern.endlessids.mixin.mixins.common.rtg; +package com.falsepattern.endlessids.mixin.mixins.common.biome.rtg; import com.falsepattern.endlessids.mixin.helpers.BiomePatchHelper; import org.spongepowered.asm.mixin.Mixin; diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/rtg/LandscapeGeneratorMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/rtg/LandscapeGeneratorMixin.java similarity index 91% rename from src/main/java/com/falsepattern/endlessids/mixin/mixins/common/rtg/LandscapeGeneratorMixin.java rename to src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/rtg/LandscapeGeneratorMixin.java index c8074c7..bec5e94 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/rtg/LandscapeGeneratorMixin.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/rtg/LandscapeGeneratorMixin.java @@ -1,4 +1,4 @@ -package com.falsepattern.endlessids.mixin.mixins.common.rtg; +package com.falsepattern.endlessids.mixin.mixins.common.biome.rtg; import com.falsepattern.endlessids.constants.ExtendedConstants; import com.falsepattern.endlessids.constants.VanillaConstants; diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/rwg/ChunkGeneratorRealisticMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/rwg/ChunkGeneratorRealisticMixin.java similarity index 94% rename from src/main/java/com/falsepattern/endlessids/mixin/mixins/common/rwg/ChunkGeneratorRealisticMixin.java rename to src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/rwg/ChunkGeneratorRealisticMixin.java index f05e45c..aeeb30d 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/rwg/ChunkGeneratorRealisticMixin.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/rwg/ChunkGeneratorRealisticMixin.java @@ -1,4 +1,4 @@ -package com.falsepattern.endlessids.mixin.mixins.common.rwg; +package com.falsepattern.endlessids.mixin.mixins.common.biome.rwg; import com.falsepattern.endlessids.mixin.helpers.BiomePatchHelper; import org.spongepowered.asm.mixin.Mixin; diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/rwg/RealisticBiomeBaseMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/rwg/RealisticBiomeBaseMixin.java similarity index 91% rename from src/main/java/com/falsepattern/endlessids/mixin/mixins/common/rwg/RealisticBiomeBaseMixin.java rename to src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/rwg/RealisticBiomeBaseMixin.java index 598bbac..2b0193e 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/rwg/RealisticBiomeBaseMixin.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/rwg/RealisticBiomeBaseMixin.java @@ -1,4 +1,4 @@ -package com.falsepattern.endlessids.mixin.mixins.common.rwg; +package com.falsepattern.endlessids.mixin.mixins.common.biome.rwg; import com.falsepattern.endlessids.constants.ExtendedConstants; import com.falsepattern.endlessids.constants.VanillaConstants; diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/rwg/VillageMaterialsMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/rwg/VillageMaterialsMixin.java similarity index 91% rename from src/main/java/com/falsepattern/endlessids/mixin/mixins/common/rwg/VillageMaterialsMixin.java rename to src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/rwg/VillageMaterialsMixin.java index 8971a48..fec9b6d 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/rwg/VillageMaterialsMixin.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/rwg/VillageMaterialsMixin.java @@ -1,4 +1,4 @@ -package com.falsepattern.endlessids.mixin.mixins.common.rwg; +package com.falsepattern.endlessids.mixin.mixins.common.biome.rwg; import com.falsepattern.endlessids.constants.ExtendedConstants; import com.falsepattern.endlessids.constants.VanillaConstants; diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/thaumcraft/UtilsMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/thaumcraft/UtilsMixin.java similarity index 95% rename from src/main/java/com/falsepattern/endlessids/mixin/mixins/common/thaumcraft/UtilsMixin.java rename to src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/thaumcraft/UtilsMixin.java index 891905d..cce769e 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/thaumcraft/UtilsMixin.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/thaumcraft/UtilsMixin.java @@ -1,4 +1,4 @@ -package com.falsepattern.endlessids.mixin.mixins.common.thaumcraft; +package com.falsepattern.endlessids.mixin.mixins.common.biome.thaumcraft; import com.falsepattern.endlessids.mixin.helpers.IChunkMixin; import org.spongepowered.asm.mixin.Mixin; diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/tropicraft/GenLayerTropiVoronoiZoomMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/tropicraft/GenLayerTropiVoronoiZoomMixin.java similarity index 90% rename from src/main/java/com/falsepattern/endlessids/mixin/mixins/common/tropicraft/GenLayerTropiVoronoiZoomMixin.java rename to src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/tropicraft/GenLayerTropiVoronoiZoomMixin.java index 46c0476..ea99728 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/tropicraft/GenLayerTropiVoronoiZoomMixin.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/tropicraft/GenLayerTropiVoronoiZoomMixin.java @@ -1,4 +1,4 @@ -package com.falsepattern.endlessids.mixin.mixins.common.tropicraft; +package com.falsepattern.endlessids.mixin.mixins.common.biome.tropicraft; import com.falsepattern.endlessids.constants.VanillaConstants; import net.tropicraft.world.genlayer.GenLayerTropiVoronoiZoom; diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/twilightforest/TFBiomeBaseMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/twilightforest/TFBiomeBaseMixin.java similarity index 95% rename from src/main/java/com/falsepattern/endlessids/mixin/mixins/common/twilightforest/TFBiomeBaseMixin.java rename to src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/twilightforest/TFBiomeBaseMixin.java index d27ffc6..c2056f3 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/twilightforest/TFBiomeBaseMixin.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/twilightforest/TFBiomeBaseMixin.java @@ -1,4 +1,4 @@ -package com.falsepattern.endlessids.mixin.mixins.common.twilightforest; +package com.falsepattern.endlessids.mixin.mixins.common.biome.twilightforest; import com.falsepattern.endlessids.PlaceholderBiome; import com.falsepattern.endlessids.constants.ExtendedConstants; diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/biome/BiomeDictionaryMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/vanilla/BiomeDictionaryMixin.java similarity index 92% rename from src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/biome/BiomeDictionaryMixin.java rename to src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/vanilla/BiomeDictionaryMixin.java index 7265396..6a40819 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/biome/BiomeDictionaryMixin.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/vanilla/BiomeDictionaryMixin.java @@ -1,4 +1,4 @@ -package com.falsepattern.endlessids.mixin.mixins.common.vanilla.biome; +package com.falsepattern.endlessids.mixin.mixins.common.biome.vanilla; import com.falsepattern.endlessids.PlaceholderBiome; import lombok.val; diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/biome/BiomeGenBaseMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/vanilla/BiomeGenBaseMixin.java similarity index 96% rename from src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/biome/BiomeGenBaseMixin.java rename to src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/vanilla/BiomeGenBaseMixin.java index 484c22a..e7813ad 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/biome/BiomeGenBaseMixin.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/vanilla/BiomeGenBaseMixin.java @@ -1,4 +1,4 @@ -package com.falsepattern.endlessids.mixin.mixins.common.vanilla.biome; +package com.falsepattern.endlessids.mixin.mixins.common.biome.vanilla; import com.falsepattern.endlessids.PlaceholderBiome; import com.falsepattern.endlessids.constants.ExtendedConstants; diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/storage/ChunkMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/vanilla/ChunkMixin.java similarity index 98% rename from src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/storage/ChunkMixin.java rename to src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/vanilla/ChunkMixin.java index 1912426..2c6135a 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/storage/ChunkMixin.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/vanilla/ChunkMixin.java @@ -1,4 +1,4 @@ -package com.falsepattern.endlessids.mixin.mixins.common.vanilla.storage; +package com.falsepattern.endlessids.mixin.mixins.common.biome.vanilla; import com.falsepattern.endlessids.EndlessIDs; import com.falsepattern.endlessids.Tags; diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/worldgen/GenLayerRiverMixMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/vanilla/GenLayerRiverMixMixin.java similarity index 90% rename from src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/worldgen/GenLayerRiverMixMixin.java rename to src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/vanilla/GenLayerRiverMixMixin.java index db0e1af..b9f1230 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/worldgen/GenLayerRiverMixMixin.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/vanilla/GenLayerRiverMixMixin.java @@ -1,4 +1,4 @@ -package com.falsepattern.endlessids.mixin.mixins.common.vanilla.worldgen; +package com.falsepattern.endlessids.mixin.mixins.common.biome.vanilla; import com.falsepattern.endlessids.constants.ExtendedConstants; import com.falsepattern.endlessids.constants.VanillaConstants; diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/worldgen/GenLayerVoronoiZoomMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/vanilla/GenLayerVoronoiZoomMixin.java similarity index 90% rename from src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/worldgen/GenLayerVoronoiZoomMixin.java rename to src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/vanilla/GenLayerVoronoiZoomMixin.java index a4b58af..1eaed23 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/worldgen/GenLayerVoronoiZoomMixin.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/vanilla/GenLayerVoronoiZoomMixin.java @@ -1,4 +1,4 @@ -package com.falsepattern.endlessids.mixin.mixins.common.vanilla.worldgen; +package com.falsepattern.endlessids.mixin.mixins.common.biome.vanilla; import com.falsepattern.endlessids.constants.ExtendedConstants; import com.falsepattern.endlessids.constants.VanillaConstants; diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/witchery/WorldChunkManagerMirrorMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/witchery/WorldChunkManagerMirrorMixin.java similarity index 92% rename from src/main/java/com/falsepattern/endlessids/mixin/mixins/common/witchery/WorldChunkManagerMirrorMixin.java rename to src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/witchery/WorldChunkManagerMirrorMixin.java index 64a9352..120fb7e 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/witchery/WorldChunkManagerMirrorMixin.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/biome/witchery/WorldChunkManagerMirrorMixin.java @@ -1,4 +1,4 @@ -package com.falsepattern.endlessids.mixin.mixins.common.witchery; +package com.falsepattern.endlessids.mixin.mixins.common.biome.witchery; import com.emoniph.witchery.dimension.WorldChunkManagerMirror; import com.falsepattern.endlessids.mixin.helpers.BiomePatchHelper; diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/cofhlib/BlockHelperMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/blockitem/cofhlib/BlockHelperMixin.java similarity index 91% rename from src/main/java/com/falsepattern/endlessids/mixin/mixins/common/cofhlib/BlockHelperMixin.java rename to src/main/java/com/falsepattern/endlessids/mixin/mixins/common/blockitem/cofhlib/BlockHelperMixin.java index 40ca2d4..cfe4554 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/cofhlib/BlockHelperMixin.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/blockitem/cofhlib/BlockHelperMixin.java @@ -1,4 +1,4 @@ -package com.falsepattern.endlessids.mixin.mixins.common.cofhlib; +package com.falsepattern.endlessids.mixin.mixins.common.blockitem.cofhlib; import cofh.lib.util.helpers.BlockHelper; import com.falsepattern.endlessids.constants.ExtendedConstants; diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/dragonapi/BlockPropertiesMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/blockitem/dragonapi/BlockPropertiesMixin.java similarity index 90% rename from src/main/java/com/falsepattern/endlessids/mixin/mixins/common/dragonapi/BlockPropertiesMixin.java rename to src/main/java/com/falsepattern/endlessids/mixin/mixins/common/blockitem/dragonapi/BlockPropertiesMixin.java index 6e336e9..2c4c726 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/dragonapi/BlockPropertiesMixin.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/blockitem/dragonapi/BlockPropertiesMixin.java @@ -1,4 +1,4 @@ -package com.falsepattern.endlessids.mixin.mixins.common.dragonapi; +package com.falsepattern.endlessids.mixin.mixins.common.blockitem.dragonapi; import Reika.DragonAPI.Extras.BlockProperties; import com.falsepattern.endlessids.constants.ExtendedConstants; diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/dragonapi/IDTypeMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/blockitem/dragonapi/IDTypeMixin.java similarity index 66% rename from src/main/java/com/falsepattern/endlessids/mixin/mixins/common/dragonapi/IDTypeMixin.java rename to src/main/java/com/falsepattern/endlessids/mixin/mixins/common/blockitem/dragonapi/IDTypeMixin.java index 7fed507..3581c65 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/dragonapi/IDTypeMixin.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/blockitem/dragonapi/IDTypeMixin.java @@ -1,4 +1,4 @@ -package com.falsepattern.endlessids.mixin.mixins.common.dragonapi; +package com.falsepattern.endlessids.mixin.mixins.common.blockitem.dragonapi; import Reika.DragonAPI.Extras.IDType; import com.falsepattern.endlessids.constants.ExtendedConstants; @@ -9,13 +9,6 @@ import org.spongepowered.asm.mixin.injection.ModifyConstant; @Mixin(value = IDType.class, remap = false) public abstract class IDTypeMixin { - @ModifyConstant(method = "", - constant = @Constant(intValue = 254), - require = 1) - private static int extendBiomeIDs(int constant) { - return ExtendedConstants.biomeIDCount - 2; - } - @ModifyConstant(method = "", constant = {@Constant(intValue = 4095), @Constant(intValue = 32767)}, require = 2) diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/mfqm/MFQMMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/blockitem/mfqm/MFQMMixin.java similarity index 96% rename from src/main/java/com/falsepattern/endlessids/mixin/mixins/common/mfqm/MFQMMixin.java rename to src/main/java/com/falsepattern/endlessids/mixin/mixins/common/blockitem/mfqm/MFQMMixin.java index ab49347..8d4530e 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/mfqm/MFQMMixin.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/blockitem/mfqm/MFQMMixin.java @@ -1,4 +1,4 @@ -package com.falsepattern.endlessids.mixin.mixins.common.mfqm; +package com.falsepattern.endlessids.mixin.mixins.common.blockitem.mfqm; import MoreFunQuicksandMod.main.MFQM; import com.falsepattern.endlessids.constants.ExtendedConstants; diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/ubc/BiomeUndergroundDecoratorMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/blockitem/ubc/BiomeUndergroundDecoratorMixin.java similarity index 97% rename from src/main/java/com/falsepattern/endlessids/mixin/mixins/common/ubc/BiomeUndergroundDecoratorMixin.java rename to src/main/java/com/falsepattern/endlessids/mixin/mixins/common/blockitem/ubc/BiomeUndergroundDecoratorMixin.java index f23f543..3ca4c4c 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/ubc/BiomeUndergroundDecoratorMixin.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/blockitem/ubc/BiomeUndergroundDecoratorMixin.java @@ -1,4 +1,4 @@ -package com.falsepattern.endlessids.mixin.mixins.common.ubc; +package com.falsepattern.endlessids.mixin.mixins.common.blockitem.ubc; import com.falsepattern.endlessids.mixin.helpers.IExtendedBlockStorageMixin; import exterminatorJeff.undergroundBiomes.worldGen.BiomeUndergroundDecorator; diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/ubc/OreUBifierMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/blockitem/ubc/OreUBifierMixin.java similarity index 91% rename from src/main/java/com/falsepattern/endlessids/mixin/mixins/common/ubc/OreUBifierMixin.java rename to src/main/java/com/falsepattern/endlessids/mixin/mixins/common/blockitem/ubc/OreUBifierMixin.java index 88a5dfa..c1cb3b6 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/ubc/OreUBifierMixin.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/blockitem/ubc/OreUBifierMixin.java @@ -1,4 +1,4 @@ -package com.falsepattern.endlessids.mixin.mixins.common.ubc; +package com.falsepattern.endlessids.mixin.mixins.common.blockitem.ubc; import com.falsepattern.endlessids.constants.ExtendedConstants; import com.falsepattern.endlessids.constants.VanillaConstants; diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/misc/BlockFireMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/blockitem/vanilla/BlockFireMixin.java similarity index 90% rename from src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/misc/BlockFireMixin.java rename to src/main/java/com/falsepattern/endlessids/mixin/mixins/common/blockitem/vanilla/BlockFireMixin.java index f1e1117..0445a80 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/misc/BlockFireMixin.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/blockitem/vanilla/BlockFireMixin.java @@ -1,4 +1,4 @@ -package com.falsepattern.endlessids.mixin.mixins.common.vanilla.misc; +package com.falsepattern.endlessids.mixin.mixins.common.blockitem.vanilla; import com.falsepattern.endlessids.constants.ExtendedConstants; import com.falsepattern.endlessids.constants.VanillaConstants; diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/storage/ExtendedBlockStorageMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/blockitem/vanilla/ExtendedBlockStorageMixin.java similarity index 97% rename from src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/storage/ExtendedBlockStorageMixin.java rename to src/main/java/com/falsepattern/endlessids/mixin/mixins/common/blockitem/vanilla/ExtendedBlockStorageMixin.java index ae4766a..99f582a 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/storage/ExtendedBlockStorageMixin.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/blockitem/vanilla/ExtendedBlockStorageMixin.java @@ -1,4 +1,4 @@ -package com.falsepattern.endlessids.mixin.mixins.common.vanilla.storage; +package com.falsepattern.endlessids.mixin.mixins.common.blockitem.vanilla; import com.falsepattern.endlessids.Hooks; import com.falsepattern.endlessids.mixin.helpers.IExtendedBlockStorageMixin; diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/misc/ItemInWorldManagerMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/blockitem/vanilla/ItemInWorldManagerMixin.java similarity index 90% rename from src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/misc/ItemInWorldManagerMixin.java rename to src/main/java/com/falsepattern/endlessids/mixin/mixins/common/blockitem/vanilla/ItemInWorldManagerMixin.java index 8979dbb..887e140 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/misc/ItemInWorldManagerMixin.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/blockitem/vanilla/ItemInWorldManagerMixin.java @@ -1,4 +1,4 @@ -package com.falsepattern.endlessids.mixin.mixins.common.vanilla.misc; +package com.falsepattern.endlessids.mixin.mixins.common.blockitem.vanilla; import com.falsepattern.endlessids.constants.ExtendedConstants; import com.falsepattern.endlessids.constants.VanillaConstants; diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/storage/ItemStackMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/blockitem/vanilla/ItemStackMixin.java similarity index 95% rename from src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/storage/ItemStackMixin.java rename to src/main/java/com/falsepattern/endlessids/mixin/mixins/common/blockitem/vanilla/ItemStackMixin.java index e2725b2..9259ed9 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/storage/ItemStackMixin.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/blockitem/vanilla/ItemStackMixin.java @@ -1,4 +1,4 @@ -package com.falsepattern.endlessids.mixin.mixins.common.vanilla.storage; +package com.falsepattern.endlessids.mixin.mixins.common.blockitem.vanilla; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Overwrite; diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/networking/PacketBufferMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/blockitem/vanilla/PacketBufferMixin.java similarity index 96% rename from src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/networking/PacketBufferMixin.java rename to src/main/java/com/falsepattern/endlessids/mixin/mixins/common/blockitem/vanilla/PacketBufferMixin.java index d2836ab..2ba21d0 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/networking/PacketBufferMixin.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/blockitem/vanilla/PacketBufferMixin.java @@ -1,4 +1,4 @@ -package com.falsepattern.endlessids.mixin.mixins.common.vanilla.networking; +package com.falsepattern.endlessids.mixin.mixins.common.blockitem.vanilla; import io.netty.buffer.ByteBuf; import org.spongepowered.asm.mixin.Mixin; diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/networking/S22PacketMultiBlockChangeMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/blockitem/vanilla/S22PacketMultiBlockChangeMixin.java similarity index 96% rename from src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/networking/S22PacketMultiBlockChangeMixin.java rename to src/main/java/com/falsepattern/endlessids/mixin/mixins/common/blockitem/vanilla/S22PacketMultiBlockChangeMixin.java index 993f115..9858cb0 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/networking/S22PacketMultiBlockChangeMixin.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/blockitem/vanilla/S22PacketMultiBlockChangeMixin.java @@ -1,4 +1,4 @@ -package com.falsepattern.endlessids.mixin.mixins.common.vanilla.networking; +package com.falsepattern.endlessids.mixin.mixins.common.blockitem.vanilla; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/networking/S24PacketBlockActionMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/blockitem/vanilla/S24PacketBlockActionMixin.java similarity index 90% rename from src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/networking/S24PacketBlockActionMixin.java rename to src/main/java/com/falsepattern/endlessids/mixin/mixins/common/blockitem/vanilla/S24PacketBlockActionMixin.java index 8a0adeb..4c1ab2c 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/networking/S24PacketBlockActionMixin.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/blockitem/vanilla/S24PacketBlockActionMixin.java @@ -1,4 +1,4 @@ -package com.falsepattern.endlessids.mixin.mixins.common.vanilla.networking; +package com.falsepattern.endlessids.mixin.mixins.common.blockitem.vanilla; import com.falsepattern.endlessids.constants.ExtendedConstants; import com.falsepattern.endlessids.constants.VanillaConstants; diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/misc/StatListMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/blockitem/vanilla/StatListMixin.java similarity index 90% rename from src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/misc/StatListMixin.java rename to src/main/java/com/falsepattern/endlessids/mixin/mixins/common/blockitem/vanilla/StatListMixin.java index 5682fb7..59c3452 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/misc/StatListMixin.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/blockitem/vanilla/StatListMixin.java @@ -1,4 +1,4 @@ -package com.falsepattern.endlessids.mixin.mixins.common.vanilla.misc; +package com.falsepattern.endlessids.mixin.mixins.common.blockitem.vanilla; import com.falsepattern.endlessids.constants.ExtendedConstants; import com.falsepattern.endlessids.constants.VanillaConstants; diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/misc/WorldMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/blockitem/vanilla/WorldMixin.java similarity index 89% rename from src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/misc/WorldMixin.java rename to src/main/java/com/falsepattern/endlessids/mixin/mixins/common/blockitem/vanilla/WorldMixin.java index 6b9407d..978edc3 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/misc/WorldMixin.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/blockitem/vanilla/WorldMixin.java @@ -1,4 +1,4 @@ -package com.falsepattern.endlessids.mixin.mixins.common.vanilla.misc; +package com.falsepattern.endlessids.mixin.mixins.common.blockitem.vanilla; import com.falsepattern.endlessids.constants.ExtendedConstants; import com.falsepattern.endlessids.constants.VanillaConstants; diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/worldedit/BaseBlockMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/blockitem/worldedit/BaseBlockMixin.java similarity index 92% rename from src/main/java/com/falsepattern/endlessids/mixin/mixins/common/worldedit/BaseBlockMixin.java rename to src/main/java/com/falsepattern/endlessids/mixin/mixins/common/blockitem/worldedit/BaseBlockMixin.java index 1491ac9..ff0ef65 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/worldedit/BaseBlockMixin.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/blockitem/worldedit/BaseBlockMixin.java @@ -1,4 +1,4 @@ -package com.falsepattern.endlessids.mixin.mixins.common.worldedit; +package com.falsepattern.endlessids.mixin.mixins.common.blockitem.worldedit; import com.falsepattern.endlessids.constants.ExtendedConstants; import com.sk89q.worldedit.blocks.BaseBlock; diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/mfqm/MFQMDataWatcherMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/datawatcher/mfqm/MFQMDataWatcherMixin.java similarity index 93% rename from src/main/java/com/falsepattern/endlessids/mixin/mixins/common/mfqm/MFQMDataWatcherMixin.java rename to src/main/java/com/falsepattern/endlessids/mixin/mixins/common/datawatcher/mfqm/MFQMDataWatcherMixin.java index 9aeb7ce..b78fb3b 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/mfqm/MFQMDataWatcherMixin.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/datawatcher/mfqm/MFQMDataWatcherMixin.java @@ -1,4 +1,4 @@ -package com.falsepattern.endlessids.mixin.mixins.common.mfqm; +package com.falsepattern.endlessids.mixin.mixins.common.datawatcher.mfqm; import MoreFunQuicksandMod.main.MFQM; import com.falsepattern.endlessids.constants.ExtendedConstants; diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/misc/DataWatcherMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/datawatcher/vanilla/DataWatcherMixin.java similarity index 98% rename from src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/misc/DataWatcherMixin.java rename to src/main/java/com/falsepattern/endlessids/mixin/mixins/common/datawatcher/vanilla/DataWatcherMixin.java index 350e403..f3260d5 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/misc/DataWatcherMixin.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/datawatcher/vanilla/DataWatcherMixin.java @@ -1,4 +1,4 @@ -package com.falsepattern.endlessids.mixin.mixins.common.vanilla.misc; +package com.falsepattern.endlessids.mixin.mixins.common.datawatcher.vanilla; import com.falsepattern.endlessids.constants.ExtendedConstants; import com.falsepattern.endlessids.constants.VanillaConstants; diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/enchantment/EnchantmentMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/enchantment/vanilla/EnchantmentMixin.java similarity index 88% rename from src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/enchantment/EnchantmentMixin.java rename to src/main/java/com/falsepattern/endlessids/mixin/mixins/common/enchantment/vanilla/EnchantmentMixin.java index c9a2b3e..b16a6df 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/enchantment/EnchantmentMixin.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/enchantment/vanilla/EnchantmentMixin.java @@ -1,4 +1,4 @@ -package com.falsepattern.endlessids.mixin.mixins.common.vanilla.enchantment; +package com.falsepattern.endlessids.mixin.mixins.common.enchantment.vanilla; import com.falsepattern.endlessids.constants.ExtendedConstants; import org.spongepowered.asm.mixin.Mixin; diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/potion/PotionEffectMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/potion/vanilla/PotionEffectMixin.java similarity index 96% rename from src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/potion/PotionEffectMixin.java rename to src/main/java/com/falsepattern/endlessids/mixin/mixins/common/potion/vanilla/PotionEffectMixin.java index b0e0086..c8fdcce 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/potion/PotionEffectMixin.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/potion/vanilla/PotionEffectMixin.java @@ -1,4 +1,4 @@ -package com.falsepattern.endlessids.mixin.mixins.common.vanilla.potion; +package com.falsepattern.endlessids.mixin.mixins.common.potion.vanilla; import lombok.val; import org.spongepowered.asm.mixin.Mixin; diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/potion/PotionMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/potion/vanilla/PotionMixin.java similarity index 92% rename from src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/potion/PotionMixin.java rename to src/main/java/com/falsepattern/endlessids/mixin/mixins/common/potion/vanilla/PotionMixin.java index c22b8d9..dc2b623 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/potion/PotionMixin.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/potion/vanilla/PotionMixin.java @@ -1,4 +1,4 @@ -package com.falsepattern.endlessids.mixin.mixins.common.vanilla.potion; +package com.falsepattern.endlessids.mixin.mixins.common.potion.vanilla; import com.falsepattern.endlessids.constants.ExtendedConstants; import org.spongepowered.asm.mixin.Final; diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/potion/network/S1DPacketEntityEffectMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/potion/vanilla/network/S1DPacketEntityEffectMixin.java similarity index 95% rename from src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/potion/network/S1DPacketEntityEffectMixin.java rename to src/main/java/com/falsepattern/endlessids/mixin/mixins/common/potion/vanilla/network/S1DPacketEntityEffectMixin.java index f751954..2a1f9df 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/potion/network/S1DPacketEntityEffectMixin.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/potion/vanilla/network/S1DPacketEntityEffectMixin.java @@ -1,10 +1,9 @@ -package com.falsepattern.endlessids.mixin.mixins.common.vanilla.potion.network; +package com.falsepattern.endlessids.mixin.mixins.common.potion.vanilla.network; import com.falsepattern.endlessids.mixin.helpers.IS1DPacketEntityEffectMixin; import com.llamalad7.mixinextras.injector.wrapoperation.Operation; import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation; import io.netty.buffer.ByteBuf; -import lombok.Getter; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Redirect; diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/potion/network/S1EPacketRemoveEntityEffectMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/potion/vanilla/network/S1EPacketRemoveEntityEffectMixin.java similarity index 95% rename from src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/potion/network/S1EPacketRemoveEntityEffectMixin.java rename to src/main/java/com/falsepattern/endlessids/mixin/mixins/common/potion/vanilla/network/S1EPacketRemoveEntityEffectMixin.java index af75f52..81da476 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/potion/network/S1EPacketRemoveEntityEffectMixin.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/potion/vanilla/network/S1EPacketRemoveEntityEffectMixin.java @@ -1,4 +1,4 @@ -package com.falsepattern.endlessids.mixin.mixins.common.vanilla.potion.network; +package com.falsepattern.endlessids.mixin.mixins.common.potion.vanilla.network; import io.netty.buffer.ByteBuf; import org.spongepowered.asm.mixin.Mixin; 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 9f22be7..06aaeb1 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/plugin/Mixin.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/plugin/Mixin.java @@ -16,70 +16,13 @@ import static com.falsepattern.lib.mixin.IMixin.PredicateHelpers.require; @RequiredArgsConstructor public enum Mixin implements IMixin { - //region Minecraft - //region Minecraft->common - //region Minecraft->common->storage + //region common + //region vanilla 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 - BiomeDictionaryMixin(Side.COMMON, always(), "vanilla.biome.BiomeDictionaryMixin"), - 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(() -> GeneralConfig.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 - GenLayerRiverMixMixin(Side.COMMON, avoid(TargetedMod.DRAGONAPI), "vanilla.worldgen.GenLayerRiverMixMixin"), - GenLayerVoronoiZoomMixin(Side.COMMON, always(), "vanilla.worldgen.GenLayerVoronoiZoomMixin"), - //endregion Minecraft->common->worldgen - //region Minecraft->common->potion - PotionEffectMixin(Side.COMMON, always(), "vanilla.potion.PotionEffectMixin"), - PotionMixin(Side.COMMON, always(), "vanilla.potion.PotionMixin"), - S1DPacketEntityEffectMixin(Side.COMMON, always(), "vanilla.potion.network.S1DPacketEntityEffectMixin"), - S1EPacketRemoveEntityEffectMixin(Side.COMMON, always(), "vanilla.potion.network.S1EPacketRemoveEntityEffectMixin"), - //endregion Minecraft->common->potion - //region Minecraft->common->enchantment - EnchantmentMixin(Side.COMMON, always(), "vanilla.enchantment.EnchantmentMixin"), - //endregion Minecraft->common->enchantment - //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 AbyssalCraft->common - AbyssalCraftMixin(Side.COMMON, require(TargetedMod.ABYSSALCRAFT), "abyssalcraft.AbyssalCraftMixin"), - //endregion AbyssalCraft->common - //region AdvancedRocketry->common - AdvancedRocketryMixin(Side.COMMON, require(TargetedMod.AROCKETRY), "arocketry.AdvancedRocketryMixin"), - ARocketryChunkProviderSpaceMixin(Side.COMMON, require(TargetedMod.AROCKETRY), "arocketry.ChunkProviderSpaceMixin"), - //endregion AdvancedRocketry->common - //region ATG->common - ATGBiomeConfigMixin(Side.COMMON, require(TargetedMod.ATG), "atg.ATGBiomeConfigMixin"), - ATGBiomeManagerMixin(Side.COMMON, require(TargetedMod.ATG), "atg.ATGBiomeManagerMixin"), - ATGWorldGenRocksMixin(Side.COMMON, require(TargetedMod.ATG), "atg.ATGWorldGenRocksMixin"), - //endregion ATG->common - //region AntiqueAtlas->commond - BiomeDetectorBaseMixin(Side.COMMON, require(TargetedMod.ANTIQUEATLAS), "antiqueatlas.BiomeDetectorBaseMixin"), - BiomeDetectorNetherMixin(Side.COMMON, require(TargetedMod.ANTIQUEATLAS), "antiqueatlas.BiomeDetectorNetherMixin"), - //endregion AntiqueAtlas->commond - //region AntiIDConflict->common + //endregion vanilla + //region AntiIDConflict AIDCAntiIdConflictBaseMixin(Side.COMMON, require(TargetedMod.ANTIIDCONFLICT), "antiidconflict.AntiIdConflictBaseMixin"), AIDCBiomesGenBasePlaceholderMixin(Side.COMMON, require(TargetedMod.ANTIIDCONFLICT), @@ -91,140 +34,213 @@ public enum Mixin implements IMixin { "antiidconflict.EnchantementsManagerMixin"), AIDCEntitiesManagerMixin(Side.COMMON, require(TargetedMod.ANTIIDCONFLICT), "antiidconflict.EntitiesManagerMixin"), AIDCPotionsManagerMixin(Side.COMMON, require(TargetedMod.ANTIIDCONFLICT), "antiidconflict.PotionsManagerMixin"), - //endregion AntiIDConflict->common - //region BoP->common - BOPBiomeManagerMixin(Side.COMMON, require(TargetedMod.BOP), "bop.BOPBiomeManagerMixin"), - BOPBiomesMixin(Side.COMMON, require(TargetedMod.BOP), "bop.BOPBiomesMixin"), - //endregion BoP->common - //region BiomeTweaker->common - BiomeEventHandlerMixin(Side.COMMON, require(TargetedMod.BIOMETWEAKER), "biometweaker.BiomeEventHandlerMixin"), - //endregion BiomeTweaker->common + //endregion AntiIDConflict + //region biome + //region vanilla + 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"), + //endregion vanilla + //region AbyssalCraft + AbyssalCraftMixin(Side.COMMON, 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"), + //endregion AntiqueAtlas + //region AdvancedRocketry + AdvancedRocketryMixin(Side.COMMON, require(TargetedMod.AROCKETRY), "biome.arocketry.AdvancedRocketryMixin"), + ARocketryChunkProviderSpaceMixin(Side.COMMON, 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"), + //endregion ATG + //region BiomeTweaker + BiomeEventHandlerMixin(Side.COMMON, require(TargetedMod.BIOMETWEAKER), "biome.biometweaker.BiomeEventHandlerMixin"), + //endregion BiomeTweaker //region Biome Wand - //region Biome Wand->client - BiomeWandItemClientMixin(Side.CLIENT, require(TargetedMod.BIOMEWAND), "biomewand.BiomeWandItemMixin"), - //endregion Biome Wand->client - //region Biome Wand->common - BiomeWandItemMixin(Side.COMMON, require(TargetedMod.BIOMEWAND), "biomewand.BiomeWandItemMixin"), - //endregion Biome Wand->common + BiomeWandItemMixin(Side.COMMON, 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"), + //endregion BoP //region Buildcraft BuildcraftEnergyMixin(Side.COMMON, require(TargetedMod.BUILDCRAFT), "buildcraft.BuildcraftEnergyMixin"), //endregion Buildcraft - //region CoFHLib->common - CoFHLibCofhBlockHelperMixin(Side.COMMON, require(TargetedMod.COFHLIB), "cofhlib.BlockHelperMixin"), - //endregion CoFHLib->common - //region CompactMachines->common - CMCubeToolsMixin(Side.COMMON, require(TargetedMod.COMPACTMACHINES), "compactmachines.CubeToolsMixin"), - //endregion CompactMachines->common - //region DarkWorld->common - DarkWorldModBiomesMixin(Side.COMMON, require(TargetedMod.DARKWORLD), "darkworld.ModBiomesMixin"), - //endregion DarkWorld->common - //region DragonAPI->common - //region DragonAPI->common->vanilla - DragonAPIGenLayerRiverMixMixin(Side.COMMON, require(TargetedMod.DRAGONAPI), - "dragonapi.vanilla.GenLayerRiverMixMixin"), - //endregion DragonAPI->common->vanilla - DragonAPIGenLayerRiverEventMixin(Side.COMMON, require(TargetedMod.DRAGONAPI), "dragonapi.GenLayerRiverEventMixin"), - DragonAPIBlockPropertiesMixin(Side.COMMON, require(TargetedMod.DRAGONAPI), "dragonapi.BlockPropertiesMixin"), - DragonAPIIDTypeMixin(Side.COMMON, require(TargetedMod.DRAGONAPI), "dragonapi.IDTypeMixin"), - ReikaChunkHelperMixin(Side.COMMON, require(TargetedMod.DRAGONAPI), "dragonapi.ReikaChunkHelperMixin"), - ReikaWorldHelperMixin(Side.COMMON, require(TargetedMod.DRAGONAPI), "dragonapi.ReikaWorldHelperMixin"), - //endregion DragonAPI->common - //region Enderlicious->common - EnderliciousBiomeConfigurationMixin(Side.COMMON, require(TargetedMod.ENDERLICIOUS), "enderlicious.BiomeConfigurationMixin"), - EnderliciousEndChunkProviderMixin(Side.COMMON, require(TargetedMod.ENDERLICIOUS), "enderlicious.EndChunkProviderMixin"), - //endregion Enderlicious->common + //region CompactMachines + CMCubeToolsMixin(Side.COMMON, require(TargetedMod.COMPACTMACHINES), "biome.compactmachines.CubeToolsMixin"), + //endregion CompactMachines + //region DarkWorld + DarkWorldModBiomesMixin(Side.COMMON, 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"), + //endregion DragonAPI //region EnhancedBiomes - EBBiomeIDsMixin(Side.COMMON, require(TargetedMod.EB), "eb.BiomeIDsMixin"), - EBGenLayerArchipelagoEdgeMixin(Side.COMMON, require(TargetedMod.EB), "eb.GenLayerArchipelagoEdgeMixin"), - EBGenLayerEBHillsMixin(Side.COMMON, require(TargetedMod.EB), "eb.GenLayerEBHillsMixin"), - EBGenLayerEBRiverMixMixin(Side.COMMON, require(TargetedMod.EB), "eb.GenLayerEBRiverMixMixin"), - EBGenLayerEBVoronoiZoomMixin(Side.COMMON, require(TargetedMod.EB), "eb.GenLayerEBVoronoiZoomMixin"), + 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"), //endregion EnhancedBiomes - //region Erebus->common - ErebusModBiomesMixin(Side.COMMON, require(TargetedMod.EREBUS), "erebus.ModBiomesMixin"), - //endregion Erebus->common - //region ExtraPlanets->common - ExtraPlanetsConfigMixin(Side.COMMON, require(TargetedMod.EXTRAPLANETS), "extraplanets.ConfigMixin"), - //endregion ExtraPlanets->common - //region ExtraUtilities->common - ChunkProviderEndOfTimeMixin(Side.COMMON, require(TargetedMod.EXTRAUTILITIES), "extrautilities.ChunkProviderEndOfTimeMixin"), - //endregion ExtraUtilities->common - //region Futurepack->common - FuturepackBiomeGenSpaceMixin(Side.COMMON, require(TargetedMod.FUTUREPACK), "futurepack.BiomeGenSpaceMixin"), - //endregion Futurepack->common - //region GalactiCraftCore->common + //region Enderlicious + EnderliciousBiomeConfigurationMixin(Side.COMMON, require(TargetedMod.ENDERLICIOUS), "biome.enderlicious.BiomeConfigurationMixin"), + EnderliciousEndChunkProviderMixin(Side.COMMON, require(TargetedMod.ENDERLICIOUS), "biome.enderlicious.EndChunkProviderMixin"), + //endregion Enderlicious + //region Erebus + ErebusModBiomesMixin(Side.COMMON, require(TargetedMod.EREBUS), "biome.erebus.ModBiomesMixin"), + //endregion Erebus + //region ExtraPlanets + ExtraPlanetsConfigMixin(Side.COMMON, require(TargetedMod.EXTRAPLANETS), "biome.extraplanets.ConfigMixin"), + //endregion ExtraPlanets + //region ExtraUtilities + ChunkProviderEndOfTimeMixin(Side.COMMON, require(TargetedMod.EXTRAUTILITIES), "biome.extrautilities.ChunkProviderEndOfTimeMixin"), + //endregion ExtraUtilities + //region Futurepack + FuturepackBiomeGenSpaceMixin(Side.COMMON, require(TargetedMod.FUTUREPACK), "biome.futurepack.BiomeGenSpaceMixin"), + //endregion Futurepack + //region GalactiCraftCore GalactiCraftConfigManagerCoreMixin(Side.COMMON, require(TargetedMod.GALACTICRAFTCORE), - "galacticraft.ConfigManagerCoreMixin"), - //endregion GalactiCraftCore->common - //region GalaxySpace->common - GSChunkProviderKuiperMixin(Side.COMMON, require(TargetedMod.GALAXYSPACE), "galaxyspace.ChunkProviderKuiperMixin"), - GSChunkProviderMarsSSMixin(Side.COMMON, require(TargetedMod.GALAXYSPACE), "galaxyspace.ChunkProviderMarsSSMixin"), - GSChunkProviderSpaceLakesMixin(Side.COMMON, require(TargetedMod.GALAXYSPACE), "galaxyspace.ChunkProviderSpaceLakesMixin"), - GSChunkProviderVenusSSMixin(Side.COMMON, require(TargetedMod.GALAXYSPACE), "galaxyspace.ChunkProviderVenusSSMixin"), - //endregion GalaxySpace->common - //region Highlands->common - HighlandsConfigMixin(Side.COMMON, require(TargetedMod.HIGHLANDS), "highlands.ConfigMixin"), - //endregion Highlands->common - //region ICG->common - ICGMysteriumPatchesFixesCaveMixin(Side.COMMON, require(TargetedMod.ICG), "icg.MysteriumPatchesFixesCaveMixin"), - //endregion ICG->common - //region LOTR->common - LOTRBiomeVariantStorageMixin(Side.COMMON, require(TargetedMod.LOTR), "lotr.LOTRBiomeVariantStorageMixin"), - LOTRChunkProviderMixin(Side.COMMON, require(TargetedMod.LOTR), "lotr.LOTRChunkProviderMixin"), - LOTRChunkProviderUtumnoMixin(Side.COMMON, require(TargetedMod.LOTR), "lotr.LOTRChunkProviderUtumnoMixin"), + "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"), + //endregion GalaxySpace + //region Highlands + HighlandsConfigMixin(Side.COMMON, require(TargetedMod.HIGHLANDS), "biome.highlands.ConfigMixin"), + //endregion Highlands + //region ICG + ICGMysteriumPatchesFixesCaveMixin(Side.COMMON, 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), - "lotr.LOTRPacketBiomeVariantsWatchHandlerMixin"), - LOTRWorldChunkManagerMixin(Side.COMMON, require(TargetedMod.LOTR), "lotr.LOTRWorldChunkManagerMixin"), - //endregion LOTR->common - //region MFQM->common - MFQMMixin(Side.COMMON, require(TargetedMod.MFQM), "mfqm.MFQMMixin"), - MFQMDataWatcherMixin(Side.COMMON, require(TargetedMod.MFQM).and(condition(() -> GeneralConfig.extendDataWatcher)), - "mfqm.MFQMDataWatcherMixin"), - //endregion MFQM->common - //region NaturesCompass->common - NaturesCompassBiomeUtilsMixin(Side.COMMON, require(TargetedMod.NATURESCOMPASS), "naturescompass.BiomeUtilsMixin"), - //endregion NaturesCompass->common - //region Netherlicious->common + "biome.lotr.LOTRPacketBiomeVariantsWatchHandlerMixin"), + LOTRWorldChunkManagerMixin(Side.COMMON, require(TargetedMod.LOTR), "biome.lotr.LOTRWorldChunkManagerMixin"), + //endregion LOTR + //region NaturesCompass + NaturesCompassBiomeUtilsMixin(Side.COMMON, require(TargetedMod.NATURESCOMPASS), "biome.naturescompass.BiomeUtilsMixin"), + //endregion NaturesCompass + //region Netherlicious NetherliciousBiomeConfigurationMixin(Side.COMMON, require(TargetedMod.NETHERLICIOUS), - "netherlicious.BiomeConfigurationMixin"), - //endregion Netherlicious->common - //region NomadicTents->common - NomadicTentsTentChunkProviderMixin(Side.COMMON, require(TargetedMod.NOMADICTENTS), "nomadictents.TentChunkProviderMixin"), - //endregion NomadicTents->common - //region RandomThings->common - ItemBiomePainterMixin(Side.COMMON, require(TargetedMod.RANDOMTHINGS), "randomthings.ItemBiomePainterMixin"), - MessagePaintBiomeMixin(Side.COMMON, require(TargetedMod.RANDOMTHINGS), "randomthings.MessagePaintBiomeMixin"), - //endregion RandomThings->common - //region RTG->common - RTGChunkProviderRTGMixin(Side.COMMON, require(TargetedMod.RTG), "rtg.ChunkProviderRTGMixin"), - RTGLandscapeGeneratorMixin(Side.COMMON, require(TargetedMod.RTG), "rtg.LandscapeGeneratorMixin"), - //endregion RTG->common - //region RWG->common - RWGChunkGeneratorRealisticMixin(Side.COMMON, require(TargetedMod.RWG), "rwg.ChunkGeneratorRealisticMixin"), - RWGRealisticBiomeBaseMixin(Side.COMMON, require(TargetedMod.RWG), "rwg.RealisticBiomeBaseMixin"), - RWGVillageMaterialsMixin(Side.COMMON, require(TargetedMod.RWG), "rwg.VillageMaterialsMixin"), - //endregion RWG->common - //region Thaumcraft->common - ThaumcraftUtilsMixin(Side.COMMON, require(TargetedMod.THAUMCRAFT), "thaumcraft.UtilsMixin"), - //endregion Thaumcraft->common - //region Tropicraft->common + "biome.netherlicious.BiomeConfigurationMixin"), + //endregion Netherlicious + //region NomadicTents + NomadicTentsTentChunkProviderMixin(Side.COMMON, 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"), + //endregion RandomThings + //region RTG + RTGChunkProviderRTGMixin(Side.COMMON, require(TargetedMod.RTG), "biome.rtg.ChunkProviderRTGMixin"), + RTGLandscapeGeneratorMixin(Side.COMMON, 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"), + //endregion RWG + //region Thaumcraft + ThaumcraftUtilsMixin(Side.COMMON, require(TargetedMod.THAUMCRAFT), "biome.thaumcraft.UtilsMixin"), + //endregion Thaumcraft + //region Tropicraft GenLayerTropiVoronoiZoomMixin(Side.COMMON, require(TargetedMod.TROPICRAFT), - "tropicraft.GenLayerTropiVoronoiZoomMixin"), - //endregion Tropicraft->common - //region TwilightForest->common - TFBiomeBaseMixin(Side.COMMON, require(TargetedMod.TWILIGHTFOREST), "twilightforest.TFBiomeBaseMixin"), - //endregion TwilightForest->common - //region UBC->common - UBCOreUBifierMixin(Side.COMMON, require(TargetedMod.UBC), "ubc.OreUBifierMixin"), - UBCBiomeUndergroundDecoratorMixin(Side.COMMON, require(TargetedMod.UBC), "ubc.BiomeUndergroundDecoratorMixin"), - //endregion UBC->common - //region Witchery->common - WitcheryWorldChunkManagerMirrorixin(Side.COMMON, require(TargetedMod.WITCHERY), "witchery.WorldChunkManagerMirrorMixin"), - //endregion Witchery->common - //region WorldEdit->common - WorldEditBaseBlockMixin(Side.COMMON, require(TargetedMod.WORLDEDIT), "worldedit.BaseBlockMixin"), - //endregion WorldEdit->common + "biome.tropicraft.GenLayerTropiVoronoiZoomMixin"), + //endregion Tropicraft + //region TwilightForest + TFBiomeBaseMixin(Side.COMMON, require(TargetedMod.TWILIGHTFOREST), "biome.twilightforest.TFBiomeBaseMixin"), + //endregion TwilightForest + //region Witchery + WitcheryWorldChunkManagerMirrorixin(Side.COMMON, require(TargetedMod.WITCHERY), "biome.witchery.WorldChunkManagerMirrorMixin"), + //endregion Witchery + + //endregion biome + //region blockitem + //region vanilla + 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"), + S22PacketMultiBlockChangeMixin(Side.COMMON, always(), "blockitem.vanilla.S22PacketMultiBlockChangeMixin"), + S24PacketBlockActionMixin(Side.COMMON, always(), "blockitem.vanilla.S24PacketBlockActionMixin"), + StatListMixin(Side.COMMON, always(), "blockitem.vanilla.StatListMixin"), + WorldMixin(Side.COMMON, always(), "blockitem.vanilla.WorldMixin"), + //endregion vanilla + //region CoFHLib + CoFHLibCofhBlockHelperMixin(Side.COMMON, 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"), + //endregion DragonAPI + //region MFQM + MFQMMixin(Side.COMMON, require(TargetedMod.MFQM), "blockitem.mfqm.MFQMMixin"), + //endregion MFQM + //region WorldEdit + WorldEditBaseBlockMixin(Side.COMMON, 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"), + //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"), + //endregion MFQM + //endregion datawatcher + //region enchantment + //region vanilla + EnchantmentMixin(Side.COMMON, always(), "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"), + //endregion vanilla + //endregion potion + //endregion common + + //region client + //region vanilla + ChunkMixinClient(Side.CLIENT, always(), "vanilla.ChunkMixin"), + NetHandlerPlayClientMixin(Side.CLIENT, always(), "vanilla.NetHandlerPlayClientMixin"), + + //endregion vanilla + //region biome + //region Biome Wand + BiomeWandItemClientMixin(Side.CLIENT, require(TargetedMod.BIOMEWAND), "biome.biomewand.BiomeWandItemMixin"), + //endregion Biome Wand + //endregion biome + //region blockitem + PlayerControllerMPMixin(Side.CLIENT, always(), "blockitem.vanilla.PlayerControllerMPMixin"), + RenderGlobalMixin(Side.CLIENT, always(), "blockitem.vanilla.RenderGlobalMixin"), + //endregion blockitem + //endregion client + ; @Getter private final Side side;