Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions src/main/java/mods/railcraft/RailcraftConfig.java
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,8 @@ public static class Server {
public final DoubleValue lossMultiplier;
public final DoubleValue fuelMultiplier;
public final DoubleValue fuelPerSteamMultiplier;
public final DoubleValue turbinePowerMultiplier;
public final DoubleValue turbineEnergyOutputRateMultiplier;
public final IntValue cartDispenserDelay;
public final BooleanValue changeDungeonLoot;
public final ConfigValue<List<? extends String>> preferredOres;
Expand Down Expand Up @@ -193,6 +195,12 @@ private Server(Builder builder) {
this.lossMultiplier = builder
.comment("adjust the losses for the Charge network")
.defineInRange("lossMultiplier", 1.0D, 0.2D, 10.0D);
this.turbinePowerMultiplier = builder
.comment("Adjust the amount of power produced in a Turbine")
.defineInRange("turbinePowerMultiplier", 1.0F, 0.1F, 100F);
this.turbineEnergyOutputRateMultiplier = builder
.comment("Adjust the amount of energy output rate in a Turbine")
.defineInRange("turbineEnergyPowerRateMultiplier", 1.0F, 0.1F, 100F);
}
builder.pop();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import java.util.List;
import java.util.Map;
import org.jetbrains.annotations.Nullable;
import mods.railcraft.RailcraftConfig;
import mods.railcraft.Translations;
import mods.railcraft.api.charge.Charge;
import mods.railcraft.api.charge.ChargeBlock;
Expand Down Expand Up @@ -36,11 +37,6 @@ public class SteamTurbineBlock extends MultiblockBlock implements ChargeBlock {

public static final Property<Boolean> ROTATED = BooleanProperty.create("rotated");

private static final Map<Charge, Spec> CHARGE_SPECS =
Spec.make(Charge.distribution, ChargeBlock.ConnectType.BLOCK, 0,
new ChargeStorage.Spec(ChargeStorage.State.DISABLED,
SteamTurbineModule.CHARGE_OUTPUT, SteamTurbineModule.CHARGE_OUTPUT, 1));

public SteamTurbineBlock(Properties properties) {
super(properties);
this.registerDefaultState(this.stateDefinition.any()
Expand Down Expand Up @@ -74,7 +70,11 @@ public <T extends BlockEntity> BlockEntityTicker<T> getTicker(Level level, Block
@Override
public Map<Charge, Spec> getChargeSpecs(BlockState state,
ServerLevel level, BlockPos pos) {
return CHARGE_SPECS;
return Spec.make(Charge.distribution, ChargeBlock.ConnectType.BLOCK, 0,
new ChargeStorage.Spec(ChargeStorage.State.DISABLED,
SteamTurbineModule.CHARGE_OUTPUT * RailcraftConfig.SERVER.turbinePowerMultiplier.get().intValue(),
SteamTurbineModule.CHARGE_OUTPUT * RailcraftConfig.SERVER.turbinePowerMultiplier.get().intValue(),
1));
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import java.util.function.Predicate;
import org.jetbrains.annotations.Nullable;
import it.unimi.dsi.fastutil.chars.CharList;
import mods.railcraft.RailcraftConfig;
import mods.railcraft.Translations;
import mods.railcraft.api.charge.Charge;
import mods.railcraft.api.charge.ChargeStorage;
Expand Down Expand Up @@ -38,23 +39,23 @@ public class SteamTurbineBlockEntity extends MultiblockBlockEntity<SteamTurbineB
private static final int ENERGY_OUTPUT_RATE = 900;

private static final BlockPredicate BLOCK_PREDICATE =
BlockPredicate.of(RailcraftBlocks.STEAM_TURBINE);
BlockPredicate.of(RailcraftBlocks.STEAM_TURBINE);

private static final MultiblockPattern<Void> pattern =
MultiblockPattern.<Void>builder(BlockPos.ZERO)
.layer(List.of(
CharList.of('A', 'W', 'B'),
CharList.of('B', 'W', 'A')))
.layer(List.of(
CharList.of('C', 'X', 'D'),
CharList.of('D', 'X', 'C')))
.predicate('A', BLOCK_PREDICATE)
.predicate('B', BLOCK_PREDICATE)
.predicate('C', BLOCK_PREDICATE)
.predicate('D', BLOCK_PREDICATE)
.predicate('X', BLOCK_PREDICATE)
.predicate('W', BLOCK_PREDICATE)
.build();
MultiblockPattern.<Void>builder(BlockPos.ZERO)
.layer(List.of(
CharList.of('A', 'W', 'B'),
CharList.of('B', 'W', 'A')))
.layer(List.of(
CharList.of('C', 'X', 'D'),
CharList.of('D', 'X', 'C')))
.predicate('A', BLOCK_PREDICATE)
.predicate('B', BLOCK_PREDICATE)
.predicate('C', BLOCK_PREDICATE)
.predicate('D', BLOCK_PREDICATE)
.predicate('X', BLOCK_PREDICATE)
.predicate('W', BLOCK_PREDICATE)
.build();

private static final MultiblockPattern<Void> rotatedPattern = pattern.rotateClockwise();

Expand Down Expand Up @@ -95,7 +96,8 @@ public static void serverTick(Level level, BlockPos blockPos, BlockState blockSt

master.getEnergyStorage()
.ifPresent(energyStorage -> EnergyUtil.pushToSides(level, blockPos, energyStorage,
ENERGY_OUTPUT_RATE, filter, Direction.values()));
ENERGY_OUTPUT_RATE * RailcraftConfig.SERVER.turbineEnergyOutputRateMultiplier.get().intValue(),
filter, Direction.values()));

master.getFluidHandler().ifPresent(fluidHandler -> {
var neighbors = FluidTools.findNeighbors(level, blockPos, filter,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package mods.railcraft.world.module;

import mods.railcraft.RailcraftConfig;
import mods.railcraft.api.charge.Charge;
import mods.railcraft.api.core.CompoundTagKeys;
import mods.railcraft.tags.RailcraftTags;
Expand Down Expand Up @@ -58,13 +59,13 @@ public LazyOptional<IFluidHandler> getFluidHandler() {
public void serverTick() {
super.serverTick();
var addedEnergy = false;
if (this.energy < CHARGE_OUTPUT) {
if (this.energy < (CHARGE_OUTPUT * RailcraftConfig.SERVER.turbinePowerMultiplier.get().intValue())) {
var steam = this.steamTank.internalDrain(STEAM_USAGE, FluidAction.SIMULATE);
if (steam.getAmount() >= STEAM_USAGE) {
var rotorStack = this.rotorContainer.getItem(0);
if (rotorStack.is(RailcraftItems.TURBINE_ROTOR.get())) {
addedEnergy = true;
this.energy += CHARGE_OUTPUT;
this.energy += CHARGE_OUTPUT * RailcraftConfig.SERVER.turbinePowerMultiplier.get().intValue();
this.steamTank.internalDrain(STEAM_USAGE, FluidAction.EXECUTE);
this.waterTank.internalFill(new FluidStack(Fluids.WATER, 2), FluidAction.EXECUTE);
this.rotorContainer.setItem(0, useRotor(rotorStack));
Expand Down
Loading