Skip to content

Commit d6ea518

Browse files
committed
add gt logo to steam machines
shrink backgrounds to 16x16 remove logo from backgrounds
1 parent 82d269e commit d6ea518

File tree

10 files changed

+14
-6
lines changed

10 files changed

+14
-6
lines changed

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,13 +150,16 @@ public boolean usesMui2() {
150150
public ModularPanel buildUI(PosGuiData guiData, PanelSyncManager panelSyncManager, UISettings settings) {
151151
RecipeMap<?> map = Objects.requireNonNull(getRecipeMap());
152152

153-
// todo remove logo from background and use a widget
154153
return map.getRecipeMapUI()
155154
.constructPanel(this, workableHandler::getProgressPercent,
156155
importItems, exportItems,
157156
EMPTY, exportFluids,
158157
0, panelSyncManager)
159158
.child(IKey.lang(getMetaFullName()).asWidget().pos(5, 5))
159+
.child(getUITheme().getLogo().asWidget()
160+
.size(16)
161+
.right(7)
162+
.top(46))
160163
.bindPlayerInventory();
161164
}
162165

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

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,8 @@ private static String id(String path) {
6363
"textures/gui/icon/gregtech_logo_blinking_yellow.png", 17, 34, 60);
6464
public static final IDrawable GREGTECH_LOGO_BLINKING_RED = animated(
6565
"textures/gui/icon/gregtech_logo_blinking_red.png", 17, 34, 36);
66+
public static final UITexture GREGTECH_LOGO_BRONZE = fullImage("textures/gui/base/logo_bronze");
67+
public static final UITexture GREGTECH_LOGO_STEEL = fullImage("textures/gui/base/logo_steel");
6668

6769
public static final UITexture INDICATOR_NO_ENERGY = fullImage("textures/gui/base/indicator_no_energy.png");
6870
public static final UITexture INDICATOR_NO_STEAM_BRONZE = fullImage(
@@ -74,15 +76,15 @@ private static String id(String path) {
7476
// BACKGROUNDS
7577
public static final UITexture BACKGROUND = UITexture.builder()
7678
.location(GTValues.MODID, "textures/gui/base/background.png")
77-
.imageSize(176, 166)
79+
.imageSize(16, 16)
7880
.adaptable(3)
7981
.name(IDs.STANDARD_BACKGROUND)
8082
.canApplyTheme()
8183
.build();
8284

8385
public static final UITexture BACKGROUND_POPUP = UITexture.builder()
8486
.location(GTValues.MODID, "textures/gui/base/background_popup.png")
85-
.imageSize(195, 136)
87+
.imageSize(16, 16)
8688
.adaptable(4)
8789
.name(IDs.COVER_BACKGROUND)
8890
.canApplyTheme()
@@ -92,22 +94,23 @@ private static String id(String path) {
9294

9395
public static final UITexture BACKGROUND_BRONZE = UITexture.builder()
9496
.location(GTValues.MODID, "textures/gui/base/background_bronze.png")
95-
.imageSize(176, 166)
97+
.imageSize(16, 16)
9698
.adaptable(3)
9799
.name(IDs.BRONZE_BACKGROUND)
98100
.build();
99101

100102
public static final UITexture BACKGROUND_STEEL = UITexture.builder()
101103
.location(GTValues.MODID, "textures/gui/base/background_steel.png")
102-
.imageSize(176, 166)
104+
.imageSize(16, 16)
103105
.adaptable(3)
104106
.name(IDs.STEEL_BACKGROUND)
105107
.build();
106108

107109
// todo move to textures/gui/base
108110
public static final UITexture BACKGROUND_PRIMITIVE = UITexture.builder()
111+
// main color 826b51
109112
.location(GTValues.MODID, "textures/gui/primitive/primitive_background.png")
110-
.imageSize(176, 166)
113+
.imageSize(16, 16)
111114
.adaptable(3)
112115
.name(IDs.PRIMITIVE_BACKGROUND)
113116
.build();

src/main/java/gregtech/api/mui/GTGuiTheme.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ private static String gregtech(String s) {
7979
.color(Colors.BRONZE)
8080
.simpleToggleButton(IDs.BRONZE_BUTTON, IDs.BRONZE_BUTTON_SELECTED,
8181
ConfigHolder.client.defaultUIColor)
82+
.logo(() -> GTGuiTextures.GREGTECH_LOGO_BRONZE)
8283
.build();
8384

8485
public static final GTGuiTheme STEEL = templateBuilder(Names.STEEL)
@@ -90,6 +91,7 @@ private static String gregtech(String s) {
9091
.button(IDs.STEEL_BUTTON)
9192
.simpleToggleButton(IDs.STEEL_BUTTON, IDs.STEEL_BUTTON_SELECTED,
9293
ConfigHolder.client.defaultUIColor)
94+
.logo(() -> GTGuiTextures.GREGTECH_LOGO_STEEL)
9395
.color(Colors.STEEL)
9496
.build();
9597

-631 Bytes
Loading
-1.59 KB
Loading
-368 Bytes
Loading
-1.59 KB
Loading
163 Bytes
Loading
163 Bytes
Loading
-1.76 KB
Loading

0 commit comments

Comments
 (0)