begin modularization

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)

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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 = "<clinit>",
+                    constant = @Constant(intValue = 254),
+                    require = 1)
+    private static int extendBiomeIDs(int constant) {
+        return ExtendedConstants.biomeIDCount - 2;
+    }
+}

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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,

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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 = "<clinit>",
-                    constant = @Constant(intValue = 254),
-                    require = 1)
-    private static int extendBiomeIDs(int constant) {
-        return ExtendedConstants.biomeIDCount - 2;
-    }
-
     @ModifyConstant(method = "<clinit>",
                     constant = {@Constant(intValue = 4095), @Constant(intValue = 32767)},
                     require = 2)

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;