Merge branch 'release/1.1.0'

build.gradle

@@ -56,6 +56,8 @@ dependencies {
 
     compileOnly '2691:339:AbyssalCraft-1.12.2-1.9.6@jar'
     compileOnly '2683:823:Bookshelf-1.12.2-2.3.577@jar'
+    compileOnly '2683:667:TheBetweenlands-3.4.6-universal@jar'
+    compileOnly '2636:492:tropicraft-MC1.12.2-7.1.8.105@jar'
     compileOnly "2686:476:twilightforest-1.12.2-3.9.888-universal@jar"
 }
 

src/main/java/uk/bobbytables/jeidsi/compat/thebetweenlands/mixins/MixinBlockSpreadingDeath.java

@@ -0,0 +1,23 @@
+package uk.bobbytables.jeidsi.compat.thebetweenlands.mixins;
+
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.World;
+import net.minecraft.world.biome.Biome;
+import net.minecraft.world.chunk.Chunk;
+import org.dimdev.jeid.INewChunk;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import thebetweenlands.common.block.terrain.BlockSpreadingDeath;
+
+@Mixin(BlockSpreadingDeath.class)
+public class MixinBlockSpreadingDeath {
+    @Inject(method = "convertBiome", at = @At("HEAD"), cancellable = true, remap = false)
+    private void convertBiomes(World world, BlockPos pos, Biome biome, CallbackInfo ci) {
+        Chunk chunk = world.getChunk(pos);
+        ((INewChunk) chunk).getIntBiomeArray()[(pos.getZ() & 15) << 4 | pos.getX() & 15] = Biome.getIdForBiome(biome);
+        chunk.markDirty();
+        ci.cancel();
+    }
+}

src/main/java/uk/bobbytables/jeidsi/compat/thebetweenlands/mixins/MixinGenLayerVoronoiZoomInstanced.java

@@ -0,0 +1,14 @@
+package uk.bobbytables.jeidsi.compat.thebetweenlands.mixins;
+
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.Constant;
+import org.spongepowered.asm.mixin.injection.ModifyConstant;
+import thebetweenlands.common.world.gen.layer.GenLayerVoronoiZoomInstanced;
+
+@Mixin(GenLayerVoronoiZoomInstanced.class)
+public abstract class MixinGenLayerVoronoiZoomInstanced {
+    @ModifyConstant(method = "func_75904_a", constant = @Constant(intValue = 255), remap = false)
+    private int getBitMask(int oldValue) {
+        return 0xFFFFFFFF;
+    }
+}

src/main/java/uk/bobbytables/jeidsi/compat/tropicraft/mixins/MixinGenLayerTropiVoronoiZoom.java

@@ -0,0 +1,14 @@
+package uk.bobbytables.jeidsi.compat.tropicraft.mixins;
+
+import net.tropicraft.core.common.worldgen.genlayer.GenLayerTropiVoronoiZoom;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.Constant;
+import org.spongepowered.asm.mixin.injection.ModifyConstant;
+
+@Mixin(GenLayerTropiVoronoiZoom.class)
+public class MixinGenLayerTropiVoronoiZoom {
+    @ModifyConstant(method = "func_75904_a", constant = @Constant(intValue = 255), remap = false)
+    private int getBitMask(int oldValue) {
+        return 0xFFFFFFFF;
+    }
+}

src/main/java/uk/bobbytables/jeidsi/compat/twilightforest/mixins/MixinGenLayerTFRiverMix.java

@@ -0,0 +1,14 @@
+package uk.bobbytables.jeidsi.compat.twilightforest.mixins;
+
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.Constant;
+import org.spongepowered.asm.mixin.injection.ModifyConstant;
+import twilightforest.world.layer.GenLayerTFRiverMix;
+
+@Mixin(GenLayerTFRiverMix.class)
+public class MixinGenLayerTFRiverMix {
+    @ModifyConstant(method = "func_75904_a", constant = @Constant(intValue = 255), remap = false)
+    private int getBitMask(int oldValue) {
+        return 0xFFFFFFFF;
+    }
+}

src/main/java/uk/bobbytables/jeidsi/init/mixins/MixinLoader.java

@@ -19,6 +19,10 @@ public class MixinLoader {
             remap = false
     )
     private void beforeModSupportMixins(List<String> injectedModContainers, CallbackInfo ci) {
-        Mixins.addConfigurations("mixins.jeidsi.abyssalcraft.json", "mixins.jeidsi.bookshelf.json", "mixins.jeidsi.twilightforest.json");
+        Mixins.addConfiguration("mixins.jeidsi.abyssalcraft.json");
+        Mixins.addConfiguration("mixins.jeidsi.bookshelf.json");
+        Mixins.addConfiguration("mixins.jeidsi.thebetweenlands.json");
+        Mixins.addConfiguration("mixins.jeidsi.tropicraft.json");
+        Mixins.addConfiguration("mixins.jeidsi.twilightforest.json");
     }
 }

src/main/resources/mixins.jeidsi.thebetweenlands.json

@@ -0,0 +1,12 @@
+{
+  "package": "uk.bobbytables.jeidsi.compat.thebetweenlands",
+  "required": true,
+  "refmap": "mixins.jeidsi.refmap.json",
+  "target": "@env(DEFAULT)",
+  "minVersion": "0.6",
+  "compatibilityLevel": "JAVA_8",
+  "mixins": [
+    "mixins.MixinBlockSpreadingDeath",
+    "mixins.MixinGenLayerVoronoiZoomInstanced"
+  ]
+}

src/main/resources/mixins.jeidsi.tropicraft.json

@@ -0,0 +1,11 @@
+{
+  "package": "uk.bobbytables.jeidsi.compat.tropicraft.mixins",
+  "required": true,
+  "refmap": "mixins.jeidsi.refmap.json",
+  "target": "@env(DEFAULT)",
+  "minVersion": "0.6",
+  "compatibilityLevel": "JAVA_8",
+  "mixins": [
+    "MixinGenLayerTropiVoronoiZoom"
+  ]
+}

src/main/resources/mixins.jeidsi.twilightforest.json

@@ -8,6 +8,7 @@
   "compatibilityLevel": "JAVA_8",
   "mixins": [
     "mixins.MixinBlockTFMagicLogSpecialUpdate",
-    "mixins.MixinBlockTFMagicLogSpecial"
+    "mixins.MixinBlockTFMagicLogSpecial",
+    "mixins.MixinGenLayerTFRiverMix"
   ]
 }