Some clean up of some code

This commit is contained in:
modmuss50 2015-06-21 14:17:47 +01:00
parent 9e4151f5fa
commit 43da219936
7 changed files with 171 additions and 169 deletions

View file

@ -1,6 +1,9 @@
package techreborn.client.container;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.ICrafting;
import net.minecraft.inventory.Slot;
import techreborn.tiles.idsu.TileIDSU;
@ -12,74 +15,76 @@ public class ContainerIDSU extends TechRebornContainer {
TileIDSU tile;
@Override
public boolean canInteractWith(EntityPlayer player)
{
public boolean canInteractWith(EntityPlayer player) {
return true;
}
public int euOut;
public int storedEu;
public int euChange;
public int channel;
public ContainerIDSU(TileIDSU tileIDSU,
EntityPlayer player)
{
EntityPlayer player) {
tile = tileIDSU;
this.player = player;
int i;
for (i = 0; i < 3; ++i)
{
for (int j = 0; j < 9; ++j)
{
for (i = 0; i < 3; ++i) {
for (int j = 0; j < 9; ++j) {
this.addSlotToContainer(new Slot(player.inventory, j + i * 9
+ 9, 7 + j * 16, 84 + i * 18 + 30));
}
}
for (i = 0; i < 9; ++i)
{
for (i = 0; i < 9; ++i) {
this.addSlotToContainer(new Slot(player.inventory, i, 7 + i * 16,
142 + 30));
}
}
//
// @Override
// public void detectAndSendChanges() {
// super.detectAndSendChanges();
// for (int i = 0; i < this.crafters.size(); i++) {
// ICrafting icrafting = (ICrafting)this.crafters.get(i);
// if(this.euOut != tile.output){
// icrafting.sendProgressBarUpdate(this, 0, tile.output);
// }
// if(this.storedEu != tile.energy){
// icrafting.sendProgressBarUpdate(this, 1, (int) tile.energy);
// }
// if(this.euChange != tile.getEuChange() && tile.getEuChange() != -1){
// icrafting.sendProgressBarUpdate(this, 2, (int) tile.getEuChange());
// }
// }
// }
//
// @Override
// public void addCraftingToCrafters(ICrafting crafting) {
// super.addCraftingToCrafters(crafting);
// crafting.sendProgressBarUpdate(this, 0, tile.output);
// crafting.sendProgressBarUpdate(this, 1, (int) tile.energy);
// crafting.sendProgressBarUpdate(this, 2 , (int) tile.getEuChange());
// }
//
// @SideOnly(Side.CLIENT)
// @Override
// public void updateProgressBar(int id, int value) {
// if(id == 0){
// this.euOut = value;
// } else if(id == 1){
// this.storedEu = value;
// } else if(id == 2){
// this.euChange = value;
// }
// }
@Override
public void detectAndSendChanges() {
super.detectAndSendChanges();
for (int i = 0; i < this.crafters.size(); i++) {
ICrafting icrafting = (ICrafting) this.crafters.get(i);
if (this.euOut != tile.output) {
icrafting.sendProgressBarUpdate(this, 0, tile.output);
}
if (this.storedEu != (int) tile.getEnergy()) {
icrafting.sendProgressBarUpdate(this, 1, (int) tile.getEnergy());
}
if (this.euChange != tile.getEuChange() && tile.getEuChange() != -1) {
icrafting.sendProgressBarUpdate(this, 2, (int) tile.getEuChange());
}
if (this.channel != tile.channelID) {
icrafting.sendProgressBarUpdate(this, 3, tile.channelID);
}
}
}
@Override
public void addCraftingToCrafters(ICrafting crafting) {
super.addCraftingToCrafters(crafting);
crafting.sendProgressBarUpdate(this, 0, tile.output);
crafting.sendProgressBarUpdate(this, 1, (int) tile.getEnergy());
crafting.sendProgressBarUpdate(this, 2, (int) tile.getEuChange());
crafting.sendProgressBarUpdate(this, 3, tile.channelID);
}
@SideOnly(Side.CLIENT)
@Override
public void updateProgressBar(int id, int value) {
if (id == 0) {
this.euOut = value;
} else if (id == 1) {
this.storedEu = value;
} else if (id == 2) {
this.euChange = value;
} else if (id == 3) {
this.channel = value;
}
}
}