From 2fa00b9c7f5b7321b66eb43e601a8db17353bbf4 Mon Sep 17 00:00:00 2001 From: gigabit101 Date: Sat, 19 Mar 2016 23:18:31 +0000 Subject: [PATCH] little fixs --- src/main/java/techreborn/init/ModItems.java | 5 +++-- src/main/java/techreborn/init/ModRecipes.java | 2 +- src/main/java/techreborn/tiles/generator/TileGenerator.java | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/main/java/techreborn/init/ModItems.java b/src/main/java/techreborn/init/ModItems.java index e959347ef..e1d50740a 100644 --- a/src/main/java/techreborn/init/ModItems.java +++ b/src/main/java/techreborn/init/ModItems.java @@ -11,6 +11,7 @@ import reborncore.common.blocks.BlockMachineBase; import reborncore.common.powerSystem.PoweredItem; import reborncore.common.util.BucketHandler; import techreborn.Core; +import techreborn.blocks.BlockMachineFrame; import techreborn.events.OreUnifier; import techreborn.items.*; import techreborn.items.armor.ItemLapotronPack; @@ -335,8 +336,8 @@ public class ModItems { registerOreDict(); - BlockMachineBase.advancedMachineStack = new ItemStack(Item.getItemFromBlock(ModBlocks.MachineCasing), 1, 2); - BlockMachineBase.machineStack = new ItemStack(Item.getItemFromBlock(ModBlocks.MachineCasing), 1, 0); + BlockMachineBase.advancedMachineStack = BlockMachineFrame.getFrameByName("advancedMachine", 1); + BlockMachineBase.machineStack = BlockMachineFrame.getFrameByName("machine", 1); } public static void registerOreDict() { diff --git a/src/main/java/techreborn/init/ModRecipes.java b/src/main/java/techreborn/init/ModRecipes.java index 77f0d5778..de2ca2c52 100644 --- a/src/main/java/techreborn/init/ModRecipes.java +++ b/src/main/java/techreborn/init/ModRecipes.java @@ -248,7 +248,7 @@ public class ModRecipes { private static void addCompressorRecipes() { - RecipeHandler.addRecipe(new CompressorRecipe(new ItemStack(Items.diamond), new ItemStack(Items.coal), 400, 20)); +// RecipeHandler.addRecipe(new CompressorRecipe(new ItemStack(Items.diamond), new ItemStack(Items.coal), 400, 20)); } static void addExtractorRecipes() { diff --git a/src/main/java/techreborn/tiles/generator/TileGenerator.java b/src/main/java/techreborn/tiles/generator/TileGenerator.java index 80f502d73..48d2c44a2 100644 --- a/src/main/java/techreborn/tiles/generator/TileGenerator.java +++ b/src/main/java/techreborn/tiles/generator/TileGenerator.java @@ -22,7 +22,7 @@ public class TileGenerator extends TilePowerAcceptor implements IWrenchable, IIn public int fuelSlot = 0; public int burnTime; public int totalBurnTime = 0; - public static int outputAmount = 40; //This is in line with BC engines rf, sould properly use the conversion ratio here. + public static int outputAmount = 10; //This is in line with BC engines rf, sould properly use the conversion ratio here. public boolean isBurning; public boolean lastTickBurning; ItemStack burnItem; @@ -143,7 +143,7 @@ public class TileGenerator extends TilePowerAcceptor implements IWrenchable, IIn @Override public double getMaxPower() { - return 10000; + return 100; } @Override