HOTFIX: bump version, fix another crash (and a structure issue)

Author: NegaNote

changelog.md

@@ -1,5 +1,3 @@
-# GregTech Modern Utilities version 1.1.1
+# GregTech Modern Utilities version 1.1.2
 
-1.1.0 added PTERB
-
-HOTFIX: prevent crashing when Quantum Coolant is disabled
+HOTFIX: fix yet another PTERB crash, sorry

gradle.properties

@@ -11,7 +11,7 @@ org.gradle.jvmargs=-Xmx1G
     mapping_version=2023.09.03-1.20.1
 
 # Mod Properties
-    mod_version=1.1.1
+    mod_version=1.1.2
     maven_group=net.neganote.gtmutils
     archives_base_name=gtmutils
     mod_id=gtmutils

src/main/java/net/neganote/gtutilities/common/machine/UtilMachines.java

@@ -153,9 +153,7 @@ public static MachineDefinition[] registerTieredMachines(String name,
                             .where('#', air())
                             .where('X',
                                     blocks(CASING_PALLADIUM_SUBSTATION.get())
-                                            .or(PTERBMachine.getEnergyHatchPredicates())
-                                            .or(abilities(PartAbility.IMPORT_FLUIDS_1X)
-                                                    .setExactLimit(UtilConfig.coolantEnabled() ? 1 : 0)))
+                                            .or(PTERBMachine.getHatchPredicates()))
                             .where('H', blocks(HIGH_POWER_CASING.get()))
                             .where('C', controller(blocks(definition.getBlock())))
                             .where('F', frames(GTMaterials.Neutronium))

src/main/java/net/neganote/gtutilities/common/machine/multiblock/PTERBMachine.java

@@ -273,13 +273,20 @@ public void onStructureInvalid() {
         converterSubscription.unsubscribe();
     }
 
-    public static TraceabilityPredicate getEnergyHatchPredicates() {
-        return abilities(PartAbility.INPUT_ENERGY).setPreviewCount(1)
+    public static TraceabilityPredicate getHatchPredicates() {
+        return UtilConfig.coolantEnabled() ? abilities(PartAbility.INPUT_ENERGY).setPreviewCount(1)
                 .or(abilities(PartAbility.OUTPUT_ENERGY).setPreviewCount(2))
                 .or(abilities(PartAbility.SUBSTATION_INPUT_ENERGY).setPreviewCount(1))
                 .or(abilities(PartAbility.SUBSTATION_OUTPUT_ENERGY).setPreviewCount(1))
                 .or(abilities(PartAbility.INPUT_LASER).setPreviewCount(1))
-                .or(abilities(PartAbility.OUTPUT_LASER).setPreviewCount(1));
+                .or(abilities(PartAbility.OUTPUT_LASER).setPreviewCount(1))
+                .or(abilities(PartAbility.IMPORT_FLUIDS).setMinGlobalLimited(1)) :
+                abilities(PartAbility.INPUT_ENERGY).setPreviewCount(1)
+                        .or(abilities(PartAbility.OUTPUT_ENERGY).setPreviewCount(2))
+                        .or(abilities(PartAbility.SUBSTATION_INPUT_ENERGY).setPreviewCount(1))
+                        .or(abilities(PartAbility.SUBSTATION_OUTPUT_ENERGY).setPreviewCount(1))
+                        .or(abilities(PartAbility.INPUT_LASER).setPreviewCount(1))
+                        .or(abilities(PartAbility.OUTPUT_LASER).setPreviewCount(1));
     }
 
     @Override
@@ -326,11 +333,12 @@ public void addDisplayText(@NotNull List<Component> textList) {
                                     FormattingUtil.formatNumbers(
                                             Math.abs(outputTotal))));
                 }
-
-                textList.add(Component
-                        .translatable("gtmutils.multiblock.pterb_machine.coolant_usage",
-                                FormattingUtil.formatNumbers(coolantDrain),
-                                UtilMaterials.QuantumCoolant.getLocalizedName()));
+                if (UtilConfig.coolantEnabled()) {
+                    textList.add(Component
+                            .translatable("gtmutils.multiblock.pterb_machine.coolant_usage",
+                                    FormattingUtil.formatNumbers(coolantDrain),
+                                    UtilMaterials.QuantumCoolant.getLocalizedName()));
+                }
                 if (!ConfigHolder.INSTANCE.machines.harmlessActiveTransformers) {
                     textList.add(Component
                             .translatable("gtceu.multiblock.active_transformer.danger_enabled"));