From 8218d8fd8210b69f5be25784c87faf3a7fd5834f Mon Sep 17 00:00:00 2001
From: trinsdar <30245301+Trinsdar@users.noreply.github.com>
Date: Wed, 4 Oct 2023 20:17:34 -0400
Subject: [PATCH] added macerating and sifting gravel recipes, updated
 antimatter

---
 AntimatterAPI                                                 | 2 +-
 .../muramasa/gregtech/loader/machines/MaceratorLoader.java    | 2 ++
 .../java/muramasa/gregtech/loader/machines/SiftingLoader.java | 4 ++++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/AntimatterAPI b/AntimatterAPI
index 72db9c93d..0f8c1aa29 160000
--- a/AntimatterAPI
+++ b/AntimatterAPI
@@ -1 +1 @@
-Subproject commit 72db9c93d8c8b6b65782640d09c08c56efddb91a
+Subproject commit 0f8c1aa2921841ac86a2354651baa214b7fc46f7
diff --git a/common/src/main/java/muramasa/gregtech/loader/machines/MaceratorLoader.java b/common/src/main/java/muramasa/gregtech/loader/machines/MaceratorLoader.java
index 283d46c57..bb2e21c79 100644
--- a/common/src/main/java/muramasa/gregtech/loader/machines/MaceratorLoader.java
+++ b/common/src/main/java/muramasa/gregtech/loader/machines/MaceratorLoader.java
@@ -25,6 +25,7 @@
 
 import static muramasa.antimatter.data.AntimatterMaterialTypes.*;
 import static muramasa.antimatter.data.AntimatterMaterialTypes.DUST;
+import static muramasa.antimatter.data.AntimatterMaterials.Stone;
 import static muramasa.antimatter.data.AntimatterMaterials.Wood;
 import static muramasa.antimatter.material.Material.NULL;
 import static muramasa.antimatter.material.MaterialTags.*;
@@ -129,6 +130,7 @@ public static void initAuto() {
     public static void init(){
         MACERATING.RB().ii(RecipeIngredient.of(Items.STONE,1)).io(new ItemStack(Items.GRAVEL,1)).add("gravel",100,2);
         MACERATING.RB().ii(RecipeIngredient.of(Items.COBBLESTONE,1)).io(new ItemStack(Items.SAND,1)).add("sand",100,2);
+        MACERATING.RB().ii(RecipeIngredient.of(Items.GRAVEL,1)).io(DUST.get(Stone,1)).add("stone_dust_from_gravel",100,2);
         MACERATING.RB().ii(RecipeIngredient.of(Items.BRICK,1)).io(DUST_SMALL.get(Materials.Brick, 2)).add("brick_dust",50,4);
         MACERATING.RB().ii(RecipeIngredient.of(Items.COAL,1)).io(AntimatterMaterialTypes.DUST.get(AntimatterMaterials.Coal, 1)).add("coal_dust",50,4);
         MACERATING.RB().ii(RecipeIngredient.of(ItemTags.LOGS, 1)).io(AntimatterMaterialTypes.DUST.get(Wood, 2)).add("wood_dust",40, 2);
diff --git a/common/src/main/java/muramasa/gregtech/loader/machines/SiftingLoader.java b/common/src/main/java/muramasa/gregtech/loader/machines/SiftingLoader.java
index d047e8e10..049635d2a 100644
--- a/common/src/main/java/muramasa/gregtech/loader/machines/SiftingLoader.java
+++ b/common/src/main/java/muramasa/gregtech/loader/machines/SiftingLoader.java
@@ -1,6 +1,9 @@
 package muramasa.gregtech.loader.machines;
 
+import muramasa.antimatter.data.ForgeCTags;
+import muramasa.antimatter.recipe.ingredient.RecipeIngredient;
 import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.item.Items;
 
 import static muramasa.antimatter.data.AntimatterMaterialTypes.*;
 import static muramasa.gregtech.data.RecipeMaps.SIFTING;
@@ -18,5 +21,6 @@ public static void init() {
                     e ? GEM_FLAWED.get(m, 1) : gem,
                     e ? GEM_CHIPPED.get(m, 1) : gem, dustPurified).chances(chances/*0.05, 0.125, 0.25, 0.5, 0.75, 1.0*/).add("crushed_" + m.getId(),800, 16);
         });
+        SIFTING.RB().ii(RecipeIngredient.of(ForgeCTags.GRAVEL, 1)).io(Items.FLINT).add("flint", 40 * 20, 16);
     }
 }