From fd42a9443005ae5fd8c88562aaf8f9c3922d202c Mon Sep 17 00:00:00 2001 From: coolGi Date: Tue, 6 Jun 2023 18:01:07 +0930 Subject: [PATCH] Refracted Config Internal Enums to its own package --- .../com/seibel/lod/core/config/Config.java | 6 +++++ .../core/config/types/AbstractConfigType.java | 1 + .../lod/core/config/types/ConfigCategory.java | 2 ++ .../lod/core/config/types/ConfigEntry.java | 1 + .../core/config/types/ConfigUIComment.java | 24 ++++++++++++++----- .../{ => enums}/ConfigEntryAppearance.java | 2 +- .../{ => enums}/ConfigEntryPerformance.java | 2 +- 7 files changed, 30 insertions(+), 8 deletions(-) rename core/src/main/java/com/seibel/lod/core/config/types/{ => enums}/ConfigEntryAppearance.java (93%) rename core/src/main/java/com/seibel/lod/core/config/types/{ => enums}/ConfigEntryPerformance.java (82%) diff --git a/core/src/main/java/com/seibel/lod/core/config/Config.java b/core/src/main/java/com/seibel/lod/core/config/Config.java index 1452d2874..9ff622c86 100644 --- a/core/src/main/java/com/seibel/lod/core/config/Config.java +++ b/core/src/main/java/com/seibel/lod/core/config/Config.java @@ -25,6 +25,12 @@ import com.seibel.lod.api.enums.rendering.*; import com.seibel.lod.api.enums.worldGeneration.EDhApiDistantGeneratorMode; import com.seibel.lod.core.config.eventHandlers.RenderCacheConfigEventHandler; import com.seibel.lod.core.config.types.*; +import com.seibel.lod.core.config.types.enums.*; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** diff --git a/core/src/main/java/com/seibel/lod/core/config/types/AbstractConfigType.java b/core/src/main/java/com/seibel/lod/core/config/types/AbstractConfigType.java index bb8bcee82..893fc3df2 100644 --- a/core/src/main/java/com/seibel/lod/core/config/types/AbstractConfigType.java +++ b/core/src/main/java/com/seibel/lod/core/config/types/AbstractConfigType.java @@ -1,6 +1,7 @@ package com.seibel.lod.core.config.types; import com.seibel.lod.core.config.ConfigBase; +import com.seibel.lod.core.config.types.enums.ConfigEntryAppearance; /** * The class where all config options should extend diff --git a/core/src/main/java/com/seibel/lod/core/config/types/ConfigCategory.java b/core/src/main/java/com/seibel/lod/core/config/types/ConfigCategory.java index 64960cb1d..d67e763a9 100644 --- a/core/src/main/java/com/seibel/lod/core/config/types/ConfigCategory.java +++ b/core/src/main/java/com/seibel/lod/core/config/types/ConfigCategory.java @@ -1,5 +1,7 @@ package com.seibel.lod.core.config.types; +import com.seibel.lod.core.config.types.enums.ConfigEntryAppearance; + /** * Adds a categoty to the config * See our config file for more information on how to use it diff --git a/core/src/main/java/com/seibel/lod/core/config/types/ConfigEntry.java b/core/src/main/java/com/seibel/lod/core/config/types/ConfigEntry.java index 2598ececd..ea70c7e38 100644 --- a/core/src/main/java/com/seibel/lod/core/config/types/ConfigEntry.java +++ b/core/src/main/java/com/seibel/lod/core/config/types/ConfigEntry.java @@ -2,6 +2,7 @@ package com.seibel.lod.core.config.types; import com.seibel.lod.core.config.listeners.IConfigListener; +import com.seibel.lod.core.config.types.enums.*; import com.seibel.lod.coreapi.interfaces.config.IConfigEntry; import java.util.ArrayList; diff --git a/core/src/main/java/com/seibel/lod/core/config/types/ConfigUIComment.java b/core/src/main/java/com/seibel/lod/core/config/types/ConfigUIComment.java index ff0b08558..78a570b69 100644 --- a/core/src/main/java/com/seibel/lod/core/config/types/ConfigUIComment.java +++ b/core/src/main/java/com/seibel/lod/core/config/types/ConfigUIComment.java @@ -1,28 +1,40 @@ package com.seibel.lod.core.config.types; +import com.seibel.lod.core.config.types.enums.ConfigEntryAppearance; + /** * Adds something like a ConfigEntry but without a button to change the input * * @author coolGi */ public class ConfigUIComment extends AbstractConfigType{ - public ConfigUIComment(String value) { - super(ConfigEntryAppearance.ONLY_SHOW, value); //TODO: Is the listener: null right? + public ConfigUIComment() { + super(ConfigEntryAppearance.ONLY_SHOW, ""); } + /** Appearance shouldn't be changed */ @Override - public void setAppearance(ConfigEntryAppearance newAppearance) { - return; - } + public void setAppearance(ConfigEntryAppearance newAppearance) {} + + /** Pointless to set the value */ + @Override + public void set(String newValue) {} public static class Builder extends AbstractConfigType.Builder { + /** Appearance shouldn't be changed */ @Override public Builder setAppearance(ConfigEntryAppearance newAppearance) { return this; } + /** Pointless to set the value */ + @Override + public Builder set(String newValue) { + return this; + } + public ConfigUIComment build() { - return new ConfigUIComment(tmpValue); + return new ConfigUIComment(); } } } diff --git a/core/src/main/java/com/seibel/lod/core/config/types/ConfigEntryAppearance.java b/core/src/main/java/com/seibel/lod/core/config/types/enums/ConfigEntryAppearance.java similarity index 93% rename from core/src/main/java/com/seibel/lod/core/config/types/ConfigEntryAppearance.java rename to core/src/main/java/com/seibel/lod/core/config/types/enums/ConfigEntryAppearance.java index a92f169de..a9aac247a 100644 --- a/core/src/main/java/com/seibel/lod/core/config/types/ConfigEntryAppearance.java +++ b/core/src/main/java/com/seibel/lod/core/config/types/enums/ConfigEntryAppearance.java @@ -1,4 +1,4 @@ -package com.seibel.lod.core.config.types; +package com.seibel.lod.core.config.types.enums; /** * Allows options or categories to only be shown in the file or only in the ui diff --git a/core/src/main/java/com/seibel/lod/core/config/types/ConfigEntryPerformance.java b/core/src/main/java/com/seibel/lod/core/config/types/enums/ConfigEntryPerformance.java similarity index 82% rename from core/src/main/java/com/seibel/lod/core/config/types/ConfigEntryPerformance.java rename to core/src/main/java/com/seibel/lod/core/config/types/enums/ConfigEntryPerformance.java index 85390f68f..37ed59650 100644 --- a/core/src/main/java/com/seibel/lod/core/config/types/ConfigEntryPerformance.java +++ b/core/src/main/java/com/seibel/lod/core/config/types/enums/ConfigEntryPerformance.java @@ -1,4 +1,4 @@ -package com.seibel.lod.core.config.types; +package com.seibel.lod.core.config.types.enums; /** * What is the performance impact of an entry