xircon/Hbm-s-Nuclear-Tech-GIT
1
0
Fork 0
mirror of https://github.com/HbmMods/Hbm-s-Nuclear-Tech-GIT.git synced 2026-01-25 10:32:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

PR cleanup

Browse Source
This commit is contained in:
Boblet 2022-06-24 08:16:08 +02:00
parent bf2224b880
commit 2b59d8709e
2 changed files with 90 additions and 228 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/hbm/inventory/gui/GUIMachineElectricFurnace.java
View File

@ -65,7 +65,7 @@ public class GUIMachineElectricFurnace extends GuiInfoContainer {
fs = diFurnace; fs = diFurnace;
if(fs.hasPower()) { if(fs.hasPower()) {
int i = (int)diFurnace.getPowerRemainingScaled(52); int i = (int)diFurnace.getPowerScaled(52);
drawTexturedModalRect(guiLeft + 20, guiTop + 69 - i, 200, 52 - i, 16, i); drawTexturedModalRect(guiLeft + 20, guiTop + 69 - i, 200, 52 - i, 16, i);
} }
@ -74,7 +74,7 @@ public class GUIMachineElectricFurnace extends GuiInfoContainer {
drawTexturedModalRect(guiLeft + 56, guiTop + 35, 176, 0, 16, 16); drawTexturedModalRect(guiLeft + 56, guiTop + 35, 176, 0, 16, 16);
} }
int j1 = fs.getDiFurnaceProgressScaled(24); int j1 = fs.getProgressScaled(24);
drawTexturedModalRect(guiLeft + 79, guiTop + 34, 176, 17, j1 + 1, 17); drawTexturedModalRect(guiLeft + 79, guiTop + 34, 176, 17, j1 + 1, 17);
this.drawInfoPanel(guiLeft + 151, guiTop + 19, 8, 8, 8); this.drawInfoPanel(guiLeft + 151, guiTop + 19, 8, 8, 8);

248
src/main/java/com/hbm/tileentity/machine/TileEntityMachineElectricFurnace.java
View File

@ -22,145 +22,44 @@ import net.minecraftforge.common.util.ForgeDirection;
public class TileEntityMachineElectricFurnace extends TileEntityMachineBase implements ISidedInventory, IEnergyUser { public class TileEntityMachineElectricFurnace extends TileEntityMachineBase implements ISidedInventory, IEnergyUser {
// HOLY FUCKING SHIT I SPENT 5 DAYS ON THIS SHITFUCK CLASS FILE // HOLY FUCKING SHIT I SPENT 5 DAYS ON THIS SHITFUCK CLASS FILE
// thanks Martin, vaer and Bob for the help // thanks Martin, vaer and Bob for the help
private ItemStack slots[];
public int progress; public int progress;
public long power; public long power;
public static final long maxPower = 100000; public static final long maxPower = 100000;
public int MaxProgress = 100; public int maxProgress = 100;
public int consumption = 50; public int consumption = 50;
private static final int[] slots_top = new int[] {1}; private static final int[] slots_io = new int[] { 0, 1, 2 };
private static final int[] slots_bottom = new int[] {2, 0};
private static final int[] slots_side = new int[] {0};
private String customName; public TileEntityMachineElectricFurnace() {
public TileEntityMachineElectricFurnace(){
super(4); super(4);
slots = new ItemStack[4];
} }
@Override @Override
public int getSizeInventory() { public String getName() {
return slots.length; return "container.electricFurnace";
} }
@Override
public ItemStack getStackInSlot(int i) {
return slots[i];
}
@Override
public ItemStack getStackInSlotOnClosing(int i) {
if(slots[i] != null)
{
ItemStack itemStack = slots[i];
slots[i] = null;
return itemStack;
} else {
return null;
}
}
@Override
public void setInventorySlotContents(int i, ItemStack itemStack) {
slots[i] = itemStack;
if(itemStack != null && itemStack.stackSize > getInventoryStackLimit())
{
itemStack.stackSize = getInventoryStackLimit();
}
}
@Override
public String getInventoryName() {
return this.hasCustomInventoryName() ? this.customName : "container.electricFurnace";
}
@Override
public boolean hasCustomInventoryName() {
return this.customName != null && this.customName.length() > 0;
}
public void setCustomName(String name) {
this.customName = name;
}
@Override
public int getInventoryStackLimit() {
return 64;
}
@Override
public boolean isUseableByPlayer(EntityPlayer player) {
if(worldObj.getTileEntity(xCoord, yCoord, zCoord) != this)
{
return false;
}else{
return player.getDistanceSq(xCoord + 0.5D, yCoord + 0.5D, zCoord + 0.5D) <=64;
}
}
//You scrubs aren't needed for anything (right now)
@Override
public void openInventory() {}
@Override
public void closeInventory() {}
@Override @Override
public boolean isItemValidForSlot(int i, ItemStack itemStack) { public boolean isItemValidForSlot(int i, ItemStack itemStack) {
if(i == 0) if(i == 0) {
if(itemStack.getItem() instanceof IBatteryItem) return itemStack.getItem() instanceof IBatteryItem;
return true; }
if(i == 1) if(i == 1) {
return true; return FurnaceRecipes.smelting().getSmeltingResult(itemStack) != null;
}
return false; return false;
} }
@Override
public ItemStack decrStackSize(int i, int j) {
if(slots[i] != null)
{
if(slots[i].stackSize <= j)
{
ItemStack itemStack = slots[i];
slots[i] = null;
return itemStack;
}
ItemStack itemStack1 = slots[i].splitStack(j);
if (slots[i].stackSize == 0)
{
slots[i] = null;
}
return itemStack1;
} else {
return null;
}
}
@Override @Override
public void readFromNBT(NBTTagCompound nbt) { public void readFromNBT(NBTTagCompound nbt) {
super.readFromNBT(nbt); super.readFromNBT(nbt);
NBTTagList list = nbt.getTagList("items", 10);
this.power = nbt.getLong("power"); this.power = nbt.getLong("power");
this.progress = nbt.getInteger("progress"); this.progress = nbt.getInteger("progress");
slots = new ItemStack[getSizeInventory()];
for(int i = 0; i < list.tagCount(); i++)
{
NBTTagCompound nbt1 = list.getCompoundTagAt(i);
byte b0 = nbt1.getByte("slot");
if(b0 >= 0 && b0 < slots.length)
{
slots[b0] = ItemStack.loadItemStackFromNBT(nbt1);
}
}
} }
@Override @Override
@ -168,36 +67,17 @@ public class TileEntityMachineElectricFurnace extends TileEntityMachineBase impl
super.writeToNBT(nbt); super.writeToNBT(nbt);
nbt.setLong("power", power); nbt.setLong("power", power);
nbt.setInteger("progress", progress); nbt.setInteger("progress", progress);
NBTTagList list = new NBTTagList();
for(int i = 0; i < slots.length; i++)
{
if(slots[i] != null)
{
NBTTagCompound nbt1 = new NBTTagCompound();
nbt1.setByte("slot", (byte)i);
slots[i].writeToNBT(nbt1);
list.appendTag(nbt1);
}
}
nbt.setTag("items", list);
} }
@Override @Override
public int[] getAccessibleSlotsFromSide(int p_94128_1_) public int[] getAccessibleSlotsFromSide(int side) {
{ return slots_io;
return p_94128_1_ == 0 ? slots_bottom : (p_94128_1_ == 1 ? slots_top : slots_side);
}
@Override
public boolean canInsertItem(int i, ItemStack itemStack, int j) {
return this.isItemValidForSlot(i, itemStack);
} }
@Override @Override
public boolean canExtractItem(int i, ItemStack itemStack, int j) { public boolean canExtractItem(int i, ItemStack itemStack, int j) {
if(i == 0) if(i == 0)
if (itemStack.getItem() instanceof IBatteryItem && ((IBatteryItem)itemStack.getItem()).getCharge(itemStack) == 0) if(itemStack.getItem() instanceof IBatteryItem && ((IBatteryItem) itemStack.getItem()).getCharge(itemStack) == 0)
return true; return true;
if(i == 2) if(i == 2)
return true; return true;
@ -205,11 +85,11 @@ public class TileEntityMachineElectricFurnace extends TileEntityMachineBase impl
return false; return false;
} }
public int getDiFurnaceProgressScaled(int i) { public int getProgressScaled(int i) {
return (progress * i) / MaxProgress; return (progress * i) / maxProgress;
} }
public long getPowerRemainingScaled(long i) { public long getPowerScaled(long i) {
return (power * i) / maxPower; return (power * i) / maxPower;
} }
@ -222,19 +102,16 @@ public class TileEntityMachineElectricFurnace extends TileEntityMachineBase impl
} }
public boolean canProcess() { public boolean canProcess() {
if(slots[1] == null) if(slots[1] == null) {
{
return false; return false;
} }
ItemStack itemStack = FurnaceRecipes.smelting().getSmeltingResult(this.slots[1]); ItemStack itemStack = FurnaceRecipes.smelting().getSmeltingResult(this.slots[1]);
if(itemStack == null) if(itemStack == null) {
{
return false; return false;
} }
if(slots[2] == null) if(slots[2] == null) {
{
return true; return true;
} }
@ -244,32 +121,28 @@ public class TileEntityMachineElectricFurnace extends TileEntityMachineBase impl
if(slots[2].stackSize < getInventoryStackLimit() && slots[2].stackSize < slots[2].getMaxStackSize()) { if(slots[2].stackSize < getInventoryStackLimit() && slots[2].stackSize < slots[2].getMaxStackSize()) {
return true; return true;
}else{ } else {
return slots[2].stackSize < itemStack.getMaxStackSize(); return slots[2].stackSize < itemStack.getMaxStackSize();
} }
} }
private void processItem() { private void processItem() {
if(canProcess()) { if(canProcess()) {
ItemStack itemStack = FurnaceRecipes.smelting().getSmeltingResult(this.slots[1]); ItemStack itemStack = FurnaceRecipes.smelting().getSmeltingResult(this.slots[1]);
if(slots[2] == null) if(slots[2] == null) {
{
slots[2] = itemStack.copy(); slots[2] = itemStack.copy();
}else if(slots[2].isItemEqual(itemStack)) { } else if(slots[2].isItemEqual(itemStack)) {
slots[2].stackSize += itemStack.stackSize; slots[2].stackSize += itemStack.stackSize;
} }
for(int i = 1; i < 2; i++) for(int i = 1; i < 2; i++) {
{ if(slots[i].stackSize <= 0) {
if(slots[i].stackSize <= 0)
{
slots[i] = new ItemStack(slots[i].getItem().setFull3D()); slots[i] = new ItemStack(slots[i].getItem().setFull3D());
}else{ } else {
slots[i].stackSize--; slots[i].stackSize--;
} }
if(slots[i].stackSize <= 0) if(slots[i].stackSize <= 0) {
{
slots[i] = null; slots[i] = null;
} }
} }
@ -283,67 +156,61 @@ public class TileEntityMachineElectricFurnace extends TileEntityMachineBase impl
if(!worldObj.isRemote) { if(!worldObj.isRemote) {
power = Library.chargeTEFromItems(slots, 0, power, maxPower);
this.updateConnections(); this.updateConnections();
this.consumption = 50; this.consumption = 50;
this.MaxProgress = 100; this.maxProgress = 100;
UpgradeManager.eval(slots, 3, 3); UpgradeManager.eval(slots, 3, 3);
int speedLevel = UpgradeManager.getLevel(UpgradeType.SPEED); int speedLevel = UpgradeManager.getLevel(UpgradeType.SPEED);
int powerLevel = UpgradeManager.getLevel(UpgradeType.POWER); int powerLevel = UpgradeManager.getLevel(UpgradeType.POWER);
MaxProgress -= speedLevel * 25; maxProgress -= speedLevel * 25;
consumption += speedLevel * 50; consumption += speedLevel * 50;
MaxProgress += powerLevel * 10; maxProgress += powerLevel * 10;
consumption -= powerLevel * 15; consumption -= powerLevel * 15;
if(hasPower() && canProcess()) {
NBTTagCompound data = new NBTTagCompound();
data.setLong("power", this.power);
data.setInteger("MaxProgress", this.MaxProgress);
data.setInteger("progress", this.progress);
this.networkPack(data, 50);
if(hasPower() && canProcess())
{
progress++; progress++;
power -= consumption; power -= consumption;
if(this.progress == MaxProgress) if(this.progress == maxProgress) {
{
this.progress = 0; this.progress = 0;
this.processItem(); this.processItem();
flag1 = true; flag1 = true;
} }
}else{ } else {
progress = 0; progress = 0;
} }
boolean trigger = true; boolean trigger = true;
if(hasPower() && canProcess() && this.progress == 0) if(hasPower() && canProcess() && this.progress == 0) {
{
trigger = false; trigger = false;
} }
if(trigger) if(trigger) {
{ flag1 = true;
flag1 = true; MachineElectricFurnace.updateBlockState(this.progress > 0, this.worldObj, this.xCoord, this.yCoord, this.zCoord);
MachineElectricFurnace.updateBlockState(this.progress > 0, this.worldObj, this.xCoord, this.yCoord, this.zCoord); }
}
power = Library.chargeTEFromItems(slots, 0, power, maxPower); NBTTagCompound data = new NBTTagCompound();
data.setLong("power", this.power);
} data.setInteger("MaxProgress", this.maxProgress);
data.setInteger("progress", this.progress);
this.networkPack(data, 50);
if(flag1) if(flag1) {
{ this.markDirty();
this.markDirty(); }
} }
} }
private void updateConnections() { private void updateConnections() {
for(ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) for(ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS)
@ -352,10 +219,11 @@ public class TileEntityMachineElectricFurnace extends TileEntityMachineBase impl
public void networkUnpack(NBTTagCompound nbt) { public void networkUnpack(NBTTagCompound nbt) {
this.power = nbt.getLong("power"); this.power = nbt.getLong("power");
this.MaxProgress = nbt.getInteger("MaxProgress"); this.maxProgress = nbt.getInteger("MaxProgress");
this.progress = nbt.getInteger("progress"); this.progress = nbt.getInteger("progress");
} }
@Override @Override
public void setPower(long i) { public void setPower(long i) {
power = i; power = i;
@ -372,10 +240,4 @@ public class TileEntityMachineElectricFurnace extends TileEntityMachineBase impl
public long getMaxPower() { public long getMaxPower() {
return maxPower; return maxPower;
} }
@Override
public String getName() {
// TODO Auto-generated method stub
return null;
}
} }