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

Merge pull request #364 from Vaern/master

Browse Source 
Zirnox finally fixed
This commit is contained in:
HbmMods 2021-12-11 20:37:44 +01:00 committed by GitHub
commit 20eb5648bc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/main/java/com/hbm/tileentity/machine/TileEntityReactorZirnox.java
View File

@ -63,7 +63,7 @@ public class TileEntityReactorZirnox extends TileEntityMachineBase implements IF
public TileEntityReactorZirnox() {
super(28);
steam = new FluidTank(FluidType.HOTSTEAM, 8000, 0);
steam = new FluidTank(FluidType.SUPERHOTSTEAM, 8000, 0);
carbonDioxide = new FluidTank(FluidType.CARBONDIOXIDE, 16000, 1);
water = new FluidTank(FluidType.WATER, 32000, 2);
}
@ -202,9 +202,14 @@ public class TileEntityReactorZirnox extends TileEntityMachineBase implements IF
this.pressure = (int) ((float)this.heat * (1.5 * this.carbonDioxide.getFill() / 16000));
if(this.heat > 0 && this.heat < maxHeat && this.water.getFill() > 0 && this.carbonDioxide.getFill() > 0) {
generateSteam();
this.heat -= (int) ((float)this.heat * (Math.sqrt(this.carbonDioxide.getFill()) / 1800));
if(this.heat > 0 && this.heat < maxHeat) {
if(this.water.getFill() > 0 && this.carbonDioxide.getFill() > 0) {
generateSteam();
this.heat -= (int) ((float)this.heat * (Math.sqrt(this.carbonDioxide.getFill()) / 1800));
} else {
this.heat -= 10;
}
}
checkIfMeltdown();
@ -224,9 +229,9 @@ public class TileEntityReactorZirnox extends TileEntityMachineBase implements IF
private void generateSteam() {
// function of SHS produced per tick
// heat% * 10 * 10 (should get rid of any rounding errors)
int Water = (int) (((float)heat / maxHeat) * 15);
int Steam = Water * 10;
// heat% * 25 * 1 (should get rid of any rounding errors)
int Water = (int) (((float)heat / maxHeat) * 25);
int Steam = Water * 1;
water.setFill(water.getFill() - Water);
steam.setFill(steam.getFill() + Steam);
@ -284,9 +289,9 @@ public class TileEntityReactorZirnox extends TileEntityMachineBase implements IF
ItemZirnoxRod rod = ((ItemZirnoxRod) slots[id].getItem());
this.heat += rod.heat;
ItemZirnoxRod.setLifeTime(slots[id], ItemZirnoxRod.getLifeTime(slots[id]) + 1);
if(ItemZirnoxRod.getLifeTime(slots[id]) > ((ItemZirnoxRod) slots[id].getItem()).lifeTime) {
slots[id] = fuelMap.get(new ComparableStack(getStackInSlot(id)).copy());
slots[id] = fuelMap.get(new ComparableStack(getStackInSlot(id))).copy();
break;
}
}
@ -390,7 +395,7 @@ public class TileEntityReactorZirnox extends TileEntityMachineBase implements IF
public int getMaxFluidFill(FluidType type) {
switch (type) {
case HOTSTEAM: return steam.getMaxFill();
case SUPERHOTSTEAM: return steam.getMaxFill();
case CARBONDIOXIDE: return carbonDioxide.getMaxFill();
case WATER: return water.getMaxFill();
default: return 0;
@ -399,7 +404,7 @@ public class TileEntityReactorZirnox extends TileEntityMachineBase implements IF
public void setFluidFill(int i, FluidType type) {
switch (type) {
case HOTSTEAM: steam.setFill(i);
case SUPERHOTSTEAM: steam.setFill(i);
break;
case CARBONDIOXIDE: carbonDioxide.setFill(i);
break;
@ -411,7 +416,7 @@ public class TileEntityReactorZirnox extends TileEntityMachineBase implements IF
public int getFluidFill(FluidType type) {
switch (type) {
case HOTSTEAM: return steam.getFill();
case SUPERHOTSTEAM: return steam.getFill();
case CARBONDIOXIDE: return carbonDioxide.getFill();
case WATER: return water.getFill();
default: return 0;

4
src/main/resources/assets/hbm/lang/en_US.lang
View File

@ -181,6 +181,7 @@ chem.CC_NAPHTHA=Naphtha Coal Liquefaction
chem.CC_OIL=Coal Liquefaction
chem.CIRCUIT_4=Overclocked Circuit Production
chem.CIRCUIT_5=High Performance Circuit Production
chem.CO2=Carbon Dioxide Production
chem.COLTAN_CLEANING=Coltan Purifying
chem.COLTAN_CRYSTAL=Tantalium Crystallizing
chem.COLTAN_PAIN=Pandemonium(III)tantalite Production
@ -208,11 +209,13 @@ chem.FP_NAPHTHA=Naphtha Processing
chem.FP_SMEAR=Industrial Oil Processing
chem.FR_PETROIL=Petroil Mixing
chem.FR_REOIL=Oil Reprocessing
chem.FRACKSOL=Fracking Solution Production
chem.GASOLINE=Gasoline Production
chem.HEAVY_ELECTROLYSIS=Heavy Water Cryo-Electrolysis
chem.HELIUM3=Helium-3 Extraction from Moon Turf
chem.KEVLAR=Kevlar Compound Production
chem.LPG=Petroleum Gas Liquefaction
chem.METH=Methamphetamine Synthesis
chem.NITAN=NITAN Super Fuel Mixing
chem.OIL_SAND=Tar Sand Extraction
chem.OSMIRIDIUM_DEATH=Osmiridic Solution Production
@ -403,6 +406,7 @@ death.attack.mku=%1$s died from unknown causes.
death.attack.monoxide=%1$s forgot to change the batteries in their carbon monoxide detector.
death.attack.mudPoisoning=%1$s died in poisonous mud.
death.attack.nuclearBlast=%1$s was blown away by a nuclear explosion.
death.attack.overdose=%1$s overdosed and asphyxiated.
death.attack.pc=%1$s was reduced to a puddle in the pink cloud.
death.attack.plasma=%1$s was immolated by %2$s.
death.attack.radiation=%1$s died from radiation poisoning.