Convert IronFurnace

This commit is contained in:
Ourten 2017-01-07 21:56:23 +01:00
parent 0325383d21
commit af524f169f
4 changed files with 110 additions and 135 deletions

View file

@ -152,7 +152,14 @@ public class GuiHandler implements IGuiHandler {
return new ContainerElectricFurnace((TileElectricFurnace) world.getTileEntity(new BlockPos(x, y, z)), return new ContainerElectricFurnace((TileElectricFurnace) world.getTileEntity(new BlockPos(x, y, z)),
player); player);
} else if (ID == GuiHandler.ironFurnace) { } else if (ID == GuiHandler.ironFurnace) {
return new ContainerIronFurnace((TileIronFurnace) 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))).slot(0, 56, 17)
.outputSlot(1, 116, 34).fuelSlot(2, 56, 53)
.syncIntegerValue(((TileIronFurnace) world.getTileEntity(new BlockPos(x, y, z)))::getBurnTime,
((TileIronFurnace) world.getTileEntity(new BlockPos(x, y, z)))::setBurnTime)
.syncIntegerValue(((TileIronFurnace) world.getTileEntity(new BlockPos(x, y, z)))::getTotalBurnTime,
((TileIronFurnace) world.getTileEntity(new BlockPos(x, y, z)))::setTotalBurnTime)
.addInventory().create();
} else if (ID == GuiHandler.recyclerID) { } else if (ID == GuiHandler.recyclerID) {
return new ContainerRecycler((TileRecycler) world.getTileEntity(new BlockPos(x, y, z)), player); return new ContainerRecycler((TileRecycler) world.getTileEntity(new BlockPos(x, y, z)), player);
} else if (ID == GuiHandler.scrapboxinatorID) { } else if (ID == GuiHandler.scrapboxinatorID) {

View file

@ -1,54 +0,0 @@
package techreborn.client.container;
import net.minecraft.entity.player.EntityPlayer;
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.SlotOutput;
import reborncore.common.container.RebornContainer;
import techreborn.tiles.TileIronFurnace;
public class ContainerIronFurnace extends RebornContainer {
public int connectionStatus;
EntityPlayer player;
TileIronFurnace tile;
public ContainerIronFurnace(TileIronFurnace tileGrinder, EntityPlayer player) {
super();
tile = tileGrinder;
this.player = player;
// input
this.addSlotToContainer(new BaseSlot(tileGrinder.inventory, 0, 56, 17));
this.addSlotToContainer(new SlotOutput(tileGrinder.inventory, 1, 116, 34));
// Fuel
this.addSlotToContainer(new SlotFurnaceFuel(tileGrinder.inventory, 2, 56, 53));
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;
}
@SideOnly(Side.CLIENT)
@Override
public void updateProgressBar(int id, int value) {
if (id == 10) {
this.connectionStatus = value;
}
}
}

View file

@ -5,52 +5,56 @@ import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.util.ResourceLocation; import net.minecraft.util.ResourceLocation;
import net.minecraft.util.text.translation.I18n; import net.minecraft.util.text.translation.I18n;
import techreborn.client.container.ContainerIronFurnace;
import techreborn.client.container.builder.ContainerBuilder;
import techreborn.tiles.TileIronFurnace; import techreborn.tiles.TileIronFurnace;
public class GuiIronFurnace extends GuiContainer { public class GuiIronFurnace extends GuiContainer {
public static final ResourceLocation texture = new ResourceLocation("minecraft", public static final ResourceLocation texture = new ResourceLocation("minecraft",
"textures/gui/container/furnace.png"); "textures/gui/container/furnace.png");
TileIronFurnace furnace; TileIronFurnace furnace;
ContainerIronFurnace containerGrinder;
public GuiIronFurnace(EntityPlayer player, TileIronFurnace tilegrinder) { public GuiIronFurnace(final EntityPlayer player, final TileIronFurnace furnace) {
super(new ContainerIronFurnace(tilegrinder, player)); super(new ContainerBuilder().player(player.inventory).inventory(8, 84).hotbar(8, 142).addInventory()
.tile(furnace).slot(0, 56, 17).outputSlot(1, 116, 34).fuelSlot(2, 56, 53)
.syncIntegerValue(furnace::getBurnTime, furnace::setBurnTime)
.syncIntegerValue(furnace::getTotalBurnTime, furnace::setTotalBurnTime).addInventory()
.create());
this.xSize = 176; this.xSize = 176;
this.ySize = 167; this.ySize = 167;
furnace = tilegrinder; this.furnace = furnace;
containerGrinder = (ContainerIronFurnace) this.inventorySlots;
} }
@Override @Override
protected void drawGuiContainerBackgroundLayer(float p_146976_1_, int p_146976_2_, int p_146976_3_) { protected void drawGuiContainerBackgroundLayer(final float p_146976_1_, final int p_146976_2_, final int p_146976_3_) {
GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
this.mc.getTextureManager().bindTexture(texture); this.mc.getTextureManager().bindTexture(GuiIronFurnace.texture);
int k = (this.width - this.xSize) / 2; final int k = (this.width - this.xSize) / 2;
int l = (this.height - this.ySize) / 2; final int l = (this.height - this.ySize) / 2;
this.drawTexturedModalRect(k, l, 0, 0, this.xSize, this.ySize); this.drawTexturedModalRect(k, l, 0, 0, this.xSize, this.ySize);
int j = 0; int j = 0;
j = furnace.gaugeProgressScaled(24); j = this.furnace.gaugeProgressScaled(24);
if (j > 0) { if (j > 0) {
this.drawTexturedModalRect(k + 78, l + 35, 176, 14, j + 1, 16); this.drawTexturedModalRect(k + 78, l + 35, 176, 14, j + 1, 16);
} }
j = furnace.gaugeFuelScaled(12); j = this.furnace.gaugeFuelScaled(12);
if (j > 0) { if (j > 0) {
this.drawTexturedModalRect(k + 57, l + 36 + 12 - j, 176, 12 - j, 14, j + 2); this.drawTexturedModalRect(k + 57, l + 36 + 12 - j, 176, 12 - j, 14, j + 2);
} }
} }
protected void drawGuiContainerForegroundLayer(int p_146979_1_, int p_146979_2_) { @Override
String name = I18n.translateToLocal("tile.techreborn.ironfurnace.name"); protected void drawGuiContainerForegroundLayer(final int p_146979_1_, final int p_146979_2_) {
final String name = I18n.translateToLocal("tile.techreborn.ironfurnace.name");
this.fontRendererObj.drawString(name, this.xSize / 2 - this.fontRendererObj.getStringWidth(name) / 2, 6, 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.fontRendererObj.drawString(I18n.translateToLocalFormatted("container.inventory", new Object[0]), 8,
this.ySize - 96 + 2, 4210752); this.ySize - 96 + 2, 4210752);
} }
} }

View file

@ -8,6 +8,7 @@ import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.FurnaceRecipes; import net.minecraft.item.crafting.FurnaceRecipes;
import net.minecraft.tileentity.TileEntityFurnace; import net.minecraft.tileentity.TileEntityFurnace;
import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumFacing;
import reborncore.api.tile.IInventoryProvider; import reborncore.api.tile.IInventoryProvider;
import reborncore.common.blocks.BlockMachineBase; import reborncore.common.blocks.BlockMachineBase;
import reborncore.common.tile.TileLegacyMachineBase; import reborncore.common.tile.TileLegacyMachineBase;
@ -30,100 +31,98 @@ public class TileIronFurnace extends TileLegacyMachineBase implements IInventory
int fuelslot = 2; int fuelslot = 2;
boolean active = false; boolean active = false;
public int gaugeProgressScaled(int scale) { public int gaugeProgressScaled(final int scale) {
return (progress * scale) / fuelScale; return this.progress * scale / this.fuelScale;
} }
public int gaugeFuelScaled(int scale) { public int gaugeFuelScaled(final int scale) {
if (fuelGague == 0) { if (this.fuelGague == 0) {
fuelGague = fuel; this.fuelGague = this.fuel;
if (fuelGague == 0) { if (this.fuelGague == 0) {
fuelGague = fuelScale; this.fuelGague = this.fuelScale;
} }
} }
return (fuel * scale) / fuelGague; return this.fuel * scale / this.fuelGague;
} }
@Override @Override
public void updateEntity() { public void updateEntity() {
boolean burning = isBurning(); final boolean burning = this.isBurning();
boolean updateInventory = false; boolean updateInventory = false;
if (fuel > 0) { if (this.fuel > 0) {
fuel--; this.fuel--;
updateState(); this.updateState();
} }
if (fuel <= 0 && canSmelt()) { if (this.fuel <= 0 && this.canSmelt()) {
fuel = fuelGague = (int) (TileEntityFurnace.getItemBurnTime(getStackInSlot(fuelslot)) * 1.25); this.fuel = this.fuelGague = (int) (TileEntityFurnace.getItemBurnTime(this.getStackInSlot(this.fuelslot)) * 1.25);
if (fuel > 0) { if (this.fuel > 0) {
if (getStackInSlot(fuelslot).getItem().hasContainerItem()) // Fuel if (this.getStackInSlot(this.fuelslot).getItem().hasContainerItem()) // Fuel
// slot // slot
{ {
setInventorySlotContents(fuelslot, new ItemStack(getStackInSlot(fuelslot).getItem().getContainerItem())); this.setInventorySlotContents(this.fuelslot, new ItemStack(this.getStackInSlot(this.fuelslot).getItem().getContainerItem()));
} else if (getStackInSlot(fuelslot).getCount() > 1) { } else if (this.getStackInSlot(this.fuelslot).getCount() > 1) {
decrStackSize(fuelslot, 1); this.decrStackSize(this.fuelslot, 1);
} else if (getStackInSlot(fuelslot).getCount() == 1) { } else if (this.getStackInSlot(this.fuelslot).getCount() == 1) {
setInventorySlotContents(fuelslot, ItemStack.EMPTY); this.setInventorySlotContents(this.fuelslot, ItemStack.EMPTY);
} }
updateInventory = true; updateInventory = true;
} }
} }
if (isBurning() && canSmelt()) { if (this.isBurning() && this.canSmelt()) {
progress++; this.progress++;
if (progress >= fuelScale) { if (this.progress >= this.fuelScale) {
progress = 0; this.progress = 0;
cookItems(); this.cookItems();
updateInventory = true; updateInventory = true;
} }
} else { } else {
progress = 0; this.progress = 0;
} }
if (burning != isBurning()) { if (burning != this.isBurning()) {
updateInventory = true; updateInventory = true;
} }
if (updateInventory) { if (updateInventory) {
markDirty(); this.markDirty();
} }
} }
public void cookItems() { public void cookItems() {
if (this.canSmelt()) { if (this.canSmelt()) {
ItemStack itemstack = FurnaceRecipes.instance().getSmeltingResult(getStackInSlot(input1)); final ItemStack itemstack = FurnaceRecipes.instance().getSmeltingResult(this.getStackInSlot(this.input1));
if (getStackInSlot(output) == ItemStack.EMPTY) { if (this.getStackInSlot(this.output) == ItemStack.EMPTY) {
setInventorySlotContents(output, itemstack.copy()); this.setInventorySlotContents(this.output, itemstack.copy());
} else if (getStackInSlot(output).isItemEqual(itemstack)) { } else if (this.getStackInSlot(this.output).isItemEqual(itemstack)) {
getStackInSlot(output).grow(itemstack.getCount()); this.getStackInSlot(this.output).grow(itemstack.getCount());
} }
if (getStackInSlot(input1).getCount() > 1) { if (this.getStackInSlot(this.input1).getCount() > 1) {
this.decrStackSize(input1, 1); this.decrStackSize(this.input1, 1);
} else { } else {
setInventorySlotContents(input1, ItemStack.EMPTY); this.setInventorySlotContents(this.input1, ItemStack.EMPTY);
} }
} }
} }
public boolean canSmelt() { public boolean canSmelt() {
if (getStackInSlot(input1) == ItemStack.EMPTY) { if (this.getStackInSlot(this.input1) == ItemStack.EMPTY)
return false; return false;
} else { final ItemStack itemstack = FurnaceRecipes.instance().getSmeltingResult(this.getStackInSlot(this.input1));
ItemStack itemstack = FurnaceRecipes.instance().getSmeltingResult(getStackInSlot(input1)); if (itemstack == ItemStack.EMPTY)
if (itemstack == ItemStack.EMPTY) return false;
return false; if (this.getStackInSlot(this.output) == ItemStack.EMPTY)
if (getStackInSlot(output) == ItemStack.EMPTY) return true;
return true; if (!this.getStackInSlot(this.output).isItemEqual(itemstack))
if (!getStackInSlot(output).isItemEqual(itemstack)) return false;
return false; final int result = this.getStackInSlot(this.output).getCount() + itemstack.getCount();
int result = getStackInSlot(output).getCount() + itemstack.getCount(); return result <= this.getInventoryStackLimit() && result <= itemstack.getMaxStackSize();
return (result <= getInventoryStackLimit() && result <= itemstack.getMaxStackSize());
}
} }
public boolean isBurning() { public boolean isBurning() {
return fuel > 0; return this.fuel > 0;
} }
public ItemStack getResultFor(ItemStack stack) { public ItemStack getResultFor(final ItemStack stack) {
ItemStack result = FurnaceRecipes.instance().getSmeltingResult(stack); final ItemStack result = FurnaceRecipes.instance().getSmeltingResult(stack);
if (result != ItemStack.EMPTY) { if (result != ItemStack.EMPTY) {
return result.copy(); return result.copy();
} }
@ -131,30 +130,33 @@ public class TileIronFurnace extends TileLegacyMachineBase implements IInventory
} }
public void updateState() { public void updateState() {
IBlockState BlockStateContainer = world.getBlockState(pos); final IBlockState BlockStateContainer = this.world.getBlockState(this.pos);
if (BlockStateContainer.getBlock() instanceof BlockMachineBase) { if (BlockStateContainer.getBlock() instanceof BlockMachineBase) {
BlockMachineBase blockMachineBase = (BlockMachineBase) BlockStateContainer.getBlock(); final BlockMachineBase blockMachineBase = (BlockMachineBase) BlockStateContainer.getBlock();
if (BlockStateContainer.getValue(BlockMachineBase.ACTIVE) != fuel > 0) if (BlockStateContainer.getValue(BlockMachineBase.ACTIVE) != this.fuel > 0)
blockMachineBase.setActive(fuel > 0, world, pos); blockMachineBase.setActive(this.fuel > 0, this.world, this.pos);
} }
} }
@Override @Override
public Inventory getInventory() { public Inventory getInventory() {
return inventory; return this.inventory;
} }
public int[] getSlotsForFace(EnumFacing side) { @Override
return side == EnumFacing.DOWN ? SLOTS_BOTTOM : (side == EnumFacing.UP ? SLOTS_TOP : SLOTS_SIDES); public int[] getSlotsForFace(final EnumFacing side) {
return side == EnumFacing.DOWN ? TileIronFurnace.SLOTS_BOTTOM : side == EnumFacing.UP ? TileIronFurnace.SLOTS_TOP : TileIronFurnace.SLOTS_SIDES;
} }
public boolean canInsertItem(int index, ItemStack itemStackIn, EnumFacing direction) { @Override
public boolean canInsertItem(final int index, final ItemStack itemStackIn, final EnumFacing direction) {
return this.isItemValidForSlot(index, itemStackIn); return this.isItemValidForSlot(index, itemStackIn);
} }
public boolean canExtractItem(int index, ItemStack stack, EnumFacing direction) { @Override
public boolean canExtractItem(final int index, final ItemStack stack, final EnumFacing direction) {
if (direction == EnumFacing.DOWN && index == 1) { if (direction == EnumFacing.DOWN && index == 1) {
Item item = stack.getItem(); final Item item = stack.getItem();
if (item != Items.WATER_BUCKET && item != Items.BUCKET) { if (item != Items.WATER_BUCKET && item != Items.BUCKET) {
return false; return false;
@ -163,4 +165,20 @@ public class TileIronFurnace extends TileLegacyMachineBase implements IInventory
return true; return true;
} }
public int getBurnTime() {
return this.fuel;
}
public void setBurnTime(final int burnTime) {
this.fuel = burnTime;
}
public int getTotalBurnTime() {
return this.fuelGague;
}
public void setTotalBurnTime(final int totalBurnTime) {
this.fuelGague = totalBurnTime;
}
} }