Merge pull request #616 from Lapis256/fix/sag_mill_recipes

Prevent item duplication by updating processing recipes in SAG Mill

src/generated/resources/data/enderio/recipes/sag_milling/bone_block.json

@@ -1,5 +1,6 @@
 {
   "type": "enderio:sag_milling",
+  "bonus": "none",
   "energy": 2400,
   "input": {
     "item": "minecraft:bone_block"

src/generated/resources/data/enderio/recipes/sag_milling/ender_crystal.json

@@ -1,5 +1,6 @@
 {
   "type": "enderio:sag_milling",
+  "bonus": "none",
   "energy": 2400,
   "input": {
     "tag": "forge:gems/ender_crystal"

src/generated/resources/data/enderio/recipes/sag_milling/ender_pearl.json

@@ -1,5 +1,6 @@
 {
   "type": "enderio:sag_milling",
+  "bonus": "none",
   "energy": 2400,
   "input": {
     "tag": "forge:ender_pearls"

src/generated/resources/data/enderio/recipes/sag_milling/glass.json

@@ -1,5 +1,6 @@
 {
   "type": "enderio:sag_milling",
+  "bonus": "none",
   "energy": 2400,
   "input": {
     "tag": "forge:glass"

src/generated/resources/data/enderio/recipes/sag_milling/glowstone.json

@@ -1,5 +1,6 @@
 {
   "type": "enderio:sag_milling",
+  "bonus": "chance_only",
   "energy": 2400,
   "input": {
     "item": "minecraft:glowstone"

src/generated/resources/data/enderio/recipes/sag_milling/gold.json

@@ -1,5 +1,6 @@
 {
   "type": "enderio:sag_milling",
+  "bonus": "none",
   "energy": 2400,
   "input": {
     "tag": "forge:ingots/gold"

src/generated/resources/data/enderio/recipes/sag_milling/iron.json

@@ -1,5 +1,6 @@
 {
   "type": "enderio:sag_milling",
+  "bonus": "none",
   "energy": 2400,
   "input": {
     "tag": "forge:ingots/iron"

src/generated/resources/data/enderio/recipes/sag_milling/lapis.json

@@ -1,5 +1,6 @@
 {
   "type": "enderio:sag_milling",
+  "bonus": "none",
   "energy": 2400,
   "input": {
     "tag": "forge:gems/lapis"

src/generated/resources/data/enderio/recipes/sag_milling/precient_crystal.json

@@ -1,5 +1,6 @@
 {
   "type": "enderio:sag_milling",
+  "bonus": "none",
   "energy": 2400,
   "input": {
     "tag": "forge:gems/prescient_crystal"

src/generated/resources/data/enderio/recipes/sag_milling/pulsating_crystal.json

@@ -1,5 +1,6 @@
 {
   "type": "enderio:sag_milling",
+  "bonus": "none",
   "energy": 2400,
   "input": {
     "tag": "forge:gems/pulsating_crystal"

src/generated/resources/data/enderio/recipes/sag_milling/quartz.json

@@ -1,5 +1,6 @@
 {
   "type": "enderio:sag_milling",
+  "bonus": "chance_only",
   "energy": 2400,
   "input": {
     "tag": "forge:gems/quartz"

src/generated/resources/data/enderio/recipes/sag_milling/quartz_block.json

@@ -1,5 +1,6 @@
 {
   "type": "enderio:sag_milling",
+  "bonus": "chance_only",
   "energy": 2400,
   "input": {
     "tag": "forge:storage_blocks/quartz"

src/generated/resources/data/enderio/recipes/sag_milling/quartz_slabs.json

@@ -1,5 +1,6 @@
 {
   "type": "enderio:sag_milling",
+  "bonus": "chance_only",
   "energy": 2400,
   "input": {
     "item": "minecraft:quartz_slab"

src/generated/resources/data/enderio/recipes/sag_milling/quartz_stairs.json

@@ -1,5 +1,6 @@
 {
   "type": "enderio:sag_milling",
+  "bonus": "chance_only",
   "energy": 2400,
   "input": {
     "item": "minecraft:quartz_stairs"

src/generated/resources/data/enderio/recipes/sag_milling/sandstone.json

@@ -1,5 +1,6 @@
 {
   "type": "enderio:sag_milling",
+  "bonus": "chance_only",
   "energy": 2400,
   "input": {
     "tag": "forge:sandstone"

src/generated/resources/data/enderio/recipes/sag_milling/soularium.json

@@ -1,5 +1,6 @@
 {
   "type": "enderio:sag_milling",
+  "bonus": "none",
   "energy": 2400,
   "input": {
     "tag": "forge:ingots/soularium"

src/generated/resources/data/enderio/recipes/sag_milling/stone.json

@@ -1,5 +1,6 @@
 {
   "type": "enderio:sag_milling",
+  "bonus": "none",
   "energy": 2400,
   "input": {
     "tag": "forge:stone"

src/generated/resources/data/enderio/recipes/sag_milling/vibrant_crystal.json

@@ -1,5 +1,6 @@
 {
   "type": "enderio:sag_milling",
+  "bonus": "none",
   "energy": 2400,
   "input": {
     "tag": "forge:gems/vibrant_crystal"

src/generated/resources/data/enderio/recipes/sag_milling/wool.json

@@ -1,5 +1,6 @@
 {
   "type": "enderio:sag_milling",
+  "bonus": "chance_only",
   "energy": 2400,
   "input": {
     "tag": "minecraft:wool"

src/machines/java/com/enderio/machines/common/blockentity/SagMillBlockEntity.java

@@ -144,7 +144,7 @@ protected void consumeInputs(SagMillingRecipe recipe) {
                 INPUT.getItemStack(inv).shrink(1);
 
                 // Claim any available grinding balls.
-                if (grindingBallData == IGrindingBallData.IDENTITY) {
+                if (recipe.getBonusType().useGrindingBall() && grindingBallData == IGrindingBallData.IDENTITY) {
                     ItemStack ball = GRINDING_BALL.getItemStack(inv);
                     if (!ball.isEmpty()) {
                         IGrindingBallData data = GrindingBallManager.getData(ball);

src/machines/java/com/enderio/machines/common/integrations/jei/category/SagMillCategory.java

@@ -11,6 +11,7 @@
 import com.enderio.machines.common.lang.MachineLang;
 import com.enderio.machines.common.recipe.SagMillingRecipe;
 import mezz.jei.api.gui.builder.IRecipeLayoutBuilder;
+import mezz.jei.api.gui.builder.IRecipeSlotBuilder;
 import mezz.jei.api.gui.drawable.IDrawable;
 import mezz.jei.api.gui.ingredient.IRecipeSlotTooltipCallback;
 import mezz.jei.api.gui.ingredient.IRecipeSlotsView;
@@ -67,9 +68,11 @@ public void setRecipe(IRecipeLayoutBuilder builder, SagMillingRecipe recipe, IFo
         builder.addSlot(INPUT, 32, 1)
             .addItemStacks(List.of(recipe.getInput().getItems()));
 
-        builder.addSlot(CATALYST, 74, 12)
-            .addItemStack(new ItemStack(Items.AIR))
-            .addItemStacks(GrindingBallManager.getGrindingBalls().stream().map(ItemStack::new).toList());
+        IRecipeSlotBuilder gridingBallSlot = builder.addSlot(CATALYST, 74, 12)
+            .addItemStack(new ItemStack(Items.AIR));
+        if (recipe.getBonusType().useGrindingBall()) {
+            gridingBallSlot.addItemStacks(GrindingBallManager.getGrindingBalls().stream().map(ItemStack::new).toList());
+        }
 
         List<SagMillingRecipe.OutputItem> results = recipe.getOutputs();
         if (!results.isEmpty()) {