7.5.1 migration.

gradle.properties

@@ -23,7 +23,7 @@ org.gradle.jvmargs=-Xmx1G
 # Dependencies
     appeng_version=15.0.18
     architectury_version=9.2.14
-    gtceu_version=7.4.0
+    gtceu_version=7.5.1
     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/lang/en_ud.json

@@ -101,11 +101,7 @@
   "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",

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

@@ -101,11 +101,7 @@
   "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)",

src/main/java/net/neganote/gtutilities/common/machine/UtilMachines.java

@@ -136,7 +136,7 @@ public static MachineDefinition[] registerConverter(int amperage) {
     // Copied from GTMachineUtils
     public static MachineDefinition[] registerTieredMachines(String name,
                                                              BiFunction<IMachineBlockEntity, Integer, MetaMachine> factory,
-                                                             BiFunction<Integer, MachineBuilder<MachineDefinition>, MachineDefinition> builder,
+                                                             BiFunction<Integer, MachineBuilder<MachineDefinition, ?>, MachineDefinition> builder,
                                                              int... tiers) {
         MachineDefinition[] definitions = new MachineDefinition[GTValues.TIER_COUNT];
         for (int tier : tiers) {

src/main/java/net/neganote/gtutilities/common/tools/UtilToolConnection.java

@@ -42,15 +42,9 @@ public static void modifyMaterials() {
 
             // Custom HV Tools
             if (UtilConfig.INSTANCE.features.customHVToolsEnabled) {
-                if (toolProperty.hasType(GTToolType.SCREWDRIVER_LV)) {
-                    toolProperty.addTypes(UtilToolType.SCREWDRIVER_HV);
-                }
                 if (toolProperty.hasType(GTToolType.BUZZSAW)) {
                     toolProperty.addTypes(UtilToolType.BUZZSAW_HV);
                 }
-                if (toolProperty.hasType(GTToolType.CHAINSAW_LV)) {
-                    toolProperty.addTypes(UtilToolType.CHAINSAW_HV);
-                }
             }
 
             // Custom EV Tools
@@ -74,15 +68,9 @@ public static void modifyMaterials() {
 
             // Custom IV Tools
             if (UtilConfig.INSTANCE.features.customIVToolsEnabled) {
-                if (toolProperty.hasType(GTToolType.SCREWDRIVER_LV)) {
-                    toolProperty.addTypes(UtilToolType.SCREWDRIVER_IV);
-                }
                 if (toolProperty.hasType(GTToolType.BUZZSAW)) {
                     toolProperty.addTypes(UtilToolType.BUZZSAW_IV);
                 }
-                if (toolProperty.hasType(GTToolType.CHAINSAW_LV)) {
-                    toolProperty.addTypes(UtilToolType.CHAINSAW_IV);
-                }
             }
 
             // Custom LuV Tools

src/main/java/net/neganote/gtutilities/common/tools/UtilToolType.java

@@ -36,19 +36,6 @@ public final class UtilToolType {
             .toolClasses(GTToolType.SCREWDRIVER)
             .defaultActions(GTToolActions.DEFAULT_SCREWDRIVER_ACTIONS)
             .build();
-    public static final GTToolType SCREWDRIVER_HV = GTToolType.builder("hv_screwdriver")
-            .idFormat("hv_%s_screwdriver")
-            .toolTag(CustomTags.CRAFTING_SCREWDRIVERS)
-            .toolTag(CustomTags.SCREWDRIVERS)
-            .toolStats(b -> b.crafting().sneakBypassUse()
-                    .attackDamage(-1.0F).attackSpeed(3.0F).durabilityMultiplier(3.0F)
-                    .behaviors(new EntityDamageBehavior(3.0F, Spider.class))
-                    .brokenStack(ToolHelper.SUPPLY_POWER_UNIT_HV))
-            .sound(GTSoundEntries.SCREWDRIVER_TOOL)
-            .electric(GTValues.HV)
-            .toolClasses(GTToolType.SCREWDRIVER)
-            .defaultActions(GTToolActions.DEFAULT_SCREWDRIVER_ACTIONS)
-            .build();
     public static final GTToolType SCREWDRIVER_EV = GTToolType.builder("ev_screwdriver")
             .idFormat("ev_%s_screwdriver")
             .toolTag(CustomTags.CRAFTING_SCREWDRIVERS)
@@ -62,19 +49,6 @@ public final class UtilToolType {
             .toolClasses(GTToolType.SCREWDRIVER)
             .defaultActions(GTToolActions.DEFAULT_SCREWDRIVER_ACTIONS)
             .build();
-    public static final GTToolType SCREWDRIVER_IV = GTToolType.builder("iv_screwdriver")
-            .idFormat("iv_%s_screwdriver")
-            .toolTag(CustomTags.CRAFTING_SCREWDRIVERS)
-            .toolTag(CustomTags.SCREWDRIVERS)
-            .toolStats(b -> b.crafting().sneakBypassUse()
-                    .attackDamage(-1.0F).attackSpeed(3.0F).durabilityMultiplier(5.0F)
-                    .behaviors(new EntityDamageBehavior(3.0F, Spider.class))
-                    .brokenStack(ToolHelper.SUPPLY_POWER_UNIT_IV))
-            .sound(GTSoundEntries.SCREWDRIVER_TOOL)
-            .electric(GTValues.IV)
-            .toolClasses(GTToolType.SCREWDRIVER)
-            .defaultActions(GTToolActions.DEFAULT_SCREWDRIVER_ACTIONS)
-            .build();
     public static final GTToolType SCREWDRIVER_LuV = GTToolType.builder("luv_screwdriver")
             .idFormat("luv_%s_screwdriver")
             .toolTag(CustomTags.CRAFTING_SCREWDRIVERS)
@@ -125,25 +99,6 @@ public final class UtilToolType {
             .defaultActions(ToolActions.AXE_DIG, ToolActions.SWORD_DIG, ToolActions.HOE_DIG,
                     GTToolActions.SAW_DIG)
             .build();
-    public static final GTToolType CHAINSAW_HV = GTToolType.builder("hv_chainsaw")
-            .idFormat("hv_%s_chainsaw")
-            .toolTag(ItemTags.AXES)
-            .toolTag(CustomTags.CHAINSAWS)
-            .harvestTag(BlockTags.MINEABLE_WITH_AXE)
-            .harvestTag(BlockTags.SWORD_EFFICIENT)
-            .harvestTag(BlockTags.MINEABLE_WITH_HOE)
-            .toolStats(b -> b.blockBreaking()
-                    .efficiencyMultiplier(4.0F)
-                    .attackDamage(5.0F).attackSpeed(-3.2F)
-                    .brokenStack(ToolHelper.SUPPLY_POWER_UNIT_HV)
-                    .behaviors(HarvestIceBehavior.INSTANCE, DisableShieldBehavior.INSTANCE,
-                            TreeFellingBehavior.INSTANCE))
-            .sound(GTSoundEntries.CHAINSAW_TOOL, true)
-            .electric(GTValues.HV)
-            .toolClasses(GTToolType.AXE)
-            .defaultActions(ToolActions.AXE_DIG, ToolActions.SWORD_DIG, ToolActions.HOE_DIG,
-                    GTToolActions.SAW_DIG)
-            .build();
     public static final GTToolType CHAINSAW_EV = GTToolType.builder("ev_chainsaw")
             .idFormat("ev_%s_chainsaw")
             .toolTag(ItemTags.AXES)
@@ -163,25 +118,6 @@ public final class UtilToolType {
             .defaultActions(ToolActions.AXE_DIG, ToolActions.SWORD_DIG, ToolActions.HOE_DIG,
                     GTToolActions.SAW_DIG)
             .build();
-    public static final GTToolType CHAINSAW_IV = GTToolType.builder("iv_chainsaw")
-            .idFormat("iv_%s_chainsaw")
-            .toolTag(ItemTags.AXES)
-            .toolTag(CustomTags.CHAINSAWS)
-            .harvestTag(BlockTags.MINEABLE_WITH_AXE)
-            .harvestTag(BlockTags.SWORD_EFFICIENT)
-            .harvestTag(BlockTags.MINEABLE_WITH_HOE)
-            .toolStats(b -> b.blockBreaking()
-                    .efficiencyMultiplier(6.0F)
-                    .attackDamage(5.0F).attackSpeed(-3.2F)
-                    .brokenStack(ToolHelper.SUPPLY_POWER_UNIT_IV)
-                    .behaviors(HarvestIceBehavior.INSTANCE, DisableShieldBehavior.INSTANCE,
-                            TreeFellingBehavior.INSTANCE))
-            .sound(GTSoundEntries.CHAINSAW_TOOL, true)
-            .electric(GTValues.IV)
-            .toolClasses(GTToolType.AXE)
-            .defaultActions(ToolActions.AXE_DIG, ToolActions.SWORD_DIG, ToolActions.HOE_DIG,
-                    GTToolActions.SAW_DIG)
-            .build();
     public static final GTToolType CHAINSAW_LuV = GTToolType.builder("luv_chainsaw")
             .idFormat("luv_%s_chainsaw")
             .toolTag(ItemTags.AXES)

src/main/java/net/neganote/gtutilities/common/tools/recipe/UtilToolRecipeHelper.java

@@ -84,8 +84,8 @@ private static void processElectricTool(Consumer<FinishedRecipe> provider, ToolP
                         'R', steelRing);
 
                 addElectricToolRecipe(provider, toolPrefix,
-                        new GTToolType[] { UtilToolType.CHAINSAW_MV, UtilToolType.CHAINSAW_HV,
-                                UtilToolType.CHAINSAW_EV, UtilToolType.CHAINSAW_IV, UtilToolType.CHAINSAW_LuV,
+                        new GTToolType[] { UtilToolType.CHAINSAW_MV,
+                                UtilToolType.CHAINSAW_EV, UtilToolType.CHAINSAW_LuV,
                                 UtilToolType.CHAINSAW_ZPM, },
                         material);
             }
@@ -157,8 +157,8 @@ private static void processElectricTool(Consumer<FinishedRecipe> provider, ToolP
             if (material.hasFlag(GENERATE_LONG_ROD)) {
                 toolPrefix = TagPrefix.toolHeadScrewdriver;
                 addElectricToolRecipe(provider, toolPrefix,
-                        new GTToolType[] { UtilToolType.SCREWDRIVER_MV, UtilToolType.SCREWDRIVER_HV,
-                                UtilToolType.SCREWDRIVER_EV, UtilToolType.SCREWDRIVER_IV,
+                        new GTToolType[] { UtilToolType.SCREWDRIVER_MV,
+                                UtilToolType.SCREWDRIVER_EV,
                                 UtilToolType.SCREWDRIVER_LuV, UtilToolType.SCREWDRIVER_ZPM, },
                         material);
 

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

@@ -27,16 +27,12 @@ public static void init(RegistrateLangProvider provider) {
         provider.add("tooltip.omnibreaker.modern_vajra", "A Modern Vajra");
 
         provider.add("item.gtceu.tool.mv_screwdriver", "%s Electric Screwdriver (MV)");
-        provider.add("item.gtceu.tool.hv_screwdriver", "%s Electric Screwdriver (HV)");
         provider.add("item.gtceu.tool.ev_screwdriver", "%s Electric Screwdriver (EV)");
-        provider.add("item.gtceu.tool.iv_screwdriver", "%s Electric Screwdriver (IV)");
         provider.add("item.gtceu.tool.luv_screwdriver", "%s Electric Screwdriver (LuV)");
         provider.add("item.gtceu.tool.zpm_screwdriver", "%s Electric Screwdriver (ZPM)");
 
         provider.add("item.gtceu.tool.mv_chainsaw", "%s Chainsaw (MV)");
-        provider.add("item.gtceu.tool.hv_chainsaw", "%s Chainsaw (HV)");
         provider.add("item.gtceu.tool.ev_chainsaw", "%s Chainsaw (EV)");
-        provider.add("item.gtceu.tool.iv_chainsaw", "%s Chainsaw (IV)");
         provider.add("item.gtceu.tool.luv_chainsaw", "%s Chainsaw (LuV)");
         provider.add("item.gtceu.tool.zpm_chainsaw", "%s Chainsaw (ZPM)");
 
@@ -82,7 +78,9 @@ public static void init(RegistrateLangProvider provider) {
                 "Returns the current frequency used by a Wireless Active Transformer.",
                 "Usage:",
                 "  {watfrequency} -> Current frequency: (insert frequency here)");
-
+        provider.add("config.jade.plugin_gtmutils.me_expanded_pattern_buffer", "[GtmUtils] Pattern Buffer Info");
+        provider.add("config.jade.plugin_gtmutils.me_expanded_pattern_buffer_proxy",
+                "[GtmUtils] Pattern Buffer Proxy Info");
         provider.add("block.gtmutils.pattern_buffer.desc.0",
                 "§fAllows expanded direct §6AE2 pattern storage §ffor GregTech Multiblocks.");
         provider.add("block.gtmutils.pattern_buffer.desc.2",

src/main/java/net/neganote/gtutilities/integration/jade/provider/ExpandedMEPatternBufferProvider.java

@@ -57,7 +57,7 @@ public void appendServerData(CompoundTag compoundTag, BlockAccessor blockAccesso
 
     @Override
     public ResourceLocation getUid() {
-        return GregTechModernUtilities.id("me_expanded_pattern_buffer_info");
+        return GregTechModernUtilities.id("me_expanded_pattern_buffer");
     }
 
     public static void writeBufferTag(CompoundTag compoundTag, ExpandedPatternBufferPartMachine buffer) {

src/main/java/net/neganote/gtutilities/integration/jade/provider/ExpandedMEPatternBufferProxyProvider.java

@@ -66,6 +66,6 @@ public void appendServerData(CompoundTag compoundTag, BlockAccessor blockAccesso
 
     @Override
     public ResourceLocation getUid() {
-        return GregTechModernUtilities.id("me_expanded_pattern_buffer_proxy_info");
+        return GregTechModernUtilities.id("me_expanded_pattern_buffer_proxy");
     }
 }