Merge pull request #172 from KosmX/configurable_emotes_dir

Configurable emotes dir
KosmX · Nov 16, 2021 · dd0de91 · dd0de91
2 parents dc8a994 + fa9b51d
commit dd0de91
Show file tree

Hide file tree

Showing 7 changed files with 36 additions and 31 deletions.
diff --git a/16/archCommon/src/main/java/io/github/kosmx/emotes/arch/executor/AbstractEmotesMain.java b/16/archCommon/src/main/java/io/github/kosmx/emotes/arch/executor/AbstractEmotesMain.java
@@ -5,8 +5,6 @@
 import io.github.kosmx.emotes.executor.dataTypes.IGetters;
 import io.github.kosmx.emotes.arch.executor.types.GettersImpl;
 
-import java.io.File;
-
 public abstract class AbstractEmotesMain extends EmoteInstance {
 
     @Override
@@ -18,9 +16,4 @@ public IDefaultTypes getDefaults() {
     public IGetters getGetters() {
         return new GettersImpl();
     }
-
-    @Override
-    public File getExternalEmoteDir() {
-        return getGameDirectory().resolve("emotes").toFile();
-    }
 }
diff --git a/17/archCommon/src/main/java/io/github/kosmx/emotes/arch/executor/AbstractEmotesMain.java b/17/archCommon/src/main/java/io/github/kosmx/emotes/arch/executor/AbstractEmotesMain.java
@@ -5,8 +5,6 @@
 import io.github.kosmx.emotes.executor.dataTypes.IGetters;
 import io.github.kosmx.emotes.arch.executor.types.GettersImpl;
 
-import java.io.File;
-
 public abstract class AbstractEmotesMain extends EmoteInstance {
 
     @Override
@@ -19,8 +17,4 @@ public IGetters getGetters() {
         return new GettersImpl();
     }
 
-    @Override
-    public File getExternalEmoteDir() {
-        return getGameDirectory().resolve("emotes").toFile();
-    }
 }
diff --git a/17/archCommon/src/main/java/io/github/kosmx/emotes/arch/gui/screen/ConfigScreen.java b/17/archCommon/src/main/java/io/github/kosmx/emotes/arch/gui/screen/ConfigScreen.java
@@ -71,24 +71,22 @@ protected void init() {
         this.addWidget(options);
     }
 
-    private void addConfigEntry(SerializableConfig.ConfigEntry<?> entry, OptionsList options){
-        if(entry.showEntry() || ((ClientConfig)EmoteInstance.config).showHiddenConfig.get()) {
+    private void addConfigEntry(SerializableConfig.ConfigEntry<?> entry, OptionsList options) {
+        if (entry.showEntry() || ((ClientConfig) EmoteInstance.config).showHiddenConfig.get()) {
             if (entry instanceof SerializableConfig.BooleanConfigEntry) {
-                if(entry.hasTooltip) {
+                if (entry.hasTooltip) {
                     options.addBig(CycleOption.createOnOff("emotecraft.otherconfig." + entry.getName(),
                             new TranslatableComponent("emotecraft.otherconfig." + entry.getName() + ".tooltip"),
                             gameOptions -> ((SerializableConfig.BooleanConfigEntry) entry).get(),
                             (gameOptions, option, aBoolean) -> ((SerializableConfig.BooleanConfigEntry) entry).set(aBoolean)
                     ));
-                }
-                else {
+                } else {
                     options.addBig(CycleOption.createOnOff("emotecraft.otherconfig." + entry.getName(),
                             gameOptions -> ((SerializableConfig.BooleanConfigEntry) entry).get(),
                             (gameOptions, option, aBoolean) -> ((SerializableConfig.BooleanConfigEntry) entry).set(aBoolean)
                     ));
                 }
-            }
-            else if (entry instanceof SerializableConfig.FloatConfigEntry) {
+            } else if (entry instanceof SerializableConfig.FloatConfigEntry) {
                 SerializableConfig.FloatConfigEntry floatEntry = (SerializableConfig.FloatConfigEntry) entry;
                 options.addBig(new ProgressOption(
                         EmoteInstance.config.validThreshold.getName(), floatEntry.min, floatEntry.max, floatEntry.step,
@@ -103,8 +101,8 @@ else if (entry instanceof SerializableConfig.FloatConfigEntry) {
         }
     }
 
-    private void resetAll(boolean bl){
-        if(bl) {
+    private void resetAll(boolean bl) {
+        if (bl) {
             EmoteInstance.config.iterate(SerializableConfig.ConfigEntry::resetToDefault);
             this.init(); //reload screen
         }
@@ -123,7 +121,7 @@ public void render(PoseStack matrices, int mouseX, int mouseY, float delta) {
 
     }
 
-    static class DummyEntry extends Option{
+    static class DummyEntry extends Option {
 
         public DummyEntry(String key) {
             super(key);
@@ -135,7 +133,7 @@ public AbstractWidget createButton(Options options, int x, int y, int width) {
         }
     }
 
-    static class DummyButton extends AbstractWidget{
+    static class DummyButton extends AbstractWidget {
 
         public DummyButton(int x, int y, int width, int height, Component message) {
             super(x, y, width, height, message);

diff --git a/bukkit/src/main/java/io/github/kosmx/emotes/bukkit/executor/BukkitInstance.java b/bukkit/src/main/java/io/github/kosmx/emotes/bukkit/executor/BukkitInstance.java
@@ -7,7 +7,6 @@
 import io.github.kosmx.emotes.executor.dataTypes.IDefaultTypes;
 import io.github.kosmx.emotes.executor.dataTypes.IGetters;
 
-import java.io.File;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 
@@ -49,9 +48,4 @@ public boolean isClient() {
     public Path getGameDirectory() {
         return Paths.get("");
     }
-
-    @Override
-    public File getExternalEmoteDir() {
-        return Paths.get("").resolve("emotes").toFile();
-    }
 }
diff --git a/emotesAPI/src/main/java/io/github/kosmx/emotes/common/SerializableConfig.java b/emotesAPI/src/main/java/io/github/kosmx/emotes/common/SerializableConfig.java
@@ -29,6 +29,8 @@ public class SerializableConfig {
     public final BooleanConfigEntry loadEmotesServerSide = new BooleanConfigEntry("loadEmotesServerSide", true, false, expert);
     public final ConfigEntry<Boolean> enableQuark = new BooleanConfigEntry("quark", "enablequark", false, true, basics);
 
+    public final StringConfigEntry emotesDir = new StringConfigEntry("emotesDirectory", "emotes", false, expert, true);
+
     public void iterate(Consumer<ConfigEntry<?>> consumer){
         basics.forEach(consumer);
         expert.forEach(consumer);
@@ -141,4 +143,18 @@ public T getTextVal(){
             return (T) get();
         }
     }
+
+    public static class StringConfigEntry extends ConfigEntry<String> {
+        public StringConfigEntry(String name, String defVal, boolean hasTooltip, List<ConfigEntry<?>> collection, boolean hidden) {
+            super(name, null, defVal, hasTooltip, collection, hidden);
+        }
+
+        public StringConfigEntry(String name, String defVal, boolean hasTooltip, List<ConfigEntry<?>> collection) {
+            super(name, defVal, hasTooltip, collection);
+        }
+
+        public StringConfigEntry(String name, String defVal, List<ConfigEntry<?>> collection, boolean hidden) {
+            super(name, defVal, collection, hidden);
+        }
+    }
 }
diff --git a/emotesServer/src/main/java/io/github/kosmx/emotes/server/config/ConfigSerializer.java b/emotesServer/src/main/java/io/github/kosmx/emotes/server/config/ConfigSerializer.java
@@ -47,6 +47,9 @@ else if(node.has(entry.getOldConfigName())){
             else if(entry instanceof SerializableConfig.FloatConfigEntry){
                 ((SerializableConfig.FloatConfigEntry)entry).set(element.getAsFloat());
             }
+            else if(entry instanceof SerializableConfig.StringConfigEntry){
+                ((SerializableConfig.StringConfigEntry)entry).set(element.getAsString());
+            }
         }
     }
 
@@ -65,6 +68,9 @@ private void serializeEntry(SerializableConfig.ConfigEntry<?> entry, JsonObject
         else if(entry instanceof SerializableConfig.FloatConfigEntry){
             node.addProperty(entry.getName(), (float)((SerializableConfig.FloatConfigEntry) entry).get());
         }
+        else if(entry instanceof SerializableConfig.StringConfigEntry){
+            node.addProperty(entry.getName(), ((SerializableConfig.StringConfigEntry)entry).get());
+        }
     }
 
 }
diff --git a/executor/src/main/java/io/github/kosmx/emotes/executor/EmoteInstance.java b/executor/src/main/java/io/github/kosmx/emotes/executor/EmoteInstance.java
@@ -27,7 +27,11 @@ public abstract class EmoteInstance {
     public abstract boolean isClient();
 
     public abstract Path getGameDirectory();
-    public abstract File getExternalEmoteDir();
+
+    public File getExternalEmoteDir(){
+        return getGameDirectory().resolve(config.emotesDir.get()).toFile();
+    }
+
     public Path getConfigPath(){
         if(!Files.exists(getGameDirectory().resolve("config"))){
             try {