GregTech Modern Utilities version 2.2.0

* Update to GTm 7.1.3
* Add a placeholder for the WAT to see what its current frequency is
* Update omni-breaker recipe to use 2 non-full amps
* Update 64A converter recipes to use non-full amps

Author: NegaNote

changelog.md

@@ -1,3 +1,6 @@
-# GregTech Modern Utilities version 2.1.1
+# GregTech Modern Utilities version 2.2.0
 
-* Fix crashing when omnibreaker is disabled
+* Update to GTm 7.1.3
+* Add a placeholder for the WAT to see what its current frequency is
+* Update omni-breaker recipe to use 2 non-full amps
+* Update 64A converter recipes to use non-full amps

gradle.properties

@@ -11,7 +11,7 @@ org.gradle.jvmargs=-Xmx1G
     mapping_version=2023.09.03-1.20.1
 
 # Mod Properties
-    mod_version=2.1.1
+    mod_version=2.2.0
     maven_group=net.neganote.gtmutils
     archives_base_name=gtmutils
     mod_id=gtmutils
@@ -23,7 +23,7 @@ org.gradle.jvmargs=-Xmx1G
 # Dependencies
     appeng_version=15.0.18
     architectury_version=9.2.14
-    gtceu_version=7.0.2
+    gtceu_version=7.1.3
     ldlib_version=1.0.40.b
     registrate_version=MC1.20-1.3.11
     rhino_version=2001.2.3-build.6

src/main/java/net/neganote/gtutilities/GregTechModernUtilities.java

@@ -25,6 +25,7 @@
 import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent;
 import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
 import net.neganote.gtutilities.client.renderer.UtilShaders;
+import net.neganote.gtutilities.common.data.UtilPlaceholders;
 import net.neganote.gtutilities.common.item.UtilItems;
 import net.neganote.gtutilities.common.machine.UtilMachines;
 import net.neganote.gtutilities.common.materials.UtilMaterials;
@@ -94,6 +95,7 @@ public static void init() {
         UtilItems.init();
         REGISTRATE.registerRegistrate();
         UtilDatagen.init();
+        UtilPlaceholders.init();
     }
 
     public static ResourceLocation id(String path) {

src/main/java/net/neganote/gtutilities/common/data/UtilPlaceholders.java

@@ -0,0 +1,32 @@
+package net.neganote.gtutilities.common.data;
+
+import com.gregtechceu.gtceu.api.machine.MetaMachine;
+import com.gregtechceu.gtceu.api.placeholder.*;
+import com.gregtechceu.gtceu.api.placeholder.exceptions.NotSupportedException;
+import com.gregtechceu.gtceu.api.placeholder.exceptions.PlaceholderException;
+
+import net.minecraft.network.chat.Component;
+import net.neganote.gtutilities.common.machine.multiblock.PTERBMachine;
+
+import java.util.List;
+
+public class UtilPlaceholders {
+
+    public static void init() {
+        PlaceholderHandler.addPlaceholder(new Placeholder("watfrequency") {
+
+            @Override
+            public MultiLineComponent apply(PlaceholderContext ctx,
+                                            List<MultiLineComponent> args) throws PlaceholderException {
+                PlaceholderUtils.checkArgs(args, 0);
+                MetaMachine machine = MetaMachine.getMachine(ctx.level(), ctx.pos());
+                if (!(machine instanceof PTERBMachine wat)) {
+                    throw new NotSupportedException();
+                }
+                var freq = wat.getFrequencyString();
+                return MultiLineComponent.of(Component.translatable("gtmutils.pterb.current_frequency",
+                        freq));
+            }
+        });
+    }
+}

src/main/java/net/neganote/gtutilities/recipe/UtilRecipes.java

@@ -64,7 +64,7 @@ public static void register64AConverterRecipes(Consumer<FinishedRecipe> provider
                     .inputItems(CABLE_HEX.get(0), 4)
                     .inputItems(CABLE_HEX.get(tier), 16)
                     .outputItems(ENERGY_CONVERTER_64A[tier])
-                    .EUt(GTValues.VEX[tier]).duration(40)
+                    .EUt(GTValues.VA[tier]).duration(40)
                     .save(provider);
         }
     }
@@ -89,7 +89,7 @@ public static void registerOmnitoolRecipe(Consumer<FinishedRecipe> provider) {
                 .inputItems(CABLE_QUAD.get(UtilConfig.INSTANCE.features.omnibreakerTier), 3)
                 .inputItems(MOTOR.get(UtilConfig.INSTANCE.features.omnibreakerTier), 2)
                 .outputItems(OMNIBREAKER)
-                .EUt(GTValues.VEX[UtilConfig.INSTANCE.features.omnibreakerTier]).duration(20 * 60)
+                .EUt(GTValues.VA[UtilConfig.INSTANCE.features.omnibreakerTier], 2).duration(20 * 60)
                 .save(provider);
     }
 }