Skip to content

Commit 7cb191a

Browse files
committed
fix logo in SimpleGeneratorMetaTileEntity
add heat tooltip + lang in SteamBoiler add todo for SteamMetaTileEntity
1 parent 13fc654 commit 7cb191a

File tree

4 files changed

+12
-1
lines changed

4 files changed

+12
-1
lines changed

src/main/java/gregtech/api/metatileentity/SimpleGeneratorMetaTileEntity.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,8 @@ public ModularPanel buildUI(PosGuiData guiData, PanelSyncManager guiSyncManager)
162162
if (exportItems.getSlots() + exportFluids.getTanks() <= 9) {
163163
panel.child(new Widget<>()
164164
.size(17)
165-
.pos(152, 63 + yOffset)
165+
.right(7)
166+
.top(45 + yOffset)
166167
.background(GTGuiTextures.getLogo(getUITheme())));
167168
}
168169
return panel;

src/main/java/gregtech/api/metatileentity/SteamMetaTileEntity.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,7 @@ public boolean usesMui2() {
144144
public ModularPanel buildUI(PosGuiData guiData, PanelSyncManager guiSyncManager) {
145145
RecipeMap<?> map = Objects.requireNonNull(getRecipeMap());
146146

147+
// todo remove logo from background and use a widget
147148
return map.getRecipeMapUI()
148149
.constructPanel(this, workableHandler::getProgressPercent,
149150
importItems, exportItems,

src/main/java/gregtech/common/metatileentities/steam/boiler/SteamBoiler.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@
5050
import com.cleanroommc.modularui.factory.PosGuiData;
5151
import com.cleanroommc.modularui.screen.ModularPanel;
5252
import com.cleanroommc.modularui.value.sync.DoubleSyncValue;
53+
import com.cleanroommc.modularui.value.sync.IntSyncValue;
5354
import com.cleanroommc.modularui.value.sync.PanelSyncManager;
5455
import com.cleanroommc.modularui.widget.Widget;
5556
import com.cleanroommc.modularui.widgets.ItemSlot;
@@ -161,12 +162,14 @@ public void readFromNBT(NBTTagCompound data) {
161162
public void writeInitialSyncData(PacketBuffer buf) {
162163
super.writeInitialSyncData(buf);
163164
buf.writeBoolean(isBurning);
165+
buf.writeVarInt(currentTemperature);
164166
}
165167

166168
@Override
167169
public void receiveInitialSyncData(PacketBuffer buf) {
168170
super.receiveInitialSyncData(buf);
169171
this.isBurning = buf.readBoolean();
172+
this.currentTemperature = buf.readVarInt();
170173
}
171174

172175
@Override
@@ -346,12 +349,17 @@ public boolean usesMui2() {
346349

347350
@Override
348351
public ModularPanel buildUI(PosGuiData guiData, PanelSyncManager guiSyncManager) {
352+
IntSyncValue temp = new IntSyncValue(this::getCurrentTemperature);
353+
guiSyncManager.syncValue("temperature", temp);
349354
return GTGuis.defaultPanel(this)
350355
.child(IKey.lang(getMetaFullName()).asWidget().pos(5, 5))
351356
.child(new ProgressWidget()
352357
.texture(getEmptyBarDrawable(), GTGuiTextures.PROGRESS_BAR_BOILER_HEAT, -1)
353358
.direction(ProgressWidget.Direction.UP)
354359
.debugName("temp")
360+
.tooltipBuilder(
361+
tooltip -> tooltip.addLine(IKey.lang("gregtech.machine.steam_boiler.heat_tooltip",
362+
temp.getIntValue(), getMaxTemperate())))
355363
.value(new DoubleSyncValue(this::getTemperaturePercent))
356364
.pos(96, 26)
357365
.size(10, 54))

src/main/resources/assets/gregtech/lang/en_us.lang

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3018,6 +3018,7 @@ gregtech.machine.steam_boiler_lava_steel.name=High Pressure Steam Liquid Boiler
30183018
gregtech.machine.steam_boiler_lava_steel.tooltip=Faster than Small Steam Liquid Boiler
30193019

30203020
gregtech.machine.steam_boiler.heat_amount=Heat Capacity: %s %%
3021+
gregtech.machine.steam_boiler.heat_tooltip=Heat: %,d°C / %,d°C
30213022

30223023
gregtech.machine.steam_extractor_bronze.name=Steam Extractor
30233024
gregtech.machine.steam_extractor_bronze.tooltip=Extracting your first Rubber

0 commit comments

Comments
 (0)