update to 9.12.2

build.gradle

@@ -6,8 +6,9 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT'
-        //classpath 'net.minecraftforge.gradle:ForgeGradle:4.1.14'
+        classpath("com.anatawa12.forge:ForgeGradle:2.3-1.0.+") {
+            changing = true
+        }
     }
 }
 

gradle.properties

@@ -1,7 +1,7 @@
 minecraft_version=1.12.2
 mappings_version=stable_39
 forge_version=14.23.5.2847
-mod_version=9.12.1
+mod_version=9.12.2
 
 mcmp_version=2.5.3
 jei_version=4.15.0.289

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,5 @@
-#Wed Jul 24 15:50:21 EDT 2019
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.3-all.zip
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists

gradlew

@@ -1,5 +1,21 @@
 #!/usr/bin/env sh
 
+#
+# Copyright 2015 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 ##############################################################################
 ##
 ##  Gradle start up script for UN*X
@@ -28,7 +44,7 @@ APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
@@ -109,8 +125,8 @@ if $darwin; then
     GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
 fi
 
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
     JAVACMD=`cygpath --unix "$JAVACMD"`

gradlew.bat

@@ -1,3 +1,19 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
 @if "%DEBUG%" == "" @echo off
 @rem ##########################################################################
 @rem
@@ -14,7 +30,7 @@ set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome

src/main/java/mekanism/common/BoxBlacklistParser.java

@@ -12,7 +12,7 @@
 public final class BoxBlacklistParser {
 
     private static File mekanismDir = new File(Mekanism.proxy.getMinecraftDir(), "config/mekanism");
-    private static File boxBlacklistFile = new File(mekanismDir, "BoxBlacklist.txt");
+    private static File boxBlacklistFile = new File(mekanismDir, "MekanismCardboardBoxBlacklist");
 
     private BoxBlacklistParser() {
     }

src/main/java/mekanism/common/Mekanism.java

@@ -218,9 +218,12 @@ public class Mekanism {
      */
     public static MekanismHooks hooks = new MekanismHooks();
     /**
-     * Mekanism configuration instance
+     * Mekanism configuration instances
      */
     public static Configuration configuration;
+    public static Configuration configurationgenerators;
+    public static Configuration configurationtools;
+    public static Configuration configurationrecipes;
     /**
      * Mekanism version number
      */
@@ -781,10 +784,10 @@ public void preInit(FMLPreInitializationEvent event) {
             }
         }
 
-        File config = event.getSuggestedConfigurationFile();
-
         //Set the mod's configuration
-        configuration = new Configuration(config);
+        configuration = new Configuration(new File("config/mekanism/Mekanism.cfg"));
+        configurationgenerators = new Configuration(new File("config/mekanism/MekanismGenerators.cfg"));
+        configurationtools = new Configuration(new File("config/mekanism/MekanismTools.cfg"));
 
         //Load configuration
         proxy.loadConfiguration();

src/main/java/mekanism/common/tile/TileEntityChemicalCrystallizer.java

@@ -162,7 +162,18 @@ public boolean canReceiveGas(EnumFacing side, Gas type) {
     @Override
     public int receiveGas(EnumFacing side, GasStack stack, boolean doTransfer) {
         if (canReceiveGas(side, stack.getGas())) {
-            return inputTank.receive(stack, doTransfer);
+            if (stack == null) {
+                return 0;
+            }
+
+            int recipeAmount = Recipe.CHEMICAL_CRYSTALLIZER.get().get(new GasInput(stack)).recipeInput.ingredient.amount;
+            int receivable = inputTank.receive(stack, false);
+            int stored = inputTank.stored != null ? inputTank.stored.amount : 0;
+            int newStored = stored + receivable;
+
+            int amount = newStored - stored - newStored % recipeAmount;
+
+            return inputTank.receive(stack.copy().withAmount(amount), doTransfer);
         }
         return 0;
     }

src/main/java/mekanism/generators/common/GeneratorsCommonProxy.java

@@ -101,10 +101,10 @@ public void preInit() {
      * Set and load the mod's common configuration properties.
      */
     public void loadConfiguration() {
-        MekanismConfig.local().generators.load(Mekanism.configuration);
+        MekanismConfig.local().generators.load(Mekanism.configurationgenerators);
         setGasGeneratorMaxEnergy();
-        if (Mekanism.configuration.hasChanged()) {
-            Mekanism.configuration.save();
+        if (Mekanism.configurationgenerators.hasChanged()) {
+            Mekanism.configurationgenerators.save();
         }
     }
 

src/main/java/mekanism/tools/common/ToolsCommonProxy.java

@@ -9,9 +9,9 @@ public class ToolsCommonProxy {
      * Set and load the mod's common configuration properties.
      */
     public void loadConfiguration() {
-        MekanismConfig.current().tools.load(Mekanism.configuration);
-        if (Mekanism.configuration.hasChanged()) {
-            Mekanism.configuration.save();
+        MekanismConfig.current().tools.load(Mekanism.configurationtools);
+        if (Mekanism.configurationtools.hasChanged()) {
+            Mekanism.configurationtools.save();
         }
     }