Skip to content

Commit 0481964

Browse files
committed
Fix heating rate value in fission reactor GUI not resetting (#8095)
1 parent 8e2aa56 commit 0481964

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-3
lines changed

src/datagen/main/java/mekanism/client/integration/emi/MekanismEmiAliasProvider.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,6 @@ private void addStorageAliases() {
227227
MekanismAliases.SLURRY_STORAGE
228228
);
229229

230-
//TODO - 1.21: Fix energy stuff not displaying properly when searching for "energy storage"? Probably has to do with components
231230
addAliases(List.of(
232231
EmiStack.of(MekanismBlocks.BASIC_ENERGY_CUBE),
233232
EmiStack.of(MekanismBlocks.ADVANCED_ENERGY_CUBE),
@@ -240,7 +239,6 @@ private void addStorageAliases() {
240239
addAliases(MekanismItems.ENERGY_TABLET, MekanismAliases.ENERGY_STORAGE, MekanismAliases.ENERGY_STORAGE_BATTERY);
241240

242241
addAliases(List.of(
243-
//TODO - 1.21: Why does the creative bin not show up?
244242
EmiStack.of(MekanismBlocks.CREATIVE_BIN),
245243
EmiStack.of(MekanismBlocks.CREATIVE_FLUID_TANK),
246244
EmiStack.of(MekanismBlocks.CREATIVE_CHEMICAL_TANK),

src/generators/java/mekanism/generators/common/content/fission/FissionReactorMultiblockData.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -415,6 +415,8 @@ private void handleCoolant() {
415415
heatedCoolantTank.insert(MekanismGases.STEAM.getStack(lastBoilRate), Action.EXECUTE, AutomationType.INTERNAL);
416416
caseCoolantHeat = lastBoilRate * HeatUtils.getWaterThermalEnthalpy() / HeatUtils.getSteamEnergyEfficiency();
417417
heatCapacitor.handleHeat(-caseCoolantHeat);
418+
} else {
419+
lastBoilRate = 0;
418420
}
419421
} else if (!gasCoolantTank.isEmpty()) {
420422
CooledCoolant coolantType = gasCoolantTank.getStack().get(CooledCoolant.class);
@@ -427,7 +429,11 @@ private void handleCoolant() {
427429
caseCoolantHeat = lastBoilRate * coolantType.getThermalEnthalpy();
428430
heatCapacitor.handleHeat(-caseCoolantHeat);
429431
}
432+
} else {
433+
lastBoilRate = 0;
430434
}
435+
} else {
436+
lastBoilRate = 0;
431437
}
432438
}
433439

src/main/java/mekanism/common/CommonPlayerTickHandler.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,6 @@ public void getBreakSpeed(BreakSpeed event) {
324324
//Gyroscopic stabilization check
325325
if (IModuleHelper.INSTANCE.isEnabled(player.getItemBySlot(EquipmentSlot.LEGS), MekanismModules.GYROSCOPIC_STABILIZATION_UNIT)) {
326326
if (player.isEyeInFluidType(NeoForgeMod.WATER_TYPE.value())) {
327-
//TODO - 1.21: Is there a way we can instead get the attribute to just be equal to one?
328327
speed /= (float) player.getAttributeValue(Attributes.SUBMERGED_MINING_SPEED);
329328
}
330329

0 commit comments

Comments
 (0)