From 3763ee3fdd8d55a1040b7fb34537c26c89041c7e Mon Sep 17 00:00:00 2001
From: Willem Cazander <git.2022@distributedrebirth.love>
Date: Mon, 31 Jan 2022 01:12:29 +0100
Subject: [PATCH] Added 60 part

---
 .../distributedrebirth/demo4d/Demo4DMain.java |   9 ++
 .../distributedrebirth/demo4d/ImGuiSetup.java |   6 +
 .../demo4d/screen/BasePartRenderer.java       |  63 ++++++++
 .../demo4d/screen/ScreenUnicode4D.java        |  20 +--
 .../numberxd/base2t/T02PartBinary.java        |   4 +-
 .../numberxd/base2t/T03PartTrit.java          |   4 +-
 .../numberxd/base2t/T04PartQuad.java          |   4 +-
 .../numberxd/base2t/T05PartPental.java        |   4 +-
 .../numberxd/base2t/T06PartSeximal.java       |   4 +-
 .../numberxd/base2t/T08PartOctal.java         |   4 +-
 .../numberxd/base2t/T12PartUncial.java        |   4 +-
 .../numberxd/base2t/T16PartHex.java           |   4 +-
 .../numberxd/base2t/T20PartScore.java         |   4 +-
 .../numberxd/base2t/T60Sexagesimal.java       | 135 ++++++++++--------
 .../facet/{BaseFacet.java => BasePart.java}   |   2 +-
 .../numberxd/base2t/facet/BasePartAlt1.java   |   2 +-
 .../base2t/facet/BasePartShiftBits.java       |   2 +-
 .../base2t/facet/BasePartSplit16.java         |   2 +-
 .../numberxd/base2t/facet/BasePartSplit4.java |   2 +-
 .../numberxd/base2t/facet/BasePartSplit6.java |   2 +-
 20 files changed, 184 insertions(+), 97 deletions(-)
 create mode 100644 core/src/love/distributedrebirth/demo4d/screen/BasePartRenderer.java
 rename core/src/love/distributedrebirth/numberxd/base2t/facet/{BaseFacet.java => BasePart.java} (91%)

diff --git a/core/src/love/distributedrebirth/demo4d/Demo4DMain.java b/core/src/love/distributedrebirth/demo4d/Demo4DMain.java
index 5653de52..2eb7a666 100644
--- a/core/src/love/distributedrebirth/demo4d/Demo4DMain.java
+++ b/core/src/love/distributedrebirth/demo4d/Demo4DMain.java
@@ -18,6 +18,7 @@ import imgui.type.ImBoolean;
 import love.distributedrebirth.demo4d.matrix4d.ScreenMatrix4D;
 import love.distributedrebirth.demo4d.music.MusicManager;
 import love.distributedrebirth.demo4d.music.MusicPlayerRenderer;
+import love.distributedrebirth.demo4d.screen.BasePartRenderer;
 import love.distributedrebirth.demo4d.screen.BasicConsoleRenderer;
 import love.distributedrebirth.demo4d.screen.HebrewWalletRenderer;
 import love.distributedrebirth.demo4d.screen.ScreenCredits;
@@ -48,6 +49,7 @@ public class Demo4DMain extends Game {
 	private ImBoolean showImGuiDemo = new ImBoolean(false);
 	private ImBoolean showMusicPlayer = new ImBoolean(false);
 	private ImBoolean showHebrewWallet = new ImBoolean(false);
+	private ImBoolean showBasePart = new ImBoolean(false);
 	private ImBoolean showBasicConsole = new ImBoolean(false);
 	
 	public Demo4DMain(List<String> args, NativeFileChooser fileChooser) {
@@ -71,6 +73,7 @@ public class Demo4DMain extends Game {
 		widgets = new HashMap<>();
 		putWidget(new MusicPlayerRenderer(this));
 		putWidget(new HebrewWalletRenderer(this));
+		putWidget(new BasePartRenderer(this));
 		putWidget(new BasicConsoleRenderer(this));
 		
 		screens = new HashMap<>();
@@ -133,6 +136,9 @@ public class Demo4DMain extends Game {
 		if (showHebrewWallet.get()) {
 			widgets.get(HebrewWalletRenderer.class).render(showHebrewWallet);
 		}
+		if (showBasePart.get()) {
+			widgets.get(BasePartRenderer.class).render(showBasePart);
+		}
 		if (showBasicConsole.get()) {
 			widgets.get(BasicConsoleRenderer.class).render(showBasicConsole);
 		}
@@ -170,6 +176,9 @@ public class Demo4DMain extends Game {
 			if (ImGui.menuItem("Hebrew Wallet")) {
 				showHebrewWallet.set(true);
 			}
+			if (ImGui.menuItem("Base Part")) {
+				showBasePart.set(true);
+			}
 			if (ImGui.menuItem("Basic Console")) {
 				showBasicConsole.set(true);
 			}
diff --git a/core/src/love/distributedrebirth/demo4d/ImGuiSetup.java b/core/src/love/distributedrebirth/demo4d/ImGuiSetup.java
index a838a9c5..16808e4d 100644
--- a/core/src/love/distributedrebirth/demo4d/ImGuiSetup.java
+++ b/core/src/love/distributedrebirth/demo4d/ImGuiSetup.java
@@ -8,6 +8,7 @@ import imgui.ImGui;
 import imgui.ImGuiIO;
 import imgui.gl3.ImGuiImplGl3;
 import imgui.glfw.ImGuiImplGlfw;
+import love.distributedrebirth.numberxd.base2t.T60Sexagesimal;
 
 /**
  * 
@@ -55,6 +56,11 @@ public class ImGuiSetup {
 		rangesBuilder.addRanges(glyphRangesToneLetters0);
 		rangesBuilder.addText("@Ω\u4ed9⁴ ˧꜏⋇꜊꜔ ⁴ﷲΩ@");
 		rangesBuilder.addText("©Δ∞ \u4ed9\u4e0a\u4e3b\u5929");
+		
+		for (T60Sexagesimal value:T60Sexagesimal.values()) {
+			rangesBuilder.addText(value.getIdentifierLetter());
+			rangesBuilder.addText(value.getChinaKey());
+		}
 
 		final ImFontConfig fontConfig = new ImFontConfig();
 		fontConfig.setMergeMode(true);  // Enable merge mode to merge cyrillic, japanese and icons with default font
diff --git a/core/src/love/distributedrebirth/demo4d/screen/BasePartRenderer.java b/core/src/love/distributedrebirth/demo4d/screen/BasePartRenderer.java
new file mode 100644
index 00000000..e0eabcb8
--- /dev/null
+++ b/core/src/love/distributedrebirth/demo4d/screen/BasePartRenderer.java
@@ -0,0 +1,63 @@
+package love.distributedrebirth.demo4d.screen;
+
+import java.util.Arrays;
+import java.util.List;
+
+import imgui.ImGui;
+import imgui.flag.ImGuiCond;
+import imgui.flag.ImGuiTableFlags;
+import imgui.type.ImBoolean;
+import love.distributedrebirth.demo4d.Demo4DMain;
+import love.distributedrebirth.demo4d.ImGuiRendererMain;
+import love.distributedrebirth.numberxd.base2t.T60Sexagesimal;
+import love.distributedrebirth.numberxd.base2t.facet.BasePart;
+
+/**
+ * 
+ * @author willemtsade ©Δ∞ 仙上主天
+ * 
+ */
+public class BasePartRenderer extends ImGuiRendererMain {
+
+	public BasePartRenderer(Demo4DMain main) {
+		super(main);
+	}
+
+	@Override
+	public void render(ImBoolean widgetOpen) {
+		ImGui.setNextWindowPos(200, 200, ImGuiCond.FirstUseEver);
+		ImGui.setNextWindowSize(640, 480, ImGuiCond.FirstUseEver);
+		ImGui.begin("Base part", widgetOpen);
+		
+		ImGui.text("Current part type:");
+		ImGui.sameLine();
+		ImGui.text("T60Sexagesimal");
+		int flags = ImGuiTableFlags.ScrollX | ImGuiTableFlags.RowBg | ImGuiTableFlags.BordersOuter | ImGuiTableFlags.BordersV;
+		ImGui.beginTable("base-part", 5, flags);
+		ImGui.tableSetupColumn("ordinal");
+		ImGui.tableSetupColumn("idTone");
+		ImGui.tableSetupColumn("idLetter");
+		ImGui.tableSetupColumn("ChinaKey");
+		ImGui.tableSetupColumn("ChinaValue");
+		ImGui.tableHeadersRow();
+
+		List<BasePart> parts = Arrays.asList(T60Sexagesimal.values());
+		
+		for (BasePart part:parts) {
+			ImGui.tableNextRow();
+			ImGui.tableNextColumn();
+			ImGui.text(Integer.toString(part.ordinal()));
+			ImGui.tableNextColumn();
+			ImGui.text(part.getIdentifierTone());
+			ImGui.tableNextColumn();
+			ImGui.text(part.getIdentifierLetter());
+			ImGui.tableNextColumn();
+			ImGui.text(part.getChinaKey());
+			ImGui.tableNextColumn();
+			ImGui.text(part.getChinaValue());
+		}
+		ImGui.endTable();
+		
+		ImGui.end();
+	}
+}
diff --git a/core/src/love/distributedrebirth/demo4d/screen/ScreenUnicode4D.java b/core/src/love/distributedrebirth/demo4d/screen/ScreenUnicode4D.java
index ea055f4f..c9641a3c 100644
--- a/core/src/love/distributedrebirth/demo4d/screen/ScreenUnicode4D.java
+++ b/core/src/love/distributedrebirth/demo4d/screen/ScreenUnicode4D.java
@@ -32,19 +32,10 @@ public class ScreenUnicode4D extends Demo4DMainAdapter {
 		ImVec2 size = new ImVec2(144f, 48f);
 		ImGui.invisibleButton("canvas", size.x, size.y);
 		ImVec2 p0 = ImGui.getItemRectMin();
-		ImVec2 p1 = ImGui.getItemRectMax();
+		ImVec2 p1 = ImGui.getItemRectMax(); // p1 = p0 + size
 		ImDrawList drawList = ImGui.getWindowDrawList();
 		drawList.pushClipRect(p0.x, p0.y, p1.x, p1.y);
 		// draw unicode4D
-		//System.out.println("p0.x="+p0.x+" p0.y="+p0.y);
-		//System.out.println("p1.x="+p1.x+" p1.y="+p1.y);
-		
-//		for (int n = 0; n < (1.0f + Math.sin(ImGui.getTime() * 5.7f)) * 40.0f; n++) {
-//			drawList.addCircle(p0.x + size.x * 0.5f, p0.y + size.y * 0.5f, size.y * (0.01f + n * 0.03f), 
-//				ImColor.intToColor(255, 140 - n * 4, n * 3, 255)
-//			);
-//		}
-		
 		drawList.addQuad(p0.x, p0.y, p0.x+size.x, p0.y, p1.x, p1.y, p0.x, p0.y+size.y,
 				ImColor.intToColor(127, 127, 255, 255), 5f);
 		
@@ -54,5 +45,14 @@ public class ScreenUnicode4D extends Demo4DMainAdapter {
 		
 		drawList.popClipRect();
 		ImGui.end();
+		
+		//System.out.println("p0.x="+p0.x+" p0.y="+p0.y);
+		//System.out.println("p1.x="+p1.x+" p1.y="+p1.y);
+		
+//		for (int n = 0; n < (1.0f + Math.sin(ImGui.getTime() * 5.7f)) * 40.0f; n++) {
+//			drawList.addCircle(p0.x + size.x * 0.5f, p0.y + size.y * 0.5f, size.y * (0.01f + n * 0.03f), 
+//				ImColor.intToColor(255, 140 - n * 4, n * 3, 255)
+//			);
+//		}
 	}
 }
diff --git a/core/src/love/distributedrebirth/numberxd/base2t/T02PartBinary.java b/core/src/love/distributedrebirth/numberxd/base2t/T02PartBinary.java
index 650316cd..8c2d3f5e 100644
--- a/core/src/love/distributedrebirth/numberxd/base2t/T02PartBinary.java
+++ b/core/src/love/distributedrebirth/numberxd/base2t/T02PartBinary.java
@@ -7,7 +7,7 @@ import java.util.Map;
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
 
-import love.distributedrebirth.numberxd.base2t.facet.BaseFacet;
+import love.distributedrebirth.numberxd.base2t.facet.BasePart;
 import love.distributedrebirth.numberxd.base2t.facet.BaseFacetKey;
 
 /**
@@ -15,7 +15,7 @@ import love.distributedrebirth.numberxd.base2t.facet.BaseFacetKey;
  * @author willemtsade ©Δ∞ 仙上主天
  * 
  */
-public enum T02PartBinary implements BaseFacet {
+public enum T02PartBinary implements BasePart {
 
 	PART_1("˧","0", "低", "low"),
 	PART_2("꜔","1", "高", "high"),
diff --git a/core/src/love/distributedrebirth/numberxd/base2t/T03PartTrit.java b/core/src/love/distributedrebirth/numberxd/base2t/T03PartTrit.java
index 1af6b459..819417c4 100644
--- a/core/src/love/distributedrebirth/numberxd/base2t/T03PartTrit.java
+++ b/core/src/love/distributedrebirth/numberxd/base2t/T03PartTrit.java
@@ -7,7 +7,7 @@ import java.util.Map;
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
 
-import love.distributedrebirth.numberxd.base2t.facet.BaseFacet;
+import love.distributedrebirth.numberxd.base2t.facet.BasePart;
 import love.distributedrebirth.numberxd.base2t.facet.BaseFacetKey;
 
 /**
@@ -15,7 +15,7 @@ import love.distributedrebirth.numberxd.base2t.facet.BaseFacetKey;
  * @author willemtsade ©Δ∞ 仙上主天
  * 
  */
-public enum T03PartTrit implements BaseFacet {
+public enum T03PartTrit implements BasePart {
 
 	PART_1("˦","0","一","1"),
 	PART_2("˧","1","二","2"),
diff --git a/core/src/love/distributedrebirth/numberxd/base2t/T04PartQuad.java b/core/src/love/distributedrebirth/numberxd/base2t/T04PartQuad.java
index 53f6766a..9c4a13ab 100644
--- a/core/src/love/distributedrebirth/numberxd/base2t/T04PartQuad.java
+++ b/core/src/love/distributedrebirth/numberxd/base2t/T04PartQuad.java
@@ -7,7 +7,7 @@ import java.util.Map;
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
 
-import love.distributedrebirth.numberxd.base2t.facet.BaseFacet;
+import love.distributedrebirth.numberxd.base2t.facet.BasePart;
 import love.distributedrebirth.numberxd.base2t.facet.BaseFacetKey;
 import love.distributedrebirth.numberxd.base2t.facet.BasePartAlt1;
 import love.distributedrebirth.numberxd.base2t.facet.BasePartSplit4;
@@ -17,7 +17,7 @@ import love.distributedrebirth.numberxd.base2t.facet.BasePartSplit4;
  * @author willemtsade ©Δ∞ 仙上主天
  * 
  */
-public enum T04PartQuad implements BaseFacet,BasePartAlt1,BasePartSplit4 {
+public enum T04PartQuad implements BasePart,BasePartAlt1,BasePartSplit4 {
 
 	PART_1("˥","0","北","north","N"),
 	PART_2("꜒","1","東","east", "E"),
diff --git a/core/src/love/distributedrebirth/numberxd/base2t/T05PartPental.java b/core/src/love/distributedrebirth/numberxd/base2t/T05PartPental.java
index 62b27d6a..e3709cae 100644
--- a/core/src/love/distributedrebirth/numberxd/base2t/T05PartPental.java
+++ b/core/src/love/distributedrebirth/numberxd/base2t/T05PartPental.java
@@ -7,14 +7,14 @@ import java.util.Map;
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
 
-import love.distributedrebirth.numberxd.base2t.facet.BaseFacet;
+import love.distributedrebirth.numberxd.base2t.facet.BasePart;
 import love.distributedrebirth.numberxd.base2t.facet.BaseFacetKey;
 
 /**
  * The distribution by 5 called Wuxing.
  * @author willemtsade ©Δ∞ 仙上主天
  */
-public enum T05PartPental implements BaseFacet {
+public enum T05PartPental implements BasePart {
 
 	PART_1("˥","0","火","fire"),
 	PART_2("˦","1","水","water"),
diff --git a/core/src/love/distributedrebirth/numberxd/base2t/T06PartSeximal.java b/core/src/love/distributedrebirth/numberxd/base2t/T06PartSeximal.java
index 844e22e2..390c4f43 100644
--- a/core/src/love/distributedrebirth/numberxd/base2t/T06PartSeximal.java
+++ b/core/src/love/distributedrebirth/numberxd/base2t/T06PartSeximal.java
@@ -7,7 +7,7 @@ import java.util.Map;
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
 
-import love.distributedrebirth.numberxd.base2t.facet.BaseFacet;
+import love.distributedrebirth.numberxd.base2t.facet.BasePart;
 import love.distributedrebirth.numberxd.base2t.facet.BaseFacetKey;
 import love.distributedrebirth.numberxd.base2t.facet.BasePartAlt1;
 import love.distributedrebirth.numberxd.base2t.facet.BasePartSplit6;
@@ -19,7 +19,7 @@ import love.distributedrebirth.numberxd.base2t.facet.BasePartSplit6;
  * @author willemtsade ©Δ∞ 仙上主天
  * 
  */
-public enum T06PartSeximal implements BaseFacet,BasePartAlt1,BasePartSplit6 {
+public enum T06PartSeximal implements BasePart,BasePartAlt1,BasePartSplit6 {
 
 	PART_1("˦","0","四","4","A"),
 	PART_2("˨","1","五","5","D"),
diff --git a/core/src/love/distributedrebirth/numberxd/base2t/T08PartOctal.java b/core/src/love/distributedrebirth/numberxd/base2t/T08PartOctal.java
index cb67eaff..0a3a3257 100644
--- a/core/src/love/distributedrebirth/numberxd/base2t/T08PartOctal.java
+++ b/core/src/love/distributedrebirth/numberxd/base2t/T08PartOctal.java
@@ -7,7 +7,7 @@ import java.util.Map;
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
 
-import love.distributedrebirth.numberxd.base2t.facet.BaseFacet;
+import love.distributedrebirth.numberxd.base2t.facet.BasePart;
 import love.distributedrebirth.numberxd.base2t.facet.BaseFacetKey;
 import love.distributedrebirth.numberxd.base2t.facet.BasePartAlt2;
 import love.distributedrebirth.numberxd.base2t.facet.BasePartSplit8;
@@ -17,7 +17,7 @@ import love.distributedrebirth.numberxd.base2t.facet.BasePartSplit8;
  * @author willemtsade ©Δ∞ 仙上主天
  * 
  */
-public enum T08PartOctal implements BaseFacet,BasePartAlt2,BasePartSplit8 {
+public enum T08PartOctal implements BasePart,BasePartAlt2,BasePartSplit8 {
 
 	PART_1("˥","0","心","heart","˧˥˩","˥˩˧", 0),
 	PART_2("˩","1","頭","head", "˧˩˥","˩˥˧", 3),
diff --git a/core/src/love/distributedrebirth/numberxd/base2t/T12PartUncial.java b/core/src/love/distributedrebirth/numberxd/base2t/T12PartUncial.java
index c9553e67..e45775c3 100644
--- a/core/src/love/distributedrebirth/numberxd/base2t/T12PartUncial.java
+++ b/core/src/love/distributedrebirth/numberxd/base2t/T12PartUncial.java
@@ -7,7 +7,7 @@ import java.util.Map;
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
 
-import love.distributedrebirth.numberxd.base2t.facet.BaseFacet;
+import love.distributedrebirth.numberxd.base2t.facet.BasePart;
 import love.distributedrebirth.numberxd.base2t.facet.BaseFacetKey;
 import love.distributedrebirth.numberxd.base2t.facet.BasePartAlt1;
 
@@ -16,7 +16,7 @@ import love.distributedrebirth.numberxd.base2t.facet.BasePartAlt1;
  * @author willemtsade ©Δ∞ 仙上主天
  * 
  */
-public enum T12PartUncial implements BaseFacet,BasePartAlt1 {
+public enum T12PartUncial implements BasePart,BasePartAlt1 {
 
 	PART_1 ("˥","0","日","sun","0"),
 	PART_2 ("˧","1","月","moon","1"),
diff --git a/core/src/love/distributedrebirth/numberxd/base2t/T16PartHex.java b/core/src/love/distributedrebirth/numberxd/base2t/T16PartHex.java
index 429d8210..e5b79d0d 100644
--- a/core/src/love/distributedrebirth/numberxd/base2t/T16PartHex.java
+++ b/core/src/love/distributedrebirth/numberxd/base2t/T16PartHex.java
@@ -7,7 +7,7 @@ import java.util.Map;
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
 
-import love.distributedrebirth.numberxd.base2t.facet.BaseFacet;
+import love.distributedrebirth.numberxd.base2t.facet.BasePart;
 import love.distributedrebirth.numberxd.base2t.facet.BaseFacetKey;
 import love.distributedrebirth.numberxd.base2t.facet.BasePartAlt1;
 import love.distributedrebirth.numberxd.base2t.facet.BasePartSplit16;
@@ -17,7 +17,7 @@ import love.distributedrebirth.numberxd.base2t.facet.BasePartSplit16;
  * @author willemtsade ©Δ∞ 仙上主天
  * 
  */
-public enum T16PartHex implements BaseFacet,BasePartAlt1,BasePartSplit16 {
+public enum T16PartHex implements BasePart,BasePartAlt1,BasePartSplit16 {
 
 	PART_1 ("˥","0","氫","hydrogen","1"),
 	PART_2 ("˦","1","氦","helium","2"),
diff --git a/core/src/love/distributedrebirth/numberxd/base2t/T20PartScore.java b/core/src/love/distributedrebirth/numberxd/base2t/T20PartScore.java
index 79ce4360..d5d9134b 100644
--- a/core/src/love/distributedrebirth/numberxd/base2t/T20PartScore.java
+++ b/core/src/love/distributedrebirth/numberxd/base2t/T20PartScore.java
@@ -7,7 +7,7 @@ import java.util.Map;
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
 
-import love.distributedrebirth.numberxd.base2t.facet.BaseFacet;
+import love.distributedrebirth.numberxd.base2t.facet.BasePart;
 import love.distributedrebirth.numberxd.base2t.facet.BaseFacetKey;
 import love.distributedrebirth.numberxd.base2t.facet.BasePartAlt1;
 
@@ -16,7 +16,7 @@ import love.distributedrebirth.numberxd.base2t.facet.BasePartAlt1;
  * @author willemtsade ©Δ∞ 仙上主天
  * 
  */
-public enum T20PartScore implements BaseFacet,BasePartAlt1 {
+public enum T20PartScore implements BasePart,BasePartAlt1 {
 
 	PART_1 ("˥","0","尧","yotta","2"),
 	PART_2 ("˦","1","泽","zetta","3"),
diff --git a/core/src/love/distributedrebirth/numberxd/base2t/T60Sexagesimal.java b/core/src/love/distributedrebirth/numberxd/base2t/T60Sexagesimal.java
index 424dfc32..c0fa26ae 100644
--- a/core/src/love/distributedrebirth/numberxd/base2t/T60Sexagesimal.java
+++ b/core/src/love/distributedrebirth/numberxd/base2t/T60Sexagesimal.java
@@ -7,71 +7,80 @@ import java.util.Map;
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
 
-import love.distributedrebirth.numberxd.base2t.facet.BaseFacet;
+import love.distributedrebirth.numberxd.base2t.facet.BasePart;
 import love.distributedrebirth.numberxd.base2t.facet.BaseFacetKey;
 
-public enum T60Sexagesimal implements BaseFacet {
-	// TODO impl too
-	PART_1 ("˧","0","","100"),
-	PART_2 ("˧","1","","101"), // ?
-	PART_3 ("˧","2","",""),
-	PART_4 ("˧","3","",""),
-	PART_5 ("˧","4","",""),
-	PART_6 ("˧","5","",""),
-	PART_7 ("˧","6","",""),
-	PART_8 ("˧","7","",""),
-	PART_9 ("˧","8","",""),
-	PART_10("˧","9","",""),
-	PART_11("˧","10","",""),
-	PART_12("˧","11","",""),
-	PART_13("˧","","",""),
-	PART_14("˧","","",""),
-	PART_15("˧","","",""),
-	PART_16("˧","","",""),
-	PART_17("˧","","",""),
-	PART_18("˧","","",""),
-	PART_19("˧","","",""),
-	PART_20("˧","","",""),
-	PART_21("˧","","",""),
-	PART_22("˧","","",""),
-	PART_23("˧","","",""),
-	PART_24("˧","","",""),
-	PART_25("˧","","",""),
-	PART_26("˧","","",""),
-	PART_27("˧","","",""),
-	PART_28("˧","","",""),
-	PART_29("˧","","",""),
-	PART_30("˧","","",""),
-	PART_31("˧","","",""),
-	PART_32("˧","","",""),
-	PART_33("˧","","",""),
-	PART_34("˧","","",""),
-	PART_35("˧","","",""),
-	PART_36("˧","","",""),
-	PART_37("˧","","",""),
-	PART_38("˧","","",""),
-	PART_39("˧","","",""),
-	PART_40("˧","","",""),
-	PART_41("˧","","",""),
-	PART_42("˧","","",""),
-	PART_43("˧","","",""),
-	PART_44("˧","","",""),
-	PART_45("˧","","",""),
-	PART_46("˧","","",""),
-	PART_47("˧","","",""),
-	PART_48("˧","","",""),
-	PART_49("˧","","",""),
-	PART_50("˧","","",""),
-	PART_51("˧","","",""),
-	PART_52("˧","","",""),
-	PART_53("˧","","",""),
-	PART_54("˧","","",""),
-	PART_55("˧","","",""),
-	PART_56("˧","","",""),
-	PART_57("˧","","",""),
-	PART_58("˧","","",""),
-	PART_59("˧","","",""),
-	PART_60("˧","","",""),
+/**
+ * The distribution by 60.
+ * 
+ * @author willemtsade ©Δ∞ 仙上主天
+ * 
+ */
+public enum T60Sexagesimal implements BasePart {
+
+	PART_1 ("˧˩˥","ια","牛","cow"),
+	PART_2 ("˧˥˦","ιβ","鸡","chicken"),
+	PART_3 ("˧˩˨","ιγ","羊","sheep"),
+	PART_4 ("˧˦˦","ιδ","狼","wolf"),
+	PART_5 ("˧˨˨","ιε","鼠","rat"),
+	PART_6 ("˧˥˥","ιϚ","貓","cat"),
+	PART_7 ("˧˩˩","ιζ","兔","rabbit"),
+	PART_8 ("˥˩˧","ιη","猿","ape"),
+	PART_9 ("˩˥˧","ιθ","蛇","snake"),
+	PART_10("˥˦˧","κα","马","horse"),
+	PART_11("˩˨˧","κβ","象","elepant"),
+	PART_12("˦˦˧","κγ","豹","leopard"),
+	PART_13("˨˨˧","κδ","鴉","crow"),
+	PART_14("˥˥˧","κε","豬","pig"),
+	PART_15("˩˩˧","κϚ","狗","dog"),
+	
+	PART_16("꜔꜒꜖","κζ","魚","fish"),
+	PART_17("꜔꜒꜓","κη","虾","shrimp"),
+	PART_18("꜔꜖꜕","κθ","鲸","whale"),
+	PART_19("꜔꜓꜓","λα","熊","bear"),
+	PART_20("꜔꜕꜕","λβ","鹿","deer"),
+	PART_21("꜔꜒꜒","λγ","驴","donkey"),
+	PART_22("꜔꜖꜖","λδ","貘","tapir"),
+	PART_23("꜒꜖꜔","λε","鸟","bird"),
+	PART_24("꜖꜒꜔","λϚ","鹤","crane"),
+	PART_25("꜒꜓꜔","λζ","鹰","eagle"),
+	PART_26("꜖꜕꜔","λη","隼","falcon"),
+	PART_27("꜓꜓꜔","λθ","鹅","goose"),
+	PART_28("꜕꜕꜔","μα","蝾","salamander"),
+	PART_29("꜒꜒꜔","μβ","龟","turtle"),
+	PART_30("꜖꜖꜔","μγ","蜈","centipede"),
+	
+	PART_31("꜊꜌꜈","μδ","蝇","fly"),
+	PART_32("꜊꜈꜉","με","蝎","scorpion"),
+	PART_33("꜊꜌꜋","μϚ","虫","worm"),
+	PART_34("꜊꜉꜉","μζ","虎","tiger"),
+	PART_35("꜊꜋꜋","μη","駝","camel"),
+	PART_36("꜊꜈꜈","μθ","猴","monkey"),
+	PART_37("꜊꜌꜌","να","鯊","shark"),
+	PART_38("꜈꜌꜊","νβ","鴨","duck"),
+	PART_39("꜌꜈꜊","νγ","芥","mustard"),
+	PART_40("꜈꜉꜊","νδ","鹽","salt"),
+	PART_41("꜌꜋꜊","νε","椒","pepper"),
+	PART_42("꜉꜉꜊","νϚ","薑","ginger"),
+	PART_43("꜋꜋꜊","νζ","穀","corn"),
+	PART_44("꜈꜈꜊","νη","豆","beans"),
+	PART_45("꜌꜌꜊","νθ","柚","pomelos"),
+	
+	PART_46("꜏꜍꜑","ξα","棗","jujube"),
+	PART_47("꜏꜍꜎","ξβ","瓜","melon"),
+	PART_48("꜏꜑꜐","ξγ","葡","grape"),
+	PART_49("꜏꜎꜎","ξδ","梅","plum"),
+	PART_50("꜏꜐꜐","ξε","灰","lime"),
+	PART_51("꜏꜍꜍","ξϚ","梨","pear"),
+	PART_52("꜏꜑꜑","ξζ","蕉","banana"),
+	PART_53("꜍꜑꜏","ξη","檸","lemon"),
+	PART_54("꜑꜍꜏","ξθ","柿","persimmon"),
+	PART_55("꜍꜎꜏","οα","橙","orange"),
+	PART_56("꜑꜐꜏","οβ","桃","peach"),
+	PART_57("꜎꜎꜏","ογ","杏","apricot"),
+	PART_58("꜐꜐꜏","οδ","莓","strawberry"),
+	PART_59("꜍꜍꜏","οε","薯","patato"),
+	PART_60("꜑꜑꜏","οϚ","蘋","apple"),
 	;
 	
 	public static int LENGTH = 60;
diff --git a/core/src/love/distributedrebirth/numberxd/base2t/facet/BaseFacet.java b/core/src/love/distributedrebirth/numberxd/base2t/facet/BasePart.java
similarity index 91%
rename from core/src/love/distributedrebirth/numberxd/base2t/facet/BaseFacet.java
rename to core/src/love/distributedrebirth/numberxd/base2t/facet/BasePart.java
index 5433cf8d..2fca624c 100644
--- a/core/src/love/distributedrebirth/numberxd/base2t/facet/BaseFacet.java
+++ b/core/src/love/distributedrebirth/numberxd/base2t/facet/BasePart.java
@@ -5,7 +5,7 @@ package love.distributedrebirth.numberxd.base2t.facet;
  * @author willemtsade ©Δ∞ 仙上主天
  * 
  */
-public interface BaseFacet extends BaseFacetStore {
+public interface BasePart extends BaseFacetStore {
 
 	int ordinal();
 	
diff --git a/core/src/love/distributedrebirth/numberxd/base2t/facet/BasePartAlt1.java b/core/src/love/distributedrebirth/numberxd/base2t/facet/BasePartAlt1.java
index f13f4154..749fcae5 100644
--- a/core/src/love/distributedrebirth/numberxd/base2t/facet/BasePartAlt1.java
+++ b/core/src/love/distributedrebirth/numberxd/base2t/facet/BasePartAlt1.java
@@ -1,6 +1,6 @@
 package love.distributedrebirth.numberxd.base2t.facet;
 
-public interface BasePartAlt1 extends BaseFacet {
+public interface BasePartAlt1 extends BasePart {
 
 	default String getAlt1Value() {
 		return (String)getFacetStore().get(BaseFacetKey.ALT_1_VALUE);
diff --git a/core/src/love/distributedrebirth/numberxd/base2t/facet/BasePartShiftBits.java b/core/src/love/distributedrebirth/numberxd/base2t/facet/BasePartShiftBits.java
index a3502e94..5cb5f415 100644
--- a/core/src/love/distributedrebirth/numberxd/base2t/facet/BasePartShiftBits.java
+++ b/core/src/love/distributedrebirth/numberxd/base2t/facet/BasePartShiftBits.java
@@ -1,6 +1,6 @@
 package love.distributedrebirth.numberxd.base2t.facet;
 
-public interface BasePartShiftBits extends BaseFacet {
+public interface BasePartShiftBits extends BasePart {
 
 	default Integer getShiftBits() {
 		return (Integer)getFacetStore().get(BaseFacetKey.SHIFT_BITS);
diff --git a/core/src/love/distributedrebirth/numberxd/base2t/facet/BasePartSplit16.java b/core/src/love/distributedrebirth/numberxd/base2t/facet/BasePartSplit16.java
index e1ff668f..7e7a9bf6 100644
--- a/core/src/love/distributedrebirth/numberxd/base2t/facet/BasePartSplit16.java
+++ b/core/src/love/distributedrebirth/numberxd/base2t/facet/BasePartSplit16.java
@@ -3,7 +3,7 @@ package love.distributedrebirth.numberxd.base2t.facet;
 import love.distributedrebirth.numberxd.base2t.T02PartBinary;
 import love.distributedrebirth.numberxd.base2t.T04PartQuad;
 
-public interface BasePartSplit16 extends BaseFacet {
+public interface BasePartSplit16 extends BasePart {
 
 	default T02PartBinary splitPartBinary(T04PartQuad part) {
 		return T02PartBinary.values()[(ordinal() >> part.ordinal()) & 1];
diff --git a/core/src/love/distributedrebirth/numberxd/base2t/facet/BasePartSplit4.java b/core/src/love/distributedrebirth/numberxd/base2t/facet/BasePartSplit4.java
index 4a31ec12..402ba5a1 100644
--- a/core/src/love/distributedrebirth/numberxd/base2t/facet/BasePartSplit4.java
+++ b/core/src/love/distributedrebirth/numberxd/base2t/facet/BasePartSplit4.java
@@ -2,7 +2,7 @@ package love.distributedrebirth.numberxd.base2t.facet;
 
 import love.distributedrebirth.numberxd.base2t.T02PartBinary;
 
-public interface BasePartSplit4 extends BaseFacet {
+public interface BasePartSplit4 extends BasePart {
 
 	default T02PartBinary splitPartBinary(T02PartBinary part) {
 		return T02PartBinary.values()[(ordinal() >> part.ordinal()) & 1];
diff --git a/core/src/love/distributedrebirth/numberxd/base2t/facet/BasePartSplit6.java b/core/src/love/distributedrebirth/numberxd/base2t/facet/BasePartSplit6.java
index b5f485e6..e5a3a220 100644
--- a/core/src/love/distributedrebirth/numberxd/base2t/facet/BasePartSplit6.java
+++ b/core/src/love/distributedrebirth/numberxd/base2t/facet/BasePartSplit6.java
@@ -3,7 +3,7 @@ package love.distributedrebirth.numberxd.base2t.facet;
 import love.distributedrebirth.numberxd.base2t.T02PartBinary;
 import love.distributedrebirth.numberxd.base2t.T03PartTrit;
 
-public interface BasePartSplit6 extends BaseFacet {
+public interface BasePartSplit6 extends BasePart {
 
 	default T02PartBinary splitPartBinary() {
 		return T02PartBinary.values()[ordinal() & 1];