Merge remote-tracking branch 'remotes/origin/1.10.2-v1' into 1.11
# Conflicts: # src/main/java/techreborn/client/container/ContainerAlloySmelter.java # src/main/java/techreborn/client/container/ContainerAssemblingMachine.java # src/main/java/techreborn/client/container/ContainerCentrifuge.java # src/main/java/techreborn/items/tools/ItemNanosaber.java
This commit is contained in:
commit
5782d2d032
10 changed files with 81 additions and 120 deletions
|
@ -80,13 +80,13 @@ public class GuiHandler implements IGuiHandler {
|
|||
} else if (ID == quantumChestID) {
|
||||
return new ContainerQuantumChest((TileQuantumChest) world.getTileEntity(new BlockPos(x, y, z)), player);
|
||||
} else if (ID == centrifugeID) {
|
||||
container = new ContainerCentrifuge();
|
||||
container = new ContainerCentrifuge(player, (TileCentrifuge) world.getTileEntity(new BlockPos(x, y, z)));
|
||||
} else if (ID == rollingMachineID) {
|
||||
return new ContainerRollingMachine((TileRollingMachine) world.getTileEntity(new BlockPos(x, y, z)), player);
|
||||
} else if (ID == blastFurnaceID) {
|
||||
return new ContainerBlastFurnace((TileBlastFurnace) world.getTileEntity(new BlockPos(x, y, z)), player);
|
||||
} else if (ID == alloySmelterID) {
|
||||
container = new ContainerAlloySmelter();
|
||||
container = new ContainerAlloySmelter(player, (TileAlloySmelter) world.getTileEntity(new BlockPos(x, y, z)));
|
||||
} else if (ID == industrialGrinderID) {
|
||||
return new ContainerIndustrialGrinder((TileIndustrialGrinder) world.getTileEntity(new BlockPos(x, y, z)),
|
||||
player);
|
||||
|
@ -99,7 +99,7 @@ public class GuiHandler implements IGuiHandler {
|
|||
} else if (ID == chunkloaderID) {
|
||||
return new ContainerChunkloader((TileChunkLoader) world.getTileEntity(new BlockPos(x, y, z)), player);
|
||||
} else if (ID == assemblingmachineID) {
|
||||
container = new ContainerAssemblingMachine();
|
||||
container = new ContainerAssemblingMachine(player, (TileAssemblingMachine) world.getTileEntity(new BlockPos(x, y, z)));
|
||||
} else if (ID == dieselGeneratorID) {
|
||||
return new ContainerDieselGenerator((TileDieselGenerator) world.getTileEntity(new BlockPos(x, y, z)),
|
||||
player);
|
||||
|
|
|
@ -13,18 +13,26 @@ import techreborn.tiles.TileAlloySmelter;
|
|||
import javax.annotation.Nullable;
|
||||
import java.util.List;
|
||||
|
||||
public class ContainerAlloySmelter extends ContainerCrafting implements IContainerLayout<TileAlloySmelter> {
|
||||
public class ContainerAlloySmelter extends ContainerCrafting {
|
||||
|
||||
public int tickTime;
|
||||
EntityPlayer player;
|
||||
TileAlloySmelter tile;
|
||||
|
||||
public ContainerAlloySmelter(EntityPlayer player, TileAlloySmelter tile) {
|
||||
super(tile.crafter);
|
||||
this.player = player;
|
||||
this.tile = tile;
|
||||
addPlayerSlots();
|
||||
addInventorySlots();
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean canInteractWith(EntityPlayer player) {
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
public void addInventorySlots() {
|
||||
|
||||
// input
|
||||
|
@ -41,7 +49,7 @@ public class ContainerAlloySmelter extends ContainerCrafting implements IContain
|
|||
this.addSlotToContainer(new SlotUpgrade(tile.inventory, 7, 152, 62));
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
public void addPlayerSlots() {
|
||||
int i;
|
||||
|
||||
|
@ -56,32 +64,4 @@ public class ContainerAlloySmelter extends ContainerCrafting implements IContain
|
|||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setTile(TileAlloySmelter tile) {
|
||||
this.tile = tile;
|
||||
setCrafter(tile.crafter);
|
||||
}
|
||||
|
||||
@Nullable
|
||||
@Override
|
||||
public TileAlloySmelter getTile() {
|
||||
return tile;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setPlayer(EntityPlayer player) {
|
||||
this.player = player;
|
||||
}
|
||||
|
||||
@Nullable
|
||||
@Override
|
||||
public EntityPlayer getPlayer() {
|
||||
return player;
|
||||
}
|
||||
|
||||
@Nullable
|
||||
@Override
|
||||
public List<Integer> getSlotsForSide(EnumFacing facing) {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -11,7 +11,7 @@ import techreborn.tiles.TileAssemblingMachine;
|
|||
import javax.annotation.Nullable;
|
||||
import java.util.List;
|
||||
|
||||
public class ContainerAssemblingMachine extends ContainerCrafting implements IContainerLayout<TileAssemblingMachine> {
|
||||
public class ContainerAssemblingMachine extends ContainerCrafting{
|
||||
|
||||
public int tickTime;
|
||||
EntityPlayer player;
|
||||
|
@ -22,7 +22,15 @@ public class ContainerAssemblingMachine extends ContainerCrafting implements ICo
|
|||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public ContainerAssemblingMachine(EntityPlayer player, TileAssemblingMachine tile) {
|
||||
super(tile.crafter);
|
||||
this.player = player;
|
||||
this.tile = tile;
|
||||
addPlayerSlots();
|
||||
addInventorySlots();
|
||||
}
|
||||
|
||||
|
||||
public void addInventorySlots() {
|
||||
// input
|
||||
this.addSlotToContainer(new BaseSlot(tile.inventory, 0, 47, 17));
|
||||
|
@ -38,7 +46,7 @@ public class ContainerAssemblingMachine extends ContainerCrafting implements ICo
|
|||
this.addSlotToContainer(new SlotUpgrade(tile.inventory, 7, 152, 62));
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
public void addPlayerSlots() {
|
||||
int i;
|
||||
|
||||
|
@ -53,32 +61,4 @@ public class ContainerAssemblingMachine extends ContainerCrafting implements ICo
|
|||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setTile(TileAssemblingMachine tile) {
|
||||
this.tile = tile;
|
||||
this.crafter = tile.crafter;
|
||||
}
|
||||
|
||||
@Nullable
|
||||
@Override
|
||||
public TileAssemblingMachine getTile() {
|
||||
return tile;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setPlayer(EntityPlayer player) {
|
||||
this.player = player;
|
||||
}
|
||||
|
||||
@Nullable
|
||||
@Override
|
||||
public EntityPlayer getPlayer() {
|
||||
return player;
|
||||
}
|
||||
|
||||
@Nullable
|
||||
@Override
|
||||
public List<Integer> getSlotsForSide(EnumFacing facing) {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -11,18 +11,26 @@ import techreborn.tiles.TileCentrifuge;
|
|||
import javax.annotation.Nullable;
|
||||
import java.util.List;
|
||||
|
||||
public class ContainerCentrifuge extends ContainerCrafting implements IContainerLayout<TileCentrifuge> {
|
||||
public class ContainerCentrifuge extends ContainerCrafting {
|
||||
|
||||
public int tickTime;
|
||||
EntityPlayer player;
|
||||
TileCentrifuge tile;
|
||||
|
||||
public ContainerCentrifuge(EntityPlayer player, TileCentrifuge tile) {
|
||||
super(tile.crafter);
|
||||
this.player = player;
|
||||
this.tile = tile;
|
||||
addInventorySlots();
|
||||
addPlayerSlots();
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean canInteractWith(EntityPlayer player) {
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
public void addInventorySlots() {
|
||||
// input
|
||||
this.addSlotToContainer(new BaseSlot(tile.inventory, 0, 80, 35));
|
||||
|
@ -41,7 +49,7 @@ public class ContainerCentrifuge extends ContainerCrafting implements IContainer
|
|||
this.addSlotToContainer(new SlotUpgrade(tile.inventory, 10, 152, 62));
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
public void addPlayerSlots() {
|
||||
int i;
|
||||
|
||||
|
@ -56,32 +64,4 @@ public class ContainerCentrifuge extends ContainerCrafting implements IContainer
|
|||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setTile(TileCentrifuge tile) {
|
||||
this.tile = tile;
|
||||
this.crafter = tile.crafter;
|
||||
}
|
||||
|
||||
@Nullable
|
||||
@Override
|
||||
public TileCentrifuge getTile() {
|
||||
return tile;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setPlayer(EntityPlayer player) {
|
||||
this.player = player;
|
||||
}
|
||||
|
||||
@Nullable
|
||||
@Override
|
||||
public EntityPlayer getPlayer() {
|
||||
return player;
|
||||
}
|
||||
|
||||
@Nullable
|
||||
@Override
|
||||
public List<Integer> getSlotsForSide(EnumFacing facing) {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue