From 303f700b51694568ca9cb06b7bdb62ec266fbf57 Mon Sep 17 00:00:00 2001 From: Willem Date: Mon, 24 Oct 2022 10:12:39 +0200 Subject: [PATCH] =?UTF-8?q?Moved=20abacus=20to=20List=E1=B4=BF=E1=B5=88=20?= =?UTF-8?q?interface?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../apps/DemoNumberMatrixDeskApp.java | 18 ++----- .../lang/number/matrix/M02MatrixBinary.java | 2 + .../jpp/lang/number/matrix/M03MatrixTrit.java | 2 + .../jpp/lang/number/matrix/M04MatrixQuad.java | 2 + .../lang/number/matrix/M05MatrixPental.java | 2 + .../lang/number/matrix/M06MatrixSeximal.java | 2 + .../number/matrix/NumberMatrixFactory.java | 48 +++++++++---------- .../lang/number/matrix/NumberMatrixSet.java | 3 +- .../bassboon/jpp/util/Collectionᴿᵈ.java | 3 +- .../bassboon/jpp/util/Iterableᴿᵈ.java | 11 +++++ .../bassboon/yd/abacus/BãßBȍőnAbacus.java | 3 +- .../yd/abacus/BãßBȍőnAbacusEnumBaseʸᴰ.java | 28 +++++++---- .../yd/abacus/BãßBȍőnAbacusInstanceʸᴰ.java | 2 +- .../yd/abacus/BãßBȍőnAbacusSetʸᴰ.java | 31 ++++++------ .../jpp/lang/NumberMatrixFactoryTest.java | 2 +- .../numberxd/WavẽWorstGetậl1ⁿᴰ.java | 4 +- .../numberxd/WavẽWorstGetậl2ⁿᴰ.java | 8 ++-- .../numberxd/alu/ŌctopǔsALU.java | 4 +- .../numberxd/base2t/Base2WarpCore.java | 2 +- .../numberxd/unicode/BaseGlyphSet.java | 2 +- .../numberxd/x4o/NumberXDModuleLoader.java | 2 +- 21 files changed, 101 insertions(+), 80 deletions(-) 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 index 95af0e3e..57193de3 100644 --- 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 @@ -6,7 +6,6 @@ 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ʸᴰ; @@ -15,13 +14,6 @@ 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 { @@ -45,11 +37,9 @@ public class DemoNumberMatrixDeskApp extends AbstractDeskApp implements DeskAppR @Override public void render() { List bases = new ArrayList<>(); - bases.add("2"); - bases.add("3"); - bases.add("4"); - bases.add("5"); - bases.add("6"); + for (int filmSequence:NumberMatrixFactory.ײاللهזأَكْبَرײ.opgenomenFilmNummers()) { + bases.add(Integer.toString(filmSequence)); + } bases.add("7"); String[] items = new String[bases.size()]; items = bases.toArray(items); @@ -69,7 +59,7 @@ public class DemoNumberMatrixDeskApp extends AbstractDeskApp implements DeskAppR } ImGui.tableHeadersRow(); - for (BãßBȍőnNumberMatrixʸᴰ part:numberMatrix.waardes()) { + for (BãßBȍőnNumberMatrixʸᴰ part:numberMatrix.waardes().iterable()) { ImGui.tableNextRow(); ImGui.tableNextColumn(); diff --git a/gdxapp4d-lib-bassboonyd/src/main/java/love/distributedrebirth/bassboon/jpp/lang/number/matrix/M02MatrixBinary.java b/gdxapp4d-lib-bassboonyd/src/main/java/love/distributedrebirth/bassboon/jpp/lang/number/matrix/M02MatrixBinary.java index 6d960487..e124713a 100644 --- a/gdxapp4d-lib-bassboonyd/src/main/java/love/distributedrebirth/bassboon/jpp/lang/number/matrix/M02MatrixBinary.java +++ b/gdxapp4d-lib-bassboonyd/src/main/java/love/distributedrebirth/bassboon/jpp/lang/number/matrix/M02MatrixBinary.java @@ -9,6 +9,8 @@ public enum M02MatrixBinary implements BãßBȍőnNumberMatrixʸᴰ M_021(0x15,0,1,2), ; + public final static M03MatrixTrit STATIC = M03MatrixTrit.M_005; + private M03MatrixTrit(int dialTone, int...args) { BãßBȍőnNumberMatrixʸᴰ.Ꝑŕḯṿª₮ḕ.魎ᴵⁿᶦᵗ(this, dialTone, args); } diff --git a/gdxapp4d-lib-bassboonyd/src/main/java/love/distributedrebirth/bassboon/jpp/lang/number/matrix/M04MatrixQuad.java b/gdxapp4d-lib-bassboonyd/src/main/java/love/distributedrebirth/bassboon/jpp/lang/number/matrix/M04MatrixQuad.java index 5932a99d..05d0879a 100644 --- a/gdxapp4d-lib-bassboonyd/src/main/java/love/distributedrebirth/bassboon/jpp/lang/number/matrix/M04MatrixQuad.java +++ b/gdxapp4d-lib-bassboonyd/src/main/java/love/distributedrebirth/bassboon/jpp/lang/number/matrix/M04MatrixQuad.java @@ -31,6 +31,8 @@ public enum M04MatrixQuad implements BãßBȍőnNumberMatrixʸᴰ M_0228(0x0E4,0,1,2,3), ; + public final static M04MatrixQuad STATIC = M04MatrixQuad.M_0027; + private M04MatrixQuad(int dialTone, int...args) { BãßBȍőnNumberMatrixʸᴰ.Ꝑŕḯṿª₮ḕ.魎ᴵⁿᶦᵗ(this, dialTone, args); } diff --git a/gdxapp4d-lib-bassboonyd/src/main/java/love/distributedrebirth/bassboon/jpp/lang/number/matrix/M05MatrixPental.java b/gdxapp4d-lib-bassboonyd/src/main/java/love/distributedrebirth/bassboon/jpp/lang/number/matrix/M05MatrixPental.java index 67ea6245..4bc9c246 100644 --- a/gdxapp4d-lib-bassboonyd/src/main/java/love/distributedrebirth/bassboon/jpp/lang/number/matrix/M05MatrixPental.java +++ b/gdxapp4d-lib-bassboonyd/src/main/java/love/distributedrebirth/bassboon/jpp/lang/number/matrix/M05MatrixPental.java @@ -127,6 +127,8 @@ public enum M05MatrixPental implements BãßBȍőnNumberMatrixʸᴰ[] values; + private final Listᴿᵈ> values; - protected NumberMatrixSetEnum(BãßBȍőnNumberMatrixʸᴰ[] values) { - this.values = values; + @SuppressWarnings("unchecked") + protected > NumberMatrixSetEnum(Listᴿᵈ values) { + this.values = (Listᴿᵈ>) values; } @Override public int geefDimensie() { - return values[0].teŀráàmMatrixDimensie(); + return values.getᴿᵈ(0).teŀráàmMatrixDimensie(); } + @SuppressWarnings("unchecked") @Override - public BãßBȍőnNumberMatrixʸᴰ[] waardes() { - return values; + public > Listᴿᵈ waardes() { + return (Listᴿᵈ) values; } } @@ -120,27 +123,19 @@ public enum NumberMatrixFactory implements BãßBȍőnAbacusInstanceMBeanʸᴰ setInit = new ArrayList<>(); - private Abacus[] values; + private Listᵂʳ values = new ArrayListᴿᵂ<>(); protected NumberMatrixSetDimension(int dimension) { this.dimension = dimension; } - protected void initSet() { - this.values = setInit.toArray(new Abacus[setInit.size()]); - this.setInit.clear(); - this.setInit = null; - } - protected void createAbacus(int itemOrdinal, String itemName, int dialTone, int...args) { - setInit.add(new Abacus(itemOrdinal, itemName, dialTone, args)); + values.addᵂʳ(new Abacus(itemOrdinal, itemName, dialTone, args)); } @Override @@ -148,9 +143,10 @@ public enum NumberMatrixFactory implements BãßBȍőnAbacusInstanceMBeanʸᴰ[] waardes() { - return values; + public > Listᴿᵈ waardes() { + return (Listᴿᵈ) values; } @BãßBȍőnNumberMatrix注(dimension = -1) @@ -176,7 +172,7 @@ public enum NumberMatrixFactory implements BãßBȍőnAbacusInstanceMBeanʸᴰ teŀráàmWaardes() { return values; } diff --git a/gdxapp4d-lib-bassboonyd/src/main/java/love/distributedrebirth/bassboon/jpp/lang/number/matrix/NumberMatrixSet.java b/gdxapp4d-lib-bassboonyd/src/main/java/love/distributedrebirth/bassboon/jpp/lang/number/matrix/NumberMatrixSet.java index dd4b7b5e..cc9e7284 100644 --- a/gdxapp4d-lib-bassboonyd/src/main/java/love/distributedrebirth/bassboon/jpp/lang/number/matrix/NumberMatrixSet.java +++ b/gdxapp4d-lib-bassboonyd/src/main/java/love/distributedrebirth/bassboon/jpp/lang/number/matrix/NumberMatrixSet.java @@ -2,6 +2,7 @@ package love.distributedrebirth.bassboon.jpp.lang.number.matrix; import love.distributedrebirth.bassboon.clazz.BãßBȍőnAuthor注; import love.distributedrebirth.bassboon.clazz.BãßBȍőnDuytschen注; +import love.distributedrebirth.bassboon.jpp.util.Listᴿᵈ; @BãßBȍőnAuthor注(name = "للَّٰهِilLצسُو", copyright = "©Δ∞ 仙上主天") public interface NumberMatrixSet { @@ -10,5 +11,5 @@ public interface NumberMatrixSet { int geefDimensie(); @BãßBȍőnDuytschen注(中國 = "價值觀", BASIC = "VALUES", 𓃬𓍄𓋹𓀭 = "𓅱𓅂𓃭𓅱𓋴") - BãßBȍőnNumberMatrixʸᴰ[] waardes(); + > Listᴿᵈ waardes(); } 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 85ae2f75..7dc3367e 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,7 @@ package love.distributedrebirth.bassboon.jpp.util; import java.util.Spliterator; +import java.util.Spliterators; import java.util.stream.Collectors; import java.util.stream.Stream; import java.util.stream.StreamSupport; @@ -31,7 +32,7 @@ public interface Collectionᴿᵈ extends Iterableᴿᵈ { } default Spliterator spliteratorᴿᵈ() { - return streamᴿᵈ().spliterator(); + return Spliterators.spliteratorUnknownSize(iteratorᴿᵈ().iteratorᴼᶠ(), Spliterator.ORDERED); } default Object[] toArrayᴿᵈ() { diff --git a/gdxapp4d-lib-bassboonyd/src/main/java/love/distributedrebirth/bassboon/jpp/util/Iterableᴿᵈ.java b/gdxapp4d-lib-bassboonyd/src/main/java/love/distributedrebirth/bassboon/jpp/util/Iterableᴿᵈ.java index b6277068..5e353f24 100644 --- a/gdxapp4d-lib-bassboonyd/src/main/java/love/distributedrebirth/bassboon/jpp/util/Iterableᴿᵈ.java +++ b/gdxapp4d-lib-bassboonyd/src/main/java/love/distributedrebirth/bassboon/jpp/util/Iterableᴿᵈ.java @@ -1,5 +1,6 @@ package love.distributedrebirth.bassboon.jpp.util; +import java.util.Iterator; import java.util.Spliterator; import java.util.Spliterators; import java.util.function.Consumer; @@ -18,4 +19,14 @@ public interface Iterableᴿᵈ { default Spliterator spliteratorᴿᵈ() { return Spliterators.spliteratorUnknownSize(iteratorᴿᵈ().iteratorᴼᶠ(), Spliterator.ORDERED); } + + default Iterable iterable() { + return new Iterable<>() { + @Override + public Iterator iterator() { + return iteratorᴿᵈ().iteratorᴼᶠ(); + } + + }; + } } diff --git a/gdxapp4d-lib-bassboonyd/src/main/java/love/distributedrebirth/bassboon/yd/abacus/BãßBȍőnAbacus.java b/gdxapp4d-lib-bassboonyd/src/main/java/love/distributedrebirth/bassboon/yd/abacus/BãßBȍőnAbacus.java index ac7cf401..30ae57d3 100644 --- a/gdxapp4d-lib-bassboonyd/src/main/java/love/distributedrebirth/bassboon/yd/abacus/BãßBȍőnAbacus.java +++ b/gdxapp4d-lib-bassboonyd/src/main/java/love/distributedrebirth/bassboon/yd/abacus/BãßBȍőnAbacus.java @@ -3,6 +3,7 @@ package love.distributedrebirth.bassboon.yd.abacus; import love.distributedrebirth.bassboon.clazz.BãßBȍőnAuthor注; import love.distributedrebirth.bassboon.clazz.BãßBȍőnDuytsFlüstern注; import love.distributedrebirth.bassboon.clazz.BãßBȍőnDuytschen注; +import love.distributedrebirth.bassboon.jpp.util.Listᴿᵈ; @BãßBȍőnAuthor注(name = "للَّٰهِilLצسُو", copyright = "©Δ∞ 仙上主天") @BãßBȍőnDuytsFlüstern注(purpose = "The manual octopussy calculator.") @@ -22,7 +23,7 @@ public interface BãßBȍőnAbacus { int rȧñkTelEen(); @BãßBȍőnDuytschen注(中國 = "算盤　籙", BASIC = "ABACUS_VALUES", 𓃬𓍄𓋹𓀭 = "𓅂𓃀𓅂𓎡𓅱𓋴　𓅱𓅂𓃭𓅱𓋴") - T[] teŀráàmWaardes(); + Listᴿᵈ teŀráàmWaardes(); @BãßBȍőnDuytschen注(中國 = "算盤　尺寸", BASIC = "ABACUS_SIZE", 𓃬𓍄𓋹𓀭 = "𓅂𓃀𓅂𓎡𓅱𓋴　𓋴𓇋 𓋊") int teŀráàmGroote(); 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 fc542ac8..fed5696a 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 @@ -16,6 +16,8 @@ import love.distributedrebirth.bassboon.clazz.pirate.BãßBȍőnPirateʸᴰ; import love.distributedrebirth.bassboon.clazz.pirate.BãßBȍőnꝐŕḯṿª₮ḕ; import love.distributedrebirth.bassboon.death.spider.BãßBȍőnSpiderWire注; import love.distributedrebirth.bassboon.jpp.lang.StringGhostKey; +import love.distributedrebirth.bassboon.jpp.util.ArrayListᴿᵂ; +import love.distributedrebirth.bassboon.jpp.util.Listᴿᵈ; @BãßBȍőnAuthor注(name = "للَّٰهِilLצسُو", copyright = "©Δ∞ 仙上主天") public interface BãßBȍőnAbacusEnumBaseʸᴰ & AbacusEnum & BãßBȍőnAbacus> extends AbacusEnum, BãßBȍőnAbacus, DefaultBãßBȍőnʸᴰ { @@ -26,6 +28,7 @@ public interface BãßBȍőnAbacusEnumBaseʸᴰ & private static final StringGhostKey GHOST_LENGTH = StringGhostKey.asciiᴳʰᵒˢᵗ(); private static final StringGhostKey GHOST_RANK_RING_TONE = StringGhostKey.asciiᴳʰᵒˢᵗ(); private static final StringGhostKey GHOST_MAP_TONE = StringGhostKey.asciiᴳʰᵒˢᵗ(); + private static final StringGhostKey GHOST_ENUM_LIST = StringGhostKey.asciiᴳʰᵒˢᵗ(); @BãßBȍőnSpiderWire注 private BãßBȍőnAbacusEnumBaseʸᴰ boon; @@ -45,6 +48,7 @@ public interface BãßBȍőnAbacusEnumBaseʸᴰ & @Override public void lock() { + boon.teŀráàmWaardes(); boon.teŀráàmGroote(); boon.teŀráàmWaardeVanRingToon(boon.rȧñkRingToon()); } @@ -74,7 +78,7 @@ public interface BãßBȍőnAbacusEnumBaseʸᴰ & default int teŀráàmGroote() { Integer result = toBBC().UNHOLY(Ꝑŕḯṿª₮ḕ.class).GHOST_INT(Ꝑŕḯṿª₮ḕ.GHOST_LENGTH); if (result == null) { - result = teŀráàmWaardes().length; + result = teŀráàmWaardes().sizeᴿᵈ(); toBBC().UNHOLY_SPELL(Ꝑŕḯṿª₮ḕ.class).PUT_GHOST(Ꝑŕḯṿª₮ḕ.GHOST_LENGTH, result); } return result; @@ -82,21 +86,29 @@ public interface BãßBȍőnAbacusEnumBaseʸᴰ & @SuppressWarnings("unchecked") @Override - default T[] teŀráàmWaardes() { + default Listᴿᵈ teŀráàmWaardes() { + Listᴿᵈ result = toBBC().UNHOLY(Ꝑŕḯṿª₮ḕ.class).GHOST_OBJ(Ꝑŕḯṿª₮ḕ.GHOST_ENUM_LIST, Listᴿᵈ.class); + if (result!=null) { + return result; + } if (!getClass().isEnum()) { throw new IllegalArgumentException("Class is not an enum: "+getClass()); } - return (T[]) getClass().getEnumConstants(); // note: highly unholy, but without it is not an abacus + // note: highly unholy, but without it is not an abacus + List values = Arrays.asList((T[]) getClass().getEnumConstants()); + result = new ArrayListᴿᵂ<>(values); + toBBC().UNHOLY_SPELL(Ꝑŕḯṿª₮ḕ.class).PUT_GHOST(Ꝑŕḯṿª₮ḕ.GHOST_ENUM_LIST, result); + return result; } - @BãßBȍőnDuytschen注(中國 = "算盤　籙　列表", BASIC = "ABACUS_VALUES_LIST", 𓃬𓍄𓋹𓀭 = "𓅂𓃀𓅂𓎡𓅱𓋴　𓅱𓅂𓃭𓅱𓋴　𓃭𓇋𓋴𓈏") - default List teŀráàmWaardesLijst() { - return Arrays.asList(teŀráàmWaardes()); - } +// @BãßBȍőnDuytschen注(中國 = "算盤　籙　列表", BASIC = "ABACUS_VALUES_LIST", 𓃬𓍄𓋹𓀭 = "𓅂𓃀𓅂𓎡𓅱𓋴　𓅱𓅂𓃭𓅱𓋴　𓃭𓇋𓋴𓈏") +// default List teŀráàmWaardesLijst() { +// return teŀráàmWaardes(); +// } @BãßBȍőnDuytschen注(中國 = "算盤　籙　至　地圖", BASIC = "ABACUS_VALUES_TO_MAP", 𓃬𓍄𓋹𓀭 = "𓅂𓃀𓅂𓎡𓅱𓋴　𓅱𓅂𓃭𓅱𓋴　𓅲　𓅕𓅂𓉱") default Map teŀráàmWaardesNaarMap(Function keyMapper) { - return teŀráàmWaardesLijst().stream().collect(Collectors.toMap(keyMapper, v -> v)); + return teŀráàmWaardes().streamᴿᵈ().collect(Collectors.toMap(keyMapper, v -> v)); } @SuppressWarnings("unchecked") diff --git a/gdxapp4d-lib-bassboonyd/src/main/java/love/distributedrebirth/bassboon/yd/abacus/BãßBȍőnAbacusInstanceʸᴰ.java b/gdxapp4d-lib-bassboonyd/src/main/java/love/distributedrebirth/bassboon/yd/abacus/BãßBȍőnAbacusInstanceʸᴰ.java index ee096e5b..2b8907e0 100644 --- a/gdxapp4d-lib-bassboonyd/src/main/java/love/distributedrebirth/bassboon/yd/abacus/BãßBȍőnAbacusInstanceʸᴰ.java +++ b/gdxapp4d-lib-bassboonyd/src/main/java/love/distributedrebirth/bassboon/yd/abacus/BãßBȍőnAbacusInstanceʸᴰ.java @@ -10,6 +10,6 @@ public interface BãßBȍőnAbacusInstanceʸᴰ & @BãßBȍőnDuytschen注(中國 = "算盤", BASIC = "ABACUS", 𓃬𓍄𓋹𓀭 = "𓅂𓃀𓅂𓎡𓅱𓋴") default T teŀráàm() { - return teŀráàmWaardes()[Bãß.ℭỗᶇṧⱦᶏꬼȶʂ.INT_ZERO]; + return teŀráàmWaardes().getᴿᵈ(Bãß.ℭỗᶇṧⱦᶏꬼȶʂ.INT_ZERO); } } 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 b0e87c69..03f66e4d 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 @@ -6,57 +6,56 @@ import love.distributedrebirth.bassboon.Bãß; import love.distributedrebirth.bassboon.BãßBȍőnʸᴰ; import love.distributedrebirth.bassboon.clazz.BãßBȍőnAuthor注; import love.distributedrebirth.bassboon.clazz.BãßBȍőnDuytschen注; +import love.distributedrebirth.bassboon.jpp.util.Listᴿᵈ; @BãßBȍőnAuthor注(name = "للَّٰهِilLצسُو", copyright = "©Δ∞ 仙上主天") public interface BãßBȍőnAbacusSetʸᴰ & AbacusEnum & BãßBȍőnAbacus> extends BãßBȍőnAbacusEnumBaseʸᴰ { @BãßBȍőnDuytschen注(中國 = "算盤　討厭　第一的", BASIC = "RANK_TO_FIRST", 𓃬𓍄𓋹𓀭 = "𓂏𓅃𓈁𓎡　𓅲　𓊲𓇋𓁹𓆘𓋶") default T rȧñkNaarEerste() { - return teŀráàmWaardes()[Bãß.ℭỗᶇṧⱦᶏꬼȶʂ.INT_ZERO]; + return teŀráàmWaardes().getᴿᵈ(Bãß.ℭỗᶇṧⱦᶏꬼȶʂ.INT_ZERO); } @BãßBȍőnDuytschen注(中國 = "算盤　討厭　最後的", BASIC = "RANK_TO_LAST", 𓃬𓍄𓋹𓀭 = "𓂏𓅃𓈁𓎡　𓅲　𓆅𓅃𓆘𓋶") default T rȧñkNaarLaatste() { - T[] values = teŀráàmWaardes(); - return values[values.length - Bãß.ℭỗᶇṧⱦᶏꬼȶʂ.INT_ONE]; + Listᴿᵈ values = teŀráàmWaardes(); + return values.getᴿᵈ(values.sizeᴿᵈ() - Bãß.ℭỗᶇṧⱦᶏꬼȶʂ.INT_ONE); } @BãßBȍőnDuytschen注(中國 = "算盤　討厭　比鄰", BASIC = "RANK_TO_NEXT", 𓃬𓍄𓋹𓀭 = "𓂏𓅃𓈁𓎡　𓅲　𓌒𓎡𓋶𓌟") default T rȧñkNaarVolgende() { - T[] values = teŀráàmWaardes(); + Listᴿᵈ values = teŀráàmWaardes(); int resultIndex = Bãß.ℭỗᶇṧⱦᶏꬼȶʂ.INT_ZERO; - for (int i=Bãß.ℭỗᶇṧⱦᶏꬼȶʂ.INT_ZERO;i values = teŀráàmWaardes(); int resultIndex = Bãß.ℭỗᶇṧⱦᶏꬼȶʂ.INT_ZERO; - for (int i=Bãß.ℭỗᶇṧⱦᶏꬼȶʂ.INT_ZERO;i consumer) { - for (T value:teŀráàmWaardes()) { - consumer.accept(value); - } + teŀráàmWaardes().forEachᴿᵈ(consumer); } } diff --git a/gdxapp4d-lib-bassboonyd/src/test/java/love/distributedrebirth/bassboon/jpp/lang/NumberMatrixFactoryTest.java b/gdxapp4d-lib-bassboonyd/src/test/java/love/distributedrebirth/bassboon/jpp/lang/NumberMatrixFactoryTest.java index 5192d88e..c2198b38 100644 --- a/gdxapp4d-lib-bassboonyd/src/test/java/love/distributedrebirth/bassboon/jpp/lang/NumberMatrixFactoryTest.java +++ b/gdxapp4d-lib-bassboonyd/src/test/java/love/distributedrebirth/bassboon/jpp/lang/NumberMatrixFactoryTest.java @@ -31,7 +31,7 @@ public class NumberMatrixFactoryTest { for (int i=2;i<4;i++) { NumberMatrixSet film = NumberMatrixFactory.ײاللهזأَكْبَرײ.geefFilmSet(i); Assertions.assertEquals(i, film.geefDimensie()); - Assertions.assertEquals(film.waardes().length, film.waardes()[0].teŀráàmGroote()); + Assertions.assertEquals(film.waardes().sizeᴿᵈ(), film.waardes().getᴿᵈ(0).teŀráàmGroote()); } } } diff --git a/gdxapp4d-lib-numberxd/src/main/java/love/distributedrebirth/numberxd/WavẽWorstGetậl1ⁿᴰ.java b/gdxapp4d-lib-numberxd/src/main/java/love/distributedrebirth/numberxd/WavẽWorstGetậl1ⁿᴰ.java index b1bbeea2..da511827 100644 --- a/gdxapp4d-lib-numberxd/src/main/java/love/distributedrebirth/numberxd/WavẽWorstGetậl1ⁿᴰ.java +++ b/gdxapp4d-lib-numberxd/src/main/java/love/distributedrebirth/numberxd/WavẽWorstGetậl1ⁿᴰ.java @@ -18,7 +18,7 @@ public class WavẽWorstGetậl1ⁿᴰ extends AbstractBaseGetậlMatrix1 worstCut) { this.worstCut = worstCut; - this.worstCutLength = worstCut.teŀráàmWaardes().length; + this.worstCutLength = worstCut.teŀráàmWaardes().sizeᴿᵈ(); this.values = new V0x0013B0ˣᴸ[this.worstCutLength]; for (int i=0;i worstCut, BaseIteratorOctal values) { this.worstCut = worstCut; - this.worstCutLength = worstCut.teŀráàmWaardes().length; + this.worstCutLength = worstCut.teŀráàmWaardes().sizeᴿᵈ(); this.values = new V0x0013B0ˣᴸ[this.worstCutLength]; for (int i=0;i worstCut, BãßBȍőnPartʸᴰ worstChannel) { this.worstCut = worstCut; - this.worstCutLength = worstCut.teŀráàmWaardes().length; + this.worstCutLength = worstCut.teŀráàmWaardes().sizeᴿᵈ(); this.worstChannel = worstChannel; - this.worstChannelLength = worstChannel.teŀráàmWaardes().length; + this.worstChannelLength = worstChannel.teŀráàmWaardes().sizeᴿᵈ(); this.values = new V0x0013B0ˣᴸ[this.worstCutLength][this.worstChannelLength]; for (int x=0;x worstCut, BãßBȍőnPartʸᴰ worstChannel, BaseIteratorOctal values) { this.worstCut = worstCut; - this.worstCutLength = worstCut.teŀráàmWaardes().length; + this.worstCutLength = worstCut.teŀráàmWaardes().sizeᴿᵈ(); this.worstChannel = worstChannel; - this.worstChannelLength = worstChannel.teŀráàmWaardes().length; + this.worstChannelLength = worstChannel.teŀráàmWaardes().sizeᴿᵈ(); this.values = new V0x0013B0ˣᴸ[this.worstCutLength][this.worstChannelLength]; for (int x=0;x valA.teŀráàmWaardes().length) { - valResultNum = valA.teŀráàmWaardes().length -1; + if (valResultNum > valA.teŀráàmWaardes().sizeᴿᵈ()) { + valResultNum = valA.teŀráàmWaardes().sizeᴿᵈ() -1; } T08PartOctal valResult = T08PartOctal.values()[valResultNum]; 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 99b3e207..ddac17c3 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 @@ -73,7 +73,7 @@ public enum Base2WarpCore implements BãßBȍőnAbacusInstanceMBeanʸᴰ[] bases = Base2PartsFactory.INSTANCE.BãßBuildPartsByBase(base); - heart.setBass(bases[0].teŀráàmWaardes().length); + heart.setBass(bases[0].teŀráàmWaardes().sizeᴿᵈ()); for (BãßBȍőnPartʸᴰ part:bases) { WaterCipherHeartTone tone = new WaterCipherHeartTone(); tone.setPart(part.rȧñkNaam()); 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 fb5db0c5..5e517ff8 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 @@ -34,7 +34,7 @@ public enum BaseGlyphSet implements BãßBȍőnAbacusSetMBeanʸᴰ if (T10PartDecimal.PART_10 == x) { v.add("ten"); } else { - v.add(T10PartDecimal.STATIC.teŀráàmWaardes()[x.rȧñkTelEen()].rȧñkChinaWaarde()); // 1 to 9 + v.add(T10PartDecimal.STATIC.teŀráàmWaardes().getᴿᵈ(x.rȧñkTelEen()).rȧñkChinaWaarde()); // 1 to 9 } }), "twenty", "thirty", "forty", "fifty", "sixty", "seventy", "eighty", "ninety", "one hundred", "two hundred", "three hundred", "four hundred", "five hundred", "six hundred", "seven hundred", "eight hundred", "nine hundred")), diff --git a/gdxapp4d-lib-numberxd/src/main/java/love/distributedrebirth/numberxd/x4o/NumberXDModuleLoader.java b/gdxapp4d-lib-numberxd/src/main/java/love/distributedrebirth/numberxd/x4o/NumberXDModuleLoader.java index dfc8db51..ce9530b8 100644 --- a/gdxapp4d-lib-numberxd/src/main/java/love/distributedrebirth/numberxd/x4o/NumberXDModuleLoader.java +++ b/gdxapp4d-lib-numberxd/src/main/java/love/distributedrebirth/numberxd/x4o/NumberXDModuleLoader.java @@ -105,7 +105,7 @@ public class NumberXDModuleLoader implements X4OLanguageModuleLoader { } private void configBãßBȍőnPartAttributes(X4OLanguage language,ElementClass ec, BãßBȍőnPartʸᴰ basePart) throws X4OLanguageModuleLoaderException { - for (BãßBȍőnPartʸᴰ part: basePart.teŀráàmWaardes()) { + for (BãßBȍőnPartʸᴰ part: basePart.teŀráàmWaardes().iterable()) { ec.addElementClassAttribute(createElementClassAttribute(language,part.rȧñkChinaSleutel(),true,new BãßBȍőnPartDialToneConverter(part))); } }