Re structuring property
This commit is contained in:
@@ -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;
|
||||
|
||||
@@ -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 {
|
||||
|
||||
+3
-1
@@ -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();
|
||||
@@ -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)
|
||||
|
||||
+1
-1
@@ -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;
|
||||
@@ -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;
|
||||
|
||||
|
||||
@@ -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<Integer> x = Property.integer(0);
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
@@ -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 {
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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 {
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user