little fixs

This commit is contained in:
gigabit101 2016-03-19 23:18:31 +00:00
parent 4da9babce0
commit 2fa00b9c7f
3 changed files with 6 additions and 5 deletions

View file

@ -11,6 +11,7 @@ import reborncore.common.blocks.BlockMachineBase;
import reborncore.common.powerSystem.PoweredItem; import reborncore.common.powerSystem.PoweredItem;
import reborncore.common.util.BucketHandler; import reborncore.common.util.BucketHandler;
import techreborn.Core; import techreborn.Core;
import techreborn.blocks.BlockMachineFrame;
import techreborn.events.OreUnifier; import techreborn.events.OreUnifier;
import techreborn.items.*; import techreborn.items.*;
import techreborn.items.armor.ItemLapotronPack; import techreborn.items.armor.ItemLapotronPack;
@ -335,8 +336,8 @@ public class ModItems {
registerOreDict(); registerOreDict();
BlockMachineBase.advancedMachineStack = new ItemStack(Item.getItemFromBlock(ModBlocks.MachineCasing), 1, 2); BlockMachineBase.advancedMachineStack = BlockMachineFrame.getFrameByName("advancedMachine", 1);
BlockMachineBase.machineStack = new ItemStack(Item.getItemFromBlock(ModBlocks.MachineCasing), 1, 0); BlockMachineBase.machineStack = BlockMachineFrame.getFrameByName("machine", 1);
} }
public static void registerOreDict() { public static void registerOreDict() {

View file

@ -248,7 +248,7 @@ public class ModRecipes {
private static void addCompressorRecipes() { 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() { static void addExtractorRecipes() {

View file

@ -22,7 +22,7 @@ public class TileGenerator extends TilePowerAcceptor implements IWrenchable, IIn
public int fuelSlot = 0; public int fuelSlot = 0;
public int burnTime; public int burnTime;
public int totalBurnTime = 0; 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 isBurning;
public boolean lastTickBurning; public boolean lastTickBurning;
ItemStack burnItem; ItemStack burnItem;
@ -143,7 +143,7 @@ public class TileGenerator extends TilePowerAcceptor implements IWrenchable, IIn
@Override @Override
public double getMaxPower() { public double getMaxPower() {
return 10000; return 100;
} }
@Override @Override