Skip to content

Update uses of crafting tools #1267

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
May 25, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions dependencies.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Add your dependencies here

dependencies {
api("com.github.GTNewHorizons:GT5-Unofficial:5.09.51.302:dev")
api("com.github.GTNewHorizons:GT5-Unofficial:5.09.51.306:dev")
api("com.github.GTNewHorizons:Yamcl:0.7.0:dev")
api("com.github.GTNewHorizons:Baubles-Expanded:2.1.8-GTNH:dev")

Expand All @@ -24,7 +24,7 @@ dependencies {
compileOnly("TGregworks:TGregworks:1.7.10-GTNH-1.0.26:deobf") { transitive = false }
compileOnly("com.github.GTNewHorizons:amunra:0.8.1:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:Galacticraft:3.3.7-GTNH:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:ForestryMC:4.10.8:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:ForestryMC:4.10.10:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:MatterManipulator:0.0.27-GTNH:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:IguanaTweaksTConstruct:2.6.2:dev") { transitive = false }
compileOnlyApi("com.github.GTNewHorizons:Mobs-Info:0.5.2-GTNH:dev")
Expand Down
343 changes: 128 additions & 215 deletions src/main/java/com/dreammaster/gthandler/GT_CraftingRecipeLoader.java

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
import gregtech.api.enums.MaterialsUEVplus;
import gregtech.api.enums.OrePrefixes;
import gregtech.api.enums.TierEU;
import gregtech.api.enums.ToolDictNames;
import gregtech.api.util.GTModHandler;
import gregtech.api.util.GTOreDictUnificator;
import gregtech.api.util.GTUtility;
Expand Down Expand Up @@ -1053,7 +1054,7 @@ public void loadRecipes() {
getModItem(AppliedEnergistics2.ID, "item.ItemMultiPart", 1, 360, missing),
"craftingToolScrewdriver",
getModItem(AppliedEnergistics2.ID, "item.ItemMultiPart", 1, 380, missing),
"craftingToolSoftHammer",
ToolDictNames.craftingToolSoftMallet.name(),
"screwCertusQuartz",
getModItem(TinkerConstruct.ID, "CraftingSlab", 1, 0, missing),
"screwCertusQuartz",
Expand All @@ -1064,7 +1065,7 @@ public void loadRecipes() {
getModItem(AppliedEnergistics2.ID, "item.ItemMultiPart", 1, 500, missing),
"craftingToolScrewdriver",
getModItem(AppliedEnergistics2.ID, "item.ItemMultiPart", 1, 360, missing),
"craftingToolSoftHammer",
ToolDictNames.craftingToolSoftMallet.name(),
ItemList.Conveyor_Module_LuV.get(1L),
CustomItemList.EngineeringProcessorItemAdvEmeraldCore.get(1L),
ItemList.Conveyor_Module_LuV.get(1L),
Expand All @@ -1075,7 +1076,7 @@ public void loadRecipes() {
getModItem(AppliedEnergistics2.ID, "item.ItemMultiPart", 1, 480, missing),
"craftingToolScrewdriver",
getModItem(AppliedEnergistics2.ID, "item.ItemMultiPart", 1, 380, missing),
"craftingToolSoftHammer",
ToolDictNames.craftingToolSoftMallet.name(),
"screwCertusQuartz",
getModItem(AppliedEnergistics2.ID, "item.ItemMultiPart", 1, 440, missing),
"screwCertusQuartz",
Expand All @@ -1097,7 +1098,7 @@ public void loadRecipes() {
getModItem(AppliedEnergistics2.ID, "item.ItemMultiPart", 1, 340, missing),
"craftingToolScrewdriver",
getModItem(AppliedEnergistics2.ID, "item.ItemMultiPart", 1, 380, missing),
"craftingToolSoftHammer",
ToolDictNames.craftingToolSoftMallet.name(),
"screwCertusQuartz",
getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 1, 52, missing),
"screwCertusQuartz",
Expand Down
5 changes: 3 additions & 2 deletions src/main/java/com/dreammaster/scripts/ScriptBattleGear.java
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@

import gregtech.api.enums.Materials;
import gregtech.api.enums.OrePrefixes;
import gregtech.api.enums.ToolDictNames;
import gregtech.api.util.GTOreDictUnificator;

public class ScriptBattleGear implements IScriptLoader {
Expand Down Expand Up @@ -221,7 +222,7 @@ public void loadRecipes() {
addShapedRecipe(
getModItem(MineAndBladeBattleGear2.ID, "waraxe.wood", 1, 0, missing),
getModItem(TinkerConstruct.ID, "hatchetHead", 1, 0, missing),
"craftingToolSoftHammer",
ToolDictNames.craftingToolSoftMallet.name(),
getModItem(TinkerConstruct.ID, "hatchetHead", 1, 0, missing),
getModItem(TinkerConstruct.ID, "hatchetHead", 1, 0, missing),
"stickWood",
Expand Down Expand Up @@ -306,7 +307,7 @@ public void loadRecipes() {
getModItem(TinkerConstruct.ID, "heavyPlate", 1, 0, missing),
getModItem(TinkerConstruct.ID, "heavyPlate", 1, 0, missing),
"stickWood",
"craftingToolSoftHammer",
ToolDictNames.craftingToolSoftMallet.name(),
null);
addShapedRecipe(
getModItem(MineAndBladeBattleGear2.ID, "mace.stone", 1, 0, missing),
Expand Down
5 changes: 3 additions & 2 deletions src/main/java/com/dreammaster/scripts/ScriptBiblioCraft.java
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

import gregtech.api.enums.GTValues;
import gregtech.api.enums.Materials;
import gregtech.api.enums.ToolDictNames;
import gregtech.api.util.GTModHandler;

public class ScriptBiblioCraft implements IScriptLoader {
Expand Down Expand Up @@ -615,7 +616,7 @@ public void loadRecipes() {
"wireFineGold",
"wireFineGold",
"lensGlass",
"craftingToolSoftHammer",
ToolDictNames.craftingToolSoftMallet.name(),
"wireFineGold",
null,
"wireFineGold",
Expand All @@ -627,7 +628,7 @@ public void loadRecipes() {
"wireFineSteel",
"wireFineSteel",
"plateLead",
"craftingToolSoftHammer",
ToolDictNames.craftingToolSoftMallet.name(),
"wireFineSteel",
"roundLead",
null,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import gregtech.api.enums.Materials;
import gregtech.api.enums.Mods;
import gregtech.api.enums.OrePrefixes;
import gregtech.api.enums.ToolDictNames;
import gregtech.api.util.GTOreDictUnificator;

public class ScriptCarpentersBlocks implements IScriptLoader {
Expand Down Expand Up @@ -166,7 +167,7 @@ public void loadRecipes() {
getModItem(CarpentersBlocks.ID, "blockCarpentersBlock", 1, 0, missing),
getModItem(CarpentersBlocks.ID, "blockCarpentersBlock", 1, 0, missing),
getModItem(CarpentersBlocks.ID, "blockCarpentersBarrier", 1, 0, missing),
"craftingToolSoftHammer",
ToolDictNames.craftingToolSoftMallet.name(),
getModItem(CarpentersBlocks.ID, "blockCarpentersBarrier", 1, 0, missing));
addShapedRecipe(
getModItem(CarpentersBlocks.ID, "blockCarpentersTorch", 2, 0, missing),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
import gregtech.api.enums.ItemList;
import gregtech.api.enums.Materials;
import gregtech.api.enums.OrePrefixes;
import gregtech.api.enums.ToolDictNames;
import gregtech.api.util.GTOreDictUnificator;
import thaumcraft.api.ThaumcraftApi;
import thaumcraft.api.aspects.Aspect;
Expand Down Expand Up @@ -532,7 +533,7 @@ public void loadRecipes() {
'h',
"stickWood",
'i',
"craftingToolSoftHammer");
ToolDictNames.craftingToolSoftMallet.name());
TCHelper.addResearchPage(
"RIDINGCROP",
new ResearchPage(
Expand Down
4 changes: 1 addition & 3 deletions src/main/java/com/dreammaster/scripts/ScriptGalaxySpace.java
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@
import gregtech.api.enums.Materials;
import gregtech.api.enums.OrePrefixes;
import gregtech.api.enums.TierEU;
import gregtech.api.enums.ToolDictNames;
import gregtech.api.util.GTModHandler;
import gregtech.api.util.GTOreDictUnificator;
import gregtech.api.util.GTUtility;
Expand Down Expand Up @@ -728,8 +727,7 @@ public void loadRecipes() {
GTModHandler.addCraftingRecipe(
getGSItem("item.plasmashovel", 1, 100),
GTModHandler.RecipeBits.NOT_REMOVABLE,
new Object[] { "FCh", "DPD", "WBW", 'F', ToolDictNames.craftingToolFile, 'C',
getGSItem("item.CompressedPlates", 1, 1), // Compressed Cobalt
new Object[] { "fCh", "DPD", "WBW", 'C', getGSItem("item.CompressedPlates", 1, 1), // Compressed Cobalt
'D', GTOreDictUnificator.get(OrePrefixes.plate, Materials.Desh, 1), 'P',
new ItemStack(GCItems.flagPole), 'W', new ItemStack(GCBlocks.aluminumWire, 1, 1), 'B',
new ItemStack(GCItems.battery, 1, W) });
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
import gregtech.api.enums.Materials;
import gregtech.api.enums.Mods;
import gregtech.api.enums.OrePrefixes;
import gregtech.api.enums.ToolDictNames;
import gregtech.api.util.GTModHandler;
import gregtech.api.util.GTOreDictUnificator;
import gregtech.common.items.MetaGeneratedTool01;
Expand Down Expand Up @@ -671,7 +672,7 @@ public void loadRecipes() {
getModItem(PamsHarvestCraft.ID, "freshwaterItem", 1, 0, missing));
addShapelessRecipe(
getModItem(PamsHarvestCraft.ID, "firmtofuItem", 1, 0, missing),
"craftingToolSoftHammer",
ToolDictNames.craftingToolSoftMallet.name(),
CustomItemList.WetTofu.get(1L));
addShapelessRecipe(
getModItem(PamsHarvestCraft.ID, "silkentofuItem", 1, 0, missing),
Expand Down
13 changes: 7 additions & 6 deletions src/main/java/com/dreammaster/scripts/ScriptIndustrialCraft.java
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@
import gregtech.api.enums.ItemList;
import gregtech.api.enums.Materials;
import gregtech.api.enums.OrePrefixes;
import gregtech.api.enums.ToolDictNames;
import gregtech.api.objects.ItemData;
import gregtech.api.util.GTOreDictUnificator;
import gregtech.api.util.GTUtility;
Expand Down Expand Up @@ -503,7 +504,7 @@ public void loadRecipes() {
"dustLapis");
addShapedRecipe(
getModItem(IndustrialCraft2.ID, "itemTreetap", 1, 0, missing),
"craftingToolSoftHammer",
ToolDictNames.craftingToolSoftMallet.name(),
"screwWood",
"craftingToolScrewdriver",
"pipeMediumWood",
Expand Down Expand Up @@ -563,7 +564,7 @@ public void loadRecipes() {
"craftingToolSaw",
"plateAnyRubber",
"plateAnyRubber",
"craftingToolSoftHammer",
ToolDictNames.craftingToolSoftMallet.name(),
"plateAnyRubber",
"plateAnyRubber",
"plateAnyRubber",
Expand Down Expand Up @@ -1055,7 +1056,7 @@ public void loadRecipes() {
'b',
getModItem(IndustrialCraft2.ID, "itemArmorRubBoots", 1, wildcard, missing),
'c',
"craftingToolSoftHammer",
ToolDictNames.craftingToolSoftMallet.name(),
'd',
getModItem(TinkerConstruct.ID, "buckets", 1, 25, missing)));
GameRegistry.addRecipe(
Expand All @@ -1069,7 +1070,7 @@ public void loadRecipes() {
'b',
getModItem(IndustrialCraft2.ID, "itemArmorHazmatHelmet", 1, wildcard, missing),
'c',
"craftingToolSoftHammer",
ToolDictNames.craftingToolSoftMallet.name(),
'd',
getModItem(TinkerConstruct.ID, "buckets", 1, 25, missing)));
GameRegistry.addRecipe(
Expand All @@ -1083,7 +1084,7 @@ public void loadRecipes() {
'b',
getModItem(IndustrialCraft2.ID, "itemArmorHazmatChestplate", 1, wildcard, missing),
'c',
"craftingToolSoftHammer",
ToolDictNames.craftingToolSoftMallet.name(),
'd',
getModItem(TinkerConstruct.ID, "buckets", 1, 25, missing)));
GameRegistry.addRecipe(
Expand All @@ -1097,7 +1098,7 @@ public void loadRecipes() {
'b',
getModItem(IndustrialCraft2.ID, "itemArmorHazmatLeggings", 1, wildcard, missing),
'c',
"craftingToolSoftHammer",
ToolDictNames.craftingToolSoftMallet.name(),
'd',
getModItem(TinkerConstruct.ID, "buckets", 1, 25, missing)));

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
import gregtech.api.enums.OrePrefixes;
import gregtech.api.enums.SubTag;
import gregtech.api.enums.TierEU;
import gregtech.api.enums.ToolDictNames;
import gregtech.api.util.GTOreDictUnificator;
import gregtech.api.util.GTUtility;

Expand Down Expand Up @@ -1418,7 +1419,7 @@ private void loadMiscRecipes() {
getModItem(BuildCraftSilicon.ID, "redstoneChipset", 1, 3, missing),
"craftingToolFile",
"screwAluminium",
"craftingToolSoftHammer",
ToolDictNames.craftingToolSoftMallet.name(),
null,
"craftingToolScrewdriver",
null);
Expand Down
15 changes: 8 additions & 7 deletions src/main/java/com/dreammaster/scripts/ScriptMinecraft.java
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@
import gregtech.api.enums.Materials;
import gregtech.api.enums.OrePrefixes;
import gregtech.api.enums.TierEU;
import gregtech.api.enums.ToolDictNames;
import gregtech.api.util.GTModHandler;
import gregtech.api.util.GTOreDictUnificator;
import gregtech.api.util.GTUtility;
Expand Down Expand Up @@ -2313,7 +2314,7 @@ private void craftingRecipes() {
addShapedRecipe(
getModItem(Minecraft.ID, "sticky_piston", 1, 0, missing),
null,
"craftingToolSoftHammer",
ToolDictNames.craftingToolSoftMallet.name(),
null,
null,
"slimeball",
Expand Down Expand Up @@ -2492,7 +2493,7 @@ private void craftingRecipes() {
"screwWood",
getModItem(Minecraft.ID, "string", 1, 0, missing),
"stickWood",
"craftingToolSoftHammer",
ToolDictNames.craftingToolSoftMallet.name(),
"stickWood");
addShapedRecipe(
getModItem(Minecraft.ID, "ladder", 4, 0, missing),
Expand All @@ -2503,7 +2504,7 @@ private void craftingRecipes() {
"screwAnyIron",
getModItem(Minecraft.ID, "string", 1, 0, missing),
"stickWood",
"craftingToolSoftHammer",
ToolDictNames.craftingToolSoftMallet.name(),
"stickWood");
addShapedRecipe(
getModItem(Minecraft.ID, "ladder", 8, 0, missing),
Expand All @@ -2514,7 +2515,7 @@ private void craftingRecipes() {
"screwSteel",
getModItem(Minecraft.ID, "string", 1, 0, missing),
"stickWood",
"craftingToolSoftHammer",
ToolDictNames.craftingToolSoftMallet.name(),
"stickWood");
addShapedRecipe(
getModItem(Minecraft.ID, "fence", 1, 0, missing),
Expand Down Expand Up @@ -4236,7 +4237,7 @@ private void craftingRecipes() {
addShapedRecipe(
getModItem(Minecraft.ID, "pumpkin_seeds", 2, 0, missing),
getModItem(Minecraft.ID, "pumpkin", 1, 0, missing),
"craftingToolSoftHammer",
ToolDictNames.craftingToolSoftMallet.name(),
getModItem(Minecraft.ID, "pumpkin", 1, 0, missing));
addShapedRecipe(
getModItem(Minecraft.ID, "melon_seeds", 1, 0, missing),
Expand All @@ -4245,7 +4246,7 @@ private void craftingRecipes() {
addShapedRecipe(
getModItem(Minecraft.ID, "melon_seeds", 1, 0, missing),
getModItem(Minecraft.ID, "melon", 1, 0, missing),
"craftingToolSoftHammer",
ToolDictNames.craftingToolSoftMallet.name(),
getModItem(Minecraft.ID, "melon", 1, 0, missing));
addShapelessRecipe(
getModItem(Minecraft.ID, "melon", 6, 0, missing),
Expand Down Expand Up @@ -4400,7 +4401,7 @@ private void craftingRecipes() {
"plankWood",
"plankWood",
"fenceWood",
"craftingToolSoftHammer",
ToolDictNames.craftingToolSoftMallet.name(),
"fenceWood");
addShapedRecipe(
getModItem(Minecraft.ID, "fishing_rod", 1, 0, missing),
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/com/dreammaster/scripts/ScriptRailcraft.java
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
import gregtech.api.enums.Materials;
import gregtech.api.enums.OrePrefixes;
import gregtech.api.enums.TierEU;
import gregtech.api.enums.ToolDictNames;
import gregtech.api.util.GTOreDictUnificator;
import gregtech.api.util.GTRecipeConstants;
import gregtech.api.util.GTUtility;
Expand Down Expand Up @@ -111,7 +112,7 @@ public void loadRecipes() {
getModItem(Railcraft.ID, "part.tie", 1, 0, missing),
getModItem(Railcraft.ID, "part.tie", 1, 0, missing),
null,
"craftingToolSoftHammer",
ToolDictNames.craftingToolSoftMallet.name(),
null);
addShapedRecipe(
getModItem(Railcraft.ID, "part.railbed", 1, 1, missing),
Expand Down
5 changes: 3 additions & 2 deletions src/main/java/com/dreammaster/scripts/ScriptStevesCarts.java
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
import gregtech.api.enums.ItemList;
import gregtech.api.enums.Materials;
import gregtech.api.enums.OrePrefixes;
import gregtech.api.enums.ToolDictNames;
import gregtech.api.util.GTOreDictUnificator;
import gregtech.api.util.GTUtility;

Expand Down Expand Up @@ -188,7 +189,7 @@ public void loadRecipes() {
addShapedRecipe(
getModItem(StevesCarts2.ID, "ModuleComponents", 1, 0, missing),
null,
"craftingToolSoftHammer",
ToolDictNames.craftingToolSoftMallet.name(),
null,
"ringWood",
"stickWood",
Expand Down Expand Up @@ -227,7 +228,7 @@ public void loadRecipes() {
addShapedRecipe(
getModItem(StevesCarts2.ID, "CartModule", 1, 37, missing),
GTOreDictUnificator.get(OrePrefixes.plate, Materials.Wood, 1L),
"craftingToolSoftHammer",
ToolDictNames.craftingToolSoftMallet.name(),
GTOreDictUnificator.get(OrePrefixes.plate, Materials.Wood, 1L),
GTOreDictUnificator.get(OrePrefixes.plate, Materials.Wood, 1L),
GTOreDictUnificator.get(OrePrefixes.plate, Materials.Wood, 1L),
Expand Down
Loading