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

Fixed coolers

Browse Source
This commit is contained in:
Vaern 2024-03-18 16:54:18 -07:00
parent b733dfc25e
commit ffcce93fba
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/main/java/com/hbm/tileentity/machine/TileEntityHadron.java
View File

@ -459,13 +459,7 @@ public class TileEntityHadron extends TileEntityMachineBase implements IEnergyUs
if(cl1 > 0) cl1--; if(cl1 > 0) cl1--;
} }
public void incrementCharge(Block block, int meta, int coilVal) { public void incrementCharge(int coilVal) {
if(block == ModBlocks.hadron_cooler) {
if(meta == 0) cl0 += 10;
if(meta == 1) cl1 += 5;
}
//not the best code ever made but it works, dammit //not the best code ever made but it works, dammit
if(cl1 > 0) { if(cl1 > 0) {
@ -554,6 +548,8 @@ public class TileEntityHadron extends TileEntityMachineBase implements IEnergyUs
//-> all coils have to be air //-> all coils have to be air
//-> all platings have to be analysis chamber walls //-> all platings have to be analysis chamber walls
boolean analysis = true; boolean analysis = true;
//ensures coolers are useful throughout their initial segment
int totalValue = 0;
for(int a = x - dX * 2; a <= x + dX * 2; a++) { for(int a = x - dX * 2; a <= x + dX * 2; a++) {
for(int b = y - dY * 2; b <= y + dY * 2; b++) { for(int b = y - dY * 2; b <= y + dY * 2; b++) {
@ -599,7 +595,12 @@ public class TileEntityHadron extends TileEntityMachineBase implements IEnergyUs
expire(p, EnumHadronState.ERROR_EXPECTED_COIL); expire(p, EnumHadronState.ERROR_EXPECTED_COIL);
} else { } else {
p.charge -= coilVal; p.charge -= coilVal;
p.incrementCharge(block, meta, coilVal); totalValue += coilVal;
if(block == ModBlocks.hadron_cooler) {
if(meta == 0) p.cl0 += 10;
if(meta == 1) p.cl1 += 5;
}
} }
continue; continue;
@ -645,6 +646,8 @@ public class TileEntityHadron extends TileEntityMachineBase implements IEnergyUs
} }
} }
} }
//all errors prior to this point come from bad construction, where exact momentum is irrelevant
p.incrementCharge(totalValue);
if(analysis) { if(analysis) {