Merge pull request #900 from MCTian-mi/1.12.7b-Miscellaneous-fixex

1.12.7b miscellaneous fixes

build/main.py

@@ -47,7 +47,7 @@ def build(args):
     modlist = []
     basePath = os.path.normpath(os.path.realpath(__file__)[:-7] + "..")
     copyDirs = ["/scripts", "/resources", "/config",
-                "/mods", "/structures", "/groovy", "/simple-rpc", "/resourcepacks"]
+                "/structures", "/groovy", "/simple-rpc", "/resourcepacks"]
     serverCopyDirs = ["/scripts", "/config", "/mods",
                       "/structures", "/groovy", "/resourcepacks"]
 

groovy/classes/ChangeFlags.groovy

@@ -1,3 +1,5 @@
+package classes
+
 import net.minecraftforge.fml.common.eventhandler.EventPriority
 
 import gregtech.api.unification.material.Material;
@@ -29,41 +31,34 @@ import supersymmetry.api.unification.material.properties.FiberProperty;
 class ChangeFlags {
 	private static void setupSlurries(Material mat) {
 		def property = new FluidProperty()
-		property.getStorage().enqueueRegistration(SusyFluidStorageKeys.SLURRY, new FluidBuilder())
-		property.getStorage().enqueueRegistration(SusyFluidStorageKeys.IMPURE_SLURRY, new FluidBuilder())
+		property.enqueueRegistration(SusyFluidStorageKeys.SLURRY, new FluidBuilder())
+		property.enqueueRegistration(SusyFluidStorageKeys.IMPURE_SLURRY, new FluidBuilder())
 
-		property.getStorage().enqueueRegistration(FluidStorageKeys.LIQUID, new FluidBuilder())
 		mat.setProperty(PropertyKey.FLUID, property)
 	}
 
 	private static void setupFluidType(Material mat, FluidStorageKey key, int temp) {
         if (mat.getProperty(PropertyKey.FLUID) == null) {
             def property = new FluidProperty();
-		    property.getStorage().enqueueRegistration(key, new FluidBuilder().temperature(temp))
+		    property.enqueueRegistration(key, new FluidBuilder().temperature(temp))
 		    mat.setProperty(PropertyKey.FLUID, property)
         } else {
             def property = mat.getProperty(PropertyKey.FLUID)
-            if (property.getStorage().getQueuedBuilder(key) != null) {
-                property.getStorage().getQueuedBuilder(key).temperature(temp)
+            if (property.getQueuedBuilder(key) != null) {
+                property.getQueuedBuilder(key).temperature(temp)
             } else {
-                property.getStorage().enqueueRegistration(key, new FluidBuilder().temperature(temp))
+                property.enqueueRegistration(key, new FluidBuilder().temperature(temp))
             }
         }
-        if (mat.getProperty(PropertyKey.FLUID).getStorage().getQueuedBuilder(FluidStorageKeys.LIQUID) == null) {
-            setupFluidType(mat, FluidStorageKeys.LIQUID, temp)
-        }
 	}
 	private static void setupFluidType(Material mat, FluidStorageKey key) {
         if (mat.getProperty(PropertyKey.FLUID) == null) {
             def property = new FluidProperty();
-		    property.getStorage().enqueueRegistration(key, new FluidBuilder())
+		    property.enqueueRegistration(key, new FluidBuilder())
 		    mat.setProperty(PropertyKey.FLUID, property)
         } else {
             def property = mat.getProperty(PropertyKey.FLUID)
-		    property.getStorage().enqueueRegistration(key, new FluidBuilder())
-        }
-        if (mat.getProperty(PropertyKey.FLUID).getStorage().getQueuedBuilder(FluidStorageKeys.LIQUID) == null) {
-            setupFluidType(mat, FluidStorageKeys.LIQUID)
+		    property.enqueueRegistration(key, new FluidBuilder())
         }
 	}
 
@@ -100,7 +95,7 @@ class ChangeFlags {
 
         Polybenzimidazole.setProperty(SuSyPropertyKey.FIBER, new FiberProperty(false, true, true))
         Polytetrafluoroethylene.setProperty(SuSyPropertyKey.FIBER, new FiberProperty(false, true, false))
-        Polydimethylsiloxane.setProperty(PropertyKey.FLUID, new FluidProperty());
+        Polydimethylsiloxane.setProperty(PropertyKey.FLUID, new FluidProperty(FluidStorageKeys.LIQUID, new FluidBuilder()));
 
         Tantalum.setProperty(PropertyKey.BLAST, new BlastProperty(3293, GasTier.MID, 480, 240, -1, -1));
         Molybdenum.setProperty(PropertyKey.BLAST, new BlastProperty(2890, GasTier.MID, 480, 240, -1, -1));

groovy/postInit/chemistry/organic_chemistry/petrochemistry/Fuels.groovy

@@ -593,7 +593,7 @@ for (pair in oxygenatePairs) {
         .buildAndRegister()
 }
 
-println("Registered oxygenate pairs")
+log.infoMC("Registered oxygenate pairs")
 
 // Gasoline final blending
 

groovy/postInit/gameplay/StartingAge.groovy

@@ -6,7 +6,7 @@ import appeng.api.features.IGrinderRecipeBuilder;
 
 final IGrinderRegistry reg = AEApi.instance().registries().grinder();
 
-println("Running StartingAge.groovy...")
+log.infoMC("Running StartingAge.groovy...")
 
 def name_removals = [
         "notreepunching:tools/iron_saw",

groovy/postInit/metallurgy/OreSorting.groovy

@@ -1,7 +1,7 @@
 import classes.*
 import globals.Globals
 
-println("Running OreSorting.groovy...")
+log.infoMC("Running OreSorting.groovy...")
 
 int fluid_amount = 100;
 

groovy/postInit/mod/GregTech.groovy

@@ -16,7 +16,7 @@ import supersymmetry.api.capability.impl.PseudoMultiRecipeLogic;
 import supersymmetry.api.recipes.builders.PseudoMultiRecipeBuilder;
 import net.minecraft.init.Blocks;
 
-println("Running GregTech.groovy...")
+log.infoMC("Running GregTech.groovy...")
 
 //REMOVALS
 

groovy/postInit/mod/ImmersiveRailroading.groovy

@@ -1,4 +1,4 @@
-println("Running ImmersiveRailroading.groovy...")
+log.infoMC("Running ImmersiveRailroading.groovy...")
 
 import globals.Globals
 import supersymmetry.api.recipes.SuSyRecipeMaps;

groovy/postInit/mod/Radiation.groovy

@@ -1,7 +1,7 @@
 /*
 import nc.radiation.RadSources;
 
-println("Running Radiation.groovy...")
+log.infoMC("Running Radiation.groovy...")
 
 private void addRadiationToDusts (String materialName, double baseRadiation){
     RadSources.addToStackMap(metaitem("dust" + materialName), baseRadiation);

groovy/preInit/MaterialChanges.groovy

@@ -1,3 +1,5 @@
+package preInit;
+
 import net.minecraftforge.fml.common.eventhandler.EventPriority
 import gregtech.api.unification.material.event.MaterialEvent;
 

groovy/preInit/RegisterElements.groovy

@@ -1,3 +1,5 @@
+package preInit;
+
 import gregtech.api.unification.material.Material;
 import gregtech.api.unification.material.event.MaterialEvent;
 
@@ -11,8 +13,8 @@ import static gregtech.api.unification.material.Materials.*;
 eventManager.listen {
     MaterialEvent event ->
 
-        println("Running RegisterElements.groovy...")
-        println("Groovy starting modifying isotopes")
+        log.infoMC("Running RegisterElements.groovy...")
+        log.infoMC("Groovy starting modifying isotopes")
 
         def mystery = new Material.Builder(32000, "mystery")
                 .dust()
@@ -22,6 +24,6 @@ eventManager.listen {
         mystery.setFormula("?", false);
         
 
-        println("Groovy finished modifying isotopes")
+        log.infoMC("Groovy finished modifying isotopes")
 }
 */

groovy/preInit/RegisterIsotopes.groovy

@@ -1,4 +1,6 @@
 /*
+package preInit;
+
 import gregtech.api.unification.material.Material;
 import gregtech.api.unification.Element;
 import static gregtech.api.unification.material.info.MaterialIconSet.*;
@@ -40,9 +42,9 @@ private void addNuclearFuelMaterials (Material materialName, int startingInt) {
 eventManager.listen {
     MaterialEvent event ->
 
-        println("Running RegisterIsotopes.groovy...")
+        log.infoMC("Running RegisterIsotopes.groovy...")
 
-        println("Groovy starting modifying elements")
+        log.infoMC("Groovy starting modifying elements")
 
         def Tc_99 = new Element(43, 55, -1, null, "Technetium-99", "Tc-99", true);
 
@@ -543,6 +545,6 @@ eventManager.listen {
                 .color(0xa8a432)
                 .build();
 
-        println("Groovy finished modifying elements")
+        log.infoMC("Groovy finished modifying elements")
 }
 */

groovy/preInit/RegisterMetaItems.groovy

@@ -1,3 +1,5 @@
+package preInit;
+
 import gregtech.api.GTValues;
 import gregtech.api.GregTechAPI;
 import gregtech.api.items.metaitem.*;

groovy/prePostInit/ModifyRecipeMaps.groovy

@@ -1,3 +1,5 @@
+package prePostInit;
+
 import gregtech.api.recipes.RecipeMaps;
 import gregtech.api.recipes.GTRecipeHandler;
 import gregtech.api.recipes.ingredients.GTRecipeInput;

groovy/prePostInit/Thermodynamics.groovy

@@ -1,3 +1,5 @@
+package prePostInit;
+
 import classes.*;
 import globals.Globals;
 

groovy/prePostInit/oreDict.groovy

@@ -1,3 +1,5 @@
+package prePostInit;
+
 import static globals.Globals.*
 
 import supersymmetry.common.blocks.SuSyBlocks

manifest.json

@@ -11,7 +11,7 @@
   "manifestType": "minecraftModpack",
   "manifestVersion": 1,
   "name": "Supersymmetry",
-  "version": "0.1.12.8",
+  "version": "0.1.12.9",
   "author": "SymmetricDevs",
   "externalDeps": [],
   "files": [
@@ -157,7 +157,7 @@
     },
     {
       "projectID": 557242,
-      "fileID": 5322654,
+      "fileID": 5506419,
       "required": true
     },
     {
@@ -262,7 +262,7 @@
     },
     {
       "projectID": 629629,
-      "fileID": 5183601,
+      "fileID": 5487266,
       "required": true
     },
     {
@@ -427,7 +427,7 @@
     },
     {
       "projectID": 846224,
-      "fileID": 5502106,
+      "fileID": 5508213,
       "required": true
     },
     {
@@ -592,7 +592,7 @@
     },
     {
       "projectID": 564858,
-      "fileID": 5121714,
+      "fileID": 5508050,
       "required": true
     },
     {
@@ -777,8 +777,13 @@
       "required": true
     },
     {
-      "projectID": 620262,
-      "fileID": 4724647,
+      "projectID": 910715,
+      "fileID": 5229610,
+      "required": true
+    },
+    {
+      "projectID": 873867,
+      "fileID": 5403908,
       "required": true
     },
     {
@@ -813,7 +818,7 @@
     },
     {
       "projectID": 687577,
-      "fileID": 5219945,
+      "fileID": 5507936,
       "required": true
     },
     {

resources/gregtech/models/item/metaitems/tubemagnesiumdiboride.json

@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-      "layer0": "gregtech:items/metaitems/tubemagnesiumdiboride"
-    }
-  }
+  "parent": "gregtech:item/metaitems/pipelike_4x4",
+  "textures": {
+    "all": "gregtech:items/metaitems/tubemagnesiumdiboride"
+  }
+}

resources/gregtech/models/item/metaitems/tubemercurybariumcalciumcuprate.json

@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-      "layer0": "gregtech:items/metaitems/tubemercurybariumcalciumcuprate"
-    }
-  }
+  "parent": "gregtech:item/metaitems/pipelike_4x4",
+  "textures": {
+    "all": "gregtech:items/metaitems/tubemercurybariumcalciumcuprate"
+  }
+}

resources/gregtech/models/item/metaitems/tubesamariumironarsenicoxide.json

@@ -1,6 +1,6 @@
 {
-    "parent": "item/generated",
-    "textures": {
-      "layer0": "gregtech:items/metaitems/tubesamariumironarsenicoxide"
-    }
-  }
+  "parent": "gregtech:item/metaitems/pipelike_4x4",
+  "textures": {
+    "all": "gregtech:items/metaitems/tubesamariumironarsenicoxide"
+  }
+}