GregTech Modern Utilities version 2.2.2

* Update to GTm version 7.1.4
* Add forgotten lang for the new "watfrequency" placeholder

Author: NegaNote

changelog.md

@@ -1,3 +1,4 @@
-# GregTech Modern Utilities version 2.2.1
+# GregTech Modern Utilities version 2.2.2
 
-* HOTFIX: fix some blocks not being properly broken by omni-breaker right click (fixes #15)
+* Update to GTm version 7.1.4
+* Add forgotten lang for the new "watfrequency" placeholder

gradle.properties

@@ -11,7 +11,7 @@ org.gradle.jvmargs=-Xmx1G
     mapping_version=2023.09.03-1.20.1
 
 # Mod Properties
-    mod_version=2.2.1
+    mod_version=2.2.2
     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.1.3
+    gtceu_version=7.1.4
     ldlib_version=1.0.40.b
     registrate_version=MC1.20-1.3.11
     rhino_version=2001.2.3-build.6

src/generated/resources/assets/gtmutils/blockstates/pterb_machine.json

@@ -20,7 +20,7 @@
       "x": 90
     },
     "facing=east,upwards_facing=east": {
-      "gtceu:z": 90,
+      "gtceu:z": 270,
       "model": "gtmutils:block/machine/pterb_machine",
       "y": 90
     },
@@ -34,12 +34,12 @@
       "y": 90
     },
     "facing=east,upwards_facing=west": {
-      "gtceu:z": 270,
+      "gtceu:z": 90,
       "model": "gtmutils:block/machine/pterb_machine",
       "y": 90
     },
     "facing=north,upwards_facing=east": {
-      "gtceu:z": 90,
+      "gtceu:z": 270,
       "model": "gtmutils:block/machine/pterb_machine"
     },
     "facing=north,upwards_facing=north": {
@@ -50,11 +50,11 @@
       "model": "gtmutils:block/machine/pterb_machine"
     },
     "facing=north,upwards_facing=west": {
-      "gtceu:z": 270,
+      "gtceu:z": 90,
       "model": "gtmutils:block/machine/pterb_machine"
     },
     "facing=south,upwards_facing=east": {
-      "gtceu:z": 90,
+      "gtceu:z": 270,
       "model": "gtmutils:block/machine/pterb_machine",
       "y": 180
     },
@@ -68,12 +68,12 @@
       "y": 180
     },
     "facing=south,upwards_facing=west": {
-      "gtceu:z": 270,
+      "gtceu:z": 90,
       "model": "gtmutils:block/machine/pterb_machine",
       "y": 180
     },
     "facing=up,upwards_facing=east": {
-      "gtceu:z": 270,
+      "gtceu:z": 90,
       "model": "gtmutils:block/machine/pterb_machine",
       "x": 270
     },
@@ -87,12 +87,12 @@
       "x": 270
     },
     "facing=up,upwards_facing=west": {
-      "gtceu:z": 90,
+      "gtceu:z": 270,
       "model": "gtmutils:block/machine/pterb_machine",
       "x": 270
     },
     "facing=west,upwards_facing=east": {
-      "gtceu:z": 90,
+      "gtceu:z": 270,
       "model": "gtmutils:block/machine/pterb_machine",
       "y": 270
     },
@@ -106,7 +106,7 @@
       "y": 270
     },
     "facing=west,upwards_facing=west": {
-      "gtceu:z": 270,
+      "gtceu:z": 90,
       "model": "gtmutils:block/machine/pterb_machine",
       "y": 270
     }

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

@@ -27,6 +27,8 @@
   "config.gtmutils.option.pterbEnabled": "pǝןqɐuƎqɹǝʇd",
   "config.gtmutils.option.sterileHatchEnabled": "pǝןqɐuƎɥɔʇɐHǝןıɹǝʇs",
   "config.jade.plugin_gtmutils.pterb_info": "oɟuI ⟘ⱯM",
+  "gtceu.placeholder_info.watfrequency.0": ":ǝbɐs∩˙ɹǝɯɹoɟsuɐɹ⟘ ǝʌıʇɔⱯ ssǝןǝɹıM ɐ ʎq pǝsn ʎɔuǝnbǝɹɟ ʇuǝɹɹnɔ ǝɥʇ suɹnʇǝᴚ",
+  "gtceu.placeholder_info.watfrequency.1": ")ǝɹǝɥ ʎɔuǝnbǝɹɟ ʇɹǝsuı( :ʎɔuǝnbǝɹɟ ʇuǝɹɹnƆ >- }ʎɔuǝnbǝɹɟʇɐʍ{  ",
   "gtmutils.gui.pterb.wireless_configurator.title": "ʎɔuǝnbǝɹɟ ssǝןǝɹıM",
   "gtmutils.machine.64a_energy_converter.tooltip_tool_usage": "ǝbuɐɥɔ oʇ ʇǝןןɐW ʇɟoS ǝsn 'ㄥ§ɹǝʇɹǝʌuoƆ ∩Ǝɟ§ sɐ sʇɹɐʇS",
   "gtmutils.multiblock.pterb_machine.coolant_usage": "puoɔǝs ɹǝd %s ɟo Ꞁ%s suıɐɹᗡɔ§",

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

@@ -27,6 +27,8 @@
   "config.gtmutils.option.pterbEnabled": "pterbEnabled",
   "config.gtmutils.option.sterileHatchEnabled": "sterileHatchEnabled",
   "config.jade.plugin_gtmutils.pterb_info": "WAT Info",
+  "gtceu.placeholder_info.watfrequency.0": "Returns the current frequency used by a Wireless Active Transformer.Usage:",
+  "gtceu.placeholder_info.watfrequency.1": "  {watfrequency} -> Current frequency: (insert frequency here)",
   "gtmutils.gui.pterb.wireless_configurator.title": "Wireless frequency",
   "gtmutils.machine.64a_energy_converter.tooltip_tool_usage": "Starts as §fEU Converter§7, use Soft Mallet to change",
   "gtmutils.multiblock.pterb_machine.coolant_usage": "§cDrains %sL of %s per second",

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

@@ -46,6 +46,11 @@ public static void init(RegistrateLangProvider provider) {
 
         provider.add("material.gtmutils.quantum_coolant", "Quantum Coolant");
 
+        multiLang(provider, "gtceu.placeholder_info.watfrequency",
+                "Returns the current frequency used by a Wireless Active Transformer." +
+                        "Usage:",
+                "  {watfrequency} -> Current frequency: (insert frequency here)");
+
         dfs(provider, new HashSet<>(), UtilConfig.CONFIG_HOLDER.getValueMap());
     }
 
@@ -60,4 +65,14 @@ private static void dfs(RegistrateLangProvider provider, Set<String> added, Map<
             }
         }
     }
+
+    protected static void multiLang(RegistrateLangProvider provider, String key, String... values) {
+        for (var i = 0; i < values.length; i++) {
+            provider.add(getSubKey(key, i), values[i]);
+        }
+    }
+
+    protected static String getSubKey(String key, int index) {
+        return key + "." + index;
+    }
 }