From 9dbf69431324af3d9c3a6e8f9d721d2a8fc665af Mon Sep 17 00:00:00 2001 From: Willem Date: Tue, 18 Oct 2022 01:14:47 +0200 Subject: [PATCH] Cleaned constants --- .../gdxapp4d/app/notepad/NotepadDeskApp.java | 40 +++++++------- .../distributedrebirth/bassboonyd/Bãß.java | 29 +++++++--- .../bassboonyd/DefaultEnumBaseʸᴰ.java | 18 +++++-- .../bassboonyd/jmx/DefaultEnumBaseᴶᴹˣ.java | 6 +++ .../jmx/DefaultEnumInstanceᴶᴹˣ.java | 7 ++- .../bassboonyd/jmx/DefaultEnumSetᴶᴹˣ.java | 13 +++-- .../numberxd/unicode/BaseGlyphSet.java | 54 +++++++++---------- 7 files changed, 99 insertions(+), 68 deletions(-) diff --git a/gdxapp4d-app-notepad/src/main/java/love/distributedrebirth/gdxapp4d/app/notepad/NotepadDeskApp.java b/gdxapp4d-app-notepad/src/main/java/love/distributedrebirth/gdxapp4d/app/notepad/NotepadDeskApp.java index 7d8c9d48..11112920 100644 --- a/gdxapp4d-app-notepad/src/main/java/love/distributedrebirth/gdxapp4d/app/notepad/NotepadDeskApp.java +++ b/gdxapp4d-app-notepad/src/main/java/love/distributedrebirth/gdxapp4d/app/notepad/NotepadDeskApp.java @@ -27,7 +27,8 @@ public class NotepadDeskApp extends AbstractDeskApp implements DeskAppRenderer { private final int[] gridRank; private final Random random; private int runCounter; - private final ImInt runSpeed = new ImInt(10); + private final ImInt runSpeed = new ImInt(Bãß.ℭỗᶇṧⱦᶏꬼȶʂ.INT_TEN); + private final static char DEFAULT_CHAR = 'ﷲ'; private final static UnicodePlane[] GRID_PLANES = { UnicodePlane.BRAHMI, UnicodePlane.UGARITIC, @@ -40,10 +41,10 @@ public class NotepadDeskApp extends AbstractDeskApp implements DeskAppRenderer { this.gridBuffer = new int[gridHeight][gridWidth]; this.gridRank = new int[gridWidth]; this.random = new Random(); - for (int y=0; y unicode4DService.getCharacterForUnicode(v)); + ImCharacter.render("speedId", "RunSpeed", DEFAULT_CHAR, v -> unicode4DService.getCharacterForUnicode(v)); ImGui.invisibleButton("matrix", ImGui.getWindowWidth(), ImGui.getWindowHeight()-(2*ImGui.getFontSize())); ImVec2 p0 = ImGui.getItemRectMin(); ImVec2 p1 = ImGui.getItemRectMax(); ImDrawList drawList = ImGui.getWindowDrawList(); drawList.pushClipRect(p0.x, p0.y, p1.x, p1.y); - for(int y=0; y0; x--) { - for (int y=0; yBãß.ℭỗᶇṧⱦᶏꬼȶʂ.INT_ZERO; x--) { + for (int y=Bãß.ℭỗᶇṧⱦᶏꬼȶʂ.INT_ZERO; y0?(random.nextInt(100)<70? charSelect:' '):(random.nextInt(100)<1? charSelect:' '); - gridBuffer[0][y] = charRandom; - if (gridBuffer[0][y]==' ') { - gridRank[y] = 0; + if (gridRank[y] > Bãß.ℭỗᶇṧⱦᶏꬼȶʂ.INT_ZERO) { + gridBuffer[Bãß.ℭỗᶇṧⱦᶏꬼȶʂ.INT_ZERO][y] = random.nextInt(100)<70? charSelect:Bãß.ℭỗᶇṧⱦᶏꬼȶʂ.CHAR_SPACE; + } else { + gridBuffer[Bãß.ℭỗᶇṧⱦᶏꬼȶʂ.INT_ZERO][y] = random.nextInt(100) extends DefaultBãßBȍőnʸᴰ { - // Bȍőn prefix is for set instance enum methods (called DefaultEnumSetʸᴰ) - // Bãß prefix is for single instance enum methods (called DefaultEnumInstanceʸᴰ) + public static final class Ꝑŕḯṿª₮ḕ implements BãßBȍőnꝐŕḯṿª₮ḕ { + private static final String STR_VALUES = "values"; + + private Ꝑŕḯṿª₮ḕ() { + } + } int ordinal(); @@ -20,9 +29,8 @@ public interface DefaultEnumBaseʸᴰ extend @SuppressWarnings("unchecked") default T[] BãßInstances() { try { - Object result = getClass().getMethod(Bãß.ℭỗᶇṧⱦᶏꬼȶʂ.STR_VALUES).invoke(null); - return (T[]) result; - } catch (Exception e) { + return (T[]) getClass().getMethod(Ꝑŕḯṿª₮ḕ.STR_VALUES).invoke(null); + } catch (NoSuchMethodException | IllegalAccessException | IllegalArgumentException | InvocationTargetException | SecurityException e) { throw new RuntimeException(e); } } diff --git a/gdxapp4d-lib-bassboonyd/src/main/java/love/distributedrebirth/bassboonyd/jmx/DefaultEnumBaseᴶᴹˣ.java b/gdxapp4d-lib-bassboonyd/src/main/java/love/distributedrebirth/bassboonyd/jmx/DefaultEnumBaseᴶᴹˣ.java index ae889bf2..5b6db09a 100644 --- a/gdxapp4d-lib-bassboonyd/src/main/java/love/distributedrebirth/bassboonyd/jmx/DefaultEnumBaseᴶᴹˣ.java +++ b/gdxapp4d-lib-bassboonyd/src/main/java/love/distributedrebirth/bassboonyd/jmx/DefaultEnumBaseᴶᴹˣ.java @@ -19,6 +19,12 @@ import love.distributedrebirth.bassboonyd.spider.BãßBȍőnSpiderEgg注; public interface DefaultEnumBaseᴶᴹˣ extends DefaultEnumBaseʸᴰ { public static final class Ꝑŕḯṿª₮ḕ implements BãßBȍőnꝐŕḯṿª₮ḕ { + protected static final String STR_NAME = "name"; + protected static final String STR_TYPE = "type"; + protected static final String STR_DOT = "."; + protected static final String STR_COLON = ":"; + protected static final String STR_IS = "="; + protected static final String STR_COMMA = ","; private static final String GHOST_KEY_JMX = "JMX"; private Ꝑŕḯṿª₮ḕ() { diff --git a/gdxapp4d-lib-bassboonyd/src/main/java/love/distributedrebirth/bassboonyd/jmx/DefaultEnumInstanceᴶᴹˣ.java b/gdxapp4d-lib-bassboonyd/src/main/java/love/distributedrebirth/bassboonyd/jmx/DefaultEnumInstanceᴶᴹˣ.java index a13744ca..44f709a3 100644 --- a/gdxapp4d-lib-bassboonyd/src/main/java/love/distributedrebirth/bassboonyd/jmx/DefaultEnumInstanceᴶᴹˣ.java +++ b/gdxapp4d-lib-bassboonyd/src/main/java/love/distributedrebirth/bassboonyd/jmx/DefaultEnumInstanceᴶᴹˣ.java @@ -5,7 +5,6 @@ import java.lang.management.ManagementFactory; import javax.management.MBeanServer; import javax.management.ObjectName; -import love.distributedrebirth.bassboonyd.Bãß; import love.distributedrebirth.bassboonyd.BãßBȍőnPhaseBarrierʸᴰ; import love.distributedrebirth.bassboonyd.DefaultEnumInstanceʸᴰ; import love.distributedrebirth.bassboonyd.clazz.BãßBȍőnAuthor注; @@ -26,9 +25,9 @@ public interface DefaultEnumInstanceᴶᴹˣ try { StringBuilder name = new StringBuilder(); name.append(boon.BãßPackageNaam()); - name.append(Bãß.ℭỗᶇṧⱦᶏꬼȶʂ.STR_COLON); - name.append(Bãß.ℭỗᶇṧⱦᶏꬼȶʂ.STR_TYPE); - name.append(Bãß.ℭỗᶇṧⱦᶏꬼȶʂ.STR_IS); + name.append(DefaultEnumBaseᴶᴹˣ.Ꝑŕḯṿª₮ḕ.STR_COLON); + name.append(DefaultEnumBaseᴶᴹˣ.Ꝑŕḯṿª₮ḕ.STR_TYPE); + name.append(DefaultEnumBaseᴶᴹˣ.Ꝑŕḯṿª₮ḕ.STR_IS); name.append(boon.BãßInfoNaam()); MBeanServer server = ManagementFactory.getPlatformMBeanServer(); diff --git a/gdxapp4d-lib-bassboonyd/src/main/java/love/distributedrebirth/bassboonyd/jmx/DefaultEnumSetᴶᴹˣ.java b/gdxapp4d-lib-bassboonyd/src/main/java/love/distributedrebirth/bassboonyd/jmx/DefaultEnumSetᴶᴹˣ.java index c9cf281e..fe997592 100644 --- a/gdxapp4d-lib-bassboonyd/src/main/java/love/distributedrebirth/bassboonyd/jmx/DefaultEnumSetᴶᴹˣ.java +++ b/gdxapp4d-lib-bassboonyd/src/main/java/love/distributedrebirth/bassboonyd/jmx/DefaultEnumSetᴶᴹˣ.java @@ -5,7 +5,6 @@ import java.lang.management.ManagementFactory; import javax.management.MBeanServer; import javax.management.ObjectName; -import love.distributedrebirth.bassboonyd.Bãß; import love.distributedrebirth.bassboonyd.BãßBȍőnPhaseBarrierʸᴰ; import love.distributedrebirth.bassboonyd.DefaultEnumSetʸᴰ; import love.distributedrebirth.bassboonyd.clazz.BãßBȍőnAuthor注; @@ -26,13 +25,13 @@ public interface DefaultEnumSetᴶᴹˣ exten try { StringBuilder name = new StringBuilder(); name.append(boon.BãßPackageNaam()); - name.append(Bãß.ℭỗᶇṧⱦᶏꬼȶʂ.STR_COLON); - name.append(Bãß.ℭỗᶇṧⱦᶏꬼȶʂ.STR_TYPE); - name.append(Bãß.ℭỗᶇṧⱦᶏꬼȶʂ.STR_IS); + name.append(DefaultEnumBaseᴶᴹˣ.Ꝑŕḯṿª₮ḕ.STR_COLON); + name.append(DefaultEnumBaseᴶᴹˣ.Ꝑŕḯṿª₮ḕ.STR_TYPE); + name.append(DefaultEnumBaseᴶᴹˣ.Ꝑŕḯṿª₮ḕ.STR_IS); name.append(boon.BãßInfoNaam()); - name.append(Bãß.ℭỗᶇṧⱦᶏꬼȶʂ.STR_COMMA); - name.append(Bãß.ℭỗᶇṧⱦᶏꬼȶʂ.STR_NAME); - name.append(Bãß.ℭỗᶇṧⱦᶏꬼȶʂ.STR_IS); + name.append(DefaultEnumBaseᴶᴹˣ.Ꝑŕḯṿª₮ḕ.STR_COMMA); + name.append(DefaultEnumBaseᴶᴹˣ.Ꝑŕḯṿª₮ḕ.STR_NAME); + name.append(DefaultEnumBaseᴶᴹˣ.Ꝑŕḯṿª₮ḕ.STR_IS); name.append(boon.BȍőnNaam()); MBeanServer server = ManagementFactory.getPlatformMBeanServer(); diff --git a/gdxapp4d-lib-numberxd/src/main/java/love/distributedrebirth/numberxd/unicode/BaseGlyphSet.java b/gdxapp4d-lib-numberxd/src/main/java/love/distributedrebirth/numberxd/unicode/BaseGlyphSet.java index 566bc2f7..06288c42 100644 --- a/gdxapp4d-lib-numberxd/src/main/java/love/distributedrebirth/numberxd/unicode/BaseGlyphSet.java +++ b/gdxapp4d-lib-numberxd/src/main/java/love/distributedrebirth/numberxd/unicode/BaseGlyphSet.java @@ -155,8 +155,8 @@ public enum BaseGlyphSet implements DefaultEnumSetᴶᴹˣ= 'a') { - numberDigit = c - 'a' + 10; + numberDigit = c - Bãß.ℭỗᶇṧⱦᶏꬼȶʂ.CHAR_A + Bãß.ℭỗᶇṧⱦᶏꬼȶʂ.INT_TEN; } else { - numberDigit = c - '0'; + numberDigit = c - Bãß.ℭỗᶇṧⱦᶏꬼȶʂ.CHAR_ZERO; } buf16.append(BȍőnPrintNumber10(numberDigit)); } @@ -242,16 +242,16 @@ public enum BaseGlyphSet implements DefaultEnumSetᴶᴹˣ= 'a') { - numberDigit = c - 'a' + 10; + numberDigit = c - Bãß.ℭỗᶇṧⱦᶏꬼȶʂ.CHAR_A + Bãß.ℭỗᶇṧⱦᶏꬼȶʂ.INT_TEN; } else { - numberDigit = c - '0'; + numberDigit = c - Bãß.ℭỗᶇṧⱦᶏꬼȶʂ.CHAR_ZERO; } if (c2 == 0) { c2 = numberDigit * 16; @@ -298,24 +298,24 @@ public enum BaseGlyphSet implements DefaultEnumSetᴶᴹˣ= 'a') { - numberDigit = c - 'a' + 10; + if (c >= Bãß.ℭỗᶇṧⱦᶏꬼȶʂ.CHAR_A) { + numberDigit = c - Bãß.ℭỗᶇṧⱦᶏꬼȶʂ.CHAR_A + Bãß.ℭỗᶇṧⱦᶏꬼȶʂ.INT_TEN; } else { - numberDigit = c - '0'; + numberDigit = c - Bãß.ℭỗᶇṧⱦᶏꬼȶʂ.CHAR_ZERO; } buf.append(printSet.BȍőnNumber16().BȍőnCharFor(numberDigit)); - if (i= 'a') { - numberDigit = c - 'a' + 10; + numberDigit = c - Bãß.ℭỗᶇṧⱦᶏꬼȶʂ.CHAR_A + 10; } else { - numberDigit = c - '0'; + numberDigit = c - Bãß.ℭỗᶇṧⱦᶏꬼȶʂ.CHAR_ZERO; } buf.append(printSet.BȍőnNumber27().BȍőnCharFor(numberDigit)); - if (i