From ce40757187e2d7703f2860ae676bef95b38ae6dc Mon Sep 17 00:00:00 2001 From: Willem Cazander Date: Fri, 4 Feb 2022 17:40:14 +0100 Subject: [PATCH] Revert "Moved XL number types to size only name." This reverts commit 954945d1fec023bacc7dd9407c7f3e341cbf2a7b. --- .../numberxd/GroßGetậl1ⁿᴰ.java | 16 ++--- .../numberxd/Gê̄ldGetậl.java | 8 +-- .../numberxd/KlompGetậl4ˢᴰ.java | 16 ++--- .../numberxd/base2t/Base2Terminator.java | 16 ++--- .../numberxd/base2t/BaseNumberTyteXL.java | 11 ---- .../numberxd/base2t/BaseNumberXL.java | 11 ---- .../type/{V027Temvig.java => V01BTemvig.java} | 14 ++--- .../type/{V036Teger.java => V024Teger.java} | 14 ++--- .../type/{V042Traw.java => V02ATraw.java} | 10 ++-- .../type/{V072Tong.java => V048Tong.java} | 28 ++++----- .../type/{V144Tocta.java => V090Tocta.java} | 28 ++++----- .../V0x000348ˣᴸ.java => type/V348Traz.java} | 27 +++++---- .../V0x000654ˣᴸ.java => type/V654Triz.java} | 27 +++++---- .../V0x000CA8ˣᴸ.java => type/VCA8Tath.java} | 28 ++++----- .../numberxd/base2t/typexl/V0x0013B0ˣᴸ.java | 52 ----------------- .../numberxd/base2t/typexl/V0x006540ˣᴸ.java | 58 ------------------- .../numberxd/base2t/typexl/V0x049D40ˣᴸ.java | 52 ----------------- 17 files changed, 115 insertions(+), 301 deletions(-) delete mode 100644 numberxd/src/main/love/distributedrebirth/numberxd/base2t/BaseNumberTyteXL.java delete mode 100644 numberxd/src/main/love/distributedrebirth/numberxd/base2t/BaseNumberXL.java rename numberxd/src/main/love/distributedrebirth/numberxd/base2t/type/{V027Temvig.java => V01BTemvig.java} (84%) rename numberxd/src/main/love/distributedrebirth/numberxd/base2t/type/{V036Teger.java => V024Teger.java} (86%) rename numberxd/src/main/love/distributedrebirth/numberxd/base2t/type/{V042Traw.java => V02ATraw.java} (85%) rename numberxd/src/main/love/distributedrebirth/numberxd/base2t/type/{V072Tong.java => V048Tong.java} (72%) rename numberxd/src/main/love/distributedrebirth/numberxd/base2t/type/{V144Tocta.java => V090Tocta.java} (78%) rename numberxd/src/main/love/distributedrebirth/numberxd/base2t/{typexl/V0x000348ˣᴸ.java => type/V348Traz.java} (53%) rename numberxd/src/main/love/distributedrebirth/numberxd/base2t/{typexl/V0x000654ˣᴸ.java => type/V654Triz.java} (59%) rename numberxd/src/main/love/distributedrebirth/numberxd/base2t/{typexl/V0x000CA8ˣᴸ.java => type/VCA8Tath.java} (55%) delete mode 100644 numberxd/src/main/love/distributedrebirth/numberxd/base2t/typexl/V0x0013B0ˣᴸ.java delete mode 100644 numberxd/src/main/love/distributedrebirth/numberxd/base2t/typexl/V0x006540ˣᴸ.java delete mode 100644 numberxd/src/main/love/distributedrebirth/numberxd/base2t/typexl/V0x049D40ˣᴸ.java diff --git a/numberxd/src/main/love/distributedrebirth/numberxd/GroßGetậl1ⁿᴰ.java b/numberxd/src/main/love/distributedrebirth/numberxd/GroßGetậl1ⁿᴰ.java index 24d06751..026ffa3f 100644 --- a/numberxd/src/main/love/distributedrebirth/numberxd/GroßGetậl1ⁿᴰ.java +++ b/numberxd/src/main/love/distributedrebirth/numberxd/GroßGetậl1ⁿᴰ.java @@ -8,7 +8,7 @@ import love.distributedrebirth.numberxd.base2t.BaseIteratorOctal; import love.distributedrebirth.numberxd.base2t.BaseAppenderTyte; import love.distributedrebirth.numberxd.base2t.BaseIteratorTyte; import love.distributedrebirth.numberxd.base2t.type.V009Tyte; -import love.distributedrebirth.numberxd.base2t.type.V144Tocta; +import love.distributedrebirth.numberxd.base2t.type.V090Tocta; /** * Holds an 144 bit fraction. @@ -19,7 +19,7 @@ public class GroßGetậl1ⁿᴰ implements BaseGetậl { public static int NUMERATOR_SIZE = 7; public static int DENOMINATOR_SIZE = 9; - public static int BIT_COUNT = V144Tocta.BIT_COUNT; + public static int BIT_COUNT = V090Tocta.BIT_COUNT; private final V009Tyte[] numerator = new V009Tyte[NUMERATOR_SIZE]; private final V009Tyte[] denominator = new V009Tyte[DENOMINATOR_SIZE]; @@ -50,7 +50,7 @@ public class GroßGetậl1ⁿᴰ implements BaseGetậl { } } - public GroßGetậl1ⁿᴰ(V144Tocta tocta) { + public GroßGetậl1ⁿᴰ(V090Tocta tocta) { List tytes = new ArrayList<>(); tocta.fillTytesByReference(new BaseAppenderTyte(tytes)); for (int i=0;i { } } - public V144Tocta toToctaByReference() { - return new V144Tocta(iteratorTytesByReference()); + public V090Tocta toToctaByReference() { + return new V090Tocta(iteratorTytesByReference()); } - public V144Tocta toToctaByClone() { - return new V144Tocta(iteratorOctalsByClone()); + public V090Tocta toToctaByClone() { + return new V090Tocta(iteratorOctalsByClone()); } @Override public int getBitCount() { - return V144Tocta.BIT_COUNT; + return V090Tocta.BIT_COUNT; } @Override diff --git a/numberxd/src/main/love/distributedrebirth/numberxd/Gê̄ldGetậl.java b/numberxd/src/main/love/distributedrebirth/numberxd/Gê̄ldGetậl.java index bb720ea1..6e263ba3 100644 --- a/numberxd/src/main/love/distributedrebirth/numberxd/Gê̄ldGetậl.java +++ b/numberxd/src/main/love/distributedrebirth/numberxd/Gê̄ldGetậl.java @@ -4,7 +4,7 @@ import java.util.ArrayList; import java.util.List; import love.distributedrebirth.numberxd.base2t.part.T04PartQuad; -import love.distributedrebirth.numberxd.base2t.type.V036Teger; +import love.distributedrebirth.numberxd.base2t.type.V024Teger; /** * @@ -20,7 +20,7 @@ public class Gê̄ldGetậl { private static final Character LEFT_TO_RIGHT_MARK = 0x200E; private static final Character RIGHT_TO_LEFT_MARK = 0x200F; - public Gê̄ldGetậl(V036Teger teger) { + public Gê̄ldGetậl(V024Teger teger) { this( new Gê̄ldGetậlÅtHebrew(teger.getTytePart(T04PartQuad.PART_1)), new Gê̄ldGetậlÅtHebrew(teger.getTytePart(T04PartQuad.PART_2)), @@ -146,8 +146,8 @@ public class Gê̄ldGetậl { return totalDecimalValue; } - public V036Teger toTeger() { - V036Teger result = new V036Teger(); + public V024Teger toTeger() { + V024Teger result = new V024Teger(); result.setTytePart(T04PartQuad.PART_1, nummerAlphabet.toTyte()); result.setTytePart(T04PartQuad.PART_2, nummerDeelA.toTyte()); result.setTytePart(T04PartQuad.PART_3, nummerDeelB.toTyte()); diff --git a/numberxd/src/main/love/distributedrebirth/numberxd/KlompGetậl4ˢᴰ.java b/numberxd/src/main/love/distributedrebirth/numberxd/KlompGetậl4ˢᴰ.java index 08ae1229..b10a14b1 100644 --- a/numberxd/src/main/love/distributedrebirth/numberxd/KlompGetậl4ˢᴰ.java +++ b/numberxd/src/main/love/distributedrebirth/numberxd/KlompGetậl4ˢᴰ.java @@ -2,8 +2,8 @@ package love.distributedrebirth.numberxd; import love.distributedrebirth.numberxd.base2t.BaseNumberTyte; import love.distributedrebirth.numberxd.base2t.part.T08PartOctal; -import love.distributedrebirth.numberxd.base2t.typexl.V0x000654ˣᴸ; -import love.distributedrebirth.numberxd.base2t.typexl.V0x000CA8ˣᴸ; +import love.distributedrebirth.numberxd.base2t.type.V654Triz; +import love.distributedrebirth.numberxd.base2t.type.VCA8Tath; import love.distributedrebirth.numberxd.base2t.BaseAppenderOctal; import love.distributedrebirth.numberxd.base2t.BaseIteratorOctal; import love.distributedrebirth.numberxd.base2t.BaseAppenderTyte; @@ -18,26 +18,26 @@ import love.distributedrebirth.numberxd.base2t.BaseAppenderTyte; */ public class KlompGetậl4ˢᴰ implements BaseNumberTyte { - public static int BIT_COUNT = V0x000654ˣᴸ.BIT_COUNT * T08PartOctal.LENGTH(); - private final V0x000CA8ˣᴸ[] values = new V0x000CA8ˣᴸ[T08PartOctal.LENGTH()]; + public static int BIT_COUNT = V654Triz.BIT_COUNT * T08PartOctal.LENGTH(); + private final VCA8Tath[] values = new VCA8Tath[T08PartOctal.LENGTH()]; public KlompGetậl4ˢᴰ() { for (int i=0;i output) throws IOException { + public int Bãß2ReadTong(InputStream input, List output) throws IOException { int totalBytes = 0; byte[] data = new byte[BLOCK_TONG_SIZE]; int readDataSize = 0; // per 9 bytes we have 24 octals for one V072Tong number @@ -37,13 +37,13 @@ public enum Base2Terminator implements BãßBȍőnEnumInstanceʸᴰ octals = Bãß2ReadOctals(v0, v1, v2); - output.add(new V072Tong(new BaseIteratorOctal(octals.iterator()))); + output.add(new V048Tong(new BaseIteratorOctal(octals.iterator()))); totalBytes += BLOCK_TONG_SIZE; } return totalBytes; } - public int Bãß2ReadTocta(InputStream input, List output) throws IOException { + public int Bãß2ReadTocta(InputStream input, List output) throws IOException { int totalBytes = 0; byte[] data = new byte[BLOCK_TOCTA_SIZE]; int readDataSize = 0; // per 18 bytes we have 48 octals for one V144Tocta number @@ -56,7 +56,7 @@ public enum Base2Terminator implements BãßBȍőnEnumInstanceʸᴰ octals = Bãß2ReadOctals(v0, v1, v2, v3, v4, v5); - output.add(new V144Tocta(new BaseIteratorOctal(octals.iterator()))); + output.add(new V090Tocta(new BaseIteratorOctal(octals.iterator()))); totalBytes += BLOCK_TOCTA_SIZE; } return totalBytes; @@ -76,11 +76,11 @@ public enum Base2Terminator implements BãßBȍőnEnumInstanceʸᴰ data, OutputStream output) throws IOException { + public int Bãß2WriteTong(List data, OutputStream output) throws IOException { return Bãß2Write(data, output); } - public int Bãß2WriteTocta(List data, OutputStream output) throws IOException { + public int Bãß2WriteTocta(List data, OutputStream output) throws IOException { return Bãß2Write(data, output); } diff --git a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/BaseNumberTyteXL.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/BaseNumberTyteXL.java deleted file mode 100644 index fddbe44f..00000000 --- a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/BaseNumberTyteXL.java +++ /dev/null @@ -1,11 +0,0 @@ -package love.distributedrebirth.numberxd.base2t; - -import love.distributedrebirth.bassboonyd.BãßBȍőnAuthorInfoʸᴰ; - -/** - * Propogate baseXL interface upwards. - */ -@BãßBȍőnAuthorInfoʸᴰ(name = "willemtsade", copyright = "©Δ∞ 仙上主天") -public interface BaseNumberTyteXL> extends BaseNumberXL,BaseNumberTyte { - -} diff --git a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/BaseNumberXL.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/BaseNumberXL.java deleted file mode 100644 index d356b07f..00000000 --- a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/BaseNumberXL.java +++ /dev/null @@ -1,11 +0,0 @@ -package love.distributedrebirth.numberxd.base2t; - -import love.distributedrebirth.bassboonyd.BãßBȍőnAuthorInfoʸᴰ; - -/** - * Marker for XL numbers which needs seperator renderer. - */ -@BãßBȍőnAuthorInfoʸᴰ(name = "willemtsade", copyright = "©Δ∞ 仙上主天") -public interface BaseNumberXL> extends BaseNumber { - -} diff --git a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/type/V027Temvig.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/type/V01BTemvig.java similarity index 84% rename from numberxd/src/main/love/distributedrebirth/numberxd/base2t/type/V027Temvig.java rename to numberxd/src/main/love/distributedrebirth/numberxd/base2t/type/V01BTemvig.java index 7a669677..934430ea 100644 --- a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/type/V027Temvig.java +++ b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/type/V01BTemvig.java @@ -12,24 +12,24 @@ import love.distributedrebirth.numberxd.base2t.part.T03PartTrit; * Holds an 27 bit value. */ @BãßBȍőnAuthorInfoʸᴰ(name = "willemtsade", copyright = "©Δ∞ 仙上主天") -public final class V027Temvig implements BaseNumberTyte { +public final class V01BTemvig implements BaseNumberTyte { public static int BIT_COUNT = V009Tyte.BIT_COUNT * T03PartTrit.LENGTH(); private V009Tyte[] values = new V009Tyte[T03PartTrit.LENGTH()]; - public V027Temvig() { + public V01BTemvig() { this(new V009Tyte(), new V009Tyte(), new V009Tyte()); } - public V027Temvig(BaseIteratorOctal values) { + public V01BTemvig(BaseIteratorOctal values) { this(new V009Tyte(values), new V009Tyte(values), new V009Tyte(values)); } - public V027Temvig(BaseIteratorTyte values) { + public V01BTemvig(BaseIteratorTyte values) { this(values.next(), values.next(), values.next()); } - private V027Temvig(V009Tyte valueHigh, V009Tyte valueMedium, V009Tyte valueLow) { + private V01BTemvig(V009Tyte valueHigh, V009Tyte valueMedium, V009Tyte valueLow) { setValue(T03PartTrit.PART_1, valueHigh); setValue(T03PartTrit.PART_2, valueMedium); setValue(T03PartTrit.PART_3, valueLow); @@ -49,8 +49,8 @@ public final class V027Temvig implements BaseNumberTyte { } @Override - public V027Temvig toClone() { - return new V027Temvig(iteratorOctalsByClone()); + public V01BTemvig toClone() { + return new V01BTemvig(iteratorOctalsByClone()); } @Override diff --git a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/type/V036Teger.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/type/V024Teger.java similarity index 86% rename from numberxd/src/main/love/distributedrebirth/numberxd/base2t/type/V036Teger.java rename to numberxd/src/main/love/distributedrebirth/numberxd/base2t/type/V024Teger.java index 3b3e0199..e6e17e23 100644 --- a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/type/V036Teger.java +++ b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/type/V024Teger.java @@ -13,24 +13,24 @@ import love.distributedrebirth.numberxd.base2t.part.T04PartQuad; * Holds an 36 bit value. */ @BãßBȍőnAuthorInfoʸᴰ(name = "willemtsade", copyright = "©Δ∞ 仙上主天") -public final class V036Teger implements BaseNumberTyte { +public final class V024Teger implements BaseNumberTyte { public static int BIT_COUNT = V012Tord.BIT_COUNT * T02PartBinary.LENGTH(); private V012Tord[] values = new V012Tord[T02PartBinary.LENGTH()]; - public V036Teger() { + public V024Teger() { this(new V012Tord(), new V012Tord()); } - public V036Teger(BaseIteratorOctal values) { + public V024Teger(BaseIteratorOctal values) { this(new V012Tord(values), new V012Tord(values)); } - public V036Teger(BaseIteratorTyte values) { + public V024Teger(BaseIteratorTyte values) { this(new V012Tord(values), new V012Tord(values)); } - private V036Teger(V012Tord valueHigh, V012Tord valueLow) { + private V024Teger(V012Tord valueHigh, V012Tord valueLow) { setValue(T02PartBinary.PART_1, valueHigh); setValue(T02PartBinary.PART_2, valueLow); } @@ -59,8 +59,8 @@ public final class V036Teger implements BaseNumberTyte { } @Override - public V036Teger toClone() { - return new V036Teger(iteratorOctalsByClone()); + public V024Teger toClone() { + return new V024Teger(iteratorOctalsByClone()); } @Override diff --git a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/type/V042Traw.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/type/V02ATraw.java similarity index 85% rename from numberxd/src/main/love/distributedrebirth/numberxd/base2t/type/V042Traw.java rename to numberxd/src/main/love/distributedrebirth/numberxd/base2t/type/V02ATraw.java index bae9eb8d..f84e3df1 100644 --- a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/type/V042Traw.java +++ b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/type/V02ATraw.java @@ -10,18 +10,18 @@ import love.distributedrebirth.numberxd.base2t.part.T07PartPlanIt; * Holds an 42 bit value. */ @BãßBȍőnAuthorInfoʸᴰ(name = "willemtsade", copyright = "©Δ∞ 仙上主天") -public final class V042Traw implements BaseNumber { +public final class V02ATraw implements BaseNumber { public static int BIT_COUNT = V006Tixte.BIT_COUNT * T07PartPlanIt.LENGTH(); private V006Tixte[] values = new V006Tixte[T07PartPlanIt.LENGTH()]; - public V042Traw() { + public V02ATraw() { for (int i=0;i { } @Override - public V042Traw toClone() { - return new V042Traw(iteratorOctalsByClone()); + public V02ATraw toClone() { + return new V02ATraw(iteratorOctalsByClone()); } @Override diff --git a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/type/V072Tong.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/type/V048Tong.java similarity index 72% rename from numberxd/src/main/love/distributedrebirth/numberxd/base2t/type/V072Tong.java rename to numberxd/src/main/love/distributedrebirth/numberxd/base2t/type/V048Tong.java index 1b6f143e..5dfca579 100644 --- a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/type/V072Tong.java +++ b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/type/V048Tong.java @@ -14,33 +14,33 @@ import love.distributedrebirth.numberxd.base2t.part.T08PartOctal; * Holds an 72 bit value. */ @BãßBȍőnAuthorInfoʸᴰ(name = "willemtsade", copyright = "©Δ∞ 仙上主天") -public final class V072Tong implements BaseNumberTyte { +public final class V048Tong implements BaseNumberTyte { - public static int BIT_COUNT = V036Teger.BIT_COUNT * T02PartBinary.LENGTH(); - private V036Teger[] values = new V036Teger[T02PartBinary.LENGTH()]; + public static int BIT_COUNT = V024Teger.BIT_COUNT * T02PartBinary.LENGTH(); + private V024Teger[] values = new V024Teger[T02PartBinary.LENGTH()]; - public V072Tong() { - this(new V036Teger(), new V036Teger()); + public V048Tong() { + this(new V024Teger(), new V024Teger()); } - public V072Tong(BaseIteratorOctal values) { - this(new V036Teger(values), new V036Teger(values)); + public V048Tong(BaseIteratorOctal values) { + this(new V024Teger(values), new V024Teger(values)); } - public V072Tong(BaseIteratorTyte values) { - this(new V036Teger(values), new V036Teger(values)); + public V048Tong(BaseIteratorTyte values) { + this(new V024Teger(values), new V024Teger(values)); } - private V072Tong(V036Teger valueHigh, V036Teger valueLow) { + private V048Tong(V024Teger valueHigh, V024Teger valueLow) { setValue(T02PartBinary.PART_1, valueHigh); setValue(T02PartBinary.PART_2, valueLow); } - public V036Teger getValue(T02PartBinary part) { + public V024Teger getValue(T02PartBinary part) { return values[part.ordinal()]; } - public void setValue(T02PartBinary part, V036Teger value) { + public void setValue(T02PartBinary part, V024Teger value) { values[part.ordinal()] = value; } @@ -62,8 +62,8 @@ public final class V072Tong implements BaseNumberTyte { } @Override - public V072Tong toClone() { - return new V072Tong(iteratorOctalsByClone()); + public V048Tong toClone() { + return new V048Tong(iteratorOctalsByClone()); } @Override diff --git a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/type/V144Tocta.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/type/V090Tocta.java similarity index 78% rename from numberxd/src/main/love/distributedrebirth/numberxd/base2t/type/V144Tocta.java rename to numberxd/src/main/love/distributedrebirth/numberxd/base2t/type/V090Tocta.java index 5f713090..05cbd1db 100644 --- a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/type/V144Tocta.java +++ b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/type/V090Tocta.java @@ -16,33 +16,33 @@ import love.distributedrebirth.numberxd.base2t.part.T16PartHex; * Holds an 144 bit value. */ @BãßBȍőnAuthorInfoʸᴰ(name = "willemtsade", copyright = "©Δ∞ 仙上主天") -public final class V144Tocta implements BaseNumberTyte { +public final class V090Tocta implements BaseNumberTyte { - public static int BIT_COUNT = V072Tong.BIT_COUNT * T02PartBinary.LENGTH(); - private V072Tong[] values = new V072Tong[T02PartBinary.LENGTH()]; + public static int BIT_COUNT = V048Tong.BIT_COUNT * T02PartBinary.LENGTH(); + private V048Tong[] values = new V048Tong[T02PartBinary.LENGTH()]; - public V144Tocta() { - this(new V072Tong(), new V072Tong()); + public V090Tocta() { + this(new V048Tong(), new V048Tong()); } - public V144Tocta(BaseIteratorOctal values) { - this(new V072Tong(values), new V072Tong(values)); + public V090Tocta(BaseIteratorOctal values) { + this(new V048Tong(values), new V048Tong(values)); } - public V144Tocta(BaseIteratorTyte values) { - this(new V072Tong(values), new V072Tong(values)); + public V090Tocta(BaseIteratorTyte values) { + this(new V048Tong(values), new V048Tong(values)); } - private V144Tocta(V072Tong valueHigh, V072Tong valueLow) { + private V090Tocta(V048Tong valueHigh, V048Tong valueLow) { setValue(T02PartBinary.PART_1, valueHigh); setValue(T02PartBinary.PART_2, valueLow); } - public V072Tong getValue(T02PartBinary part) { + public V048Tong getValue(T02PartBinary part) { return values[part.ordinal()]; } - public void setValue(T02PartBinary part, V072Tong value) { + public void setValue(T02PartBinary part, V048Tong value) { values[part.ordinal()] = value; } @@ -78,8 +78,8 @@ public final class V144Tocta implements BaseNumberTyte { } @Override - public V144Tocta toClone() { - return new V144Tocta(iteratorOctalsByClone()); + public V090Tocta toClone() { + return new V090Tocta(iteratorOctalsByClone()); } @Override diff --git a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/typexl/V0x000348ˣᴸ.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/type/V348Traz.java similarity index 53% rename from numberxd/src/main/love/distributedrebirth/numberxd/base2t/typexl/V0x000348ˣᴸ.java rename to numberxd/src/main/love/distributedrebirth/numberxd/base2t/type/V348Traz.java index 08d680b1..99665157 100644 --- a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/typexl/V0x000348ˣᴸ.java +++ b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/type/V348Traz.java @@ -1,38 +1,37 @@ -package love.distributedrebirth.numberxd.base2t.typexl; +package love.distributedrebirth.numberxd.base2t.type; import love.distributedrebirth.bassboonyd.BãßBȍőnAuthorInfoʸᴰ; import love.distributedrebirth.numberxd.base2t.BaseAppenderOctal; import love.distributedrebirth.numberxd.base2t.BaseIteratorOctal; -import love.distributedrebirth.numberxd.base2t.BaseNumberXL; +import love.distributedrebirth.numberxd.base2t.BaseNumber; import love.distributedrebirth.numberxd.base2t.part.T20PartScore; -import love.distributedrebirth.numberxd.base2t.type.V042Traw; /** * Holds an 840 bit value. */ @BãßBȍőnAuthorInfoʸᴰ(name = "willemtsade", copyright = "©Δ∞ 仙上主天") -public class V0x000348ˣᴸ implements BaseNumberXL { +public class V348Traz implements BaseNumber { - public static int BIT_COUNT = V042Traw.BIT_COUNT * T20PartScore.LENGTH(); - private V042Traw[] values = new V042Traw[T20PartScore.LENGTH()]; + public static int BIT_COUNT = V02ATraw.BIT_COUNT * T20PartScore.LENGTH(); + private V02ATraw[] values = new V02ATraw[T20PartScore.LENGTH()]; - public V0x000348ˣᴸ() { + public V348Traz() { for (int i=0;i { } @Override - public V0x000348ˣᴸ toClone() { - return new V0x000348ˣᴸ(iteratorOctalsByClone()); + public V348Traz toClone() { + return new V348Traz(iteratorOctalsByClone()); } @Override diff --git a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/typexl/V0x000654ˣᴸ.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/type/V654Triz.java similarity index 59% rename from numberxd/src/main/love/distributedrebirth/numberxd/base2t/typexl/V0x000654ˣᴸ.java rename to numberxd/src/main/love/distributedrebirth/numberxd/base2t/type/V654Triz.java index 629a61be..b5feb8b0 100644 --- a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/typexl/V0x000654ˣᴸ.java +++ b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/type/V654Triz.java @@ -1,39 +1,38 @@ -package love.distributedrebirth.numberxd.base2t.typexl; +package love.distributedrebirth.numberxd.base2t.type; import love.distributedrebirth.bassboonyd.BãßBȍőnAuthorInfoʸᴰ; import love.distributedrebirth.numberxd.base2t.BaseAppenderOctal; import love.distributedrebirth.numberxd.base2t.BaseAppenderTyte; import love.distributedrebirth.numberxd.base2t.BaseIteratorOctal; -import love.distributedrebirth.numberxd.base2t.BaseNumberTyteXL; +import love.distributedrebirth.numberxd.base2t.BaseNumberTyte; import love.distributedrebirth.numberxd.base2t.part.T60PartSexagesimal; -import love.distributedrebirth.numberxd.base2t.type.V027Temvig; /** * Holds an 1620 bit value. */ @BãßBȍőnAuthorInfoʸᴰ(name = "willemtsade", copyright = "©Δ∞ 仙上主天") -public class V0x000654ˣᴸ implements BaseNumberTyteXL { +public class V654Triz implements BaseNumberTyte { - public static int BIT_COUNT = V027Temvig.BIT_COUNT * T60PartSexagesimal.LENGTH(); - private V027Temvig[] values = new V027Temvig[T60PartSexagesimal.LENGTH()]; + public static int BIT_COUNT = V01BTemvig.BIT_COUNT * T60PartSexagesimal.LENGTH(); + private V01BTemvig[] values = new V01BTemvig[T60PartSexagesimal.LENGTH()]; - public V0x000654ˣᴸ() { + public V654Triz() { for (int i=0;i { } @Override - public V0x000654ˣᴸ toClone() { - return new V0x000654ˣᴸ(iteratorOctalsByClone()); + public V654Triz toClone() { + return new V654Triz(iteratorOctalsByClone()); } @Override diff --git a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/typexl/V0x000CA8ˣᴸ.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/type/VCA8Tath.java similarity index 55% rename from numberxd/src/main/love/distributedrebirth/numberxd/base2t/typexl/V0x000CA8ˣᴸ.java rename to numberxd/src/main/love/distributedrebirth/numberxd/base2t/type/VCA8Tath.java index c6a50cec..0deb85f1 100644 --- a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/typexl/V0x000CA8ˣᴸ.java +++ b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/type/VCA8Tath.java @@ -1,39 +1,39 @@ -package love.distributedrebirth.numberxd.base2t.typexl; +package love.distributedrebirth.numberxd.base2t.type; import love.distributedrebirth.bassboonyd.BãßBȍőnAuthorInfoʸᴰ; import love.distributedrebirth.numberxd.base2t.BaseAppenderOctal; import love.distributedrebirth.numberxd.base2t.BaseAppenderTyte; import love.distributedrebirth.numberxd.base2t.BaseIteratorOctal; -import love.distributedrebirth.numberxd.base2t.BaseNumberTyteXL; +import love.distributedrebirth.numberxd.base2t.BaseNumberTyte; import love.distributedrebirth.numberxd.base2t.part.T02PartBinary; /** * Holds an 3240 bit value. */ @BãßBȍőnAuthorInfoʸᴰ(name = "willemtsade", copyright = "©Δ∞ 仙上主天") -public class V0x000CA8ˣᴸ implements BaseNumberTyteXL { +public class VCA8Tath implements BaseNumberTyte { - public static int BIT_COUNT = V0x000654ˣᴸ.BIT_COUNT * T02PartBinary.LENGTH(); - private V0x000654ˣᴸ[] values = new V0x000654ˣᴸ[T02PartBinary.LENGTH()]; + public static int BIT_COUNT = V654Triz.BIT_COUNT * T02PartBinary.LENGTH(); + private V654Triz[] values = new V654Triz[T02PartBinary.LENGTH()]; - public V0x000CA8ˣᴸ() { - this(new V0x000654ˣᴸ(), new V0x000654ˣᴸ()); + public VCA8Tath() { + this(new V654Triz(), new V654Triz()); } - public V0x000CA8ˣᴸ(BaseIteratorOctal values) { - this(new V0x000654ˣᴸ(values), new V0x000654ˣᴸ(values)); + public VCA8Tath(BaseIteratorOctal values) { + this(new V654Triz(values), new V654Triz(values)); } - private V0x000CA8ˣᴸ(V0x000654ˣᴸ valueHigh, V0x000654ˣᴸ valueLow) { + private VCA8Tath(V654Triz valueHigh, V654Triz valueLow) { setValue(T02PartBinary.PART_1, valueHigh); setValue(T02PartBinary.PART_2, valueLow); } - public V0x000654ˣᴸ getValue(T02PartBinary part) { + public V654Triz getValue(T02PartBinary part) { return values[part.ordinal()]; } - public void setValue(T02PartBinary part, V0x000654ˣᴸ value) { + public void setValue(T02PartBinary part, V654Triz value) { values[part.ordinal()] = value; } @@ -43,8 +43,8 @@ public class V0x000CA8ˣᴸ implements BaseNumberTyteXL { } @Override - public V0x000CA8ˣᴸ toClone() { - return new V0x000CA8ˣᴸ(iteratorOctalsByClone()); + public VCA8Tath toClone() { + return new VCA8Tath(iteratorOctalsByClone()); } @Override diff --git a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/typexl/V0x0013B0ˣᴸ.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/typexl/V0x0013B0ˣᴸ.java deleted file mode 100644 index 73ea776d..00000000 --- a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/typexl/V0x0013B0ˣᴸ.java +++ /dev/null @@ -1,52 +0,0 @@ -package love.distributedrebirth.numberxd.base2t.typexl; - -import love.distributedrebirth.bassboonyd.BãßBȍőnAuthorInfoʸᴰ; -import love.distributedrebirth.numberxd.base2t.BaseAppenderOctal; -import love.distributedrebirth.numberxd.base2t.BaseIteratorOctal; -import love.distributedrebirth.numberxd.base2t.BaseNumberXL; -import love.distributedrebirth.numberxd.base2t.part.T06PartSeximal; - -/** - * Holds an 5040 bit value. - */ -@BãßBȍőnAuthorInfoʸᴰ(name = "willemtsade", copyright = "©Δ∞ 仙上主天") -public class V0x0013B0ˣᴸ implements BaseNumberXL { - - public static int BIT_COUNT = V0x000348ˣᴸ.BIT_COUNT * T06PartSeximal.LENGTH(); - private V0x000348ˣᴸ[] values = new V0x000348ˣᴸ[T06PartSeximal.LENGTH()]; - - public V0x0013B0ˣᴸ() { - for (int i=0;i getValue(v).fillOctalsByClone(appender)); - } -} diff --git a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/typexl/V0x006540ˣᴸ.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/typexl/V0x006540ˣᴸ.java deleted file mode 100644 index 2925bcaf..00000000 --- a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/typexl/V0x006540ˣᴸ.java +++ /dev/null @@ -1,58 +0,0 @@ -package love.distributedrebirth.numberxd.base2t.typexl; - -import love.distributedrebirth.bassboonyd.BãßBȍőnAuthorInfoʸᴰ; -import love.distributedrebirth.numberxd.base2t.BaseAppenderOctal; -import love.distributedrebirth.numberxd.base2t.BaseAppenderTyte; -import love.distributedrebirth.numberxd.base2t.BaseIteratorOctal; -import love.distributedrebirth.numberxd.base2t.BaseNumberTyteXL; -import love.distributedrebirth.numberxd.base2t.part.T08PartOctal; - -/** - * Holds an 25920 bit value. (3240 bytes) - */ -@BãßBȍőnAuthorInfoʸᴰ(name = "willemtsade", copyright = "©Δ∞ 仙上主天") -public class V0x006540ˣᴸ implements BaseNumberTyteXL { - - public static int BIT_COUNT = V0x000CA8ˣᴸ.BIT_COUNT * T08PartOctal.LENGTH(); - private V0x000CA8ˣᴸ[] values = new V0x000CA8ˣᴸ[T08PartOctal.LENGTH()]; - - public V0x006540ˣᴸ() { - for (int i=0;i getValue(v).fillOctalsByClone(appender)); - } - - @Override - public void fillTytesByReference(BaseAppenderTyte appender) { - T08PartOctal.PART_1.BãßVoorElk(v -> getValue(v).fillTytesByReference(appender)); - } -} diff --git a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/typexl/V0x049D40ˣᴸ.java b/numberxd/src/main/love/distributedrebirth/numberxd/base2t/typexl/V0x049D40ˣᴸ.java deleted file mode 100644 index 734cfa52..00000000 --- a/numberxd/src/main/love/distributedrebirth/numberxd/base2t/typexl/V0x049D40ˣᴸ.java +++ /dev/null @@ -1,52 +0,0 @@ -package love.distributedrebirth.numberxd.base2t.typexl; - -import love.distributedrebirth.bassboonyd.BãßBȍőnAuthorInfoʸᴰ; -import love.distributedrebirth.numberxd.base2t.BaseAppenderOctal; -import love.distributedrebirth.numberxd.base2t.BaseIteratorOctal; -import love.distributedrebirth.numberxd.base2t.BaseNumberXL; -import love.distributedrebirth.numberxd.base2t.part.T60PartSexagesimal; - -/** - * Holds an 302400 bit value. (37800 bytes) - */ -@BãßBȍőnAuthorInfoʸᴰ(name = "willemtsade", copyright = "©Δ∞ 仙上主天") -public class V0x049D40ˣᴸ implements BaseNumberXL { - - public static int BIT_COUNT = V0x0013B0ˣᴸ.BIT_COUNT * T60PartSexagesimal.LENGTH(); - private V0x0013B0ˣᴸ[] values = new V0x0013B0ˣᴸ[T60PartSexagesimal.LENGTH()]; - - public V0x049D40ˣᴸ() { - for (int i=0;i getValue(v).fillOctalsByClone(appender)); - } -}