fix all? the tile to prevent bug duplication

This commit is contained in:
alexpic57 2017-09-08 21:39:46 +02:00
parent 53adc8142e
commit c1dd9d9192
35 changed files with 35 additions and 35 deletions

View file

@ -156,6 +156,6 @@ public class TileAssemblingMachine extends TilePowerAcceptor
return new ContainerBuilder("assemblingmachine").player(player.inventory).inventory(8, 84).hotbar(8, 142)
.addInventory().tile(this).slot(0, 47, 17).slot(1, 65, 17).outputSlot(2, 116, 35).energySlot(3, 56, 53)
.upgradeSlot(4, 152, 8).upgradeSlot(5, 152, 26).upgradeSlot(6, 152, 44).upgradeSlot(7, 152, 62)
.syncEnergyValue().syncCrafterValue().addInventory().create();
.syncEnergyValue().syncCrafterValue().addInventory().create(this);
}
}

View file

@ -296,7 +296,7 @@ public class TileAutoCraftingTable extends TilePowerAcceptor implements IContain
.outputSlot(9, 145, 42).syncEnergyValue()
.syncIntegerValue(this::getProgress, this::setProgress)
.syncIntegerValue(this::getMaxProgress, this::setMaxProgress)
.addInventory().create();
.addInventory().create(this);
}
@Override

View file

@ -144,7 +144,7 @@ public class TileChargeOMat extends TilePowerAcceptor
public BuiltContainer createContainer(final EntityPlayer player) {
return new ContainerBuilder("chargebench").player(player.inventory).inventory().hotbar().addInventory()
.tile(this).energySlot(0, 62, 25).energySlot(1, 98, 25).energySlot(2, 62, 45).energySlot(3, 98, 45)
.energySlot(4, 62, 65).energySlot(5, 98, 65).syncEnergyValue().addInventory().create();
.energySlot(4, 62, 65).energySlot(5, 98, 65).syncEnergyValue().addInventory().create(this);
}
@Override

View file

@ -170,6 +170,6 @@ public class TileChemicalReactor extends TilePowerAcceptor
public BuiltContainer createContainer(final EntityPlayer player) {
return new ContainerBuilder("chemicalreactor").player(player.inventory).inventory().hotbar()
.addInventory().tile(this).slot(0, 34, 47).slot(1, 126, 47).outputSlot(2, 80, 47).energySlot(3, 8, 72)
.syncEnergyValue().syncCrafterValue().addInventory().create();
.syncEnergyValue().syncCrafterValue().addInventory().create(this);
}
}

View file

@ -100,6 +100,6 @@ public class TileChunkLoader extends TilePowerAcceptor implements IToolDrop, IIn
@Override
public BuiltContainer createContainer(final EntityPlayer player) {
return new ContainerBuilder("chunkloader").player(player.inventory).inventory(8,84).hotbar(8,142).addInventory()
.create();
.create(this);
}
}

View file

@ -45,7 +45,7 @@ public class TileDigitalChest extends TileTechStorageBase implements IContainerP
@Override
public BuiltContainer createContainer(final EntityPlayer player) {
return new ContainerBuilder("digitalchest").player(player.inventory).inventory().hotbar().addInventory()
.tile(this).slot(0, 80, 24).outputSlot(1, 80, 64).addInventory().create();
.tile(this).slot(0, 80, 24).outputSlot(1, 80, 64).addInventory().create(this);
}
@Override

View file

@ -188,7 +188,7 @@ public class TileIndustrialCentrifuge extends TilePowerAcceptor
return new ContainerBuilder("centrifuge").player(player.inventory).inventory().hotbar()
.addInventory().tile(this).slot(0, 40, 34).slot(1, 40, 54).outputSlot(2, 82, 44).outputSlot(3, 101, 25)
.outputSlot(4, 120, 44).outputSlot(5, 101, 63).energySlot(6, 8, 72).syncEnergyValue()
.syncCrafterValue().addInventory().create();
.syncCrafterValue().addInventory().create(this);
}
}

View file

@ -183,6 +183,6 @@ public class TileIndustrialElectrolyzer extends TilePowerAcceptor
.filterSlot(1, 50, 51, stack -> ItemUtils.isItemEqual(stack, DynamicCell.getEmptyCell(1), true, true))
.filterSlot(0, 80, 51, stack -> !ItemUtils.isItemEqual(stack, DynamicCell.getEmptyCell(1), true, true))
.outputSlot(2, 50, 19).outputSlot(3, 70, 19).outputSlot(4, 90, 19).outputSlot(5, 110, 19)
.energySlot(6, 18, 51).syncEnergyValue().syncCrafterValue().addInventory().create();
.energySlot(6, 18, 51).syncEnergyValue().syncCrafterValue().addInventory().create(this);
}
}

View file

@ -352,6 +352,6 @@ public class TileIronAlloyFurnace extends TileLegacyMachineBase
&& ItemUtils.isInputEqual(recipe.getInputs().get(1), stack, true, true, true)))
.outputSlot(2, 116, 35).fuelSlot(3, 56, 53).syncIntegerValue(this::getBurnTime, this::setBurnTime)
.syncIntegerValue(this::getCookTime, this::setCookTime)
.syncIntegerValue(this::getCurrentItemBurnTime, this::setCurrentItemBurnTime).addInventory().create();
.syncIntegerValue(this::getCurrentItemBurnTime, this::setCurrentItemBurnTime).addInventory().create(this);
}
}

View file

@ -207,6 +207,6 @@ public class TileIronFurnace extends TileLegacyMachineBase
return new ContainerBuilder("ironfurnace").player(player.inventory).inventory(8, 84).hotbar(8, 142)
.addInventory().tile(this).slot(0, 56, 17).outputSlot(1, 116, 35).fuelSlot(2, 56, 53)
.syncIntegerValue(this::getBurnTime, this::setBurnTime)
.syncIntegerValue(this::getTotalBurnTime, this::setTotalBurnTime).addInventory().create();
.syncIntegerValue(this::getTotalBurnTime, this::setTotalBurnTime).addInventory().create(this);
}
}

View file

@ -233,7 +233,7 @@ public class TileMatterFabricator extends TilePowerAcceptor
.addInventory().tile(this).slot(0, 30, 20).slot(1, 50, 20).slot(2, 70, 20).slot(3, 90, 20)
.slot(4, 110, 20).slot(5, 130, 20).outputSlot(6, 40, 66).outputSlot(7, 60, 66).outputSlot(8, 80, 66)
.outputSlot(9, 100, 66).outputSlot(10, 120, 66).syncEnergyValue()
.syncIntegerValue(this::getProgress, this::setProgress).addInventory().create();
.syncIntegerValue(this::getProgress, this::setProgress).addInventory().create(this);
}
@Override

View file

@ -45,7 +45,7 @@ public class TileQuantumChest extends TileTechStorageBase implements IContainerP
@Override
public BuiltContainer createContainer(final EntityPlayer player) {
return new ContainerBuilder("quantumchest").player(player.inventory).inventory().hotbar().addInventory()
.tile(this).slot(0, 80, 24).outputSlot(1, 80, 64).addInventory().create();
.tile(this).slot(0, 80, 24).outputSlot(1, 80, 64).addInventory().create(this);
}
@Override

View file

@ -158,6 +158,6 @@ public class TileQuantumTank extends TileLegacyMachineBase
public BuiltContainer createContainer(final EntityPlayer player) {
return new ContainerBuilder("quantumtank").player(player.inventory).inventory(8, 84).hotbar(8, 142)
.addInventory().tile(this).fluidSlot(0, 80, 17).outputSlot(1, 80, 53).fakeSlot(2, 59, 42).addInventory()
.create();
.create(this);
}
}

View file

@ -239,7 +239,7 @@ public class TileRollingMachine extends TilePowerAcceptor
.onCraft(inv -> this.inventory.setInventorySlotContents(1,
RollingMachineRecipe.instance.findMatchingRecipe(inv, this.world)))
.addInventory().tile(this).outputSlot(0, 124, 35).energySlot(2, 8, 51).syncEnergyValue()
.syncIntegerValue(this::getBurnTime, this::setBurnTime).addInventory().create();
.syncIntegerValue(this::getBurnTime, this::setBurnTime).addInventory().create(this);
}
private static class RollingTileContainer extends Container {

View file

@ -217,6 +217,6 @@ public class TileScrapboxinator extends TilePowerAcceptor
.addInventory().tile(this).filterSlot(0, 56, 34, stack -> stack.getItem() == ModItems.SCRAP_BOX)
.outputSlot(1, 116, 35).upgradeSlot(2, 152, 8).upgradeSlot(3, 152, 26).upgradeSlot(4, 152, 44)
.upgradeSlot(5, 152, 62).syncEnergyValue().syncIntegerValue(this::getProgress, this::setProgress)
.addInventory().create();
.addInventory().create(this);
}
}

View file

@ -70,6 +70,6 @@ public class TileDieselGenerator extends TileBaseFluidGenerator implements ICont
public BuiltContainer createContainer(final EntityPlayer player) {
return new ContainerBuilder("dieselgenerator").player(player.inventory).inventory().hotbar()
.addInventory().tile(this).slot(0, 25, 35).outputSlot(1, 25, 55).syncEnergyValue()
.addInventory().create();
.addInventory().create(this);
}
}

View file

@ -70,6 +70,6 @@ public class TileGasTurbine extends TileBaseFluidGenerator implements IContainer
public BuiltContainer createContainer(final EntityPlayer player) {
return new ContainerBuilder("gasturbine").player(player.inventory).inventory().hotbar()
.addInventory().tile(this).slot(0, 25, 35).outputSlot(1, 25, 55).syncEnergyValue()
.addInventory().create();
.addInventory().create(this);
}
}

View file

@ -70,6 +70,6 @@ public class TileSemiFluidGenerator extends TileBaseFluidGenerator implements IC
public BuiltContainer createContainer(final EntityPlayer player) {
return new ContainerBuilder("semifluidgenerator").player(player.inventory).inventory().hotbar()
.addInventory().tile(this).slot(0, 25, 35).outputSlot(1, 25, 55).syncEnergyValue()
.addInventory().create();
.addInventory().create(this);
}
}

View file

@ -179,7 +179,7 @@ public class TileSolidFuelGenerator extends TilePowerAcceptor implements IToolDr
return new ContainerBuilder("generator").player(player.inventory).inventory().hotbar().addInventory()
.tile(this).fuelSlot(0, 80, 54).energySlot(1, 8, 72).syncEnergyValue()
.syncIntegerValue(this::getBurnTime, this::setBurnTime)
.syncIntegerValue(this::getTotalBurnTime, this::setTotalBurnTime).addInventory().create();
.syncIntegerValue(this::getTotalBurnTime, this::setTotalBurnTime).addInventory().create(this);
}
@Override

View file

@ -75,6 +75,6 @@ public class TileThermalGenerator extends TileBaseFluidGenerator implements ICon
public BuiltContainer createContainer(final EntityPlayer player) {
return new ContainerBuilder("thermalgenerator").player(player.inventory).inventory().hotbar()
.addInventory().tile(this).slot(0, 25, 35).outputSlot(1, 25, 55).syncEnergyValue()
.addInventory().create();
.addInventory().create(this);
}
}

View file

@ -87,7 +87,7 @@ public class TileInterdimensionalSU extends TileEnergyStorage implements IContai
public BuiltContainer createContainer(final EntityPlayer player) {
return new ContainerBuilder("mfsu").player(player.inventory).inventory().hotbar().armor()
.complete(8, 18).addArmor().addInventory().tile(this).energySlot(0, 62, 45).energySlot(1, 98, 45)
.syncEnergyValue().addInventory().create();
.syncEnergyValue().addInventory().create(this);
}
@Override

View file

@ -155,7 +155,7 @@ public class TileImplosionCompressor extends TilePowerAcceptor
public BuiltContainer createContainer(final EntityPlayer player) {
return new ContainerBuilder("implosioncompressor").player(player.inventory).inventory().hotbar()
.addInventory().tile(this).slot(0, 50, 27).slot(1, 50, 47).outputSlot(2, 92, 36).outputSlot(3, 110, 36)
.syncEnergyValue().syncCrafterValue().addInventory().create();
.syncEnergyValue().syncCrafterValue().addInventory().create(this);
}
}

View file

@ -234,6 +234,6 @@ public class TileIndustrialBlastFurnace extends TilePowerAcceptor implements ITo
return new ContainerBuilder("blastfurnace").player(player.inventory).inventory().hotbar()
.addInventory().tile(this).slot(0, 50, 27).slot(1, 50, 47).outputSlot(2, 92, 36).outputSlot(3, 110, 36)
.syncEnergyValue().syncCrafterValue().syncIntegerValue(this::getHeat, this::setHeat).addInventory()
.create();
.create(this);
}
}

View file

@ -278,7 +278,7 @@ public class TileIndustrialGrinder extends TilePowerAcceptor implements IToolDro
return new ContainerBuilder("industrialgrinder").player(player.inventory).inventory().hotbar()
.addInventory().tile(this).slot(1, 34, 35).slot(0, 84, 43).outputSlot(2, 126, 18).outputSlot(3, 126, 36)
.outputSlot(4, 126, 54).outputSlot(5, 126, 72).outputSlot(6, 34, 55).syncEnergyValue().syncCrafterValue().addInventory()
.create();
.create(this);
}
}

View file

@ -267,6 +267,6 @@ public class TileIndustrialSawmill extends TilePowerAcceptor
public BuiltContainer createContainer(final EntityPlayer player) {
return new ContainerBuilder("industrialsawmill").player(player.inventory).inventory(8, 84).hotbar(8, 142)
.addInventory().tile(this).slot(0, 32, 26).slot(1, 32, 44).outputSlot(2, 84, 35).outputSlot(3, 102, 35)
.outputSlot(4, 120, 35).syncEnergyValue().syncIntegerValue(this::getTickTime, this::setTickTime).addInventory().create();
.outputSlot(4, 120, 35).syncEnergyValue().syncIntegerValue(this::getTickTime, this::setTickTime).addInventory().create(this);
}
}

View file

@ -150,7 +150,7 @@ public class TileVacuumFreezer extends TilePowerAcceptor
public BuiltContainer createContainer(final EntityPlayer player) {
return new ContainerBuilder("vacuumfreezer").player(player.inventory).inventory().hotbar().addInventory()
.tile(this).slot(0, 55, 45).outputSlot(1, 101, 45).syncEnergyValue().syncCrafterValue().addInventory()
.create();
.create(this);
}
}

View file

@ -48,6 +48,6 @@ public class TileHighVoltageSU extends TileEnergyStorage implements IContainerPr
public BuiltContainer createContainer(final EntityPlayer player) {
return new ContainerBuilder("mfsu").player(player.inventory).inventory().hotbar().armor()
.complete(8, 18).addArmor().addInventory().tile(this).energySlot(0, 62, 45).energySlot(1, 98, 45)
.syncEnergyValue().addInventory().create();
.syncEnergyValue().addInventory().create(this);
}
}

View file

@ -43,6 +43,6 @@ public class TileLowVoltageSU extends TileEnergyStorage implements IContainerPro
@Override
public BuiltContainer createContainer(final EntityPlayer player) {
return new ContainerBuilder("batbox").player(player.inventory).inventory().hotbar().addInventory()
.tile(this).energySlot(0, 62, 45).energySlot(1, 98, 45).syncEnergyValue().addInventory().create();
.tile(this).energySlot(0, 62, 45).energySlot(1, 98, 45).syncEnergyValue().addInventory().create(this);
}
}

View file

@ -48,7 +48,7 @@ public class TileMediumVoltageSU extends TileEnergyStorage implements IContainer
public BuiltContainer createContainer(final EntityPlayer player) {
return new ContainerBuilder("mfe").player(player.inventory).inventory().hotbar().armor()
.complete(8, 18).addArmor().addInventory().tile(this).energySlot(0, 62, 45).energySlot(1, 98, 45)
.syncEnergyValue().addInventory().create();
.syncEnergyValue().addInventory().create(this);
}
}

View file

@ -187,6 +187,6 @@ public class TileAlloySmelter extends TilePowerAcceptor
&& ItemUtils.isInputEqual(recipe.getInputs().get(1), stack, true, true, true)))
.outputSlot(2, 116, 35).energySlot(3, 56, 53).upgradeSlot(4, 152, 8).upgradeSlot(5, 152, 26)
.upgradeSlot(6, 152, 44).upgradeSlot(7, 152, 62).syncEnergyValue().syncCrafterValue().addInventory()
.create();
.create(this);
}
}

View file

@ -139,6 +139,6 @@ public class TileCompressor extends TilePowerAcceptor implements IToolDrop, IInv
public BuiltContainer createContainer(final EntityPlayer player) {
return new ContainerBuilder("compressor").player(player.inventory).inventory().hotbar().addInventory()
.tile(this).slot(0, 55, 45).outputSlot(1, 101, 45).syncEnergyValue().syncCrafterValue().addInventory()
.create();
.create(this);
}
}

View file

@ -222,7 +222,7 @@ public class TileElectricFurnace extends TilePowerAcceptor
public BuiltContainer createContainer(final EntityPlayer player) {
return new ContainerBuilder("electricfurnace").player(player.inventory).inventory().hotbar().addInventory()
.tile(this).slot(0, 55, 45).outputSlot(1, 101, 45).syncEnergyValue()
.syncIntegerValue(this::getBurnTime, this::setBurnTime).addInventory().create();
.syncIntegerValue(this::getBurnTime, this::setBurnTime).addInventory().create(this);
}
@Override

View file

@ -154,7 +154,7 @@ public class TileExtractor extends TilePowerAcceptor
public BuiltContainer createContainer(final EntityPlayer player) {
return new ContainerBuilder("extractor").player(player.inventory).inventory().hotbar().addInventory()
.tile(this).slot(0, 55, 45).outputSlot(1, 101, 45).syncEnergyValue().syncCrafterValue().addInventory()
.create();
.create(this);
}
}

View file

@ -155,7 +155,7 @@ public class TileGrinder extends TilePowerAcceptor
public BuiltContainer createContainer(final EntityPlayer player) {
return new ContainerBuilder("grinder").player(player.inventory).inventory().hotbar().addInventory()
.tile(this).slot(0, 55, 45).outputSlot(1, 101, 45).syncEnergyValue().syncCrafterValue().addInventory()
.create();
.create(this);
}
@Override

View file

@ -200,7 +200,7 @@ public class TileRecycler extends TilePowerAcceptor implements IToolDrop, IInven
public BuiltContainer createContainer(final EntityPlayer player) {
return new ContainerBuilder("recycler").player(player.inventory).inventory().hotbar().addInventory()
.tile(this).slot(0, 55, 45).outputSlot(1, 101, 45).syncEnergyValue()
.syncIntegerValue(this::getProgress, this::setProgress).addInventory().create();
.syncIntegerValue(this::getProgress, this::setProgress).addInventory().create(this);
}
//TODO make this so