Skip to content

Commit 0f5b054

Browse files
VlamonsterCaedisDream-Masterboubou19
authored
Update uses of crafting tools (#1267)
Co-authored-by: Caedis <Caedis@users.noreply.github.com> Co-authored-by: Martin Robertz <dream-master@gmx.net> Co-authored-by: boubou19 <miisterunknown@gmail.com>
1 parent 6963373 commit 0f5b054

15 files changed

+214
-372
lines changed

‎dependencies.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Add your dependencies here
22

33
dependencies {
4-
api("com.github.GTNewHorizons:GT5-Unofficial:5.09.51.302:dev")
4+
api("com.github.GTNewHorizons:GT5-Unofficial:5.09.51.306:dev")
55
api("com.github.GTNewHorizons:Yamcl:0.7.0:dev")
66
api("com.github.GTNewHorizons:Baubles-Expanded:2.1.8-GTNH:dev")
77

@@ -24,7 +24,7 @@ dependencies {
2424
compileOnly("TGregworks:TGregworks:1.7.10-GTNH-1.0.26:deobf") { transitive = false }
2525
compileOnly("com.github.GTNewHorizons:amunra:0.8.1:dev") { transitive = false }
2626
compileOnly("com.github.GTNewHorizons:Galacticraft:3.3.7-GTNH:dev") { transitive = false }
27-
compileOnly("com.github.GTNewHorizons:ForestryMC:4.10.8:dev") { transitive = false }
27+
compileOnly("com.github.GTNewHorizons:ForestryMC:4.10.10:dev") { transitive = false }
2828
compileOnly("com.github.GTNewHorizons:MatterManipulator:0.0.27-GTNH:dev") { transitive = false }
2929
compileOnly("com.github.GTNewHorizons:IguanaTweaksTConstruct:2.6.2:dev") { transitive = false }
3030
compileOnlyApi("com.github.GTNewHorizons:Mobs-Info:0.5.2-GTNH:dev")

‎src/main/java/com/dreammaster/gthandler/GT_CraftingRecipeLoader.java

Lines changed: 128 additions & 215 deletions
Large diffs are not rendered by default.

‎src/main/java/com/dreammaster/scripts/ScriptAppliedEnergistics2.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@
4545
import gregtech.api.enums.MaterialsUEVplus;
4646
import gregtech.api.enums.OrePrefixes;
4747
import gregtech.api.enums.TierEU;
48+
import gregtech.api.enums.ToolDictNames;
4849
import gregtech.api.util.GTModHandler;
4950
import gregtech.api.util.GTOreDictUnificator;
5051
import gregtech.api.util.GTUtility;
@@ -1053,7 +1054,7 @@ public void loadRecipes() {
10531054
getModItem(AppliedEnergistics2.ID, "item.ItemMultiPart", 1, 360, missing),
10541055
"craftingToolScrewdriver",
10551056
getModItem(AppliedEnergistics2.ID, "item.ItemMultiPart", 1, 380, missing),
1056-
"craftingToolSoftHammer",
1057+
ToolDictNames.craftingToolSoftMallet.name(),
10571058
"screwCertusQuartz",
10581059
getModItem(TinkerConstruct.ID, "CraftingSlab", 1, 0, missing),
10591060
"screwCertusQuartz",
@@ -1064,7 +1065,7 @@ public void loadRecipes() {
10641065
getModItem(AppliedEnergistics2.ID, "item.ItemMultiPart", 1, 500, missing),
10651066
"craftingToolScrewdriver",
10661067
getModItem(AppliedEnergistics2.ID, "item.ItemMultiPart", 1, 360, missing),
1067-
"craftingToolSoftHammer",
1068+
ToolDictNames.craftingToolSoftMallet.name(),
10681069
ItemList.Conveyor_Module_LuV.get(1L),
10691070
CustomItemList.EngineeringProcessorItemAdvEmeraldCore.get(1L),
10701071
ItemList.Conveyor_Module_LuV.get(1L),
@@ -1075,7 +1076,7 @@ public void loadRecipes() {
10751076
getModItem(AppliedEnergistics2.ID, "item.ItemMultiPart", 1, 480, missing),
10761077
"craftingToolScrewdriver",
10771078
getModItem(AppliedEnergistics2.ID, "item.ItemMultiPart", 1, 380, missing),
1078-
"craftingToolSoftHammer",
1079+
ToolDictNames.craftingToolSoftMallet.name(),
10791080
"screwCertusQuartz",
10801081
getModItem(AppliedEnergistics2.ID, "item.ItemMultiPart", 1, 440, missing),
10811082
"screwCertusQuartz",
@@ -1097,7 +1098,7 @@ public void loadRecipes() {
10971098
getModItem(AppliedEnergistics2.ID, "item.ItemMultiPart", 1, 340, missing),
10981099
"craftingToolScrewdriver",
10991100
getModItem(AppliedEnergistics2.ID, "item.ItemMultiPart", 1, 380, missing),
1100-
"craftingToolSoftHammer",
1101+
ToolDictNames.craftingToolSoftMallet.name(),
11011102
"screwCertusQuartz",
11021103
getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1, 52, missing),
11031104
"screwCertusQuartz",

‎src/main/java/com/dreammaster/scripts/ScriptBattleGear.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212

1313
import gregtech.api.enums.Materials;
1414
import gregtech.api.enums.OrePrefixes;
15+
import gregtech.api.enums.ToolDictNames;
1516
import gregtech.api.util.GTOreDictUnificator;
1617

1718
public class ScriptBattleGear implements IScriptLoader {
@@ -221,7 +222,7 @@ public void loadRecipes() {
221222
addShapedRecipe(
222223
getModItem(MineAndBladeBattleGear2.ID, "waraxe.wood", 1, 0, missing),
223224
getModItem(TinkerConstruct.ID, "hatchetHead", 1, 0, missing),
224-
"craftingToolSoftHammer",
225+
ToolDictNames.craftingToolSoftMallet.name(),
225226
getModItem(TinkerConstruct.ID, "hatchetHead", 1, 0, missing),
226227
getModItem(TinkerConstruct.ID, "hatchetHead", 1, 0, missing),
227228
"stickWood",
@@ -306,7 +307,7 @@ public void loadRecipes() {
306307
getModItem(TinkerConstruct.ID, "heavyPlate", 1, 0, missing),
307308
getModItem(TinkerConstruct.ID, "heavyPlate", 1, 0, missing),
308309
"stickWood",
309-
"craftingToolSoftHammer",
310+
ToolDictNames.craftingToolSoftMallet.name(),
310311
null);
311312
addShapedRecipe(
312313
getModItem(MineAndBladeBattleGear2.ID, "mace.stone", 1, 0, missing),

‎src/main/java/com/dreammaster/scripts/ScriptBiblioCraft.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
import gregtech.api.enums.GTValues;
2020
import gregtech.api.enums.Materials;
21+
import gregtech.api.enums.ToolDictNames;
2122
import gregtech.api.util.GTModHandler;
2223

2324
public class ScriptBiblioCraft implements IScriptLoader {
@@ -615,7 +616,7 @@ public void loadRecipes() {
615616
"wireFineGold",
616617
"wireFineGold",
617618
"lensGlass",
618-
"craftingToolSoftHammer",
619+
ToolDictNames.craftingToolSoftMallet.name(),
619620
"wireFineGold",
620621
null,
621622
"wireFineGold",
@@ -627,7 +628,7 @@ public void loadRecipes() {
627628
"wireFineSteel",
628629
"wireFineSteel",
629630
"plateLead",
630-
"craftingToolSoftHammer",
631+
ToolDictNames.craftingToolSoftMallet.name(),
631632
"wireFineSteel",
632633
"roundLead",
633634
null,

‎src/main/java/com/dreammaster/scripts/ScriptCarpentersBlocks.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import gregtech.api.enums.Materials;
2121
import gregtech.api.enums.Mods;
2222
import gregtech.api.enums.OrePrefixes;
23+
import gregtech.api.enums.ToolDictNames;
2324
import gregtech.api.util.GTOreDictUnificator;
2425

2526
public class ScriptCarpentersBlocks implements IScriptLoader {
@@ -166,7 +167,7 @@ public void loadRecipes() {
166167
getModItem(CarpentersBlocks.ID, "blockCarpentersBlock", 1, 0, missing),
167168
getModItem(CarpentersBlocks.ID, "blockCarpentersBlock", 1, 0, missing),
168169
getModItem(CarpentersBlocks.ID, "blockCarpentersBarrier", 1, 0, missing),
169-
"craftingToolSoftHammer",
170+
ToolDictNames.craftingToolSoftMallet.name(),
170171
getModItem(CarpentersBlocks.ID, "blockCarpentersBarrier", 1, 0, missing));
171172
addShapedRecipe(
172173
getModItem(CarpentersBlocks.ID, "blockCarpentersTorch", 2, 0, missing),

‎src/main/java/com/dreammaster/scripts/ScriptForbiddenMagic.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
import gregtech.api.enums.ItemList;
3636
import gregtech.api.enums.Materials;
3737
import gregtech.api.enums.OrePrefixes;
38+
import gregtech.api.enums.ToolDictNames;
3839
import gregtech.api.util.GTOreDictUnificator;
3940
import thaumcraft.api.ThaumcraftApi;
4041
import thaumcraft.api.aspects.Aspect;
@@ -532,7 +533,7 @@ public void loadRecipes() {
532533
'h',
533534
"stickWood",
534535
'i',
535-
"craftingToolSoftHammer");
536+
ToolDictNames.craftingToolSoftMallet.name());
536537
TCHelper.addResearchPage(
537538
"RIDINGCROP",
538539
new ResearchPage(

‎src/main/java/com/dreammaster/scripts/ScriptGalaxySpace.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@
4141
import gregtech.api.enums.Materials;
4242
import gregtech.api.enums.OrePrefixes;
4343
import gregtech.api.enums.TierEU;
44-
import gregtech.api.enums.ToolDictNames;
4544
import gregtech.api.util.GTModHandler;
4645
import gregtech.api.util.GTOreDictUnificator;
4746
import gregtech.api.util.GTUtility;
@@ -728,8 +727,7 @@ public void loadRecipes() {
728727
GTModHandler.addCraftingRecipe(
729728
getGSItem("item.plasmashovel", 1, 100),
730729
GTModHandler.RecipeBits.NOT_REMOVABLE,
731-
new Object[] { "FCh", "DPD", "WBW", 'F', ToolDictNames.craftingToolFile, 'C',
732-
getGSItem("item.CompressedPlates", 1, 1), // Compressed Cobalt
730+
new Object[] { "fCh", "DPD", "WBW", 'C', getGSItem("item.CompressedPlates", 1, 1), // Compressed Cobalt
733731
'D', GTOreDictUnificator.get(OrePrefixes.plate, Materials.Desh, 1), 'P',
734732
new ItemStack(GCItems.flagPole), 'W', new ItemStack(GCBlocks.aluminumWire, 1, 1), 'B',
735733
new ItemStack(GCItems.battery, 1, W) });

‎src/main/java/com/dreammaster/scripts/ScriptHarvestcraft.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
import gregtech.api.enums.Materials;
3636
import gregtech.api.enums.Mods;
3737
import gregtech.api.enums.OrePrefixes;
38+
import gregtech.api.enums.ToolDictNames;
3839
import gregtech.api.util.GTModHandler;
3940
import gregtech.api.util.GTOreDictUnificator;
4041
import gregtech.common.items.MetaGeneratedTool01;
@@ -671,7 +672,7 @@ public void loadRecipes() {
671672
getModItem(PamsHarvestCraft.ID, "freshwaterItem", 1, 0, missing));
672673
addShapelessRecipe(
673674
getModItem(PamsHarvestCraft.ID, "firmtofuItem", 1, 0, missing),
674-
"craftingToolSoftHammer",
675+
ToolDictNames.craftingToolSoftMallet.name(),
675676
CustomItemList.WetTofu.get(1L));
676677
addShapelessRecipe(
677678
getModItem(PamsHarvestCraft.ID, "silkentofuItem", 1, 0, missing),

‎src/main/java/com/dreammaster/scripts/ScriptIndustrialCraft.java

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848
import gregtech.api.enums.ItemList;
4949
import gregtech.api.enums.Materials;
5050
import gregtech.api.enums.OrePrefixes;
51+
import gregtech.api.enums.ToolDictNames;
5152
import gregtech.api.objects.ItemData;
5253
import gregtech.api.util.GTOreDictUnificator;
5354
import gregtech.api.util.GTUtility;
@@ -503,7 +504,7 @@ public void loadRecipes() {
503504
"dustLapis");
504505
addShapedRecipe(
505506
getModItem(IndustrialCraft2.ID, "itemTreetap", 1, 0, missing),
506-
"craftingToolSoftHammer",
507+
ToolDictNames.craftingToolSoftMallet.name(),
507508
"screwWood",
508509
"craftingToolScrewdriver",
509510
"pipeMediumWood",
@@ -563,7 +564,7 @@ public void loadRecipes() {
563564
"craftingToolSaw",
564565
"plateAnyRubber",
565566
"plateAnyRubber",
566-
"craftingToolSoftHammer",
567+
ToolDictNames.craftingToolSoftMallet.name(),
567568
"plateAnyRubber",
568569
"plateAnyRubber",
569570
"plateAnyRubber",
@@ -1055,7 +1056,7 @@ public void loadRecipes() {
10551056
'b',
10561057
getModItem(IndustrialCraft2.ID, "itemArmorRubBoots", 1, wildcard, missing),
10571058
'c',
1058-
"craftingToolSoftHammer",
1059+
ToolDictNames.craftingToolSoftMallet.name(),
10591060
'd',
10601061
getModItem(TinkerConstruct.ID, "buckets", 1, 25, missing)));
10611062
GameRegistry.addRecipe(
@@ -1069,7 +1070,7 @@ public void loadRecipes() {
10691070
'b',
10701071
getModItem(IndustrialCraft2.ID, "itemArmorHazmatHelmet", 1, wildcard, missing),
10711072
'c',
1072-
"craftingToolSoftHammer",
1073+
ToolDictNames.craftingToolSoftMallet.name(),
10731074
'd',
10741075
getModItem(TinkerConstruct.ID, "buckets", 1, 25, missing)));
10751076
GameRegistry.addRecipe(
@@ -1083,7 +1084,7 @@ public void loadRecipes() {
10831084
'b',
10841085
getModItem(IndustrialCraft2.ID, "itemArmorHazmatChestplate", 1, wildcard, missing),
10851086
'c',
1086-
"craftingToolSoftHammer",
1087+
ToolDictNames.craftingToolSoftMallet.name(),
10871088
'd',
10881089
getModItem(TinkerConstruct.ID, "buckets", 1, 25, missing)));
10891090
GameRegistry.addRecipe(
@@ -1097,7 +1098,7 @@ public void loadRecipes() {
10971098
'b',
10981099
getModItem(IndustrialCraft2.ID, "itemArmorHazmatLeggings", 1, wildcard, missing),
10991100
'c',
1100-
"craftingToolSoftHammer",
1101+
ToolDictNames.craftingToolSoftMallet.name(),
11011102
'd',
11021103
getModItem(TinkerConstruct.ID, "buckets", 1, 25, missing)));
11031104

‎src/main/java/com/dreammaster/scripts/ScriptLogisticPipes.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
import gregtech.api.enums.OrePrefixes;
3838
import gregtech.api.enums.SubTag;
3939
import gregtech.api.enums.TierEU;
40+
import gregtech.api.enums.ToolDictNames;
4041
import gregtech.api.util.GTOreDictUnificator;
4142
import gregtech.api.util.GTUtility;
4243

@@ -1418,7 +1419,7 @@ private void loadMiscRecipes() {
14181419
getModItem(BuildCraftSilicon.ID, "redstoneChipset", 1, 3, missing),
14191420
"craftingToolFile",
14201421
"screwAluminium",
1421-
"craftingToolSoftHammer",
1422+
ToolDictNames.craftingToolSoftMallet.name(),
14221423
null,
14231424
"craftingToolScrewdriver",
14241425
null);

‎src/main/java/com/dreammaster/scripts/ScriptMinecraft.java

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@
5353
import gregtech.api.enums.Materials;
5454
import gregtech.api.enums.OrePrefixes;
5555
import gregtech.api.enums.TierEU;
56+
import gregtech.api.enums.ToolDictNames;
5657
import gregtech.api.util.GTModHandler;
5758
import gregtech.api.util.GTOreDictUnificator;
5859
import gregtech.api.util.GTUtility;
@@ -2313,7 +2314,7 @@ private void craftingRecipes() {
23132314
addShapedRecipe(
23142315
getModItem(Minecraft.ID, "sticky_piston", 1, 0, missing),
23152316
null,
2316-
"craftingToolSoftHammer",
2317+
ToolDictNames.craftingToolSoftMallet.name(),
23172318
null,
23182319
null,
23192320
"slimeball",
@@ -2492,7 +2493,7 @@ private void craftingRecipes() {
24922493
"screwWood",
24932494
getModItem(Minecraft.ID, "string", 1, 0, missing),
24942495
"stickWood",
2495-
"craftingToolSoftHammer",
2496+
ToolDictNames.craftingToolSoftMallet.name(),
24962497
"stickWood");
24972498
addShapedRecipe(
24982499
getModItem(Minecraft.ID, "ladder", 4, 0, missing),
@@ -2503,7 +2504,7 @@ private void craftingRecipes() {
25032504
"screwAnyIron",
25042505
getModItem(Minecraft.ID, "string", 1, 0, missing),
25052506
"stickWood",
2506-
"craftingToolSoftHammer",
2507+
ToolDictNames.craftingToolSoftMallet.name(),
25072508
"stickWood");
25082509
addShapedRecipe(
25092510
getModItem(Minecraft.ID, "ladder", 8, 0, missing),
@@ -2514,7 +2515,7 @@ private void craftingRecipes() {
25142515
"screwSteel",
25152516
getModItem(Minecraft.ID, "string", 1, 0, missing),
25162517
"stickWood",
2517-
"craftingToolSoftHammer",
2518+
ToolDictNames.craftingToolSoftMallet.name(),
25182519
"stickWood");
25192520
addShapedRecipe(
25202521
getModItem(Minecraft.ID, "fence", 1, 0, missing),
@@ -4236,7 +4237,7 @@ private void craftingRecipes() {
42364237
addShapedRecipe(
42374238
getModItem(Minecraft.ID, "pumpkin_seeds", 2, 0, missing),
42384239
getModItem(Minecraft.ID, "pumpkin", 1, 0, missing),
4239-
"craftingToolSoftHammer",
4240+
ToolDictNames.craftingToolSoftMallet.name(),
42404241
getModItem(Minecraft.ID, "pumpkin", 1, 0, missing));
42414242
addShapedRecipe(
42424243
getModItem(Minecraft.ID, "melon_seeds", 1, 0, missing),
@@ -4245,7 +4246,7 @@ private void craftingRecipes() {
42454246
addShapedRecipe(
42464247
getModItem(Minecraft.ID, "melon_seeds", 1, 0, missing),
42474248
getModItem(Minecraft.ID, "melon", 1, 0, missing),
4248-
"craftingToolSoftHammer",
4249+
ToolDictNames.craftingToolSoftMallet.name(),
42494250
getModItem(Minecraft.ID, "melon", 1, 0, missing));
42504251
addShapelessRecipe(
42514252
getModItem(Minecraft.ID, "melon", 6, 0, missing),
@@ -4400,7 +4401,7 @@ private void craftingRecipes() {
44004401
"plankWood",
44014402
"plankWood",
44024403
"fenceWood",
4403-
"craftingToolSoftHammer",
4404+
ToolDictNames.craftingToolSoftMallet.name(),
44044405
"fenceWood");
44054406
addShapedRecipe(
44064407
getModItem(Minecraft.ID, "fishing_rod", 1, 0, missing),

‎src/main/java/com/dreammaster/scripts/ScriptRailcraft.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@
4444
import gregtech.api.enums.Materials;
4545
import gregtech.api.enums.OrePrefixes;
4646
import gregtech.api.enums.TierEU;
47+
import gregtech.api.enums.ToolDictNames;
4748
import gregtech.api.util.GTOreDictUnificator;
4849
import gregtech.api.util.GTRecipeConstants;
4950
import gregtech.api.util.GTUtility;
@@ -111,7 +112,7 @@ public void loadRecipes() {
111112
getModItem(Railcraft.ID, "part.tie", 1, 0, missing),
112113
getModItem(Railcraft.ID, "part.tie", 1, 0, missing),
113114
null,
114-
"craftingToolSoftHammer",
115+
ToolDictNames.craftingToolSoftMallet.name(),
115116
null);
116117
addShapedRecipe(
117118
getModItem(Railcraft.ID, "part.railbed", 1, 1, missing),

‎src/main/java/com/dreammaster/scripts/ScriptStevesCarts.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@
4747
import gregtech.api.enums.ItemList;
4848
import gregtech.api.enums.Materials;
4949
import gregtech.api.enums.OrePrefixes;
50+
import gregtech.api.enums.ToolDictNames;
5051
import gregtech.api.util.GTOreDictUnificator;
5152
import gregtech.api.util.GTUtility;
5253

@@ -188,7 +189,7 @@ public void loadRecipes() {
188189
addShapedRecipe(
189190
getModItem(StevesCarts2.ID, "ModuleComponents", 1, 0, missing),
190191
null,
191-
"craftingToolSoftHammer",
192+
ToolDictNames.craftingToolSoftMallet.name(),
192193
null,
193194
"ringWood",
194195
"stickWood",
@@ -227,7 +228,7 @@ public void loadRecipes() {
227228
addShapedRecipe(
228229
getModItem(StevesCarts2.ID, "CartModule", 1, 37, missing),
229230
GTOreDictUnificator.get(OrePrefixes.plate, Materials.Wood, 1L),
230-
"craftingToolSoftHammer",
231+
ToolDictNames.craftingToolSoftMallet.name(),
231232
GTOreDictUnificator.get(OrePrefixes.plate, Materials.Wood, 1L),
232233
GTOreDictUnificator.get(OrePrefixes.plate, Materials.Wood, 1L),
233234
GTOreDictUnificator.get(OrePrefixes.plate, Materials.Wood, 1L),

0 commit comments

Comments
 (0)