Skip to content
This repository has been archived by the owner on May 24, 2024. It is now read-only.

Numeric widget and localized number formatting. #2

Merged
merged 6 commits into from
Mar 10, 2024
Merged

Numeric widget and localized number formatting. #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
15c4f12
bs + deps
AbdielKavash Mar 9, 2024
1bad4ea
Radio Hatch
AbdielKavash Mar 9, 2024
b2fc321
LESU
AbdielKavash Mar 9, 2024
af87e72
spotless
AbdielKavash Mar 9, 2024
8dbe8a2
Merge branch 'master' into NumericWidget
AbdielKavash Mar 10, 2024
d9b132f
deps
AbdielKavash Mar 10, 2024
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
4 changes: 2 additions & 2 deletions dependencies.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ dependencies {
runtimeOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.5.24-GTNH:dev')
runtimeOnlyNonPublishable('com.github.GTNewHorizons:waila:1.7.1:dev')

compileOnlyApi('com.github.GTNewHorizons:Angelica:1.0.0-alpha33:api') { transitive = false }
api('com.github.GTNewHorizons:GT5-Unofficial:5.09.45.92:dev')
compileOnlyApi('com.github.GTNewHorizons:Angelica:1.0.0-alpha34:api') { transitive = false }
api('com.github.GTNewHorizons:GT5-Unofficial:5.09.45.95:dev')
api("com.github.GTNewHorizons:TecTech:5.3.32:dev")
api("com.github.GTNewHorizons:GalacticGregGT5:1.1.0:dev") {
exclude group:"com.github.GTNewHorizons", module:"bartworks"
Expand Down
56 changes: 37 additions & 19 deletions ...ava/com/github/bartimaeusnek/bartworks/common/tileentities/multis/GT_TileEntity_LESU.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,15 @@
import com.github.bartimaeusnek.bartworks.util.BW_Tooltip_Reference;
import com.github.bartimaeusnek.bartworks.util.ChatColorHelper;
import com.github.bartimaeusnek.bartworks.util.ConnectedBlocksChecker;
import com.gtnewhorizons.modularui.api.NumberFormatMUI;
import com.gtnewhorizons.modularui.api.drawable.Text;
import com.gtnewhorizons.modularui.api.forge.ItemStackHandler;
import com.gtnewhorizons.modularui.api.screen.ModularWindow;
import com.gtnewhorizons.modularui.api.screen.UIBuildContext;
import com.gtnewhorizons.modularui.common.internal.wrapper.BaseSlot;
import com.gtnewhorizons.modularui.common.widget.DrawableWidget;
import com.gtnewhorizons.modularui.common.widget.DynamicPositionedColumn;
import com.gtnewhorizons.modularui.common.widget.FakeSyncWidget;
import com.gtnewhorizons.modularui.common.widget.ProgressBar;
import com.gtnewhorizons.modularui.common.widget.SlotWidget;
import com.gtnewhorizons.modularui.common.widget.TextWidget;
Expand Down Expand Up @@ -79,6 +81,8 @@ public int getSlotLimit(int slot) {
};
private long mStorage;

protected static final NumberFormatMUI numberFormat = new NumberFormatMUI();

public GT_TileEntity_LESU(int aID, String aName, String aNameRegional) {
super(aID, aName, aNameRegional);
this.mStorage = ConfigHandler.energyPerCell;
Expand Down Expand Up @@ -492,39 +496,53 @@ public int getSlotStackLimit() {
.setSize(116, 5));
}

private long clientEU;
private long clientMaxEU;
private long clientMaxIn;
private long clientMaxOut;
private long clientAmps;

private void drawTexts(DynamicPositionedColumn screenElements) {
screenElements.setSpace(0).setPos(11, 8);

screenElements
.widget(
TextWidget.dynamicString(
() -> "EU: " + GT_Utility.formatNumbers(this.getBaseMetaTileEntity().getStoredEU()))
new TextWidget().setStringSupplier(() -> "EU: " + numberFormat.format(this.clientEU))
.setDefaultColor(this.COLOR_TEXT_WHITE.get()))
.widget(
TextWidget.dynamicString(
() -> "MAX: " + (this.getBaseMetaTileEntity().isActive()
? GT_Utility.formatNumbers(this.getBaseMetaTileEntity().getOutputVoltage())
+ String.valueOf(ConfigHandler.energyPerCell).substring(1)
: Integer.toString(0)))
new FakeSyncWidget.LongSyncer(
() -> this.getBaseMetaTileEntity().getStoredEU(),
val -> clientEU = val))
.widget(
new TextWidget().setStringSupplier(() -> "MAX: " + numberFormat.format(clientMaxEU))
.setDefaultColor(this.COLOR_TEXT_WHITE.get()))
.widget(
TextWidget
.dynamicString(
() -> "MAX EU/t IN: " + GT_Utility
.formatNumbers(this.getBaseMetaTileEntity().getInputVoltage()))
new FakeSyncWidget.LongSyncer(
() -> this.getBaseMetaTileEntity().isActive()
? this.getBaseMetaTileEntity().getOutputVoltage() * ConfigHandler.energyPerCell
: 0,
val -> clientMaxEU = val))
.widget(
new TextWidget().setStringSupplier(() -> "MAX EU/t IN: " + numberFormat.format(clientMaxIn))
.setDefaultColor(this.COLOR_TEXT_WHITE.get()))
.widget(
TextWidget
.dynamicString(
() -> "EU/t OUT: " + GT_Utility
.formatNumbers(this.getBaseMetaTileEntity().getOutputVoltage()))
new FakeSyncWidget.LongSyncer(
() -> this.getBaseMetaTileEntity().getInputVoltage(),
val -> clientMaxIn = val))
.widget(
new TextWidget().setStringSupplier(() -> "EU/t OUT: " + numberFormat.format(clientMaxOut))
.setDefaultColor(this.COLOR_TEXT_WHITE.get()))
.widget(
TextWidget
.dynamicString(
() -> "AMP/t IN/OUT: " + GT_Utility
.formatNumbers(this.getBaseMetaTileEntity().getInputAmperage()))
new FakeSyncWidget.LongSyncer(
() -> this.getBaseMetaTileEntity().getOutputVoltage(),
val -> clientMaxOut = val))
.widget(
new TextWidget().setStringSupplier(() -> "AMP/t IN/OUT: " + numberFormat.format(clientAmps))
.setDefaultColor(this.COLOR_TEXT_WHITE.get()))
.widget(
new FakeSyncWidget.LongSyncer(
() -> this.getBaseMetaTileEntity().getInputAmperage(),
val -> clientAmps = val))
.widget(
new TextWidget(Text.localised("tooltip.LESU.0.name")).setDefaultColor(Color.YELLOW.getRGB())
.setEnabled(widget -> this.maxEUStore() >= Long.MAX_VALUE - 1))
Expand Down
13 changes: 7 additions & 6 deletions ...thub/bartimaeusnek/bartworks/common/tileentities/tiered/GT_MetaTileEntity_RadioHatch.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
import com.gtnewhorizons.modularui.common.widget.ProgressBar;
import com.gtnewhorizons.modularui.common.widget.ProgressBar.Direction;
import com.gtnewhorizons.modularui.common.widget.TextWidget;
import com.gtnewhorizons.modularui.common.widget.textfield.TextFieldWidget;
import com.gtnewhorizons.modularui.common.widget.textfield.NumericWidget;

import gregtech.api.enums.Materials;
import gregtech.api.enums.Textures;
Expand Down Expand Up @@ -402,14 +402,16 @@ public void draw(float partialTicks) {
new DrawableWidget().setBackground(BW_UITextures.PICTURE_DECAY_TIME_CONTAINER).setPos(120, 14)
.setSize(24, 56))
.widget(
TextWidget.dynamicString(
new TextWidget().setStringSupplier(
() -> StatCollector.translateToLocalFormatted("BW.NEI.display.radhatch.1", this.mass))
.setTextAlignment(Alignment.Center).setPos(65, 62))
.widget(new FakeSyncWidget.ByteSyncer(() -> this.mass, val -> this.mass = val))
.widget(
TextWidget.dynamicString(
new TextWidget().setStringSupplier(
() -> StatCollector
.translateToLocalFormatted("BW.NEI.display.radhatch.0", this.getSievert()))
.setTextAlignment(Alignment.Center).setPos(60, 72))
.widget(new FakeSyncWidget.IntegerSyncer(() -> this.sievert, val -> this.sievert = val))
.widget(new ButtonWidget().setOnClick((clickData, widget) -> {
if (!widget.isClient()) {
widget.getContext().openSyncedWindow(RADIATION_SHUTTER_WINDOW_ID);
Expand Down Expand Up @@ -442,9 +444,8 @@ private ModularWindow createShutterWindow(EntityPlayer player) {
(widget, val) -> widget.setPos(16, 29 + this.coverage / 2)
.setSize(51, 50 - this.coverage / 2)))
.widget(
new TextFieldWidget().setSetterInt(val -> this.coverage = val.byteValue())
.setGetterInt(() -> (int) this.coverage).setNumbers(0, 100)
.setTextColor(Color.WHITE.dark(1)).setOnScrollNumbers(1, 5, 50)
new NumericWidget().setSetter(val -> this.coverage = (byte) val).setGetter(() -> this.coverage)
.setBounds(0, 100).setScrollValues(1, 5, 50).setTextColor(Color.WHITE.dark(1))
.setTextAlignment(Alignment.CenterLeft)
.setBackground(GT_UITextures.BACKGROUND_TEXT_FIELD.withOffset(-1, -1, 2, 2))
.setPos(86, 27).setSize(30, 12))
Expand Down