From 91b9bfd9ebc00951b1f200140249e5569761c10e Mon Sep 17 00:00:00 2001
From: Willem <willemtsade.git.2022@distributedrebirth.love>
Date: Tue, 22 Feb 2022 18:33:57 +0100
Subject: [PATCH] Added more of warpme lib

---
 .../distributedrebirth/warpme/Warpᵐᵉ.java     | 10 ++++++
 .../WaterBucketDriver.java}                   | 11 +++---
 .../warpme/hash/WaterDrugsDriver.java         | 27 +++++++++++++++
 .../warpme/sea/WaterOceanDriver.java          | 27 +++++++++++++++
 .../warp-core-lang.eld}                       | 16 ++++-----
 .../warp-core-modules.xml}                    |  2 +-
 .../META-INF/warp-hash/warp-hash-lang.eld     | 34 +++++++++++++++++++
 .../META-INF/warp-hash/warp-hash-modules.xml  | 10 ++++++
 .../src/resources/META-INF/x4o-drivers.xml    |  4 ++-
 .../distributedrebirth/gdxapp/GDXAppMain.java |  6 ++--
 10 files changed, 128 insertions(+), 19 deletions(-)
 create mode 100644 lib-warpme/src/main/love/distributedrebirth/warpme/Warpᵐᵉ.java
 rename lib-warpme/src/main/love/distributedrebirth/warpme/{TOSWarpCoreDriver.java => core/WaterBucketDriver.java} (60%)
 create mode 100644 lib-warpme/src/main/love/distributedrebirth/warpme/hash/WaterDrugsDriver.java
 create mode 100644 lib-warpme/src/main/love/distributedrebirth/warpme/sea/WaterOceanDriver.java
 rename lib-warpme/src/resources/META-INF/{warpcore/warpcore-lang.eld => warp-core/warp-core-lang.eld} (76%)
 rename lib-warpme/src/resources/META-INF/{warpcore/warpcore-modules.xml => warp-core/warp-core-modules.xml} (86%)
 create mode 100644 lib-warpme/src/resources/META-INF/warp-hash/warp-hash-lang.eld
 create mode 100644 lib-warpme/src/resources/META-INF/warp-hash/warp-hash-modules.xml

diff --git a/lib-warpme/src/main/love/distributedrebirth/warpme/Warpᵐᵉ.java b/lib-warpme/src/main/love/distributedrebirth/warpme/Warpᵐᵉ.java
new file mode 100644
index 00000000..9828a7d8
--- /dev/null
+++ b/lib-warpme/src/main/love/distributedrebirth/warpme/Warpᵐᵉ.java
@@ -0,0 +1,10 @@
+package love.distributedrebirth.warpme;
+
+public class Warpᵐᵉ {
+
+	//public static final String WARP_BOOT = "warp-boot.xml";
+	public static final String WARP_CORE = "warp-core.xml";
+	public static final String WARP_HASH = "warp-hash.xml";
+	public static final String WARP_SEA  = "warp-sea.xml";
+	public static final String WARP_ROOT = "warp-root.xml";
+}
diff --git a/lib-warpme/src/main/love/distributedrebirth/warpme/TOSWarpCoreDriver.java b/lib-warpme/src/main/love/distributedrebirth/warpme/core/WaterBucketDriver.java
similarity index 60%
rename from lib-warpme/src/main/love/distributedrebirth/warpme/TOSWarpCoreDriver.java
rename to lib-warpme/src/main/love/distributedrebirth/warpme/core/WaterBucketDriver.java
index e97159b9..13aaeade 100644
--- a/lib-warpme/src/main/love/distributedrebirth/warpme/TOSWarpCoreDriver.java
+++ b/lib-warpme/src/main/love/distributedrebirth/warpme/core/WaterBucketDriver.java
@@ -1,15 +1,14 @@
-package love.distributedrebirth.warpme;
+package love.distributedrebirth.warpme.core;
 
 import org.x4o.xml.X4ODriver;
 import org.x4o.xml.X4ODriverManager;
 
 import love.distributedrebirth.bassboonyd.BãßBȍőnAuthorInfoʸᴰ;
-import love.distributedrebirth.warpme.core.WaterBucket;
 
 @BãßBȍőnAuthorInfoʸᴰ(name = "willemtsade", copyright = "©Δ∞ 仙上主天")
-public class TOSWarpCoreDriver extends X4ODriver<WaterBucket> {
+public class WaterBucketDriver extends X4ODriver<WaterBucket> {
 
-	static final public String LANGUAGE_NAME = "warpcore";
+	static final public String LANGUAGE_NAME = "warp-core";
 	static final public String[] LANGUAGE_VERSIONS = new String[]{X4ODriver.DEFAULT_LANGUAGE_VERSION};
 	
 	@Override
@@ -22,7 +21,7 @@ public class TOSWarpCoreDriver extends X4ODriver<WaterBucket> {
 		return LANGUAGE_VERSIONS;
 	}
 	
-	static public TOSWarpCoreDriver newInstance() {
-		return (TOSWarpCoreDriver)X4ODriverManager.getX4ODriver(LANGUAGE_NAME);
+	static public WaterBucketDriver newInstance() {
+		return (WaterBucketDriver)X4ODriverManager.getX4ODriver(LANGUAGE_NAME);
 	}
 }
diff --git a/lib-warpme/src/main/love/distributedrebirth/warpme/hash/WaterDrugsDriver.java b/lib-warpme/src/main/love/distributedrebirth/warpme/hash/WaterDrugsDriver.java
new file mode 100644
index 00000000..8d45ef5d
--- /dev/null
+++ b/lib-warpme/src/main/love/distributedrebirth/warpme/hash/WaterDrugsDriver.java
@@ -0,0 +1,27 @@
+package love.distributedrebirth.warpme.hash;
+
+import org.x4o.xml.X4ODriver;
+import org.x4o.xml.X4ODriverManager;
+
+import love.distributedrebirth.bassboonyd.BãßBȍőnAuthorInfoʸᴰ;
+
+@BãßBȍőnAuthorInfoʸᴰ(name = "willemtsade", copyright = "©Δ∞ 仙上主天")
+public class WaterDrugsDriver extends X4ODriver<WaterDrugs> {
+
+	static final public String LANGUAGE_NAME = "warp-hash";
+	static final public String[] LANGUAGE_VERSIONS = new String[]{X4ODriver.DEFAULT_LANGUAGE_VERSION};
+	
+	@Override
+	public String getLanguageName() {
+		return LANGUAGE_NAME;
+	}
+
+	@Override
+	public String[] getLanguageVersions() {
+		return LANGUAGE_VERSIONS;
+	}
+	
+	static public WaterDrugsDriver newInstance() {
+		return (WaterDrugsDriver)X4ODriverManager.getX4ODriver(LANGUAGE_NAME);
+	}
+}
diff --git a/lib-warpme/src/main/love/distributedrebirth/warpme/sea/WaterOceanDriver.java b/lib-warpme/src/main/love/distributedrebirth/warpme/sea/WaterOceanDriver.java
new file mode 100644
index 00000000..6ff1d882
--- /dev/null
+++ b/lib-warpme/src/main/love/distributedrebirth/warpme/sea/WaterOceanDriver.java
@@ -0,0 +1,27 @@
+package love.distributedrebirth.warpme.sea;
+
+import org.x4o.xml.X4ODriver;
+import org.x4o.xml.X4ODriverManager;
+
+import love.distributedrebirth.bassboonyd.BãßBȍőnAuthorInfoʸᴰ;
+
+@BãßBȍőnAuthorInfoʸᴰ(name = "willemtsade", copyright = "©Δ∞ 仙上主天")
+public class WaterOceanDriver extends X4ODriver<WaterOcean> {
+
+	static final public String LANGUAGE_NAME = "warp-ocean";
+	static final public String[] LANGUAGE_VERSIONS = new String[]{X4ODriver.DEFAULT_LANGUAGE_VERSION};
+	
+	@Override
+	public String getLanguageName() {
+		return LANGUAGE_NAME;
+	}
+
+	@Override
+	public String[] getLanguageVersions() {
+		return LANGUAGE_VERSIONS;
+	}
+	
+	static public WaterOceanDriver newInstance() {
+		return (WaterOceanDriver)X4ODriverManager.getX4ODriver(LANGUAGE_NAME);
+	}
+}
diff --git a/lib-warpme/src/resources/META-INF/warpcore/warpcore-lang.eld b/lib-warpme/src/resources/META-INF/warp-core/warp-core-lang.eld
similarity index 76%
rename from lib-warpme/src/resources/META-INF/warpcore/warpcore-lang.eld
rename to lib-warpme/src/resources/META-INF/warp-core/warp-core-lang.eld
index ad27b5b0..6f67b628 100644
--- a/lib-warpme/src/resources/META-INF/warpcore/warpcore-lang.eld
+++ b/lib-warpme/src/resources/META-INF/warp-core/warp-core-lang.eld
@@ -4,8 +4,8 @@
 	xmlns:conv="http://eld.x4o.org/xml/ns/eld-conv"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://eld.x4o.org/xml/ns/eld-root http://eld.x4o.org/xml/ns/eld-root-1.0.xsd"
-	providerHost="warpcore.x4o.distributedrebirth.love" providerName="WarpCore Encryption"
-	id="warpcore-module">
+	providerHost="warp-core.x4o.distributedrebirth.love" providerName="WarpCoreᵐᵉ"
+	id="warp-core-module">
 
 	<eld:classBindingHandler id="Bucket-Water"
 		parentClass="love.distributedrebirth.numberxd.base2t.part.warp.WaterBucket"
@@ -21,9 +21,9 @@
 		addMethod="addHeartTone" getMethod="getHeartTones" />
 	
 	<eld:namespace
-		uri="http://wrapcore.x4o.distributedrebirth.love/xml/ns/warpcore-root"
-		schemaUri="http://warpcore.x4o.distributedrebirth.love/xml/ns/warpcore-root-1.0.xsd"
-		schemaResource="warpcore-root-1.0.xsd" schemaPrefix="root"
+		uri="http://wrap-core.x4o.distributedrebirth.love/xml/ns/warp-core-root"
+		schemaUri="http://warp-core.x4o.distributedrebirth.love/xml/ns/warp-core-root-1.0.xsd"
+		schemaResource="warp-core-root-1.0.xsd" schemaPrefix="root"
 		description="Root namespace to have nice namespaceing."
 		name="WarpCore Root Namespace" languageRoot="true" id="root">
 		<eld:element tag="bucket"
@@ -31,9 +31,9 @@
 	</eld:namespace>
 
 	<eld:namespace
-		uri="http://warpcore.x4o.distributedrebirth.love/xml/ns/warpcore-cipher"
-		schemaUri="http://warpcore.x4o.distributedrebirth.love/xml/ns/warpcore-cipher-1.0.xsd"
-		schemaResource="warpcore-lang-1.0.xsd" schemaPrefix="cipher"
+		uri="http://warp-core.x4o.distributedrebirth.love/xml/ns/warp-core-cipher"
+		schemaUri="http://warp-core.x4o.distributedrebirth.love/xml/ns/warp-core-cipher-1.0.xsd"
+		schemaResource="warp-core-lang-1.0.xsd" schemaPrefix="cipher"
 		description="Language namespace to store warp cipher"
 		name="WarpCore Language Namespace" id="cipher">
 		<eld:element tag="water"
diff --git a/lib-warpme/src/resources/META-INF/warpcore/warpcore-modules.xml b/lib-warpme/src/resources/META-INF/warp-core/warp-core-modules.xml
similarity index 86%
rename from lib-warpme/src/resources/META-INF/warpcore/warpcore-modules.xml
rename to lib-warpme/src/resources/META-INF/warp-core/warp-core-modules.xml
index 3d48b7f8..f1bb5684 100644
--- a/lib-warpme/src/resources/META-INF/warpcore/warpcore-modules.xml
+++ b/lib-warpme/src/resources/META-INF/warp-core/warp-core-modules.xml
@@ -5,6 +5,6 @@
 	xsi:schemaLocation="http://language.x4o.org/xml/ns/modules http://language.x4o.org/xml/ns/modules-1.0.xsd"
 	>
 	<language version="1.0">
-		<eld-resource>warpcore-lang.eld</eld-resource>
+		<eld-resource>warp-core-lang.eld</eld-resource>
 	</language>
 </modules>
diff --git a/lib-warpme/src/resources/META-INF/warp-hash/warp-hash-lang.eld b/lib-warpme/src/resources/META-INF/warp-hash/warp-hash-lang.eld
new file mode 100644
index 00000000..da41a662
--- /dev/null
+++ b/lib-warpme/src/resources/META-INF/warp-hash/warp-hash-lang.eld
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<root:module xmlns:root="http://eld.x4o.org/xml/ns/eld-root"
+	xmlns:eld="http://eld.x4o.org/xml/ns/eld-lang"
+	xmlns:conv="http://eld.x4o.org/xml/ns/eld-conv"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://eld.x4o.org/xml/ns/eld-root http://eld.x4o.org/xml/ns/eld-root-1.0.xsd"
+	providerHost="warp-hash.x4o.distributedrebirth.love" providerName="WarpHashᵐᵉ"
+	id="warp-hash-module">
+
+	<eld:classBindingHandler id="WaterDrugs-WaterFileHash"
+		parentClass="love.distributedrebirth.warpme.hash.WaterDrugs"
+		childClass="love.distributedrebirth.warpme.hash.WaterFileHash"
+		addMethod="addFileHash" getMethod="getFileHashes" />
+	
+	<eld:namespace
+		uri="http://wrap-core.x4o.distributedrebirth.love/xml/ns/warp-hash-root"
+		schemaUri="http://warp-hash.x4o.distributedrebirth.love/xml/ns/warp-hash-root-1.0.xsd"
+		schemaResource="warp-hash-root-1.0.xsd" schemaPrefix="root"
+		description="Root namespace to have nice namespaceing."
+		name="WarpHash Root Namespace" languageRoot="true" id="root">
+		<eld:element tag="drugs"
+			objectClass="love.distributedrebirth.warpme.hash.WaterDrugs"/>
+	</eld:namespace>
+
+	<eld:namespace
+		uri="http://warp-hash.x4o.distributedrebirth.love/xml/ns/warp-hash-soft"
+		schemaUri="http://warp-hash.x4o.distributedrebirth.love/xml/ns/warp-hash-soft-1.0.xsd"
+		schemaResource="warp-hash-soft-1.0.xsd" schemaPrefix="soft"
+		description="Language namespace to store warp hash"
+		name="WarpHash Language Namespace" id="soft">
+		<eld:element tag="hash"
+			objectClass="love.distributedrebirth.warpme.hash.WaterFileHash" />
+	</eld:namespace>
+</root:module>
\ No newline at end of file
diff --git a/lib-warpme/src/resources/META-INF/warp-hash/warp-hash-modules.xml b/lib-warpme/src/resources/META-INF/warp-hash/warp-hash-modules.xml
new file mode 100644
index 00000000..9ec3bb54
--- /dev/null
+++ b/lib-warpme/src/resources/META-INF/warp-hash/warp-hash-modules.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<modules version="1.0"
+	xmlns="http://language.x4o.org/xml/ns/modules"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://language.x4o.org/xml/ns/modules http://language.x4o.org/xml/ns/modules-1.0.xsd"
+	>
+	<language version="1.0">
+		<eld-resource>warp-hash-lang.eld</eld-resource>
+	</language>
+</modules>
diff --git a/lib-warpme/src/resources/META-INF/x4o-drivers.xml b/lib-warpme/src/resources/META-INF/x4o-drivers.xml
index cf83c49b..c6b5b9b3 100644
--- a/lib-warpme/src/resources/META-INF/x4o-drivers.xml
+++ b/lib-warpme/src/resources/META-INF/x4o-drivers.xml
@@ -4,5 +4,7 @@
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://language.x4o.org/xml/ns/drivers http://language.x4o.org/xml/ns/drivers-1.0.xsd"
 	>
-	<driver language="warpcore" className="love.distributedrebirth.numberxd.base2t.part.warp.TOSWarpCoreDriver"/>
+	<driver language="warp-core" className="love.distributedrebirth.warpme.core.WaterBucketDriver"/>
+	<driver language="warp-hash" className="love.distributedrebirth.warpme.hash.WaterDrugsDriver"/>
+	<driver language="warp-sea" className="love.distributedrebirth.warpme.sea.WaterOceanDriver"/>
 </drivers>
diff --git a/main-gdxapp/src/main/love/distributedrebirth/gdxapp/GDXAppMain.java b/main-gdxapp/src/main/love/distributedrebirth/gdxapp/GDXAppMain.java
index cdb8a79d..9826168a 100644
--- a/main-gdxapp/src/main/love/distributedrebirth/gdxapp/GDXAppMain.java
+++ b/main-gdxapp/src/main/love/distributedrebirth/gdxapp/GDXAppMain.java
@@ -45,8 +45,8 @@ import love.distributedrebirth.numberxd.base2t.part.warp.TOSWarpCore;
 import love.distributedrebirth.numberxd.glyph.BaseGlyphSet;
 import love.distributedrebirth.unicode4d.atlas.FontAtlas;
 import love.distributedrebirth.unicode4d.atlas.FontAtlasDriver;
-import love.distributedrebirth.warpme.TOSWarpCoreDriver;
 import love.distributedrebirth.warpme.core.WaterBucket;
+import love.distributedrebirth.warpme.core.WaterBucketDriver;
 import net.spookygames.gdx.nativefilechooser.NativeFileChooser;
 
 @BãßBȍőnAuthorInfoʸᴰ(name = "willemtsade", copyright = "©Δ∞ 仙上主天")
@@ -119,13 +119,13 @@ public enum GDXAppMain implements DefaultEnumInstanceᴶᴹˣ<GDXAppMain,GDXAppM
 			
 			if (args.contains("warpcore-load")) {
 				System.out.println("warpcore-load: requested");
-				WaterBucket bucket = TOSWarpCoreDriver.newInstance().createReader().readFile("./warpcore.xml");
+				WaterBucket bucket = WaterBucketDriver.newInstance().createReader().readFile("./warpcore.xml");
 				TOSWarpCore.INSTANCE.BãßArmWarpCore(bucket);
 			}
 			if (args.contains("warpcore-save")) {
 				System.out.println("warpcore-save: requested");
 				WaterBucket bucket = TOSWarpCore.INSTANCE.BãßCurrentWarpCore();
-				TOSWarpCoreDriver.newInstance().createWriter().writeFile(bucket, "./warpcore.xml");
+				WaterBucketDriver.newInstance().createWriter().writeFile(bucket, "./warpcore.xml");
 			}
 		} catch (Exception e) {
 			throw new RuntimeException(e);