Cleanup

src/main/java/org/dimdev/jeid/core/JEIDMixinLoader.java

@@ -9,7 +9,7 @@
 
 public class JEIDMixinLoader implements ILateMixinLoader {
     public List<String> getMixinConfigs() {
-        List<String> configs = new ArrayList<String>();
+        List<String> configs = new ArrayList<>();
 
         if (JEIDLoadingPlugin.isClient) {
             if (Loader.isModLoaded("advancedrocketry")) {

src/main/java/org/dimdev/jeid/mixin/core/misc/MixinBlock.java

@@ -40,7 +40,7 @@ public static int getIdFromBlock(Block blockIn) {
      * an ID larger than 4096 stored in JEID format (state ID is larger than 65536)
      */
     @ModifyArg(method = "getStateById", at = @At(value = "INVOKE", target = "Lnet/minecraft/block/Block;getBlockById(I)Lnet/minecraft/block/Block;"), index = 0)
-    private static int reid$useJEIDId(int vanillaId, @Local(ordinal = 0) int stateId) {
+    private static int reid$useJEIDId(int vanillaId, @Local(ordinal = 0, argsOnly = true) int stateId) {
         if ((stateId & 0xffff0000) == 0) {
             return vanillaId;
         } else {
@@ -52,7 +52,7 @@ public static int getIdFromBlock(Block blockIn) {
      * @reason See {@link #reid$useJEIDId}
      */
     @ModifyArg(method = "getStateById", at = @At(value = "INVOKE", target = "Lnet/minecraft/block/Block;getStateFromMeta(I)Lnet/minecraft/block/state/IBlockState;"), index = 0)
-    private static int reid$useJEIDMeta(int vanillaMeta, @Local(ordinal = 0) int stateId) {
+    private static int reid$useJEIDMeta(int vanillaMeta, @Local(ordinal = 0, argsOnly = true) int stateId) {
         if ((stateId & 0xffff0000) == 0) {
             return vanillaMeta;
         } else {

src/main/java/org/dimdev/jeid/mixin/core/potion/MixinSPacketRemoveEntityEffect.java

@@ -19,7 +19,7 @@
 public class MixinSPacketRemoveEntityEffect {
     @Final
     @ModifyArg(method = "readPacketData", at = @At(value = "INVOKE", target = "Lnet/minecraft/potion/Potion;getPotionById(I)Lnet/minecraft/potion/Potion;"), index = 0)
-    private int reid$readIntPotionId(int original, @Local PacketBuffer buf) {
+    private int reid$readIntPotionId(int original, @Local(argsOnly = true) PacketBuffer buf) {
         return buf.readInt();
     }
 

src/main/java/org/dimdev/jeid/mixin/core/potion/client/MixinNetHandlerPlayClient.java

@@ -18,7 +18,7 @@
 public class MixinNetHandlerPlayClient {
     @Final
     @ModifyArg(method = "handleEntityEffect", at = @At(value = "INVOKE", target = "Lnet/minecraft/potion/Potion;getPotionById(I)Lnet/minecraft/potion/Potion;"), index = 0)
-    private int reid$getIntEffectId(int potionID, @Local SPacketEntityEffect packetIn) {
+    private int reid$getIntEffectId(int potionID, @Local(argsOnly = true) SPacketEntityEffect packetIn) {
         return ((IStoredEffectInt) packetIn).getEffectInt();
     }
 }

src/main/java/org/dimdev/jeid/mixin/core/world/MixinChunk.java

@@ -43,7 +43,6 @@ public void setIntBiomeArray(int[] intBiomeArray) {
         System.arraycopy(intBiomeArray, 0, this.intBiomeArray, 0, this.intBiomeArray.length);
     }
 
-    @SuppressWarnings("unused")
     @Inject(method = "getBiomeArray", at = @At(value = "RETURN"), cancellable = true)
     private void reid$returnErrorBiomeArray(CallbackInfoReturnable<byte[]> cir) {
         byte[] arr = new byte[256];

src/main/java/org/dimdev/jeid/mixin/core/world/MixinChunkPrimer.java

@@ -15,7 +15,7 @@
 @Mixin(ChunkPrimer.class)
 public class MixinChunkPrimer {
     @Unique
-    private int[] intData = new int[65536];
+    private final int[] intData = new int[65536];
 
     @Shadow
     private static int getBlockIndex(int x, int y, int z) {

src/main/java/org/dimdev/jeid/mixin/core/world/MixinChunkProviderServer.java

@@ -4,42 +4,32 @@
 import net.minecraft.world.biome.Biome;
 import net.minecraft.world.chunk.Chunk;
 import net.minecraft.world.gen.ChunkProviderServer;
-import net.minecraft.world.gen.IChunkGenerator;
 import net.minecraftforge.fml.common.Loader;
+
+import com.llamalad7.mixinextras.sugar.Local;
 import org.dimdev.jeid.ducks.INewChunk;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Mutable;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
-import org.spongepowered.asm.mixin.injection.callback.LocalCapture;
 import rtg.world.biome.BiomeProviderRTG;
 
 @Mixin(ChunkProviderServer.class)
 public class MixinChunkProviderServer {
-
-    @Shadow
-    @Final
-    @Mutable
-    public final IChunkGenerator chunkGenerator;
     @Unique
     private final Biome[] reusableBiomeList = new Biome[256];
     @Shadow
     @Final
     public WorldServer world;
 
-    protected MixinChunkProviderServer(IChunkGenerator chunkGenerator) {
-        this.chunkGenerator = chunkGenerator;
-    }
-
     /**
      * @reason Return an empty biome byte array if the chunk is using an int biome array.
      */
-    @Inject(method = "provideChunk", at = @At(value = "INVOKE_ASSIGN", target = "Lnet/minecraft/world/gen/IChunkGenerator;generateChunk(II)Lnet/minecraft/world/chunk/Chunk;"), locals = LocalCapture.CAPTURE_FAILHARD)
-    private void reid$initializeBiomeArray(int x, int z, CallbackInfoReturnable<Chunk> cir, Chunk chunk) {
+    @Inject(method = "provideChunk", at = @At(value = "INVOKE_ASSIGN", target = "Lnet/minecraft/world/gen/IChunkGenerator;generateChunk(II)Lnet/minecraft/world/chunk/Chunk;"))
+    private void reid$initializeBiomeArray(int x, int z, CallbackInfoReturnable<Chunk> cir, @Local Chunk chunk) {
         if (!Loader.isModLoaded("rtg") || !(world.getBiomeProvider() instanceof BiomeProviderRTG)) {
             Biome[] biomes = world.getBiomeProvider().getBiomes(reusableBiomeList, x * 16, z * 16, 16, 16);
 

src/main/java/org/dimdev/jeid/mixin/modsupport/cubicchunks/MixinCube.java

@@ -18,19 +18,23 @@
 import org.spongepowered.asm.mixin.Overwrite;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.Unique;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
+import java.util.Arrays;
 
 @Mixin(value = Cube.class, remap = false)
 @Implements(@Interface(iface = INewCube.class, prefix = "int$"))
 public abstract class MixinCube {
-    private static final byte ERROR_BIOME_ID = (byte) Biome.REGISTRY.getIDForObject(BiomeError.getInstance());
     @Shadow
     @Final
-    @Nonnull
     private World world;
     @Unique
+    private static final byte ERROR_BIOME_ID = (byte) Biome.REGISTRY.getIDForObject(BiomeError.getInstance());
+    @Unique
     @Nullable
     private int[] intBiomeArray;
 
@@ -54,6 +58,13 @@ public Biome getBiome(BlockPos pos) {
         return Biome.getBiome(biomeId);
     }
 
+    @Inject(method = "getBiomeArray", at = @At(value = "RETURN"), cancellable = true)
+    private void reid$returnErrorBiomeArray(CallbackInfoReturnable<byte[]> cir) {
+        byte[] arr = new byte[256];
+        Arrays.fill(arr, ERROR_BIOME_ID);
+        cir.setReturnValue(arr);
+    }
+
     /**
      * @author Exsolutus
      * @reason Support int biome ids

src/main/java/org/dimdev/jeid/mixin/modsupport/geographicraft/MixinDimensionManager.java

@@ -1,10 +1,10 @@
 package org.dimdev.jeid.mixin.modsupport.geographicraft;
 
-import climateControl.DimensionManager;
-import com.rwtema.extrautils2.biome.BiomeManip;
 import net.minecraft.init.Biomes;
 import net.minecraft.world.biome.Biome;
 import net.minecraft.world.chunk.Chunk;
+
+import climateControl.DimensionManager;
 import org.dimdev.jeid.ducks.INewChunk;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;