add recipes

NegaNote · NegaNote · commit 9a396626e810 · 2025-12-18T15:50:57.000-05:00
diff --git a/src/generated/resources/assets/gtmutils/blockstates/ulv_auto_charger_4x.json b/src/generated/resources/assets/gtmutils/blockstates/ulv_auto_charger_4x.json
@@ -0,0 +1,28 @@
+{
+  "variants": {
+    "facing=down": {
+      "model": "gtmutils:block/machine/ulv_auto_charger_4x",
+      "x": 90
+    },
+    "facing=east": {
+      "model": "gtmutils:block/machine/ulv_auto_charger_4x",
+      "y": 90
+    },
+    "facing=north": {
+      "model": "gtmutils:block/machine/ulv_auto_charger_4x"
+    },
+    "facing=south": {
+      "model": "gtmutils:block/machine/ulv_auto_charger_4x",
+      "y": 180
+    },
+    "facing=up": {
+      "gtceu:z": 180,
+      "model": "gtmutils:block/machine/ulv_auto_charger_4x",
+      "x": 270
+    },
+    "facing=west": {
+      "model": "gtmutils:block/machine/ulv_auto_charger_4x",
+      "y": 270
+    }
+  }
+}
diff --git a/src/generated/resources/assets/gtmutils/lang/en_ud.json b/src/generated/resources/assets/gtmutils/lang/en_ud.json
@@ -23,6 +23,7 @@
   "block.gtmutils.uiv_64a_energy_converter": "ɹǝʇɹǝʌuoƆ ʎbɹǝuƎ ɹ§Ɐǝ§ㄣ9 ɹ§ΛI∩ᄅ§",
   "block.gtmutils.uiv_auto_charger_4x": "ɹǝbɹɐɥƆ oqɹn⟘ oʇnⱯ xㄣ ɹ§ǝbɐʇןoΛ ǝsuǝɯɯI ɐɹʇן∩ᄅ§",
   "block.gtmutils.ulv_64a_energy_converter": "ɹǝʇɹǝʌuoƆ ʎbɹǝuƎ ɹ§Ɐǝ§ㄣ9 ɹ§ΛꞀ∩8§",
+  "block.gtmutils.ulv_auto_charger_4x": "ɹǝbɹɐɥƆ oqɹn⟘ oʇnⱯ xㄣ ɹ§ǝbɐʇןoΛ ʍoꞀ ɐɹʇן∩8§",
   "block.gtmutils.uv_64a_energy_converter": "ɹǝʇɹǝʌuoƆ ʎbɹǝuƎ ɹ§Ɐǝ§ㄣ9 ɹ§Λ∩Ɛ§",
   "block.gtmutils.uv_auto_charger_4x": "ɹǝbɹɐɥƆ oqɹn⟘ oʇnⱯ xㄣ ɹ§ǝbɐʇןoΛ ǝʇɐɯıʇן∩Ɛ§",
   "block.gtmutils.uxv_64a_energy_converter": "ɹǝʇɹǝʌuoƆ ʎbɹǝuƎ ɹ§Ɐǝ§ㄣ9 ɹ§ΛX∩ǝ§",
diff --git a/src/generated/resources/assets/gtmutils/lang/en_us.json b/src/generated/resources/assets/gtmutils/lang/en_us.json
@@ -23,6 +23,7 @@
   "block.gtmutils.uiv_64a_energy_converter": "§2UIV§r 64§eA§r Energy Converter",
   "block.gtmutils.uiv_auto_charger_4x": "§2Ultra Immense Voltage§r 4x Auto Turbo Charger",
   "block.gtmutils.ulv_64a_energy_converter": "§8ULV§r 64§eA§r Energy Converter",
+  "block.gtmutils.ulv_auto_charger_4x": "§8Ultra Low Voltage§r 4x Auto Turbo Charger",
   "block.gtmutils.uv_64a_energy_converter": "§3UV§r 64§eA§r Energy Converter",
   "block.gtmutils.uv_auto_charger_4x": "§3Ultimate Voltage§r 4x Auto Turbo Charger",
   "block.gtmutils.uxv_64a_energy_converter": "§eUXV§r 64§eA§r Energy Converter",
diff --git a/src/generated/resources/assets/gtmutils/models/block/machine/ulv_auto_charger_4x.json b/src/generated/resources/assets/gtmutils/models/block/machine/ulv_auto_charger_4x.json
@@ -0,0 +1,42 @@
+{
+  "parent": "minecraft:block/block",
+  "loader": "gtceu:machine",
+  "machine": "gtmutils:ulv_auto_charger_4x",
+  "variants": {
+    "charger_state=finished": {
+      "model": {
+        "parent": "gtceu:block/machine/template/sided/sided",
+        "textures": {
+          "bottom": "gtceu:block/casings/voltage/ulv/bottom",
+          "overlay_front": "gtceu:block/machines/charger/overlay_charger_finished",
+          "overlay_front_emissive": "gtceu:block/machines/charger/overlay_charger_finished_emissive",
+          "side": "gtceu:block/casings/voltage/ulv/side",
+          "top": "gtceu:block/casings/voltage/ulv/top"
+        }
+      }
+    },
+    "charger_state=idle": {
+      "model": {
+        "parent": "gtceu:block/machine/template/sided/sided",
+        "textures": {
+          "bottom": "gtceu:block/casings/voltage/ulv/bottom",
+          "overlay_front": "gtceu:block/machines/charger/overlay_charger_idle",
+          "side": "gtceu:block/casings/voltage/ulv/side",
+          "top": "gtceu:block/casings/voltage/ulv/top"
+        }
+      }
+    },
+    "charger_state=running": {
+      "model": {
+        "parent": "gtceu:block/machine/template/sided/sided",
+        "textures": {
+          "bottom": "gtceu:block/casings/voltage/ulv/bottom",
+          "overlay_front": "gtceu:block/machines/charger/overlay_charger_running",
+          "overlay_front_emissive": "gtceu:block/machines/charger/overlay_charger_running_emissive",
+          "side": "gtceu:block/casings/voltage/ulv/side",
+          "top": "gtceu:block/casings/voltage/ulv/top"
+        }
+      }
+    }
+  }
+}
diff --git a/src/generated/resources/assets/gtmutils/models/item/ulv_auto_charger_4x.json b/src/generated/resources/assets/gtmutils/models/item/ulv_auto_charger_4x.json
@@ -0,0 +1,3 @@
+{
+  "parent": "gtmutils:block/machine/ulv_auto_charger_4x"
+}
diff --git a/src/main/java/net/neganote/gtutilities/common/machine/UtilMachines.java b/src/main/java/net/neganote/gtutilities/common/machine/UtilMachines.java
@@ -74,11 +74,11 @@ public class UtilMachines {
         }
     }
 
-    public static MachineDefinition[] CHARGER_4 = null;
+    public static MachineDefinition[] AUTO_CHARGER_4 = null;
 
     static {
         if (UtilConfig.INSTANCE.features.autoChargersEnabled || GTCEu.isDataGen()) {
-            CHARGER_4 = registerCharger(4);
+            AUTO_CHARGER_4 = registerCharger(4);
         }
     }
 
@@ -106,7 +106,7 @@ public static MachineDefinition[] registerCharger(int itemSlotSize) {
                                 Component.translatable("gtceu.universal.tooltip.amperage_in_till",
                                         itemSlotSize * ChargerMachine.AMPS_PER_ITEM))
                         .register(),
-                GTValues.tiersBetween(LV, maxTier));
+                GTValues.tiersBetween(ULV, maxTier));
     }
 
     // Copied from GTMachineUtils
diff --git a/src/main/java/net/neganote/gtutilities/config/UtilConfig.java b/src/main/java/net/neganote/gtutilities/config/UtilConfig.java
@@ -89,7 +89,7 @@ public static class FeatureConfigs {
 
         @Configurable
         @Configurable.Comment({ "Whether the Auto Turbo Chargers are enabled." })
-        public boolean autoChargersEnabled = true;
+        public boolean autoChargersEnabled = false;
     }
 
     public static boolean coolantEnabled() {
diff --git a/src/main/java/net/neganote/gtutilities/recipe/UtilRecipes.java b/src/main/java/net/neganote/gtutilities/recipe/UtilRecipes.java
@@ -3,11 +3,14 @@
 import com.gregtechceu.gtceu.api.GTCEuAPI;
 import com.gregtechceu.gtceu.api.GTValues;
 import com.gregtechceu.gtceu.api.data.tag.TagPrefix;
+import com.gregtechceu.gtceu.api.machine.MachineDefinition;
 import com.gregtechceu.gtceu.common.data.GTItems;
+import com.gregtechceu.gtceu.common.data.GTMachines;
 import com.gregtechceu.gtceu.common.data.GTMaterials;
 import com.gregtechceu.gtceu.common.data.machines.GTMultiMachines;
 import com.gregtechceu.gtceu.config.ConfigHolder;
 import com.gregtechceu.gtceu.data.recipe.CustomTags;
+import com.gregtechceu.gtceu.data.recipe.VanillaRecipeHelper;
 
 import net.minecraft.data.recipes.FinishedRecipe;
 import net.minecraft.world.item.ItemStack;
@@ -21,6 +24,7 @@
 import static com.gregtechceu.gtceu.common.data.GTRecipeTypes.ASSEMBLY_LINE_RECIPES;
 import static com.gregtechceu.gtceu.data.recipe.GTCraftingComponents.*;
 import static net.neganote.gtutilities.common.item.UtilItems.OMNIBREAKER;
+import static net.neganote.gtutilities.common.machine.UtilMachines.AUTO_CHARGER_4;
 import static net.neganote.gtutilities.common.machine.UtilMachines.ENERGY_CONVERTER_64A;
 
 public class UtilRecipes {
@@ -55,6 +59,20 @@ public static void init(Consumer<FinishedRecipe> provider) {
                             .researchStack(GTMultiMachines.ACTIVE_TRANSFORMER.asStack()).CWUt(16))
                     .save(provider);
         }
+
+        if (UtilConfig.INSTANCE.features.autoChargersEnabled) {
+            for (MachineDefinition autoChargerDef : AUTO_CHARGER_4) {
+                if (autoChargerDef == null) {
+                    continue;
+                }
+                var tier = autoChargerDef.getTier();
+                VanillaRecipeHelper.addShapedRecipe(provider, true, autoChargerDef.getId(), autoChargerDef.asStack(),
+                        "WRW", "WCW", "WRW",
+                        'W', WIRE_QUAD.get(tier),
+                        'R', ROBOT_ARM.get(tier),
+                        'C', GTMachines.CHARGER_4[tier].asStack());
+            }
+        }
     }
 
     public static void register64AConverterRecipes(Consumer<FinishedRecipe> provider) {

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+{`
	`2`	`+ "parent": "gtmutils:block/machine/ulv_auto_charger_4x"`
	`3`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -74,11 +74,11 @@ public class UtilMachines {`
`74`	`74`	`}`
`75`	`75`	`}`
`76`	`76`
`77`		`- public static MachineDefinition[] CHARGER_4 = null;`
	`77`	`+ public static MachineDefinition[] AUTO_CHARGER_4 = null;`
`78`	`78`
`79`	`79`	`static {`
`80`	`80`	`if (UtilConfig.INSTANCE.features.autoChargersEnabled \|\| GTCEu.isDataGen()) {`
`81`		`- CHARGER_4 = registerCharger(4);`
	`81`	`+ AUTO_CHARGER_4 = registerCharger(4);`
`82`	`82`	`}`
`83`	`83`	`}`
`84`	`84`
`@@ -106,7 +106,7 @@ public static MachineDefinition[] registerCharger(int itemSlotSize) {`
`106`	`106`	`Component.translatable("gtceu.universal.tooltip.amperage_in_till",`
`107`	`107`	`itemSlotSize * ChargerMachine.AMPS_PER_ITEM))`
`108`	`108`	`.register(),`
`109`		`- GTValues.tiersBetween(LV, maxTier));`
	`109`	`+ GTValues.tiersBetween(ULV, maxTier));`
`110`	`110`	`}`
`111`	`111`
`112`	`112`	`// Copied from GTMachineUtils`
Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ public static class FeatureConfigs {`
`89`	`89`
`90`	`90`	`@Configurable`
`91`	`91`	`@Configurable.Comment({ "Whether the Auto Turbo Chargers are enabled." })`
`92`		`- public boolean autoChargersEnabled = true;`
	`92`	`+ public boolean autoChargersEnabled = false;`
`93`	`93`	`}`
`94`	`94`
`95`	`95`	`public static boolean coolantEnabled() {`