Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
5a57dc5817
4 changed files with 16 additions and 4 deletions
|
@ -30,8 +30,15 @@ public class ContainerAlloySmelter extends TechRebornContainer {
|
||||||
this.addSlotToContainer(new Slot(tileAlloysmelter.inventory, 0, 47, 17));
|
this.addSlotToContainer(new Slot(tileAlloysmelter.inventory, 0, 47, 17));
|
||||||
this.addSlotToContainer(new Slot(tileAlloysmelter.inventory, 1, 65, 17));
|
this.addSlotToContainer(new Slot(tileAlloysmelter.inventory, 1, 65, 17));
|
||||||
// outputs
|
// outputs
|
||||||
this.addSlotToContainer(new SlotOutput(tileAlloysmelter.inventory, 2,
|
this.addSlotToContainer(new SlotOutput(tileAlloysmelter.inventory, 2, 116, 35));
|
||||||
116, 35));
|
// battery
|
||||||
|
this.addSlotToContainer(new Slot(tileAlloysmelter.inventory, 3, 56, 53));
|
||||||
|
// upgrades
|
||||||
|
this.addSlotToContainer(new Slot(tileAlloysmelter.inventory, 4, 152, 8));
|
||||||
|
this.addSlotToContainer(new Slot(tileAlloysmelter.inventory, 5, 152, 26));
|
||||||
|
this.addSlotToContainer(new Slot(tileAlloysmelter.inventory, 6, 152, 44));
|
||||||
|
this.addSlotToContainer(new Slot(tileAlloysmelter.inventory, 7, 152, 62));
|
||||||
|
|
||||||
|
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
|
|
|
@ -34,6 +34,11 @@ public class ContainerAssemblingMachine extends TechRebornContainer {
|
||||||
this.addSlotToContainer(new SlotOutput(tileAssemblingMachine.inventory, 2,116, 35));
|
this.addSlotToContainer(new SlotOutput(tileAssemblingMachine.inventory, 2,116, 35));
|
||||||
// power
|
// power
|
||||||
this.addSlotToContainer(new Slot(tileAssemblingMachine.inventory, 3, 56, 53));
|
this.addSlotToContainer(new Slot(tileAssemblingMachine.inventory, 3, 56, 53));
|
||||||
|
// upgrades
|
||||||
|
this.addSlotToContainer(new Slot(tileAssemblingMachine.inventory, 4, 152, 8));
|
||||||
|
this.addSlotToContainer(new Slot(tileAssemblingMachine.inventory, 5, 152, 26));
|
||||||
|
this.addSlotToContainer(new Slot(tileAssemblingMachine.inventory, 6, 152, 44));
|
||||||
|
this.addSlotToContainer(new Slot(tileAssemblingMachine.inventory, 7, 152, 62));
|
||||||
|
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
|
|
|
@ -15,7 +15,7 @@ public class TileAlloySmelter extends TileMachineBase implements IWrenchable, IE
|
||||||
|
|
||||||
public int tickTime;
|
public int tickTime;
|
||||||
public BasicSink energy;
|
public BasicSink energy;
|
||||||
public Inventory inventory = new Inventory(3, "TileAlloySmelter", 64);
|
public Inventory inventory = new Inventory(8, "TileAlloySmelter", 64);
|
||||||
public RecipeCrafter crafter;
|
public RecipeCrafter crafter;
|
||||||
|
|
||||||
public TileAlloySmelter()
|
public TileAlloySmelter()
|
||||||
|
|
|
@ -15,7 +15,7 @@ public class TileAssemblingMachine extends TileMachineBase implements IWrenchabl
|
||||||
|
|
||||||
public int tickTime;
|
public int tickTime;
|
||||||
public BasicSink energy;
|
public BasicSink energy;
|
||||||
public Inventory inventory = new Inventory(4, "TileAssemblingMachine", 64);
|
public Inventory inventory = new Inventory(8, "TileAssemblingMachine", 64);
|
||||||
public RecipeCrafter crafter;
|
public RecipeCrafter crafter;
|
||||||
|
|
||||||
public TileAssemblingMachine()
|
public TileAssemblingMachine()
|
||||||
|
|
Loading…
Add table
Reference in a new issue