Anvilcraft/atomicscience
2
1
Fork 0
generated from tilera/1710mod
Code Issues Pull requests Packages Projects Releases Wiki Activity

fix: balance turbines
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse source
This commit is contained in:
Timo Ley 2022-12-02 11:34:29 +01:00
parent 57fe937f33
commit ba377d21ef
2 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/atomicscience/AtomicScience.java
View file

@ -119,7 +119,7 @@ public class AtomicScience {
public static CommonProxy proxy;
@Metadata("AtomicScience") public static ModMetadata metadata;
private static final String[] LANGUAGES = new String[] {"en_US"};
public static float WOLUN_MULTIPLIER_OUTPUT = 30.0F;
public static float WOLUN_MULTIPLIER_OUTPUT = 15.0F;
public static boolean ALLOW_LAYERED_TURBINES = true;
public static boolean ALLOW_TOXIC_WASTE = true;
public static boolean ALLOW_RADIOACTIVE_ORES = true;
@ -174,7 +174,7 @@ public class AtomicScience {
EnumHelper.addArmorMaterial("HAZMAT", 0, new int[] {0, 0, 0, 0}, 0);
public static OreGenBase uraniumOreGeneration;
public static int URANIUM_HEXAFLOURIDE_RATIO = 200;
public static int STEAM_RATIO = 40;
public static int STEAM_RATIO = 120;
public static final String QIZI_FAN_WU_SU_BAO_ZHA = FlagRegistry.registerFlag("ban_antimatter_power");
public static final Logger LOGGER = Logger.getLogger("AtomicScience");

12
src/main/java/atomicscience/jiqi/TTurbine.java
View file

@ -45,10 +45,12 @@ public class TTurbine extends TileEntityUniversalProducer
@Override
public void updateEntity() {
super.updateEntity();
if (this.tank.getFluid() != null &&
this.tank.getFluidAmount() > AtomicScience.STEAM_RATIO) {
this.onReceiveSteam(AtomicScience.STEAM_RATIO);
if (this.tank.getFluid() != null && this.tank.getFluidAmount() > AtomicScience.STEAM_RATIO && !this.isMultiblock) {
this.onReceiveSteam(1);
this.tank.drain(AtomicScience.STEAM_RATIO, true);
} else if (this.tank.getFluid() != null && this.tank.getFluidAmount() > AtomicScience.STEAM_RATIO * 9 && this.isMultiblock) {
this.onReceiveSteam(9);
this.tank.drain(AtomicScience.STEAM_RATIO * 9, true);
}
if (this.masterTurbine != null) {
@ -242,7 +244,7 @@ public class TTurbine extends TileEntityUniversalProducer
}
public int fill(ForgeDirection from, FluidStack resource, boolean doFill) {
return this.tank.fill(resource, doFill);
return this.masterTurbine == null ? this.tank.fill(resource, doFill) : 0;
}
public FluidStack drain(ForgeDirection from, int maxDrain, boolean doDrain) {
@ -262,7 +264,7 @@ public class TTurbine extends TileEntityUniversalProducer
@Override
public boolean canFill(ForgeDirection arg0, Fluid arg1) {
return arg1 == AtomicScience.FLUID_STEAM &&
this.tank.getFluidAmount() < this.tank.getCapacity();
this.tank.getFluidAmount() < this.tank.getCapacity() && this.masterTurbine == null;
}
@Override