Merge branch 'release/v1.3.3'

build.gradle

@@ -14,7 +14,7 @@ apply plugin: 'org.spongepowered.mixin'
 
 def buildnumber = System.getenv('TRAVIS_BUILD_NUMBER')
 def suffix = buildnumber != null ? ".$buildnumber" : "-SNAPSHOT"
-version = "1.3.2$suffix"
+version = "1.3.3$suffix"
 group = "uk.bobbytables.jeidsi" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
 archivesBaseName = "jeidsi"
 
@@ -69,6 +69,7 @@ dependencies {
     compileOnly "2710:204:HammerCore-1.12.2-2.0.4.7@jar"
     compileOnly "2733:984:AdvancedRocketry-1.12.2-1.6.0-151-universal@jar"
     compileOnly "2731:147:LibVulpes-1.12.2-0.4.1-59-universal@jar"
+    compileOnly "2724:738:gaiadimension-1.12.2-1.0.5@jar"
 }
 
 mixin {

src/main/java/uk/bobbytables/jeidsi/core/compat/gaiadimension/mixins/MixinGenLayerGDRiverMix.java

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

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

@@ -26,6 +26,7 @@ private void beforeModSupportMixins(List<String> injectedModContainers, Callback
                 "mixins.jeidsi.creepingnether.json",
                 "mixins.jeidsi.cyclopscore.json",
                 "mixins.jeidsi.extrautils2.json",
+                "mixins.jeidsi.gaiadimension.json",
                 "mixins.jeidsi.hammercore.json",
                 "mixins.jeidsi.tofucraft.json",
                 "mixins.jeidsi.thebetweenlands.json",

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

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