diff --git a/src/main/java/techreborn/compat/nei/recipes/AlloySmelterRecipeHandler.java b/src/main/java/techreborn/compat/nei/recipes/AlloySmelterRecipeHandler.java index 62341ae36..2900196c1 100644 --- a/src/main/java/techreborn/compat/nei/recipes/AlloySmelterRecipeHandler.java +++ b/src/main/java/techreborn/compat/nei/recipes/AlloySmelterRecipeHandler.java @@ -2,6 +2,7 @@ package techreborn.compat.nei.recipes; import codechicken.nei.PositionedStack; import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraftforge.oredict.OreDictionary; import techreborn.api.recipe.IBaseRecipeType; import techreborn.client.gui.GuiAlloySmelter; import techreborn.client.gui.GuiImplosionCompressor; @@ -12,10 +13,10 @@ public class AlloySmelterRecipeHandler extends GenericRecipeHander implements IN @Override public void addPositionedStacks(List input, List outputs, IBaseRecipeType recipeType) { int offset = 4; - PositionedStack pStack = new PositionedStack(recipeType.getInputs().get(0), 56 - offset, 25 - offset); + PositionedStack pStack = new PositionedStack(OreDictionary.getOres(OreDictionary.getOreName(OreDictionary.getOreID(recipeType.getInputs().get(0)))), 56 - offset, 25 - offset); input.add(pStack); - PositionedStack pStack2 = new PositionedStack(recipeType.getInputs().get(1), 56 - offset, 43 - offset); + PositionedStack pStack2 = new PositionedStack(OreDictionary.getOres(OreDictionary.getOreName(OreDictionary.getOreID(recipeType.getInputs().get(1)))), 56 - offset, 43 - offset); input.add(pStack2); PositionedStack pStack3 = new PositionedStack(recipeType.getOutputs().get(0), 116 - offset, 35 - offset); diff --git a/src/main/java/techreborn/compat/nei/recipes/ImplosionCompressorRecipeHandler.java b/src/main/java/techreborn/compat/nei/recipes/ImplosionCompressorRecipeHandler.java index af4b55138..1c3523a55 100644 --- a/src/main/java/techreborn/compat/nei/recipes/ImplosionCompressorRecipeHandler.java +++ b/src/main/java/techreborn/compat/nei/recipes/ImplosionCompressorRecipeHandler.java @@ -2,19 +2,23 @@ package techreborn.compat.nei.recipes; import codechicken.nei.PositionedStack; import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraftforge.oredict.OreDictionary; import techreborn.api.recipe.IBaseRecipeType; import techreborn.client.gui.GuiImplosionCompressor; +import java.util.ArrayList; import java.util.List; public class ImplosionCompressorRecipeHandler extends GenericRecipeHander implements INeiBaseRecipe { @Override public void addPositionedStacks(List input, List outputs, IBaseRecipeType recipeType) { int offset = 4; - PositionedStack pStack = new PositionedStack(recipeType.getInputs().get(0), 34 - offset, 16 - offset); + PositionedStack pStack = new PositionedStack(OreDictionary.getOres(OreDictionary.getOreName(OreDictionary.getOreID(recipeType.getInputs().get(0)))), 34 - offset, 16 - offset); input.add(pStack); - PositionedStack pStack2 = new PositionedStack(recipeType.getInputs().get(1), 34 - offset, 34 - offset); + PositionedStack pStack2 = new PositionedStack(OreDictionary.getOres(OreDictionary.getOreName(OreDictionary.getOreID(recipeType.getInputs().get(1)))), 34 - offset, 34 - offset); input.add(pStack2); PositionedStack pStack3 = new PositionedStack(recipeType.getOutputs().get(0), 86 - offset, 25 - offset); diff --git a/src/main/java/techreborn/init/ModRecipes.java b/src/main/java/techreborn/init/ModRecipes.java index be2f32cfc..9f0fc3513 100644 --- a/src/main/java/techreborn/init/ModRecipes.java +++ b/src/main/java/techreborn/init/ModRecipes.java @@ -198,7 +198,7 @@ public class ModRecipes { Blocks.cobblestone); TechRebornAPI.registerBlastFurnaceRecipe(new BlastFurnaceRecipe(new ItemStack(Items.apple), new ItemStack(Items.ender_pearl), new ItemStack(Items.golden_apple), new ItemStack(Items.diamond), 120, 1000)); - RecipeHanderer.addRecipe(new ImplosionCompressorRecipe(new ItemStack(Blocks.planks, 4), new ItemStack(Blocks.wool), new ItemStack(Items.brewing_stand), new ItemStack(Items.carrot), 120, 5)); + RecipeHanderer.addRecipe(new ImplosionCompressorRecipe(new ItemStack(Blocks.planks, 4), IC2Items.getItem("copperIngot"), new ItemStack(Items.brewing_stand), new ItemStack(Items.carrot), 120, 5)); RecipeHanderer.addRecipe(new AlloySmelterRecipe(new ItemStack(Items.coal), new ItemStack(Blocks.sand), new ItemStack(Items.diamond), 120, 5)); RecipeHanderer.addRecipe(new AssemblingMachineRecipe(new ItemStack(Items.coal), new ItemStack(Blocks.sand), new ItemStack(Items.diamond), 120, 5)); diff --git a/src/main/java/techreborn/multiblocks/MultiBlockCasing.java b/src/main/java/techreborn/multiblocks/MultiBlockCasing.java index 02df57fa7..8c5ea6a29 100644 --- a/src/main/java/techreborn/multiblocks/MultiBlockCasing.java +++ b/src/main/java/techreborn/multiblocks/MultiBlockCasing.java @@ -16,7 +16,7 @@ import techreborn.util.LogHelper; public class MultiBlockCasing extends RectangularMultiblockControllerBase { public boolean hasLava; - public boolean isStar; + public boolean isStar = false; public MultiBlockCasing(World world) { super(world); @@ -93,13 +93,20 @@ public class MultiBlockCasing extends RectangularMultiblockControllerBase { } - if(checkIfStarShape(minimumCoord.x, minimumCoord.y, minimumCoord.z)){ - isStar = true; - return; - } else { - isStar = false; - } +// if(checkIfStarShape(minimumCoord.x, minimumCoord.y, minimumCoord.z)){ +// isStar = true; +// return; +// } else { +// isStar = false; +// } + if (deltaY < 4) + { + throw new MultiblockValidationException( + String.format( + "Machine is too small, it must be at least %d blocks in the Y dimension", + minY)); + } // Now we run a simple check on each block within that volume. // Any block deviating = NO DEAL SIR @@ -410,7 +417,8 @@ public class MultiBlockCasing extends RectangularMultiblockControllerBase { } {//middle blocks for (int i = 0; i < 3; i++) { - te = this.worldObj.getTileEntity(x + 1, y + i, z); + System.out.println(this.worldObj.getBlock(x, y - 1, z)); + te = this.worldObj.getTileEntity(x + 1, y + i, z); isSolid = checkTeIsCenter(te); if(!isSolid){ return false; @@ -444,7 +452,7 @@ public class MultiBlockCasing extends RectangularMultiblockControllerBase { } public boolean checkTeIsCorner(TileEntity te){ - return (te.blockType instanceof BlockMachineCasing && te.blockMetadata == 0); + return (te.blockType instanceof BlockMachineCasing && te.blockMetadata == 0); } public boolean checkTeIsCenter(TileEntity te){