From 7683e7b91e12f8cadade33ccc3d2149e4474fbf3 Mon Sep 17 00:00:00 2001 From: Klesti Selimaj Date: Sat, 21 Feb 2026 20:18:52 +0100 Subject: [PATCH] Removed NamedProperty --- .../saturnclient/modules/ModDimensions.java | 20 +++++++++---------- .../java/org/saturnclient/modules/Module.java | 15 ++++++++------ .../saturnclient/config/NamedProperty.java | 11 ---------- .../saturnclient/config/Property.java | 9 +++++++++ 4 files changed, 28 insertions(+), 27 deletions(-) delete mode 100644 src/main/java/org/saturnclient/saturnclient/config/NamedProperty.java diff --git a/src/main/java/org/saturnclient/modules/ModDimensions.java b/src/main/java/org/saturnclient/modules/ModDimensions.java index b0bdb4f..c09b096 100644 --- a/src/main/java/org/saturnclient/modules/ModDimensions.java +++ b/src/main/java/org/saturnclient/modules/ModDimensions.java @@ -2,7 +2,7 @@ package org.saturnclient.modules; import java.util.Map; -import org.saturnclient.saturnclient.config.NamedProperty; +import org.saturnclient.saturnclient.config.Property.NamedProperty; import org.saturnclient.saturnclient.config.Property; public class ModDimensions { @@ -20,17 +20,17 @@ public class ModDimensions { public NamedProperty>> prop() { return Property.namespace(Map.of( - "X", x, - "Y", y, - "Scale", scale, - "Background Color", bgColor, - "Foreground Color", fgColor, - "Corner Radius", radius, - "Font", font - )).named("In-Game Display"); + "X", x, + "Y", y, + "Scale", scale, + "Background Color", bgColor, + "Foreground Color", fgColor, + "Corner Radius", radius, + "Font", font)).named("In-Game Display"); } - public ModDimensions() {} + public ModDimensions() { + } public ModDimensions(int width, int height) { this.width = width; diff --git a/src/main/java/org/saturnclient/modules/Module.java b/src/main/java/org/saturnclient/modules/Module.java index 87527e4..bedc306 100644 --- a/src/main/java/org/saturnclient/modules/Module.java +++ b/src/main/java/org/saturnclient/modules/Module.java @@ -1,9 +1,9 @@ package org.saturnclient.modules; import org.saturnclient.saturnclient.config.ConfigManager; -import org.saturnclient.saturnclient.config.NamedProperty; import org.saturnclient.ui2.resources.Textures; import org.saturnclient.ui2.RenderScope; +import org.saturnclient.saturnclient.config.Property.NamedProperty; import net.minecraft.util.Identifier; @@ -19,8 +19,11 @@ public abstract class Module { } } - public void render(RenderScope scope) {} - public void tick() {} + public void render(RenderScope scope) { + } + + public void tick() { + } public abstract boolean isEnabled(); @@ -34,7 +37,7 @@ public abstract class Module { public final String getName() { return details.name; } - + public Identifier getIconTexture() { return Textures.getModIcon(details.namespace); } @@ -46,11 +49,11 @@ public abstract class Module { public String getDescription() { return details.description; } - + public String[] getTags() { return details.tags; } - + public String getVersion() { return details.version; } diff --git a/src/main/java/org/saturnclient/saturnclient/config/NamedProperty.java b/src/main/java/org/saturnclient/saturnclient/config/NamedProperty.java deleted file mode 100644 index 3e63c31..0000000 --- a/src/main/java/org/saturnclient/saturnclient/config/NamedProperty.java +++ /dev/null @@ -1,11 +0,0 @@ -package org.saturnclient.saturnclient.config; - -public class NamedProperty { - public String name; - public Property prop; - - public NamedProperty(String name, Property value) { - this.name = name; - this.prop = value; - } -} diff --git a/src/main/java/org/saturnclient/saturnclient/config/Property.java b/src/main/java/org/saturnclient/saturnclient/config/Property.java index 0a8aa01..6d81da7 100644 --- a/src/main/java/org/saturnclient/saturnclient/config/Property.java +++ b/src/main/java/org/saturnclient/saturnclient/config/Property.java @@ -10,6 +10,15 @@ import com.google.gson.JsonObject; import com.google.gson.JsonPrimitive; public class Property { + public static class NamedProperty { + public String name; + public Property prop; + + public NamedProperty(String name, Property value) { + this.name = name; + this.prop = value; + } + } public enum PropertyType { BOOLEAN,