Skip to content

Commit b819a31

Browse files
NegaNoteNegaNote
committed
GregTech Modern Utilities version 2.8.0
* Migrate to GTm 7.5.1 (this version is REQUIRED to run in 7.5.1+) * Includes removal of custom hv/iv chainsaw and screwdriver, as they are now in the base mod
1 parent 9f18507 commit b819a31

17 files changed

Lines changed: 16 additions & 138 deletions

File tree

‎changelog.md‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1-
# GregTech Modern Utilities version 2.7.2
1+
# GregTech Modern Utilities version 2.8.0
22

3-
* Fix crash with tag parsing in tag buses/hatches (thanks Wizz)
3+
* Migrate to GTm 7.5.1 (this version is REQUIRED to run in 7.5.1+)
4+
* Includes removal of custom hv/iv chainsaw and screwdriver, as they are now in the base mod

‎gradle.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ org.gradle.jvmargs=-Xmx1G
1111
mapping_version=2023.09.03
1212

1313
# Mod Properties
14-
mod_version=2.7.2
14+
mod_version=2.8.0
1515
maven_group=net.neganote.gtmutils
1616
archives_base_name=gtmutils
1717
mod_id=gtmutils
@@ -23,7 +23,7 @@ org.gradle.jvmargs=-Xmx1G
2323
# Dependencies
2424
appeng_version=15.0.18
2525
architectury_version=9.2.14
26-
gtceu_version=7.4.0
26+
gtceu_version=7.5.1
2727
ldlib_version=1.0.40.b
2828
registrate_version=MC1.20-1.3.11
2929
rhino_version=2001.2.3-build.6

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -101,11 +101,7 @@
101101
"item.gtceu.tool.ev_wirecutter": ")ΛƎ( ɹǝʇʇnƆ ǝɹıM %s",
102102
"item.gtceu.tool.ev_wrench": ")ΛƎ( ɥɔuǝɹM %s",
103103
"item.gtceu.tool.hv_buzzsaw": ")ΛH( ʍɐszznᗺ %s",
104-
"item.gtceu.tool.hv_chainsaw": ")ΛH( ʍɐsuıɐɥƆ %s",
105-
"item.gtceu.tool.hv_screwdriver": ")ΛH( ɹǝʌıɹpʍǝɹɔS ɔıɹʇɔǝןƎ %s",
106104
"item.gtceu.tool.iv_buzzsaw": ")ΛI( ʍɐszznᗺ %s",
107-
"item.gtceu.tool.iv_chainsaw": ")ΛI( ʍɐsuıɐɥƆ %s",
108-
"item.gtceu.tool.iv_screwdriver": ")ΛI( ɹǝʌıɹpʍǝɹɔS ɔıɹʇɔǝןƎ %s",
109105
"item.gtceu.tool.luv_buzzsaw": ")ΛnꞀ( ʍɐszznᗺ %s",
110106
"item.gtceu.tool.luv_chainsaw": ")ΛnꞀ( ʍɐsuıɐɥƆ %s",
111107
"item.gtceu.tool.luv_drill": ")ΛnꞀ( ןןıɹᗡ %s",

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -101,11 +101,7 @@
101101
"item.gtceu.tool.ev_wirecutter": "%s Wire Cutter (EV)",
102102
"item.gtceu.tool.ev_wrench": "%s Wrench (EV)",
103103
"item.gtceu.tool.hv_buzzsaw": "%s Buzzsaw (HV)",
104-
"item.gtceu.tool.hv_chainsaw": "%s Chainsaw (HV)",
105-
"item.gtceu.tool.hv_screwdriver": "%s Electric Screwdriver (HV)",
106104
"item.gtceu.tool.iv_buzzsaw": "%s Buzzsaw (IV)",
107-
"item.gtceu.tool.iv_chainsaw": "%s Chainsaw (IV)",
108-
"item.gtceu.tool.iv_screwdriver": "%s Electric Screwdriver (IV)",
109105
"item.gtceu.tool.luv_buzzsaw": "%s Buzzsaw (LuV)",
110106
"item.gtceu.tool.luv_chainsaw": "%s Chainsaw (LuV)",
111107
"item.gtceu.tool.luv_drill": "%s Drill (LuV)",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ public static MachineDefinition[] registerConverter(int amperage) {
136136
// Copied from GTMachineUtils
137137
public static MachineDefinition[] registerTieredMachines(String name,
138138
BiFunction<IMachineBlockEntity, Integer, MetaMachine> factory,
139-
BiFunction<Integer, MachineBuilder<MachineDefinition>, MachineDefinition> builder,
139+
BiFunction<Integer, MachineBuilder<MachineDefinition, ?>, MachineDefinition> builder,
140140
int... tiers) {
141141
MachineDefinition[] definitions = new MachineDefinition[GTValues.TIER_COUNT];
142142
for (int tier : tiers) {

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

Lines changed: 7 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package net.neganote.gtutilities.common.tools;
22

3+
import com.gregtechceu.gtceu.GTCEu;
34
import com.gregtechceu.gtceu.api.GTCEuAPI;
45
import com.gregtechceu.gtceu.api.data.chemical.material.Material;
56
import com.gregtechceu.gtceu.api.data.chemical.material.properties.PropertyKey;
@@ -22,7 +23,7 @@ public static void modifyMaterials() {
2223
}
2324

2425
// Custom MV Tools
25-
if (UtilConfig.INSTANCE.features.customMVToolsEnabled) {
26+
if (UtilConfig.INSTANCE.features.customMVToolsEnabled || GTCEu.isDataGen()) {
2627
if (toolProperty.hasType(GTToolType.SCREWDRIVER_LV)) {
2728
toolProperty.addTypes(UtilToolType.SCREWDRIVER_MV);
2829
}
@@ -41,20 +42,14 @@ public static void modifyMaterials() {
4142
}
4243

4344
// Custom HV Tools
44-
if (UtilConfig.INSTANCE.features.customHVToolsEnabled) {
45-
if (toolProperty.hasType(GTToolType.SCREWDRIVER_LV)) {
46-
toolProperty.addTypes(UtilToolType.SCREWDRIVER_HV);
47-
}
45+
if (UtilConfig.INSTANCE.features.customHVToolsEnabled || GTCEu.isDataGen()) {
4846
if (toolProperty.hasType(GTToolType.BUZZSAW)) {
4947
toolProperty.addTypes(UtilToolType.BUZZSAW_HV);
5048
}
51-
if (toolProperty.hasType(GTToolType.CHAINSAW_LV)) {
52-
toolProperty.addTypes(UtilToolType.CHAINSAW_HV);
53-
}
5449
}
5550

5651
// Custom EV Tools
57-
if (UtilConfig.INSTANCE.features.customEVToolsEnabled) {
52+
if (UtilConfig.INSTANCE.features.customEVToolsEnabled || GTCEu.isDataGen()) {
5853
if (toolProperty.hasType(GTToolType.SCREWDRIVER_LV)) {
5954
toolProperty.addTypes(UtilToolType.SCREWDRIVER_EV);
6055
}
@@ -73,20 +68,14 @@ public static void modifyMaterials() {
7368
}
7469

7570
// Custom IV Tools
76-
if (UtilConfig.INSTANCE.features.customIVToolsEnabled) {
77-
if (toolProperty.hasType(GTToolType.SCREWDRIVER_LV)) {
78-
toolProperty.addTypes(UtilToolType.SCREWDRIVER_IV);
79-
}
71+
if (UtilConfig.INSTANCE.features.customIVToolsEnabled || GTCEu.isDataGen()) {
8072
if (toolProperty.hasType(GTToolType.BUZZSAW)) {
8173
toolProperty.addTypes(UtilToolType.BUZZSAW_IV);
8274
}
83-
if (toolProperty.hasType(GTToolType.CHAINSAW_LV)) {
84-
toolProperty.addTypes(UtilToolType.CHAINSAW_IV);
85-
}
8675
}
8776

8877
// Custom LuV Tools
89-
if (UtilConfig.INSTANCE.features.customLuVToolsEnabled) {
78+
if (UtilConfig.INSTANCE.features.customLuVToolsEnabled || GTCEu.isDataGen()) {
9079
if (toolProperty.hasType(GTToolType.SCREWDRIVER_LV)) {
9180
toolProperty.addTypes(UtilToolType.SCREWDRIVER_LuV);
9281
}
@@ -108,7 +97,7 @@ public static void modifyMaterials() {
10897
}
10998

11099
// Custom ZPM Tools
111-
if (UtilConfig.INSTANCE.features.customZPMToolsEnabled) {
100+
if (UtilConfig.INSTANCE.features.customZPMToolsEnabled || GTCEu.isDataGen()) {
112101
if (toolProperty.hasType(GTToolType.SCREWDRIVER_LV)) {
113102
toolProperty.addTypes(UtilToolType.SCREWDRIVER_ZPM);
114103
}

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

Lines changed: 0 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -36,19 +36,6 @@ public final class UtilToolType {
3636
.toolClasses(GTToolType.SCREWDRIVER)
3737
.defaultActions(GTToolActions.DEFAULT_SCREWDRIVER_ACTIONS)
3838
.build();
39-
public static final GTToolType SCREWDRIVER_HV = GTToolType.builder("hv_screwdriver")
40-
.idFormat("hv_%s_screwdriver")
41-
.toolTag(CustomTags.CRAFTING_SCREWDRIVERS)
42-
.toolTag(CustomTags.SCREWDRIVERS)
43-
.toolStats(b -> b.crafting().sneakBypassUse()
44-
.attackDamage(-1.0F).attackSpeed(3.0F).durabilityMultiplier(3.0F)
45-
.behaviors(new EntityDamageBehavior(3.0F, Spider.class))
46-
.brokenStack(ToolHelper.SUPPLY_POWER_UNIT_HV))
47-
.sound(GTSoundEntries.SCREWDRIVER_TOOL)
48-
.electric(GTValues.HV)
49-
.toolClasses(GTToolType.SCREWDRIVER)
50-
.defaultActions(GTToolActions.DEFAULT_SCREWDRIVER_ACTIONS)
51-
.build();
5239
public static final GTToolType SCREWDRIVER_EV = GTToolType.builder("ev_screwdriver")
5340
.idFormat("ev_%s_screwdriver")
5441
.toolTag(CustomTags.CRAFTING_SCREWDRIVERS)
@@ -62,19 +49,6 @@ public final class UtilToolType {
6249
.toolClasses(GTToolType.SCREWDRIVER)
6350
.defaultActions(GTToolActions.DEFAULT_SCREWDRIVER_ACTIONS)
6451
.build();
65-
public static final GTToolType SCREWDRIVER_IV = GTToolType.builder("iv_screwdriver")
66-
.idFormat("iv_%s_screwdriver")
67-
.toolTag(CustomTags.CRAFTING_SCREWDRIVERS)
68-
.toolTag(CustomTags.SCREWDRIVERS)
69-
.toolStats(b -> b.crafting().sneakBypassUse()
70-
.attackDamage(-1.0F).attackSpeed(3.0F).durabilityMultiplier(5.0F)
71-
.behaviors(new EntityDamageBehavior(3.0F, Spider.class))
72-
.brokenStack(ToolHelper.SUPPLY_POWER_UNIT_IV))
73-
.sound(GTSoundEntries.SCREWDRIVER_TOOL)
74-
.electric(GTValues.IV)
75-
.toolClasses(GTToolType.SCREWDRIVER)
76-
.defaultActions(GTToolActions.DEFAULT_SCREWDRIVER_ACTIONS)
77-
.build();
7852
public static final GTToolType SCREWDRIVER_LuV = GTToolType.builder("luv_screwdriver")
7953
.idFormat("luv_%s_screwdriver")
8054
.toolTag(CustomTags.CRAFTING_SCREWDRIVERS)
@@ -125,25 +99,6 @@ public final class UtilToolType {
12599
.defaultActions(ToolActions.AXE_DIG, ToolActions.SWORD_DIG, ToolActions.HOE_DIG,
126100
GTToolActions.SAW_DIG)
127101
.build();
128-
public static final GTToolType CHAINSAW_HV = GTToolType.builder("hv_chainsaw")
129-
.idFormat("hv_%s_chainsaw")
130-
.toolTag(ItemTags.AXES)
131-
.toolTag(CustomTags.CHAINSAWS)
132-
.harvestTag(BlockTags.MINEABLE_WITH_AXE)
133-
.harvestTag(BlockTags.SWORD_EFFICIENT)
134-
.harvestTag(BlockTags.MINEABLE_WITH_HOE)
135-
.toolStats(b -> b.blockBreaking()
136-
.efficiencyMultiplier(4.0F)
137-
.attackDamage(5.0F).attackSpeed(-3.2F)
138-
.brokenStack(ToolHelper.SUPPLY_POWER_UNIT_HV)
139-
.behaviors(HarvestIceBehavior.INSTANCE, DisableShieldBehavior.INSTANCE,
140-
TreeFellingBehavior.INSTANCE))
141-
.sound(GTSoundEntries.CHAINSAW_TOOL, true)
142-
.electric(GTValues.HV)
143-
.toolClasses(GTToolType.AXE)
144-
.defaultActions(ToolActions.AXE_DIG, ToolActions.SWORD_DIG, ToolActions.HOE_DIG,
145-
GTToolActions.SAW_DIG)
146-
.build();
147102
public static final GTToolType CHAINSAW_EV = GTToolType.builder("ev_chainsaw")
148103
.idFormat("ev_%s_chainsaw")
149104
.toolTag(ItemTags.AXES)
@@ -163,25 +118,6 @@ public final class UtilToolType {
163118
.defaultActions(ToolActions.AXE_DIG, ToolActions.SWORD_DIG, ToolActions.HOE_DIG,
164119
GTToolActions.SAW_DIG)
165120
.build();
166-
public static final GTToolType CHAINSAW_IV = GTToolType.builder("iv_chainsaw")
167-
.idFormat("iv_%s_chainsaw")
168-
.toolTag(ItemTags.AXES)
169-
.toolTag(CustomTags.CHAINSAWS)
170-
.harvestTag(BlockTags.MINEABLE_WITH_AXE)
171-
.harvestTag(BlockTags.SWORD_EFFICIENT)
172-
.harvestTag(BlockTags.MINEABLE_WITH_HOE)
173-
.toolStats(b -> b.blockBreaking()
174-
.efficiencyMultiplier(6.0F)
175-
.attackDamage(5.0F).attackSpeed(-3.2F)
176-
.brokenStack(ToolHelper.SUPPLY_POWER_UNIT_IV)
177-
.behaviors(HarvestIceBehavior.INSTANCE, DisableShieldBehavior.INSTANCE,
178-
TreeFellingBehavior.INSTANCE))
179-
.sound(GTSoundEntries.CHAINSAW_TOOL, true)
180-
.electric(GTValues.IV)
181-
.toolClasses(GTToolType.AXE)
182-
.defaultActions(ToolActions.AXE_DIG, ToolActions.SWORD_DIG, ToolActions.HOE_DIG,
183-
GTToolActions.SAW_DIG)
184-
.build();
185121
public static final GTToolType CHAINSAW_LuV = GTToolType.builder("luv_chainsaw")
186122
.idFormat("luv_%s_chainsaw")
187123
.toolTag(ItemTags.AXES)

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

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -84,9 +84,8 @@ private static void processElectricTool(Consumer<FinishedRecipe> provider, ToolP
8484
'R', steelRing);
8585

8686
addElectricToolRecipe(provider, toolPrefix,
87-
new GTToolType[] { UtilToolType.CHAINSAW_MV, UtilToolType.CHAINSAW_HV,
88-
UtilToolType.CHAINSAW_EV, UtilToolType.CHAINSAW_IV, UtilToolType.CHAINSAW_LuV,
89-
UtilToolType.CHAINSAW_ZPM, },
87+
new GTToolType[] { UtilToolType.CHAINSAW_MV, UtilToolType.CHAINSAW_EV,
88+
UtilToolType.CHAINSAW_LuV, UtilToolType.CHAINSAW_ZPM, },
9089
material);
9190
}
9291

@@ -157,8 +156,7 @@ private static void processElectricTool(Consumer<FinishedRecipe> provider, ToolP
157156
if (material.hasFlag(GENERATE_LONG_ROD)) {
158157
toolPrefix = TagPrefix.toolHeadScrewdriver;
159158
addElectricToolRecipe(provider, toolPrefix,
160-
new GTToolType[] { UtilToolType.SCREWDRIVER_MV, UtilToolType.SCREWDRIVER_HV,
161-
UtilToolType.SCREWDRIVER_EV, UtilToolType.SCREWDRIVER_IV,
159+
new GTToolType[] { UtilToolType.SCREWDRIVER_MV, UtilToolType.SCREWDRIVER_EV,
162160
UtilToolType.SCREWDRIVER_LuV, UtilToolType.SCREWDRIVER_ZPM, },
163161
material);
164162

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,16 +27,12 @@ public static void init(RegistrateLangProvider provider) {
2727
provider.add("tooltip.omnibreaker.modern_vajra", "A Modern Vajra");
2828

2929
provider.add("item.gtceu.tool.mv_screwdriver", "%s Electric Screwdriver (MV)");
30-
provider.add("item.gtceu.tool.hv_screwdriver", "%s Electric Screwdriver (HV)");
3130
provider.add("item.gtceu.tool.ev_screwdriver", "%s Electric Screwdriver (EV)");
32-
provider.add("item.gtceu.tool.iv_screwdriver", "%s Electric Screwdriver (IV)");
3331
provider.add("item.gtceu.tool.luv_screwdriver", "%s Electric Screwdriver (LuV)");
3432
provider.add("item.gtceu.tool.zpm_screwdriver", "%s Electric Screwdriver (ZPM)");
3533

3634
provider.add("item.gtceu.tool.mv_chainsaw", "%s Chainsaw (MV)");
37-
provider.add("item.gtceu.tool.hv_chainsaw", "%s Chainsaw (HV)");
3835
provider.add("item.gtceu.tool.ev_chainsaw", "%s Chainsaw (EV)");
39-
provider.add("item.gtceu.tool.iv_chainsaw", "%s Chainsaw (IV)");
4036
provider.add("item.gtceu.tool.luv_chainsaw", "%s Chainsaw (LuV)");
4137
provider.add("item.gtceu.tool.zpm_chainsaw", "%s Chainsaw (ZPM)");
4238

‎src/main/resources/assets/gtceu/models/item/tools/hv_chainsaw.json‎

Lines changed: 0 additions & 9 deletions
This file was deleted.

0 commit comments

Comments
 (0)