Some small tweaks

This commit is contained in:
modmuss50 2016-03-27 19:23:38 +01:00
parent dfb7d0afd4
commit 877308a75c
3 changed files with 32 additions and 20 deletions

View file

@ -7,22 +7,31 @@ import techreborn.lib.Reference;
public class CentrifugeRecipe extends BaseRecipe public class CentrifugeRecipe extends BaseRecipe
{ {
boolean useOreDic = false;
public CentrifugeRecipe(ItemStack input1, ItemStack input2, ItemStack output1, ItemStack output2, ItemStack output3, public CentrifugeRecipe(ItemStack input1, ItemStack input2, ItemStack output1, ItemStack output2, ItemStack output3,
ItemStack output4, int tickTime, int euPerTick) ItemStack output4, int tickTime, int euPerTick)
{
super(Reference.centrifugeRecipe, tickTime, euPerTick);
if (input1 != null)
inputs.add(input1);
if (input2 != null)
inputs.add(input2);
if (output1 != null)
addOutput(output1);
if (output2 != null)
addOutput(output2);
if (output3 != null)
addOutput(output3);
if (output4 != null)
addOutput(output4);
}
public CentrifugeRecipe(ItemStack input1, ItemStack input2, ItemStack output1, ItemStack output2, ItemStack output3,
ItemStack output4, int tickTime, int euPerTick, boolean useOreDic)
{ {
super(Reference.centrifugeRecipe, tickTime, euPerTick); this(input1, input2, output1, output2, output3, output4, tickTime, euPerTick);
if (input1 != null) this.useOreDic = useOreDic;
inputs.add(input1);
if (input2 != null)
inputs.add(input2);
if (output1 != null)
addOutput(output1);
if (output2 != null)
addOutput(output2);
if (output3 != null)
addOutput(output3);
if (output4 != null)
addOutput(output4);
} }
@Override @Override
@ -30,4 +39,9 @@ public class CentrifugeRecipe extends BaseRecipe
{ {
return "Centrifuge"; return "Centrifuge";
} }
@Override
public boolean useOreDic() {
return useOreDic;
}
} }

View file

@ -5,7 +5,6 @@ import net.minecraft.inventory.ICrafting;
import net.minecraft.inventory.Slot; import net.minecraft.inventory.Slot;
import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.fml.relauncher.SideOnly;
import reborncore.client.gui.SlotCharge;
import reborncore.common.container.RebornContainer; import reborncore.common.container.RebornContainer;
import techreborn.tiles.storage.TileBatBox; import techreborn.tiles.storage.TileBatBox;
@ -40,8 +39,8 @@ public class ContainerBatbox extends RebornContainer
this.addSlotToContainer(new Slot(player.inventory, i, 8 + i * 18, 142)); this.addSlotToContainer(new Slot(player.inventory, i, 8 + i * 18, 142));
} }
this.addSlotToContainer(new SlotCharge(tile.inventory, 0, 80, 17)); // this.addSlotToContainer(new SlotCharge(tile.inventory, 0, 80, 17));
this.addSlotToContainer(new SlotCharge(tile.inventory, 1, 80, 53)); // this.addSlotToContainer(new SlotCharge(tile.inventory, 1, 80, 53));
} }
@Override @Override

View file

@ -7,7 +7,6 @@ import net.minecraft.inventory.Slot;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.fml.relauncher.SideOnly;
import reborncore.client.gui.SlotCharge;
import reborncore.common.container.RebornContainer; import reborncore.common.container.RebornContainer;
import techreborn.tiles.storage.TileMFSU; import techreborn.tiles.storage.TileMFSU;
@ -55,8 +54,8 @@ public class ContainerMFSU extends RebornContainer
} }
}); });
} }
this.addSlotToContainer(new SlotCharge(tile.inventory, 0, 80, 17)); // this.addSlotToContainer(new SlotCharge(tile.inventory, 0, 80, 17));
this.addSlotToContainer(new SlotCharge(tile.inventory, 1, 80, 53)); // this.addSlotToContainer(new SlotCharge(tile.inventory, 1, 80, 53));
} }
@Override @Override