Convert MFSU and BatBox
This commit is contained in:
parent
e7eaa40bde
commit
53a3869092
5 changed files with 49 additions and 220 deletions
|
@ -157,10 +157,10 @@ public class GuiHandler implements IGuiHandler {
|
||||||
} else if (ID == GuiHandler.scrapboxinatorID) {
|
} else if (ID == GuiHandler.scrapboxinatorID) {
|
||||||
return new ContainerScrapboxinator((TileScrapboxinator) world.getTileEntity(new BlockPos(x, y, z)), player);
|
return new ContainerScrapboxinator((TileScrapboxinator) world.getTileEntity(new BlockPos(x, y, z)), player);
|
||||||
} else if (ID == GuiHandler.batboxID) {
|
} else if (ID == GuiHandler.batboxID) {
|
||||||
return new ContainerBatbox((TileBatBox) world.getTileEntity(new BlockPos(x, y, z)), player);
|
return new ContainerBuilder().player(player.inventory).inventory(8, 84).hotbar(8, 142).addInventory()
|
||||||
} else if (ID == GuiHandler.mfsuID) {
|
.tile((IInventory) world.getTileEntity(new BlockPos(x, y, z))).energySlot(0, 80, 17)
|
||||||
return new ContainerMFSU((TileMFSU) world.getTileEntity(new BlockPos(x, y, z)), player);
|
.energySlot(1, 80, 53).syncEnergyValue().addInventory().create();
|
||||||
} else if (ID == GuiHandler.mfeID) {
|
} else if (ID == GuiHandler.mfeID || ID == GuiHandler.mfsuID) {
|
||||||
return new ContainerBuilder().player(player.inventory).inventory(8, 84).hotbar(8, 142).armor()
|
return new ContainerBuilder().player(player.inventory).inventory(8, 84).hotbar(8, 142).armor()
|
||||||
.complete(44, 6).addArmor().addInventory()
|
.complete(44, 6).addArmor().addInventory()
|
||||||
.tile((IInventory) world.getTileEntity(new BlockPos(x, y, z))).energySlot(0, 80, 17)
|
.tile((IInventory) world.getTileEntity(new BlockPos(x, y, z))).energySlot(0, 80, 17)
|
||||||
|
|
|
@ -1,80 +0,0 @@
|
||||||
package techreborn.client.container;
|
|
||||||
|
|
||||||
import net.minecraft.entity.player.EntityPlayer;
|
|
||||||
import net.minecraft.inventory.IContainerListener;
|
|
||||||
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.storage.TileBatBox;
|
|
||||||
|
|
||||||
public class ContainerBatbox extends RebornContainer {
|
|
||||||
|
|
||||||
public int burnTime = 0;
|
|
||||||
public int totalBurnTime = 0;
|
|
||||||
public int energy;
|
|
||||||
public int tickTime;
|
|
||||||
EntityPlayer player;
|
|
||||||
TileBatBox tile;
|
|
||||||
|
|
||||||
public ContainerBatbox(TileBatBox tile, EntityPlayer player) {
|
|
||||||
super();
|
|
||||||
this.tile = tile;
|
|
||||||
this.player = player;
|
|
||||||
|
|
||||||
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));
|
|
||||||
}
|
|
||||||
|
|
||||||
this.addSlotToContainer(new SlotCharge(tile.inventory, 0, 80, 17));
|
|
||||||
this.addSlotToContainer(new SlotCharge(tile.inventory, 1, 80, 53));
|
|
||||||
}
|
|
||||||
|
|
||||||
@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.energy != (int) tile.getEnergy()) {
|
|
||||||
IContainerListener.sendProgressBarUpdate(this, 2, (int) tile.getEnergy());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void addListener(IContainerListener crafting) {
|
|
||||||
super.addListener(crafting);
|
|
||||||
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);
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,94 +0,0 @@
|
||||||
package techreborn.client.container;
|
|
||||||
|
|
||||||
import net.minecraft.entity.player.EntityPlayer;
|
|
||||||
import net.minecraft.inventory.EntityEquipmentSlot;
|
|
||||||
import net.minecraft.inventory.IContainerListener;
|
|
||||||
import net.minecraft.item.ItemStack;
|
|
||||||
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.storage.TileMFSU;
|
|
||||||
|
|
||||||
public class ContainerMFSU extends RebornContainer {
|
|
||||||
|
|
||||||
public int burnTime = 0;
|
|
||||||
public int totalBurnTime = 0;
|
|
||||||
public int energy;
|
|
||||||
public int tickTime;
|
|
||||||
EntityPlayer player;
|
|
||||||
TileMFSU tile;
|
|
||||||
private static final EntityEquipmentSlot[] equipmentSlots = new EntityEquipmentSlot[] { EntityEquipmentSlot.HEAD, EntityEquipmentSlot.CHEST, EntityEquipmentSlot.LEGS, EntityEquipmentSlot.FEET };
|
|
||||||
|
|
||||||
public ContainerMFSU(TileMFSU tile, EntityPlayer player) {
|
|
||||||
super();
|
|
||||||
this.tile = tile;
|
|
||||||
this.player = player;
|
|
||||||
|
|
||||||
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));
|
|
||||||
}
|
|
||||||
for (int k = 0; k < 4; k++) {
|
|
||||||
final EntityEquipmentSlot slot = equipmentSlots[k];
|
|
||||||
addSlotToContainer(new BaseSlot(player.inventory, player.inventory.getSizeInventory() - 2 - k, 44, 6 + k * 19) {
|
|
||||||
@Override
|
|
||||||
public int getSlotStackLimit() { return 1; }
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public boolean isItemValid(ItemStack stack) {
|
|
||||||
return stack != null && stack.getItem().isValidArmor(stack, slot, player);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
this.addSlotToContainer(new SlotCharge(tile.inventory, 0, 80, 17));
|
|
||||||
this.addSlotToContainer(new SlotCharge(tile.inventory, 1, 80, 53));
|
|
||||||
}
|
|
||||||
|
|
||||||
@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.energy != (int) tile.getEnergy()) {
|
|
||||||
IContainerListener.sendProgressBarUpdate(this, 2, (int) tile.getEnergy());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void addListener(IContainerListener crafting) {
|
|
||||||
super.addListener(crafting);
|
|
||||||
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);
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -4,8 +4,10 @@ import net.minecraft.client.gui.inventory.GuiContainer;
|
||||||
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 reborncore.common.powerSystem.PowerSystem;
|
import reborncore.common.powerSystem.PowerSystem;
|
||||||
import techreborn.client.container.ContainerBatbox;
|
|
||||||
|
import techreborn.client.container.builder.ContainerBuilder;
|
||||||
import techreborn.tiles.storage.TileBatBox;
|
import techreborn.tiles.storage.TileBatBox;
|
||||||
|
|
||||||
public class GuiBatbox extends GuiContainer {
|
public class GuiBatbox extends GuiContainer {
|
||||||
|
@ -14,33 +16,31 @@ public class GuiBatbox extends GuiContainer {
|
||||||
|
|
||||||
TileBatBox generator;
|
TileBatBox generator;
|
||||||
|
|
||||||
ContainerBatbox containerGenerator;
|
public GuiBatbox(final EntityPlayer player, final TileBatBox generator) {
|
||||||
|
super(new ContainerBuilder().player(player.inventory).inventory(8, 84).hotbar(8, 142).addInventory()
|
||||||
public GuiBatbox(EntityPlayer player, TileBatBox generator) {
|
.tile(generator).energySlot(0, 80, 17).energySlot(1, 80, 53).syncEnergyValue().addInventory().create());
|
||||||
super(new ContainerBatbox(generator, player));
|
|
||||||
this.xSize = 176;
|
this.xSize = 176;
|
||||||
this.ySize = 167;
|
this.ySize = 167;
|
||||||
this.generator = generator;
|
this.generator = generator;
|
||||||
this.containerGenerator = (ContainerBatbox) this.inventorySlots;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void initGui() {
|
public void initGui() {
|
||||||
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;
|
||||||
super.initGui();
|
super.initGui();
|
||||||
}
|
}
|
||||||
|
|
||||||
@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_) {
|
||||||
this.mc.getTextureManager().bindTexture(texture);
|
this.mc.getTextureManager().bindTexture(GuiBatbox.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 = generator.getEnergyScaled(24);
|
j = this.generator.getEnergyScaled(24);
|
||||||
if (j > 0) {
|
if (j > 0) {
|
||||||
this.drawTexturedModalRect(k + 109, l + 21 + 12, 176, 0, j + 1, 16);
|
this.drawTexturedModalRect(k + 109, l + 21 + 12, 176, 0, j + 1, 16);
|
||||||
}
|
}
|
||||||
|
@ -53,16 +53,17 @@ public class GuiBatbox extends GuiContainer {
|
||||||
// }
|
// }
|
||||||
}
|
}
|
||||||
|
|
||||||
protected void drawGuiContainerForegroundLayer(int p_146979_1_, int p_146979_2_) {
|
@Override
|
||||||
String name = I18n.translateToLocal("tile.techreborn.batbox.name");
|
protected void drawGuiContainerForegroundLayer(final int p_146979_1_, final int p_146979_2_) {
|
||||||
|
final String name = I18n.translateToLocal("tile.techreborn.batbox.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);
|
||||||
this.fontRendererObj.drawString(PowerSystem.getLocaliszedPower(generator.getMaxPower()), 25, this.ySize - 140,
|
this.fontRendererObj.drawString(PowerSystem.getLocaliszedPower(this.generator.getMaxPower()), 25, this.ySize - 140,
|
||||||
4210752);
|
4210752);
|
||||||
this.fontRendererObj.drawString(PowerSystem.getLocaliszedPower(containerGenerator.energy), 25, this.ySize - 150,
|
this.fontRendererObj.drawString(PowerSystem.getLocaliszedPower(this.generator.getEnergy()), 25,
|
||||||
4210752);
|
this.ySize - 150, 4210752);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -4,8 +4,10 @@ import net.minecraft.client.gui.inventory.GuiContainer;
|
||||||
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 reborncore.common.powerSystem.PowerSystem;
|
import reborncore.common.powerSystem.PowerSystem;
|
||||||
import techreborn.client.container.ContainerMFSU;
|
|
||||||
|
import techreborn.client.container.builder.ContainerBuilder;
|
||||||
import techreborn.tiles.storage.TileMFSU;
|
import techreborn.tiles.storage.TileMFSU;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -17,33 +19,32 @@ public class GuiMFSU extends GuiContainer {
|
||||||
|
|
||||||
TileMFSU generator;
|
TileMFSU generator;
|
||||||
|
|
||||||
ContainerMFSU containerGenerator;
|
public GuiMFSU(final EntityPlayer player, final TileMFSU generator) {
|
||||||
|
super(new ContainerBuilder().player(player.inventory).inventory(8, 84).hotbar(8, 142).armor().complete(44, 6)
|
||||||
public GuiMFSU(EntityPlayer player, TileMFSU generator) {
|
.addArmor().addInventory().tile(generator).energySlot(0, 80, 17).energySlot(1, 80, 53).syncEnergyValue()
|
||||||
super(new ContainerMFSU(generator, player));
|
.addInventory().create());
|
||||||
this.xSize = 176;
|
this.xSize = 176;
|
||||||
this.ySize = 167;
|
this.ySize = 167;
|
||||||
this.generator = generator;
|
this.generator = generator;
|
||||||
this.containerGenerator = (ContainerMFSU) this.inventorySlots;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void initGui() {
|
public void initGui() {
|
||||||
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;
|
||||||
super.initGui();
|
super.initGui();
|
||||||
}
|
}
|
||||||
|
|
||||||
@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_) {
|
||||||
this.mc.getTextureManager().bindTexture(texture);
|
this.mc.getTextureManager().bindTexture(GuiMFSU.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 = generator.getEnergyScaled(24);
|
j = this.generator.getEnergyScaled(24);
|
||||||
if (j > 0) {
|
if (j > 0) {
|
||||||
this.drawTexturedModalRect(k + 109, l + 21 + 12, 176, 0, j + 1, 16);
|
this.drawTexturedModalRect(k + 109, l + 21 + 12, 176, 0, j + 1, 16);
|
||||||
}
|
}
|
||||||
|
@ -56,16 +57,17 @@ public class GuiMFSU extends GuiContainer {
|
||||||
// }
|
// }
|
||||||
}
|
}
|
||||||
|
|
||||||
protected void drawGuiContainerForegroundLayer(int p_146979_1_, int p_146979_2_) {
|
@Override
|
||||||
String name = I18n.translateToLocal("tile.techreborn.mfsu.name");
|
protected void drawGuiContainerForegroundLayer(final int p_146979_1_, final int p_146979_2_) {
|
||||||
|
final String name = I18n.translateToLocal("tile.techreborn.mfsu.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]), this.xSize - 60,
|
this.fontRendererObj.drawString(I18n.translateToLocalFormatted("container.inventory", new Object[0]), this.xSize - 60,
|
||||||
this.ySize - 96 + 2, 4210752);
|
this.ySize - 96 + 2, 4210752);
|
||||||
this.fontRendererObj.drawString(PowerSystem.getLocaliszedPower(generator.getMaxPower()), 110, this.ySize - 150,
|
this.fontRendererObj.drawString(PowerSystem.getLocaliszedPower(this.generator.getMaxPower()), 110, this.ySize - 150,
|
||||||
4210752);
|
4210752);
|
||||||
this.fontRendererObj.drawString(PowerSystem.getLocaliszedPower(containerGenerator.energy), 110, this.ySize - 160,
|
this.fontRendererObj.drawString(PowerSystem.getLocaliszedPower(this.generator.getEnergy()), 110,
|
||||||
4210752);
|
this.ySize - 160, 4210752);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue