Skip to content

Commit

Permalink
Natura Wood crafting recipes use all saws now (#1153)
Browse files Browse the repository at this point in the history
Co-authored-by: MissBismuth <[email protected]>
  • Loading branch information
MissBismuth and MissBismuth authored Jan 11, 2025
1 parent 2351cbe commit 902a613
Showing 1 changed file with 28 additions and 30 deletions.
58 changes: 28 additions & 30 deletions src/main/java/com/dreammaster/scripts/ScriptNatura.java
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
import static gregtech.api.util.GTModHandler.getModItem;
import static gregtech.api.util.GTRecipeBuilder.SECONDS;
import static gregtech.api.util.GTRecipeBuilder.TICKS;
import static gregtech.common.items.IDMetaTool01.SAW;

import java.util.Arrays;
import java.util.List;
Expand All @@ -28,7 +27,6 @@
import gregtech.api.enums.OrePrefixes;
import gregtech.api.util.GTOreDictUnificator;
import gregtech.api.util.GTUtility;
import gregtech.common.items.MetaGeneratedTool01;

public class ScriptNatura implements IScriptLoader {

Expand Down Expand Up @@ -64,7 +62,7 @@ public void loadRecipes() {
getModItem(Minecraft.ID, "string", 1, 0, missing));
addShapelessRecipe(
getModItem(Natura.ID, "planks", 4, 0, missing),
MetaGeneratedTool01.INSTANCE.getToolWithStats(SAW.ID, 1, null, null, null),
"craftingToolSaw",
getModItem(Natura.ID, "tree", 1, 0, missing));
addShapelessRecipe(
getModItem(Natura.ID, "planks", 2, 0, missing),
Expand All @@ -75,7 +73,7 @@ public void loadRecipes() {
getModItem(Natura.ID, "planks", 1, 0, missing));
addShapedRecipe(
getModItem(Natura.ID, "natura.stick", 4, 0, missing),
MetaGeneratedTool01.INSTANCE.getToolWithStats(SAW.ID, 1, null, null, null),
"craftingToolSaw",
null,
null,
null,
Expand Down Expand Up @@ -212,7 +210,7 @@ public void loadRecipes() {
null);
addShapelessRecipe(
getModItem(Natura.ID, "planks", 4, 1, missing),
MetaGeneratedTool01.INSTANCE.getToolWithStats(SAW.ID, 1, null, null, null),
"craftingToolSaw",
getModItem(Natura.ID, "tree", 1, 1, missing));
addShapelessRecipe(
getModItem(Natura.ID, "planks", 2, 1, missing),
Expand All @@ -223,7 +221,7 @@ public void loadRecipes() {
getModItem(Natura.ID, "planks", 1, 1, missing));
addShapedRecipe(
getModItem(Natura.ID, "natura.stick", 4, 1, missing),
MetaGeneratedTool01.INSTANCE.getToolWithStats(SAW.ID, 1, null, null, null),
"craftingToolSaw",
null,
null,
null,
Expand Down Expand Up @@ -375,7 +373,7 @@ public void loadRecipes() {
"craftingToolKnife");
addShapelessRecipe(
getModItem(Natura.ID, "planks", 4, 2, missing),
MetaGeneratedTool01.INSTANCE.getToolWithStats(SAW.ID, 1, null, null, null),
"craftingToolSaw",
getModItem(Natura.ID, "tree", 1, 2, missing));
addShapelessRecipe(
getModItem(Natura.ID, "planks", 2, 2, missing),
Expand All @@ -386,7 +384,7 @@ public void loadRecipes() {
getModItem(Natura.ID, "planks", 1, 2, missing));
addShapedRecipe(
getModItem(Natura.ID, "natura.stick", 4, 2, missing),
MetaGeneratedTool01.INSTANCE.getToolWithStats(SAW.ID, 1, null, null, null),
"craftingToolSaw",
null,
null,
null,
Expand Down Expand Up @@ -534,7 +532,7 @@ public void loadRecipes() {
null);
addShapelessRecipe(
getModItem(Natura.ID, "planks", 4, 3, missing),
MetaGeneratedTool01.INSTANCE.getToolWithStats(SAW.ID, 1, null, null, null),
"craftingToolSaw",
getModItem(Natura.ID, "redwood", 1, 1, missing));
addShapelessRecipe(
getModItem(Natura.ID, "planks", 2, 3, missing),
Expand All @@ -545,7 +543,7 @@ public void loadRecipes() {
getModItem(Natura.ID, "planks", 1, 3, missing));
addShapedRecipe(
getModItem(Natura.ID, "natura.stick", 4, 3, missing),
MetaGeneratedTool01.INSTANCE.getToolWithStats(SAW.ID, 1, null, null, null),
"craftingToolSaw",
null,
null,
null,
Expand Down Expand Up @@ -693,29 +691,29 @@ public void loadRecipes() {
null);
addShapelessRecipe(
getModItem(Natura.ID, "planks", 4, 4, missing),
MetaGeneratedTool01.INSTANCE.getToolWithStats(SAW.ID, 1, null, null, null),
"craftingToolSaw",
getModItem(Natura.ID, "bloodwood", 1, 0, missing));
addShapelessRecipe(
getModItem(Natura.ID, "planks", 2, 4, missing),
getModItem(Natura.ID, "bloodwood", 1, 0, missing));
addShapelessRecipe(
getModItem(Natura.ID, "planks", 4, 4, missing),
MetaGeneratedTool01.INSTANCE.getToolWithStats(SAW.ID, 1, null, null, null),
"craftingToolSaw",
getModItem(Natura.ID, "bloodwood", 1, 15, missing));
addShapelessRecipe(
getModItem(Natura.ID, "planks", 2, 4, missing),
getModItem(Natura.ID, "bloodwood", 1, 15, missing));
addShapelessRecipe(
getModItem(Natura.ID, "planks", 4, 4, missing),
MetaGeneratedTool01.INSTANCE.getToolWithStats(SAW.ID, 1, null, null, null),
"craftingToolSaw",
getModItem(Natura.ID, "bloodwood", 1, 1, missing));
addShapelessRecipe(
getModItem(Natura.ID, "natura.stick", 2, 4, missing),
getModItem(Natura.ID, "planks", 1, 4, missing),
getModItem(Natura.ID, "planks", 1, 4, missing));
addShapedRecipe(
getModItem(Natura.ID, "natura.stick", 4, 4, missing),
MetaGeneratedTool01.INSTANCE.getToolWithStats(SAW.ID, 1, null, null, null),
"craftingToolSaw",
null,
null,
null,
Expand Down Expand Up @@ -873,7 +871,7 @@ public void loadRecipes() {
"craftingToolKnife");
addShapelessRecipe(
getModItem(Natura.ID, "planks", 4, 5, missing),
MetaGeneratedTool01.INSTANCE.getToolWithStats(SAW.ID, 1, null, null, null),
"craftingToolSaw",
getModItem(Natura.ID, "tree", 1, 3, missing));
addShapelessRecipe(
getModItem(Natura.ID, "planks", 2, 5, missing),
Expand All @@ -884,7 +882,7 @@ public void loadRecipes() {
getModItem(Natura.ID, "planks", 1, 5, missing));
addShapedRecipe(
getModItem(Natura.ID, "natura.stick", 4, 5, missing),
MetaGeneratedTool01.INSTANCE.getToolWithStats(SAW.ID, 1, null, null, null),
"craftingToolSaw",
null,
null,
null,
Expand Down Expand Up @@ -1032,7 +1030,7 @@ public void loadRecipes() {
null);
addShapelessRecipe(
getModItem(Natura.ID, "planks", 4, 6, missing),
MetaGeneratedTool01.INSTANCE.getToolWithStats(SAW.ID, 1, null, null, null),
"craftingToolSaw",
getModItem(Natura.ID, "Rare Tree", 1, 0, missing));
addShapelessRecipe(
getModItem(Natura.ID, "planks", 2, 6, missing),
Expand All @@ -1043,7 +1041,7 @@ public void loadRecipes() {
getModItem(Natura.ID, "planks", 1, 6, missing));
addShapedRecipe(
getModItem(Natura.ID, "natura.stick", 4, 6, missing),
MetaGeneratedTool01.INSTANCE.getToolWithStats(SAW.ID, 1, null, null, null),
"craftingToolSaw",
null,
null,
null,
Expand Down Expand Up @@ -1191,7 +1189,7 @@ public void loadRecipes() {
null);
addShapelessRecipe(
getModItem(Natura.ID, "planks", 4, 7, missing),
MetaGeneratedTool01.INSTANCE.getToolWithStats(SAW.ID, 1, null, null, null),
"craftingToolSaw",
getModItem(Natura.ID, "Rare Tree", 1, 1, missing));
addShapelessRecipe(
getModItem(Natura.ID, "planks", 2, 7, missing),
Expand All @@ -1202,7 +1200,7 @@ public void loadRecipes() {
getModItem(Natura.ID, "planks", 1, 7, missing));
addShapedRecipe(
getModItem(Natura.ID, "natura.stick", 4, 7, missing),
MetaGeneratedTool01.INSTANCE.getToolWithStats(SAW.ID, 1, null, null, null),
"craftingToolSaw",
null,
null,
null,
Expand Down Expand Up @@ -1350,7 +1348,7 @@ public void loadRecipes() {
null);
addShapelessRecipe(
getModItem(Natura.ID, "planks", 4, 8, missing),
MetaGeneratedTool01.INSTANCE.getToolWithStats(SAW.ID, 1, null, null, null),
"craftingToolSaw",
getModItem(Natura.ID, "Rare Tree", 1, 2, missing));
addShapelessRecipe(
getModItem(Natura.ID, "planks", 2, 8, missing),
Expand All @@ -1361,7 +1359,7 @@ public void loadRecipes() {
getModItem(Natura.ID, "planks", 1, 8, missing));
addShapedRecipe(
getModItem(Natura.ID, "natura.stick", 4, 8, missing),
MetaGeneratedTool01.INSTANCE.getToolWithStats(SAW.ID, 1, null, null, null),
"craftingToolSaw",
null,
null,
null,
Expand Down Expand Up @@ -1509,7 +1507,7 @@ public void loadRecipes() {
null);
addShapelessRecipe(
getModItem(Natura.ID, "planks", 4, 9, missing),
MetaGeneratedTool01.INSTANCE.getToolWithStats(SAW.ID, 1, null, null, null),
"craftingToolSaw",
getModItem(Natura.ID, "Rare Tree", 1, 3, missing));
addShapelessRecipe(
getModItem(Natura.ID, "planks", 2, 9, missing),
Expand All @@ -1520,7 +1518,7 @@ public void loadRecipes() {
getModItem(Natura.ID, "planks", 1, 9, missing));
addShapedRecipe(
getModItem(Natura.ID, "natura.stick", 4, 9, missing),
MetaGeneratedTool01.INSTANCE.getToolWithStats(SAW.ID, 1, null, null, null),
"craftingToolSaw",
null,
null,
null,
Expand Down Expand Up @@ -1668,7 +1666,7 @@ public void loadRecipes() {
null);
addShapelessRecipe(
getModItem(Natura.ID, "planks", 4, 10, missing),
MetaGeneratedTool01.INSTANCE.getToolWithStats(SAW.ID, 1, null, null, null),
"craftingToolSaw",
getModItem(Natura.ID, "willow", 1, 0, missing));
addShapelessRecipe(
getModItem(Natura.ID, "planks", 2, 10, missing),
Expand All @@ -1679,7 +1677,7 @@ public void loadRecipes() {
getModItem(Natura.ID, "planks", 1, 10, missing));
addShapedRecipe(
getModItem(Natura.ID, "natura.stick", 4, 10, missing),
MetaGeneratedTool01.INSTANCE.getToolWithStats(SAW.ID, 1, null, null, null),
"craftingToolSaw",
null,
null,
null,
Expand Down Expand Up @@ -1827,7 +1825,7 @@ public void loadRecipes() {
null);
addShapelessRecipe(
getModItem(Natura.ID, "planks", 4, 11, missing),
MetaGeneratedTool01.INSTANCE.getToolWithStats(SAW.ID, 1, null, null, null),
"craftingToolSaw",
getModItem(Natura.ID, "Dark Tree", 1, 0, missing));
addShapelessRecipe(
getModItem(Natura.ID, "planks", 2, 11, missing),
Expand All @@ -1838,7 +1836,7 @@ public void loadRecipes() {
getModItem(Natura.ID, "planks", 1, 11, missing));
addShapedRecipe(
getModItem(Natura.ID, "natura.stick", 4, 11, missing),
MetaGeneratedTool01.INSTANCE.getToolWithStats(SAW.ID, 1, null, null, null),
"craftingToolSaw",
null,
null,
null,
Expand Down Expand Up @@ -1990,7 +1988,7 @@ public void loadRecipes() {
"craftingToolKnife");
addShapelessRecipe(
getModItem(Natura.ID, "planks", 4, 12, missing),
MetaGeneratedTool01.INSTANCE.getToolWithStats(SAW.ID, 1, null, null, null),
"craftingToolSaw",
getModItem(Natura.ID, "Dark Tree", 1, 1, missing));
addShapelessRecipe(
getModItem(Natura.ID, "planks", 2, 12, missing),
Expand All @@ -2001,7 +1999,7 @@ public void loadRecipes() {
getModItem(Natura.ID, "planks", 1, 12, missing));
addShapedRecipe(
getModItem(Natura.ID, "natura.stick", 4, 12, missing),
MetaGeneratedTool01.INSTANCE.getToolWithStats(SAW.ID, 1, null, null, null),
"craftingToolSaw",
null,
null,
null,
Expand Down

0 comments on commit 902a613

Please sign in to comment.