From 5231e1d93b389f908e380d7610de09d2f2c3f838 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Wed, 15 Mar 2017 09:59:23 +0000 Subject: [PATCH] Fix Industrial Grinder getting stuck at 100%, closes #1004 --- .../api/recipe/machines/IndustrialGrinderRecipe.java | 10 ---------- .../tiles/multiblock/TileIndustrialGrinder.java | 3 +++ src/main/resources/assets/techreborn/lang/en_us.lang | 1 + 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/src/main/java/techreborn/api/recipe/machines/IndustrialGrinderRecipe.java b/src/main/java/techreborn/api/recipe/machines/IndustrialGrinderRecipe.java index 9f638636e..15f4ea2f6 100644 --- a/src/main/java/techreborn/api/recipe/machines/IndustrialGrinderRecipe.java +++ b/src/main/java/techreborn/api/recipe/machines/IndustrialGrinderRecipe.java @@ -25,11 +25,9 @@ package techreborn.api.recipe.machines; import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; import net.minecraftforge.fluids.FluidStack; import techreborn.api.Reference; import techreborn.api.recipe.BaseRecipe; -import techreborn.tiles.multiblock.TileIndustrialGrinder; public class IndustrialGrinderRecipe extends BaseRecipe { @@ -67,12 +65,4 @@ public class IndustrialGrinderRecipe extends BaseRecipe { public boolean useOreDic() { return useOreDic; } - - @Override - public boolean canCraft(TileEntity tile) { - if(tile instanceof TileIndustrialGrinder){ - return ((TileIndustrialGrinder) tile).getMutliBlock(); - } - return false; - } } diff --git a/src/main/java/techreborn/tiles/multiblock/TileIndustrialGrinder.java b/src/main/java/techreborn/tiles/multiblock/TileIndustrialGrinder.java index 72386bbdd..698fc4972 100644 --- a/src/main/java/techreborn/tiles/multiblock/TileIndustrialGrinder.java +++ b/src/main/java/techreborn/tiles/multiblock/TileIndustrialGrinder.java @@ -231,6 +231,9 @@ public class TileIndustrialGrinder extends TilePowerAcceptor implements IWrencha @Override public boolean canCraft(final TileEntity tile, final IndustrialGrinderRecipe recipe) { + if(!getMutliBlock()){ + return false; + } final FluidStack recipeFluid = recipe.fluidStack; final FluidStack tankFluid = this.tank.getFluid(); if (recipe.fluidStack == null) { diff --git a/src/main/resources/assets/techreborn/lang/en_us.lang b/src/main/resources/assets/techreborn/lang/en_us.lang index 7353696ab..99a4c6ac2 100644 --- a/src/main/resources/assets/techreborn/lang/en_us.lang +++ b/src/main/resources/assets/techreborn/lang/en_us.lang @@ -67,6 +67,7 @@ tile.techreborn.machineFrame.machine.name=Machine Block tile.techreborn.ore2.copper.name=Copper Ore tile.techreborn.ore2.tin.name=Tin Ore tile.techreborn.solarpanel.name=Solar Panel +tile.techreborn.creativepanel.name=Creative Panel tile.techreborn.watermill.name=Water Mill tile.techreborn.windmill.name=Wind Mill tile.techreborn.ironfurnace.name=Iron Furnace