diff --git a/build/main.py b/build/main.py index a2f695e5d..e3db8ba0c 100644 --- a/build/main.py +++ b/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"] diff --git a/groovy/classes/ChangeFlags.groovy b/groovy/classes/ChangeFlags.groovy index 41cb751ba..4864fe4fa 100644 --- a/groovy/classes/ChangeFlags.groovy +++ b/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)); diff --git a/groovy/postInit/chemistry/organic_chemistry/petrochemistry/Fuels.groovy b/groovy/postInit/chemistry/organic_chemistry/petrochemistry/Fuels.groovy index 19f6f4e2f..1f23f2354 100755 --- a/groovy/postInit/chemistry/organic_chemistry/petrochemistry/Fuels.groovy +++ b/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 diff --git a/groovy/postInit/gameplay/StartingAge.groovy b/groovy/postInit/gameplay/StartingAge.groovy index 64bbe8875..d7cf1af9a 100644 --- a/groovy/postInit/gameplay/StartingAge.groovy +++ b/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", diff --git a/groovy/postInit/metallurgy/OreSorting.groovy b/groovy/postInit/metallurgy/OreSorting.groovy index 2e28257cb..e3835b9ac 100644 --- a/groovy/postInit/metallurgy/OreSorting.groovy +++ b/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; diff --git a/groovy/postInit/mod/GregTech.groovy b/groovy/postInit/mod/GregTech.groovy index 8706e4e6d..5dfbcb51f 100644 --- a/groovy/postInit/mod/GregTech.groovy +++ b/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 diff --git a/groovy/postInit/mod/ImmersiveRailroading.groovy b/groovy/postInit/mod/ImmersiveRailroading.groovy index 215b85920..396d64f91 100755 --- a/groovy/postInit/mod/ImmersiveRailroading.groovy +++ b/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; diff --git a/groovy/postInit/mod/Radiation.groovy b/groovy/postInit/mod/Radiation.groovy index b1ab661ce..ce252aaaa 100644 --- a/groovy/postInit/mod/Radiation.groovy +++ b/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); diff --git a/groovy/preInit/MaterialChanges.groovy b/groovy/preInit/MaterialChanges.groovy index c867e640d..6ce18023c 100644 --- a/groovy/preInit/MaterialChanges.groovy +++ b/groovy/preInit/MaterialChanges.groovy @@ -1,3 +1,5 @@ +package preInit; + import net.minecraftforge.fml.common.eventhandler.EventPriority import gregtech.api.unification.material.event.MaterialEvent; diff --git a/groovy/preInit/RegisterElements.groovy b/groovy/preInit/RegisterElements.groovy index 7126df6e1..516590165 100644 --- a/groovy/preInit/RegisterElements.groovy +++ b/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") } */ \ No newline at end of file diff --git a/groovy/preInit/RegisterIsotopes.groovy b/groovy/preInit/RegisterIsotopes.groovy index 61ff45658..f623b0f78 100644 --- a/groovy/preInit/RegisterIsotopes.groovy +++ b/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") } */ \ No newline at end of file diff --git a/groovy/preInit/RegisterMetaItems.groovy b/groovy/preInit/RegisterMetaItems.groovy index 788696980..7d266546d 100644 --- a/groovy/preInit/RegisterMetaItems.groovy +++ b/groovy/preInit/RegisterMetaItems.groovy @@ -1,3 +1,5 @@ +package preInit; + import gregtech.api.GTValues; import gregtech.api.GregTechAPI; import gregtech.api.items.metaitem.*; diff --git a/groovy/prePostInit/ModifyRecipeMaps.groovy b/groovy/prePostInit/ModifyRecipeMaps.groovy index 31ab514a7..484139dd9 100755 --- a/groovy/prePostInit/ModifyRecipeMaps.groovy +++ b/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; diff --git a/groovy/prePostInit/Thermodynamics.groovy b/groovy/prePostInit/Thermodynamics.groovy index 4cccc4ce4..7dd012b5b 100755 --- a/groovy/prePostInit/Thermodynamics.groovy +++ b/groovy/prePostInit/Thermodynamics.groovy @@ -1,3 +1,5 @@ +package prePostInit; + import classes.*; import globals.Globals; diff --git a/groovy/prePostInit/oreDict.groovy b/groovy/prePostInit/oreDict.groovy index af375557a..87c824555 100644 --- a/groovy/prePostInit/oreDict.groovy +++ b/groovy/prePostInit/oreDict.groovy @@ -1,3 +1,5 @@ +package prePostInit; + import static globals.Globals.* import supersymmetry.common.blocks.SuSyBlocks diff --git a/manifest.json b/manifest.json index 1e2311639..f42174d2f 100644 --- a/manifest.json +++ b/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 }, { diff --git a/resources/gregtech/models/item/metaitems/tubemagnesiumdiboride.json b/resources/gregtech/models/item/metaitems/tubemagnesiumdiboride.json index ff0d8738e..8bddc971a 100644 --- a/resources/gregtech/models/item/metaitems/tubemagnesiumdiboride.json +++ b/resources/gregtech/models/item/metaitems/tubemagnesiumdiboride.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "gregtech:items/metaitems/tubemagnesiumdiboride" - } - } \ No newline at end of file + "parent": "gregtech:item/metaitems/pipelike_4x4", + "textures": { + "all": "gregtech:items/metaitems/tubemagnesiumdiboride" + } +} \ No newline at end of file diff --git a/resources/gregtech/models/item/metaitems/tubemercurybariumcalciumcuprate.json b/resources/gregtech/models/item/metaitems/tubemercurybariumcalciumcuprate.json index b0adc08b7..f5baa114c 100644 --- a/resources/gregtech/models/item/metaitems/tubemercurybariumcalciumcuprate.json +++ b/resources/gregtech/models/item/metaitems/tubemercurybariumcalciumcuprate.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "gregtech:items/metaitems/tubemercurybariumcalciumcuprate" - } - } \ No newline at end of file + "parent": "gregtech:item/metaitems/pipelike_4x4", + "textures": { + "all": "gregtech:items/metaitems/tubemercurybariumcalciumcuprate" + } +} \ No newline at end of file diff --git a/resources/gregtech/models/item/metaitems/tubesamariumironarsenicoxide.json b/resources/gregtech/models/item/metaitems/tubesamariumironarsenicoxide.json index 993e4fc9d..9199a5e39 100644 --- a/resources/gregtech/models/item/metaitems/tubesamariumironarsenicoxide.json +++ b/resources/gregtech/models/item/metaitems/tubesamariumironarsenicoxide.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "gregtech:items/metaitems/tubesamariumironarsenicoxide" - } - } \ No newline at end of file + "parent": "gregtech:item/metaitems/pipelike_4x4", + "textures": { + "all": "gregtech:items/metaitems/tubesamariumironarsenicoxide" + } +} \ No newline at end of file diff --git a/resources/gregtech/textures/items/metaitems/tubemagnesiumdiboride.png b/resources/gregtech/textures/items/metaitems/tubemagnesiumdiboride.png index faae87047..d9325c5fa 100644 Binary files a/resources/gregtech/textures/items/metaitems/tubemagnesiumdiboride.png and b/resources/gregtech/textures/items/metaitems/tubemagnesiumdiboride.png differ diff --git a/resources/gregtech/textures/items/metaitems/tubemercurybariumcalciumcuprate.png b/resources/gregtech/textures/items/metaitems/tubemercurybariumcalciumcuprate.png index af87f0799..53b3a71b4 100644 Binary files a/resources/gregtech/textures/items/metaitems/tubemercurybariumcalciumcuprate.png and b/resources/gregtech/textures/items/metaitems/tubemercurybariumcalciumcuprate.png differ diff --git a/resources/gregtech/textures/items/metaitems/tubesamariumironarsenicoxide.png b/resources/gregtech/textures/items/metaitems/tubesamariumironarsenicoxide.png index c328c3383..589ffc74e 100644 Binary files a/resources/gregtech/textures/items/metaitems/tubesamariumironarsenicoxide.png and b/resources/gregtech/textures/items/metaitems/tubesamariumironarsenicoxide.png differ