Re structuring property

src/main/java/org/saturnclient/config/AnimationConfig.java

@@ -1,7 +1,6 @@
 package org.saturnclient.config;
 
-import org.saturnclient.config.manager.ConfigManager;
+import org.saturnclient.config.property.Property;
-import org.saturnclient.config.manager.Property;
 
 public class AnimationConfig {
     public static ConfigManager config;

src/main/java/org/saturnclient/config/Config.java

@@ -5,8 +5,7 @@ import java.io.File;
 import org.saturnclient.common.provider.GLFWProvider;
 import org.saturnclient.common.provider.Providers;
 import org.saturnclient.common.ref.asset.IdentifierRef;
-import org.saturnclient.config.manager.ConfigManager;
+import org.saturnclient.config.property.Property;
-import org.saturnclient.config.manager.Property;
 import org.saturnclient.ui.resources.Textures;
 
 public class Config {

src/main/java/org/saturnclient/config/ConfigManager.java

@@ -1,4 +1,4 @@
-package org.saturnclient.config.manager;
+package org.saturnclient.config;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -10,6 +10,8 @@ import java.nio.file.Files;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
+import org.saturnclient.config.property.Property;
+
 public class ConfigManager {
 
     private static final ObjectMapper MAPPER = new ObjectMapper();

src/main/java/org/saturnclient/config/Theme.java

@@ -1,7 +1,6 @@
 package org.saturnclient.config;
 
-import org.saturnclient.config.manager.ConfigManager;
+import org.saturnclient.config.property.Property;
-import org.saturnclient.config.manager.Property;
 
 public class Theme {
     // Main UI background (slightly warm dark to match Saturn tone)

src/main/java/org/saturnclient/config/property/Property.java

@@ -1,4 +1,4 @@
-package org.saturnclient.config.manager;
+package org.saturnclient.config.property;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.JsonNodeFactory;

src/main/java/org/saturnclient/feature/Feature.java

@@ -1,8 +1,8 @@
 package org.saturnclient.feature;
 
 import org.saturnclient.common.ref.asset.IdentifierRef;
-import org.saturnclient.config.manager.ConfigManager;
+import org.saturnclient.config.ConfigManager;
-import org.saturnclient.config.manager.Property.NamedProperty;
+import org.saturnclient.config.property.Property.NamedProperty;
 import org.saturnclient.ui.RenderScope;
 import org.saturnclient.ui.resources.Textures;
 

src/main/java/org/saturnclient/feature/FeatureLayout.java

@@ -2,8 +2,8 @@ package org.saturnclient.feature;
 
 import java.util.Map;
 
-import org.saturnclient.config.manager.Property;
+import org.saturnclient.config.property.Property;
-import org.saturnclient.config.manager.Property.NamedProperty;
+import org.saturnclient.config.property.Property.NamedProperty;
 
 public class FeatureLayout {
     public Property<Integer> x = Property.integer(0);

src/main/java/org/saturnclient/feature/features/ArmorDisplayFeature.java

@@ -3,7 +3,7 @@ package org.saturnclient.feature.features;
 import org.saturnclient.common.provider.Providers;
 import org.saturnclient.common.module.PlayerModule;
 import org.saturnclient.common.ref.game.ItemStackRef;
-import org.saturnclient.config.manager.Property;
+import org.saturnclient.config.property.Property;
 import org.saturnclient.feature.Feature;
 import org.saturnclient.feature.FeatureDetails;
 import org.saturnclient.feature.FeatureLayout;

src/main/java/org/saturnclient/feature/features/AutoSprintFeature.java

@@ -1,9 +1,9 @@
 package org.saturnclient.feature.features;
 
 import org.saturnclient.common.provider.Providers;
+import org.saturnclient.config.property.Property;
 import org.saturnclient.common.module.NetworkModule;
 import org.saturnclient.common.module.PlayerModule;
-import org.saturnclient.config.manager.Property;
 import org.saturnclient.feature.Feature;
 import org.saturnclient.feature.FeatureDetails;
 

src/main/java/org/saturnclient/feature/features/ClockFeature.java

@@ -3,9 +3,9 @@ package org.saturnclient.feature.features;
 import java.time.LocalTime;
 import java.time.format.DateTimeFormatter;
 
-import org.saturnclient.config.manager.Property;
 import org.saturnclient.ui.RenderScope;
 import org.saturnclient.ui.resources.Fonts;
+import org.saturnclient.config.property.Property;
 import org.saturnclient.feature.Feature;
 import org.saturnclient.feature.FeatureDetails;
 import org.saturnclient.feature.FeatureLayout;

src/main/java/org/saturnclient/feature/features/CoordinatesFeature.java

@@ -1,7 +1,7 @@
 package org.saturnclient.feature.features;
 
 import org.saturnclient.common.provider.Providers;
-import org.saturnclient.config.manager.Property;
+import org.saturnclient.config.property.Property;
 import org.saturnclient.ui.RenderScope;
 import org.saturnclient.ui.resources.Fonts;
 import org.saturnclient.feature.Feature;

src/main/java/org/saturnclient/feature/features/CrosshairFeature.java

@@ -1,8 +1,8 @@
 package org.saturnclient.feature.features;
 
 import org.saturnclient.common.provider.Providers;
+import org.saturnclient.config.property.Property;
 import org.saturnclient.common.module.RenderModule;
-import org.saturnclient.config.manager.Property;
 import org.saturnclient.ui.RenderScope;
 import org.saturnclient.ui.resources.Textures;
 import org.saturnclient.feature.Feature;

src/main/java/org/saturnclient/feature/features/DayCounterFeature.java

@@ -1,7 +1,7 @@
 package org.saturnclient.feature.features;
 
 import org.saturnclient.common.provider.Providers;
-import org.saturnclient.config.manager.Property;
+import org.saturnclient.config.property.Property;
 import org.saturnclient.ui.RenderScope;
 import org.saturnclient.ui.resources.Fonts;
 import org.saturnclient.feature.Feature;

src/main/java/org/saturnclient/feature/features/FpsFeature.java

@@ -1,7 +1,7 @@
 package org.saturnclient.feature.features;
 
 import org.saturnclient.common.provider.Providers;
-import org.saturnclient.config.manager.Property;
+import org.saturnclient.config.property.Property;
 import org.saturnclient.ui.RenderScope;
 import org.saturnclient.ui.resources.Fonts;
 import org.saturnclient.feature.Feature;

src/main/java/org/saturnclient/feature/features/FreelookFeature.java

@@ -1,9 +1,9 @@
 package org.saturnclient.feature.features;
 
 import org.saturnclient.common.provider.Providers;
+import org.saturnclient.config.property.Property;
 import org.saturnclient.common.module.RenderModule;
 import org.saturnclient.common.provider.GLFWProvider;
-import org.saturnclient.config.manager.Property;
 import org.saturnclient.feature.Feature;
 import org.saturnclient.feature.FeatureDetails;
 

src/main/java/org/saturnclient/feature/features/FullbrightFeature.java

@@ -1,6 +1,6 @@
 package org.saturnclient.feature.features;
 
-import org.saturnclient.config.manager.Property;
+import org.saturnclient.config.property.Property;
 import org.saturnclient.feature.Feature;
 import org.saturnclient.feature.FeatureDetails;
 

src/main/java/org/saturnclient/feature/features/HealthDisplayFeature.java

@@ -1,7 +1,7 @@
 package org.saturnclient.feature.features;
 
 import org.saturnclient.common.provider.Providers;
-import org.saturnclient.config.manager.Property;
+import org.saturnclient.config.property.Property;
 import org.saturnclient.ui.RenderScope;
 import org.saturnclient.ui.resources.Fonts;
 import org.saturnclient.feature.Feature;

src/main/java/org/saturnclient/feature/features/KeystrokesFeature.java

@@ -1,8 +1,8 @@
 package org.saturnclient.feature.features;
 
 import org.saturnclient.common.provider.Providers;
+import org.saturnclient.config.property.Property;
 import org.saturnclient.common.module.PlayerModule;
-import org.saturnclient.config.manager.Property;
 import org.saturnclient.ui.RenderScope;
 import org.saturnclient.feature.Feature;
 import org.saturnclient.feature.FeatureDetails;

src/main/java/org/saturnclient/feature/features/NametagsFeature.java

@@ -1,7 +1,7 @@
 package org.saturnclient.feature.features;
 
 import org.saturnclient.common.module.EntityModule;
-import org.saturnclient.config.manager.Property;
+import org.saturnclient.config.property.Property;
 import org.saturnclient.feature.Feature;
 import org.saturnclient.feature.FeatureDetails;
 

src/main/java/org/saturnclient/feature/features/NoFogFeature.java

@@ -1,6 +1,6 @@
 package org.saturnclient.feature.features;
 
-import org.saturnclient.config.manager.Property;
+import org.saturnclient.config.property.Property;
 import org.saturnclient.feature.Feature;
 import org.saturnclient.feature.FeatureDetails;
 

src/main/java/org/saturnclient/feature/features/PingFeature.java

@@ -1,7 +1,7 @@
 package org.saturnclient.feature.features;
 
 import org.saturnclient.common.provider.Providers;
-import org.saturnclient.config.manager.Property;
+import org.saturnclient.config.property.Property;
 import org.saturnclient.ui.RenderScope;
 import org.saturnclient.ui.resources.Fonts;
 import org.saturnclient.feature.Feature;

src/main/java/org/saturnclient/feature/features/SpeedometerFeature.java

@@ -1,8 +1,8 @@
 package org.saturnclient.feature.features;
 
 import org.saturnclient.common.provider.Providers;
+import org.saturnclient.config.property.Property;
 import org.saturnclient.common.module.PlayerModule;
-import org.saturnclient.config.manager.Property;
 import org.saturnclient.ui.RenderScope;
 import org.saturnclient.ui.resources.Fonts;
 import org.saturnclient.feature.Feature;

src/main/java/org/saturnclient/feature/features/StatusEffectsFeature.java

@@ -4,7 +4,7 @@ import java.util.List;
 
 import org.saturnclient.common.provider.Providers;
 import org.saturnclient.common.ref.asset.SpriteRef;
-import org.saturnclient.config.manager.Property;
+import org.saturnclient.config.property.Property;
 import org.saturnclient.ui.RenderScope;
 import org.saturnclient.feature.Feature;
 import org.saturnclient.feature.FeatureDetails;

src/main/java/org/saturnclient/feature/features/TpsFeature.java

@@ -1,8 +1,8 @@
 package org.saturnclient.feature.features;
 
-import org.saturnclient.config.manager.Property;
 import org.saturnclient.ui.RenderScope;
 import org.saturnclient.ui.resources.Fonts;
+import org.saturnclient.config.property.Property;
 import org.saturnclient.feature.Feature;
 import org.saturnclient.feature.FeatureDetails;
 import org.saturnclient.feature.FeatureLayout;

src/main/java/org/saturnclient/feature/features/ZoomFeature.java

@@ -1,7 +1,7 @@
 package org.saturnclient.feature.features;
 
 import org.saturnclient.common.provider.GLFWProvider;
-import org.saturnclient.config.manager.Property;
+import org.saturnclient.config.property.Property;
 import org.saturnclient.feature.Feature;
 import org.saturnclient.feature.FeatureDetails;
 

src/main/java/org/saturnclient/ui/components/inputs/FloatInput.java

@@ -1,7 +1,7 @@
 package org.saturnclient.ui.components.inputs;
 
-import org.saturnclient.config.manager.ConfigManager;
+import org.saturnclient.config.ConfigManager;
-import org.saturnclient.config.manager.Property;
+import org.saturnclient.config.property.Property;
 import org.saturnclient.ui.resources.Fonts;
 
 public class FloatInput extends Input {

src/main/java/org/saturnclient/ui/components/inputs/HexInput.java

@@ -2,7 +2,7 @@ package org.saturnclient.ui.components.inputs;
 
 import java.awt.Color;
 
-import org.saturnclient.config.manager.Property;
+import org.saturnclient.config.property.Property;
 import org.saturnclient.ui.Element;
 import org.saturnclient.ui.ElementContext;
 import org.saturnclient.ui.RenderScope;

src/main/java/org/saturnclient/ui/components/inputs/IntInput.java

@@ -1,7 +1,7 @@
 package org.saturnclient.ui.components.inputs;
 
-import org.saturnclient.config.manager.ConfigManager;
+import org.saturnclient.config.ConfigManager;
-import org.saturnclient.config.manager.Property;
+import org.saturnclient.config.property.Property;
 import org.saturnclient.ui.resources.Fonts;
 
 public class IntInput extends Input {

src/main/java/org/saturnclient/ui/components/inputs/KeybindingSelector.java

@@ -3,7 +3,7 @@ package org.saturnclient.ui.components.inputs;
 import org.saturnclient.common.provider.GLFWProvider;
 import org.saturnclient.common.provider.Providers;
 import org.saturnclient.config.Theme;
-import org.saturnclient.config.manager.Property;
+import org.saturnclient.config.property.Property;
 import org.saturnclient.ui.Element;
 import org.saturnclient.ui.ElementContext;
 import org.saturnclient.ui.RenderScope;

src/main/java/org/saturnclient/ui/components/inputs/Select.java

@@ -1,7 +1,7 @@
 package org.saturnclient.ui.components.inputs;
 
 import org.saturnclient.config.Theme;
-import org.saturnclient.config.manager.Property;
+import org.saturnclient.config.property.Property;
 import org.saturnclient.ui.Element;
 import org.saturnclient.ui.ElementContext;
 import org.saturnclient.ui.RenderScope;

src/main/java/org/saturnclient/ui/components/inputs/Toggle.java

@@ -1,7 +1,7 @@
 package org.saturnclient.ui.components.inputs;
 
 import org.saturnclient.config.Theme;
-import org.saturnclient.config.manager.Property;
+import org.saturnclient.config.property.Property;
 import org.saturnclient.ui.Element;
 import org.saturnclient.ui.ElementContext;
 import org.saturnclient.ui.RenderScope;

src/main/java/org/saturnclient/ui/elements/Notification.java

@@ -1,7 +1,7 @@
 package org.saturnclient.ui.elements;
 
 import org.saturnclient.config.Theme;
-import org.saturnclient.config.manager.Property;
+import org.saturnclient.config.property.Property;
 import org.saturnclient.ui.Element;
 import org.saturnclient.ui.ElementContext;
 import org.saturnclient.ui.RenderScope;

src/main/java/org/saturnclient/ui/elements/Scroll.java

@@ -4,7 +4,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.saturnclient.config.Theme;
-import org.saturnclient.config.manager.Property;
+import org.saturnclient.config.property.Property;
 import org.saturnclient.ui.Element;
 import org.saturnclient.ui.ElementContext;
 import org.saturnclient.ui.ElementRenderer;

src/main/java/org/saturnclient/ui/screens/ConfigEditor.java

@@ -2,9 +2,9 @@ package org.saturnclient.ui.screens;
 
 import java.util.Map;
 
+import org.saturnclient.config.ConfigManager;
 import org.saturnclient.config.Theme;
-import org.saturnclient.config.manager.ConfigManager;
+import org.saturnclient.config.property.Property;
-import org.saturnclient.config.manager.Property;
 import org.saturnclient.ui.SaturnScreen;
 import org.saturnclient.ui.components.Sidebar;
 import org.saturnclient.ui.components.inputs.FloatInput;

src/main/java/org/saturnclient/ui/screens/HudEditor.java

@@ -1,7 +1,7 @@
 package org.saturnclient.ui.screens;
 
 import org.saturnclient.common.ref.render.MatrixStackRef;
-import org.saturnclient.config.manager.ConfigManager;
+import org.saturnclient.config.ConfigManager;
 import org.saturnclient.feature.HudFeature;
 import org.saturnclient.feature.FeatureLayout;
 import org.saturnclient.feature.FeatureManager;