diff --git a/core/src/love/distributedrebirth/demo4d/Demo4DMain.java b/core/src/love/distributedrebirth/demo4d/Demo4DMain.java index 48ee6488..dc7501ca 100644 --- a/core/src/love/distributedrebirth/demo4d/Demo4DMain.java +++ b/core/src/love/distributedrebirth/demo4d/Demo4DMain.java @@ -15,6 +15,7 @@ import com.badlogic.gdx.utils.ScreenUtils; import imgui.ImGui; import imgui.type.ImBoolean; +import love.distributedrebirth.bassboonyd.BãßBȍőnAuthorInfoʸᴰ; import love.distributedrebirth.demo4d.matrix4d.ScreenMatrix4D; import love.distributedrebirth.demo4d.music.MusicManager; import love.distributedrebirth.demo4d.music.MusicPlayerRenderer; @@ -33,9 +34,8 @@ import net.spookygames.gdx.nativefilechooser.NativeFileChooser; /** * Main loop render dispatcher and event handling. - * - * @author willemtsade ©Δ∞ 仙上主天 */ +@BãßBȍőnAuthorInfoʸᴰ(name = "willemtsade", copyright = "©Δ∞ 仙上主天") public class Demo4DMain extends Game { private List args; public NativeFileChooser fileChooser; diff --git a/core/src/love/distributedrebirth/demo4d/Demo4DMainAdapter.java b/core/src/love/distributedrebirth/demo4d/Demo4DMainAdapter.java index 10e790f8..87162ae2 100644 --- a/core/src/love/distributedrebirth/demo4d/Demo4DMainAdapter.java +++ b/core/src/love/distributedrebirth/demo4d/Demo4DMainAdapter.java @@ -2,11 +2,9 @@ package love.distributedrebirth.demo4d; import com.badlogic.gdx.ScreenAdapter; -/** - * - * - * @author willemtsade ©Δ∞ 仙上主天 - */ +import love.distributedrebirth.bassboonyd.BãßBȍőnAuthorInfoʸᴰ; + +@BãßBȍőnAuthorInfoʸᴰ(name = "willemtsade", copyright = "©Δ∞ 仙上主天") public class Demo4DMainAdapter extends ScreenAdapter { protected final Demo4DMain main; diff --git a/core/src/love/distributedrebirth/demo4d/ImGuiRenderer.java b/core/src/love/distributedrebirth/demo4d/ImGuiRenderer.java index 63e8d5dd..4abbf63d 100644 --- a/core/src/love/distributedrebirth/demo4d/ImGuiRenderer.java +++ b/core/src/love/distributedrebirth/demo4d/ImGuiRenderer.java @@ -1,12 +1,9 @@ package love.distributedrebirth.demo4d; import imgui.type.ImBoolean; +import love.distributedrebirth.bassboonyd.BãßBȍőnAuthorInfoʸᴰ; -/** - * - * - * @author willemtsade ©Δ∞ 仙上主天 - */ +@BãßBȍőnAuthorInfoʸᴰ(name = "willemtsade", copyright = "©Δ∞ 仙上主天") public interface ImGuiRenderer { void render(ImBoolean widgetOpen); diff --git a/core/src/love/distributedrebirth/demo4d/ImGuiRendererMain.java b/core/src/love/distributedrebirth/demo4d/ImGuiRendererMain.java index 00f66e3c..dc6d2c65 100644 --- a/core/src/love/distributedrebirth/demo4d/ImGuiRendererMain.java +++ b/core/src/love/distributedrebirth/demo4d/ImGuiRendererMain.java @@ -1,10 +1,8 @@ package love.distributedrebirth.demo4d; -/** - * - * - * @author willemtsade ©Δ∞ 仙上主天 - */ +import love.distributedrebirth.bassboonyd.BãßBȍőnAuthorInfoʸᴰ; + +@BãßBȍőnAuthorInfoʸᴰ(name = "willemtsade", copyright = "©Δ∞ 仙上主天") abstract public class ImGuiRendererMain implements ImGuiRenderer { protected final Demo4DMain main; diff --git a/core/src/love/distributedrebirth/demo4d/ImGuiSetup.java b/core/src/love/distributedrebirth/demo4d/ImGuiSetup.java index a0f57969..6f39946c 100644 --- a/core/src/love/distributedrebirth/demo4d/ImGuiSetup.java +++ b/core/src/love/distributedrebirth/demo4d/ImGuiSetup.java @@ -8,12 +8,12 @@ import imgui.ImGui; import imgui.ImGuiIO; import imgui.gl3.ImGuiImplGl3; import imgui.glfw.ImGuiImplGlfw; +import love.distributedrebirth.bassboonyd.BãßBȍőnAuthorInfoʸᴰ; /** * Create and shutdown of ImGui and font activations. - * - * @author willemtsade ©Δ∞ 仙上主天 */ +@BãßBȍőnAuthorInfoʸᴰ(name = "willemtsade", copyright = "©Δ∞ 仙上主天") public class ImGuiSetup { public static final ImGuiImplGlfw imGuiImp = new ImGuiImplGlfw(); public static final ImGuiImplGl3 imGuiGlImp = new ImGuiImplGl3(); @@ -29,7 +29,7 @@ public class ImGuiSetup { ImGui.createContext(); initFonts(ImGui.getIO()); imGuiImp.init(windowHandle, true); - imGuiGlImp.init("#version 150"); + imGuiGlImp.init("#version 140"); ImGui.init(); ImGui.styleColorsLight(); diff --git a/core/src/love/distributedrebirth/demo4d/matrix4d/ScreenMatrix4D.java b/core/src/love/distributedrebirth/demo4d/matrix4d/ScreenMatrix4D.java index 464eddd5..b0276c02 100644 --- a/core/src/love/distributedrebirth/demo4d/matrix4d/ScreenMatrix4D.java +++ b/core/src/love/distributedrebirth/demo4d/matrix4d/ScreenMatrix4D.java @@ -27,14 +27,11 @@ import com.badlogic.gdx.utils.viewport.ScreenViewport; import imgui.ImGui; import imgui.flag.ImGuiCond; +import love.distributedrebirth.bassboonyd.BãßBȍőnAuthorInfoʸᴰ; import love.distributedrebirth.demo4d.Demo4DMain; import love.distributedrebirth.demo4d.Demo4DMainAdapter; -/** - * - * - * @author willemtsade ©Δ∞ 仙上主天 - */ +@BãßBȍőnAuthorInfoʸᴰ(name = "willemtsade", copyright = "©Δ∞ 仙上主天") public class ScreenMatrix4D extends Demo4DMainAdapter { public Environment environment; public PerspectiveCamera cam; diff --git a/core/src/love/distributedrebirth/demo4d/matrix4d/UserColorShader.java b/core/src/love/distributedrebirth/demo4d/matrix4d/UserColorShader.java index 21262886..e88102df 100644 --- a/core/src/love/distributedrebirth/demo4d/matrix4d/UserColorShader.java +++ b/core/src/love/distributedrebirth/demo4d/matrix4d/UserColorShader.java @@ -11,11 +11,9 @@ import com.badlogic.gdx.graphics.g3d.utils.RenderContext; import com.badlogic.gdx.graphics.glutils.ShaderProgram; import com.badlogic.gdx.utils.GdxRuntimeException; -/** - * - * - * @author willemtsade ©Δ∞ 仙上主天 - */ +import love.distributedrebirth.bassboonyd.BãßBȍőnAuthorInfoʸᴰ; + +@BãßBȍőnAuthorInfoʸᴰ(name = "willemtsade", copyright = "©Δ∞ 仙上主天") public class UserColorShader implements Shader { ShaderProgram program; Camera camera; diff --git a/core/src/love/distributedrebirth/demo4d/music/MusicManager.java b/core/src/love/distributedrebirth/demo4d/music/MusicManager.java index d1a30095..f5a218f9 100644 --- a/core/src/love/distributedrebirth/demo4d/music/MusicManager.java +++ b/core/src/love/distributedrebirth/demo4d/music/MusicManager.java @@ -8,11 +8,12 @@ import com.badlogic.gdx.audio.Music; import com.badlogic.gdx.audio.Music.OnCompletionListener; import com.badlogic.gdx.files.FileHandle; +import love.distributedrebirth.bassboonyd.BãßBȍőnAuthorInfoʸᴰ; + /** * Manages the background and others songs. - * - * @author willemtsade ©Δ∞ 仙上主天 */ +@BãßBȍőnAuthorInfoʸᴰ(name = "willemtsade", copyright = "©Δ∞ 仙上主天") public class MusicManager { private final MusicSong introSong; diff --git a/core/src/love/distributedrebirth/demo4d/music/MusicPlayerRenderer.java b/core/src/love/distributedrebirth/demo4d/music/MusicPlayerRenderer.java index 2644250d..8b89ba65 100644 --- a/core/src/love/distributedrebirth/demo4d/music/MusicPlayerRenderer.java +++ b/core/src/love/distributedrebirth/demo4d/music/MusicPlayerRenderer.java @@ -12,15 +12,15 @@ import imgui.flag.ImGuiTableColumnFlags; import imgui.flag.ImGuiTableFlags; import imgui.type.ImBoolean; import love.distributedrebirth.demo4d.ImGuiRendererMain; +import love.distributedrebirth.bassboonyd.BãßBȍőnAuthorInfoʸᴰ; import love.distributedrebirth.demo4d.Demo4DMain; import net.spookygames.gdx.nativefilechooser.NativeFileChooserCallback; import net.spookygames.gdx.nativefilechooser.NativeFileChooserConfiguration; /** - * - * - * @author willemtsade ©Δ∞ 仙上主天 + * The music player ui. */ +@BãßBȍőnAuthorInfoʸᴰ(name = "willemtsade", copyright = "©Δ∞ 仙上主天") public class MusicPlayerRenderer extends ImGuiRendererMain { private final NativeFileChooserConfiguration fileChooserConfig; diff --git a/core/src/love/distributedrebirth/demo4d/music/MusicSong.java b/core/src/love/distributedrebirth/demo4d/music/MusicSong.java index 0e4ab5de..d4a00bd8 100644 --- a/core/src/love/distributedrebirth/demo4d/music/MusicSong.java +++ b/core/src/love/distributedrebirth/demo4d/music/MusicSong.java @@ -2,11 +2,12 @@ package love.distributedrebirth.demo4d.music; import com.badlogic.gdx.audio.Music; +import love.distributedrebirth.bassboonyd.BãßBȍőnAuthorInfoʸᴰ; + /** - * - * - * @author willemtsade ©Δ∞ 仙上主天 + * The music with the (file) name. */ +@BãßBȍőnAuthorInfoʸᴰ(name = "willemtsade", copyright = "©Δ∞ 仙上主天") public class MusicSong { protected final Music music; private final String name; diff --git a/core/src/love/distributedrebirth/demo4d/music/MusicSongType.java b/core/src/love/distributedrebirth/demo4d/music/MusicSongType.java index 47cd7bd6..7bb179ba 100644 --- a/core/src/love/distributedrebirth/demo4d/music/MusicSongType.java +++ b/core/src/love/distributedrebirth/demo4d/music/MusicSongType.java @@ -1,10 +1,11 @@ package love.distributedrebirth.demo4d.music; +import love.distributedrebirth.bassboonyd.BãßBȍőnAuthorInfoʸᴰ; + /** - * - * - * @author willemtsade ©Δ∞ 仙上主天 + * The song types. */ +@BãßBȍőnAuthorInfoʸᴰ(name = "willemtsade", copyright = "©Δ∞ 仙上主天") public enum MusicSongType { INTRO, CREDITS, diff --git a/core/src/love/distributedrebirth/demo4d/screen/BasePartRenderer.java b/core/src/love/distributedrebirth/demo4d/screen/BasePartRenderer.java index 31e4ff93..2e77398d 100644 --- a/core/src/love/distributedrebirth/demo4d/screen/BasePartRenderer.java +++ b/core/src/love/distributedrebirth/demo4d/screen/BasePartRenderer.java @@ -8,6 +8,7 @@ import imgui.flag.ImGuiCond; import imgui.flag.ImGuiTableFlags; import imgui.type.ImBoolean; import imgui.type.ImInt; +import love.distributedrebirth.bassboonyd.BãßBȍőnAuthorInfoʸᴰ; import love.distributedrebirth.demo4d.Demo4DMain; import love.distributedrebirth.demo4d.ImGuiRendererMain; import love.distributedrebirth.numberxd.base2t.BasePartFactory; @@ -18,11 +19,7 @@ import love.distributedrebirth.numberxd.base2t.part.BãßBȍőnPartAlt3ʸᴰ; import love.distributedrebirth.numberxd.base2t.part.BãßBȍőnPartAlt4ʸᴰ; import love.distributedrebirth.numberxd.base2t.part.BãßBȍőnPartʸᴰ; -/** - * - * - * @author willemtsade ©Δ∞ 仙上主天 - */ +@BãßBȍőnAuthorInfoʸᴰ(name = "willemtsade", copyright = "©Δ∞ 仙上主天") public class BasePartRenderer extends ImGuiRendererMain { private ImInt selectedBasePart = new ImInt(); diff --git a/core/src/love/distributedrebirth/demo4d/screen/BasicConsoleRenderer.java b/core/src/love/distributedrebirth/demo4d/screen/BasicConsoleRenderer.java index e59d4cc3..4a8652f2 100644 --- a/core/src/love/distributedrebirth/demo4d/screen/BasicConsoleRenderer.java +++ b/core/src/love/distributedrebirth/demo4d/screen/BasicConsoleRenderer.java @@ -3,14 +3,11 @@ package love.distributedrebirth.demo4d.screen; import imgui.ImGui; import imgui.flag.ImGuiCond; import imgui.type.ImBoolean; +import love.distributedrebirth.bassboonyd.BãßBȍőnAuthorInfoʸᴰ; import love.distributedrebirth.demo4d.Demo4DMain; import love.distributedrebirth.demo4d.ImGuiRendererMain; -/** - * - * - * @author willemtsade ©Δ∞ 仙上主天 - */ +@BãßBȍőnAuthorInfoʸᴰ(name = "willemtsade", copyright = "©Δ∞ 仙上主天") public class BasicConsoleRenderer extends ImGuiRendererMain { public BasicConsoleRenderer(Demo4DMain main) { diff --git a/core/src/love/distributedrebirth/demo4d/screen/HebrewWalletRenderer.java b/core/src/love/distributedrebirth/demo4d/screen/HebrewWalletRenderer.java index 992e828a..1b607432 100644 --- a/core/src/love/distributedrebirth/demo4d/screen/HebrewWalletRenderer.java +++ b/core/src/love/distributedrebirth/demo4d/screen/HebrewWalletRenderer.java @@ -4,15 +4,12 @@ import imgui.ImGui; import imgui.flag.ImGuiCond; import imgui.flag.ImGuiTableFlags; import imgui.type.ImBoolean; +import love.distributedrebirth.bassboonyd.BãßBȍőnAuthorInfoʸᴰ; import love.distributedrebirth.demo4d.Demo4DMain; import love.distributedrebirth.demo4d.ImGuiRendererMain; import love.distributedrebirth.numberxd.Gê̄ldGetậl; -/** - * - * - * @author willemtsade ©Δ∞ 仙上主天 - */ +@BãßBȍőnAuthorInfoʸᴰ(name = "willemtsade", copyright = "©Δ∞ 仙上主天") public class HebrewWalletRenderer extends ImGuiRendererMain { public HebrewWalletRenderer(Demo4DMain main) { diff --git a/core/src/love/distributedrebirth/demo4d/screen/ScreenCredits.java b/core/src/love/distributedrebirth/demo4d/screen/ScreenCredits.java index 8fe8e5db..adb75c05 100644 --- a/core/src/love/distributedrebirth/demo4d/screen/ScreenCredits.java +++ b/core/src/love/distributedrebirth/demo4d/screen/ScreenCredits.java @@ -2,14 +2,11 @@ package love.distributedrebirth.demo4d.screen; import com.badlogic.gdx.Screen; +import love.distributedrebirth.bassboonyd.BãßBȍőnAuthorInfoʸᴰ; import love.distributedrebirth.demo4d.Demo4DMain; import love.distributedrebirth.demo4d.music.MusicSongType; -/** - * - * - * @author willemtsade ©Δ∞ 仙上主天 - */ +@BãßBȍőnAuthorInfoʸᴰ(name = "willemtsade", copyright = "©Δ∞ 仙上主天") public class ScreenCredits extends ScrollScreenAdapter { private final String creditsText = String.join("\n", "Credits;", diff --git a/core/src/love/distributedrebirth/demo4d/screen/ScreenDefault.java b/core/src/love/distributedrebirth/demo4d/screen/ScreenDefault.java index 52455369..284ae5d0 100644 --- a/core/src/love/distributedrebirth/demo4d/screen/ScreenDefault.java +++ b/core/src/love/distributedrebirth/demo4d/screen/ScreenDefault.java @@ -5,13 +5,10 @@ import com.badlogic.gdx.ScreenAdapter; import com.badlogic.gdx.graphics.Texture; import com.badlogic.gdx.utils.ScreenUtils; +import love.distributedrebirth.bassboonyd.BãßBȍőnAuthorInfoʸᴰ; import love.distributedrebirth.demo4d.Demo4DMain; -/** - * - * - * @author willemtsade ©Δ∞ 仙上主天 - */ +@BãßBȍőnAuthorInfoʸᴰ(name = "willemtsade", copyright = "©Δ∞ 仙上主天") public class ScreenDefault extends ScreenAdapter { private final Demo4DMain main; private Texture backgroundImage; diff --git a/core/src/love/distributedrebirth/demo4d/screen/ScreenHelp.java b/core/src/love/distributedrebirth/demo4d/screen/ScreenHelp.java index 6486e5a7..85f4f26c 100644 --- a/core/src/love/distributedrebirth/demo4d/screen/ScreenHelp.java +++ b/core/src/love/distributedrebirth/demo4d/screen/ScreenHelp.java @@ -2,14 +2,11 @@ package love.distributedrebirth.demo4d.screen; import com.badlogic.gdx.Screen; +import love.distributedrebirth.bassboonyd.BãßBȍőnAuthorInfoʸᴰ; import love.distributedrebirth.demo4d.Demo4DMain; import love.distributedrebirth.demo4d.music.MusicSongType; -/** - * - * - * @author willemtsade ©Δ∞ 仙上主天 - */ +@BãßBȍőnAuthorInfoʸᴰ(name = "willemtsade", copyright = "©Δ∞ 仙上主天") public class ScreenHelp extends ScrollScreenAdapter { private final String creditsText = String.join("\n", "Genesis 11", diff --git a/core/src/love/distributedrebirth/demo4d/screen/ScreenIntro.java b/core/src/love/distributedrebirth/demo4d/screen/ScreenIntro.java index 17e8c489..1278519f 100644 --- a/core/src/love/distributedrebirth/demo4d/screen/ScreenIntro.java +++ b/core/src/love/distributedrebirth/demo4d/screen/ScreenIntro.java @@ -6,14 +6,11 @@ import com.badlogic.gdx.Input.Keys; import com.badlogic.gdx.graphics.Texture; import com.badlogic.gdx.utils.ScreenUtils; +import love.distributedrebirth.bassboonyd.BãßBȍőnAuthorInfoʸᴰ; import love.distributedrebirth.demo4d.Demo4DMain; import love.distributedrebirth.demo4d.music.MusicSongType; -/** - * - * - * @author willemtsade ©Δ∞ 仙上主天 - */ +@BãßBȍőnAuthorInfoʸᴰ(name = "willemtsade", copyright = "©Δ∞ 仙上主天") public class ScreenIntro extends ScreenAdapter { private final Demo4DMain main; private Texture backgroundImage; diff --git a/core/src/love/distributedrebirth/demo4d/screen/ScreenIntroMission.java b/core/src/love/distributedrebirth/demo4d/screen/ScreenIntroMission.java index 3ca9d9ba..b7dc450a 100644 --- a/core/src/love/distributedrebirth/demo4d/screen/ScreenIntroMission.java +++ b/core/src/love/distributedrebirth/demo4d/screen/ScreenIntroMission.java @@ -2,14 +2,11 @@ package love.distributedrebirth.demo4d.screen; import com.badlogic.gdx.Screen; +import love.distributedrebirth.bassboonyd.BãßBȍőnAuthorInfoʸᴰ; import love.distributedrebirth.demo4d.Demo4DMain; import love.distributedrebirth.demo4d.music.MusicSongType; -/** - * - * - * @author willemtsade ©Δ∞ 仙上主天 - */ +@BãßBȍőnAuthorInfoʸᴰ(name = "willemtsade", copyright = "©Δ∞ 仙上主天") public class ScreenIntroMission extends ScrollScreenAdapter { private final String missionText = String.join("\n", "To a Waterfowl", diff --git a/core/src/love/distributedrebirth/demo4d/screen/ScreenUnicode4D.java b/core/src/love/distributedrebirth/demo4d/screen/ScreenUnicode4D.java index c7a16f68..514133b0 100644 --- a/core/src/love/distributedrebirth/demo4d/screen/ScreenUnicode4D.java +++ b/core/src/love/distributedrebirth/demo4d/screen/ScreenUnicode4D.java @@ -5,14 +5,11 @@ import imgui.ImDrawList; import imgui.ImGui; import imgui.ImVec2; import imgui.flag.ImGuiCond; +import love.distributedrebirth.bassboonyd.BãßBȍőnAuthorInfoʸᴰ; import love.distributedrebirth.demo4d.Demo4DMain; import love.distributedrebirth.demo4d.Demo4DMainAdapter; -/** - * - * - * @author willemtsade ©Δ∞ 仙上主天 - */ +@BãßBȍőnAuthorInfoʸᴰ(name = "willemtsade", copyright = "©Δ∞ 仙上主天") public class ScreenUnicode4D extends Demo4DMainAdapter { public ScreenUnicode4D(final Demo4DMain main) { diff --git a/core/src/love/distributedrebirth/demo4d/screen/ScrollScreenAdapter.java b/core/src/love/distributedrebirth/demo4d/screen/ScrollScreenAdapter.java index 92202775..cca86486 100644 --- a/core/src/love/distributedrebirth/demo4d/screen/ScrollScreenAdapter.java +++ b/core/src/love/distributedrebirth/demo4d/screen/ScrollScreenAdapter.java @@ -6,14 +6,11 @@ import com.badlogic.gdx.Input.Keys; import com.badlogic.gdx.graphics.Texture; import com.badlogic.gdx.utils.ScreenUtils; +import love.distributedrebirth.bassboonyd.BãßBȍőnAuthorInfoʸᴰ; import love.distributedrebirth.demo4d.Demo4DMain; import love.distributedrebirth.demo4d.Demo4DMainAdapter; -/** - * - * - * @author willemtsade ©Δ∞ 仙上主天 - */ +@BãßBȍőnAuthorInfoʸᴰ(name = "willemtsade", copyright = "©Δ∞ 仙上主天") abstract public class ScrollScreenAdapter extends Demo4DMainAdapter { private static final int LINE_HEIGHT = 16; private float scrollDeltaTime = 0f; diff --git a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/glyph/BaseGlyphSet.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/glyph/BaseGlyphSet.java index 053535ad..71aa7601 100644 --- a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/glyph/BaseGlyphSet.java +++ b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/glyph/BaseGlyphSet.java @@ -4,6 +4,8 @@ import love.distributedrebirth.bassboonyd.BãßBȍőnAuthorInfoʸᴰ; import love.distributedrebirth.bassboonyd.BãßBȍőnClassInfoʸᴰ; import love.distributedrebirth.bassboonyd.BãßBȍőnCoffinOpenʸᴰ; import love.distributedrebirth.bassboonyd.BãßBȍőnCoffinʸᴰ; +import love.distributedrebirth.numberxd.base2t.part.T10PartDecimal; +import love.distributedrebirth.numberxd.base2t.part.T16PartHex; @BãßBȍőnAuthorInfoʸᴰ(name = "willemtsade", copyright = "©Δ∞ 仙上主天") @BãßBȍőnClassInfoʸᴰ(name = "BaseGlyphSet", purpose = "The encoded base scripts.") @@ -14,58 +16,71 @@ public enum BaseGlyphSet implements BãßBȍőnGlyphSetʸᴰ { // TODO: ImGui add font for BURMESE // TODO: ImGui add font for ARABIC - BURMESE(new BaseGlyphSetNumber10("\u1040","\u1041","\u1042","\u1043","\u1044","\u1045","\u1046","\u1047","\u1048","\u1049")), - BENGALI(new BaseGlyphSetNumber10("০","১","২","৩","৪","৫","৬","৭","৮","৯")), - SINHALA(new BaseGlyphSetNumber10("෦","෧","෨","෩","෪","෫","෬","෭","෮","෯")), - - TONE_LETTER(new BaseGlyphSetNumber10("˥","˦","˧","˨","˩","꜒","꜓","꜔","꜕","꜖"), - new BaseGlyphSetNumber16("˧˥˩","˧˩˥","˧˥˦","˧˩˨","˧˦˦","˧˨˨","˧˥˥","˧˩˩","˥˩˧","˩˥˧","˥˦˧","˩˨˧","˦˦˧","˨˨˧","˥˥˧","˩˩˧"), - new BaseGlyphSetNumber36("꜊꜈","꜊꜉","꜊꜋","꜊꜌","꜊꜍","꜊꜎","꜊꜏","꜊꜐","꜊꜑","˧˥","˧˦","˧˨","˧˩","˧꜒","˧꜓","˧꜔","˧꜕","˧꜖","꜏˥","꜏˦","꜏˧","꜏˨","꜏˩","꜏꜍","꜏꜎","꜏꜐","꜏꜑")), + LATIN_DTMF(new BaseGlyphSetNumber(v -> T10PartDecimal.PART_1.BãßVoorElk(x -> v.add(x.BȍőnChinaValue()))).withSeperator(" "), + new BaseGlyphSetNumber("1","2","3","A","4","5","6","B","7","8","9","C","*","0","#","D"), + null), + LATIN_BASIC(new BaseGlyphSetNumber(v -> T10PartDecimal.PART_1.BãßVoorElk(x -> v.add(Integer.toString(x.BȍőnRangTelNul())))), + new BaseGlyphSetNumber(v -> T16PartHex.PART_1.BãßVoorElk(x -> v.add(x.BȍőnAlt1Value()))), + new BaseGlyphSetNumber("1","2","3","4","5","6","7","8","9","A","B","C","D","E","F","G","H","I","J","K","L","M","N","O","P","Q","R")), + LATIN_TOP16(new BaseGlyphSetNumber("⁰","¹","²","³","⁴","⁵","⁶","⁷","⁸","⁹"), + new BaseGlyphSetNumber("⁰","¹","²","³","⁴","⁵","⁶","⁷","⁸","⁹","ᵃ","ᵇ","ᶜ","ᵈ","ᵉ","ᶠ"), + new BaseGlyphSetNumber("¹","²","³","⁴","⁵","⁶","⁷","⁸","⁹","ᵃ","ᵇ","ᶜ","ᵈ","ᵉ","ᶠ","ᴳ","ᴴ","ᴵ","ᴶ","ᴷ","ᴸ","ᴹ","ᴺ","ᴼ","ᴾ","Q","ᴿ")), + LATIN_SUB16(new BaseGlyphSetNumber("₀","₁","₂","₃","₄","₅","₆","₇","₈","₉"), + new BaseGlyphSetNumber("₀","₁","₂","₃","₄","₅","₆","₇","₈","₉","ₐ","₆","꜀","ₔ","ₑ","բ"), + new BaseGlyphSetNumber("₁","₂","₃","₄","₅","₆","₇","₈","₉","ₐ","₆","꜀","ₔ","ₑ","բ","G","ₕ","ᵢ","ⱼ","ₖ","ₗ","ₘ","ₙ","ₒ","ₚ","Q","ᵣ")), + TONE_LETTER(new BaseGlyphSetNumber(v -> T10PartDecimal.PART_1.BãßVoorElk(x -> v.add(x.BȍőnIdentifierTone()))), + new BaseGlyphSetNumber(v -> T16PartHex.PART_1.BãßVoorElk(x -> v.add(x.BȍőnIdentifierTone()))), + new BaseGlyphSetNumber("꜊꜈","꜊꜉","꜊꜋","꜊꜌","꜊꜍","꜊꜎","꜊꜏","꜊꜐","꜊꜑","˧˥","˧˦","˧˨","˧˩","˧꜒","˧꜓","˧꜔","˧꜕","˧꜖","꜏˥","꜏˦","꜏˧","꜏˨","꜏˩","꜏꜍","꜏꜎","꜏꜐","꜏꜑")), - GREEK(new BaseGlyphSetNumber10("ō","α","β","γ","δ","ε","ϝ","ζ","η","θ"), - new BaseGlyphSetNumber16("ō","α","β","γ","δ","ε","ϝ","ζ","η","θ","ι","κ","λ","μ","ν","ξ"), - new BaseGlyphSetNumber36("α","β","γ","δ","ε","ϝ","ζ","η","θ","ι","κ","λ","μ","ν","ξ","ο","π","ϟ","ρ","σ","τ","υ","φ","χ","ψ","ω","ϡ")), + DIPAVALI_TONE_LR_TOP16(new BaseGlyphSetNumber(v -> T10PartDecimal.PART_1.BãßVoorElk(x -> v.add(x.BȍőnAlt1Value()))), + new BaseGlyphSetNumber("˧˥˩","˧˩˥","˧˥˦","˧˩˨","˧˦˦","˧˨˨","˧˥˥","˧˩˩","˥˩˧","˩˥˧","˥˦˧","˩˨˧","˦˦˧","˨˨˧","˥˥˧","˩˩˧").withAltGlyphSet(BaseGlyphSet.LATIN_TOP16), + null), + DIPAVALI_TONE_LR_SUB16(new BaseGlyphSetNumber(v -> T10PartDecimal.PART_1.BãßVoorElk(x -> v.add(x.BȍőnAlt1Value()))), + new BaseGlyphSetNumber("˧˥˩","˧˩˥","˧˥˦","˧˩˨","˧˦˦","˧˨˨","˧˥˥","˧˩˩","˥˩˧","˩˥˧","˥˦˧","˩˨˧","˦˦˧","˨˨˧","˥˥˧","˩˩˧").withAltGlyphSet(BaseGlyphSet.LATIN_SUB16), + null), + DIPAVALI_TONE_RL_TOP16(new BaseGlyphSetNumber(v -> T10PartDecimal.PART_1.BãßVoorElk(x -> v.add(x.BȍőnAlt2Value()))), + new BaseGlyphSetNumber("꜔꜒꜖","꜔꜖꜒","꜔꜒꜓","꜔꜖꜕","꜔꜓꜓","꜔꜕꜕","꜔꜒꜒","꜔꜖꜖","꜒꜖꜔","꜖꜒꜔","꜒꜓꜔","꜖꜕꜔","꜓꜓꜔","꜕꜕꜔","꜒꜒꜔","꜖꜖꜔").withAltGlyphSet(BaseGlyphSet.LATIN_TOP16), + null), + DIPAVALI_TONE_RL_SUB16(new BaseGlyphSetNumber(v -> T10PartDecimal.PART_1.BãßVoorElk(x -> v.add(x.BȍőnAlt2Value()))), + new BaseGlyphSetNumber("꜔꜒꜖","꜔꜖꜒","꜔꜒꜓","꜔꜖꜕","꜔꜓꜓","꜔꜕꜕","꜔꜒꜒","꜔꜖꜖","꜒꜖꜔","꜖꜒꜔","꜒꜓꜔","꜖꜕꜔","꜓꜓꜔","꜕꜕꜔","꜒꜒꜔","꜖꜖꜔").withAltGlyphSet(BaseGlyphSet.LATIN_SUB16), + null), - KOREAN(new BaseGlyphSetNumber10("영","일","이","삼","사","오","육","칠","팔","구"), - new BaseGlyphSetNumber16("ㅏ","ㅐ","ㅑ","ㅒ","ㅓ","ㅔ","ㅕ","ㅖ","ㅗ","ㅘ","ㅙ","ㅚ","ㅛ","ㅜ","ㅝ","ㅞ"), - new BaseGlyphSetNumber36("ㄱ","ㄲ","ㄴ","ㄷ","ㄸ","ㄹ","ㅁ","ㅂ","ㅃ","ㅅ","ㅆ","ㅈ","ㅉ","ㅊ","ㅋ","ㅌ","ㅍ","ㅎ","ㄵ","ㄶ","ㄺ","ㄻ","ㄼ","ㄽ","ㄾ","ㄿ","ㅀ")), + BURMESE(new BaseGlyphSetNumber("\u1040","\u1041","\u1042","\u1043","\u1044","\u1045","\u1046","\u1047","\u1048","\u1049")), + BENGALI(new BaseGlyphSetNumber("০","১","২","৩","৪","৫","৬","৭","৮","৯")), + SINHALA(new BaseGlyphSetNumber("෦","෧","෨","෩","෪","෫","෬","෭","෮","෯")), + CHINA_FINANCIAL_T(new BaseGlyphSetNumber(v -> T10PartDecimal.PART_1.BãßVoorElk(x -> v.add(x.BȍőnChinaKey()))), + new BaseGlyphSetNumber(v -> T16PartHex.PART_1.BãßVoorElk(x -> v.add(x.BȍőnChinaKey()))).withAltGlyphSet(BaseGlyphSet.LATIN_TOP16), + null), + CHINA_FINANCIAL_S(new BaseGlyphSetNumber("零","壹","贰","叁","肆","伍","陆","柒","捌","玖")), + CHINA_NORMAL_T(new BaseGlyphSetNumber("零","一","二","三","四","五","六","七","八","九")), + CHINA_NORMAL_S(new BaseGlyphSetNumber("〇","一","二","三","四","五","六","七","八","九")), - LATIN_BASIC(new BaseGlyphSetNumber10("0","1","2","3","4","5","6","7","8","9"), - new BaseGlyphSetNumber16("0","1","2","3","4","5","6","7","8","9","A","B","C","D","E","F"), - new BaseGlyphSetNumber36("1","2","3","4","5","6","7","8","9","A","B","C","D","E","F","G","H","I","J","K","L","M","N","O","P","Q","R")), + GREEK(new BaseGlyphSetNumber("ō","α","β","γ","δ","ε","ϝ","ζ","η","θ"), + new BaseGlyphSetNumber("ō","α","β","γ","δ","ε","ϝ","ζ","η","θ","ι","κ","λ","μ","ν","ξ").withAltGlyphSet(BaseGlyphSet.LATIN_TOP16), + new BaseGlyphSetNumber("α","β","γ","δ","ε","ϝ","ζ","η","θ","ι","κ","λ","μ","ν","ξ","ο","π","ϟ","ρ","σ","τ","υ","φ","χ","ψ","ω","ϡ")), - LATIN_DTMF(new BaseGlyphSetNumber10("zero","one","two","three","four","five","six","seven","eight","nine").withSeperator(" "), - new BaseGlyphSetNumber16("1","2","3","A","4","5","6","B","7","8","9","C","*","0","#","D")), - LATIN_SUPER(new BaseGlyphSetNumber10("⁰","¹","²","³","⁴","⁵","⁶","⁷","⁸","⁹"), - new BaseGlyphSetNumber16("⁰","¹","²","³","⁴","⁵","⁶","⁷","⁸","⁹","ᵃ","ᵇ","ᶜ","ᵈ","ᵉ","ᶠ")), - LATIN_SUB(new BaseGlyphSetNumber10("₀","₁","₂","₃","₄","₅","₆","₇","₈","₉"), - new BaseGlyphSetNumber16("₀","₁","₂","₃","₄","₅","₆","₇","₈","₉","ₐ","₆","꜀","ₔ","ₑ","բ")), + KOREAN(new BaseGlyphSetNumber("영","일","이","삼","사","오","육","칠","팔","구"), + new BaseGlyphSetNumber("ㅏ","ㅐ","ㅑ","ㅒ","ㅓ","ㅔ","ㅕ","ㅖ","ㅗ","ㅘ","ㅙ","ㅚ","ㅛ","ㅜ","ㅝ","ㅞ").withAltGlyphSet(BaseGlyphSet.LATIN_TOP16), + new BaseGlyphSetNumber("ㄱ","ㄲ","ㄴ","ㄷ","ㄸ","ㄹ","ㅁ","ㅂ","ㅃ","ㅅ","ㅆ","ㅈ","ㅉ","ㅊ","ㅋ","ㅌ","ㅍ","ㅎ","ㄵ","ㄶ","ㄺ","ㄻ","ㄼ","ㄽ","ㄾ","ㄿ","ㅀ")), - HEBREW(new BaseGlyphSetNumber10("אֶפֶס","אֶחָד","שְׁתַּיִם","שְׁלֹשָׁה","אַרְבַּע‎","חֲמִשָּׁה‎","שֵׁשׁ‎","שִׁבְעָה","שְׁמוֹנֶה","תִּשְׁעָה‎").withSeperator(" "), - new BaseGlyphSetNumber36("א","ב","ג","ד","ה","ו","ז","ח","ט","י","כ","ל","מ","נ","ס ","ע","פ","צ","ק","ר","ש","ת","ך","ם","ן","ף","ץ")), - ARABIC(new BaseGlyphSetNumber10("٠","١","٢","٣","٤","٥","٦","٧","٨","٩"), - new BaseGlyphSetNumber36("ا","ب","ج","د","ه","و","ز","ح","ط","ي","ك","ل","م","ن","س","ع","ف","ص","ق","ر","ش","ت","ث","خ","ذ","ض","ظ")), + ARABIC(new BaseGlyphSetNumber("٠","١","٢","٣","٤","٥","٦","٧","٨","٩"), + new BaseGlyphSetNumber("٠","١","٢","٣","٤","٥","٦","٧","٨","٩","ا","ب","ج","د","ه","و").withAltGlyphSet(BaseGlyphSet.LATIN_TOP16), + new BaseGlyphSetNumber("ا","ب","ج","د","ه","و","ز","ح","ط","ي","ك","ل","م","ن","س","ع","ف","ص","ق","ر","ش","ت","ث","خ","ذ","ض","ظ")), + + HEBREW(new BaseGlyphSetNumber("אֶפֶס","אֶחָד","שְׁתַּיִם","שְׁלֹשָׁה","אַרְבַּע‎","חֲמִשָּׁה‎","שֵׁשׁ‎","שִׁבְעָה","שְׁמוֹנֶה","תִּשְׁעָה‎").withSeperator(" "), + new BaseGlyphSetNumber("אֶפֶס","אֶחָד","שְׁתַּיִם","שְׁלֹשָׁה","אַרְבַּע‎","חֲמִשָּׁה‎","שֵׁשׁ‎","שִׁבְעָה","שְׁמוֹנֶה","תִּשְׁעָה‎","א","ב","ג","ד","ה","ו").withAltGlyphSet(BaseGlyphSet.LATIN_TOP16), + new BaseGlyphSetNumber("א","ב","ג","ד","ה","ו","ז","ח","ט","י","כ","ל","מ","נ","ס ","ע","פ","צ","ק","ר","ש","ת","ך","ם","ן","ף","ץ")), ; private final BãßBȍőnCoffinOpenʸᴰ BBC = BãßBȍőnCoffinOpenʸᴰ.newInstance(); public BãßBȍőnCoffinʸᴰ GET_BBC() { return BBC; } public static int LENGTH() { return values().length; }; - private BaseGlyphSet(BaseGlyphSetNumber10 numbers) { - BBC.PUT_OBJ(BãßBȍőnGlyphSetKeyʸᴰ.NUMBERS, numbers); + private BaseGlyphSet(BaseGlyphSetNumber numbers) { + this(numbers, null, null); } - private BaseGlyphSet(BaseGlyphSetNumber10 numbers, BaseGlyphSetNumber36 gematria) { - BBC.PUT_OBJ(BãßBȍőnGlyphSetKeyʸᴰ.NUMBERS, numbers); - BBC.PUT_OBJ(BãßBȍőnGlyphSetKeyʸᴰ.GEMATRIA, gematria); - } - - private BaseGlyphSet(BaseGlyphSetNumber10 numbers, BaseGlyphSetNumber16 hex) { - BBC.PUT_OBJ(BãßBȍőnGlyphSetKeyʸᴰ.NUMBERS, numbers); - BBC.PUT_OBJ(BãßBȍőnGlyphSetKeyʸᴰ.HEXIMALS, hex); - } - - private BaseGlyphSet(BaseGlyphSetNumber10 numbers, BaseGlyphSetNumber16 hex, BaseGlyphSetNumber36 gematria) { + private BaseGlyphSet(BaseGlyphSetNumber numbers, BaseGlyphSetNumber hex, BaseGlyphSetNumber gematria) { BBC.PUT_OBJ(BãßBȍőnGlyphSetKeyʸᴰ.NUMBERS, numbers); BBC.PUT_OBJ(BãßBȍőnGlyphSetKeyʸᴰ.HEXIMALS, hex); BBC.PUT_OBJ(BãßBȍőnGlyphSetKeyʸᴰ.GEMATRIA, gematria); diff --git a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/glyph/BaseGlyphSetNumber.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/glyph/BaseGlyphSetNumber.java index ee975be0..792568cc 100644 --- a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/glyph/BaseGlyphSetNumber.java +++ b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/glyph/BaseGlyphSetNumber.java @@ -1,17 +1,179 @@ package love.distributedrebirth.numberxd.base2t.glyph; -import love.distributedrebirth.bassboonyd.BãßBȍőnAnnotationInfoʸᴰ; +import java.util.ArrayList; +import java.util.List; +import java.util.function.Consumer; + import love.distributedrebirth.bassboonyd.BãßBȍőnAuthorInfoʸᴰ; +import love.distributedrebirth.numberxd.base2t.BaseAppender; @BãßBȍőnAuthorInfoʸᴰ(name = "willemtsade", copyright = "©Δ∞ 仙上主天") -@BãßBȍőnAnnotationInfoʸᴰ(required = {BãßBȍőnGlyphSetNumberInfoʸᴰ.class}) -public interface BaseGlyphSetNumber { - - default BaseGlyphSetNumberType BãßNumberType() { - return getClass().getAnnotation(BãßBȍőnGlyphSetNumberInfoʸᴰ.class).base(); +public final class BaseGlyphSetNumber { + + private final List chars = new ArrayList<>(); + private BaseGlyphSet altGlyphSet = null; + private String charSeperator = ""; + + public BaseGlyphSetNumber(String char0, String char1, String char2, String char3, String char4, String char5, + String char6, String char7, String char8, String char9) { + this.chars.add(char0); + this.chars.add(char1); + this.chars.add(char2); + this.chars.add(char3); + this.chars.add(char4); + this.chars.add(char5); + this.chars.add(char6); + this.chars.add(char7); + this.chars.add(char8); + this.chars.add(char9); } - String BȍőnCharFor(int number); + public BaseGlyphSetNumber(String char0, String char1, String char2, String char3, String char4, String char5, + String char6, String char7, String char8, String char9, String charA, String charB, String charC, + String charD, String charE, String charF) { + this.chars.add(char0); + this.chars.add(char1); + this.chars.add(char2); + this.chars.add(char3); + this.chars.add(char4); + this.chars.add(char5); + this.chars.add(char6); + this.chars.add(char7); + this.chars.add(char8); + this.chars.add(char9); + this.chars.add(charA); + this.chars.add(charB); + this.chars.add(charC); + this.chars.add(charD); + this.chars.add(charE); + this.chars.add(charF); + } - String BȍőnCharSeperator(); + public BaseGlyphSetNumber(String char1, String char2, String char3, String char4, String char5, String char6, + String char7, String char8, String char9, String char10, String char20, String char30, String char40, + String char50, String char60, String char70, String char80, String char90, String char100, String char200, + String char300, String char400, String char500, String char600, String char700, String char800, + String char900) { + this.chars.add(char1); + this.chars.add(char2); + this.chars.add(char3); + this.chars.add(char4); + this.chars.add(char5); + this.chars.add(char6); + this.chars.add(char7); + this.chars.add(char8); + this.chars.add(char9); + this.chars.add(char10); + this.chars.add(char20); + this.chars.add(char30); + this.chars.add(char40); + this.chars.add(char50); + this.chars.add(char60); + this.chars.add(char70); + this.chars.add(char80); + this.chars.add(char90); + this.chars.add(char100); + this.chars.add(char200); + this.chars.add(char300); + this.chars.add(char400); + this.chars.add(char500); + this.chars.add(char600); + this.chars.add(char700); + this.chars.add(char800); + this.chars.add(char900); + } + + public BaseGlyphSetNumber(Consumer> consumer) { + consumer.accept(new BaseAppender() { + + @Override + public void add(String value) { + chars.add(value); + } + }); + } + + public BaseGlyphSetNumber withAltGlyphSet(BaseGlyphSet altGlyphSet) { + this.altGlyphSet = altGlyphSet; + return this; + } + + + public BaseGlyphSetNumber withSeperator(String charSeperator) { + this.charSeperator = charSeperator; + return this; + } + + public String BȍőnCharFor(int number) { + return chars.get(number); + } + + public String BȍőnCharSeperator() { + return charSeperator; + } + + public BaseGlyphSet BȍőnAltGlyphSet() { + return altGlyphSet; + } + + public String BȍőnCharFor36(int number) { + switch (number) { + case 1: + return chars.get(0); + case 2: + return chars.get(1); + case 3: + return chars.get(2); + case 4: + return chars.get(3); + case 5: + return chars.get(4); + case 6: + return chars.get(5); + case 7: + return chars.get(6); + case 8: + return chars.get(7); + case 9: + return chars.get(8); + case 10: + return chars.get(9); + case 20: + return chars.get(10); + case 30: + return chars.get(11); + case 40: + return chars.get(12); + case 50: + return chars.get(13); + case 60: + return chars.get(14); + case 70: + return chars.get(15); + case 80: + return chars.get(16); + case 90: + return chars.get(17); + case 100: + return chars.get(18); + case 200: + return chars.get(19); + case 300: + return chars.get(20); + case 400: + return chars.get(21); + case 500: + return chars.get(22); + case 600: + return chars.get(23); + case 700: + return chars.get(24); + case 800: + return chars.get(25); + case 900: + return chars.get(26); + default: + throw new IllegalArgumentException("Can't handle higher numbers: "+number); + } + } } diff --git a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/glyph/BaseGlyphSetNumber10.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/glyph/BaseGlyphSetNumber10.java deleted file mode 100644 index 2474db16..00000000 --- a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/glyph/BaseGlyphSetNumber10.java +++ /dev/null @@ -1,114 +0,0 @@ -package love.distributedrebirth.numberxd.base2t.glyph; - -import love.distributedrebirth.bassboonyd.BãßBȍőnAuthorInfoʸᴰ; - -@BãßBȍőnAuthorInfoʸᴰ(name = "willemtsade", copyright = "©Δ∞ 仙上主天") -@BãßBȍőnGlyphSetNumberInfoʸᴰ(base = BaseGlyphSetNumberType.BASE_10) -public final class BaseGlyphSetNumber10 implements BaseGlyphSetNumber { - - private String charSeperator; - private final String char0; - private final String char1; - private final String char2; - private final String char3; - private final String char4; - private final String char5; - private final String char6; - private final String char7; - private final String char8; - private final String char9; - - public BaseGlyphSetNumber10(String char0, String char1, String char2, String char3, String char4, String char5, - String char6, String char7, String char8, String char9) { - super(); - this.charSeperator = ""; - this.char0 = char0; - this.char1 = char1; - this.char2 = char2; - this.char3 = char3; - this.char4 = char4; - this.char5 = char5; - this.char6 = char6; - this.char7 = char7; - this.char8 = char8; - this.char9 = char9; - } - - public BaseGlyphSetNumber10 withSeperator(String charSeperator) { - this.charSeperator = charSeperator; - return this; - } - - @Override - public String BȍőnCharFor(int number) { - switch (number) { - case 0: - return char0; - case 1: - return char1; - case 2: - return char2; - case 3: - return char3; - case 4: - return char4; - case 5: - return char5; - case 6: - return char6; - case 7: - return char7; - case 8: - return char8; - case 9: - return char9; - default: - throw new IllegalArgumentException("Can't handle higher numbers: "+number); - } - } - - @Override - public String BȍőnCharSeperator() { - return charSeperator; - } - - public String getChar0() { - return char0; - } - - public String getChar1() { - return char1; - } - - public String getChar2() { - return char2; - } - - public String getChar3() { - return char3; - } - - public String getChar4() { - return char4; - } - - public String getChar5() { - return char5; - } - - public String getChar6() { - return char6; - } - - public String getChar7() { - return char7; - } - - public String getChar8() { - return char8; - } - - public String getChar9() { - return char9; - } -} diff --git a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/glyph/BaseGlyphSetNumber16.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/glyph/BaseGlyphSetNumber16.java deleted file mode 100644 index 5e76e1ff..00000000 --- a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/glyph/BaseGlyphSetNumber16.java +++ /dev/null @@ -1,162 +0,0 @@ -package love.distributedrebirth.numberxd.base2t.glyph; - -import love.distributedrebirth.bassboonyd.BãßBȍőnAuthorInfoʸᴰ; - -@BãßBȍőnAuthorInfoʸᴰ(name = "willemtsade", copyright = "©Δ∞ 仙上主天") -@BãßBȍőnGlyphSetNumberInfoʸᴰ(base = BaseGlyphSetNumberType.BASE_16) -public final class BaseGlyphSetNumber16 implements BaseGlyphSetNumber { - - private String charSeperator; - private final String char0; - private final String char1; - private final String char2; - private final String char3; - private final String char4; - private final String char5; - private final String char6; - private final String char7; - private final String char8; - private final String char9; - private final String charA; - private final String charB; - private final String charC; - private final String charD; - private final String charE; - private final String charF; - - public BaseGlyphSetNumber16(String char0, String char1, String char2, String char3, String char4, String char5, - String char6, String char7, String char8, String char9, String charA, String charB, String charC, - String charD, String charE, String charF) { - this.charSeperator = ""; - this.char0 = char0; - this.char1 = char1; - this.char2 = char2; - this.char3 = char3; - this.char4 = char4; - this.char5 = char5; - this.char6 = char6; - this.char7 = char7; - this.char8 = char8; - this.char9 = char9; - this.charA = charA; - this.charB = charB; - this.charC = charC; - this.charD = charD; - this.charE = charE; - this.charF = charF; - } - - public BaseGlyphSetNumber16 withSeperator(String charSeperator) { - this.charSeperator = charSeperator; - return this; - } - - @Override - public String BȍőnCharFor(int number) { - switch (number) { - case 0: - return char0; - case 1: - return char1; - case 2: - return char2; - case 3: - return char3; - case 4: - return char4; - case 5: - return char5; - case 6: - return char6; - case 7: - return char7; - case 8: - return char8; - case 9: - return char9; - case 10: - return charA; - case 11: - return charB; - case 12: - return charC; - case 13: - return charD; - case 14: - return charE; - case 15: - return charF; - default: - throw new IllegalArgumentException("Can't handle higher numbers: "+number); - } - } - - @Override - public String BȍőnCharSeperator() { - return charSeperator; - } - - public String getChar0() { - return char0; - } - - public String getChar1() { - return char1; - } - - public String getChar2() { - return char2; - } - - public String getChar3() { - return char3; - } - - public String getChar4() { - return char4; - } - - public String getChar5() { - return char5; - } - - public String getChar6() { - return char6; - } - - public String getChar7() { - return char7; - } - - public String getChar8() { - return char8; - } - - public String getChar9() { - return char9; - } - - public String getCharA() { - return charA; - } - - public String getCharB() { - return charB; - } - - public String getCharC() { - return charC; - } - - public String getCharD() { - return charD; - } - - public String getCharE() { - return charE; - } - - public String getCharF() { - return charF; - } -} diff --git a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/glyph/BaseGlyphSetNumber36.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/glyph/BaseGlyphSetNumber36.java deleted file mode 100644 index 9dc8bf72..00000000 --- a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/glyph/BaseGlyphSetNumber36.java +++ /dev/null @@ -1,253 +0,0 @@ -package love.distributedrebirth.numberxd.base2t.glyph; - -import love.distributedrebirth.bassboonyd.BãßBȍőnAuthorInfoʸᴰ; - -@BãßBȍőnAuthorInfoʸᴰ(name = "willemtsade", copyright = "©Δ∞ 仙上主天") -@BãßBȍőnGlyphSetNumberInfoʸᴰ(base = BaseGlyphSetNumberType.BASE_36) -public final class BaseGlyphSetNumber36 implements BaseGlyphSetNumber { - - private String charSeperator; - private final String char1; - private final String char2; - private final String char3; - private final String char4; - private final String char5; - private final String char6; - private final String char7; - private final String char8; - private final String char9; - private final String char10; - private final String char20; - private final String char30; - private final String char40; - private final String char50; - private final String char60; - private final String char70; - private final String char80; - private final String char90; - private final String char100; - private final String char200; - private final String char300; - private final String char400; - private final String char500; - private final String char600; - private final String char700; - private final String char800; - private final String char900; - - public BaseGlyphSetNumber36(String char1, String char2, String char3, String char4, String char5, String char6, - String char7, String char8, String char9, String char10, String char20, String char30, String char40, - String char50, String char60, String char70, String char80, String char90, String char100, String char200, - String char300, String char400, String char500, String char600, String char700, String char800, - String char900) { - this.charSeperator = ""; - this.char1 = char1; - this.char2 = char2; - this.char3 = char3; - this.char4 = char4; - this.char5 = char5; - this.char6 = char6; - this.char7 = char7; - this.char8 = char8; - this.char9 = char9; - this.char10 = char10; - this.char20 = char20; - this.char30 = char30; - this.char40 = char40; - this.char50 = char50; - this.char60 = char60; - this.char70 = char70; - this.char80 = char80; - this.char90 = char90; - this.char100 = char100; - this.char200 = char200; - this.char300 = char300; - this.char400 = char400; - this.char500 = char500; - this.char600 = char600; - this.char700 = char700; - this.char800 = char800; - this.char900 = char900; - } - - public BaseGlyphSetNumber36 withSeperator(String charSeperator) { - this.charSeperator = charSeperator; - return this; - } - - @Override - public String BȍőnCharFor(int number) { - switch (number) { - case 1: - return char1; - case 2: - return char2; - case 3: - return char3; - case 4: - return char4; - case 5: - return char5; - case 6: - return char6; - case 7: - return char7; - case 8: - return char8; - case 9: - return char9; - case 10: - return char10; - case 20: - return char20; - case 30: - return char30; - case 40: - return char40; - case 50: - return char50; - case 60: - return char60; - case 70: - return char70; - case 80: - return char80; - case 90: - return char90; - case 100: - return char100; - case 200: - return char200; - case 300: - return char300; - case 400: - return char400; - case 500: - return char500; - case 600: - return char600; - case 700: - return char700; - case 800: - return char800; - case 900: - return char900; - default: - throw new IllegalArgumentException("Can't handle higher numbers: "+number); - } - } - - @Override - public String BȍőnCharSeperator() { - return charSeperator; - } - - public String getChar1() { - return char1; - } - - public String getChar2() { - return char2; - } - - public String getChar3() { - return char3; - } - - public String getChar4() { - return char4; - } - - public String getChar5() { - return char5; - } - - public String getChar6() { - return char6; - } - - public String getChar7() { - return char7; - } - - public String getChar8() { - return char8; - } - - public String getChar9() { - return char9; - } - - public String getChar10() { - return char10; - } - - public String getChar20() { - return char20; - } - - public String getChar30() { - return char30; - } - - public String getChar40() { - return char40; - } - - public String getChar50() { - return char50; - } - - public String getChar60() { - return char60; - } - - public String getChar70() { - return char70; - } - - public String getChar80() { - return char80; - } - - public String getChar90() { - return char90; - } - - public String getChar100() { - return char100; - } - - public String getChar200() { - return char200; - } - - public String getChar300() { - return char300; - } - - public String getChar400() { - return char400; - } - - public String getChar500() { - return char500; - } - - public String getChar600() { - return char600; - } - - public String getChar700() { - return char700; - } - - public String getChar800() { - return char800; - } - - public String getChar900() { - return char900; - } - -} diff --git a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/glyph/BaseGlyphSetNumberType.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/glyph/BaseGlyphSetNumberType.java deleted file mode 100644 index e26705b1..00000000 --- a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/glyph/BaseGlyphSetNumberType.java +++ /dev/null @@ -1,10 +0,0 @@ -package love.distributedrebirth.numberxd.base2t.glyph; - -import love.distributedrebirth.bassboonyd.BãßBȍőnAuthorInfoʸᴰ; - -@BãßBȍőnAuthorInfoʸᴰ(name = "willemtsade", copyright = "©Δ∞ 仙上主天") -public enum BaseGlyphSetNumberType { - BASE_10, - BASE_16, - BASE_36 -} diff --git a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/glyph/BãßBȍőnGlyphSetNumberInfoʸᴰ.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/glyph/BãßBȍőnGlyphSetNumberInfoʸᴰ.java deleted file mode 100644 index a089506e..00000000 --- a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/glyph/BãßBȍőnGlyphSetNumberInfoʸᴰ.java +++ /dev/null @@ -1,16 +0,0 @@ -package love.distributedrebirth.numberxd.base2t.glyph; - -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -import love.distributedrebirth.bassboonyd.BãßBȍőnAuthorInfoʸᴰ; - -@BãßBȍőnAuthorInfoʸᴰ(name = "willemtsade", copyright = "©Δ∞ 仙上主天") -@Retention(RetentionPolicy.RUNTIME) -@Target({ElementType.TYPE}) -public @interface BãßBȍőnGlyphSetNumberInfoʸᴰ { - - BaseGlyphSetNumberType base(); -} diff --git a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/glyph/BãßBȍőnGlyphSetʸᴰ.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/glyph/BãßBȍőnGlyphSetʸᴰ.java index e86b974b..8eeaf195 100644 --- a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/glyph/BãßBȍőnGlyphSetʸᴰ.java +++ b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/glyph/BãßBȍőnGlyphSetʸᴰ.java @@ -7,15 +7,15 @@ import love.distributedrebirth.bassboonyd.BãßBȍőnEnumSetʸᴰ; @BãßBȍőnAuthorInfoʸᴰ(name = "willemtsade", copyright = "©Δ∞ 仙上主天") public interface BãßBȍőnGlyphSetʸᴰ> extends BãßBȍőnEnumSetʸᴰ, BãßBȍőnCoffinStoreʸᴰ { - default BaseGlyphSetNumber10 BȍőnGlyphSetNumber10() { - return GET_BBC().GET_OBJ(BãßBȍőnGlyphSetKeyʸᴰ.NUMBERS, BaseGlyphSetNumber10.class); + default BaseGlyphSetNumber BȍőnGlyphSetNumber10() { + return GET_BBC().GET_OBJ(BãßBȍőnGlyphSetKeyʸᴰ.NUMBERS, BaseGlyphSetNumber.class); } - default BaseGlyphSetNumber16 BȍőnGlyphSetNumber16() { - return GET_BBC().GET_OBJ(BãßBȍőnGlyphSetKeyʸᴰ.HEXIMALS, BaseGlyphSetNumber16.class); + default BaseGlyphSetNumber BȍőnGlyphSetNumber16() { + return GET_BBC().GET_OBJ(BãßBȍőnGlyphSetKeyʸᴰ.HEXIMALS, BaseGlyphSetNumber.class); } - default BaseGlyphSetNumber36 BȍőnGlyphSetNumber36() { - return GET_BBC().GET_OBJ(BãßBȍőnGlyphSetKeyʸᴰ.GEMATRIA, BaseGlyphSetNumber36.class); + default BaseGlyphSetNumber BȍőnGlyphSetNumber36() { + return GET_BBC().GET_OBJ(BãßBȍőnGlyphSetKeyʸᴰ.GEMATRIA, BaseGlyphSetNumber.class); } } diff --git a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/BãßBȍőnPartʸᴰ.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/BãßBȍőnPartʸᴰ.java index fa05968a..2992e479 100644 --- a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/BãßBȍőnPartʸᴰ.java +++ b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/BãßBȍőnPartʸᴰ.java @@ -62,13 +62,21 @@ public interface BãßBȍőnPartʸᴰ> extends } else if (values.length <= 256) { buf.append(glyphSet.BȍőnGlyphSetNumber16().BȍőnCharFor(BȍőnRangTelNul() >> 4)); buf.append(glyphSet.BȍőnGlyphSetNumber16().BȍőnCharSeperator()); - buf.append(glyphSet.BȍőnGlyphSetNumber16().BȍőnCharFor(BȍőnRangTelNul() & 0x0F)); + BaseGlyphSet secondGlyphSet = glyphSet.BȍőnGlyphSetNumber16().BȍőnAltGlyphSet(); + if (secondGlyphSet == null) { + secondGlyphSet = glyphSet; + } + buf.append(secondGlyphSet.BȍőnGlyphSetNumber16().BȍőnCharFor(BȍőnRangTelNul() & 0x0F)); } else if (values.length <= 0xFFF+1) { buf.append(glyphSet.BȍőnGlyphSetNumber16().BȍőnCharFor((BȍőnRangTelNul() >> 8) & 0x0F)); buf.append(glyphSet.BȍőnGlyphSetNumber16().BȍőnCharSeperator()); - buf.append(glyphSet.BȍőnGlyphSetNumber16().BȍőnCharFor((BȍőnRangTelNul() >> 4) & 0x0F)); - buf.append(glyphSet.BȍőnGlyphSetNumber16().BȍőnCharSeperator()); - buf.append(glyphSet.BȍőnGlyphSetNumber16().BȍőnCharFor(BȍőnRangTelNul() & 0x0F)); + BaseGlyphSet secondGlyphSet = glyphSet.BȍőnGlyphSetNumber16().BȍőnAltGlyphSet(); + if (secondGlyphSet == null) { + secondGlyphSet = glyphSet; + } + buf.append(secondGlyphSet.BȍőnGlyphSetNumber16().BȍőnCharFor((BȍőnRangTelNul() >> 4) & 0x0F)); + buf.append(secondGlyphSet.BȍőnGlyphSetNumber16().BȍőnCharSeperator()); + buf.append(secondGlyphSet.BȍőnGlyphSetNumber16().BȍőnCharFor(BȍőnRangTelNul() & 0x0F)); } else { throw new IllegalStateException("Can't handle more than 0xFFF values."); } @@ -82,24 +90,24 @@ public interface BãßBȍőnPartʸᴰ> extends StringBuilder buf = new StringBuilder(); T[] values = BãßInstances(); if (values.length <= 9) { - buf.append(glyphSet.BȍőnGlyphSetNumber36().BȍőnCharFor(BȍőnRangTelEen())); + buf.append(glyphSet.BȍőnGlyphSetNumber36().BȍőnCharFor36(BȍőnRangTelEen())); } else if (values.length <= 99) { int count = BȍőnRangTelNul(); int mod10 = count % 9 + 1; int div10 = count / 9 + 1; - buf.append(glyphSet.BȍőnGlyphSetNumber36().BȍőnCharFor(div10)); + buf.append(glyphSet.BȍőnGlyphSetNumber36().BȍőnCharFor36(div10)); buf.append(glyphSet.BȍőnGlyphSetNumber36().BȍőnCharSeperator()); - buf.append(glyphSet.BȍőnGlyphSetNumber36().BȍőnCharFor(mod10)); + buf.append(glyphSet.BȍőnGlyphSetNumber36().BȍőnCharFor36(mod10)); } else if (values.length <= 999) { int count = BȍőnRangTelNul(); int mod10 = count % 9 + 1; int div10 = count / 90 + 1; int div100 = count / 900 + 1; - buf.append(glyphSet.BȍőnGlyphSetNumber36().BȍőnCharFor(div10)); + buf.append(glyphSet.BȍőnGlyphSetNumber36().BȍőnCharFor36(div10)); buf.append(glyphSet.BȍőnGlyphSetNumber36().BȍőnCharSeperator()); - buf.append(glyphSet.BȍőnGlyphSetNumber36().BȍőnCharFor(div100)); + buf.append(glyphSet.BȍőnGlyphSetNumber36().BȍőnCharFor36(div100)); buf.append(glyphSet.BȍőnGlyphSetNumber36().BȍőnCharSeperator()); - buf.append(glyphSet.BȍőnGlyphSetNumber36().BȍőnCharFor(mod10)); + buf.append(glyphSet.BȍőnGlyphSetNumber36().BȍőnCharFor36(mod10)); } else { throw new IllegalStateException("Can't handle more than 1000 values."); } diff --git a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/T10PartDecimal.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/T10PartDecimal.java index 3e412fb6..49cf2610 100644 --- a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/T10PartDecimal.java +++ b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/T10PartDecimal.java @@ -7,28 +7,32 @@ import love.distributedrebirth.bassboonyd.BãßBȍőnClassInfoʸᴰ; @BãßBȍőnAuthorInfoʸᴰ(name = "willemtsade", copyright = "©Δ∞ 仙上主天") @BãßBȍőnClassInfoʸᴰ(name = "T10PartDecimal", purpose = "The distribution by 10.") -public enum T10PartDecimal implements BãßBȍőnPartʸᴰ { +@BãßBȍőnPartAlt1Infoʸᴰ(name = "Tone Letter LR", website = "https://en.wikipedia.org/wiki/Tone_letter") +@BãßBȍőnPartAlt2Infoʸᴰ(name = "Tone Letter RL", website = "https://en.wikipedia.org/wiki/Tone_letter") +public enum T10PartDecimal implements BãßBȍőnPartAlt2ʸᴰ { - PART_1 ("˥","零","zero"), - PART_2 ("˦","壹","one"), - PART_3 ("˧","貳","two"), - PART_4 ("˨","參","three"), - PART_5 ("˩","肆","four"), - PART_6 ("꜒","伍","five"), - PART_7 ("꜓","陸","six"), - PART_8 ("꜔","柒","seven"), - PART_9 ("꜕","捌","eight"), - PART_10("꜖","玖","nine"), + PART_1 ("˥","零","zero", "˥","꜒"), + PART_2 ("˦","壹","one", "˦","꜓"), + PART_3 ("˧","貳","two", "˧","꜔"), + PART_4 ("˨","參","three","˨","꜕"), + PART_5 ("˩","肆","four", "˩","꜖"), + PART_6 ("꜖","伍","five", "꜌","꜑"), + PART_7 ("꜕","陸","six", "꜋","꜐"), + PART_8 ("꜔","柒","seven","꜊","꜏"), + PART_9 ("꜓","捌","eight","꜉","꜎"), + PART_10("꜒","玖","nine", "꜈","꜍"), ; private final BãßBȍőnCoffinOpenʸᴰ BBC = BãßBȍőnCoffinOpenʸᴰ.newInstance(); public BãßBȍőnCoffinʸᴰ GET_BBC() { return BBC; } public static int LENGTH() { return values().length; }; - private T10PartDecimal(String idTone, String chinaKey, String chinaValue) { + private T10PartDecimal(String idTone, String chinaKey, String chinaValue, String alt1Value, String alt2Value) { BBC.PUT_OBJ(BãßBȍőnPartKeyʸᴰ.ID_TONE, idTone); BBC.PUT_OBJ(BãßBȍőnPartKeyʸᴰ.CHINA_KEY, chinaKey); BBC.PUT_OBJ(BãßBȍőnPartKeyʸᴰ.CHINA_VALUE, chinaValue); + BBC.PUT_OBJ(BãßBȍőnPartKeyʸᴰ.ALT_1_VALUE, alt1Value); + BBC.PUT_OBJ(BãßBȍőnPartKeyʸᴰ.ALT_2_VALUE, alt2Value); BBC.PUT_MAP(BãßBȍőnPartKeyʸᴰ.MAP_TONE); BBC.PUT_MAP(BãßBȍőnPartKeyʸᴰ.MAP_CHINA); } diff --git a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/T16PartHex.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/T16PartHex.java index a3a28fbf..b76b0047 100644 --- a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/T16PartHex.java +++ b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/part/T16PartHex.java @@ -7,34 +7,36 @@ import love.distributedrebirth.bassboonyd.BãßBȍőnClassInfoʸᴰ; @BãßBȍőnAuthorInfoʸᴰ(name = "willemtsade", copyright = "©Δ∞ 仙上主天") @BãßBȍőnClassInfoʸᴰ(name = "T16PartHex", purpose = "The distribution by 16.") -public enum T16PartHex implements BãßBȍőnPartʸᴰ { +@BãßBȍőnPartAlt1Infoʸᴰ(name = "Hexadecimal", website = "https://en.wikipedia.org/wiki/Hexadecimal") +public enum T16PartHex implements BãßBȍőnPartAlt1ʸᴰ { - PART_1 ("˥","氫","hydrogen"), - PART_2 ("˦","氦","helium"), - PART_3 ("˨","鋰","lithium"), - PART_4 ("˩","鈹","beryllium"), - PART_5 ("꜒","硼","boron"), - PART_6 ("꜓","碳","carbon"), - PART_7 ("꜕","氮","nitrogen"), - PART_8 ("꜖","氧","oxygen"), - PART_9 ("꜈","氟","fluorine"), - PART_10("꜉","氖","neon"), - PART_11("꜋","鈉","sodium"), - PART_12("꜌","鎂","magnesium"), - PART_13("꜍","鋁","aluminium"), - PART_14("꜎","矽","silicon"), - PART_15("꜐","磷","phosphorus"), - PART_16("꜑","硫","sulfur"), + PART_1 ("˥","氫","hydrogen", "0"), + PART_2 ("˦","氦","helium", "1"), + PART_3 ("˨","鋰","lithium", "2"), + PART_4 ("˩","鈹","beryllium", "3"), + PART_5 ("꜒","硼","boron", "4"), + PART_6 ("꜓","碳","carbon", "5"), + PART_7 ("꜕","氮","nitrogen", "6"), + PART_8 ("꜖","氧","oxygen", "7"), + PART_9 ("꜈","氟","fluorine", "8"), + PART_10("꜉","氖","neon", "9"), + PART_11("꜋","鈉","sodium", "A"), + PART_12("꜌","鎂","magnesium", "B"), + PART_13("꜍","鋁","aluminium", "C"), + PART_14("꜎","矽","silicon", "D"), + PART_15("꜐","磷","phosphorus","E"), + PART_16("꜑","硫","sulfur", "F"), ; private final BãßBȍőnCoffinOpenʸᴰ BBC = BãßBȍőnCoffinOpenʸᴰ.newInstance(); public BãßBȍőnCoffinʸᴰ GET_BBC() { return BBC; } public static int LENGTH() { return values().length; }; - private T16PartHex(String idTone, String chinaKey, String chinaValue) { + private T16PartHex(String idTone, String chinaKey, String chinaValue, String alt1Value) { BBC.PUT_OBJ(BãßBȍőnPartKeyʸᴰ.ID_TONE, idTone); BBC.PUT_OBJ(BãßBȍőnPartKeyʸᴰ.CHINA_KEY, chinaKey); BBC.PUT_OBJ(BãßBȍőnPartKeyʸᴰ.CHINA_VALUE, chinaValue); + BBC.PUT_OBJ(BãßBȍőnPartKeyʸᴰ.ALT_1_VALUE, alt1Value); BBC.PUT_MAP(BãßBȍőnPartKeyʸᴰ.MAP_TONE); BBC.PUT_MAP(BãßBȍőnPartKeyʸᴰ.MAP_CHINA); }