diff --git a/gradle.properties b/gradle.properties index 0306255..97f9bba 100644 --- a/gradle.properties +++ b/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 diff --git a/src/generated/resources/assets/gtmutils/lang/en_ud.json b/src/generated/resources/assets/gtmutils/lang/en_ud.json index f298d05..ea9022c 100644 --- a/src/generated/resources/assets/gtmutils/lang/en_ud.json +++ b/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", diff --git a/src/generated/resources/assets/gtmutils/lang/en_us.json b/src/generated/resources/assets/gtmutils/lang/en_us.json index 73a4f1c..ad78d24 100644 --- a/src/generated/resources/assets/gtmutils/lang/en_us.json +++ b/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)", diff --git a/src/main/java/net/neganote/gtutilities/common/machine/UtilMachines.java b/src/main/java/net/neganote/gtutilities/common/machine/UtilMachines.java index 731b57c..9d0a619 100644 --- a/src/main/java/net/neganote/gtutilities/common/machine/UtilMachines.java +++ b/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 factory, - BiFunction, MachineDefinition> builder, + BiFunction, MachineDefinition> builder, int... tiers) { MachineDefinition[] definitions = new MachineDefinition[GTValues.TIER_COUNT]; for (int tier : tiers) { diff --git a/src/main/java/net/neganote/gtutilities/common/tools/UtilToolConnection.java b/src/main/java/net/neganote/gtutilities/common/tools/UtilToolConnection.java index ff6c554..703e33f 100644 --- a/src/main/java/net/neganote/gtutilities/common/tools/UtilToolConnection.java +++ b/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 diff --git a/src/main/java/net/neganote/gtutilities/common/tools/UtilToolType.java b/src/main/java/net/neganote/gtutilities/common/tools/UtilToolType.java index 777a46c..8b1f6d3 100644 --- a/src/main/java/net/neganote/gtutilities/common/tools/UtilToolType.java +++ b/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) diff --git a/src/main/java/net/neganote/gtutilities/common/tools/recipe/UtilToolRecipeHelper.java b/src/main/java/net/neganote/gtutilities/common/tools/recipe/UtilToolRecipeHelper.java index 3cbc4fa..99169b5 100644 --- a/src/main/java/net/neganote/gtutilities/common/tools/recipe/UtilToolRecipeHelper.java +++ b/src/main/java/net/neganote/gtutilities/common/tools/recipe/UtilToolRecipeHelper.java @@ -84,8 +84,8 @@ private static void processElectricTool(Consumer 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 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); diff --git a/src/main/java/net/neganote/gtutilities/datagen/lang/UtilLangHandler.java b/src/main/java/net/neganote/gtutilities/datagen/lang/UtilLangHandler.java index 057627d..0246d23 100644 --- a/src/main/java/net/neganote/gtutilities/datagen/lang/UtilLangHandler.java +++ b/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", diff --git a/src/main/java/net/neganote/gtutilities/integration/jade/provider/ExpandedMEPatternBufferProvider.java b/src/main/java/net/neganote/gtutilities/integration/jade/provider/ExpandedMEPatternBufferProvider.java index 3e30692..8a77be3 100644 --- a/src/main/java/net/neganote/gtutilities/integration/jade/provider/ExpandedMEPatternBufferProvider.java +++ b/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) { diff --git a/src/main/java/net/neganote/gtutilities/integration/jade/provider/ExpandedMEPatternBufferProxyProvider.java b/src/main/java/net/neganote/gtutilities/integration/jade/provider/ExpandedMEPatternBufferProxyProvider.java index d6fd627..28e1763 100644 --- a/src/main/java/net/neganote/gtutilities/integration/jade/provider/ExpandedMEPatternBufferProxyProvider.java +++ b/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"); } } diff --git a/src/main/resources/assets/gtceu/models/item/tools/hv_chainsaw.json b/src/main/resources/assets/gtceu/models/item/tools/hv_chainsaw.json deleted file mode 100644 index 3b86d4c..0000000 --- a/src/main/resources/assets/gtceu/models/item/tools/hv_chainsaw.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "parent": "item/handheld", - "textures": { - "layer0": "gtceu:item/tools/power_unit_hv", - "layer1": "gtceu:item/tools/chainsaw", - "layer2": "gtceu:item/void", - "layer3": "gtmutils:item/tools/chainsaw_body_hv" - } -} diff --git a/src/main/resources/assets/gtceu/models/item/tools/hv_screwdriver.json b/src/main/resources/assets/gtceu/models/item/tools/hv_screwdriver.json deleted file mode 100644 index 58fab2e..0000000 --- a/src/main/resources/assets/gtceu/models/item/tools/hv_screwdriver.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "item/handheld", - "textures": { - "layer0": "gtmutils:item/tools/handle_electric_screwdriver_hv", - "layer1": "gtceu:item/tools/screwdriver_short", - "layer2": "gtceu:item/tools/screwdriver_overlay" - } -} diff --git a/src/main/resources/assets/gtceu/models/item/tools/iv_chainsaw.json b/src/main/resources/assets/gtceu/models/item/tools/iv_chainsaw.json deleted file mode 100644 index 99d1625..0000000 --- a/src/main/resources/assets/gtceu/models/item/tools/iv_chainsaw.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "parent": "item/handheld", - "textures": { - "layer0": "gtceu:item/tools/power_unit_iv", - "layer1": "gtceu:item/tools/chainsaw", - "layer2": "gtceu:item/void", - "layer3": "gtmutils:item/tools/chainsaw_body_iv" - } -} diff --git a/src/main/resources/assets/gtceu/models/item/tools/iv_screwdriver.json b/src/main/resources/assets/gtceu/models/item/tools/iv_screwdriver.json deleted file mode 100644 index 805da93..0000000 --- a/src/main/resources/assets/gtceu/models/item/tools/iv_screwdriver.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "item/handheld", - "textures": { - "layer0": "gtmutils:item/tools/handle_electric_screwdriver_iv", - "layer1": "gtceu:item/tools/screwdriver_short", - "layer2": "gtceu:item/tools/screwdriver_overlay" - } -} diff --git a/src/main/resources/assets/gtmutils/textures/item/tools/chainsaw_body_hv.png b/src/main/resources/assets/gtmutils/textures/item/tools/chainsaw_body_hv.png deleted file mode 100644 index 1158880..0000000 Binary files a/src/main/resources/assets/gtmutils/textures/item/tools/chainsaw_body_hv.png and /dev/null differ diff --git a/src/main/resources/assets/gtmutils/textures/item/tools/chainsaw_body_iv.png b/src/main/resources/assets/gtmutils/textures/item/tools/chainsaw_body_iv.png deleted file mode 100644 index 053b537..0000000 Binary files a/src/main/resources/assets/gtmutils/textures/item/tools/chainsaw_body_iv.png and /dev/null differ diff --git a/src/main/resources/assets/gtmutils/textures/item/tools/handle_electric_screwdriver_hv.png b/src/main/resources/assets/gtmutils/textures/item/tools/handle_electric_screwdriver_hv.png deleted file mode 100644 index 4aec88e..0000000 Binary files a/src/main/resources/assets/gtmutils/textures/item/tools/handle_electric_screwdriver_hv.png and /dev/null differ diff --git a/src/main/resources/assets/gtmutils/textures/item/tools/handle_electric_screwdriver_iv.png b/src/main/resources/assets/gtmutils/textures/item/tools/handle_electric_screwdriver_iv.png deleted file mode 100644 index 8556b5e..0000000 Binary files a/src/main/resources/assets/gtmutils/textures/item/tools/handle_electric_screwdriver_iv.png and /dev/null differ