diff --git a/src/main/java/org/saturnclient/config/AnimationConfig.java b/src/main/java/org/saturnclient/config/AnimationConfig.java index 615b5c3..ebda05f 100644 --- a/src/main/java/org/saturnclient/config/AnimationConfig.java +++ b/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.manager.Property; +import org.saturnclient.config.property.Property; public class AnimationConfig { public static ConfigManager config; diff --git a/src/main/java/org/saturnclient/config/Config.java b/src/main/java/org/saturnclient/config/Config.java index 9cb4eed..953332f 100644 --- a/src/main/java/org/saturnclient/config/Config.java +++ b/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.manager.Property; +import org.saturnclient.config.property.Property; import org.saturnclient.ui.resources.Textures; public class Config { diff --git a/src/main/java/org/saturnclient/config/manager/ConfigManager.java b/src/main/java/org/saturnclient/config/ConfigManager.java similarity index 98% rename from src/main/java/org/saturnclient/config/manager/ConfigManager.java rename to src/main/java/org/saturnclient/config/ConfigManager.java index 6e2c829..b12a900 100644 --- a/src/main/java/org/saturnclient/config/manager/ConfigManager.java +++ b/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(); diff --git a/src/main/java/org/saturnclient/config/Theme.java b/src/main/java/org/saturnclient/config/Theme.java index e1042a8..86f8010 100644 --- a/src/main/java/org/saturnclient/config/Theme.java +++ b/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.manager.Property; +import org.saturnclient.config.property.Property; public class Theme { // Main UI background (slightly warm dark to match Saturn tone) diff --git a/src/main/java/org/saturnclient/config/manager/Property.java b/src/main/java/org/saturnclient/config/property/Property.java similarity index 99% rename from src/main/java/org/saturnclient/config/manager/Property.java rename to src/main/java/org/saturnclient/config/property/Property.java index 65172a1..1355ab2 100644 --- a/src/main/java/org/saturnclient/config/manager/Property.java +++ b/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; diff --git a/src/main/java/org/saturnclient/feature/Feature.java b/src/main/java/org/saturnclient/feature/Feature.java index 2849c0d..a4da5bb 100644 --- a/src/main/java/org/saturnclient/feature/Feature.java +++ b/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.manager.Property.NamedProperty; +import org.saturnclient.config.ConfigManager; +import org.saturnclient.config.property.Property.NamedProperty; import org.saturnclient.ui.RenderScope; import org.saturnclient.ui.resources.Textures; diff --git a/src/main/java/org/saturnclient/feature/FeatureLayout.java b/src/main/java/org/saturnclient/feature/FeatureLayout.java index 02165ff..a82ac35 100644 --- a/src/main/java/org/saturnclient/feature/FeatureLayout.java +++ b/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.manager.Property.NamedProperty; +import org.saturnclient.config.property.Property; +import org.saturnclient.config.property.Property.NamedProperty; public class FeatureLayout { public Property x = Property.integer(0); diff --git a/src/main/java/org/saturnclient/feature/features/ArmorDisplayFeature.java b/src/main/java/org/saturnclient/feature/features/ArmorDisplayFeature.java index 2fdfec8..d5da3bf 100644 --- a/src/main/java/org/saturnclient/feature/features/ArmorDisplayFeature.java +++ b/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; diff --git a/src/main/java/org/saturnclient/feature/features/AutoSprintFeature.java b/src/main/java/org/saturnclient/feature/features/AutoSprintFeature.java index da2e3e0..ed89c6a 100644 --- a/src/main/java/org/saturnclient/feature/features/AutoSprintFeature.java +++ b/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; diff --git a/src/main/java/org/saturnclient/feature/features/ClockFeature.java b/src/main/java/org/saturnclient/feature/features/ClockFeature.java index 2d7f5d3..9cc42b7 100644 --- a/src/main/java/org/saturnclient/feature/features/ClockFeature.java +++ b/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; diff --git a/src/main/java/org/saturnclient/feature/features/CoordinatesFeature.java b/src/main/java/org/saturnclient/feature/features/CoordinatesFeature.java index 4f7fe55..7715173 100644 --- a/src/main/java/org/saturnclient/feature/features/CoordinatesFeature.java +++ b/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; diff --git a/src/main/java/org/saturnclient/feature/features/CrosshairFeature.java b/src/main/java/org/saturnclient/feature/features/CrosshairFeature.java index 4c585e7..dce022b 100644 --- a/src/main/java/org/saturnclient/feature/features/CrosshairFeature.java +++ b/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; diff --git a/src/main/java/org/saturnclient/feature/features/DayCounterFeature.java b/src/main/java/org/saturnclient/feature/features/DayCounterFeature.java index 6c46310..fdf4540 100644 --- a/src/main/java/org/saturnclient/feature/features/DayCounterFeature.java +++ b/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; diff --git a/src/main/java/org/saturnclient/feature/features/FpsFeature.java b/src/main/java/org/saturnclient/feature/features/FpsFeature.java index ebe8843..d4ccb50 100644 --- a/src/main/java/org/saturnclient/feature/features/FpsFeature.java +++ b/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; diff --git a/src/main/java/org/saturnclient/feature/features/FreelookFeature.java b/src/main/java/org/saturnclient/feature/features/FreelookFeature.java index 1cc19f7..bb9d857 100644 --- a/src/main/java/org/saturnclient/feature/features/FreelookFeature.java +++ b/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; diff --git a/src/main/java/org/saturnclient/feature/features/FullbrightFeature.java b/src/main/java/org/saturnclient/feature/features/FullbrightFeature.java index 9627848..ca35852 100644 --- a/src/main/java/org/saturnclient/feature/features/FullbrightFeature.java +++ b/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; diff --git a/src/main/java/org/saturnclient/feature/features/HealthDisplayFeature.java b/src/main/java/org/saturnclient/feature/features/HealthDisplayFeature.java index 961d887..e797306 100644 --- a/src/main/java/org/saturnclient/feature/features/HealthDisplayFeature.java +++ b/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; diff --git a/src/main/java/org/saturnclient/feature/features/KeystrokesFeature.java b/src/main/java/org/saturnclient/feature/features/KeystrokesFeature.java index c08fa58..af19597 100644 --- a/src/main/java/org/saturnclient/feature/features/KeystrokesFeature.java +++ b/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; diff --git a/src/main/java/org/saturnclient/feature/features/NametagsFeature.java b/src/main/java/org/saturnclient/feature/features/NametagsFeature.java index b4da7c9..27c782d 100644 --- a/src/main/java/org/saturnclient/feature/features/NametagsFeature.java +++ b/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; diff --git a/src/main/java/org/saturnclient/feature/features/NoFogFeature.java b/src/main/java/org/saturnclient/feature/features/NoFogFeature.java index 45f7dea..b20f605 100644 --- a/src/main/java/org/saturnclient/feature/features/NoFogFeature.java +++ b/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; diff --git a/src/main/java/org/saturnclient/feature/features/PingFeature.java b/src/main/java/org/saturnclient/feature/features/PingFeature.java index 67cf0ed..ef68b8a 100644 --- a/src/main/java/org/saturnclient/feature/features/PingFeature.java +++ b/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; diff --git a/src/main/java/org/saturnclient/feature/features/SpeedometerFeature.java b/src/main/java/org/saturnclient/feature/features/SpeedometerFeature.java index 73b378d..6f3c4dd 100644 --- a/src/main/java/org/saturnclient/feature/features/SpeedometerFeature.java +++ b/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; diff --git a/src/main/java/org/saturnclient/feature/features/StatusEffectsFeature.java b/src/main/java/org/saturnclient/feature/features/StatusEffectsFeature.java index a06c71a..8ab5080 100644 --- a/src/main/java/org/saturnclient/feature/features/StatusEffectsFeature.java +++ b/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; diff --git a/src/main/java/org/saturnclient/feature/features/TpsFeature.java b/src/main/java/org/saturnclient/feature/features/TpsFeature.java index d3741b7..69ba8d6 100644 --- a/src/main/java/org/saturnclient/feature/features/TpsFeature.java +++ b/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; diff --git a/src/main/java/org/saturnclient/feature/features/ZoomFeature.java b/src/main/java/org/saturnclient/feature/features/ZoomFeature.java index a9778ef..fec864b 100644 --- a/src/main/java/org/saturnclient/feature/features/ZoomFeature.java +++ b/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; diff --git a/src/main/java/org/saturnclient/ui/components/inputs/FloatInput.java b/src/main/java/org/saturnclient/ui/components/inputs/FloatInput.java index 234d189..f6fb6ad 100644 --- a/src/main/java/org/saturnclient/ui/components/inputs/FloatInput.java +++ b/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.manager.Property; +import org.saturnclient.config.ConfigManager; +import org.saturnclient.config.property.Property; import org.saturnclient.ui.resources.Fonts; public class FloatInput extends Input { diff --git a/src/main/java/org/saturnclient/ui/components/inputs/HexInput.java b/src/main/java/org/saturnclient/ui/components/inputs/HexInput.java index e72d1a5..f0e5b6e 100644 --- a/src/main/java/org/saturnclient/ui/components/inputs/HexInput.java +++ b/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; diff --git a/src/main/java/org/saturnclient/ui/components/inputs/IntInput.java b/src/main/java/org/saturnclient/ui/components/inputs/IntInput.java index 4b8bea9..cac14d9 100644 --- a/src/main/java/org/saturnclient/ui/components/inputs/IntInput.java +++ b/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.manager.Property; +import org.saturnclient.config.ConfigManager; +import org.saturnclient.config.property.Property; import org.saturnclient.ui.resources.Fonts; public class IntInput extends Input { diff --git a/src/main/java/org/saturnclient/ui/components/inputs/KeybindingSelector.java b/src/main/java/org/saturnclient/ui/components/inputs/KeybindingSelector.java index a77736a..1b10d00 100644 --- a/src/main/java/org/saturnclient/ui/components/inputs/KeybindingSelector.java +++ b/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; diff --git a/src/main/java/org/saturnclient/ui/components/inputs/Select.java b/src/main/java/org/saturnclient/ui/components/inputs/Select.java index ef62975..a7dc301 100644 --- a/src/main/java/org/saturnclient/ui/components/inputs/Select.java +++ b/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; diff --git a/src/main/java/org/saturnclient/ui/components/inputs/Toggle.java b/src/main/java/org/saturnclient/ui/components/inputs/Toggle.java index 6c4f3ec..68078dd 100644 --- a/src/main/java/org/saturnclient/ui/components/inputs/Toggle.java +++ b/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; diff --git a/src/main/java/org/saturnclient/ui/elements/Notification.java b/src/main/java/org/saturnclient/ui/elements/Notification.java index 110ff3c..4d362f8 100644 --- a/src/main/java/org/saturnclient/ui/elements/Notification.java +++ b/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; diff --git a/src/main/java/org/saturnclient/ui/elements/Scroll.java b/src/main/java/org/saturnclient/ui/elements/Scroll.java index 8c4648f..734b6fd 100644 --- a/src/main/java/org/saturnclient/ui/elements/Scroll.java +++ b/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; diff --git a/src/main/java/org/saturnclient/ui/screens/ConfigEditor.java b/src/main/java/org/saturnclient/ui/screens/ConfigEditor.java index 4701989..18411e7 100644 --- a/src/main/java/org/saturnclient/ui/screens/ConfigEditor.java +++ b/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.manager.Property; +import org.saturnclient.config.property.Property; import org.saturnclient.ui.SaturnScreen; import org.saturnclient.ui.components.Sidebar; import org.saturnclient.ui.components.inputs.FloatInput; diff --git a/src/main/java/org/saturnclient/ui/screens/HudEditor.java b/src/main/java/org/saturnclient/ui/screens/HudEditor.java index 204d998..2b16d8c 100644 --- a/src/main/java/org/saturnclient/ui/screens/HudEditor.java +++ b/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;