close #384 and #336

src/main/java/me/zeroeightsix/kami/KamiMod.java

@@ -74,9 +74,15 @@ public class KamiMod {
 
 //    public static final String KAMI_HIRAGANA = "\u304B\u307F";
 //    public static final String KAMI_KATAKANA = "\u30AB\u30DF";
-//    public static final String KAMI_BLUE = "\u1d0b\u1d00\u1d0d\u026a \u0299\u029f\u1d1c\u1d07";
-    public static final String KAMI_KANJI = "\u30ab\u30df\u30d6\u30eb"; //\u30ab\u30df\u30d6\u30eb //\u795E
+    public static final String KAMI_KANJI = "\u30ab\u30df\u30d6\u30eb";
+    public static final String KAMI_BLUE = "\u1d0b\u1d00\u1d0d\u026a \u0299\u029f\u1d1c\u1d07";
+    public static final String KAMI_JAPANESE_ONTOP = "\u4e0a\u306b\u30ab\u30df\u30d6\u30eb\u30fc";
+    public static final String KAMI_ONTOP = "\u1d0b\u1d00\u1d0d\u026a \u0299\u029f\u1d1c\u1d07 \u1d0f\u0274 \u1d1b\u1d0f\u1d18";
+    public static final String KAMI_WEBSITE = "\u0299\u1d07\u029f\u029f\u1d00\u002e\u1d21\u1d1b\ua730\u002f\u1d0b\u1d00\u1d0d\u026a\u0299\u029f\u1d1c\u1d07";
     public static final char colour = '\u00A7';
+    public static final char separator = '\u23d0';
+    public static final char quoteLeft = '\u00ab';
+    public static final char quoteRight = '\u00bb';
 
     private static final String KAMI_CONFIG_NAME_DEFAULT = "KAMIBlueConfig.json";
 

src/main/java/me/zeroeightsix/kami/module/modules/zeroeightysix/misc/CustomChat.java

@@ -2,76 +2,50 @@
 
 import me.zero.alpine.listener.EventHandler;
 import me.zero.alpine.listener.Listener;
-import me.zeroeightsix.kami.command.Command;
 import me.zeroeightsix.kami.event.events.PacketEvent;
 import me.zeroeightsix.kami.module.Module;
 import me.zeroeightsix.kami.setting.Setting;
 import me.zeroeightsix.kami.setting.Settings;
 import net.minecraft.network.play.client.CPacketChatMessage;
 
-import static me.zeroeightsix.kami.module.modules.bewwawho.lllllllliiiliiilllli.lllllllliiiliiilllll.lllllllliiiliiilllll;
-import static me.zeroeightsix.kami.module.modules.bewwawho.lllllllliiiliiilllli.lllllllliiiliiliiiii.lllllllliiiliiliiiii;
-import static me.zeroeightsix.kami.module.modules.bewwawho.lllllllliiiliiilllli.lllllllliiiliiliiiil.lllllllliiiliiliiiil;
-import static me.zeroeightsix.kami.module.modules.bewwawho.lllllllliiiliiilllli.lllllllliiiliiliiili.lllllllliiiliiliiili;
-import static me.zeroeightsix.kami.module.modules.bewwawho.lllllllliiiliiilllli.lllllllliiiliiliiill.lllllllliiiliiliiill;
-import static me.zeroeightsix.kami.module.modules.bewwawho.lllllllliiiliiilllli.lllllllliiiliiliilii.lllllllliiiliiliilii;
-import static me.zeroeightsix.kami.module.modules.bewwawho.lllllllliiiliiilllli.lllllllliiiliiliilil.lllllllliiiliiliilil;
-import static me.zeroeightsix.kami.module.modules.bewwawho.lllllllliiiliiilllli.lllllllliiiliiliilli.lllllllliiiliiliilli;
-import static me.zeroeightsix.kami.module.modules.bewwawho.lllllllliiiliiilllli.lllllllliiiliiliilll.lllllllliiiliiliilll;
-import static me.zeroeightsix.kami.module.modules.bewwawho.lllllllliiiliiilllli.lllllllliiiliililiii.lllllllliiiliililiii;
-import static me.zeroeightsix.kami.module.modules.bewwawho.lllllllliiiliiilllli.lllllllliiiliililiil.lllllllliiiliililiil;
-import static me.zeroeightsix.kami.module.modules.bewwawho.lllllllliiiliiilllli.lllllllliiiliililili.lllllllliiiliililili;
-import static me.zeroeightsix.kami.module.modules.bewwawho.lllllllliiiliiilllli.lllllllliiiliililill.lllllllliiiliililill;
-import static me.zeroeightsix.kami.module.modules.bewwawho.lllllllliiiliiilllli.lllllllliiiliilillii.lllllllliiiliilillii;
-import static me.zeroeightsix.kami.module.modules.bewwawho.lllllllliiiliiilllli.lllllllliiiliilillil.lllllllliiiliilillil;
-import static me.zeroeightsix.kami.module.modules.bewwawho.lllllllliiiliiilllli.lllllllliiiliilillli.lllllllliiiliilillli;
-import static me.zeroeightsix.kami.module.modules.bewwawho.lllllllliiiliiilllli.lllllllliiiliilillll.lllllllliiiliilillll;
-import static me.zeroeightsix.kami.module.modules.bewwawho.lllllllliiiliiilllli.lllllllliiiliilliiii.lllllllliiiliilliiii;
-import static me.zeroeightsix.kami.module.modules.bewwawho.lllllllliiiliiilllli.lllllllliiiliilliiil.lllllllliiiliilliiil;
-import static me.zeroeightsix.kami.module.modules.bewwawho.lllllllliiiliiilllli.lllllllliiiliilliili.lllllllliiiliilliili;
-import static me.zeroeightsix.kami.module.modules.bewwawho.lllllllliiiliiilllli.lllllllliiiliilliill.lllllllliiiliilliill;
-import static me.zeroeightsix.kami.module.modules.bewwawho.lllllllliiiliiilllli.lllllllliiiliillilii.lllllllliiiliillilii;
-import static me.zeroeightsix.kami.module.modules.bewwawho.lllllllliiiliiilllli.lllllllliiiliillilil.lllllllliiiliillilil;
-import static me.zeroeightsix.kami.module.modules.bewwawho.lllllllliiiliiilllli.lllllllliiiliillilli.lllllllliiiliillilli;
-import static me.zeroeightsix.kami.module.modules.bewwawho.lllllllliiiliiilllli.lllllllliiiliillilll.lllllllliiiliillilll;
-import static me.zeroeightsix.kami.module.modules.bewwawho.lllllllliiiliiilllli.lllllllliiiliillliii.lllllllliiiliillliii;
-import static me.zeroeightsix.kami.module.modules.bewwawho.lllllllliiiliiilllli.lllllllliiiliillliil.lllllllliiiliillliil;
-import static me.zeroeightsix.kami.module.modules.bewwawho.lllllllliiiliiilllli.lllllllliiiliilllili.lllllllliiiliilllili;
-import static me.zeroeightsix.kami.module.modules.bewwawho.lllllllliiiliiilllli.lllllllliiiliilllill.lllllllliiiliilllill;
-import static me.zeroeightsix.kami.module.modules.bewwawho.lllllllliiiliiilllli.lllllllliiiliillllii.lllllllliiiliillllii;
-import static me.zeroeightsix.kami.module.modules.bewwawho.lllllllliiiliiilllli.lllllllliiiliillllil.lllllllliiiliillllil;
-import static me.zeroeightsix.kami.module.modules.bewwawho.lllllllliiiliiilllli.lllllllliiiliillllli.lllllllliiiliillllli;
-import static me.zeroeightsix.kami.module.modules.bewwawho.lllllllliiiliiilllli.lllllllliiiliillllll.lllllllliiiliillllll;
-import static me.zeroeightsix.kami.module.modules.bewwawho.lllllllliiiliiilllli.lllllllliiililiiiiii.lllllllliiililiiiiii;
-import static me.zeroeightsix.kami.module.modules.bewwawho.lllllllliiiliiilllli.lllllllliiililiiiiil.lllllllliiililiiiiil;
+import static me.zeroeightsix.kami.KamiMod.*;
 
 /**
  * Created by 086 on 8/04/2018.
- * Updated by S-B99 on 12/11/19
+ * Updated by S-B99 on 26/01/20
  */
-@Module.Info(name = "CustomChat", category = Module.Category.MISC, description = "Chat ending. Now has modes!", showOnArray = Module.ShowOnArray.OFF)
+@Module.Info(name = "CustomChat", category = Module.Category.MISC, description = "Chat ending", showOnArray = Module.ShowOnArray.OFF)
 public class CustomChat extends Module {
 
     public Setting<Boolean> startupGlobal = register(Settings.b("Enable Automatically", true));
-    private Setting<TextMode> textMode = register(Settings.e("Text", TextMode.ONTOP));
-    private Setting<DecoMode> decoMode = register(Settings.e("Decoration", DecoMode.NONE));
+    private Setting<TextMode> textMode = register(Settings.e("Content", TextMode.JAPANESE));
+    private Setting<DecoMode> decoMode = register(Settings.e("Punctuation", DecoMode.CLASSIC));
     private Setting<Boolean> commands = register(Settings.b("Commands", false));
-    private Setting<Boolean> debug = register(Settings.b("Debug", true));
 
+    private enum TextMode {
+        NAME, ONTOP, WEBSITE, JAPANESE;
+    }
 
-    private String kSep = " " + lllllllliiiliiilllll + " ";
-    private String kClassic = " " + lllllllliiiliiliiiii + " ";
-    private String kClassicO = " " + lllllllliiiliiliiili;
-    private String kName = lllllllliiiliiliiiil + lllllllliiiliiliiill + lllllllliiiliiliilii + lllllllliiiliiliilli + " " + lllllllliiiliiliilil + lllllllliiiliiliilll + lllllllliiiliililiii + lllllllliiiliililiil;
-    private String kOnTop = lllllllliiiliiliiiil + lllllllliiiliiliiill + lllllllliiiliiliilii + lllllllliiiliiliilli + " " + lllllllliiiliiliilil + lllllllliiiliiliilll + lllllllliiiliililiii + lllllllliiiliililiil + " " + lllllllliiiliililili + lllllllliiiliililill + " " + lllllllliiiliilillii + lllllllliiiliilillil + lllllllliiiliilillli;
-    private String kWebsite = lllllllliiiliilillll + lllllllliiiliilliiii + lllllllliiiliilliiil + lllllllliiiliilliili + lllllllliiiliilliill + lllllllliiiliillilii + lllllllliiiliillilil + lllllllliiiliillilli + lllllllliiiliillilll + lllllllliiiliillliii + lllllllliiiliillliil + lllllllliiiliilllili + lllllllliiiliilllill + lllllllliiiliillllii + lllllllliiiliillllil + lllllllliiiliillllli + lllllllliiiliillllll + lllllllliiililiiiiii;
-    private String kfinal = "";
-    private String kAll = lllllllliiililiiiiil;
+    private enum DecoMode {
+        SEPARATOR, CLASSIC, NONE
+    }
 
-    @Override
-    public void onEnable() {
-        if (mc.player != null && debug.getValue()) {
-            Command.sendChatMessage("[CustomChat] Note: ALL text mode only works with the separator decoration mode");
+    private String getText(TextMode t) {
+        switch (t) {
+            case NAME: return KAMI_BLUE;
+            case ONTOP: return KAMI_ONTOP;
+            case WEBSITE: return KAMI_WEBSITE;
+            case JAPANESE: return KAMI_JAPANESE_ONTOP;
+            default: return "";
+        }
+    }
+
+    private String getFull(DecoMode d) {
+        switch (d) {
+            case NONE: return " " + getText(textMode.getValue());
+            case CLASSIC: return  " " + quoteLeft + " " + getText(textMode.getValue()) + " " + quoteRight;
+            case SEPARATOR: return " " + separator + " " + getText(textMode.getValue());
+            default: return "";
         }
     }
 
@@ -86,47 +60,14 @@ public void onEnable() {
                 else if (s.startsWith("-")) return;
                 else if (s.startsWith(";")) return;
                 else if (s.startsWith("?")) return;
+                else if (s.startsWith("*")) return;
+                else if (s.startsWith("^")) return;
+                else if (s.startsWith("&")) return;
             }
-            if (decoMode.getValue().equals(DecoMode.SEPARATOR)) {
-                if (textMode.getValue().equals(TextMode.NAME)) {
-                    kfinal = kSep + kName;
-                } else if (textMode.getValue().equals(TextMode.ONTOP)) {
-                    kfinal = kSep + kOnTop;
-                } else if (textMode.getValue().equals(TextMode.WEBSITE)) {
-                    kfinal = kSep + kWebsite;
-                } else if (textMode.getValue().equals(TextMode.ALL)) {
-                    kfinal = kAll;
-                }
-            } else if (decoMode.getValue().equals(DecoMode.NONE)) {
-                if (textMode.getValue().equals(TextMode.NAME)) {
-                    kfinal = " " + kName;
-                } else if (textMode.getValue().equals(TextMode.ONTOP)) {
-                    kfinal = " " + kOnTop;
-                } else if (textMode.getValue().equals(TextMode.WEBSITE)) {
-                    kfinal = " " + kWebsite;
-                }
-            } else if (decoMode.getValue().equals(DecoMode.CLASSIC)) {
-                if (textMode.getValue().equals(TextMode.NAME)) {
-                    kfinal = kClassic + kName + kClassicO;
-                } else if (textMode.getValue().equals(TextMode.ONTOP)) {
-                    kfinal = kClassic + kOnTop + kClassicO;
-                } else if (textMode.getValue().equals(TextMode.WEBSITE)) {
-                    kfinal = kClassic + kWebsite + kClassicO;
-                }
-            }
-            s += kfinal;
+            s += getFull(decoMode.getValue());
             if (s.length() >= 256) s = s.substring(0, 256);
             ((CPacketChatMessage) event.getPacket()).message = s;
         }
     });
 
-    private enum TextMode {
-        NAME, ONTOP, WEBSITE, ALL
-    }
-
-    private enum DecoMode {
-        SEPARATOR, CLASSIC, NONE
-
-    }
-
 }