Skip to content

Commit da6998f

Browse files
committed
Replace excess waste fission logic adapter mode with a critical waste level mode. Default config is set at 90% of waste tank's capacity (#7851)
1 parent a7ae1af commit da6998f

File tree

11 files changed

+35
-22
lines changed

11 files changed

+35
-22
lines changed

src/datagen/generated/mekanism/.cache/2ca94f3a6e22cb9eec299788405fc6e4ad158c09

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/datagen/generated/mekanism/data/mekanism/computer_help/enums.csv

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/datagen/generated/mekanism/data/mekanism/computer_help/enums.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/datagen/generated/mekanism/data/mekanism/computer_help/jekyll.md

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/datagen/generated/mekanismgenerators/.cache/de34ee0556eec16c961269bcb7ec3070f0579cfd

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/datagen/generated/mekanismgenerators/assets/mekanismgenerators/lang/en_ud.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/datagen/generated/mekanismgenerators/assets/mekanismgenerators/lang/en_us.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/datagen/generators/java/mekanism/generators/client/GeneratorsLangProvider.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ private void addMisc() {
122122
add(GeneratorsLang.REACTOR_LOGIC_OUTPUTTING, "Outputting");
123123
add(GeneratorsLang.REACTOR_LOGIC_ACTIVATION, "Activation");
124124
add(GeneratorsLang.REACTOR_LOGIC_TEMPERATURE, "High Temperature");
125-
add(GeneratorsLang.REACTOR_LOGIC_EXCESS_WASTE, "Excess Waste");
125+
add(GeneratorsLang.REACTOR_LOGIC_CRITICAL_WASTE_LEVEL, "Critical Waste Level");
126126
add(GeneratorsLang.REACTOR_LOGIC_DAMAGED, "Damage Critical");
127127
add(GeneratorsLang.REACTOR_LOGIC_POWERED, "Powered");
128128
add(GeneratorsLang.OUTPUT_RATE_SHORT, "Out: %1$s/t");
@@ -226,7 +226,7 @@ private void addMisc() {
226226
add(GeneratorsLang.DESCRIPTION_REACTOR_ACTIVATION, "Activate the reactor when powered, and deactivate when unpowered");
227227
add(GeneratorsLang.DESCRIPTION_REACTOR_TEMPERATURE, "Output when the reactor reaches dangerous temperatures");
228228
add(GeneratorsLang.DESCRIPTION_REACTOR_DAMAGED, "Output when the reactor reaches critical damage levels (100%+).");
229-
add(GeneratorsLang.DESCRIPTION_REACTOR_EXCESS_WASTE, "Output when the reactor has excess waste");
229+
add(GeneratorsLang.DESCRIPTION_REACTOR_CRITICAL_WASTE_LEVEL, "Output when the reactor has reached a critical level of waste (%1$s)");
230230
add(GeneratorsLang.DESCRIPTION_REACTOR_DEPLETED, "Output when the reactor has insufficient fuel to sustain a reaction");
231231
add(GeneratorsLang.DESCRIPTION_REACTOR_DISABLED, "Will not handle redstone");
232232
add(GeneratorsLang.DESCRIPTION_REACTOR_READY, "Output when the reactor has reached the required heat level to ignite");

src/generators/java/mekanism/generators/common/GeneratorsLang.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public enum GeneratorsLang implements ILangEntry {
4040
REACTOR_LOGIC_ACTIVE_COOLING("reactor", "logic.active_cooling"),
4141
REACTOR_LOGIC_ACTIVATION("reactor", "logic.activation"),
4242
REACTOR_LOGIC_TEMPERATURE("reactor", "logic.temperature"),
43-
REACTOR_LOGIC_EXCESS_WASTE("reactor", "logic.excess_waste"),
43+
REACTOR_LOGIC_CRITICAL_WASTE_LEVEL("reactor", "logic.critical_waste_level"),
4444
REACTOR_LOGIC_DAMAGED("reactor", "logic.damaged"),
4545
REACTOR_LOGIC_OUTPUTTING("reactor", "logic.outputting"),
4646
REACTOR_LOGIC_POWERED("reactor", "logic.powered"),
@@ -124,7 +124,7 @@ public enum GeneratorsLang implements ILangEntry {
124124
DESCRIPTION_REACTOR_ACTIVATION("description", "reactor.logic.activation"),
125125
DESCRIPTION_REACTOR_TEMPERATURE("description", "reactor.logic.temperature"),
126126
DESCRIPTION_REACTOR_DAMAGED("description", "reactor.logic.damaged"),
127-
DESCRIPTION_REACTOR_EXCESS_WASTE("description", "reactor.logic.excess_waste"),
127+
DESCRIPTION_REACTOR_CRITICAL_WASTE_LEVEL("description", "reactor.logic.critical_waste_level"),
128128
DESCRIPTION_REACTOR_READY("description", "reactor.logic.ready"),
129129
DESCRIPTION_REACTOR_CAPACITY("description", "reactor.logic.capacity"),
130130
DESCRIPTION_REACTOR_DEPLETED("description", "reactor.logic.depleted"),

src/generators/java/mekanism/generators/common/config/GeneratorsConfig.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ public class GeneratorsConfig extends BaseMekanismConfig {
7474
public final CachedLongValue maxFuelPerAssembly;
7575
public final CachedIntValue fissionCooledCoolantPerTank;
7676
public final CachedLongValue fissionHeatedCoolantPerTank;
77+
public final CachedDoubleValue fissionExcessWasteRatio;
7778

7879
public final CachedLongValue hohlraumMaxGas;
7980
public final CachedLongValue hohlraumFillRate;
@@ -213,6 +214,8 @@ public class GeneratorsConfig extends BaseMekanismConfig {
213214
.defineInRange("cooledCoolantPerTank", 100 * FluidType.BUCKET_VOLUME, 1, Integer.MAX_VALUE / maxVolume));
214215
fissionHeatedCoolantPerTank = CachedLongValue.wrap(this, builder.comment("Amount of heated coolant (mB) that each block of the fission reactor contributes to the volume. Max = volume * heatedCoolantPerTank")
215216
.defineInRange("heatedCoolantPerTank", 1_000L * FluidType.BUCKET_VOLUME, 1_000, Long.MAX_VALUE / maxVolume));
217+
fissionExcessWasteRatio = CachedDoubleValue.wrap(this, builder.comment("The percentage of waste in a fission reactor's output waste tank that is necessary to trigger the excess waste .")
218+
.defineInRange("excessWaste", 0.9D, 0.001D, 1D));
216219
builder.pop();
217220

218221
builder.pop();

0 commit comments

Comments
 (0)