allow overriding CraftingBlock output

Author: Riley31415

pom.xml

@@ -6,7 +6,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>io.github.mooy1</groupId>
     <artifactId>InfinityLib</artifactId>
-    <version>1.1.1</version>
+    <version>1.1.2</version>
 
     <properties>
         <maven.compiler.source>1.8</maven.compiler.source>

src/main/java/io/github/mooy1/infinitylib/machines/AbstractMachineBlock.java

@@ -16,7 +16,6 @@
 import io.github.thebusybiscuit.slimefun4.api.recipes.RecipeType;
 import io.github.thebusybiscuit.slimefun4.core.attributes.EnergyNetComponent;
 import io.github.thebusybiscuit.slimefun4.core.networks.energy.EnergyNetComponentType;
-import io.github.thebusybiscuit.slimefun4.libraries.dough.items.CustomItemStack;
 import io.github.thebusybiscuit.slimefun4.utils.ChestMenuUtils;
 import me.mrCookieSlime.Slimefun.api.inventory.BlockMenu;
 import me.mrCookieSlime.Slimefun.api.inventory.BlockMenuPreset;
@@ -25,10 +24,6 @@
 @ParametersAreNonnullByDefault
 public abstract class AbstractMachineBlock extends TickingMenuBlock implements EnergyNetComponent {
 
-    public static final ItemStack PROCESSING_ITEM = new CustomItemStack(Material.LIME_STAINED_GLASS_PANE, "&aProcessing...");
-    public static final ItemStack NO_ENERGY_ITEM = new CustomItemStack(Material.RED_STAINED_GLASS_PANE, "&cNot enough energy!");
-    public static final ItemStack IDLE_ITEM = new CustomItemStack(Material.BLACK_STAINED_GLASS_PANE, "&8Idle");
-
     protected MachineLayout layout = MachineLayout.MACHINE_DEFAULT;
     protected int energyPerTick = -1;
     protected int energyCapacity = -1;

src/main/java/io/github/mooy1/infinitylib/machines/CraftingBlock.java

@@ -72,14 +72,11 @@ private boolean craft(Block b, BlockMenu menu, Player p) {
             CraftingBlockRecipe recipe = getOutput(b, input);
             if (recipe != null) {
                 if (recipe.check(p)) {
-                    if (menu.fits(recipe.output, layout.outputSlots())) {
-                        ItemStack item = recipe.output.clone();
-                        onSuccessfulCraft(b, menu, p, recipe.output);
-                        menu.pushItem(item, layout.outputSlots());
+                    ItemStack output = recipe.output.clone();
+                    if (output(b, menu, p, output)) {
+                        onSuccessfulCraft(b, menu, p, output);
                         recipe.consume(input);
                         tick(b, menu);
-                    } else {
-                        onNoRoom(p);
                     }
                 }
             } else {
@@ -141,6 +138,16 @@ protected ItemStack getStatus(Block b, BlockMenu menu) {
         }
     }
 
+    protected boolean output(Block b, BlockMenu menu, Player p, ItemStack output) {
+        if (menu.fits(output, layout.outputSlots())) {
+            menu.pushItem(output, layout.outputSlots());
+            return true;
+        } else {
+            onNoRoom(p);
+            return false;
+        }
+    }
+
     protected boolean canCraft(Block b, Player p) {
         return true;
     }

src/main/java/io/github/mooy1/infinitylib/machines/MenuBlock.java

@@ -29,6 +29,9 @@
 @ParametersAreNonnullByDefault
 public abstract class MenuBlock extends SlimefunItem {
 
+    public static final ItemStack PROCESSING_ITEM = new CustomItemStack(Material.LIME_STAINED_GLASS_PANE, "&aProcessing...");
+    public static final ItemStack NO_ENERGY_ITEM = new CustomItemStack(Material.RED_STAINED_GLASS_PANE, "&cNot enough energy!");
+    public static final ItemStack IDLE_ITEM = new CustomItemStack(Material.BLACK_STAINED_GLASS_PANE, "&8Idle");
     public static final ItemStack NO_ROOM_ITEM = new CustomItemStack(Material.ORANGE_STAINED_GLASS_PANE, "&6Not enough room!");
     public static final ItemStack OUTPUT_BORDER = new CustomItemStack(ChestMenuUtils.getOutputSlotTexture(), "&6Output");
     public static final ItemStack INPUT_BORDER = new CustomItemStack(ChestMenuUtils.getInputSlotTexture(), "&9Input");