From 7c0c7d7df7ff17ddfa4f795af779b525f9b40b31 Mon Sep 17 00:00:00 2001 From: Willem Date: Sun, 23 Oct 2022 05:22:44 +0200 Subject: [PATCH] Added number matrix viewer and fixed generator --- .../app/glyphdemo/GlyphDemoComponent.java | 7 +- .../apps/DemoNumberMatrixDeskApp.java | 88 +++++++++++++++++++ .../death/BãßBȍőnCoffinDuytschenᵗˣᵗ.java | 30 +++---- .../number/matrix/BãßBȍőnNumberMatrixʸᴰ.java | 2 +- .../number/matrix/NumberMatrixFactory.java | 9 +- .../bassboon/jpp/util/Collectionᴿᵈ.java | 30 ++----- .../bassboon/jpp/util/Collectionᵂʳ.java | 8 +- .../yd/abacus/BãßBȍőnAbacusEnumBaseʸᴰ.java | 2 +- .../yd/abacus/BãßBȍőnAbacusEnumBase響ᴼᶠ.java | 2 +- .../yd/abacus/BãßBȍőnAbacusSetʸᴰ.java | 2 +- .../numberxd/base2t/Base2WarpCore.java | 2 +- .../numberxd/base2t/part/BãßBȍőnPartʸᴰ.java | 2 +- .../gdxapp4d/tos4/GDXAppTos4BootFactory.java | 4 + pom.xml | 4 + 14 files changed, 136 insertions(+), 56 deletions(-) create mode 100644 gdxapp4d-app-glyphdemo/src/main/java/love/distributedrebirth/gdxapp4d/app/glyphdemo/apps/DemoNumberMatrixDeskApp.java diff --git a/gdxapp4d-app-glyphdemo/src/main/java/love/distributedrebirth/gdxapp4d/app/glyphdemo/GlyphDemoComponent.java b/gdxapp4d-app-glyphdemo/src/main/java/love/distributedrebirth/gdxapp4d/app/glyphdemo/GlyphDemoComponent.java index b7cf36d1..fd6ec8b0 100644 --- a/gdxapp4d-app-glyphdemo/src/main/java/love/distributedrebirth/gdxapp4d/app/glyphdemo/GlyphDemoComponent.java +++ b/gdxapp4d-app-glyphdemo/src/main/java/love/distributedrebirth/gdxapp4d/app/glyphdemo/GlyphDemoComponent.java @@ -11,6 +11,7 @@ import love.distributedrebirth.gdxapp4d.app.glyphdemo.apps.DemoUnicodePlaneDeskA import love.distributedrebirth.gdxapp4d.app.glyphdemo.apps.DemoUnitConverterDeskApp; import love.distributedrebirth.bassboon.clazz.BãßBȍőnAuthor注; import love.distributedrebirth.gdxapp4d.app.glyphdemo.apps.DemoGlyphSetDeskApp; +import love.distributedrebirth.gdxapp4d.app.glyphdemo.apps.DemoNumberMatrixDeskApp; import love.distributedrebirth.gdxapp4d.app.glyphdemo.apps.DemoNumberPartDeskApp; import love.distributedrebirth.gdxapp4d.tos4.service.SystemGdxLog; import love.distributedrebirth.gdxapp4d.vrgem4.service.VrGem4DeskAppService; @@ -43,12 +44,14 @@ public class GlyphDemoComponent { private final DeskAppLauncher unicodeLauncher; private final DeskAppLauncher baseGlyphLauncher; private final DeskAppLauncher basePartLauncher; + private final DeskAppLauncher numberMatrixLauncher; private final DeskAppLauncher unitConverterLauncher; public GlyphDemoComponent() { unicodeLauncher = new DeskAppLauncher(DeskAppMenuSection.PROGRAMMING, "Unicode Plane", () -> new DemoUnicodePlaneDeskApp(createBundle(), unicode4DService)); baseGlyphLauncher = new DeskAppLauncher(DeskAppMenuSection.PROGRAMMING, "Glyph Set", () -> new DemoGlyphSetDeskApp(createBundle())); - basePartLauncher = new DeskAppLauncher(DeskAppMenuSection.PROGRAMMING, "Number Parts", () -> new DemoNumberPartDeskApp(createBundle())); + basePartLauncher = new DeskAppLauncher(DeskAppMenuSection.EDUCATION, "Number Parts", () -> new DemoNumberPartDeskApp(createBundle())); + numberMatrixLauncher = new DeskAppLauncher(DeskAppMenuSection.EDUCATION, "Number Matrix", () -> new DemoNumberMatrixDeskApp(createBundle())); unitConverterLauncher = new DeskAppLauncher(DeskAppMenuSection.SCIENCE, "Unitˣᶜ Converter", () -> new DemoUnitConverterDeskApp(unitManager)); } @@ -62,6 +65,7 @@ public class GlyphDemoComponent { deskAppService.installDeskApp(unicodeLauncher); deskAppService.installDeskApp(baseGlyphLauncher); deskAppService.installDeskApp(basePartLauncher); + deskAppService.installDeskApp(numberMatrixLauncher); deskAppService.installDeskApp(unitConverterLauncher); } @@ -71,6 +75,7 @@ public class GlyphDemoComponent { deskAppService.removeDeskApp(unicodeLauncher); deskAppService.removeDeskApp(baseGlyphLauncher); deskAppService.removeDeskApp(basePartLauncher); + deskAppService.removeDeskApp(numberMatrixLauncher); deskAppService.removeDeskApp(unitConverterLauncher); } } diff --git a/gdxapp4d-app-glyphdemo/src/main/java/love/distributedrebirth/gdxapp4d/app/glyphdemo/apps/DemoNumberMatrixDeskApp.java b/gdxapp4d-app-glyphdemo/src/main/java/love/distributedrebirth/gdxapp4d/app/glyphdemo/apps/DemoNumberMatrixDeskApp.java new file mode 100644 index 00000000..d596dd7b --- /dev/null +++ b/gdxapp4d-app-glyphdemo/src/main/java/love/distributedrebirth/gdxapp4d/app/glyphdemo/apps/DemoNumberMatrixDeskApp.java @@ -0,0 +1,88 @@ +package love.distributedrebirth.gdxapp4d.app.glyphdemo.apps; + +import java.util.ArrayList; +import java.util.List; +import java.util.ResourceBundle; + +import imgui.ImGui; +import imgui.flag.ImGuiTableFlags; +import imgui.type.ImBoolean; +import imgui.type.ImInt; +import love.distributedrebirth.bassboon.clazz.BãßBȍőnAuthor注; +import love.distributedrebirth.bassboon.jpp.lang.number.matrix.BãßBȍőnNumberMatrixʸᴰ; +import love.distributedrebirth.bassboon.jpp.lang.number.matrix.NumberMatrixFactory; +import love.distributedrebirth.bassboon.jpp.lang.number.matrix.NumberMatrixSet; +import love.distributedrebirth.gdxapp4d.vrgem4.service.deskapp.AbstractDeskApp; +import love.distributedrebirth.gdxapp4d.vrgem4.service.deskapp.DeskAppContourSection; +import love.distributedrebirth.gdxapp4d.vrgem4.service.deskapp.DeskAppRenderer; +import love.distributedrebirth.numberxd.base2t.Base2PartsFactory; +import love.distributedrebirth.numberxd.base2t.part.BãßBȍőnPartAlt1ʸᴰ; +import love.distributedrebirth.numberxd.base2t.part.BãßBȍőnPartAlt2ʸᴰ; +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ʸᴰ; +import love.distributedrebirth.numberxd.unicode.BaseGlyphSet; + +@BãßBȍőnAuthor注(name = "للَّٰهِilLצسُو", copyright = "©Δ∞ 仙上主天") +public class DemoNumberMatrixDeskApp extends AbstractDeskApp implements DeskAppRenderer { + + private final ResourceBundle bundle; + private ImInt selectedMatrixPart = new ImInt(); + + public DemoNumberMatrixDeskApp(ResourceBundle bundle) { + this.bundle = bundle; + } + +// private String getTxt(String key) { +// return bundle.getString(DemoNumberMatrixDeskApp.class.getSimpleName()+"."+key); +// } + + public void create() { + getContours().setTitle("NumberMatrix"); + getContours().registrateContour(DeskAppContourSection.MAIN, this); + } + + @Override + public void render() { + List bases = new ArrayList<>(); + bases.add("2"); + bases.add("3"); + bases.add("4"); + bases.add("5"); + bases.add("6"); + bases.add("7"); + String[] items = new String[bases.size()]; + items = bases.toArray(items); + String selectedItem = items[selectedMatrixPart.get()]; + Integer baseNumber = Integer.valueOf(selectedItem); + NumberMatrixSet numberMatrix = NumberMatrixFactory.ײاللهזأَكْبَرײ.getFilmRol(baseNumber); + + ImGui.combo("selectMatrix", selectedMatrixPart, items); + + int columns = 2 + numberMatrix.getDimension(); + int flags = ImGuiTableFlags.ScrollX | ImGuiTableFlags.RowBg | ImGuiTableFlags.BordersOuter | ImGuiTableFlags.BordersV; + ImGui.beginTable("base-part", columns, flags); + ImGui.tableSetupColumn("rȧñkNaam"); + ImGui.tableSetupColumn("rȧñkRingToon"); + for (int i=0;i part:numberMatrix.values()) { + ImGui.tableNextRow(); + + ImGui.tableNextColumn(); + ImGui.text(part.rȧñkNaam()); + + ImGui.tableNextColumn(); + ImGui.text(part.rȧñkRingToon()); + + for (int i=0;i> familyName) { return ᵃpᵢ.UNHOLY(familyName); } - public BãßBȍőnCoffinGhostSpell ײזזןןײןןךזזײ(Class> familyName) { return ᵃpᵢ.UNHOLY_SPELL(familyName); } - public T ײןזןזןזײ(Class noiseName) { return ᵃpᵢ.NOISE_OF(noiseName); } + public BãßBȍőnCoffinGhost ײןןזזײ(Class> ײןןךז) { return ᵃpᵢ.UNHOLY(ײןןךז); } + public BãßBȍőnCoffinGhostSpell ײזזןןײןןךזזײ(Class> ײןןךז) { return ᵃpᵢ.UNHOLY_SPELL(ײןןךז); } + public T ײןזןזןזײ(Class ןזײ) { return ᵃpᵢ.NOISE_OF(ןזײ); } } class BASIC extends BãßBȍőnCoffinDuytschenᴬᵖᶦ { @@ -77,26 +77,26 @@ public interface BãßBȍőnCoffinDuytschenᵗˣᵗ { } class 中國 extends BãßBȍőnCoffinDuytschenᴬᵖᶦ { - public BãßBȍőnCoffinGhost 邪惡的(Class> familyName) { return ᵃpᵢ.UNHOLY(familyName); } - public BãßBȍőnCoffinGhostSpell 邪惡的龸魅力(Class> familyName) { return ᵃpᵢ.UNHOLY_SPELL(familyName); } - public T 噪音龸的(Class noiseName) { return ᵃpᵢ.NOISE_OF(noiseName); } + public BãßBȍőnCoffinGhost 邪惡的(Class> 姓) { return ᵃpᵢ.UNHOLY(姓); } + public BãßBȍőnCoffinGhostSpell 邪惡的龸魅力(Class> 姓) { return ᵃpᵢ.UNHOLY_SPELL(姓); } + public T 噪音龸的(Class 音名) { return ᵃpᵢ.NOISE_OF(音名); } } class 𓃬𓍄𓋹𓀭 extends BãßBȍőnCoffinDuytschenᴬᵖᶦ { - public BãßBȍőnCoffinGhost 𓆙𓄿𓏀𓃟𓇋𓇋𓄋(Class> familyName) { return ᵃpᵢ.UNHOLY(familyName); } - public BãßBȍőnCoffinGhostSpell 𓆙𓄿𓏀𓃟𓇋𓇋𓄋𓐘𓆘𓉯𓌇𓆅𓆅(Class> familyName) { return ᵃpᵢ.UNHOLY_SPELL(familyName); } - public T 𓁵𓇋𓌗𓁬𓐘𓅂𓁿𓆑(Class noiseName) { return ᵃpᵢ.NOISE_OF(noiseName); } + public BãßBȍőnCoffinGhost 𓆙𓄿𓏀𓃟𓇋𓇋𓄋(Class> 𓊲𓅃𓅓𓇋𓊝) { return ᵃpᵢ.UNHOLY(𓊲𓅃𓅓𓇋𓊝); } + public BãßBȍőnCoffinGhostSpell 𓆙𓄿𓏀𓃟𓇋𓇋𓄋𓐘𓆘𓉯𓌇𓆅𓆅(Class> 𓊲𓅃𓅓𓇋𓊝) { return ᵃpᵢ.UNHOLY_SPELL(𓊲𓅃𓅓𓇋𓊝); } + public T 𓁵𓇋𓌗𓁬𓐘𓅂𓁿𓆑(Class 𓈖𓇋𓌗𓌇𓈖𓅂𓅓) { return ᵃpᵢ.NOISE_OF(𓈖𓇋𓌗𓌇𓈖𓅂𓅓); } } class عربى extends BãßBȍőnCoffinDuytschenᴬᵖᶦ { - public BãßBȍőnCoffinGhost غير۵مقدس(Class> familyName) { return ᵃpᵢ.UNHOLY(familyName); } - public BãßBȍőnCoffinGhostSpell غير۵مقدس۵سحر(Class> familyName) { return ᵃpᵢ.UNHOLY_SPELL(familyName); } - public T ضوضاء۵من(Class noiseName) { return ᵃpᵢ.NOISE_OF(noiseName); } + public BãßBȍőnCoffinGhost غير۵مقدس(Class> لقب) { return ᵃpᵢ.UNHOLY(لقب); } + public BãßBȍőnCoffinGhostSpell غير۵مقدس۵سحر(Class> لقب) { return ᵃpᵢ.UNHOLY_SPELL(لقب); } + public T ضوضاء۵من(Class هناك۵صوت) { return ᵃpᵢ.NOISE_OF(هناك۵صوت); } } class עִברִית extends BãßBȍőnCoffinDuytschenᴬᵖᶦ { - public BãßBȍőnCoffinGhost לאײקדוש(Class> familyName) { return ᵃpᵢ.UNHOLY(familyName); } - public BãßBȍőnCoffinGhostSpell לאײקדושײקֶסֶם(Class> familyName) { return ᵃpᵢ.UNHOLY_SPELL(familyName); } - public T צלילײשל(Class noiseName) { return ᵃpᵢ.NOISE_OF(noiseName); } + public BãßBȍőnCoffinGhost לאײקדוש(Class> שםײמשפחה) { return ᵃpᵢ.UNHOLY(שםײמשפחה); } + public BãßBȍőnCoffinGhostSpell לאײקדושײקֶסֶם(Class> שםײמשפחה) { return ᵃpᵢ.UNHOLY_SPELL(שםײמשפחה); } + public T צלילײשל(Class ישײצליל) { return ᵃpᵢ.NOISE_OF(ישײצליל); } } } diff --git a/gdxapp4d-lib-bassboonyd/src/main/java/love/distributedrebirth/bassboon/jpp/lang/number/matrix/BãßBȍőnNumberMatrixʸᴰ.java b/gdxapp4d-lib-bassboonyd/src/main/java/love/distributedrebirth/bassboon/jpp/lang/number/matrix/BãßBȍőnNumberMatrixʸᴰ.java index 09699341..414ae326 100644 --- a/gdxapp4d-lib-bassboonyd/src/main/java/love/distributedrebirth/bassboon/jpp/lang/number/matrix/BãßBȍőnNumberMatrixʸᴰ.java +++ b/gdxapp4d-lib-bassboonyd/src/main/java/love/distributedrebirth/bassboon/jpp/lang/number/matrix/BãßBȍőnNumberMatrixʸᴰ.java @@ -33,7 +33,7 @@ public interface BãßBȍőnNumberMatrixʸᴰ> void 魎ᴵⁿᶦᵗ(Y boon, int dialTone, int...args) { Bãß.石棺ʸᴰ.魎ᴵⁿᶦᵗ(boon); - boon.toBBC().NOISE_OF(BãßBȍőnAbacusEnumBase響ᴼᶠ.class).ráàmRingToonInluiden(Integer.toString(dialTone)); + boon.toBBC().NOISE_OF(BãßBȍőnAbacusEnumBase響ᴼᶠ.class).rȧñkRingToonInluiden(Integer.toHexString(dialTone).toUpperCase()); boon.toBBC().UNHOLY_SPELL(Ꝑŕḯṿª₮ḕ.class).PUT_GHOST_LIST(GHOST_NUMBER_BLOCK); for (int arg:args) { boon.toBBC().UNHOLY_SPELL(Ꝑŕḯṿª₮ḕ.class).GHOST_LIST_INT(GHOST_NUMBER_BLOCK).add(arg); diff --git a/gdxapp4d-lib-bassboonyd/src/main/java/love/distributedrebirth/bassboon/jpp/lang/number/matrix/NumberMatrixFactory.java b/gdxapp4d-lib-bassboonyd/src/main/java/love/distributedrebirth/bassboon/jpp/lang/number/matrix/NumberMatrixFactory.java index 54de7c6f..6b026ad3 100644 --- a/gdxapp4d-lib-bassboonyd/src/main/java/love/distributedrebirth/bassboon/jpp/lang/number/matrix/NumberMatrixFactory.java +++ b/gdxapp4d-lib-bassboonyd/src/main/java/love/distributedrebirth/bassboon/jpp/lang/number/matrix/NumberMatrixFactory.java @@ -104,19 +104,12 @@ public enum NumberMatrixFactory implements BãßBȍőnAbacusInstanceMBeanʸᴰ=0;y--) { char c = ii.charAt(y); - args[y] = c; + args[y] = c - '0'; } result.createAbacus(cnt, name, cnt, args); } diff --git a/gdxapp4d-lib-bassboonyd/src/main/java/love/distributedrebirth/bassboon/jpp/util/Collectionᴿᵈ.java b/gdxapp4d-lib-bassboonyd/src/main/java/love/distributedrebirth/bassboon/jpp/util/Collectionᴿᵈ.java index e4bded98..a16dc21f 100644 --- a/gdxapp4d-lib-bassboonyd/src/main/java/love/distributedrebirth/bassboon/jpp/util/Collectionᴿᵈ.java +++ b/gdxapp4d-lib-bassboonyd/src/main/java/love/distributedrebirth/bassboon/jpp/util/Collectionᴿᵈ.java @@ -1,6 +1,5 @@ package love.distributedrebirth.bassboon.jpp.util; -import java.util.Iterator; import java.util.Spliterator; import java.util.Spliterators; import java.util.stream.Collectors; @@ -19,15 +18,15 @@ public interface Collectionᴿᵈ { } default boolean isEmpty() { - return !iteratorᴿᵈ().hasNext(); + return iteratorᴿᵈ().hasNext() == false; } - default boolean contains(Object o) { - return streamᴿᵈ().collect(Collectors.toSet()).contains(o); + default boolean contains(Object obj) { + return streamᴿᵈ().collect(Collectors.toSet()).contains(obj); } - default boolean containsAll(Collectionᴿᵈ c) { - return streamᴿᵈ().collect(Collectors.toSet()).containsAll(c.streamᴿᵈ().collect(Collectors.toSet())); + default boolean containsAll(Collectionᴿᵈ set) { + return streamᴿᵈ().collect(Collectors.toSet()).containsAll(set.streamᴿᵈ().collect(Collectors.toSet())); } default Stream parallelStreamᴿᵈ() { @@ -42,24 +41,11 @@ public interface Collectionᴿᵈ { return streamᴿᵈ().collect(Collectors.toList()).toArray(); } - default T[] toArray(T[] a) { - return streamᴿᵈ().collect(Collectors.toList()).toArray(a); + default T[] toArray(T[] arr) { + return streamᴿᵈ().collect(Collectors.toList()).toArray(arr); } default Stream streamᴿᵈ() { - Iteratorᴿᵈ iterator = iteratorᴿᵈ(); - Iterator wrap = new Iterator<>() { - @Override - public boolean hasNext() { - return iterator.hasNext(); - } - - @Override - public E next() { - return iterator.next(); - } - - }; - return StreamSupport.stream(Spliterators.spliteratorUnknownSize(wrap, Spliterator.ORDERED), false); + return StreamSupport.stream(Spliterators.spliteratorUnknownSize(Iteratorᴿᵈ.wrap(iteratorᴿᵈ()), Spliterator.ORDERED), false); } } diff --git a/gdxapp4d-lib-bassboonyd/src/main/java/love/distributedrebirth/bassboon/jpp/util/Collectionᵂʳ.java b/gdxapp4d-lib-bassboonyd/src/main/java/love/distributedrebirth/bassboon/jpp/util/Collectionᵂʳ.java index 90684717..94fe2241 100644 --- a/gdxapp4d-lib-bassboonyd/src/main/java/love/distributedrebirth/bassboon/jpp/util/Collectionᵂʳ.java +++ b/gdxapp4d-lib-bassboonyd/src/main/java/love/distributedrebirth/bassboon/jpp/util/Collectionᵂʳ.java @@ -14,9 +14,9 @@ public interface Collectionᵂʳ extends Collectionᴿᵈ, Appenderᵂʳ remove(v)); } - default boolean removeAll(Collectionᴿᵈ c) { + default boolean removeAll(Collectionᴿᵈ set) { boolean result = false; - Iteratorᴿᵈ iterator = c.iteratorᴿᵈ(); + Iteratorᴿᵈ iterator = set.iteratorᴿᵈ(); while (iterator.hasNext()) { if (remove(iterator.next())) { result = true; @@ -35,10 +35,10 @@ public interface Collectionᵂʳ extends Collectionᴿᵈ, Appenderᵂʳ c) { + default boolean retainAll(Collectionᴿᵈ set) { boolean result = false; for (E e:streamᴿᵈ().collect(Collectors.toList())) { - if (!c.contains(e)) { + if (!set.contains(e)) { remove(e); result = true; } diff --git a/gdxapp4d-lib-bassboonyd/src/main/java/love/distributedrebirth/bassboon/yd/abacus/BãßBȍőnAbacusEnumBaseʸᴰ.java b/gdxapp4d-lib-bassboonyd/src/main/java/love/distributedrebirth/bassboon/yd/abacus/BãßBȍőnAbacusEnumBaseʸᴰ.java index 346c39b8..91a4f9f7 100644 --- a/gdxapp4d-lib-bassboonyd/src/main/java/love/distributedrebirth/bassboon/yd/abacus/BãßBȍőnAbacusEnumBaseʸᴰ.java +++ b/gdxapp4d-lib-bassboonyd/src/main/java/love/distributedrebirth/bassboon/yd/abacus/BãßBȍőnAbacusEnumBaseʸᴰ.java @@ -37,7 +37,7 @@ public interface BãßBȍőnAbacusEnumBaseʸᴰ & boon.toBBC().UNHOLY_SPELL(Ꝑŕḯṿª₮ḕ.class).PUT_GHOST(GHOST_RANK_RING_TONE, boon.rȧñkNaam()); return new BãßBȍőnAbacusEnumBase響ᴼᶠ() { @Override - public void ráàmRingToonInluiden(String dialTone) { + public void rȧñkRingToonInluiden(String dialTone) { boon.toBBC().UNHOLY_SPELL(Ꝑŕḯṿª₮ḕ.class).PUT_GHOST(GHOST_RANK_RING_TONE, dialTone); } }; diff --git a/gdxapp4d-lib-bassboonyd/src/main/java/love/distributedrebirth/bassboon/yd/abacus/BãßBȍőnAbacusEnumBase響ᴼᶠ.java b/gdxapp4d-lib-bassboonyd/src/main/java/love/distributedrebirth/bassboon/yd/abacus/BãßBȍőnAbacusEnumBase響ᴼᶠ.java index 090cb1f2..2aec425d 100644 --- a/gdxapp4d-lib-bassboonyd/src/main/java/love/distributedrebirth/bassboon/yd/abacus/BãßBȍőnAbacusEnumBase響ᴼᶠ.java +++ b/gdxapp4d-lib-bassboonyd/src/main/java/love/distributedrebirth/bassboon/yd/abacus/BãßBȍőnAbacusEnumBase響ᴼᶠ.java @@ -6,5 +6,5 @@ import love.distributedrebirth.bassboon.clazz.pirate.BãßBȍőnꝐŕḯṿª₮ @BãßBȍőnAuthor注(name = "للَّٰهِilLצسُو", copyright = "©Δ∞ 仙上主天") public interface BãßBȍőnAbacusEnumBase響ᴼᶠ extends BãßBȍőnꝐŕḯṿª₮ḕ響ᴼᶠ { - void ráàmRingToonInluiden(String dialTone); + void rȧñkRingToonInluiden(String dialTone); } diff --git a/gdxapp4d-lib-bassboonyd/src/main/java/love/distributedrebirth/bassboon/yd/abacus/BãßBȍőnAbacusSetʸᴰ.java b/gdxapp4d-lib-bassboonyd/src/main/java/love/distributedrebirth/bassboon/yd/abacus/BãßBȍőnAbacusSetʸᴰ.java index cee8fb6e..7975bd86 100644 --- a/gdxapp4d-lib-bassboonyd/src/main/java/love/distributedrebirth/bassboon/yd/abacus/BãßBȍőnAbacusSetʸᴰ.java +++ b/gdxapp4d-lib-bassboonyd/src/main/java/love/distributedrebirth/bassboon/yd/abacus/BãßBȍőnAbacusSetʸᴰ.java @@ -18,7 +18,7 @@ public interface BãßBȍőnAbacusSetʸᴰ & Abacu @BãßBȍőnDuytschen注(中國 = "算盤　討厭　最後的", BASIC = "RANK_TO_LAST", 𓃬𓍄𓋹𓀭 = "𓂏𓅃𓈁𓎡　𓅲　𓆅𓅃𓆘𓋶") default T rȧñkNaarLaatste() { T[] values = ráàmWaardes(); - return values[values.length - Bãß.ℭỗᶇṧⱦᶏꬼȶʂ.INT_ZERO]; + return values[values.length - Bãß.ℭỗᶇṧⱦᶏꬼȶʂ.INT_ONE]; } @BãßBȍőnDuytschen注(中國 = "算盤　討厭　比鄰", BASIC = "RANK_TO_NEXT", 𓃬𓍄𓋹𓀭 = "𓂏𓅃𓈁𓎡　𓅲　𓌒𓎡𓋶𓌟") diff --git a/gdxapp4d-lib-numberxd/src/main/java/love/distributedrebirth/numberxd/base2t/Base2WarpCore.java b/gdxapp4d-lib-numberxd/src/main/java/love/distributedrebirth/numberxd/base2t/Base2WarpCore.java index d387d4d8..aea9dad6 100644 --- a/gdxapp4d-lib-numberxd/src/main/java/love/distributedrebirth/numberxd/base2t/Base2WarpCore.java +++ b/gdxapp4d-lib-numberxd/src/main/java/love/distributedrebirth/numberxd/base2t/Base2WarpCore.java @@ -125,7 +125,7 @@ public enum Base2WarpCore implements BãßBȍőnAbacusInstanceMBeanʸᴰ bassTone = baseParts.get(tone.getPart()); - bassTone.toBBC().NOISE_OF(BãßBȍőnAbacusEnumBase響ᴼᶠ.class).ráàmRingToonInluiden(tone.getDialTone()); + bassTone.toBBC().NOISE_OF(BãßBȍőnAbacusEnumBase響ᴼᶠ.class).rȧñkRingToonInluiden(tone.getDialTone()); BãßBȍőnAbacusZombieCorpse corpse = BãßBȍőnAbacusZombieCorpse.castᴼᶠ(bassTone.toEnumZombie()); corpse.PUT_OBJ(BãßBȍőnPartBullet.CHINA_KEY, tone.getChinaKey()); corpse.PUT_OBJ(BãßBȍőnPartBullet.CHINA_VALUE, tone.getChinaValue()); diff --git a/gdxapp4d-lib-numberxd/src/main/java/love/distributedrebirth/numberxd/base2t/part/BãßBȍőnPartʸᴰ.java b/gdxapp4d-lib-numberxd/src/main/java/love/distributedrebirth/numberxd/base2t/part/BãßBȍőnPartʸᴰ.java index d2537bc9..57911679 100644 --- a/gdxapp4d-lib-numberxd/src/main/java/love/distributedrebirth/numberxd/base2t/part/BãßBȍőnPartʸᴰ.java +++ b/gdxapp4d-lib-numberxd/src/main/java/love/distributedrebirth/numberxd/base2t/part/BãßBȍőnPartʸᴰ.java @@ -44,7 +44,7 @@ public interface BãßBȍőnPartʸᴰ> extends @SafeVarargs public static > void 魎ᴵⁿᶦᵗ(Y boon, String dialTone, Consumer>...fleshFeeders) { Bãß.石棺ʸᴰ.魎ᴵⁿᶦᵗ(boon); - boon.toBBC().NOISE_OF(BãßBȍőnAbacusEnumBase響ᴼᶠ.class).ráàmRingToonInluiden(dialTone); + boon.toBBC().NOISE_OF(BãßBȍőnAbacusEnumBase響ᴼᶠ.class).rȧñkRingToonInluiden(dialTone); BãßBȍőnAbacusZombieCorpse corpse = BãßBȍőnAbacusZombieCorpse.castᴼᶠ(boon.toEnumZombie()); for (Consumer> flesh:fleshFeeders) { flesh.accept(corpse); diff --git a/gdxapp4d-tos4/src/main/java/love/distributedrebirth/gdxapp4d/tos4/GDXAppTos4BootFactory.java b/gdxapp4d-tos4/src/main/java/love/distributedrebirth/gdxapp4d/tos4/GDXAppTos4BootFactory.java index bca3ff74..2a908ad4 100644 --- a/gdxapp4d-tos4/src/main/java/love/distributedrebirth/gdxapp4d/tos4/GDXAppTos4BootFactory.java +++ b/gdxapp4d-tos4/src/main/java/love/distributedrebirth/gdxapp4d/tos4/GDXAppTos4BootFactory.java @@ -123,6 +123,10 @@ public class GDXAppTos4BootFactory { "love.distributedrebirth.bassboon.clazz.pirate,"+ "love.distributedrebirth.bassboon.death,"+ "love.distributedrebirth.bassboon.death.spider,"+ + "love.distributedrebirth.bassboon.jpp.lang,"+ + "love.distributedrebirth.bassboon.jpp.lang.number,"+ + "love.distributedrebirth.bassboon.jpp.lang.number.matrix,"+ + "love.distributedrebirth.bassboon.jpp.util,"+ "love.distributedrebirth.bassboon.yd,"+ "love.distributedrebirth.bassboon.yd.abacus,"+ "love.distributedrebirth.bassboon.yd.abacus.zombie,"+ diff --git a/pom.xml b/pom.xml index 2a83ef8d..5ae6d029 100644 --- a/pom.xml +++ b/pom.xml @@ -133,6 +133,10 @@ love.distributedrebirth.bassboon.clazz.pirate, love.distributedrebirth.bassboon.death, love.distributedrebirth.bassboon.death.spider, + love.distributedrebirth.bassboon.jpp.lang, + love.distributedrebirth.bassboon.jpp.lang.number, + love.distributedrebirth.bassboon.jpp.lang.number.matrix, + love.distributedrebirth.bassboon.jpp.util, love.distributedrebirth.bassboon.yd, love.distributedrebirth.bassboon.yd.abacus, love.distributedrebirth.bassboon.yd.abacus.zombie,