Fixed font stuff in screens
This commit is contained in:
@@ -4,6 +4,7 @@ import java.util.Map;
|
|||||||
|
|
||||||
import org.saturnclient.saturnclient.config.ConfigManager;
|
import org.saturnclient.saturnclient.config.ConfigManager;
|
||||||
import org.saturnclient.saturnclient.config.Property;
|
import org.saturnclient.saturnclient.config.Property;
|
||||||
|
import org.saturnclient.saturnclient.config.Theme;
|
||||||
import org.saturnclient.ui2.SaturnScreen;
|
import org.saturnclient.ui2.SaturnScreen;
|
||||||
import org.saturnclient.ui2.components.Sidebar;
|
import org.saturnclient.ui2.components.Sidebar;
|
||||||
import org.saturnclient.ui2.components.inputs.FloatInput;
|
import org.saturnclient.ui2.components.inputs.FloatInput;
|
||||||
@@ -60,13 +61,12 @@ public class ConfigEditor extends SaturnScreen {
|
|||||||
if (prop.getType() == Property.PropertyType.NAMESPACE) {
|
if (prop.getType() == Property.PropertyType.NAMESPACE) {
|
||||||
configScroll.draw(
|
configScroll.draw(
|
||||||
new Text(
|
new Text(
|
||||||
propName
|
propName).position(Fonts.centerX(520, propName, Theme.FONT.value), modY + 1)
|
||||||
).position(Fonts.centerX(520, propName, Text.font.value), modY + 1).scale(0.7f));
|
.scale(0.7f));
|
||||||
} else {
|
} else {
|
||||||
configScroll.draw(
|
configScroll.draw(
|
||||||
new Text(
|
new Text(
|
||||||
propName
|
propName).position(modX, modY + 1).scale(0.7f));
|
||||||
).position(modX, modY + 1).scale(0.7f));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
switch (prop.getType()) {
|
switch (prop.getType()) {
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ package org.saturnclient.ui2.screens.store;
|
|||||||
import org.saturnclient.saturnclient.SaturnClient;
|
import org.saturnclient.saturnclient.SaturnClient;
|
||||||
import org.saturnclient.saturnclient.client.ServiceClient;
|
import org.saturnclient.saturnclient.client.ServiceClient;
|
||||||
import org.saturnclient.saturnclient.client.player.SaturnPlayer;
|
import org.saturnclient.saturnclient.client.player.SaturnPlayer;
|
||||||
|
import org.saturnclient.saturnclient.config.Theme;
|
||||||
import org.saturnclient.saturnclient.cosmetics.cloaks.Cloaks;
|
import org.saturnclient.saturnclient.cosmetics.cloaks.Cloaks;
|
||||||
import org.saturnclient.ui2.SaturnScreen;
|
import org.saturnclient.ui2.SaturnScreen;
|
||||||
import org.saturnclient.ui2.Utils;
|
import org.saturnclient.ui2.Utils;
|
||||||
@@ -75,10 +76,10 @@ public class CloakStore extends SaturnScreen {
|
|||||||
|
|
||||||
String t = "100";
|
String t = "100";
|
||||||
|
|
||||||
scroll.draw(new Text(t).position(x + Fonts.centerX(50, t, Text.font.value), y + 113).scale(0.5f));
|
scroll.draw(new Text(t).position(x + Fonts.centerX(50, t, Theme.FONT.value), y + 113).scale(0.5f));
|
||||||
|
|
||||||
scroll.draw(new ImageTexture(Textures.COINS).dimensions(16, 16)
|
scroll.draw(new ImageTexture(Textures.COINS).dimensions(16, 16)
|
||||||
.position(x + Fonts.getWidth(t, Text.font.value) - 1, y + 112).scale(0.5f));
|
.position(x + Fonts.getWidth(t, Theme.FONT.value) - 1, y + 112).scale(0.5f));
|
||||||
|
|
||||||
if (col == 8) {
|
if (col == 8) {
|
||||||
col = 0;
|
col = 0;
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ package org.saturnclient.ui2.screens.store;
|
|||||||
import org.saturnclient.saturnclient.SaturnClient;
|
import org.saturnclient.saturnclient.SaturnClient;
|
||||||
import org.saturnclient.saturnclient.client.ServiceClient;
|
import org.saturnclient.saturnclient.client.ServiceClient;
|
||||||
import org.saturnclient.saturnclient.client.player.SaturnPlayer;
|
import org.saturnclient.saturnclient.client.player.SaturnPlayer;
|
||||||
|
import org.saturnclient.saturnclient.config.Theme;
|
||||||
import org.saturnclient.saturnclient.cosmetics.Hats;
|
import org.saturnclient.saturnclient.cosmetics.Hats;
|
||||||
import org.saturnclient.ui2.SaturnScreen;
|
import org.saturnclient.ui2.SaturnScreen;
|
||||||
import org.saturnclient.ui2.Utils;
|
import org.saturnclient.ui2.Utils;
|
||||||
@@ -75,10 +76,10 @@ public class HatStore extends SaturnScreen {
|
|||||||
|
|
||||||
String t = "50";
|
String t = "50";
|
||||||
|
|
||||||
scroll.draw(new Text(t).position(x + Fonts.centerX(50, t, Text.font.value), y + 53).scale(0.5f));
|
scroll.draw(new Text(t).position(x + Fonts.centerX(50, t, Theme.FONT.value), y + 53).scale(0.5f));
|
||||||
|
|
||||||
scroll.draw(new ImageTexture(Textures.COINS).dimensions(16, 16)
|
scroll.draw(new ImageTexture(Textures.COINS).dimensions(16, 16)
|
||||||
.position(x + Fonts.getWidth(t, Text.font.value) + 4, y + 52).scale(0.5f));
|
.position(x + Fonts.getWidth(t, Theme.FONT.value) + 4, y + 52).scale(0.5f));
|
||||||
|
|
||||||
if (col == 8) {
|
if (col == 8) {
|
||||||
col = 0;
|
col = 0;
|
||||||
|
|||||||
Reference in New Issue
Block a user