Bump version to 1.1.4

* 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

Author: NegaNote

changelog.md

@@ -1,3 +1,5 @@
-# GregTech Modern Utilities version 1.1.3
+# GregTech Modern Utilities version 1.1.4
 
-Fix Omni-breaker not looking right in third person
+* 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

gradle.properties

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

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

@@ -25,7 +25,7 @@
   "config.gtmutils.option.pterbCoolantIOMultiplier": "ɹǝıןdıʇןnWOIʇuɐןooƆqɹǝʇd",
   "config.gtmutils.option.pterbEnabled": "pǝןqɐuƎqɹǝʇd",
   "config.gtmutils.option.sterileHatchEnabled": "pǝןqɐuƎɥɔʇɐHǝןıɹǝʇs",
-  "config.jade.plugin_gtmutils.frequency_info": "oɟuI ʎɔuǝnbǝɹℲ ᗺᴚƎ⟘Ԁ",
+  "config.jade.plugin_gtmutils.pterb_info": "oɟuI ᗺᴚƎ⟘Ԁ",
   "gtmutils.gui.pterb.wireless_configurator.title": "ʎɔuǝnbǝɹɟ ssǝןǝɹıM",
   "gtmutils.multiblock.pterb_machine.coolant_usage": "puoɔǝs ɹǝd %s ɟo Ꞁ%s suıɐɹᗡɔ§",
   "gtmutils.pterb.current_frequency": "%s :ʎɔuǝnbǝɹɟ ʇuǝɹɹnƆ",
@@ -35,6 +35,7 @@
   "material.gtmutils.quantum_coolant": "ʇuɐןooƆ ɯnʇuɐnὉ",
   "tooltip.omnibreaker.can_break_anything": "¡⅁NIH⟘ʎNⱯ ǝuıɯ-ɐʇsuı uɐɔ ɹǝʞɐǝɹq-ıuɯO ǝɥ⟘",
   "tooltip.omnibreaker.charge_status": "∩Ǝ %s / ∩Ǝ %s :ʎbɹǝuƎ",
+  "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.purpose": ")ᗺᴚƎ⟘Ԁ( ɹǝɯɹoɟsuɐɹ⟘ ǝʌıʇɔⱯ ssǝןǝɹıM",

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

@@ -25,7 +25,7 @@
   "config.gtmutils.option.pterbCoolantIOMultiplier": "pterbCoolantIOMultiplier",
   "config.gtmutils.option.pterbEnabled": "pterbEnabled",
   "config.gtmutils.option.sterileHatchEnabled": "sterileHatchEnabled",
-  "config.jade.plugin_gtmutils.frequency_info": "PTERB Frequency Info",
+  "config.jade.plugin_gtmutils.pterb_info": "PTERB Info",
   "gtmutils.gui.pterb.wireless_configurator.title": "Wireless frequency",
   "gtmutils.multiblock.pterb_machine.coolant_usage": "§cDrains %sL of %s per second",
   "gtmutils.pterb.current_frequency": "Current frequency: %s",
@@ -35,6 +35,7 @@
   "material.gtmutils.quantum_coolant": "Quantum Coolant",
   "tooltip.omnibreaker.can_break_anything": "The Omni-breaker can insta-mine ANYTHING!",
   "tooltip.omnibreaker.charge_status": "Energy: %s EU / %s EU",
+  "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.purpose": "Wireless Active Transformer (PTERB)",

src/main/java/net/neganote/gtutilities/common/item/OmniBreakerItem.java

@@ -84,6 +84,7 @@ public void appendHoverText(@NotNull ItemStack stack, @Nullable Level level,
         tooltipComponents.add(Component.translatable("tooltip.omnibreaker.charge_status",
                 Component.translatable(FormattingUtil.formatNumbers(charge)).withStyle(ChatFormatting.GREEN),
                 Component.translatable(FormattingUtil.formatNumbers(maxCharge)).withStyle(ChatFormatting.YELLOW)));
+        tooltipComponents.add(Component.translatable("tooltip.omnibreaker.modern_vajra"));
         tooltipComponents
                 .add(Component.translatable("tooltip.omnibreaker.can_break_anything").withStyle(ChatFormatting.GRAY));
         tooltipComponents

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

@@ -72,7 +72,8 @@ public class PTERBMachine extends WorkableElectricMultiblockMachine
     @DescSynced
     private BlockPos coolantHatchPos;
 
-    private long coolantDrain;
+    @Getter
+    private int coolantDrain;
 
     @Persisted
     @DescSynced
@@ -108,7 +109,7 @@ public void convertEnergyTick() {
             FluidStack coolant = coolantHatch.tank.getFluidInTank(0);
             if (coolant.getFluid() == UtilMaterials.QuantumCoolant.getFluid() && coolant.getAmount() >= coolantDrain) {
                 coolantHatch.tank.handleRecipe(IO.IN, null,
-                        List.of(FluidIngredient.of((int) coolantDrain, UtilMaterials.QuantumCoolant.getFluid())), null,
+                        List.of(FluidIngredient.of(coolantDrain, UtilMaterials.QuantumCoolant.getFluid())), null,
                         false);
             } else {
                 if (!ConfigHolder.INSTANCE.machines.harmlessActiveTransformers) {
@@ -138,7 +139,7 @@ public void convertEnergyTick() {
         converterSubscription.updateSubscription();
     }
 
-    private long calculateCoolantDrain() {
+    private int calculateCoolantDrain() {
         long inputAmperage = 0;
         long inputVoltage = 0;
         long outputAmperage = 0;
@@ -158,7 +159,7 @@ private long calculateCoolantDrain() {
 
         long scalingFactor = Math.max(inputAmperage * inputVoltage, outputAmperage * outputVoltage);
         return UtilConfig.INSTANCE.features.pterbCoolantBaseDrain +
-                (long) (scalingFactor * UtilConfig.INSTANCE.features.pterbCoolantIOMultiplier);
+                (int) (scalingFactor * UtilConfig.INSTANCE.features.pterbCoolantIOMultiplier);
     }
 
     @SuppressWarnings("RedundantIfStatement") // It is cleaner to have the final return true separate.
@@ -280,7 +281,7 @@ public static TraceabilityPredicate getHatchPredicates() {
                 .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.IMPORT_FLUIDS).setMinGlobalLimited(1)) :
+                .or(abilities(PartAbility.IMPORT_FLUIDS).setExactLimit(1)) :
                 abilities(PartAbility.INPUT_ENERGY).setPreviewCount(1)
                         .or(abilities(PartAbility.OUTPUT_ENERGY).setPreviewCount(2))
                         .or(abilities(PartAbility.SUBSTATION_INPUT_ENERGY).setPreviewCount(1))

src/main/java/net/neganote/gtutilities/config/UtilConfig.java

@@ -60,7 +60,7 @@ public static class FeatureConfigs {
     }
 
     public static boolean coolantEnabled() {
-        return UtilConfig.INSTANCE.features.pterbCoolantBaseDrain != 0 &&
+        return UtilConfig.INSTANCE.features.pterbCoolantBaseDrain != 0 ||
                 UtilConfig.INSTANCE.features.pterbCoolantIOMultiplier != 0.0f;
     }
 }

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

@@ -17,6 +17,7 @@ public static void init(RegistrateLangProvider provider) {
         provider.add("tooltip.omnibreaker.can_break_anything", "The Omni-breaker can insta-mine ANYTHING!");
         provider.add("tooltip.omnibreaker.charge_status", "Energy: %s EU / %s EU");
         provider.add("tooltip.omnibreaker.right_click_function", "Break individual blocks with right-click!");
+        provider.add("tooltip.omnibreaker.modern_vajra", "A Modern Vajra");
 
         provider.add("tooltip.pterb_machine.uses_coolant", "Drains %s to function!");
 
@@ -30,7 +31,7 @@ public static void init(RegistrateLangProvider provider) {
                 "All PTERBs with the same frequency act like a single Active Transformer.");
         provider.add("gtmutils.pterb.current_frequency", "Current frequency: %s");
 
-        provider.add("config.jade.plugin_gtmutils.frequency_info", "PTERB Frequency Info");
+        provider.add("config.jade.plugin_gtmutils.pterb_info", "PTERB Info");
 
         dfs(provider, new HashSet<>(), UtilConfig.CONFIG_HOLDER.getValueMap());
     }

src/main/java/net/neganote/gtutilities/integration/jade/UtilJadePlugin.java

@@ -2,7 +2,7 @@
 
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.entity.BlockEntity;
-import net.neganote.gtutilities.integration.jade.provider.PTERBFrequencyProvider;
+import net.neganote.gtutilities.integration.jade.provider.PTERBInformationProvider;
 
 import snownee.jade.api.IWailaClientRegistration;
 import snownee.jade.api.IWailaCommonRegistration;
@@ -15,11 +15,11 @@ public class UtilJadePlugin implements IWailaPlugin {
 
     @Override
     public void register(IWailaCommonRegistration registration) {
-        registration.registerBlockDataProvider(new PTERBFrequencyProvider(), BlockEntity.class);
+        registration.registerBlockDataProvider(new PTERBInformationProvider(), BlockEntity.class);
     }
 
     @Override
     public void registerClient(IWailaClientRegistration registration) {
-        registration.registerBlockComponent(new PTERBFrequencyProvider(), Block.class);
+        registration.registerBlockComponent(new PTERBInformationProvider(), Block.class);
     }
 }

…ade/provider/PTERBFrequencyProvider.java …e/provider/PTERBInformationProvider.javasrc/main/java/net/neganote/gtutilities/integration/jade/provider/PTERBFrequencyProvider.java renamed to src/main/java/net/neganote/gtutilities/integration/jade/provider/PTERBInformationProvider.java src/main/java/net/neganote/gtutilities/integration/jade/provider/PTERBFrequencyProvider.java renamed to src/main/java/net/neganote/gtutilities/integration/jade/provider/PTERBInformationProvider.java

@@ -10,23 +10,30 @@
 import net.neganote.gtutilities.GregTechModernUtilities;
 import net.neganote.gtutilities.common.machine.multiblock.PTERBMachine;
 
+import net.neganote.gtutilities.common.materials.UtilMaterials;
+import net.neganote.gtutilities.config.UtilConfig;
 import snownee.jade.api.BlockAccessor;
 import snownee.jade.api.IBlockComponentProvider;
 import snownee.jade.api.IServerDataProvider;
 import snownee.jade.api.ITooltip;
 import snownee.jade.api.config.IPluginConfig;
 
-public class PTERBFrequencyProvider implements IBlockComponentProvider, IServerDataProvider<BlockAccessor> {
+public class PTERBInformationProvider implements IBlockComponentProvider, IServerDataProvider<BlockAccessor> {
 
     @Override
     public void appendTooltip(ITooltip iTooltip, BlockAccessor blockAccessor, IPluginConfig iPluginConfig) {
         BlockEntity be = blockAccessor.getBlockEntity();
-        if (be instanceof MetaMachineBlockEntity mmbe && mmbe.getMetaMachine() instanceof PTERBMachine) {
+        if (be instanceof MetaMachineBlockEntity mmbe && mmbe.getMetaMachine() instanceof PTERBMachine pterb) {
             CompoundTag data = blockAccessor.getServerData().getCompound(getUid().toString());
-            if (data.contains("frequencyData")) {
-                var tag = data.getCompound("frequencyData");
+            if (data.contains("pterbData")) {
+                var tag = data.getCompound("pterbData");
                 iTooltip.add(Component.translatable("gtmutils.pterb.current_frequency",
                         FormattingUtil.formatNumbers(tag.getInt("currentFrequency"))));
+                if (tag.contains("coolantDrain") && UtilConfig.coolantEnabled() && pterb.isFormed()) {
+                    iTooltip.add(Component.translatable("gtmutils.multiblock.pterb_machine.coolant_usage",
+                            FormattingUtil.formatNumbers(tag.getInt("coolantDrain")),
+                            UtilMaterials.QuantumCoolant.getLocalizedName()));
+                }
             }
         }
     }
@@ -36,15 +43,19 @@ public void appendServerData(CompoundTag compoundTag, BlockAccessor blockAccesso
         CompoundTag data = compoundTag.getCompound(getUid().toString());
         if (blockAccessor.getBlockEntity() instanceof MetaMachineBlockEntity mmbe &&
                 mmbe.getMetaMachine() instanceof PTERBMachine pterb) {
-            CompoundTag freqData = new CompoundTag();
-            freqData.putInt("currentFrequency", pterb.getFrequency());
-            data.put("frequencyData", freqData);
+            CompoundTag pterbData = new CompoundTag();
+            pterbData.putInt("currentFrequency", pterb.getFrequency());
+            if (UtilConfig.coolantEnabled() && pterb.isFormed()) {
+                int coolantDrain = pterb.getCoolantDrain();
+                pterbData.putInt("coolantDrain", coolantDrain);
+            }
+            data.put("pterbData", pterbData);
         }
         compoundTag.put(getUid().toString(), data);
     }
 
     @Override
     public ResourceLocation getUid() {
-        return GregTechModernUtilities.id("frequency_info");
+        return GregTechModernUtilities.id("pterb_info");
     }
 }