Skip to content

Commit 64c1688

Browse files
ghzdudeghzdude
committed
fix rebase
1 parent 60ade55 commit 64c1688

File tree

10 files changed

+39
-46
lines changed

10 files changed

+39
-46
lines changed

‎src/main/java/gregtech/api/mui/GTGuiTextures.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -460,15 +460,15 @@ private static String id(String path) {
460460

461461
// Texture Areas
462462
public static final UITexture[] BUTTON_FLUID = slice("textures/blocks/cover/cover_interface_fluid_button.png", 18,
463-
36, false);
463+
36, null);
464464
public static final UITexture[] BUTTON_ITEM = slice("textures/blocks/cover/cover_interface_item_button.png", 18, 36,
465-
false);
465+
null);
466466
public static final UITexture[] BUTTON_ENERGY = slice("textures/blocks/cover/cover_interface_energy_button.png", 18,
467-
36, false);
467+
36, null);
468468
public static final UITexture[] BUTTON_MACHINE = slice("textures/blocks/cover/cover_interface_machine_button.png",
469-
18, 36, false);
469+
18, 36, null);
470470
public static final UITexture[] BUTTON_INTERFACE = slice(
471-
"textures/blocks/cover/cover_interface_computer_button.png", 18, 36, false);
471+
"textures/blocks/cover/cover_interface_computer_button.png", 18, 36, null);
472472
public static final UITexture COVER_INTERFACE_MACHINE_ON_PROXY = fullImage(
473473
"textures/blocks/cover/cover_interface_machine_on_proxy.png");
474474
public static final UITexture COVER_INTERFACE_MACHINE_OFF_PROXY = fullImage(

‎src/main/java/gregtech/common/covers/CoverConveyor.java‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
import gregtech.client.renderer.texture.Textures;
1616
import gregtech.client.renderer.texture.cube.SimpleSidedCubeRenderer;
1717
import gregtech.common.covers.filter.ItemFilterContainer;
18-
import gregtech.common.mui.widget.GTTextFieldWidget;
1918
import gregtech.common.pipelike.itempipe.tile.TileEntityItemPipe;
2019

2120
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
@@ -58,6 +57,7 @@
5857
import com.cleanroommc.modularui.widget.ParentWidget;
5958
import com.cleanroommc.modularui.widgets.ButtonWidget;
6059
import com.cleanroommc.modularui.widgets.layout.Flow;
60+
import com.cleanroommc.modularui.widgets.textfield.TextFieldWidget;
6161
import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
6262
import it.unimi.dsi.fastutil.ints.IntArrayList;
6363
import it.unimi.dsi.fastutil.ints.IntList;
@@ -548,11 +548,9 @@ protected ParentWidget<Flow> createUI(GuiData data, PanelSyncManager guiSyncMana
548548
return true;
549549
})
550550
.onUpdateListener(w -> w.overlay(createAdjustOverlay(false))))
551-
.child(new GTTextFieldWidget()
551+
.child(new TextFieldWidget()
552552
.left(18).right(18)
553-
// todo remove 'keepScrollBarInArea' when this is fixed in mui2
554-
.keepScrollBarInArea(true)
555-
.setPostFix(" items/s")
553+
// .setPostFix(" items/s")
556554
.setTextColor(Color.WHITE.darker(1))
557555
.setNumbers(1, maxItemTransferRate)
558556
.value(formattedThroughput)

‎src/main/java/gregtech/common/covers/CoverDigitalInterface.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import gregtech.client.utils.RenderUtil;
2121
import gregtech.common.gui.widget.prospector.widget.WidgetOreList;
2222
import gregtech.common.metatileentities.multi.electric.MetaTileEntityPowerSubstation;
23-
import gregtech.common.mui.widget.GTTextFieldWidget;
2423

2524
import net.minecraft.client.Minecraft;
2625
import net.minecraft.client.renderer.GlStateManager;
@@ -67,6 +66,7 @@
6766
import com.cleanroommc.modularui.drawable.DynamicDrawable;
6867
import com.cleanroommc.modularui.factory.SidedPosGuiData;
6968
import com.cleanroommc.modularui.screen.ModularPanel;
69+
import com.cleanroommc.modularui.screen.UISettings;
7070
import com.cleanroommc.modularui.utils.Alignment;
7171
import com.cleanroommc.modularui.utils.Color;
7272
import com.cleanroommc.modularui.value.StringValue;
@@ -75,6 +75,7 @@
7575
import com.cleanroommc.modularui.value.sync.PanelSyncManager;
7676
import com.cleanroommc.modularui.widgets.ButtonWidget;
7777
import com.cleanroommc.modularui.widgets.layout.Flow;
78+
import com.cleanroommc.modularui.widgets.textfield.TextFieldWidget;
7879
import org.apache.commons.lang3.ArrayUtils;
7980
import org.jetbrains.annotations.NotNull;
8081
import org.jetbrains.annotations.Nullable;
@@ -487,7 +488,7 @@ public boolean usesMui2() {
487488
}
488489

489490
@Override
490-
public ModularPanel buildUI(SidedPosGuiData guiData, PanelSyncManager guiSyncManager) {
491+
public ModularPanel buildUI(SidedPosGuiData guiData, PanelSyncManager guiSyncManager, UISettings settings) {
491492
Flow row = Flow.row()
492493
.pos(10, 20)
493494
.coverChildren()
@@ -533,13 +534,12 @@ public ModularPanel buildUI(SidedPosGuiData guiData, PanelSyncManager guiSyncMan
533534
slotValue.setIntValue(s);
534535
return true;
535536
}))
536-
.child(new GTTextFieldWidget()
537+
.child(new TextFieldWidget()
537538
.setNumbers(0, Integer.MAX_VALUE)
538539
.value(new StringValue.Dynamic(
539540
() -> String.valueOf(slotValue.getIntValue()),
540541
s -> slotValue.setIntValue(Integer.parseInt(s))))
541542
.size(80, 20)
542-
.keepScrollBarInArea()
543543
.setTextColor(Color.WHITE.main)
544544
.background(GTGuiTextures.DISPLAY))
545545
.child(new ButtonWidget<>()

‎src/main/java/gregtech/common/covers/CoverPump.java‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
import gregtech.client.renderer.texture.Textures;
1515
import gregtech.client.renderer.texture.cube.SimpleSidedCubeRenderer;
1616
import gregtech.common.covers.filter.FluidFilterContainer;
17-
import gregtech.common.mui.widget.GTTextFieldWidget;
1817

1918
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
2019
import net.minecraft.entity.player.EntityPlayer;
@@ -56,6 +55,7 @@
5655
import com.cleanroommc.modularui.widget.ParentWidget;
5756
import com.cleanroommc.modularui.widgets.ButtonWidget;
5857
import com.cleanroommc.modularui.widgets.layout.Flow;
58+
import com.cleanroommc.modularui.widgets.textfield.TextFieldWidget;
5959
import org.jetbrains.annotations.NotNull;
6060
import org.jetbrains.annotations.Nullable;
6161

@@ -229,11 +229,9 @@ protected ParentWidget<?> createUI(GuiData data, PanelSyncManager syncManager) {
229229
return true;
230230
})
231231
.onUpdateListener(w -> w.overlay(createAdjustOverlay(false))))
232-
.child(new GTTextFieldWidget()
232+
.child(new TextFieldWidget()
233233
.left(18).right(18)
234-
// todo remove 'keepScrollBarInArea' when this is fixed in mui2
235-
.keepScrollBarInArea(true)
236-
.setPostFix(" L/s")
234+
// .setPostFix(" L/s")
237235
.setTextColor(Color.WHITE.darker(1))
238236
.setNumbers(1, maxFluidTransferRate)
239237
.value(throughputString)

‎src/main/java/gregtech/common/covers/detector/CoverDetectorBase.java‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import gregtech.api.cover.CoverBase;
44
import gregtech.api.cover.CoverDefinition;
55
import gregtech.api.cover.CoverableView;
6-
import gregtech.common.mui.widget.GTTextFieldWidget;
76

87
import net.minecraft.entity.player.EntityPlayer;
98
import net.minecraft.nbt.NBTTagCompound;
@@ -164,25 +163,25 @@ protected static Flow createMinMaxRow(@NotNull String lang, @NotNull LongSupplie
164163
protected static Flow createMinMaxRow(@NotNull String lang, @NotNull LongSupplier getter,
165164
@Nullable LongConsumer setter,
166165
@Nullable Supplier<String> postFix,
167-
@Nullable Consumer<GTTextFieldWidget> listener) {
166+
@Nullable Consumer<TextFieldWidget> listener) {
168167
return createMinMaxRow(lang, new LongSyncValue(getter, setter), postFix, listener);
169168
}
170169

171170
protected static Flow createMinMaxRow(@NotNull String lang,
172171
@NotNull LongSyncValue syncValue,
173172
@Nullable Supplier<String> postFix,
174-
@Nullable Consumer<GTTextFieldWidget> listener) {
173+
@Nullable Consumer<TextFieldWidget> listener) {
175174
return Flow.row()
176175
.widthRel(1f)
177176
.coverChildrenHeight()
178177
.marginBottom(5)
179178
.child(IKey.lang(lang).asWidget())
180-
.child(new GTTextFieldWidget()
179+
.child(new TextFieldWidget()
181180
.right(0)
182181
.size(90, 18 - 4)
183182
.setTextColor(Color.WHITE.main)
184183
.setPattern(TextFieldWidget.WHOLE_NUMS)
185-
.setPostFix(postFix)
184+
// .setPostFix(postFix)
186185
.onUpdateListener(listener)
187186
.value(syncValue));
188187
}

‎src/main/java/gregtech/common/covers/detector/CoverDetectorEnergyAdvanced.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
import gregtech.api.mui.GTGuis;
77
import gregtech.api.util.RedstoneUtil;
88
import gregtech.client.renderer.texture.Textures;
9-
import gregtech.common.mui.widget.GTTextFieldWidget;
109

1110
import net.minecraft.entity.player.EntityPlayer;
1211
import net.minecraft.entity.player.EntityPlayerMP;
@@ -27,10 +26,12 @@
2726
import com.cleanroommc.modularui.drawable.DynamicDrawable;
2827
import com.cleanroommc.modularui.factory.SidedPosGuiData;
2928
import com.cleanroommc.modularui.screen.ModularPanel;
29+
import com.cleanroommc.modularui.screen.UISettings;
3030
import com.cleanroommc.modularui.value.sync.BooleanSyncValue;
3131
import com.cleanroommc.modularui.value.sync.PanelSyncManager;
3232
import com.cleanroommc.modularui.widgets.ToggleButton;
3333
import com.cleanroommc.modularui.widgets.layout.Flow;
34+
import com.cleanroommc.modularui.widgets.textfield.TextFieldWidget;
3435
import org.jetbrains.annotations.NotNull;
3536

3637
public class CoverDetectorEnergyAdvanced extends CoverDetectorEnergy implements CoverWithUI {
@@ -86,7 +87,7 @@ public void update() {
8687
}
8788

8889
@Override
89-
public ModularPanel buildUI(SidedPosGuiData guiData, PanelSyncManager syncManager) {
90+
public ModularPanel buildUI(SidedPosGuiData guiData, PanelSyncManager syncManager, UISettings settings) {
9091
return GTGuis.defaultPanel(this)
9192
.height(202)
9293
.child(CoverWithUI.createTitleRow(getPickItem()))
@@ -132,7 +133,7 @@ public ModularPanel buildUI(SidedPosGuiData guiData, PanelSyncManager syncManage
132133
.bindPlayerInventory();
133134
}
134135

135-
private void updateWidget(GTTextFieldWidget w) {
136+
private void updateWidget(TextFieldWidget w) {
136137
w.setMaxLength(getLength());
137138
w.setNumbers(0, isUsePercent() ? 100 : Integer.MAX_VALUE);
138139
}

‎src/main/java/gregtech/common/covers/detector/CoverDetectorFluidAdvanced.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
import com.cleanroommc.modularui.drawable.DynamicDrawable;
3232
import com.cleanroommc.modularui.factory.SidedPosGuiData;
3333
import com.cleanroommc.modularui.screen.ModularPanel;
34+
import com.cleanroommc.modularui.screen.UISettings;
3435
import com.cleanroommc.modularui.value.sync.BooleanSyncValue;
3536
import com.cleanroommc.modularui.value.sync.PanelSyncManager;
3637
import com.cleanroommc.modularui.widgets.ToggleButton;
@@ -69,7 +70,7 @@ public void renderCover(@NotNull CCRenderState renderState, @NotNull Matrix4 tra
6970
}
7071

7172
@Override
72-
public ModularPanel buildUI(SidedPosGuiData guiData, PanelSyncManager guiSyncManager) {
73+
public ModularPanel buildUI(SidedPosGuiData guiData, PanelSyncManager guiSyncManager, UISettings settings) {
7374
return GTGuis.defaultPanel(this)
7475
.height(202)
7576
.child(CoverWithUI.createTitleRow(getPickItem()))

‎src/main/java/gregtech/common/covers/detector/CoverDetectorItemAdvanced.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
import com.cleanroommc.modularui.drawable.DynamicDrawable;
3030
import com.cleanroommc.modularui.factory.SidedPosGuiData;
3131
import com.cleanroommc.modularui.screen.ModularPanel;
32+
import com.cleanroommc.modularui.screen.UISettings;
3233
import com.cleanroommc.modularui.value.sync.BooleanSyncValue;
3334
import com.cleanroommc.modularui.value.sync.PanelSyncManager;
3435
import com.cleanroommc.modularui.widgets.ToggleButton;
@@ -59,7 +60,7 @@ public void renderCover(@NotNull CCRenderState renderState, @NotNull Matrix4 tra
5960
}
6061

6162
@Override
62-
public ModularPanel buildUI(SidedPosGuiData guiData, PanelSyncManager guiSyncManager) {
63+
public ModularPanel buildUI(SidedPosGuiData guiData, PanelSyncManager guiSyncManager, UISettings settings) {
6364
return GTGuis.defaultPanel(this)
6465
.height(202)
6566
.child(CoverWithUI.createTitleRow(getPickItem()))

‎src/main/java/gregtech/common/covers/ender/CoverAbstractEnderLink.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -174,8 +174,6 @@ protected Flow createWidgets(GuiData data, PanelSyncManager syncManager) {
174174
.child(createPrivateButton(uuid))
175175
.child(createColorIcon())
176176
.child(new TextFieldWidget()
177-
// todo remove 'keepScrollBarInArea' when this is fixed in mui2
178-
.keepScrollBarInArea(true)
179177
.height(18)
180178
.value(name)
181179
.setTextColor(Color.WHITE.main)

‎src/main/java/gregtech/common/mui/widget/GTTextFieldWidget.java‎

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,11 @@
44

55
import net.minecraft.client.renderer.GlStateManager;
66

7-
import com.cleanroommc.modularui.api.ITheme;
87
import com.cleanroommc.modularui.api.drawable.IKey;
98
import com.cleanroommc.modularui.api.value.IStringValue;
9+
import com.cleanroommc.modularui.screen.RichTooltip;
1010
import com.cleanroommc.modularui.screen.viewport.ModularGuiContext;
11-
import com.cleanroommc.modularui.theme.WidgetTextFieldTheme;
12-
import com.cleanroommc.modularui.theme.WidgetTheme;
11+
import com.cleanroommc.modularui.theme.TextFieldTheme;
1312
import com.cleanroommc.modularui.utils.MathUtils;
1413
import com.cleanroommc.modularui.utils.ParseResult;
1514
import com.cleanroommc.modularui.value.StringValue;
@@ -31,6 +30,7 @@
3130
import java.util.function.Supplier;
3231
import java.util.regex.Pattern;
3332

33+
// todo text is rendering incorrectly, figure out why
3434
public class GTTextFieldWidget extends BaseTextFieldWidget<GTTextFieldWidget> {
3535

3636
private IStringValue<?> stringValue;
@@ -72,11 +72,7 @@ public void onInit() {
7272
}
7373

7474
public int getMarkedColor() {
75-
WidgetTheme theme = getWidgetTheme(getContext().getTheme());
76-
if (theme instanceof WidgetTextFieldTheme textFieldTheme) {
77-
return textFieldTheme.getMarkedColor();
78-
}
79-
return ITheme.getDefault().getTextFieldTheme().getMarkedColor();
75+
return getWidgetTheme(getContext().getTheme()).getTheme().getTextColor();
8076
}
8177

8278
@Override
@@ -105,20 +101,22 @@ public void onUpdate() {
105101
}
106102

107103
@Override
108-
public void drawText(ModularGuiContext context) {
104+
protected void drawText(ModularGuiContext context, TextFieldTheme widgetTheme) {
109105
this.renderer.setSimulate(false);
110-
this.renderer.setPos(getArea().getPadding().left, 0);
106+
this.renderer.setPos(getArea().getPadding().getLeft(), 0);
111107
this.renderer.setScale(this.scale);
112108
this.renderer.setAlignment(this.textAlignment, -1, getArea().height);
113109
this.renderer.draw(this.handler.getText());
114-
getScrollData().setScrollSize(Math.max(0, (int) this.renderer.getLastWidth()));
110+
getScrollData().setScrollSize(Math.max(0, (int) (this.renderer.getLastActualWidth() + 0.5f)));
115111
}
116112

117113
@Override
118114
public void drawForeground(ModularGuiContext context) {
119-
if (hasTooltip() && getScrollData().isScrollBarActive(getScrollArea()) &&
120-
isHoveringFor(getTooltip().getShowUpTimer())) {
121-
getTooltip().draw(getContext());
115+
RichTooltip tooltip = getTooltip();
116+
if (tooltip != null &&
117+
getScrollData().isScrollBarActive(getScrollArea()) &&
118+
isHoveringFor(tooltip.getShowUpTimer())) {
119+
tooltip.draw(getContext());
122120
}
123121
}
124122

@@ -189,7 +187,6 @@ public GTTextFieldWidget setPattern(Pattern pattern) {
189187

190188
public GTTextFieldWidget setTextColor(int textColor) {
191189
this.renderer.setColor(textColor);
192-
this.changedTextColor = true;
193190
return this;
194191
}
195192

0 commit comments

Comments
 (0)