From e445123e0312beeb8d1e2a7d81bca917fc4f4e85 Mon Sep 17 00:00:00 2001 From: trinsdar <30245301+Trinsdar@users.noreply.github.com> Date: Mon, 17 Apr 2023 10:50:59 -0400 Subject: [PATCH] made flint tool recipes match gt6 --- .../java/muramasa/antimatter/datagen/loaders/Tools.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/common/src/main/java/muramasa/antimatter/datagen/loaders/Tools.java b/common/src/main/java/muramasa/antimatter/datagen/loaders/Tools.java index 8c506f54c..38ccb489f 100644 --- a/common/src/main/java/muramasa/antimatter/datagen/loaders/Tools.java +++ b/common/src/main/java/muramasa/antimatter/datagen/loaders/Tools.java @@ -135,16 +135,16 @@ public static void init(Consumer consumer, AntimatterRecipeProvi of('W', AntimatterDefaultTools.WIRE_CUTTER.getTag(), 'R', PropertyIngredient.builder("primary").tool(AntimatterDefaultTools.PLUNGER, true).types(AntimatterMaterialTypes.ROD).build(), 'I', PropertyIngredient.builder("secondary").types(AntimatterMaterialTypes.PLATE).tags(HANDLE, RUBBERTOOLS).build(), 'F', AntimatterDefaultTools.FILE.getTag()), "WII", " RI", "R F"); provider.addToolRecipe(TOOL_BUILDER.get(AntimatterDefaultTools.PICKAXE.getId()), consumer, Ref.ID, "flint_" + AntimatterDefaultTools.PICKAXE.getId() + "_" + "recipe", "antimatter_tools", - "has_flint", provider.hasSafeItem(AntimatterMaterialTypes.GEM.getMaterialTag(AntimatterMaterials.Flint)), AntimatterDefaultTools.PICKAXE.getToolStack(AntimatterMaterials.Flint, Material.NULL), of('I', PropertyIngredient.builder("primary").types(AntimatterMaterialTypes.GEM).tags(FLINT).build(), 'R', PropertyIngredient.builder("secondary").types(AntimatterMaterialTypes.ROD).tags(HANDLE).build()), "III", " R ", " R "); + "has_flint", provider.hasSafeItem(AntimatterMaterialTypes.GEM.getMaterialTag(AntimatterMaterials.Flint)), AntimatterDefaultTools.PICKAXE.getToolStack(AntimatterMaterials.Flint, Material.NULL), of('I', PropertyIngredient.builder("primary").types(AntimatterMaterialTypes.GEM).tags(FLINT).build(), 'R', PropertyIngredient.builder("secondary").types(AntimatterMaterialTypes.ROD).tags(HANDLE).build()), "III", " R "); provider.addToolRecipe(TOOL_BUILDER.get(AntimatterDefaultTools.AXE.getId()), consumer, Ref.ID, "flint_" + AntimatterDefaultTools.AXE.getId() + "_" + "recipe", "antimatter_tools", - "has_flint", provider.hasSafeItem(AntimatterMaterialTypes.GEM.getMaterialTag(AntimatterMaterials.Flint)), AntimatterDefaultTools.AXE.getToolStack(AntimatterMaterials.Flint, Material.NULL), of('I', PropertyIngredient.builder("primary").types(AntimatterMaterialTypes.GEM).tags(FLINT).build(), 'R', PropertyIngredient.builder("secondary").types(AntimatterMaterialTypes.ROD).tags(HANDLE).build()), "II", "IR", " R"); + "has_flint", provider.hasSafeItem(AntimatterMaterialTypes.GEM.getMaterialTag(AntimatterMaterials.Flint)), AntimatterDefaultTools.AXE.getToolStack(AntimatterMaterials.Flint, Material.NULL), of('I', PropertyIngredient.builder("primary").types(AntimatterMaterialTypes.GEM).tags(FLINT).build(), 'R', PropertyIngredient.builder("secondary").types(AntimatterMaterialTypes.ROD).tags(HANDLE).build()), "II", "IR"); provider.addToolRecipe(TOOL_BUILDER.get(AntimatterDefaultTools.SWORD.getId()), consumer, Ref.ID, "flint_" + AntimatterDefaultTools.SWORD.getId() + "_" + "recipe", "antimatter_tools", "has_flint", provider.hasSafeItem(AntimatterMaterialTypes.GEM.getMaterialTag(AntimatterMaterials.Flint)), AntimatterDefaultTools.SWORD.getToolStack(AntimatterMaterials.Flint, Material.NULL), of('I', PropertyIngredient.builder("primary").types(AntimatterMaterialTypes.GEM).tags(FLINT).build(), 'R', PropertyIngredient.builder("secondary").types(AntimatterMaterialTypes.ROD).tags(HANDLE).build()), "I", "I", "R"); provider.addToolRecipe(TOOL_BUILDER.get(AntimatterDefaultTools.SHOVEL.getId()), consumer, Ref.ID, "flint_" + AntimatterDefaultTools.SHOVEL.getId() + "_" + "recipe", "antimatter_tools", - "has_flint", provider.hasSafeItem(AntimatterMaterialTypes.GEM.getMaterialTag(AntimatterMaterials.Flint)), AntimatterDefaultTools.SHOVEL.getToolStack(AntimatterMaterials.Flint, Material.NULL), of('I', PropertyIngredient.builder("primary").types(AntimatterMaterialTypes.GEM).tags(FLINT).build(), 'R', PropertyIngredient.builder("secondary").types(AntimatterMaterialTypes.ROD).tags(HANDLE).build()), "I", "R", "R"); + "has_flint", provider.hasSafeItem(AntimatterMaterialTypes.GEM.getMaterialTag(AntimatterMaterials.Flint)), AntimatterDefaultTools.SHOVEL.getToolStack(AntimatterMaterials.Flint, Material.NULL), of('I', PropertyIngredient.builder("primary").types(AntimatterMaterialTypes.GEM).tags(FLINT).build(), 'R', PropertyIngredient.builder("secondary").types(AntimatterMaterialTypes.ROD).tags(HANDLE).build()), "I", "R"); provider.addToolRecipe(TOOL_BUILDER.get(AntimatterDefaultTools.HOE.getId()), consumer, Ref.ID, "flint_" + AntimatterDefaultTools.HOE.getId() + "_" + "recipe", "antimatter_tools", "has_flint", provider.hasSafeItem(AntimatterMaterialTypes.GEM.getMaterialTag(AntimatterMaterials.Flint)), AntimatterDefaultTools.HOE.getToolStack(AntimatterMaterials.Flint, Material.NULL), of('I', PropertyIngredient.builder("primary").types(AntimatterMaterialTypes.GEM).tags(FLINT).build(), 'R', PropertyIngredient.builder("secondary").types(AntimatterMaterialTypes.ROD).tags(HANDLE).build()), "II", " R", " R");