Skip to content

Commit f1237eb

Browse files
Fix misleading variable name (toolClass -> toolId)
1 parent 7169eb8 commit f1237eb

File tree

4 files changed

+14
-14
lines changed

4 files changed

+14
-14
lines changed

src/main/java/gregtech/api/unification/material/Material.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -940,9 +940,9 @@ public Builder toolStats(ToolProperty toolProperty) {
940940
/**
941941
* Use {@link ExtraToolProperty.Builder} to create a Tool Property Override.
942942
*/
943-
public Builder overrideToolStats(String toolClass, ExtraToolProperty.OverrideToolProperty toolProperty) {
943+
public Builder overrideToolStats(String toolId, ExtraToolProperty.OverrideToolProperty toolProperty) {
944944
properties.ensureSet(PropertyKey.EXTRATOOL);
945-
properties.getProperty(PropertyKey.EXTRATOOL).setOverrideProperty(toolClass, toolProperty);
945+
properties.getProperty(PropertyKey.EXTRATOOL).setOverrideProperty(toolId, toolProperty);
946946
return this;
947947
}
948948

src/main/java/gregtech/api/unification/material/properties/ExtraToolProperty.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -72,22 +72,22 @@ public ExtraToolProperty() {
7272
this.overrideMap = new HashMap<>();
7373
}
7474

75-
public void setOverrideProperty(String toolClass, OverrideToolProperty overrideProperty) {
76-
this.overrideMap.put(toolClass, overrideProperty);
75+
public void setOverrideProperty(String toolId, OverrideToolProperty overrideProperty) {
76+
this.overrideMap.put(toolId, overrideProperty);
7777
}
7878

7979
@Nullable
80-
public OverrideToolProperty getOverrideProperty(String toolClass) {
81-
return this.overrideMap.get(toolClass);
80+
public OverrideToolProperty getOverrideProperty(String toolId) {
81+
return this.overrideMap.get(toolId);
8282
}
8383

84-
public boolean hasOverrideProperty(String toolClass) {
85-
return getOverrideProperty(toolClass) != null;
84+
public boolean hasOverrideProperty(String toolId) {
85+
return getOverrideProperty(toolId) != null;
8686
}
8787

88-
public SimpleToolProperty getOverriddenResult(String toolClass, @Nullable ToolProperty toolProperty) {
88+
public SimpleToolProperty getOverriddenResult(String toolId, @Nullable ToolProperty toolProperty) {
8989
if (toolProperty == null) toolProperty = new ToolProperty();
90-
return overrideMap.getOrDefault(toolClass, new OverrideToolProperty())
90+
return overrideMap.getOrDefault(toolId, new OverrideToolProperty())
9191
.override(toolProperty);
9292
}
9393

src/main/java/gregtech/integration/groovy/GroovyMaterialBuilderExpansion.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,8 +133,8 @@ public static Material.Builder toolStats(Material.Builder builder, float harvest
133133
return builder.toolStats(ToolProperty.Builder.of(harvestSpeed, attackDamage, durability, harvestLevel).build());
134134
}
135135

136-
public static Material.Builder overrideToolStats(Material.Builder builder, String toolClass,
136+
public static Material.Builder overrideToolStats(Material.Builder builder, String toolId,
137137
ExtraToolProperty.Builder overrideBuilder) {
138-
return builder.overrideToolStats(toolClass, overrideBuilder.build());
138+
return builder.overrideToolStats(toolId, overrideBuilder.build());
139139
}
140140
}

src/main/java/gregtech/integration/groovy/MaterialExpansion.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -191,12 +191,12 @@ public static void setToolStats(Material m, float toolSpeed, float toolAttackDam
191191
// Extra Tool Property //
192192
////////////////////////////////////
193193

194-
public static void setOverrideToolStats(Material m, String toolClass, ExtraToolProperty.Builder overrideBuilder) {
194+
public static void setOverrideToolStats(Material m, String toolId, ExtraToolProperty.Builder overrideBuilder) {
195195
if (checkFrozen("set overriding tool stats")) return;
196196
m.getProperties().ensureSet(PropertyKey.EXTRATOOL);
197197
ExtraToolProperty prop = m.getProperty(PropertyKey.EXTRATOOL);
198198
if (prop != null) {
199-
prop.setOverrideProperty(toolClass, overrideBuilder.build());
199+
prop.setOverrideProperty(toolId, overrideBuilder.build());
200200
} else logError(m, "change tool stats", "Tool");
201201
}
202202

0 commit comments

Comments
 (0)