diff --git a/src/main/java/techreborn/client/GuiHandler.java b/src/main/java/techreborn/client/GuiHandler.java index cec483aa5..604956d58 100644 --- a/src/main/java/techreborn/client/GuiHandler.java +++ b/src/main/java/techreborn/client/GuiHandler.java @@ -142,7 +142,15 @@ public class GuiHandler implements IGuiHandler { } else if (ID == GuiHandler.grinderID) { container = new ContainerGrinder(player, (TileGrinder) world.getTileEntity(new BlockPos(x, y, z))); } else if (ID == GuiHandler.generatorID) { - return new ContainerGenerator((TileGenerator) world.getTileEntity(new BlockPos(x, y, z)), player); + + return new ContainerBuilder().player(player.inventory).inventory(8, 84).hotbar(8, 142).addInventory() + .tile((IInventory) world.getTileEntity(new BlockPos(x, y, z))).fuelSlot(0, 80, 53) + .energySlot(1, 80, 17).syncEnergyValue() + .syncIntegerValue(((TileGenerator) world.getTileEntity(new BlockPos(x, y, z)))::getBurnTime, + ((TileGenerator) world.getTileEntity(new BlockPos(x, y, z)))::setBurnTime) + .syncIntegerValue(((TileGenerator) world.getTileEntity(new BlockPos(x, y, z)))::getTotalBurnTime, + ((TileGenerator) world.getTileEntity(new BlockPos(x, y, z)))::setTotalBurnTime) + .addInventory().create(); } else if (ID == GuiHandler.extractorID) { container = new ContainerExtractor(player, (TileExtractor) world.getTileEntity(new BlockPos(x, y, z))); } else if (ID == GuiHandler.compressorID) { diff --git a/src/main/java/techreborn/client/container/ContainerGenerator.java b/src/main/java/techreborn/client/container/ContainerGenerator.java deleted file mode 100644 index cc1dcca14..000000000 --- a/src/main/java/techreborn/client/container/ContainerGenerator.java +++ /dev/null @@ -1,92 +0,0 @@ -package techreborn.client.container; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IContainerListener; -import net.minecraft.inventory.SlotFurnaceFuel; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; -import reborncore.client.gui.slots.BaseSlot; -import reborncore.client.gui.slots.SlotCharge; -import reborncore.common.container.RebornContainer; -import techreborn.tiles.generator.TileGenerator; - -public class ContainerGenerator extends RebornContainer { - - public int burnTime = 0; - public int totalBurnTime = 0; - public int energy; - public int tickTime; - EntityPlayer player; - TileGenerator tile; - - public ContainerGenerator(TileGenerator tile, EntityPlayer player) { - super(); - this.tile = tile; - this.player = player; - - // fuel - this.addSlotToContainer(new SlotFurnaceFuel(tile.inventory, 0, 80, 53)); - // charge - this.addSlotToContainer(new SlotCharge(tile.inventory, 1, 80, 17)); - - int i; - - for (i = 0; i < 3; ++i) { - for (int j = 0; j < 9; ++j) { - this.addSlotToContainer(new BaseSlot(player.inventory, j + i * 9 + 9, 8 + j * 18, 84 + i * 18)); - } - } - - for (i = 0; i < 9; ++i) { - this.addSlotToContainer(new BaseSlot(player.inventory, i, 8 + i * 18, 142)); - } - } - - @Override - public boolean canInteractWith(EntityPlayer player) { - return true; - } - - @Override - public void detectAndSendChanges() { - super.detectAndSendChanges(); - for (int i = 0; i < this.listeners.size(); i++) { - IContainerListener IContainerListener = this.listeners.get(i); - if (this.burnTime != tile.burnTime) { - IContainerListener.sendProgressBarUpdate(this, 0, tile.burnTime); - } - if (this.totalBurnTime != tile.totalBurnTime) { - IContainerListener.sendProgressBarUpdate(this, 1, tile.totalBurnTime); - } - if (this.energy != (int) tile.getEnergy()) { - IContainerListener.sendProgressBarUpdate(this, 2, (int) tile.getEnergy()); - } - } - } - - @Override - public void addListener(IContainerListener crafting) { - super.addListener(crafting); - crafting.sendProgressBarUpdate(this, 0, tile.burnTime); - crafting.sendProgressBarUpdate(this, 1, tile.totalBurnTime); - crafting.sendProgressBarUpdate(this, 2, (int) tile.getEnergy()); - } - - @SideOnly(Side.CLIENT) - @Override - public void updateProgressBar(int id, int value) { - if (id == 0) { - this.burnTime = value; - } else if (id == 1) { - this.totalBurnTime = value; - } else if (id == 2) { - this.energy = value; - } - this.tile.setEnergy(energy); - } - - public int getScaledBurnTime(int i) { - return (int) (((float) burnTime / (float) totalBurnTime) * i); - } - -} diff --git a/src/main/java/techreborn/client/container/builder/ContainerTileInventoryBuilder.java b/src/main/java/techreborn/client/container/builder/ContainerTileInventoryBuilder.java index 0988cafd7..e6f6ca0e9 100644 --- a/src/main/java/techreborn/client/container/builder/ContainerTileInventoryBuilder.java +++ b/src/main/java/techreborn/client/container/builder/ContainerTileInventoryBuilder.java @@ -4,8 +4,10 @@ import org.apache.commons.lang3.Range; import org.apache.commons.lang3.tuple.Pair; import net.minecraft.inventory.IInventory; +import net.minecraft.inventory.SlotFurnaceFuel; import net.minecraft.util.EnumFacing; import net.minecraftforge.energy.CapabilityEnergy; +import net.minecraftforge.fluids.capability.CapabilityFluidHandler; import reborncore.api.power.IEnergyInterfaceItem; import reborncore.client.gui.slots.BaseSlot; @@ -54,6 +56,19 @@ public class ContainerTileInventoryBuilder { return this; } + @SuppressWarnings("null") + public ContainerTileInventoryBuilder fluidSlot(final int index, final int x, final int y) { + this.parent.slots.add(new FilteredSlot(this.tile, index, x, y).setFilter( + stack -> stack.hasCapability(CapabilityFluidHandler.FLUID_HANDLER_ITEM_CAPABILITY, EnumFacing.UP))); + return this; + } + + public ContainerTileInventoryBuilder fuelSlot(final int index, final int x, final int y) + { + this.parent.slots.add(new SlotFurnaceFuel(this.tile, index, x, y)); + return this; + } + /** * * @param supplier diff --git a/src/main/java/techreborn/client/gui/GuiGenerator.java b/src/main/java/techreborn/client/gui/GuiGenerator.java index d678bc235..048653b9a 100644 --- a/src/main/java/techreborn/client/gui/GuiGenerator.java +++ b/src/main/java/techreborn/client/gui/GuiGenerator.java @@ -4,8 +4,10 @@ import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.ResourceLocation; import net.minecraft.util.text.translation.I18n; + import reborncore.common.powerSystem.PowerSystem; -import techreborn.client.container.ContainerGenerator; + +import techreborn.client.container.builder.ContainerBuilder; import techreborn.tiles.generator.TileGenerator; public class GuiGenerator extends GuiContainer { @@ -14,51 +16,52 @@ public class GuiGenerator extends GuiContainer { TileGenerator generator; - ContainerGenerator containerGenerator; - - public GuiGenerator(EntityPlayer player, TileGenerator generator) { - super(new ContainerGenerator(generator, player)); + public GuiGenerator(final EntityPlayer player, final TileGenerator generator) { + super(new ContainerBuilder().player(player.inventory).inventory(8, 84).hotbar(8, 142).addInventory() + .tile(generator).fuelSlot(0, 80, 53).energySlot(1, 80, 17).syncEnergyValue() + .syncIntegerValue(generator::getBurnTime, generator::setBurnTime) + .syncIntegerValue(generator::getTotalBurnTime, generator::setTotalBurnTime).addInventory().create()); this.xSize = 176; this.ySize = 167; this.generator = generator; - this.containerGenerator = (ContainerGenerator) this.inventorySlots; } @Override public void initGui() { - int k = (this.width - this.xSize) / 2; - int l = (this.height - this.ySize) / 2; + final int k = (this.width - this.xSize) / 2; + final int l = (this.height - this.ySize) / 2; super.initGui(); } @Override - protected void drawGuiContainerBackgroundLayer(float p_146976_1_, int p_146976_2_, int p_146976_3_) { - this.mc.getTextureManager().bindTexture(texture); - int k = (this.width - this.xSize) / 2; - int l = (this.height - this.ySize) / 2; + protected void drawGuiContainerBackgroundLayer(final float p_146976_1_, final int p_146976_2_, final int p_146976_3_) { + this.mc.getTextureManager().bindTexture(GuiGenerator.texture); + final int k = (this.width - this.xSize) / 2; + final int l = (this.height - this.ySize) / 2; this.drawTexturedModalRect(k, l, 0, 0, this.xSize, this.ySize); int j = 0; - j = generator.getEnergyScaled(24); + j = this.generator.getEnergyScaled(24); if (j > 0) { this.drawTexturedModalRect(k + 109, l + 21 + 12, 176, 0, j + 1, 16); } - if (containerGenerator.burnTime != 0) { - j = containerGenerator.getScaledBurnTime(13); + if (this.generator.burnTime != 0) { + j = this.generator.getScaledBurnTime(13); this.drawTexturedModalRect(k + 80, l + 38 + 12 - j, 176, 30 - j, 14, j + 1); } } - protected void drawGuiContainerForegroundLayer(int p_146979_1_, int p_146979_2_) { - String name = I18n.translateToLocal("tile.techreborn.generator.name"); + @Override + protected void drawGuiContainerForegroundLayer(final int p_146979_1_, final int p_146979_2_) { + final String name = I18n.translateToLocal("tile.techreborn.generator.name"); this.fontRendererObj.drawString(name, this.xSize / 2 - this.fontRendererObj.getStringWidth(name) / 2, 6, - 4210752); + 4210752); this.fontRendererObj.drawString(I18n.translateToLocalFormatted("container.inventory", new Object[0]), 8, - this.ySize - 96 + 2, 4210752); + this.ySize - 96 + 2, 4210752); - this.fontRendererObj.drawString(PowerSystem.getLocaliszedPower(containerGenerator.energy), 25, this.ySize - 150, - 4210752); + this.fontRendererObj.drawString(PowerSystem.getLocaliszedPower(this.generator.getEnergy()), 25, + this.ySize - 150, 4210752); } } diff --git a/src/main/java/techreborn/tiles/generator/TileGenerator.java b/src/main/java/techreborn/tiles/generator/TileGenerator.java index 6b3e5a192..fcfd3a3b5 100644 --- a/src/main/java/techreborn/tiles/generator/TileGenerator.java +++ b/src/main/java/techreborn/tiles/generator/TileGenerator.java @@ -7,12 +7,14 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntityFurnace; import net.minecraft.util.EnumFacing; import net.minecraftforge.common.ForgeModContainer; + import reborncore.api.power.EnumPowerTier; import reborncore.api.tile.IInventoryProvider; import reborncore.common.IWrenchable; import reborncore.common.blocks.BlockMachineBase; import reborncore.common.powerSystem.TilePowerAcceptor; import reborncore.common.util.Inventory; + import techreborn.init.ModBlocks; public class TileGenerator extends TilePowerAcceptor implements IWrenchable, IInventoryProvider { @@ -31,69 +33,69 @@ public class TileGenerator extends TilePowerAcceptor implements IWrenchable, IIn super(1); } - public static int getItemBurnTime(ItemStack stack) { + public static int getItemBurnTime(final ItemStack stack) { return TileEntityFurnace.getItemBurnTime(stack) / 4; } @Override public void updateEntity() { super.updateEntity(); - if (world.isRemote) { + if (this.world.isRemote) { return; } - if (getEnergy() < getMaxPower()) { - if (burnTime > 0) { - burnTime--; - addEnergy(outputAmount); - isBurning = true; + if (this.getEnergy() < this.getMaxPower()) { + if (this.burnTime > 0) { + this.burnTime--; + this.addEnergy(TileGenerator.outputAmount); + this.isBurning = true; } } else { - isBurning = false; + this.isBurning = false; } - if (burnTime == 0) { - updateState(); - burnTime = totalBurnTime = getItemBurnTime(getStackInSlot(fuelSlot)); - if (burnTime > 0) { - updateState(); - burnItem = getStackInSlot(fuelSlot); - if (getStackInSlot(fuelSlot).getCount() == 1) { - if (getStackInSlot(fuelSlot).getItem() == Items.LAVA_BUCKET || getStackInSlot(fuelSlot).getItem() == ForgeModContainer.getInstance().universalBucket) { - setInventorySlotContents(fuelSlot, new ItemStack(Items.BUCKET)); + if (this.burnTime == 0) { + this.updateState(); + this.burnTime = this.totalBurnTime = TileGenerator.getItemBurnTime(this.getStackInSlot(this.fuelSlot)); + if (this.burnTime > 0) { + this.updateState(); + this.burnItem = this.getStackInSlot(this.fuelSlot); + if (this.getStackInSlot(this.fuelSlot).getCount() == 1) { + if (this.getStackInSlot(this.fuelSlot).getItem() == Items.LAVA_BUCKET || this.getStackInSlot(this.fuelSlot).getItem() == ForgeModContainer.getInstance().universalBucket) { + this.setInventorySlotContents(this.fuelSlot, new ItemStack(Items.BUCKET)); } else { - setInventorySlotContents(fuelSlot, ItemStack.EMPTY); + this.setInventorySlotContents(this.fuelSlot, ItemStack.EMPTY); } } else { - decrStackSize(fuelSlot, 1); + this.decrStackSize(this.fuelSlot, 1); } } } - lastTickBurning = isBurning; + this.lastTickBurning = this.isBurning; } public void updateState() { - IBlockState BlockStateContainer = world.getBlockState(pos); + final IBlockState BlockStateContainer = this.world.getBlockState(this.pos); if (BlockStateContainer.getBlock() instanceof BlockMachineBase) { - BlockMachineBase blockMachineBase = (BlockMachineBase) BlockStateContainer.getBlock(); - if (BlockStateContainer.getValue(BlockMachineBase.ACTIVE) != burnTime > 0) - blockMachineBase.setActive(burnTime > 0, world, pos); + final BlockMachineBase blockMachineBase = (BlockMachineBase) BlockStateContainer.getBlock(); + if (BlockStateContainer.getValue(BlockMachineBase.ACTIVE) != this.burnTime > 0) + blockMachineBase.setActive(this.burnTime > 0, this.world, this.pos); } } @Override - public boolean wrenchCanSetFacing(EntityPlayer entityPlayer, EnumFacing side) { + public boolean wrenchCanSetFacing(final EntityPlayer entityPlayer, final EnumFacing side) { return false; } @Override public EnumFacing getFacing() { - return getFacingEnum(); + return this.getFacingEnum(); } @Override - public boolean wrenchCanRemove(EntityPlayer entityPlayer) { + public boolean wrenchCanRemove(final EntityPlayer entityPlayer) { return entityPlayer.isSneaking(); } @@ -108,12 +110,12 @@ public class TileGenerator extends TilePowerAcceptor implements IWrenchable, IIn } @Override - public boolean canAcceptEnergy(EnumFacing direction) { + public boolean canAcceptEnergy(final EnumFacing direction) { return false; } @Override - public boolean canProvideEnergy(EnumFacing direction) { + public boolean canProvideEnergy(final EnumFacing direction) { return true; } @@ -133,12 +135,32 @@ public class TileGenerator extends TilePowerAcceptor implements IWrenchable, IIn } @Override - public ItemStack getWrenchDrop(EntityPlayer p0) { + public ItemStack getWrenchDrop(final EntityPlayer p0) { return new ItemStack(ModBlocks.SOLID_FUEL_GENEREATOR); } @Override public Inventory getInventory() { - return inventory; + return this.inventory; + } + + public int getBurnTime() { + return this.burnTime; + } + + public void setBurnTime(final int burnTime) { + this.burnTime = burnTime; + } + + public int getTotalBurnTime() { + return this.totalBurnTime; + } + + public void setTotalBurnTime(final int totalBurnTime) { + this.totalBurnTime = totalBurnTime; + } + + public int getScaledBurnTime(final int i) { + return (int) ((float) this.burnTime / (float) this.totalBurnTime * i); } }