diff --git a/src/main/java/techreborn/init/ModRecipes.java b/src/main/java/techreborn/init/ModRecipes.java index af320bd29..cbd0b463d 100644 --- a/src/main/java/techreborn/init/ModRecipes.java +++ b/src/main/java/techreborn/init/ModRecipes.java @@ -111,6 +111,23 @@ public class ModRecipes { } } IndustrialSawmillRecipes.init(); + + //Let it be in postInit to be sure that oredict already there + if (OreUtil.doesOreExistAndValid("stoneMarble")) { + ItemStack marbleStack = getOre("stoneMarble"); + marbleStack.setCount(1); + RecipeHandler.addRecipe(new GrinderRecipe( + marbleStack, ItemDusts.getDustByName("marble"), + 120, 10)); + } + if (OreUtil.doesOreExistAndValid("stoneBasalt")) { + ItemStack marbleStack = getOre("stoneBasalt"); + marbleStack.setCount(1); + RecipeHandler.addRecipe(new GrinderRecipe( + marbleStack, ItemDusts.getDustByName("basalt"), + 120, 10)); + } + } private static void addCompressorRecipes() { @@ -229,7 +246,7 @@ public class ModRecipes { new ItemStack(Blocks.END_STONE), ItemDusts.getDustByName("endstone"), 300, 16)); - + } static void addReactorRecipes() { diff --git a/src/main/java/techreborn/multiblocks/MultiBlockCasing.java b/src/main/java/techreborn/multiblocks/MultiBlockCasing.java index 3c5b2cb77..b692b95b2 100644 --- a/src/main/java/techreborn/multiblocks/MultiBlockCasing.java +++ b/src/main/java/techreborn/multiblocks/MultiBlockCasing.java @@ -324,7 +324,6 @@ public class MultiBlockCasing extends RectangularMultiblockControllerBase { protected void isBlockGoodForInterior(World world, int x, int y, int z) throws MultiblockValidationException { Block block = world.getBlockState(new BlockPos(x, y, z)).getBlock(); - System.out.println(block); if (block.isAir(world.getBlockState(new BlockPos(x, y, z)), world, new BlockPos(x, y, z))) { } else if (block.getUnlocalizedName().equals("tile.lava")) { @@ -344,4 +343,4 @@ public class MultiBlockCasing extends RectangularMultiblockControllerBase { } } -} \ No newline at end of file +} diff --git a/src/main/java/techreborn/tiles/TileMatterFabricator.java b/src/main/java/techreborn/tiles/TileMatterFabricator.java index db6f9eb42..6839d3b2c 100644 --- a/src/main/java/techreborn/tiles/TileMatterFabricator.java +++ b/src/main/java/techreborn/tiles/TileMatterFabricator.java @@ -51,8 +51,10 @@ public class TileMatterFabricator extends TilePowerAcceptor public static int maxInput = 8192; @ConfigRegistry(config = "machines", category = "matter_fabricator", key = "MatterFabricatorMaxEnergy", comment = "Matter Fabricator Max Energy (Value in EU)") public static int maxEnergy = 100000000; - @ConfigRegistry(config = "machines", category = "matter_fabricator", key = "MatterFabricatorFabricationRate", comment = "Matter Fabricator Fabrication Rate") + @ConfigRegistry(config = "machines", category = "matter_fabricator", key = "MatterFabricatorFabricationRate", comment = "Matter Fabricator Fabrication Rate, amount of amplifier units per UUM") public static int fabricationRate = 10000; + @ConfigRegistry(config = "machines", category = "matter_fabricator", key = "MatterFabricatorEnergyPerAmp", comment = "Matter Fabricator EU per amplifier unit, multiply this with the rate for total EU") + public static int energyPerAmp = 1666; // @ConfigRegistry(config = "machines", category = "matter_fabricator", key = "MatterFabricatorWrenchDropRate", comment = "Matter Fabricator Wrench Drop Rate") public static float wrenchDropRate = 1.0F; @@ -100,14 +102,14 @@ public class TileMatterFabricator extends TilePowerAcceptor @Override public boolean canInsertItem(int slotIndex, ItemStack itemStack, EnumFacing side) { - if (slotIndex == 6) + if (slotIndex >= 6) return false; return isItemValidForSlot(slotIndex, itemStack); } @Override public boolean canExtractItem(int slotIndex, ItemStack itemStack, EnumFacing side) { - return slotIndex == 6; + return slotIndex >= 6 && slotIndex <= 10; } @Override @@ -119,8 +121,9 @@ public class TileMatterFabricator extends TilePowerAcceptor final ItemStack stack = this.inventory.getStackInSlot(i); if (!stack.isEmpty() && spaceForOutput()) { final int amp = this.getValue(stack); - if (amp != 0 && this.canUseEnergy(85)) { - this.useEnergy(85); + final int euNeeded = amp * energyPerAmp; + if (amp != 0 && this.canUseEnergy(euNeeded)) { + this.useEnergy(euNeeded); this.amplifier += amp; this.inventory.decrStackSize(i, 1); } diff --git a/src/main/java/techreborn/tiles/multiblock/TileVacuumFreezer.java b/src/main/java/techreborn/tiles/multiblock/TileVacuumFreezer.java index a6fa3abb2..0c655ab9e 100644 --- a/src/main/java/techreborn/tiles/multiblock/TileVacuumFreezer.java +++ b/src/main/java/techreborn/tiles/multiblock/TileVacuumFreezer.java @@ -118,7 +118,7 @@ public class TileVacuumFreezer extends TilePowerAcceptor @Override public ItemStack getWrenchDrop(final EntityPlayer entityPlayer) { - return new ItemStack(ModBlocks.ALLOY_SMELTER, 1); + return new ItemStack(ModBlocks.VACUUM_FREEZER, 1); } @Override