From ac7a4246f6f8f2abaebb7152b968e6bab7c78295 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Mon, 26 Jun 2017 22:30:13 +0100 Subject: [PATCH] Fixes the auto crafting table, as it broke a bit with the forge update. --- .../gui/autocrafting/GuiAutoCraftingRecipeSlector.java | 6 ++++++ src/main/java/techreborn/packets/PacketSetRecipe.java | 5 +---- src/main/java/techreborn/tiles/TileAutoCraftingTable.java | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/main/java/techreborn/client/gui/autocrafting/GuiAutoCraftingRecipeSlector.java b/src/main/java/techreborn/client/gui/autocrafting/GuiAutoCraftingRecipeSlector.java index 5362448f4..cdf65e247 100644 --- a/src/main/java/techreborn/client/gui/autocrafting/GuiAutoCraftingRecipeSlector.java +++ b/src/main/java/techreborn/client/gui/autocrafting/GuiAutoCraftingRecipeSlector.java @@ -22,6 +22,7 @@ public class GuiAutoCraftingRecipeSlector extends GuiRecipeBook { //Pulls the button off the screen as we dont need it toggleRecipesBtn = new GuiButtonToggle(0, -1000, -1000, 26, 16, false); toggleRecipesBtn.initTextureValues(152, 41, 28, 18, RECIPE_BOOK); + //recipeBook.setGuiOpen(true); } @Override @@ -30,6 +31,11 @@ public class GuiAutoCraftingRecipeSlector extends GuiRecipeBook { } + @Override + public boolean isVisible() { + return true; + } + @Override public void setContainerRecipe(IRecipe recipe, RecipeList recipes) { guiAutoCrafting.setRecipe(recipe, false); diff --git a/src/main/java/techreborn/packets/PacketSetRecipe.java b/src/main/java/techreborn/packets/PacketSetRecipe.java index 031ff09da..54bedc608 100644 --- a/src/main/java/techreborn/packets/PacketSetRecipe.java +++ b/src/main/java/techreborn/packets/PacketSetRecipe.java @@ -28,10 +28,7 @@ public class PacketSetRecipe implements INetworkPacket { this.recipe = recipe.getRegistryName(); } - if(this.recipe == null){ - //TODO fix vanilla recipes - this.recipe = new ResourceLocation(""); - } + System.out.println(this.recipe); this.custom = custom; } diff --git a/src/main/java/techreborn/tiles/TileAutoCraftingTable.java b/src/main/java/techreborn/tiles/TileAutoCraftingTable.java index 727ce9351..d3d01f3ff 100644 --- a/src/main/java/techreborn/tiles/TileAutoCraftingTable.java +++ b/src/main/java/techreborn/tiles/TileAutoCraftingTable.java @@ -331,7 +331,7 @@ public class TileAutoCraftingTable extends TilePowerAcceptor implements IContain return -1; } List possibleSlots = new ArrayList<>(); - for (int i = 0; i < 9; i++) { + for (int i = 0; i < recipe.getIngredients().size(); i++) { ItemStack stackInSlot = inventory.getStackInSlot(i); Ingredient ingredient = recipe.getIngredients().get(i); if (ingredient != Ingredient.EMPTY && ingredient.apply(stack)) {