Merge branch 'master' into labels

GTNewHorizons · Sep 6, 2024 · df214e9 · df214e9
2 parents 5142342 + 02d4a8b
commit df214e9
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 44 deletions.
diff --git a/dependencies.gradle b/dependencies.gradle
@@ -40,16 +40,16 @@ dependencies {
     api("com.github.GTNewHorizons:NotEnoughIds:2.1.0:dev")
     api("com.github.GTNewHorizons:GTNHLib:0.5.5:dev")
     api("com.github.GTNewHorizons:ModularUI:1.2.2:dev")
-    api("com.github.GTNewHorizons:ModularUI2:2.1.4-1.7.10:dev")
+    api("com.github.GTNewHorizons:ModularUI2:2.1.5-1.7.10:dev")
     api("com.github.GTNewHorizons:waila:1.8.1:dev")
-    api("com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-451-GTNH:dev")
+    api("com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-452-GTNH:dev")
     api("com.github.GTNewHorizons:AE2FluidCraft-Rework:1.3.35-gtnh:dev")
     api('com.github.GTNewHorizons:Yamcl:0.6.0:dev')
     api("com.github.GTNewHorizons:Postea:1.0.9:dev")
 
     compileOnlyApi('com.github.GTNewHorizons:ThaumicTinkerer:2.10.1:dev')
     compileOnlyApi("com.github.GTNewHorizons:Mobs-Info:0.4.6-GTNH:dev")
-    compileOnlyApi("com.github.GTNewHorizons:Navigator:1.0.10:dev")
+    compileOnlyApi("com.github.GTNewHorizons:Navigator:1.0.11:dev")
     implementation('com.github.GTNewHorizons:Baubles:1.0.4:dev') {transitive=false}
     // Required to prevent an older bauble api from Extra Utilities from loading first in the javac classpath
     compileOnly('com.github.GTNewHorizons:Baubles:1.0.4:dev') {transitive=false}
@@ -67,43 +67,43 @@ dependencies {
     implementation("com.github.GTNewHorizons:ForestryMC:4.9.10:dev") { transitive = false }
 
     compileOnlyApi('com.github.GTNewHorizons:Angelica:1.0.0-beta5:api') { transitive = false }
-    compileOnlyApi("com.github.GTNewHorizons:AppleCore:3.3.0:dev") { transitive = false }
+    compileOnlyApi("com.github.GTNewHorizons:AppleCore:3.3.1:dev") { transitive = false }
     compileOnlyApi("com.github.GTNewHorizons:BuildCraft:7.1.39:dev") { transitive = false }
     compileOnlyApi("com.github.GTNewHorizons:EnderIO:2.8.17:dev") { transitive = false }
     compileOnlyApi("com.github.GTNewHorizons:ProjectRed:4.10.2-GTNH:dev") { transitive = false }
-    compileOnlyApi("com.github.GTNewHorizons:Railcraft:9.15.12:dev") { transitive = false }
+    compileOnlyApi("com.github.GTNewHorizons:Railcraft:9.15.14:dev") { transitive = false }
 
     compileOnly("TGregworks:TGregworks:1.7.10-GTNH-1.0.27:deobf") {transitive = false}
     compileOnly("com.github.GTNewHorizons:ThaumicBases:1.7.5:dev") { transitive = false }
     compileOnly("com.github.GTNewHorizons:EnderCore:0.4.6:dev") { transitive = false }
     compileOnly('com.github.GTNewHorizons:VisualProspecting:1.3.13:dev') { transitive = false }
-    compileOnly("com.github.GTNewHorizons:Galaxy-Space-GTNH:1.1.92-GTNH:dev") { transitive = false }
+    compileOnly("com.github.GTNewHorizons:Galaxy-Space-GTNH:1.1.93-GTNH:dev") { transitive = false }
 
     compileOnlyApi("com.github.GTNewHorizons:Galacticraft:3.2.4-GTNH:dev") { transitive = false }
     implementation("com.github.GTNewHorizons:TinkersConstruct:1.12.9-GTNH:dev")
 
     compileOnly("com.github.GTNewHorizons:Chisel:2.15.2-GTNH:dev") { transitive = false }
     compileOnly("com.github.GTNewHorizons:Translocators:1.2.1:dev") { transitive = false }
     compileOnly rfg.deobf("curse.maven:cofh-core-69162:2388751")
-    compileOnly("com.github.GTNewHorizons:Nuclear-Control:2.6.4:dev") { transitive = false }
+    compileOnly("com.github.GTNewHorizons:Nuclear-Control:2.6.7:dev") { transitive = false }
     compileOnly("thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev") { transitive = false }
-    compileOnly("com.github.GTNewHorizons:Hodgepodge:2.5.57:dev") { transitive = false }
+    compileOnly("com.github.GTNewHorizons:Hodgepodge:2.5.60:dev") { transitive = false }
     compileOnly('com.github.GTNewHorizons:Botania:1.11.5-GTNH:dev') { transitive = false }
     compileOnly('com.github.GTNewHorizons:HoloInventory:2.4.12-GTNH:dev') { transitive = false }
     compileOnly rfg.deobf("curse.maven:extra-utilities-225561:2264384")
     compileOnly rfg.deobf('curse.maven:minefactory-reloaded-66672:2366150')
     compileOnly("com.github.GTNewHorizons:OpenComputers:1.10.23-GTNH:dev") {transitive = false}
     // https://www.curseforge.com/minecraft/mc-mods/advancedsolarpanels
     compileOnlyApi rfg.deobf('curse.maven:advsolar-362768:2885953')
-    compileOnly('com.github.GTNewHorizons:ThaumicEnergistics:1.6.22-GTNH:dev') {transitive =  false}
-    compileOnly("com.github.GTNewHorizons:BloodMagic:1.6.3:dev") { transitive = false }
+    compileOnly('com.github.GTNewHorizons:ThaumicEnergistics:1.6.23-GTNH:dev') {transitive =  false}
+    compileOnly("com.github.GTNewHorizons:BloodMagic:1.6.5:dev") { transitive = false }
     compileOnly("com.github.GTNewHorizons:CraftTweaker:3.4.0:dev") { transitive = false }
     compileOnly("com.github.GTNewHorizons:BetterLoadingScreen:1.7.0-GTNH:dev") { transitive = false }
 
     compileOnly('com.github.GTNewHorizons:SC2:2.2.0:dev') {transitive=false}
     compileOnly('com.github.GTNewHorizons:Binnie:2.4.1:dev') {transitive = false}
     compileOnly('curse.maven:PlayerAPI-228969:2248928') {transitive=false}
-    compileOnly('com.github.GTNewHorizons:BlockRenderer6343:1.2.13:dev'){transitive=false}
+    compileOnly('com.github.GTNewHorizons:BlockRenderer6343:1.2.14:dev'){transitive=false}
 
     shadowImplementation('com.github.GTNewHorizons:AVRcore:1.0.1')
 

diff --git a/src/main/java/goodgenerator/loader/FuelRecipeLoader.java b/src/main/java/goodgenerator/loader/FuelRecipeLoader.java
@@ -111,7 +111,7 @@ public static void RegisterFuel() {
                 GGMaterial.orundum.get(OrePrefixes.dust, 64))
             .fluidInputs(
                 GGMaterial.naquadahBasedFuelMkIII.getFluidOrGas(2000),
-                new FluidStack(FluidRegistry.getFluid("molten.hypogen"), 720))
+                new FluidStack(FluidRegistry.getFluid("molten.hypogen"), 240))
             .fluidOutputs(GGMaterial.naquadahBasedFuelMkIV.getFluidOrGas(500))
             .duration(8 * SECONDS)
             .eut(75_000_000)
@@ -129,7 +129,7 @@ public static void RegisterFuel() {
             .fluidInputs(
                 GGMaterial.heavyNaquadahFuel.getFluidOrGas(4000),
                 GGMaterial.lightNaquadahFuel.getFluidOrGas(5000),
-                new FluidStack(FluidRegistry.getFluid("molten.hypogen"), 360),
+                new FluidStack(FluidRegistry.getFluid("molten.hypogen"), 120),
                 new FluidStack(FluidRegistry.getFluid("molten.chromaticglass"), 6480))
             .fluidOutputs(GGMaterial.naquadahBasedFuelMkIV.getFluidOrGas(250))
             .duration(10 * TICKS)

diff --git a/src/main/java/gtPlusPlus/core/recipe/RecipesMachines.java b/src/main/java/gtPlusPlus/core/recipe/RecipesMachines.java
@@ -2874,29 +2874,21 @@ private static void runModRecipes() {
                 CI.getTieredCircuit(5),
                 "plateStaballoy",
                 GregtechItemList.Industrial_Mixer.get(1));
-        }
-
-        if (GTPPCore.ConfigSwitches.enableMultiblock_IndustrialMultiMachine) {
-            ItemStack plate = MaterialsAlloy.STABALLOY.getPlate(1);
 
-            ItemStack o_Compressor = ItemList.Machine_IV_Compressor.get(1);
-            ItemStack o_Lathe = ItemList.Machine_IV_Lathe.get(1);
-            ItemStack o_Electromagnet = ItemList.Machine_IV_Polarizer.get(1);
-            ItemStack o_Fermenter = ItemList.Machine_IV_Fermenter.get(1);
-            ItemStack o_Distillery = ItemList.Machine_IV_FluidExtractor.get(1);
-            ItemStack o_Extractor = ItemList.Machine_IV_Extractor.get(1);
+            final ItemStack staballoyPlate = MaterialsAlloy.STABALLOY.getPlate(1);
 
             RecipeUtils.addShapedRecipe(
-                plate,
+                staballoyPlate,
                 CI.craftingToolHammer_Hard,
-                plate,
+                staballoyPlate,
                 "plateStainlessSteel",
                 "frameGtZirconiumCarbide",
                 "plateStainlessSteel",
-                plate,
+                staballoyPlate,
                 CI.craftingToolWrench,
-                plate,
+                staballoyPlate,
                 GregtechItemList.Casing_Multi_Use.get(1));
+
             GTValues.RA.stdBuilder()
                 .itemInputs(
                     MaterialsAlloy.STABALLOY.getPlate(4),
@@ -2907,18 +2899,6 @@ private static void runModRecipes() {
                 .duration(2 * SECONDS + 10 * TICKS)
                 .eut(16)
                 .addTo(assemblerRecipes);
-
-            RecipeUtils.addShapedRecipe(
-                o_Compressor,
-                o_Lathe,
-                o_Electromagnet,
-                plate,
-                ItemUtils.getSimpleStack(ModBlocks.blockProjectTable),
-                plate,
-                o_Fermenter,
-                o_Distillery,
-                o_Extractor,
-                GregtechItemList.Industrial_MultiMachine.get(1));
         }
 
         // Drilling Platform Casings

diff --git a/.../java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MTEHatchSolidifier.java b/.../java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/MTEHatchSolidifier.java
@@ -39,10 +39,8 @@ public MTEHatchSolidifier(int aID, String aName, String aNameRegional, int aTier
     @Override
     public String[] getDescription() {
         return new String[] {
-            "Fluid Input with Mold for " + EnumChatFormatting.YELLOW
-                + "Large Processing Factory"
-                + EnumChatFormatting.RESET,
-            "#22 Circuit is imprinted in Hatch", "Capacity: " + GTUtility.formatNumbers(getCapacity()) + "L",
+            "Fluid Input with Mold for " + EnumChatFormatting.YELLOW + "Fluid Shaper" + EnumChatFormatting.RESET,
+            "Capacity: " + GTUtility.formatNumbers(getCapacity()) + "L",
             "Added by: " + EnumChatFormatting.AQUA
                 + "Quetz4l"
                 + " - "

diff --git a/...mod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialMultiMachine.java b/...mod/gregtech/common/tileentities/machines/multi/processing/MTEIndustrialMultiMachine.java
@@ -127,6 +127,8 @@ protected MultiblockTooltipBuilder createTooltip() {
         MultiblockTooltipBuilder tt = new MultiblockTooltipBuilder();
         tt.addMachineType(getMachineType())
             .addInfo("Controller Block for the Industrial Multi-Machine")
+            .addInfo(EnumChatFormatting.RED + "DEPRECATED! This machine will be removed in the next major update.")
+            .addInfo(EnumChatFormatting.RED + "A variety of multiblocks have been added to replace these machines!")
             .addInfo("250% faster than using single block machines of the same voltage")
             .addInfo("Only uses 80% of the EU/t normally required")
             .addInfo("Processes two items per voltage tier")

diff --git a/src/main/java/tectech/thing/metaTileEntity/pipe/MTEPipeEnergyMirror.java b/src/main/java/tectech/thing/metaTileEntity/pipe/MTEPipeEnergyMirror.java
@@ -141,8 +141,9 @@ public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) {
     }
 
     public ForgeDirection getBendDirection(ForgeDirection dir) {
+        if (dir == null) return null;
         for (ForgeDirection bendDir : connectedSides) {
-            if (bendDir != dir) {
+            if (bendDir != null && bendDir != dir) {
                 chainedFrontFacing = bendDir.getOpposite();
                 return bendDir;
             }