refactoring CraftingProcess

src/api/java/baritone/api/process/ICraftingProcess.java

@@ -23,49 +23,53 @@
 import java.util.List;
 
 /**
- * but it rescans the world every once in a while so it doesn't get fooled by its cache
+ * Allows you to craft items.
  */
 public interface ICraftingProcess extends IBaritoneProcess {
 
     /**
+     * Executes the crafting of the requested item such that we obtain the requested amount.
      * @param item that should be crafted
-     * @return Can the item be crafted in a crafting table?
+     * @param amount how much of that item is wanted.
      */
-    boolean hasCraftingRecipe(Item item);
+    void craftItem(Item item, int amount);
 
     /**
-     * @param item that should be crafted
-     * @return List of all recipies that result in the provided Item.
+     * Executes the crafting of the requested recipe such that we obtain the requested amount of output.
+     * @param recipe recipe that should be used.
+     * @param amount how many result items are wanted.
      */
-    List<IRecipe> getCraftingRecipes(Item item);
+    void craftRecipe(IRecipe recipe, int amount);
 
     /**
-     * Checks if the recipe can craft the requested amount of output.
-     * @param recipe that should be crafted
-     * @param amount how much output is wanted
-     * @return
+     * @param item that should be crafted.
+     * @return Can the item be crafted in a crafting table?
      */
-    boolean canCraft(IRecipe recipe, int amount);
+    boolean hasCraftingRecipe(Item item);
 
     /**
-     * Checks if the item can be crafted the requested amount of times.
-     * @param item that should be crafted
-     * @param amount how much of this item should be crafted
-     * @return
+     * @param item that should be crafted.
+     * @return List of all recipes that result in the provided Item.
+     */
+    List<IRecipe> getCraftingRecipes(Item item);
+
+    /**
+     * @param item that should be crafted.
+     * @param amount how much of this item should be crafted.
+     * @return Can we craft this item the requested amount of times?
      */
     boolean canCraft(Item item, int amount);
 
     /**
-     * Executes the crafting of the requested item the requested amount of times.
-     * @param item that should be crafted
-     * @param amount how much of that item is wanted.
+     * @param recipe that should be crafted.
+     * @param amount how much output is wanted.
+     * @return Can we craft this recipe to get the requested amount of output?
      */
-    void craftItem(Item item, int amount);
+    boolean canCraft(IRecipe recipe, int amount);
 
     /**
-     * Executes the crafting of the requested recipe the requested amount of times.
-     * @param recipe recipe that should be used.
-     * @param amount how many result items are wanted.
+     * @param recipe the recipe we want to craft.
+     * @return Do we need a crafting table or can we craft it in our inventory?
      */
-    void craftRecipe(IRecipe recipe, int amount);
+    boolean canCraftInInventory(IRecipe recipe);
 }

src/main/java/baritone/process/CraftingProcess.java

@@ -23,7 +23,6 @@
 import baritone.api.process.PathingCommandType;
 import baritone.utils.BaritoneProcessHelper;
 import net.minecraft.client.gui.GuiScreen;
-import net.minecraft.client.gui.inventory.GuiCrafting;
 import net.minecraft.client.util.RecipeItemHelper;
 import net.minecraft.init.Blocks;
 import net.minecraft.inventory.ClickType;
@@ -44,7 +43,6 @@ public CraftingProcess(Baritone baritone) {
         super(baritone);
     }
 
-
     @Override
     public boolean isActive() {
         return recipe != null && amount >= 1;
@@ -58,14 +56,8 @@ public synchronized PathingCommand onTick(boolean calcFailed, boolean isSafeToCa
         } else {
             //we no longer pathing so it's time to craft
             try {
-                int outputCount = getOutputCount(); //items per crafting cycle
-                int inputCount = getInputCount();
-                boolean inputStackLimitReached = inputCount >= getLowestMaxStackSize();
-
-                takeResultFromOutput(outputCount, inputCount, inputStackLimitReached);
-                if (mc.currentScreen instanceof GuiCrafting) {
-                    moveItemsToCraftingGrid();
-                }
+                moveItemsToCraftingGrid();
+                takeResultFromOutput();
             } catch (Exception e) {
                 logDirect("Error! Did you close the crafting window while crafting process was still running?");
                 onLostControl();
@@ -74,25 +66,38 @@ public synchronized PathingCommand onTick(boolean calcFailed, boolean isSafeToCa
         }
     }
 
-    private void takeResultFromOutput(int outputCount, int inputCount, boolean inputStackLimitReached) {
-        if (outputCount * inputCount >= amount || inputStackLimitReached) {
-            int windowId = ctx.player().openContainer.windowId;
-            int slotID = 0; //slot id. for crafting table output it is 0
-            int randomIntWeDontNeedButHaveToProvide = 0; //idk isnt used
-            mc.playerController.windowClick(windowId, slotID, randomIntWeDontNeedButHaveToProvide, ClickType.QUICK_MOVE, ctx.player());
-            amount = amount - (outputCount * inputCount);
+    @Override
+    public synchronized void onLostControl() {
+        amount = 0;
+        recipe = null;
+    }
 
-            if (amount <= 0) {
-                logDirect("done");
-                //we finished crafting
-                ctx.player().closeScreen();
-                onLostControl();
-            }
+    @Override
+    public String displayName0() {
+        return "Crafting " + amount + "x " + recipe.getRecipeOutput().getDisplayName();
+    }
+
+    @Override
+    public void craftItem(Item item, int amount) {
+        if (canCraft(item, amount)) {
+            this.amount = amount;
+            //todo check for crafting tables that are close. if none are found place one. else gotoBlock.
+            baritone.getGetToBlockProcess().getToBlock(Blocks.CRAFTING_TABLE);
+            logDirect("Crafting now " + amount + "x [" + recipe.getRecipeOutput().getDisplayName() + "]");
+        } else {
+            logDirect("Insufficient resources.");
         }
     }
 
-    private int getOutputCount() {
-        return ((ContainerWorkbench) baritone.getPlayerContext().player().openContainer).craftResult.getStackInSlot(420).getCount();
+    @Override
+    public void craftRecipe(IRecipe recipe, int amount) {
+        if (canCraft(recipe, amount)) {
+            this.recipe = recipe;
+            this.amount = amount;
+            baritone.getGetToBlockProcess().getToBlock(Blocks.CRAFTING_TABLE);
+        } else {
+            logDirect("this recipe is not craftable with the available resources.");
+        }
     }
 
     private int getInputCount() {
@@ -103,25 +108,32 @@ private int getInputCount() {
                 stackSize = Math.min(itemStack.getCount(), stackSize);
             }
         }
-        return stackSize;
+        return stackSize == Integer.MAX_VALUE ? 0 : stackSize;
     }
 
-    private int getLowestMaxStackSize() {
-        int maxStackSize = Integer.MAX_VALUE;
-        for (int i = 0; i < 9; i++) {
-            ItemStack itemStack = ((ContainerWorkbench) baritone.getPlayerContext().player().openContainer).craftMatrix.getStackInSlot(i);
-            if (itemStack.getItem() != Item.getItemFromBlock(Blocks.AIR)) {
-                maxStackSize = Math.min(itemStack.getMaxStackSize(), maxStackSize);
-            }
+    private void takeResultFromOutput() {
+        int inputCount = getInputCount();
+        if (inputCount > 0) {
+            int windowId = ctx.player().openContainer.windowId;
+            int slotID = 0; //slot id. for crafting table output it is 0
+            int randomIntWeDontNeedButHaveToProvide = 0; //idk isnt used
+            mc.playerController.windowClick(windowId, slotID, randomIntWeDontNeedButHaveToProvide, ClickType.QUICK_MOVE, ctx.player());
+            amount = amount - (recipe.getRecipeOutput().getCount() * inputCount);
+        }
+
+        if (amount <= 0) {
+            logDirect("Done");
+            //we finished crafting
+            ctx.player().closeScreen();
+            onLostControl();
         }
-        return maxStackSize;
     }
 
     private void moveItemsToCraftingGrid() {
         int windowId = baritone.getPlayerContext().player().openContainer.windowId;
         //try to put the recipe the required amount of times in to the crafting grid.
-        for (int i = 0; i*recipe.getRecipeOutput().getCount() < amount; i++) {
-            mc.playerController.func_194338_a(windowId,recipe, GuiScreen.isShiftKeyDown(), ctx.player());
+        for (int i = 0; i * recipe.getRecipeOutput().getCount() < amount; i++) {
+            mc.playerController.func_194338_a(windowId, recipe, GuiScreen.isShiftKeyDown(), ctx.player());
         }
     }
 
@@ -144,25 +156,12 @@ public ArrayList<IRecipe> getCraftingRecipes(Item item) {
         return recipes;
     }
 
-    @Override
-    //should this be in a helper class?
-    public boolean canCraft(IRecipe recipe, int amount) {
-        RecipeItemHelper recipeItemHelper = new RecipeItemHelper();
-        for (ItemStack stack : ctx.player().inventory.mainInventory) {
-            recipeItemHelper.accountStack(stack);
-        }
-        //could be inlined but i think that would be not very readable
-        int outputCount = recipe.getRecipeOutput().getCount();
-        int times = amount % outputCount == 0 ? amount / outputCount : (amount / outputCount) + 1;
-        return recipeItemHelper.canCraft(recipe, null, times);
-    }
-
     @Override
     //should this be in a helper class?
     public boolean canCraft(Item item, int amount) {
         List<IRecipe> recipeList = getCraftingRecipes(item);
         for (IRecipe recipe : recipeList) {
-            if(canCraft(recipe, amount)) {
+            if (canCraft(recipe, amount)) {
                 this.recipe = recipe;
                 return true;
             }
@@ -173,37 +172,21 @@ public boolean canCraft(Item item, int amount) {
     }
 
     @Override
-    public void craftItem(Item item, int amount) {
-        if(canCraft(item, amount)) {
-            this.amount = amount;
-            //todo check for crafting tables that are close. if none are found place one. else gotoBlock.
-            baritone.getGetToBlockProcess().getToBlock(Blocks.CRAFTING_TABLE);
-            logDirect("im totally crafting right now");
-        } else {
-            logDirect("unable to find a craftable recipe. do you have the necessary resources?");
-        }
-    }
-
-    @Override
-    //this is intended for use over the api
-    public void craftRecipe(IRecipe recipe, int amount) {
-        if(canCraft(recipe,amount)) {
-            this.recipe = recipe;
-            this.amount = amount;
-            baritone.getGetToBlockProcess().getToBlock(Blocks.CRAFTING_TABLE);
-        } else {
-            logDirect("this recipe is not craftable with the available resources.");
+    //should this be in a helper class?
+    public boolean canCraft(IRecipe recipe, int amount) {
+        RecipeItemHelper recipeItemHelper = new RecipeItemHelper();
+        for (ItemStack stack : ctx.player().inventory.mainInventory) {
+            recipeItemHelper.accountStack(stack);
         }
+        //could be inlined but i think that would be not very readable
+        int outputCount = recipe.getRecipeOutput().getCount();
+        int times = amount % outputCount == 0 ? amount / outputCount : (amount / outputCount) + 1;
+        return recipeItemHelper.canCraft(recipe, null, times);
     }
 
-    @Override
-    public synchronized void onLostControl() {
-        amount = 0;
-        recipe = null;
-    }
 
     @Override
-    public String displayName0() {
-        return "Crafting "+amount+"x "+recipe.getRecipeOutput().getDisplayName();
+    public boolean canCraftInInventory(IRecipe recipe) {
+        return recipe.canFit(2,2);
     }
 }