Skip to content

Commit 6321b5c

Browse files
committed
Fusion reactor checklist update
1 parent dcf9f63 commit 6321b5c

File tree

6 files changed

+11
-4
lines changed

6 files changed

+11
-4
lines changed

src/generated/resources/assets/nuclearcraft/lang/en_us.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1960,6 +1960,7 @@
19601960
"itemGroup.nuclearcraft_fluids": "NuclearCraft Fluids",
19611961
"itemGroup.nuclearcraft_fusion_reactor": "NuclearCraft Fusion Reactor",
19621962
"itemGroup.nuclearcraft_items": "NuclearCraft Items",
1963+
"itemGroup.nuclearcraft_kugelblitz": "NuclearCraft Kugelblitz",
19631964
"itemGroup.nuclearcraft_turbine_controller": "NuclearCraft Turbine",
19641965
"leacher.tooltip.invalid_pump": "Pump in the corner not found",
19651966
"leacher.tooltip.valid_pump": "Pump - Ok",
@@ -2162,6 +2163,7 @@
21622163
"tooltip.nc.reactor.plasma_heat": "Plasma Heat: %s K",
21632164
"tooltip.nc.reactor.plasma_optimal": "Optimal: %s K",
21642165
"tooltip.nc.reactor.ready": "Ready",
2166+
"tooltip.nc.reactor.running": "Activation: %s",
21652167
"tooltip.nc.rf_amplifier.efficiency": "Efficiency: %s%%",
21662168
"tooltip.nc.rf_amplifier.heat": "Heat: %s H/t",
21672169
"tooltip.nc.rf_amplifier.max_temp": "Max Temperature: %s K",

src/main/java/igentuman/nc/block/entity/fusion/FusionCoreBE.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package igentuman.nc.block.entity.fusion;
22

33
import igentuman.nc.NuclearCraft;
4-
import igentuman.nc.block.entity.fission.FissionPortBE;
54
import igentuman.nc.block.fusion.FusionCoreBlock;
65
import igentuman.nc.client.particle.FusionBeamParticleData;
76
import igentuman.nc.client.sound.SoundHandler;
@@ -82,6 +81,8 @@ public class FusionCoreBE <RECIPE extends FusionCoreBE.Recipe> extends FusionBE
8281
@NBTField
8382
public int currentRfAmplification = 0;
8483
@NBTField
84+
public int amplifiers = 0;
85+
@NBTField
8586
protected boolean forceShutdown = false;
8687
@NBTField
8788
public double magneticFieldStrength = 0;
@@ -630,6 +631,7 @@ protected boolean updateCharacteristics() {
630631
|| rfAmplifiersPower != multiblock().rfAmplifiersPower*rfAmplifierRatio()
631632
|| minRFAmplifiersTemp != multiblock().maxRFAmplifiersTemp;
632633
rfEfficiency = multiblock().rfEfficiency;
634+
amplifiers = multiblock().amplifiers.size();
633635
magnetsEfficiency = multiblock().magnetsEfficiency;
634636
magneticFieldStrength = multiblock().magneticFieldStrength;
635637
magnetsPower = multiblock().magnetsPower;

src/main/java/igentuman/nc/client/gui/FusionCoreScreen.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,7 @@ private void renderWidgets(GuiGraphics graphics, float partialTicks, int mouseX,
138138
checklist.addTooltip(Component.translatable("tooltip.nc.reactor.has_energy", container().hasEnoughEnergy() ? "Ok" : "--").withStyle(ChatFormatting.AQUA));
139139
checklist.addTooltip(Component.translatable("tooltip.nc.reactor.has_fuel", container().hasRecipe() ? "Ok" : "--").withStyle(ChatFormatting.AQUA));
140140
checklist.addTooltip(Component.translatable("tooltip.nc.reactor.charge", container().getCharge() == 100 ? "Ok" : "--").withStyle(ChatFormatting.AQUA));
141+
checklist.addTooltip(Component.translatable("tooltip.nc.reactor.running", container().isRunning() ? "Ok" : "--").withStyle(ChatFormatting.AQUA));
141142

142143
if(!container().getElectromagnetsPower().equals("0")) {
143144
checkboxIsFormed.addTooltip(Component.translatable("tooltip.nc.electromagnet.magnetic_field", container().getElectromagnetsField()).withStyle(ChatFormatting.BLUE));
@@ -147,7 +148,7 @@ private void renderWidgets(GuiGraphics graphics, float partialTicks, int mouseX,
147148
checkboxIsFormed.addTooltip(Component.translatable("tooltip.nc.electromagnet.not_found").withStyle(ChatFormatting.RED));
148149
}
149150
checkboxIsFormed.addTooltip(Component.literal("----------------------"));
150-
if(!container().getAmplifierVoltage().equals("0")) {
151+
if(!container().hasAmplifiers()) {
151152
checkboxIsFormed.addTooltip(Component.translatable("tooltip.nc.rf_amplifier.voltage", container().getAmplifierVoltage()).withStyle(ChatFormatting.BLUE));
152153
checkboxIsFormed.addTooltip(Component.translatable("tooltip.nc.rf_amplifier.power", container().getAmplifierPower()).withStyle(ChatFormatting.AQUA));
153154
checkboxIsFormed.addTooltip(Component.translatable("tooltip.nc.rf_amplifier.max_temp", container().getAmplifierMaxTemp()).withStyle(ChatFormatting.GOLD));

src/main/java/igentuman/nc/container/FusionCoreContainer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ public boolean hasMagnets() {
182182
}
183183

184184
public boolean hasAmplifiers() {
185-
return blockEntity.rfAmplifiersPower > 0;
185+
return blockEntity.amplifiers > 0;
186186
}
187187

188188
public int getCharge() {

src/main/java/igentuman/nc/datagen/NCLanguageProvider.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ protected void addTranslations() {
3030
add("itemGroup." + MODID+"_fusion_reactor", "NuclearCraft Fusion Reactor");
3131
add("itemGroup." + MODID+"_fluids", "NuclearCraft Fluids");
3232
add("itemGroup." + MODID+"_turbine_controller", "NuclearCraft Turbine");
33+
add("itemGroup." + MODID+"_kugelblitz", "NuclearCraft Kugelblitz");
3334
ores();
3435
ingots();
3536
plates();
@@ -262,6 +263,7 @@ private void tooltips() {
262263
add("tooltip.nc.rf_amplifier.max_temp","Max Temperature: %s K");
263264

264265
add("tooltip.nc.reactor.charge","Charged: %s");
266+
add("tooltip.nc.reactor.running","Activation: %s");
265267
add("tooltip.nc.reactor.has_magnets","Electromagnets: %s");
266268
add("tooltip.nc.reactor.has_amplifiers","RF Amplifiers: %s");
267269
add("tooltip.nc.reactor.has_coolant","Coolant: %s");

src/main/java/igentuman/nc/multiblock/fusion/FusionReactorMultiblock.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public boolean isReadyToProcess()
4646
}
4747

4848
protected HashMap<BlockPos, ElectromagnetBlock> electromagnets = new HashMap<>();
49-
protected HashMap<BlockPos, RFAmplifierBlock> amplifiers = new HashMap<>();
49+
public HashMap<BlockPos, RFAmplifierBlock> amplifiers = new HashMap<>();
5050

5151
public FusionReactorMultiblock(FusionCoreBE<?> core) {
5252
super(

0 commit comments

Comments
 (0)