Skip to content
This repository has been archived by the owner on Oct 4, 2024. It is now read-only.

Commit

Permalink
fixed gem tool recipes and flint knife recipe
Browse files Browse the repository at this point in the history
  • Loading branch information
@Trinsdar
Trinsdar committed Nov 20, 2023
1 parent 98541db commit fb3c70e
Showing 1 changed file with 26 additions and 3 deletions.
29 changes: 26 additions & 3 deletions common/src/main/java/io/github/gregtechintergalactical/gtcore/loader/crafting/Tools.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,13 @@ public static void init(Consumer<FinishedRecipe> consumer, AntimatterRecipeProvi

}
if (t.toolTypes().contains(SAW)){
provider.addStackRecipe(consumer, GTCore.ID, "", "", SAW.getToolStack(m),
of('R', rod, 'P', plateGem,'F', AntimatterDefaultTools.FILE.getTag(), 'H', AntimatterDefaultTools.HAMMER.getTag()), "PPR", "FH ");
if (m.has(GEM)){
provider.addStackRecipe(consumer, GTCore.ID, "", "", SAW.getToolStack(m),
of('R', rod, 'P', plateGem,'F', AntimatterDefaultTools.FILE.getTag()), "PPR", "F ");
} else {
provider.addStackRecipe(consumer, GTCore.ID, "", "", SAW.getToolStack(m),
of('R', rod, 'P', plateGem,'F', AntimatterDefaultTools.FILE.getTag(), 'H', AntimatterDefaultTools.HAMMER.getTag()), "PPR", "FH ");
}
}
if (t.toolTypes().contains(WIRE_CUTTER)){
ImmutableMap.Builder<Character, Object> builder = ImmutableMap.builder();
Expand Down Expand Up @@ -130,6 +135,9 @@ public static void init(Consumer<FinishedRecipe> consumer, AntimatterRecipeProvi
provider.addStackRecipe(consumer, GTCore.ID, "", "", PICKAXE.getToolStack(m),
of('R', rod, 'P', ingotGem), "PPP", " R ");
}
} else if (m.has(GEM)){
provider.addStackRecipe(consumer, GTCore.ID, "", "", PICKAXE.getToolStack(m),
of('R', rod, 'P', plateGem, 'I', ingotGem,'F', AntimatterDefaultTools.FILE.getTag()), "PII", "FR ", " R ");
} else {
provider.addStackRecipe(consumer, GTCore.ID, "", "", PICKAXE.getToolStack(m),
of('R', rod, 'P', plateGem, 'I', ingotGem,'F', AntimatterDefaultTools.FILE.getTag(), 'H', AntimatterDefaultTools.HAMMER.getTag()), "PII", "FRH", " R ");
Expand All @@ -142,6 +150,9 @@ public static void init(Consumer<FinishedRecipe> consumer, AntimatterRecipeProvi
provider.addStackRecipe(consumer, GTCore.ID, "", "", AXE.getToolStack(m),
of('R', rod, 'P', ingotGem), "PP", "PR");
}
} else if (m.has(GEM)){
provider.addStackRecipe(consumer, GTCore.ID, "", "", AXE.getToolStack(m),
of('R', rod, 'P', plateGem, 'I', ingotGem,'F', AntimatterDefaultTools.FILE.getTag()), "PI", "PR", "FR");
} else {
provider.addStackRecipe(consumer, GTCore.ID, "", "", AXE.getToolStack(m),
of('R', rod, 'P', plateGem, 'I', ingotGem,'F', AntimatterDefaultTools.FILE.getTag(), 'H', AntimatterDefaultTools.HAMMER.getTag()), "PIH", "PR ", "FR ");
Expand All @@ -154,6 +165,9 @@ public static void init(Consumer<FinishedRecipe> consumer, AntimatterRecipeProvi
provider.addStackRecipe(consumer, GTCore.ID, "", "", SHOVEL.getToolStack(m),
of('R', rod, 'P', ingotGem), "P", "R");
}
} else if (m.has(GEM)){
provider.addStackRecipe(consumer, GTCore.ID, "", "", SHOVEL.getToolStack(m),
of('R', rod, 'P', plateGem,'F', AntimatterDefaultTools.FILE.getTag()), "FP", " R", " R");
} else {
provider.addStackRecipe(consumer, GTCore.ID, "", "", SHOVEL.getToolStack(m),
of('R', rod, 'P', plateGem,'F', AntimatterDefaultTools.FILE.getTag(), 'H', AntimatterDefaultTools.HAMMER.getTag()), "FPH", " R ", " R ");
Expand All @@ -166,6 +180,9 @@ public static void init(Consumer<FinishedRecipe> consumer, AntimatterRecipeProvi
provider.addStackRecipe(consumer, GTCore.ID, "", "", SWORD.getToolStack(m),
of('R', rod, 'P', ingotGem), "P", "P", "R");
}
} else if (m.has(GEM)){
provider.addStackRecipe(consumer, GTCore.ID, "", "", SWORD.getToolStack(m),
of('R', rod, 'P', plateGem,'F', AntimatterDefaultTools.FILE.getTag()), "FP", " P", " R");
} else {
provider.addStackRecipe(consumer, GTCore.ID, "", "", SWORD.getToolStack(m),
of('R', rod, 'P', plateGem,'F', AntimatterDefaultTools.FILE.getTag(), 'H', AntimatterDefaultTools.HAMMER.getTag()), "FPH", " P ", " R ");
Expand All @@ -178,6 +195,9 @@ public static void init(Consumer<FinishedRecipe> consumer, AntimatterRecipeProvi
provider.addStackRecipe(consumer, GTCore.ID, "", "", HOE.getToolStack(m),
of('R', rod, 'P', ingotGem), "PP", " R");
}
} else if (m.has(GEM)){
provider.addStackRecipe(consumer, GTCore.ID, "", "", HOE.getToolStack(m),
of('R', rod, 'P', plateGem, 'I', ingotGem,'F', AntimatterDefaultTools.FILE.getTag()), "PI", "FR", " R");
} else {
provider.addStackRecipe(consumer, GTCore.ID, "", "", HOE.getToolStack(m),
of('R', rod, 'P', plateGem, 'I', ingotGem,'F', AntimatterDefaultTools.FILE.getTag(), 'H', AntimatterDefaultTools.HAMMER.getTag()), "PIH", "FR ", " R ");
Expand All @@ -188,8 +208,11 @@ public static void init(Consumer<FinishedRecipe> consumer, AntimatterRecipeProvi
if (m.has(FLINT)){
if (!AntimatterAPI.isModLoaded("tfc")) {
provider.addStackRecipe(consumer, GTCore.ID, "", "", KNIFE.getToolStack(m),
of('R', rod, 'P', ingotGem), "R", "P");
of('R', rod, 'P', ingotGem), "P", "R");
}
} else if (m.has(GEM)){
provider.addStackRecipe(consumer, GTCore.ID, "", "", KNIFE.getToolStack(m),
of('R', rod, 'P', plateGem,'F', AntimatterDefaultTools.FILE.getTag()), "FP", " R", " R");
} else {
provider.addStackRecipe(consumer, GTCore.ID, "", "", KNIFE.getToolStack(m),
of('R', rod, 'P', plateGem,'F', AntimatterDefaultTools.FILE.getTag(), 'H', AntimatterDefaultTools.HAMMER.getTag()), "FP", "HR");
Expand Down

0 comments on commit fb3c70e

Please sign in to comment.