Merge pull request #17 from Phoenixvine32908/main

Custom MV-ZPM tools.

Author: NegaNote

gradle.properties

@@ -23,7 +23,7 @@ org.gradle.jvmargs=-Xmx1G
 # Dependencies
     appeng_version=15.0.18
     architectury_version=9.2.14
-    gtceu_version=7.1.4
+    gtceu_version=7.2.0
     ldlib_version=1.0.40.b
     registrate_version=MC1.20-1.3.11
     rhino_version=2001.2.3-build.6

run/config/gtmutils.yaml

@@ -0,0 +1,49 @@
+features:
+  # Whether the Sterile Cleaning Maintenance Hatch is enabled.
+  sterileHatchEnabled: true
+
+  # Whether the 64A energy converters are enabled.
+  converters64aEnabled: true
+
+  # Whether the Omni-breaker is enabled.
+  omnibreakerEnabled: true
+
+  # What tier the Omni-breaker is, if enabled. (ULV = 0, LV = 1, MV = 2, ...)
+  # (Unless the default recipe is overridden, can only support LV to IV!)
+  omnibreakerTier: 5
+
+  # The energy capacity of the Omni-breaker.
+  omnibreakerEnergyCapacity: 40960000
+
+  # Whether the Wireless Active Transformer is enabled.
+  pterbEnabled: true
+
+  # Base amount of WAT coolant to drain every second.
+  # (Setting both this amount and the IO multiplier to 0 disables the coolant mechanic.)
+  pterbCoolantBaseDrain: 10
+
+  # Multiplier over IO amount for additional coolant drain.
+  # (Setting both this and the base drain amount to 0 disables the coolant mechanic.)
+  pterbCoolantIOMultiplier: 3.0E-5
+
+  # Whether the coins/credits are enabled.
+  coinsEnabled: true
+
+  # Whether the custom MV tools are enabled.
+  customMVToolsEnabled: false
+
+  # Whether the custom HV tools are enabled.
+  customHVToolsEnabled: false
+
+  # Whether the custom EV tools are enabled.
+  customEVToolsEnabled: false
+
+  # Whether the custom IV tools are enabled.
+  customIVToolsEnabled: false
+
+  # Whether the custom LuV tools are enabled.
+  customLuVToolsEnabled: true
+
+  # Whether the custom ZPM tools are enabled.
+  customZPMToolsEnabled: true
+

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

@@ -18,6 +18,12 @@
   "block.gtmutils.zpm_64a_energy_converter": "ɹǝʇɹǝʌuoƆ ʎbɹǝuƎ ɹ§Ɐǝ§ㄣ9 ɹ§WԀZɔ§",
   "config.gtmutils.option.coinsEnabled": "pǝןqɐuƎsuıoɔ",
   "config.gtmutils.option.converters64aEnabled": "pǝןqɐuƎɐㄣ9sɹǝʇɹǝʌuoɔ",
+  "config.gtmutils.option.customEVToolsEnabled": "pǝןqɐuƎsןoo⟘ΛƎɯoʇsnɔ",
+  "config.gtmutils.option.customHVToolsEnabled": "pǝןqɐuƎsןoo⟘ΛHɯoʇsnɔ",
+  "config.gtmutils.option.customIVToolsEnabled": "pǝןqɐuƎsןoo⟘ΛIɯoʇsnɔ",
+  "config.gtmutils.option.customLuVToolsEnabled": "pǝןqɐuƎsןoo⟘ΛnꞀɯoʇsnɔ",
+  "config.gtmutils.option.customMVToolsEnabled": "pǝןqɐuƎsןoo⟘ΛWɯoʇsnɔ",
+  "config.gtmutils.option.customZPMToolsEnabled": "pǝןqɐuƎsןoo⟘WԀZɯoʇsnɔ",
   "config.gtmutils.option.features": "sǝɹnʇɐǝɟ",
   "config.gtmutils.option.omnibreakerEnabled": "pǝןqɐuƎɹǝʞɐǝɹqıuɯo",
   "config.gtmutils.option.omnibreakerEnergyCapacity": "ʎʇıɔɐdɐƆʎbɹǝuƎɹǝʞɐǝɹqıuɯo",
@@ -35,18 +41,48 @@
   "gtmutils.multiblock.pterb_machine.coolant_usage": "puoɔǝs ɹǝd %s ɟo Ꞁ%s suıɐɹᗡɔ§",
   "gtmutils.pterb.current_frequency": "%s :ʎɔuǝnbǝɹɟ ʇuǝɹɹnƆ",
   "gtmutils.pterb_machine.invalid_frequency": "¡0 ʎɔuǝnbǝɹɟ uo ʞɹoʍ ʇou ןןıʍ s⟘ⱯM",
+  "item.gtceu.tool.ev_buzzsaw": ")ΛƎ( ʍɐszznᗺ %s",
+  "item.gtceu.tool.ev_chainsaw": ")ΛƎ( ʍɐsuıɐɥƆ %s",
+  "item.gtceu.tool.ev_screwdriver": ")ΛƎ( ɹǝʌıɹpʍǝɹɔS ɔıɹʇɔǝןƎ %s",
+  "item.gtceu.tool.ev_wirecutter": ")ΛƎ( ɹǝʇʇnƆ ǝɹıM %s",
+  "item.gtceu.tool.ev_wrench": ")ΛƎ( ɥɔuǝɹM %s",
+  "item.gtceu.tool.hv_buzzsaw": ")ΛH( ʍɐszznᗺ %s",
+  "item.gtceu.tool.hv_chainsaw": ")ΛH( ʍɐsuıɐɥƆ %s",
+  "item.gtceu.tool.hv_screwdriver": ")ΛH( ɹǝʌıɹpʍǝɹɔS ɔıɹʇɔǝןƎ %s",
+  "item.gtceu.tool.iv_buzzsaw": ")ΛI( ʍɐszznᗺ %s",
+  "item.gtceu.tool.iv_chainsaw": ")ΛI( ʍɐsuıɐɥƆ %s",
+  "item.gtceu.tool.iv_screwdriver": ")ΛI( ɹǝʌıɹpʍǝɹɔS ɔıɹʇɔǝןƎ %s",
+  "item.gtceu.tool.luv_buzzsaw": ")ΛnꞀ( ʍɐszznᗺ %s",
+  "item.gtceu.tool.luv_chainsaw": ")ΛnꞀ( ʍɐsuıɐɥƆ %s",
+  "item.gtceu.tool.luv_drill": ")ΛnꞀ( ןןıɹᗡ %s",
+  "item.gtceu.tool.luv_screwdriver": ")ΛnꞀ( ɹǝʌıɹpʍǝɹɔS ɔıɹʇɔǝןƎ %s",
+  "item.gtceu.tool.luv_wirecutter": ")ΛnꞀ( ɹǝʇʇnƆ ǝɹıM %s",
+  "item.gtceu.tool.luv_wrench": ")ΛnꞀ( ɥɔuǝɹM %s",
+  "item.gtceu.tool.mv_buzzsaw": ")ΛW( ʍɐszznᗺ %s",
+  "item.gtceu.tool.mv_chainsaw": ")ΛW( ʍɐsuıɐɥƆ %s",
+  "item.gtceu.tool.mv_screwdriver": ")ΛW( ɹǝʌıɹpʍǝɹɔS ɔıɹʇɔǝןƎ %s",
+  "item.gtceu.tool.mv_wirecutter": ")ΛW( ɹǝʇʇnƆ ǝɹıM %s",
+  "item.gtceu.tool.mv_wrench": ")ΛW( ɥɔuǝɹM %s",
+  "item.gtceu.tool.zpm_buzzsaw": ")WԀZ( ʍɐszznᗺ %s",
+  "item.gtceu.tool.zpm_chainsaw": ")WԀZ( ʍɐsuıɐɥƆ %s",
+  "item.gtceu.tool.zpm_drill": ")WԀZ( ןןıɹᗡ %s",
+  "item.gtceu.tool.zpm_screwdriver": ")WԀZ( ɹǝʌıɹpʍǝɹɔS ɔıɹʇɔǝןƎ %s",
+  "item.gtceu.tool.zpm_wirecutter": ")WԀZ( ɹǝʇʇnƆ ǝɹıM %s",
+  "item.gtceu.tool.zpm_wrench": ")WԀZ( ɥɔuǝɹM %s",
   "item.gtmutils.ancient_gold_coin": "uıoƆ pןo⅁ ʇuǝıɔuⱯ",
   "item.gtmutils.chocolate_coin": "uıoƆ ǝʇɐןoɔoɥƆ",
   "item.gtmutils.copper_credit": "ʇıpǝɹƆ ɹǝddoƆ",
   "item.gtmutils.cupronickel_credit": "ʇıpǝɹƆ ןǝʞɔıuoɹdnƆ",
   "item.gtmutils.doge_coin": "uıoƆ ǝboᗡ",
   "item.gtmutils.gold_credit": "ʇıpǝɹƆ pןo⅁",
+  "item.gtmutils.luv_power_unit": "ʇıu∩ ɹǝʍoԀ ΛnꞀ",
   "item.gtmutils.naquadah_credit": "ʇıpǝɹƆ ɥɐpɐnbɐN",
   "item.gtmutils.neutronium_credit": "ʇıpǝɹƆ ɯnıuoɹʇnǝN",
   "item.gtmutils.omnibreaker": "ɹǝʞɐǝɹq-ıuɯO",
   "item.gtmutils.osmium_credit": "ʇıpǝɹƆ ɯnıɯsO",
   "item.gtmutils.platinum_credit": "ʇıpǝɹƆ ɯnuıʇɐןԀ",
   "item.gtmutils.silver_credit": "ʇıpǝɹƆ ɹǝʌןıS",
+  "item.gtmutils.zpm_power_unit": "ʇıu∩ ɹǝʍoԀ WԀZ",
   "itemGroup.gtmutils.creative_tab": "sǝıʇıןıʇ∩ uɹǝpoW ɥɔǝ⟘bǝɹ⅁",
   "material.gtmutils.quantum_coolant": "ʇuɐןooƆ ɯnʇuɐnὉ",
   "tooltip.omnibreaker.can_break_anything": "¡⅁NIH⟘ʎNⱯ ǝuıɯ-ɐʇsuı uɐɔ ɹǝʞɐǝɹq-ıuɯO ǝɥ⟘",

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

@@ -18,6 +18,12 @@
   "block.gtmutils.zpm_64a_energy_converter": "§cZPM§r 64§eA§r Energy Converter",
   "config.gtmutils.option.coinsEnabled": "coinsEnabled",
   "config.gtmutils.option.converters64aEnabled": "converters64aEnabled",
+  "config.gtmutils.option.customEVToolsEnabled": "customEVToolsEnabled",
+  "config.gtmutils.option.customHVToolsEnabled": "customHVToolsEnabled",
+  "config.gtmutils.option.customIVToolsEnabled": "customIVToolsEnabled",
+  "config.gtmutils.option.customLuVToolsEnabled": "customLuVToolsEnabled",
+  "config.gtmutils.option.customMVToolsEnabled": "customMVToolsEnabled",
+  "config.gtmutils.option.customZPMToolsEnabled": "customZPMToolsEnabled",
   "config.gtmutils.option.features": "features",
   "config.gtmutils.option.omnibreakerEnabled": "omnibreakerEnabled",
   "config.gtmutils.option.omnibreakerEnergyCapacity": "omnibreakerEnergyCapacity",
@@ -35,18 +41,48 @@
   "gtmutils.multiblock.pterb_machine.coolant_usage": "§cDrains %sL of %s per second",
   "gtmutils.pterb.current_frequency": "Current frequency: %s",
   "gtmutils.pterb_machine.invalid_frequency": "WATs will not work on frequency 0!",
+  "item.gtceu.tool.ev_buzzsaw": "%s Buzzsaw (EV)",
+  "item.gtceu.tool.ev_chainsaw": "%s Chainsaw (EV)",
+  "item.gtceu.tool.ev_screwdriver": "%s Electric Screwdriver (EV)",
+  "item.gtceu.tool.ev_wirecutter": "%s Wire Cutter (EV)",
+  "item.gtceu.tool.ev_wrench": "%s Wrench (EV)",
+  "item.gtceu.tool.hv_buzzsaw": "%s Buzzsaw (HV)",
+  "item.gtceu.tool.hv_chainsaw": "%s Chainsaw (HV)",
+  "item.gtceu.tool.hv_screwdriver": "%s Electric Screwdriver (HV)",
+  "item.gtceu.tool.iv_buzzsaw": "%s Buzzsaw (IV)",
+  "item.gtceu.tool.iv_chainsaw": "%s Chainsaw (IV)",
+  "item.gtceu.tool.iv_screwdriver": "%s Electric Screwdriver (IV)",
+  "item.gtceu.tool.luv_buzzsaw": "%s Buzzsaw (LuV)",
+  "item.gtceu.tool.luv_chainsaw": "%s Chainsaw (LuV)",
+  "item.gtceu.tool.luv_drill": "%s Drill (LuV)",
+  "item.gtceu.tool.luv_screwdriver": "%s Electric Screwdriver (LuV)",
+  "item.gtceu.tool.luv_wirecutter": "%s Wire Cutter (LuV)",
+  "item.gtceu.tool.luv_wrench": "%s Wrench (LuV)",
+  "item.gtceu.tool.mv_buzzsaw": "%s Buzzsaw (MV)",
+  "item.gtceu.tool.mv_chainsaw": "%s Chainsaw (MV)",
+  "item.gtceu.tool.mv_screwdriver": "%s Electric Screwdriver (MV)",
+  "item.gtceu.tool.mv_wirecutter": "%s Wire Cutter (MV)",
+  "item.gtceu.tool.mv_wrench": "%s Wrench (MV)",
+  "item.gtceu.tool.zpm_buzzsaw": "%s Buzzsaw (ZPM)",
+  "item.gtceu.tool.zpm_chainsaw": "%s Chainsaw (ZPM)",
+  "item.gtceu.tool.zpm_drill": "%s Drill (ZPM)",
+  "item.gtceu.tool.zpm_screwdriver": "%s Electric Screwdriver (ZPM)",
+  "item.gtceu.tool.zpm_wirecutter": "%s Wire Cutter (ZPM)",
+  "item.gtceu.tool.zpm_wrench": "%s Wrench (ZPM)",
   "item.gtmutils.ancient_gold_coin": "Ancient Gold Coin",
   "item.gtmutils.chocolate_coin": "Chocolate Coin",
   "item.gtmutils.copper_credit": "Copper Credit",
   "item.gtmutils.cupronickel_credit": "Cupronickel Credit",
   "item.gtmutils.doge_coin": "Doge Coin",
   "item.gtmutils.gold_credit": "Gold Credit",
+  "item.gtmutils.luv_power_unit": "LuV Power Unit",
   "item.gtmutils.naquadah_credit": "Naquadah Credit",
   "item.gtmutils.neutronium_credit": "Neutronium Credit",
   "item.gtmutils.omnibreaker": "Omni-breaker",
   "item.gtmutils.osmium_credit": "Osmium Credit",
   "item.gtmutils.platinum_credit": "Platinum Credit",
   "item.gtmutils.silver_credit": "Silver Credit",
+  "item.gtmutils.zpm_power_unit": "ZPM Power Unit",
   "itemGroup.gtmutils.creative_tab": "GregTech Modern Utilities",
   "material.gtmutils.quantum_coolant": "Quantum Coolant",
   "tooltip.omnibreaker.can_break_anything": "The Omni-breaker can insta-mine ANYTHING!",

src/generated/resources/assets/gtmutils/models/item/luv_power_unit.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "gtmutils:item/tools/power_unit_luv"
+  }
+}

src/generated/resources/assets/gtmutils/models/item/zpm_power_unit.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "gtmutils:item/tools/power_unit_zpm"
+  }
+}

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

@@ -5,6 +5,7 @@
 import com.gregtechceu.gtceu.api.registry.registrate.GTRegistrate;
 
 import net.minecraft.data.recipes.FinishedRecipe;
+import net.neganote.gtutilities.common.tools.recipe.UtilToolRecipes;
 import net.neganote.gtutilities.recipe.UtilRecipes;
 
 import java.util.function.Consumer;
@@ -34,6 +35,7 @@ public void registerTagPrefixes() {
     @Override
     public void addRecipes(Consumer<FinishedRecipe> provider) {
         UtilRecipes.init(provider);
+        UtilToolRecipes.init(provider);
     }
 
     // If you have custom ingredient types, uncomment this & change to match your capability.

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

@@ -27,8 +27,10 @@
 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.item.UtilToolItems;
 import net.neganote.gtutilities.common.machine.UtilMachines;
 import net.neganote.gtutilities.common.materials.UtilMaterials;
+import net.neganote.gtutilities.common.tools.UtilToolConnection;
 import net.neganote.gtutilities.config.UtilConfig;
 import net.neganote.gtutilities.datagen.UtilDatagen;
 
@@ -93,6 +95,7 @@ public static void init() {
                     .register();
         }
         UtilItems.init();
+        UtilToolItems.init();
         REGISTRATE.registerRegistrate();
         UtilDatagen.init();
         UtilPlaceholders.init();
@@ -142,7 +145,7 @@ private void addMaterials(MaterialEvent event) {
 
     // This is optional, though.
     private void modifyMaterials(PostMaterialEvent event) {
-        // CustomMaterials.modify();
+        UtilToolConnection.modifyMaterials();
     }
 
     private void registerRecipeTypes(GTCEuAPI.RegisterEvent<ResourceLocation, GTRecipeType> event) {

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

@@ -0,0 +1,43 @@
+package net.neganote.gtutilities.common.item;
+
+import com.gregtechceu.gtceu.api.GTValues;
+import com.gregtechceu.gtceu.api.item.ComponentItem;
+import com.gregtechceu.gtceu.api.item.component.ElectricStats;
+
+import net.neganote.gtutilities.config.UtilConfig;
+
+import com.tterrag.registrate.util.entry.ItemEntry;
+
+import static net.neganote.gtutilities.GregTechModernUtilities.REGISTRATE;
+
+/**
+ * Item registry file for the LuV and ZPM tool power units.
+ */
+public class UtilToolItems {
+
+    public static ItemEntry<ComponentItem> POWER_UNIT_ZPM = null;
+    public static ItemEntry<ComponentItem> POWER_UNIT_LUV = null;
+
+    static {
+
+        if (UtilConfig.INSTANCE.features.customLuVToolsEnabled) {
+            POWER_UNIT_LUV = REGISTRATE.item("luv_power_unit", ComponentItem::create)
+                    .lang("LuV Power Unit")
+                    .properties(p -> p.stacksTo(8))
+                    .model((ctx, prov) -> prov.generated(ctx, prov.modLoc("item/tools/power_unit_luv")))
+                    .onRegister((c) -> c.attachComponents(ElectricStats.createElectricItem(102400000L, GTValues.LuV)))
+                    .register();
+        }
+
+        if (UtilConfig.INSTANCE.features.customZPMToolsEnabled) {
+            POWER_UNIT_ZPM = REGISTRATE.item("zpm_power_unit", ComponentItem::create)
+                    .lang("ZPM Power Unit")
+                    .properties(p -> p.stacksTo(8))
+                    .model((ctx, prov) -> prov.generated(ctx, prov.modLoc("item/tools/power_unit_zpm")))
+                    .onRegister((c) -> c.attachComponents(ElectricStats.createElectricItem(409600000L, GTValues.ZPM)))
+                    .register();
+        }
+    }
+
+    public static void init() {}
+}