added macerating and sifting gravel recipes, updated antimatter

GregTech-Intergalactical · Oct 5, 2023 · 8218d8f · 8218d8f
1 parent be01568
commit 8218d8f
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/AntimatterAPI b/AntimatterAPI
diff --git 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
@@ -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);
     }
 }
+0 −1		common/src/main/java/muramasa/antimatter/MaterialDataInit.java
+0 −1		common/src/main/java/muramasa/antimatter/data/AntimatterMaterials.java
+1 −1		common/src/main/java/muramasa/antimatter/data/AntimatterStoneTypes.java
+5 −0		common/src/main/java/muramasa/antimatter/datagen/loaders/StoneRecipes.java
+6 −0		forge/src/main/java/muramasa/antimatter/common/event/forge/ForgeCommonEvents.java