progress bar issues

This commit is contained in:
Adam 2022-06-20 22:33:04 +02:00 committed by GitHub
parent e1b75a315e
commit 879741a17c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1,6 +1,8 @@
package com.hbm.tileentity.machine; package com.hbm.tileentity.machine;
import com.hbm.blocks.machine.MachineElectricFurnace; import com.hbm.blocks.machine.MachineElectricFurnace;
import com.hbm.inventory.UpgradeManager;
import com.hbm.items.machine.ItemMachineUpgrade.UpgradeType;
import com.hbm.lib.Library; import com.hbm.lib.Library;
import com.hbm.packet.AuxElectricityPacket; import com.hbm.packet.AuxElectricityPacket;
import com.hbm.packet.AuxGaugePacket; import com.hbm.packet.AuxGaugePacket;
@ -25,7 +27,8 @@ public class TileEntityMachineElectricFurnace extends TileEntityLoadedBase imple
public int dualCookTime; public int dualCookTime;
public long power; public long power;
public static final long maxPower = 100000; public static final long maxPower = 100000;
public static final int processingSpeed = 100; public int processingSpeed = 100;
int consumption = 50;
private static final int[] slots_top = new int[] {1}; private static final int[] slots_top = new int[] {1};
private static final int[] slots_bottom = new int[] {2, 0}; private static final int[] slots_bottom = new int[] {2, 0};
@ -34,7 +37,7 @@ public class TileEntityMachineElectricFurnace extends TileEntityLoadedBase imple
private String customName; private String customName;
public TileEntityMachineElectricFurnace() { public TileEntityMachineElectricFurnace() {
slots = new ItemStack[3]; slots = new ItemStack[4];
} }
@Override @Override
@ -199,10 +202,6 @@ public class TileEntityMachineElectricFurnace extends TileEntityLoadedBase imple
return false; return false;
} }
public int getDiFurnaceProgressScaled(int i) {
return (dualCookTime * i) / processingSpeed;
}
public long getPowerRemainingScaled(long i) { public long getPowerRemainingScaled(long i) {
return (power * i) / maxPower; return (power * i) / maxPower;
} }
@ -279,13 +278,26 @@ public class TileEntityMachineElectricFurnace extends TileEntityLoadedBase imple
this.updateConnections(); this.updateConnections();
this.consumption = 50;
this.processingSpeed = 100;
UpgradeManager.eval(slots, 3, 3);
int speedLevel = UpgradeManager.getLevel(UpgradeType.SPEED);
int powerLevel = UpgradeManager.getLevel(UpgradeType.POWER);
processingSpeed -= speedLevel * 25;
consumption += speedLevel * 50;
processingSpeed += powerLevel * 10;
consumption -= powerLevel * 20;
if(hasPower() && canProcess()) if(hasPower() && canProcess())
{ {
dualCookTime++; dualCookTime++;
power -= 50; power -= consumption;
if(this.dualCookTime == TileEntityMachineElectricFurnace.processingSpeed) if(this.dualCookTime == processingSpeed)
{ {
this.dualCookTime = 0; this.dualCookTime = 0;
this.processItem(); this.processItem();
@ -327,6 +339,10 @@ public class TileEntityMachineElectricFurnace extends TileEntityLoadedBase imple
this.trySubscribe(worldObj, xCoord + dir.offsetX, yCoord + dir.offsetY, zCoord + dir.offsetZ, dir); this.trySubscribe(worldObj, xCoord + dir.offsetX, yCoord + dir.offsetY, zCoord + dir.offsetZ, dir);
} }
public int getDiFurnaceProgressScaled(int i) {
return (dualCookTime * i) / processingSpeed;
}
@Override @Override
public void setPower(long i) { public void setPower(long i) {
power = i; power = i;