saturnclientmc/saturnclient
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases 5 Wiki Activity

Config structure update

Browse Source
This commit is contained in:
selimaj-dev
2025-04-06 00:51:28 +02:00
parent 563a68e9f1
commit a702214e81
29 changed files with 275 additions and 276 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/org/saturnclient/saturnclient/SaturnClient.java
-35
View File
@@ -2,18 +2,12 @@ package org.saturnclient.saturnclient;
import net.fabricmc.api.ModInitializer; import net.fabricmc.api.ModInitializer;
import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientLifecycleEvents; import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientLifecycleEvents;
import net.minecraft.client.font.TextRenderer;
import net.minecraft.util.math.ColorHelper;
import org.saturnclient.saturnclient.auth.SaturnSocket; import org.saturnclient.saturnclient.auth.SaturnSocket;
import org.saturnclient.saturnclient.config.ConfigManager; import org.saturnclient.saturnclient.config.ConfigManager;
import org.saturnclient.saturnclient.config.Property;
import org.saturnclient.saturnclient.cosmetics.Hats; import org.saturnclient.saturnclient.cosmetics.Hats;
import org.saturnclient.saturnclient.cosmetics.cloaks.Cloaks; import org.saturnclient.saturnclient.cosmetics.cloaks.Cloaks;
import org.saturnclient.saturnclient.event.KeyInputHandler; import org.saturnclient.saturnclient.event.KeyInputHandler;
import org.saturnclient.saturnmods.ModManager; import org.saturnclient.saturnmods.ModManager;
import org.saturnclient.ui.SaturnAnimation;
import org.saturnclient.ui.SaturnUi;
import org.saturnclient.ui.animations.FadeIn;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@@ -25,35 +19,6 @@ public class SaturnClient implements ModInitializer {
public static final String MOD_ID = "saturnclient"; public static final String MOD_ID = "saturnclient";
public static final Logger LOGGER = LoggerFactory.getLogger(MOD_ID); public static final Logger LOGGER = LoggerFactory.getLogger(MOD_ID);
public static ConfigManager config = new ConfigManager("Saturn Client");
public static Property<Integer> COLOR = config.property(
"Primary color",
new Property<Integer>(
ColorHelper.getArgb(255, 251, 60, 79),
Property.PropertyType.HEX));
public static Property<Integer> NORMAL = config.property(
"Default color",
new Property<Integer>(
ColorHelper.getArgb(255, 182, 182, 182),
Property.PropertyType.HEX));
public static int WHITE = ColorHelper.getArgb(255, 255, 255, 255);
public static TextRenderer textRenderer = null;
public static int getWhite(float alpha) {
return ((int) (alpha * 255) << 24) | (NORMAL.value & 0x00FFFFFF);
}
public static int getColor(boolean hovering, float alpha) {
return SaturnUi.getAlpha(hovering ? SaturnClient.COLOR.value : NORMAL.value, alpha);
}
public static SaturnAnimation[] getAnimations() {
return new SaturnAnimation[] { new FadeIn(1) };
}
@Override @Override
public void onInitialize() { public void onInitialize() {
LOGGER.info("Initializing " + MOD_ID); LOGGER.info("Initializing " + MOD_ID);
src/main/java/org/saturnclient/saturnclient/SaturnClientConfig.java
+41
View File
@@ -0,0 +1,41 @@
package org.saturnclient.saturnclient;
import org.saturnclient.saturnclient.config.Property;
import org.saturnclient.saturnclient.config.ConfigManager;
import org.saturnclient.ui.SaturnAnimation;
import org.saturnclient.ui.SaturnUi;
import org.saturnclient.ui.animations.FadeIn;
import net.minecraft.client.font.TextRenderer;
import net.minecraft.util.math.ColorHelper;
public class SaturnClientConfig {
public static ConfigManager config = new ConfigManager("Saturn Client");
public static Property<Integer> COLOR = config.property(
"Primary color",
new Property<Integer>(
ColorHelper.getArgb(255, 251, 60, 79),
Property.PropertyType.HEX));
public static Property<Integer> NORMAL = config.property(
"Default color",
new Property<Integer>(
ColorHelper.getArgb(255, 182, 182, 182),
Property.PropertyType.HEX));
public static int WHITE = ColorHelper.getArgb(255, 255, 255, 255);
public static TextRenderer textRenderer = null;
public static int getWhite(float alpha) {
return ((int) (alpha * 255) << 24) | (NORMAL.value & 0x00FFFFFF);
}
public static int getColor(boolean hovering, float alpha) {
return SaturnUi.getAlpha(hovering ? COLOR.value : NORMAL.value, alpha);
}
public static SaturnAnimation[] getAnimations() {
return new SaturnAnimation[] { new FadeIn(1) };
}
}
src/main/java/org/saturnclient/saturnclient/auth/SaturnSocket.java
+1 -3
View File
@@ -4,13 +4,11 @@ import java.io.*;
import java.net.Socket; import java.net.Socket;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientLifecycleEvents; import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientLifecycleEvents;
import net.minecraft.client.MinecraftClient; import net.minecraft.client.MinecraftClient;
import org.saturnclient.saturnclient.SaturnClient;
import org.saturnclient.saturnclient.cosmetics.Hats; import org.saturnclient.saturnclient.cosmetics.Hats;
import org.saturnclient.saturnclient.cosmetics.cloaks.Cloaks; import org.saturnclient.saturnclient.cosmetics.cloaks.Cloaks;
import org.saturnclient.saturnclient.SaturnClient;
public class SaturnSocket { public class SaturnSocket {
src/main/java/org/saturnclient/saturnclient/cosmetics/cloaks/Cloaks.java
+1 -1
View File
@@ -1,7 +1,6 @@
package org.saturnclient.saturnclient.cosmetics.cloaks; package org.saturnclient.saturnclient.cosmetics.cloaks;
import net.minecraft.util.Identifier; import net.minecraft.util.Identifier;
import org.saturnclient.saturnclient.SaturnClient;
import org.saturnclient.saturnclient.auth.SaturnSocket; import org.saturnclient.saturnclient.auth.SaturnSocket;
import org.saturnclient.saturnclient.cosmetics.cloaks.utils.AnimatedCloakData; import org.saturnclient.saturnclient.cosmetics.cloaks.utils.AnimatedCloakData;
import org.saturnclient.saturnclient.cosmetics.cloaks.utils.IdentifierUtils; import org.saturnclient.saturnclient.cosmetics.cloaks.utils.IdentifierUtils;
@@ -13,6 +12,7 @@ import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.util.*; import java.util.*;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
import org.saturnclient.saturnclient.SaturnClient;
/** /**
* Manages the cloak system for Saturn Client. * Manages the cloak system for Saturn Client.
src/main/java/org/saturnclient/saturnclient/menus/CloaksMenu.java
+8 -8
View File
@@ -1,7 +1,7 @@
package org.saturnclient.saturnclient.menus; package org.saturnclient.saturnclient.menus;
import net.minecraft.text.Text; import net.minecraft.text.Text;
import org.saturnclient.saturnclient.SaturnClient; import org.saturnclient.saturnclient.SaturnClientConfig;
import org.saturnclient.saturnclient.auth.SaturnSocket; import org.saturnclient.saturnclient.auth.SaturnSocket;
import org.saturnclient.saturnclient.config.Property; import org.saturnclient.saturnclient.config.Property;
import org.saturnclient.saturnclient.cosmetics.cloaks.Cloaks; import org.saturnclient.saturnclient.cosmetics.cloaks.Cloaks;
@@ -36,7 +36,7 @@ public class CloaksMenu extends SaturnUi {
.setY(rectY) .setY(rectY)
.setWidth(rectWidth) .setWidth(rectWidth)
.setHeight(rectHeight) .setHeight(rectHeight)
.setAnimations(SaturnClient.getAnimations())); .setAnimations(SaturnClientConfig.getAnimations()));
int tabsX = (width - 43) / 2; int tabsX = (width - 43) / 2;
int tabsY = rectY - 17; int tabsY = rectY - 17;
@@ -47,7 +47,7 @@ public class CloaksMenu extends SaturnUi {
.setY(tabsY) .setY(tabsY)
.setWidth(43) .setWidth(43)
.setHeight(15) .setHeight(15)
.setAnimations(SaturnClient.getAnimations())); .setAnimations(SaturnClientConfig.getAnimations()));
draw( draw(
new SaturnInputBox(search, rectX + rectWidth - 72, tabsY, 70).onUpdate(() -> { new SaturnInputBox(search, rectX + rectWidth - 72, tabsY, 70).onUpdate(() -> {
@@ -56,7 +56,7 @@ public class CloaksMenu extends SaturnUi {
}) })
.setHeight(15) .setHeight(15)
.setWidth(72) .setWidth(72)
.setAnimations(SaturnClient.getAnimations())); .setAnimations(SaturnClientConfig.getAnimations()));
int tabSize = 9; int tabSize = 9;
tabsX = (width - tabSize) / 2; tabsX = (width - tabSize) / 2;
@@ -68,7 +68,7 @@ public class CloaksMenu extends SaturnUi {
.setY(tabsY + 4) .setY(tabsY + 4)
.setWidth(tabSize) .setWidth(tabSize)
.setHeight(7) .setHeight(7)
.setAnimations(SaturnClient.getAnimations())); .setAnimations(SaturnClientConfig.getAnimations()));
draw( draw(
new SaturnClickableImage(Textures.CLOAK, () -> { new SaturnClickableImage(Textures.CLOAK, () -> {
@@ -79,7 +79,7 @@ public class CloaksMenu extends SaturnUi {
.setY(tabsY + 3) .setY(tabsY + 3)
.setWidth(tabSize) .setWidth(tabSize)
.setHeight(tabSize) .setHeight(tabSize)
.setAnimations(SaturnClient.getAnimations())); .setAnimations(SaturnClientConfig.getAnimations()));
draw( draw(
new SaturnClickableImage(Textures.SEARCH, () -> { new SaturnClickableImage(Textures.SEARCH, () -> {
@@ -89,7 +89,7 @@ public class CloaksMenu extends SaturnUi {
.setY(tabsY + 3) .setY(tabsY + 3)
.setWidth(tabSize) .setWidth(tabSize)
.setHeight(tabSize) .setHeight(tabSize)
.setAnimations(SaturnClient.getAnimations())); .setAnimations(SaturnClientConfig.getAnimations()));
scroll = new SaturnScroll(); scroll = new SaturnScroll();
@@ -100,7 +100,7 @@ public class CloaksMenu extends SaturnUi {
.setY(rectY + 10) .setY(rectY + 10)
.setWidth(rectWidth - 17) .setWidth(rectWidth - 17)
.setHeight(rectHeight - 10) .setHeight(rectHeight - 10)
.setAnimations(SaturnClient.getAnimations())); .setAnimations(SaturnClientConfig.getAnimations()));
super.init(); super.init();
} }
src/main/java/org/saturnclient/saturnclient/menus/ConfigEditor.java
+4 -4
View File
@@ -2,7 +2,7 @@ package org.saturnclient.saturnclient.menus;
import java.util.Map; import java.util.Map;
import net.minecraft.text.Text; import net.minecraft.text.Text;
import org.saturnclient.saturnclient.SaturnClient; import org.saturnclient.saturnclient.SaturnClientConfig;
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.ui.SaturnUi; import org.saturnclient.ui.SaturnUi;
@@ -40,7 +40,7 @@ public class ConfigEditor extends SaturnUi {
.setY(rectY) .setY(rectY)
.setWidth(rectWidth) .setWidth(rectWidth)
.setHeight(rectHeight) .setHeight(rectHeight)
.setAnimations(SaturnClient.getAnimations())); .setAnimations(SaturnClientConfig.getAnimations()));
draw( draw(
new SaturnImageButton(Textures.CLOSE, 9, 9, () -> { new SaturnImageButton(Textures.CLOSE, 9, 9, () -> {
@@ -50,7 +50,7 @@ public class ConfigEditor extends SaturnUi {
.setY(rectY - 15) .setY(rectY - 15)
.setWidth(13) .setWidth(13)
.setHeight(13) .setHeight(13)
.setAnimations(SaturnClient.getAnimations())); .setAnimations(SaturnClientConfig.getAnimations()));
SaturnScroll configScroll = new SaturnScroll(); SaturnScroll configScroll = new SaturnScroll();
@@ -65,7 +65,7 @@ public class ConfigEditor extends SaturnUi {
.setY(rectY + 10) .setY(rectY + 10)
.setWidth(rectWidth - 17) .setWidth(rectWidth - 17)
.setHeight(rectHeight - 10) .setHeight(rectHeight - 10)
.setAnimations(SaturnClient.getAnimations())); .setAnimations(SaturnClientConfig.getAnimations()));
super.init(); super.init();
} }
src/main/java/org/saturnclient/saturnclient/menus/HatsMenu.java
+7 -7
View File
@@ -1,7 +1,7 @@
package org.saturnclient.saturnclient.menus; package org.saturnclient.saturnclient.menus;
import net.minecraft.text.Text; import net.minecraft.text.Text;
import org.saturnclient.saturnclient.SaturnClient; import org.saturnclient.saturnclient.SaturnClientConfig;
import org.saturnclient.saturnclient.auth.SaturnSocket; import org.saturnclient.saturnclient.auth.SaturnSocket;
import org.saturnclient.saturnclient.cosmetics.Hats; import org.saturnclient.saturnclient.cosmetics.Hats;
import org.saturnclient.ui.SaturnUi; import org.saturnclient.ui.SaturnUi;
@@ -31,7 +31,7 @@ public class HatsMenu extends SaturnUi {
.setY(rectY) .setY(rectY)
.setWidth(rectWidth) .setWidth(rectWidth)
.setHeight(rectHeight) .setHeight(rectHeight)
.setAnimations(SaturnClient.getAnimations())); .setAnimations(SaturnClientConfig.getAnimations()));
int tabsX = (width - 43) / 2; int tabsX = (width - 43) / 2;
int tabsY = rectY - 17; int tabsY = rectY - 17;
@@ -42,7 +42,7 @@ public class HatsMenu extends SaturnUi {
.setY(tabsY) .setY(tabsY)
.setWidth(43) .setWidth(43)
.setHeight(15) .setHeight(15)
.setAnimations(SaturnClient.getAnimations())); .setAnimations(SaturnClientConfig.getAnimations()));
int tabSize = 9; int tabSize = 9;
tabsX = (width - tabSize) / 2; tabsX = (width - tabSize) / 2;
@@ -55,7 +55,7 @@ public class HatsMenu extends SaturnUi {
.setY(tabsY + 4) .setY(tabsY + 4)
.setWidth(tabSize) .setWidth(tabSize)
.setHeight(7) .setHeight(7)
.setAnimations(SaturnClient.getAnimations())); .setAnimations(SaturnClientConfig.getAnimations()));
draw( draw(
new SaturnClickableImage(Textures.CLOAK, () -> { new SaturnClickableImage(Textures.CLOAK, () -> {
@@ -65,7 +65,7 @@ public class HatsMenu extends SaturnUi {
.setY(tabsY + 3) .setY(tabsY + 3)
.setWidth(tabSize) .setWidth(tabSize)
.setHeight(tabSize) .setHeight(tabSize)
.setAnimations(SaturnClient.getAnimations())); .setAnimations(SaturnClientConfig.getAnimations()));
draw( draw(
new SaturnClickableImage(Textures.SEARCH, () -> { new SaturnClickableImage(Textures.SEARCH, () -> {
@@ -75,7 +75,7 @@ public class HatsMenu extends SaturnUi {
.setY(tabsY + 3) .setY(tabsY + 3)
.setWidth(tabSize) .setWidth(tabSize)
.setHeight(tabSize) .setHeight(tabSize)
.setAnimations(SaturnClient.getAnimations())); .setAnimations(SaturnClientConfig.getAnimations()));
int hatSize = 32; int hatSize = 32;
@@ -119,7 +119,7 @@ public class HatsMenu extends SaturnUi {
.setY(rectY + 10) .setY(rectY + 10)
.setWidth(rectWidth - 17) .setWidth(rectWidth - 17)
.setHeight(rectHeight - 10) .setHeight(rectHeight - 10)
.setAnimations(SaturnClient.getAnimations())); .setAnimations(SaturnClientConfig.getAnimations()));
super.init(); super.init();
} }
src/main/java/org/saturnclient/saturnclient/menus/MainMenu.java
+2 -2
View File
@@ -2,7 +2,7 @@ package org.saturnclient.saturnclient.menus;
import net.minecraft.client.MinecraftClient; import net.minecraft.client.MinecraftClient;
import net.minecraft.text.Text; import net.minecraft.text.Text;
import org.saturnclient.saturnclient.SaturnClient; import org.saturnclient.saturnclient.SaturnClientConfig;
import org.saturnclient.ui.SaturnUi; import org.saturnclient.ui.SaturnUi;
import org.saturnclient.ui.Textures; import org.saturnclient.ui.Textures;
import org.saturnclient.ui.animations.FadeIn; import org.saturnclient.ui.animations.FadeIn;
@@ -19,7 +19,7 @@ public class MainMenu extends SaturnUi {
@Override @Override
protected void init() { protected void init() {
SaturnClient.textRenderer = MinecraftClient.getInstance().textRenderer; SaturnClientConfig.textRenderer = MinecraftClient.getInstance().textRenderer;
int buttonWidth = 96; int buttonWidth = 96;
int buttonHeight = 25; int buttonHeight = 25;
src/main/java/org/saturnclient/saturnclient/menus/ModMenu.java
+8 -8
View File
@@ -1,7 +1,7 @@
package org.saturnclient.saturnclient.menus; package org.saturnclient.saturnclient.menus;
import net.minecraft.text.Text; import net.minecraft.text.Text;
import org.saturnclient.saturnclient.SaturnClient; import org.saturnclient.saturnclient.SaturnClientConfig;
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.saturnmods.ModManager; import org.saturnclient.saturnmods.ModManager;
@@ -36,7 +36,7 @@ public class ModMenu extends SaturnUi {
.setY(rectY) .setY(rectY)
.setWidth(rectWidth) .setWidth(rectWidth)
.setHeight(rectHeight) .setHeight(rectHeight)
.setAnimations(SaturnClient.getAnimations())); .setAnimations(SaturnClientConfig.getAnimations()));
int tabsX = (width - 43) / 2; int tabsX = (width - 43) / 2;
int tabsY = rectY - 17; int tabsY = rectY - 17;
@@ -47,7 +47,7 @@ public class ModMenu extends SaturnUi {
.setY(tabsY) .setY(tabsY)
.setWidth(43) .setWidth(43)
.setHeight(15) .setHeight(15)
.setAnimations(SaturnClient.getAnimations())); .setAnimations(SaturnClientConfig.getAnimations()));
draw( draw(
new SaturnInputBox(search, rectX + rectWidth - 72, tabsY, 70).onUpdate(() -> { new SaturnInputBox(search, rectX + rectWidth - 72, tabsY, 70).onUpdate(() -> {
@@ -56,7 +56,7 @@ public class ModMenu extends SaturnUi {
}) })
.setHeight(15) .setHeight(15)
.setWidth(72) .setWidth(72)
.setAnimations(SaturnClient.getAnimations())); .setAnimations(SaturnClientConfig.getAnimations()));
int tabSize = 9; int tabSize = 9;
tabsX = (width - tabSize) / 2; tabsX = (width - tabSize) / 2;
@@ -68,7 +68,7 @@ public class ModMenu extends SaturnUi {
.setY(tabsY + 3) .setY(tabsY + 3)
.setWidth(tabSize) .setWidth(tabSize)
.setHeight(tabSize) .setHeight(tabSize)
.setAnimations(SaturnClient.getAnimations())); .setAnimations(SaturnClientConfig.getAnimations()));
draw( draw(
new SaturnClickableImage(Textures.MODS_TAB, () -> { new SaturnClickableImage(Textures.MODS_TAB, () -> {
@@ -78,7 +78,7 @@ public class ModMenu extends SaturnUi {
.setY(tabsY + 3) .setY(tabsY + 3)
.setWidth(tabSize) .setWidth(tabSize)
.setHeight(tabSize) .setHeight(tabSize)
.setAnimations(SaturnClient.getAnimations())); .setAnimations(SaturnClientConfig.getAnimations()));
draw( draw(
new SaturnClickableImage(Textures.SEARCH, () -> { new SaturnClickableImage(Textures.SEARCH, () -> {
@@ -88,7 +88,7 @@ public class ModMenu extends SaturnUi {
.setY(tabsY + 3) .setY(tabsY + 3)
.setWidth(tabSize) .setWidth(tabSize)
.setHeight(tabSize) .setHeight(tabSize)
.setAnimations(SaturnClient.getAnimations())); .setAnimations(SaturnClientConfig.getAnimations()));
scroll = new SaturnScroll(); scroll = new SaturnScroll();
@@ -99,7 +99,7 @@ public class ModMenu extends SaturnUi {
.setY(rectY + 10) .setY(rectY + 10)
.setWidth(rectWidth - 17) .setWidth(rectWidth - 17)
.setHeight(rectHeight - 20) .setHeight(rectHeight - 20)
.setAnimations(SaturnClient.getAnimations())); .setAnimations(SaturnClientConfig.getAnimations()));
super.init(); super.init();
} }
src/main/java/org/saturnclient/saturnclient/menus/SaturnConfigEditor.java
+6 -6
View File
@@ -1,6 +1,6 @@
package org.saturnclient.saturnclient.menus; package org.saturnclient.saturnclient.menus;
import org.saturnclient.saturnclient.SaturnClient; import org.saturnclient.saturnclient.SaturnClientConfig;
import org.saturnclient.ui.Textures; import org.saturnclient.ui.Textures;
import org.saturnclient.ui.widgets.SaturnClickableImage; import org.saturnclient.ui.widgets.SaturnClickableImage;
import org.saturnclient.ui.widgets.SaturnSprite; import org.saturnclient.ui.widgets.SaturnSprite;
@@ -8,7 +8,7 @@ import org.saturnclient.ui.widgets.SaturnSprite;
public class SaturnConfigEditor extends ConfigEditor { public class SaturnConfigEditor extends ConfigEditor {
public SaturnConfigEditor() { public SaturnConfigEditor() {
super(SaturnClient.config); super(SaturnClientConfig.config);
} }
@Override @Override
@@ -25,7 +25,7 @@ public class SaturnConfigEditor extends ConfigEditor {
.setY(tabsY) .setY(tabsY)
.setWidth(43) .setWidth(43)
.setHeight(15) .setHeight(15)
.setAnimations(SaturnClient.getAnimations())); .setAnimations(SaturnClientConfig.getAnimations()));
int tabSize = 9; int tabSize = 9;
tabsX = (width - tabSize) / 2; tabsX = (width - tabSize) / 2;
@@ -37,7 +37,7 @@ public class SaturnConfigEditor extends ConfigEditor {
.setY(tabsY + 3) .setY(tabsY + 3)
.setWidth(tabSize) .setWidth(tabSize)
.setHeight(tabSize) .setHeight(tabSize)
.setAnimations(SaturnClient.getAnimations())); .setAnimations(SaturnClientConfig.getAnimations()));
draw( draw(
new SaturnClickableImage(Textures.MODS_TAB, () -> { new SaturnClickableImage(Textures.MODS_TAB, () -> {
@@ -47,7 +47,7 @@ public class SaturnConfigEditor extends ConfigEditor {
.setY(tabsY + 3) .setY(tabsY + 3)
.setWidth(tabSize) .setWidth(tabSize)
.setHeight(tabSize) .setHeight(tabSize)
.setAnimations(SaturnClient.getAnimations())); .setAnimations(SaturnClientConfig.getAnimations()));
draw( draw(
new SaturnClickableImage(Textures.SEARCH, () -> { new SaturnClickableImage(Textures.SEARCH, () -> {
@@ -57,7 +57,7 @@ public class SaturnConfigEditor extends ConfigEditor {
.setY(tabsY + 3) .setY(tabsY + 3)
.setWidth(tabSize) .setWidth(tabSize)
.setHeight(tabSize) .setHeight(tabSize)
.setAnimations(SaturnClient.getAnimations())); .setAnimations(SaturnClientConfig.getAnimations()));
super.init(); super.init();
} }
src/main/java/org/saturnclient/saturnmods/ModManager.java
+2 -2
View File
@@ -4,7 +4,7 @@ import net.fabricmc.fabric.api.client.rendering.v1.HudRenderCallback;
import net.minecraft.client.MinecraftClient; import net.minecraft.client.MinecraftClient;
import net.minecraft.client.font.TextRenderer; import net.minecraft.client.font.TextRenderer;
import net.minecraft.client.util.math.MatrixStack; import net.minecraft.client.util.math.MatrixStack;
import org.saturnclient.saturnclient.SaturnClient; import org.saturnclient.saturnclient.SaturnClientConfig;
import org.saturnclient.saturnclient.menus.HudEditor; import org.saturnclient.saturnclient.menus.HudEditor;
import org.saturnclient.saturnmods.mods.*; import org.saturnclient.saturnmods.mods.*;
@@ -25,7 +25,7 @@ public class ModManager {
if (textRenderer != null && if (textRenderer != null &&
!(client.currentScreen instanceof HudEditor)) { !(client.currentScreen instanceof HudEditor)) {
SaturnClient.textRenderer = textRenderer; SaturnClientConfig.textRenderer = textRenderer;
for (SaturnMod m : MODS) { for (SaturnMod m : MODS) {
if (m instanceof HudMod && m.isEnabled()) { if (m instanceof HudMod && m.isEnabled()) {
src/main/java/org/saturnclient/saturnmods/mods/ArmorDisplay.java
+26 -30
View File
@@ -8,7 +8,7 @@ import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.item.Items; import net.minecraft.item.Items;
import net.minecraft.util.Identifier; import net.minecraft.util.Identifier;
import org.saturnclient.saturnclient.SaturnClient; import org.saturnclient.saturnclient.SaturnClientConfig;
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.saturnmods.HudMod; import org.saturnclient.saturnmods.HudMod;
@@ -20,21 +20,18 @@ public class ArmorDisplay implements SaturnMod, HudMod {
private static ConfigManager config = new ConfigManager("armor"); private static ConfigManager config = new ConfigManager("armor");
public static Property<Boolean> enabled = config.property( public static Property<Boolean> enabled = config.property(
"Enabled", "Enabled",
new Property<>(false) new Property<>(false));
);
private static ModDimensions dimensions = new ModDimensions( private static ModDimensions dimensions = new ModDimensions(
config, config,
0, 0,
0, 0,
34, 34,
75 75);
);
public static Property<Integer> fgColor = config.property( public static Property<Integer> fgColor = config.property(
"Foreground color", "Foreground color",
new Property<>(SaturnClient.WHITE, Property.PropertyType.HEX) new Property<>(SaturnClientConfig.WHITE, Property.PropertyType.HEX));
);
private boolean renderItem(DrawContext context, ItemStack item, int y) { private boolean renderItem(DrawContext context, ItemStack item, int y) {
if (item.isEmpty()) { if (item.isEmpty()) {
@@ -53,13 +50,12 @@ public class ArmorDisplay implements SaturnMod, HudMod {
matrices.scale(0.8f, 0.8f, 0f); matrices.scale(0.8f, 0.8f, 0f);
context.drawText( context.drawText(
SaturnClient.textRenderer, SaturnClientConfig.textRenderer,
"" + (item.getMaxDamage() - item.getDamage()), "" + (item.getMaxDamage() - item.getDamage()),
0, 0,
0, 0,
fgColor.value, fgColor.value,
false false);
);
matrices.pop(); matrices.pop();
} }
@@ -71,11 +67,11 @@ public class ArmorDisplay implements SaturnMod, HudMod {
public void render(DrawContext context) { public void render(DrawContext context) {
PlayerEntity player = MinecraftClient.getInstance().player; PlayerEntity player = MinecraftClient.getInstance().player;
ItemStack[] items = { ItemStack[] items = {
player.getEquippedStack(EquipmentSlot.MAINHAND), player.getEquippedStack(EquipmentSlot.MAINHAND),
player.getEquippedStack(EquipmentSlot.FEET), player.getEquippedStack(EquipmentSlot.FEET),
player.getEquippedStack(EquipmentSlot.LEGS), player.getEquippedStack(EquipmentSlot.LEGS),
player.getEquippedStack(EquipmentSlot.CHEST), player.getEquippedStack(EquipmentSlot.CHEST),
player.getEquippedStack(EquipmentSlot.HEAD), player.getEquippedStack(EquipmentSlot.HEAD),
}; };
int y = 60; int y = 60;
@@ -90,11 +86,11 @@ public class ArmorDisplay implements SaturnMod, HudMod {
@Override @Override
public void renderDummy(DrawContext context) { public void renderDummy(DrawContext context) {
ItemStack[] items = { ItemStack[] items = {
new ItemStack(Items.DIAMOND_SWORD), new ItemStack(Items.DIAMOND_SWORD),
new ItemStack(Items.DIAMOND_BOOTS), new ItemStack(Items.DIAMOND_BOOTS),
new ItemStack(Items.DIAMOND_LEGGINGS), new ItemStack(Items.DIAMOND_LEGGINGS),
new ItemStack(Items.DIAMOND_CHESTPLATE), new ItemStack(Items.DIAMOND_CHESTPLATE),
new ItemStack(Items.DIAMOND_HELMET), new ItemStack(Items.DIAMOND_HELMET),
}; };
int y = 60; int y = 60;
src/main/java/org/saturnclient/saturnmods/mods/Coordinates.java
+7 -7
View File
@@ -4,7 +4,7 @@ import net.minecraft.client.MinecraftClient;
import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.DrawContext;
import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.util.Identifier; import net.minecraft.util.Identifier;
import org.saturnclient.saturnclient.SaturnClient; import org.saturnclient.saturnclient.SaturnClientConfig;
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.saturnmods.HudMod; import org.saturnclient.saturnmods.HudMod;
@@ -22,12 +22,12 @@ public class Coordinates implements SaturnMod, HudMod {
public static Property<Integer> fgColor = config.property( public static Property<Integer> fgColor = config.property(
"Foreground color", "Foreground color",
new Property<>(SaturnClient.WHITE, Property.PropertyType.HEX)); new Property<>(SaturnClientConfig.WHITE, Property.PropertyType.HEX));
public Coordinates() { public Coordinates() {
// Ensure fgColor has a value // Ensure fgColor has a value
if (fgColor.value == null) { if (fgColor.value == null) {
fgColor.value = SaturnClient.WHITE; fgColor.value = SaturnClientConfig.WHITE;
} }
} }
@@ -37,16 +37,16 @@ public class Coordinates implements SaturnMod, HudMod {
int playerZ = 83; int playerZ = 83;
context.drawText( context.drawText(
SaturnClient.textRenderer, SaturnClientConfig.textRenderer,
playerX + " " + playerY + " " + playerZ, playerX + " " + playerY + " " + playerZ,
0, 0,
0, 0,
fgColor.value, fgColor.value,
false); false);
dimensions.width = SaturnClient.textRenderer.getWidth( dimensions.width = SaturnClientConfig.textRenderer.getWidth(
playerX + " " + playerY + " " + playerZ); playerX + " " + playerY + " " + playerZ);
dimensions.height = SaturnClient.textRenderer.fontHeight; dimensions.height = SaturnClientConfig.textRenderer.fontHeight;
} }
public void render(DrawContext context) { public void render(DrawContext context) {
@@ -56,7 +56,7 @@ public class Coordinates implements SaturnMod, HudMod {
int playerZ = (int) player.getZ(); int playerZ = (int) player.getZ();
context.drawText( context.drawText(
SaturnClient.textRenderer, SaturnClientConfig.textRenderer,
playerX + " " + playerY + " " + playerZ, playerX + " " + playerY + " " + playerZ,
0, 0,
0, 0,
src/main/java/org/saturnclient/saturnmods/mods/FpsDisplay.java
+22 -27
View File
@@ -3,7 +3,7 @@ package org.saturnclient.saturnmods.mods;
import net.minecraft.client.MinecraftClient; import net.minecraft.client.MinecraftClient;
import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.DrawContext;
import net.minecraft.util.Identifier; import net.minecraft.util.Identifier;
import org.saturnclient.saturnclient.SaturnClient; import org.saturnclient.saturnclient.SaturnClientConfig;
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.saturnmods.HudMod; import org.saturnclient.saturnmods.HudMod;
@@ -16,22 +16,19 @@ public class FpsDisplay implements SaturnMod, HudMod {
public static ConfigManager config = new ConfigManager("Fps Display"); public static ConfigManager config = new ConfigManager("Fps Display");
public static Property<Boolean> enabled = config.property( public static Property<Boolean> enabled = config.property(
"Enabled", "Enabled",
new Property<>(false) new Property<>(false));
);
public static ModDimensions dimensions = new ModDimensions( public static ModDimensions dimensions = new ModDimensions(
config, config,
0, 0,
0, 0,
40, 40,
8 8);
);
public static Property<Integer> fgColor = config.property( public static Property<Integer> fgColor = config.property(
"Foreground color", "Foreground color",
new Property<>(SaturnClient.WHITE, Property.PropertyType.HEX) new Property<>(SaturnClientConfig.WHITE, Property.PropertyType.HEX));
);
@Override @Override
public ModDimensions getDimensions() { public ModDimensions getDimensions() {
@@ -43,13 +40,12 @@ public class FpsDisplay implements SaturnMod, HudMod {
int fps = 128; int fps = 128;
context.drawText( context.drawText(
SaturnClient.textRenderer, SaturnClientConfig.textRenderer,
String.valueOf(fps) + " FPS", String.valueOf(fps) + " FPS",
0, 0,
0, 0,
fgColor.value, fgColor.value,
false false);
);
} }
@Override @Override
@@ -57,13 +53,12 @@ public class FpsDisplay implements SaturnMod, HudMod {
int fps = MinecraftClient.getInstance().getCurrentFps(); int fps = MinecraftClient.getInstance().getCurrentFps();
context.drawText( context.drawText(
SaturnClient.textRenderer, SaturnClientConfig.textRenderer,
String.valueOf(fps) + " FPS", String.valueOf(fps) + " FPS",
0, 0,
0, 0,
fgColor.value, fgColor.value,
false false);
);
} }
@Override @Override
src/main/java/org/saturnclient/saturnmods/mods/Particles.java
+3 -3
View File
@@ -1,7 +1,7 @@
package org.saturnclient.saturnmods.mods; package org.saturnclient.saturnmods.mods;
import net.minecraft.util.Identifier; import net.minecraft.util.Identifier;
import org.saturnclient.saturnclient.SaturnClient; import org.saturnclient.saturnclient.SaturnClientConfig;
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.saturnmods.SaturnMod; import org.saturnclient.saturnmods.SaturnMod;
@@ -22,11 +22,11 @@ public class Particles implements SaturnMod {
public static Property<Integer> totem_1 = totem.property( public static Property<Integer> totem_1 = totem.property(
"Totem particle color 1", "Totem particle color 1",
new Property<>(SaturnClient.COLOR.value, Property.PropertyType.HEX)); new Property<>(SaturnClientConfig.COLOR.value, Property.PropertyType.HEX));
public static Property<Integer> totem_2 = totem.property( public static Property<Integer> totem_2 = totem.property(
"Totem particle color 2", "Totem particle color 2",
new Property<>(SaturnClient.COLOR.value, Property.PropertyType.HEX)); new Property<>(SaturnClientConfig.COLOR.value, Property.PropertyType.HEX));
@Override @Override
public boolean isEnabled() { public boolean isEnabled() {
src/main/java/org/saturnclient/ui/SaturnUi.java
+2 -2
View File
@@ -254,8 +254,8 @@ public class SaturnUi extends Screen {
public void saturnTick() { public void saturnTick() {
synchronized (scheduler) { synchronized (scheduler) {
if (f < 20.0f) { if (f < 15.0f) {
f += 1.0f; f += 0.25f;
} }
} }
synchronized (widgets) { synchronized (widgets) {
src/main/java/org/saturnclient/ui/components/SaturnFloat.java
+6 -5
View File
@@ -4,7 +4,8 @@ import net.minecraft.client.MinecraftClient;
import net.minecraft.client.font.TextRenderer; import net.minecraft.client.font.TextRenderer;
import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.DrawContext;
import org.lwjgl.glfw.GLFW; import org.lwjgl.glfw.GLFW;
import org.saturnclient.saturnclient.SaturnClient; import org.saturnclient.saturnclient.SaturnClientConfig;
import org.saturnclient.saturnclient.config.ConfigManager;
import org.saturnclient.saturnclient.config.Property; import org.saturnclient.saturnclient.config.Property;
import org.saturnclient.ui.SaturnUi; import org.saturnclient.ui.SaturnUi;
import org.saturnclient.ui.SaturnWidget; import org.saturnclient.ui.SaturnWidget;
@@ -59,7 +60,7 @@ public class SaturnFloat extends SaturnWidget {
text.substring(cursorPosition); text.substring(cursorPosition);
prop.value = text.isEmpty() ? 0 : Float.parseFloat(text); prop.value = text.isEmpty() ? 0 : Float.parseFloat(text);
org.saturnclient.saturnclient.config.ConfigManager.save(); ConfigManager.save();
cursorPosition++; cursorPosition++;
} }
@@ -78,7 +79,7 @@ public class SaturnFloat extends SaturnWidget {
cursorPosition = 1; cursorPosition = 1;
} }
prop.value = Float.parseFloat(text); prop.value = Float.parseFloat(text);
org.saturnclient.saturnclient.config.ConfigManager.save(); ConfigManager.save();
} }
} else if (keyCode == GLFW.GLFW_KEY_LEFT) { } else if (keyCode == GLFW.GLFW_KEY_LEFT) {
if (cursorPosition > 0) { if (cursorPosition > 0) {
@@ -110,8 +111,8 @@ public class SaturnFloat extends SaturnWidget {
this.width, this.width,
this.height, this.height,
focused focused
? SaturnClient.COLOR.value ? SaturnClientConfig.COLOR.value
: SaturnClient.getWhite(this.alpha)); : SaturnClientConfig.getWhite(this.alpha));
int scrollOffset = getScrollOffset(); int scrollOffset = getScrollOffset();
String visibleText = getVisibleText(scrollOffset); String visibleText = getVisibleText(scrollOffset);
src/main/java/org/saturnclient/ui/components/SaturnHex.java
+6 -5
View File
@@ -4,7 +4,8 @@ import net.minecraft.client.MinecraftClient;
import net.minecraft.client.font.TextRenderer; import net.minecraft.client.font.TextRenderer;
import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.DrawContext;
import org.lwjgl.glfw.GLFW; import org.lwjgl.glfw.GLFW;
import org.saturnclient.saturnclient.SaturnClient; import org.saturnclient.saturnclient.SaturnClientConfig;
import org.saturnclient.saturnclient.config.ConfigManager;
import org.saturnclient.saturnclient.config.Property; import org.saturnclient.saturnclient.config.Property;
import org.saturnclient.ui.SaturnUi; import org.saturnclient.ui.SaturnUi;
import org.saturnclient.ui.SaturnWidget; import org.saturnclient.ui.SaturnWidget;
@@ -42,7 +43,7 @@ public class SaturnHex extends SaturnWidget {
if (text.length() == 7) { // Only update value when full hex is entered if (text.length() == 7) { // Only update value when full hex is entered
prop.value = hexToInt(text); prop.value = hexToInt(text);
org.saturnclient.saturnclient.config.ConfigManager.save(); ConfigManager.save();
} }
} }
} }
@@ -66,7 +67,7 @@ public class SaturnHex extends SaturnWidget {
if (text.length() == 7) { // Update only when valid hex if (text.length() == 7) { // Update only when valid hex
prop.value = hexToInt(text); prop.value = hexToInt(text);
org.saturnclient.saturnclient.config.ConfigManager.save(); ConfigManager.save();
} }
} }
@@ -89,8 +90,8 @@ public class SaturnHex extends SaturnWidget {
this.width, this.width,
this.height, this.height,
focused focused
? SaturnClient.COLOR.value ? SaturnClientConfig.COLOR.value
: SaturnClient.getWhite(this.alpha)); : SaturnClientConfig.getWhite(this.alpha));
int textColor = focused ? 0xFFFFFF : 0xAAAAAA; int textColor = focused ? 0xFFFFFF : 0xAAAAAA;
context.drawText( context.drawText(
src/main/java/org/saturnclient/ui/components/SaturnInteger.java
+6 -5
View File
@@ -4,7 +4,8 @@ import net.minecraft.client.MinecraftClient;
import net.minecraft.client.font.TextRenderer; import net.minecraft.client.font.TextRenderer;
import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.DrawContext;
import org.lwjgl.glfw.GLFW; import org.lwjgl.glfw.GLFW;
import org.saturnclient.saturnclient.SaturnClient; import org.saturnclient.saturnclient.SaturnClientConfig;
import org.saturnclient.saturnclient.config.ConfigManager;
import org.saturnclient.saturnclient.config.Property; import org.saturnclient.saturnclient.config.Property;
import org.saturnclient.ui.SaturnUi; import org.saturnclient.ui.SaturnUi;
import org.saturnclient.ui.SaturnWidget; import org.saturnclient.ui.SaturnWidget;
@@ -59,7 +60,7 @@ public class SaturnInteger extends SaturnWidget {
text.substring(cursorPosition); text.substring(cursorPosition);
prop.value = text.isEmpty() ? 0 : Integer.parseInt(text); prop.value = text.isEmpty() ? 0 : Integer.parseInt(text);
org.saturnclient.saturnclient.config.ConfigManager.save(); ConfigManager.save();
cursorPosition++; cursorPosition++;
} }
@@ -78,7 +79,7 @@ public class SaturnInteger extends SaturnWidget {
cursorPosition = 1; cursorPosition = 1;
} }
prop.value = Integer.parseInt(text); prop.value = Integer.parseInt(text);
org.saturnclient.saturnclient.config.ConfigManager.save(); ConfigManager.save();
} }
} else if (keyCode == GLFW.GLFW_KEY_LEFT) { } else if (keyCode == GLFW.GLFW_KEY_LEFT) {
if (cursorPosition > 0) { if (cursorPosition > 0) {
@@ -110,8 +111,8 @@ public class SaturnInteger extends SaturnWidget {
this.width, this.width,
this.height, this.height,
focused focused
? SaturnClient.COLOR.value ? SaturnClientConfig.COLOR.value
: SaturnClient.getWhite(this.alpha)); : SaturnClientConfig.getWhite(this.alpha));
int scrollOffset = getScrollOffset(); int scrollOffset = getScrollOffset();
String visibleText = getVisibleText(scrollOffset); String visibleText = getVisibleText(scrollOffset);
src/main/java/org/saturnclient/ui/components/SaturnModComp.java
+82 -82
View File
@@ -2,7 +2,7 @@ package org.saturnclient.ui.components;
import net.minecraft.client.MinecraftClient; import net.minecraft.client.MinecraftClient;
import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.DrawContext;
import org.saturnclient.saturnclient.SaturnClient; import org.saturnclient.saturnclient.SaturnClientConfig;
import org.saturnclient.saturnclient.menus.ConfigEditor; import org.saturnclient.saturnclient.menus.ConfigEditor;
import org.saturnclient.saturnmods.SaturnMod; import org.saturnclient.saturnmods.SaturnMod;
import org.saturnclient.ui.SaturnUi; import org.saturnclient.ui.SaturnUi;
@@ -11,95 +11,95 @@ import org.saturnclient.ui.Textures;
public class SaturnModComp extends SaturnWidget { public class SaturnModComp extends SaturnWidget {
SaturnMod mod; SaturnMod mod;
public SaturnModComp(SaturnMod mod) { public SaturnModComp(SaturnMod mod) {
this.mod = mod; this.mod = mod;
}
@Override
public void render(
DrawContext context,
boolean hovering,
int mouseX,
int mouseY) {
boolean enabled = mod.isEnabled();
boolean hovering_settings = settingsHovering(mouseX, mouseY);
int color = !hovering_settings && (enabled || hovering)
? SaturnClient.COLOR.value
: SaturnClient.getWhite(alpha);
int size = 12;
if (enabled) {
SaturnUi.drawHighResTexture(
context,
Textures.MOD_BG,
0,
0,
86,
20,
SaturnClient.COLOR.value);
} }
SaturnUi.drawHighResTexture( @Override
context, public void render(
Textures.MOD, DrawContext context,
0, boolean hovering,
0, int mouseX,
86, int mouseY) {
20, boolean enabled = mod.isEnabled();
color);
SaturnUi.drawHighResTexture( boolean hovering_settings = settingsHovering(mouseX, mouseY);
context,
mod.getIconTexture(),
4,
4,
size,
size,
color);
context.drawText( int color = !hovering_settings && (enabled || hovering)
SaturnClient.textRenderer, ? SaturnClientConfig.COLOR.value
SaturnUi.text(mod.getName()), : SaturnClientConfig.getWhite(alpha);
20,
(21 - SaturnClient.textRenderer.fontHeight) / 2,
color,
false);
SaturnUi.drawHighResTexture( int size = 12;
context,
Textures.SETTINGS,
77,
11,
7,
7,
hovering_settings
? SaturnClient.COLOR.value
: SaturnClient.getWhite(alpha));
}
@Override if (enabled) {
public void click(int mouseX, int mouseY) { SaturnUi.drawHighResTexture(
if (settingsHovering(mouseX, mouseY)) { context,
MinecraftClient.getInstance() Textures.MOD_BG,
.setScreen(new ConfigEditor(mod.getConfig())); 0,
} else { 0,
mod.setEnabled(!mod.isEnabled()); 86,
20,
SaturnClientConfig.COLOR.value);
}
SaturnUi.drawHighResTexture(
context,
Textures.MOD,
0,
0,
86,
20,
color);
SaturnUi.drawHighResTexture(
context,
mod.getIconTexture(),
4,
4,
size,
size,
color);
context.drawText(
SaturnClientConfig.textRenderer,
SaturnUi.text(mod.getName()),
20,
(21 - SaturnClientConfig.textRenderer.fontHeight) / 2,
color,
false);
SaturnUi.drawHighResTexture(
context,
Textures.SETTINGS,
77,
11,
7,
7,
hovering_settings
? SaturnClientConfig.COLOR.value
: SaturnClientConfig.getWhite(alpha));
} }
}
public boolean settingsHovering(int mouseX, int mouseY) { @Override
int sX = 77; public void click(int mouseX, int mouseY) {
int sY = 11; if (settingsHovering(mouseX, mouseY)) {
int size = 7; MinecraftClient.getInstance()
.setScreen(new ConfigEditor(mod.getConfig()));
} else {
mod.setEnabled(!mod.isEnabled());
}
}
return (sX < mouseX && public boolean settingsHovering(int mouseX, int mouseY) {
sX + size > mouseX && int sX = 77;
sY < mouseY && int sY = 11;
sY + size > mouseY); int size = 7;
}
return (sX < mouseX &&
sX + size > mouseX &&
sY < mouseY &&
sY + size > mouseY);
}
} }
src/main/java/org/saturnclient/ui/components/SaturnString.java
+3 -3
View File
@@ -4,7 +4,7 @@ import net.minecraft.client.MinecraftClient;
import net.minecraft.client.font.TextRenderer; import net.minecraft.client.font.TextRenderer;
import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.DrawContext;
import org.lwjgl.glfw.GLFW; import org.lwjgl.glfw.GLFW;
import org.saturnclient.saturnclient.SaturnClient; import org.saturnclient.saturnclient.SaturnClientConfig;
import org.saturnclient.saturnclient.config.Property; import org.saturnclient.saturnclient.config.Property;
import org.saturnclient.ui.SaturnUi; import org.saturnclient.ui.SaturnUi;
import org.saturnclient.ui.SaturnWidget; import org.saturnclient.ui.SaturnWidget;
@@ -88,8 +88,8 @@ public class SaturnString extends SaturnWidget {
this.width, this.width,
this.height, this.height,
focused focused
? SaturnClient.COLOR.value ? SaturnClientConfig.COLOR.value
: SaturnClient.getWhite(this.alpha)); : SaturnClientConfig.getWhite(this.alpha));
int scrollOffset = getScrollOffset(); int scrollOffset = getScrollOffset();
String visibleText = getVisibleText(scrollOffset); String visibleText = getVisibleText(scrollOffset);
src/main/java/org/saturnclient/ui/components/SaturnToggle.java
+5 -4
View File
@@ -2,7 +2,8 @@ package org.saturnclient.ui.components;
import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.DrawContext;
import net.minecraft.client.render.RenderLayer; import net.minecraft.client.render.RenderLayer;
import org.saturnclient.saturnclient.SaturnClient; import org.saturnclient.saturnclient.SaturnClientConfig;
import org.saturnclient.saturnclient.config.ConfigManager;
import org.saturnclient.saturnclient.config.Property; import org.saturnclient.saturnclient.config.Property;
import org.saturnclient.ui.SaturnWidget; import org.saturnclient.ui.SaturnWidget;
import org.saturnclient.ui.Textures; import org.saturnclient.ui.Textures;
@@ -24,8 +25,8 @@ public class SaturnToggle extends SaturnWidget {
int mouseX, int mouseX,
int mouseY) { int mouseY) {
int color = prop.value int color = prop.value
? SaturnClient.COLOR.value ? SaturnClientConfig.COLOR.value
: SaturnClient.getWhite(alpha); : SaturnClientConfig.getWhite(alpha);
int w = 13; int w = 13;
int h = 6; int h = 6;
int s = 8; int s = 8;
@@ -60,6 +61,6 @@ public class SaturnToggle extends SaturnWidget {
@Override @Override
public void click(int mouseX, int mouseY) { public void click(int mouseX, int mouseY) {
prop.value = !prop.value; prop.value = !prop.value;
org.saturnclient.saturnclient.config.ConfigManager.save(); ConfigManager.save();
} }
} }
src/main/java/org/saturnclient/ui/widgets/SaturnButton.java
+4 -4
View File
@@ -5,7 +5,7 @@ import java.util.function.Consumer;
import net.minecraft.client.MinecraftClient; import net.minecraft.client.MinecraftClient;
import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.DrawContext;
import org.saturnclient.saturnclient.SaturnClient; import org.saturnclient.saturnclient.SaturnClientConfig;
import org.saturnclient.ui.SaturnUi; import org.saturnclient.ui.SaturnUi;
import org.saturnclient.ui.SaturnWidget; import org.saturnclient.ui.SaturnWidget;
import org.saturnclient.ui.Textures; import org.saturnclient.ui.Textures;
@@ -47,7 +47,7 @@ public class SaturnButton extends SaturnWidget {
0, 0,
this.width, this.width,
this.height, this.height,
SaturnClient.getColor(hovering, alpha)); SaturnClientConfig.getColor(hovering, alpha));
if (hovering) { if (hovering) {
if (hoverAlpha == 0.0f) if (hoverAlpha == 0.0f)
@@ -60,7 +60,7 @@ public class SaturnButton extends SaturnWidget {
0, 0,
this.width, this.width,
this.height, this.height,
SaturnClient.getColor(hovering, alpha)); SaturnClientConfig.getColor(hovering, alpha));
} else { } else {
hoverAlpha = 0.0f; hoverAlpha = 0.0f;
} }
@@ -77,7 +77,7 @@ public class SaturnButton extends SaturnWidget {
2), 2),
((this.height - minecraftClient.textRenderer.fontHeight + 1) / ((this.height - minecraftClient.textRenderer.fontHeight + 1) /
2), 2),
SaturnClient.getColor(hovering, alpha), SaturnClientConfig.getColor(hovering, alpha),
false); false);
} }
} }
src/main/java/org/saturnclient/ui/widgets/SaturnClickableImage.java
+2 -2
View File
@@ -3,7 +3,7 @@ package org.saturnclient.ui.widgets;
import java.util.function.Consumer; import java.util.function.Consumer;
import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.DrawContext;
import net.minecraft.util.Identifier; import net.minecraft.util.Identifier;
import org.saturnclient.saturnclient.SaturnClient; import org.saturnclient.saturnclient.SaturnClientConfig;
import org.saturnclient.ui.SaturnUi; import org.saturnclient.ui.SaturnUi;
import org.saturnclient.ui.SaturnWidget; import org.saturnclient.ui.SaturnWidget;
@@ -45,7 +45,7 @@ public class SaturnClickableImage extends SaturnWidget {
0, 0,
width, width,
height, height,
SaturnClient.getColor(hovering || selected, alpha)); SaturnClientConfig.getColor(hovering || selected, alpha));
} }
@Override @Override
src/main/java/org/saturnclient/ui/widgets/SaturnClickableSprite.java
+2 -2
View File
@@ -3,7 +3,7 @@ package org.saturnclient.ui.widgets;
import java.util.function.Consumer; import java.util.function.Consumer;
import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.DrawContext;
import net.minecraft.util.Identifier; import net.minecraft.util.Identifier;
import org.saturnclient.saturnclient.SaturnClient; import org.saturnclient.saturnclient.SaturnClientConfig;
import org.saturnclient.ui.SaturnUi; import org.saturnclient.ui.SaturnUi;
import org.saturnclient.ui.SaturnWidget; import org.saturnclient.ui.SaturnWidget;
@@ -39,7 +39,7 @@ public class SaturnClickableSprite extends SaturnWidget {
0, 0,
this.width, this.width,
this.height, this.height,
SaturnClient.getColor(hovering, alpha)); SaturnClientConfig.getColor(hovering, alpha));
} }
@Override @Override
src/main/java/org/saturnclient/ui/widgets/SaturnImageButton.java
+4 -4
View File
@@ -4,7 +4,7 @@ import java.util.function.Consumer;
import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.DrawContext;
import net.minecraft.client.render.RenderLayer; import net.minecraft.client.render.RenderLayer;
import net.minecraft.util.Identifier; import net.minecraft.util.Identifier;
import org.saturnclient.saturnclient.SaturnClient; import org.saturnclient.saturnclient.SaturnClientConfig;
import org.saturnclient.ui.SaturnUi; import org.saturnclient.ui.SaturnUi;
import org.saturnclient.ui.SaturnWidget; import org.saturnclient.ui.SaturnWidget;
import org.saturnclient.ui.Textures; import org.saturnclient.ui.Textures;
@@ -59,7 +59,7 @@ public class SaturnImageButton extends SaturnWidget {
0, 0,
this.width, this.width,
this.height, this.height,
SaturnClient.getColor(hovering, alpha)); SaturnClientConfig.getColor(hovering, alpha));
if (hovering) { if (hovering) {
SaturnUi.drawHighResGuiTexture( SaturnUi.drawHighResGuiTexture(
@@ -69,7 +69,7 @@ public class SaturnImageButton extends SaturnWidget {
0, 0,
this.width, this.width,
this.height, this.height,
SaturnClient.getColor(hovering, alpha)); SaturnClientConfig.getColor(hovering, alpha));
} }
context.drawTexture( context.drawTexture(
@@ -83,7 +83,7 @@ public class SaturnImageButton extends SaturnWidget {
imageHeight, imageHeight,
imageWidth, imageWidth,
imageHeight, imageHeight,
SaturnClient.getColor(hovering, alpha)); SaturnClientConfig.getColor(hovering, alpha));
} }
@Override @Override
src/main/java/org/saturnclient/ui/widgets/SaturnInputBox.java
+9 -9
View File
@@ -7,7 +7,7 @@ import net.minecraft.client.gui.DrawContext;
import net.minecraft.client.util.math.MatrixStack; import net.minecraft.client.util.math.MatrixStack;
import org.lwjgl.glfw.GLFW; import org.lwjgl.glfw.GLFW;
import org.saturnclient.saturnclient.SaturnClient; import org.saturnclient.saturnclient.SaturnClientConfig;
import org.saturnclient.saturnclient.config.Property; import org.saturnclient.saturnclient.config.Property;
import org.saturnclient.ui.SaturnUi; import org.saturnclient.ui.SaturnUi;
import org.saturnclient.ui.Textures; import org.saturnclient.ui.Textures;
@@ -97,8 +97,8 @@ public class SaturnInputBox extends SaturnWidget {
this.width, this.width,
this.height, this.height,
focused focused
? SaturnClient.COLOR.value ? SaturnClientConfig.COLOR.value
: SaturnClient.getWhite(this.alpha)); : SaturnClientConfig.getWhite(this.alpha));
if (hovering || focused) { if (hovering || focused) {
SaturnUi.drawHighResGuiTexture( SaturnUi.drawHighResGuiTexture(
@@ -109,8 +109,8 @@ public class SaturnInputBox extends SaturnWidget {
this.width, this.width,
this.height, this.height,
hovering hovering
? SaturnClient.COLOR.value ? SaturnClientConfig.COLOR.value
: SaturnClient.getWhite(this.alpha)); : SaturnClientConfig.getWhite(this.alpha));
} }
MatrixStack matrices = context.getMatrices(); MatrixStack matrices = context.getMatrices();
@@ -125,8 +125,8 @@ public class SaturnInputBox extends SaturnWidget {
9, 9,
9, 9,
hovering hovering
? SaturnClient.COLOR.value ? SaturnClientConfig.COLOR.value
: SaturnClient.getWhite(this.alpha)); : SaturnClientConfig.getWhite(this.alpha));
matrices.scale(0.9f, 0.9f, 1.0f); matrices.scale(0.9f, 0.9f, 1.0f);
@@ -136,8 +136,8 @@ public class SaturnInputBox extends SaturnWidget {
14, 14,
textRenderer.fontHeight / 2 + 1, textRenderer.fontHeight / 2 + 1,
hovering hovering
? SaturnClient.COLOR.value ? SaturnClientConfig.COLOR.value
: SaturnClient.getWhite(this.alpha), : SaturnClientConfig.getWhite(this.alpha),
false); false);
} }
src/main/java/org/saturnclient/ui/widgets/SaturnText.java
+5 -5
View File
@@ -1,7 +1,7 @@
package org.saturnclient.ui.widgets; package org.saturnclient.ui.widgets;
import net.minecraft.client.gui.DrawContext; import net.minecraft.client.gui.DrawContext;
import org.saturnclient.saturnclient.SaturnClient; import org.saturnclient.saturnclient.SaturnClientConfig;
import org.saturnclient.ui.SaturnUi; import org.saturnclient.ui.SaturnUi;
import org.saturnclient.ui.SaturnWidget; import org.saturnclient.ui.SaturnWidget;
@@ -11,8 +11,8 @@ public class SaturnText extends SaturnWidget {
public SaturnText(String text) { public SaturnText(String text) {
this.text = text; this.text = text;
this.width = SaturnClient.textRenderer.getWidth(SaturnUi.text(text)); this.width = SaturnClientConfig.textRenderer.getWidth(SaturnUi.text(text));
this.height = SaturnClient.textRenderer.fontHeight; this.height = SaturnClientConfig.textRenderer.fontHeight;
} }
public SaturnText(String text, int color) { public SaturnText(String text, int color) {
@@ -26,11 +26,11 @@ public class SaturnText extends SaturnWidget {
int mouseX, int mouseX,
int mouseY) { int mouseY) {
context.drawText( context.drawText(
SaturnClient.textRenderer, SaturnClientConfig.textRenderer,
SaturnUi.text(text), SaturnUi.text(text),
0, 0,
0, 0,
SaturnClient.getColor(hovering, alpha), SaturnClientConfig.getColor(hovering, alpha),
false); false);
} }
} }