Bump version to 1.1.5

* Fix various PTERB issues

Author: NegaNote

changelog.md

@@ -1,5 +1,3 @@
-# GregTech Modern Utilities version 1.1.4
+# GregTech Modern Utilities version 1.1.5
 
-* Fix PTERB coolant not being re-enabled if only one of the coolant vars was zero
-* Add more Jade integration, putting the PTERB's coolant drain in the hover info
-* Add tool tags to Omni-breaker, update tooltip
+* Fix various PTERB issues

gradle.properties

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

src/generated/resources/assets/gtmutils/lang/en_ud.json

@@ -38,6 +38,7 @@
   "tooltip.omnibreaker.modern_vajra": "ɐɹظɐΛ uɹǝpoW Ɐ",
   "tooltip.omnibreaker.right_click_function": "¡ʞɔıןɔ-ʇɥbıɹ ɥʇıʍ sʞɔoןq ןɐnpıʌıpuı ʞɐǝɹᗺ",
   "tooltip.pterb_machine.frequencies": "˙ɹǝɯɹoɟsuɐɹ⟘ ǝʌıʇɔⱯ ǝןbuıs ɐ ǝʞıן ʇɔɐ ʎɔuǝnbǝɹɟ ǝɯɐs ǝɥʇ ɥʇıʍ sᗺᴚƎ⟘Ԁ ןןⱯ",
+  "tooltip.pterb_machine.input_coolant_before_use": "¡ʎɔuǝnbǝɹɟ oɹǝz-uou ɐ oʇ ᗺᴚƎ⟘Ԁ ǝɥʇ buıʇʇǝs ǝɹoɟǝq ʇuɐןooɔ ʇnduı sʎɐʍןⱯ",
   "tooltip.pterb_machine.purpose": ")ᗺᴚƎ⟘Ԁ( ɹǝɯɹoɟsuɐɹ⟘ ǝʌıʇɔⱯ ssǝןǝɹıM",
   "tooltip.pterb_machine.uses_coolant": "¡uoıʇɔunɟ oʇ %s suıɐɹᗡ"
 }

src/generated/resources/assets/gtmutils/lang/en_us.json

@@ -38,6 +38,7 @@
   "tooltip.omnibreaker.modern_vajra": "A Modern Vajra",
   "tooltip.omnibreaker.right_click_function": "Break individual blocks with right-click!",
   "tooltip.pterb_machine.frequencies": "All PTERBs with the same frequency act like a single Active Transformer.",
+  "tooltip.pterb_machine.input_coolant_before_use": "Always input coolant before setting the PTERB to a non-zero frequency!",
   "tooltip.pterb_machine.purpose": "Wireless Active Transformer (PTERB)",
   "tooltip.pterb_machine.uses_coolant": "Drains %s to function!"
 }

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

@@ -137,6 +137,8 @@ public static MachineDefinition[] registerTieredMachines(String name,
                                                             .withStyle(ChatFormatting.AQUA) : "")
                                     .withStyle(ChatFormatting.DARK_RED),
                             UtilConfig.coolantEnabled())
+                    .conditionalTooltip(Component.translatable("tooltip.pterb_machine.input_coolant_before_use")
+                            .withStyle(ChatFormatting.DARK_RED), UtilConfig.coolantEnabled())
                     .pattern((definition) -> FactoryBlockPattern.start()
                             // spotless:off
                             .aisle("   XXX   ", "    F    ", "         ", "    H    ", "    H    ", "    H    ", "    H    ", "    H    ")

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

@@ -158,8 +158,13 @@ private int calculateCoolantDrain() {
         }
 
         long scalingFactor = Math.max(inputAmperage * inputVoltage, outputAmperage * outputVoltage);
-        return UtilConfig.INSTANCE.features.pterbCoolantBaseDrain +
+
+        int coolantDrain = UtilConfig.INSTANCE.features.pterbCoolantBaseDrain +
                 (int) (scalingFactor * UtilConfig.INSTANCE.features.pterbCoolantIOMultiplier);
+        if (coolantDrain <= 0) {
+            coolantDrain = 1;
+        }
+        return coolantDrain;
     }
 
     @SuppressWarnings("RedundantIfStatement") // It is cleaner to have the final return true separate.
@@ -180,6 +185,12 @@ public boolean onWorking() {
     @Override
     public void onStructureFormed() {
         super.onStructureFormed();
+
+        if (frequency == 0) {
+            getRecipeLogic().setStatus(RecipeLogic.Status.SUSPEND);
+            return;
+        }
+
         // capture all energy containers
         List<IMultiPart> localPowerInput = new ArrayList<>();
         List<IMultiPart> localPowerOutput = new ArrayList<>();

src/main/java/net/neganote/gtutilities/datagen/lang/UtilLangHandler.java

@@ -20,6 +20,8 @@ public static void init(RegistrateLangProvider provider) {
         provider.add("tooltip.omnibreaker.modern_vajra", "A Modern Vajra");
 
         provider.add("tooltip.pterb_machine.uses_coolant", "Drains %s to function!");
+        provider.add("tooltip.pterb_machine.input_coolant_before_use",
+                "Always input coolant before setting the PTERB to a non-zero frequency!");
 
         provider.add("gtmutils.multiblock.pterb_machine.coolant_usage", "§cDrains %sL of %s per second");
         provider.add("gtmutils.pterb_machine.invalid_frequency", "PTERBs will not work on frequency 0!");