diff --git a/gdxapp4d-app-notepad/src/main/chain/warp-sea.xml b/gdxapp4d-app-notepad/src/main/chain/warp-sea.xml deleted file mode 100644 index 11b29c2f..00000000 --- a/gdxapp4d-app-notepad/src/main/chain/warp-sea.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - diff --git a/gdxapp4d-app-tosamp/src/main/chain/warp-sea.xml b/gdxapp4d-app-tosamp/src/main/chain/warp-sea.xml deleted file mode 100644 index 43ccb91b..00000000 --- a/gdxapp4d-app-tosamp/src/main/chain/warp-sea.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - diff --git a/gdxapp4d-boot-desktop/local-override.xml b/gdxapp4d-boot-desktop/local-override.xml index 5369dbaf..34491935 100644 --- a/gdxapp4d-boot-desktop/local-override.xml +++ b/gdxapp4d-boot-desktop/local-override.xml @@ -2,27 +2,18 @@ ../gdxapp4d-chain-sys-engine/src/main/chain - ../gdxapp4d-chain-sys-engine-fuel/src/main/chain + ../gdxapp4d-chain-sys-default/src/main/chain + ../gdxapp4d-chain-dep-osgi-scr/src/main/chain - ../gdxapp4d-chain-music-msx/src/main/chain - ../gdxapp4d-chain-music-templeos/src/main/chain - ../gdxapp4d-chain-sys-unicode4d/target/chain - - ../gdxapp4d-app-calculator/src/main/chain + ../gdxapp4d-chain-font-unicode4d/target/chain + ../gdxapp4d-chain-default-music/src/main/chain + ../gdxapp4d-chain-default-apps/src/main/chain ../gdxapp4d-app-calculator/target/classes + ../gdxapp4d-app-hewallet/target/classes + ../gdxapp4d-app-tosamp/target/classes + ../gdxapp4d-app-notepad/target/classes - ../gdxapp4d-app-hewallet/src/main/chain - ../gdxapp4d-app-hewallet/target/classes - - ../gdxapp4d-app-tosamp/src/main/chain - ../gdxapp4d-app-tosamp/target/classes - - ../gdxapp4d-app-notepad/src/main/chain - ../gdxapp4d-app-notepad/target/classes - - ../gdxapp4d-vrgem4/src/main/chain + ../gdxapp4d-chain-vrlib/src/main/chain ../gdxapp4d-vrgem4/target/classes - - ../gdxapp4d-vrsys5/src/main/chain - ../gdxapp4d-vrsys5/target/classes + ../gdxapp4d-vrsys5/target/classes diff --git a/gdxapp4d-chain-default-apps/pom.xml b/gdxapp4d-chain-default-apps/pom.xml new file mode 100644 index 00000000..ecbc37b4 --- /dev/null +++ b/gdxapp4d-chain-default-apps/pom.xml @@ -0,0 +1,36 @@ + + 4.0.0 + + love.distributedrebirth.gdxapp4d + gdxapp4d + 0.0.1-SNAPSHOT + + gdxapp4d-chain-default-apps + pom + + + love.distributedrebirth.gdxapp4d + gdxapp4d-app-calculator + ${project.version} + provided + + + love.distributedrebirth.gdxapp4d + gdxapp4d-app-hewallet + ${project.version} + provided + + + love.distributedrebirth.gdxapp4d + gdxapp4d-app-notepad + ${project.version} + provided + + + love.distributedrebirth.gdxapp4d + gdxapp4d-app-tosamp + ${project.version} + provided + + + \ No newline at end of file diff --git a/gdxapp4d-app-calculator/src/main/chain/warp-sea.xml b/gdxapp4d-chain-default-apps/src/main/chain/warp-sea.xml similarity index 62% rename from gdxapp4d-app-calculator/src/main/chain/warp-sea.xml rename to gdxapp4d-chain-default-apps/src/main/chain/warp-sea.xml index 7ea6e2b4..c150cf2d 100644 --- a/gdxapp4d-app-calculator/src/main/chain/warp-sea.xml +++ b/gdxapp4d-chain-default-apps/src/main/chain/warp-sea.xml @@ -3,7 +3,10 @@ xmlns:link="http://warp-sea.x4o.distributedrebirth.love/xml/ns/warp-sea-link" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://wrap-sea.x4o.distributedrebirth.love/xml/ns/warp-sea-root http://warp-sea.x4o.distributedrebirth.love/xml/ns/warp-sea-root-1.0.xsd"> - + + + + diff --git a/gdxapp4d-chain-music-templeos/pom.xml b/gdxapp4d-chain-default-music/pom.xml similarity index 86% rename from gdxapp4d-chain-music-templeos/pom.xml rename to gdxapp4d-chain-default-music/pom.xml index 3d2bf017..86332b74 100644 --- a/gdxapp4d-chain-music-templeos/pom.xml +++ b/gdxapp4d-chain-default-music/pom.xml @@ -5,6 +5,6 @@ gdxapp4d 0.0.1-SNAPSHOT - gdxapp4d-chain-music-templeos + gdxapp4d-chain-default-music pom \ No newline at end of file diff --git a/gdxapp4d-chain-music-msx/src/main/chain/music/000-playlist.m3u b/gdxapp4d-chain-default-music/src/main/chain/music-msx/000-playlist.m3u similarity index 100% rename from gdxapp4d-chain-music-msx/src/main/chain/music/000-playlist.m3u rename to gdxapp4d-chain-default-music/src/main/chain/music-msx/000-playlist.m3u diff --git a/gdxapp4d-chain-music-msx/src/main/chain/music/08SD-SNATCHER-CODA.MP3 b/gdxapp4d-chain-default-music/src/main/chain/music-msx/08SD-SNATCHER-CODA.MP3 similarity index 100% rename from gdxapp4d-chain-music-msx/src/main/chain/music/08SD-SNATCHER-CODA.MP3 rename to gdxapp4d-chain-default-music/src/main/chain/music-msx/08SD-SNATCHER-CODA.MP3 diff --git a/gdxapp4d-chain-music-msx/src/main/chain/music/25_-_under_the_cloud_of_darkness_night_bgm.mp3 b/gdxapp4d-chain-default-music/src/main/chain/music-msx/25_-_under_the_cloud_of_darkness_night_bgm.mp3 similarity index 100% rename from gdxapp4d-chain-music-msx/src/main/chain/music/25_-_under_the_cloud_of_darkness_night_bgm.mp3 rename to gdxapp4d-chain-default-music/src/main/chain/music-msx/25_-_under_the_cloud_of_darkness_night_bgm.mp3 diff --git a/gdxapp4d-chain-music-msx/src/main/chain/music/Bart-XakTheTowerofGazzel-FirstFloor.mp3 b/gdxapp4d-chain-default-music/src/main/chain/music-msx/Bart-XakTheTowerofGazzel-FirstFloor.mp3 similarity index 100% rename from gdxapp4d-chain-music-msx/src/main/chain/music/Bart-XakTheTowerofGazzel-FirstFloor.mp3 rename to gdxapp4d-chain-default-music/src/main/chain/music-msx/Bart-XakTheTowerofGazzel-FirstFloor.mp3 diff --git a/gdxapp4d-chain-music-msx/src/main/chain/music/DEVA-Shop Neutral.mp3 b/gdxapp4d-chain-default-music/src/main/chain/music-msx/DEVA-Shop Neutral.mp3 similarity index 100% rename from gdxapp4d-chain-music-msx/src/main/chain/music/DEVA-Shop Neutral.mp3 rename to gdxapp4d-chain-default-music/src/main/chain/music-msx/DEVA-Shop Neutral.mp3 diff --git a/gdxapp4d-chain-music-msx/src/main/chain/music/Hybris_0.mp3 b/gdxapp4d-chain-default-music/src/main/chain/music-msx/Hybris_0.mp3 similarity index 100% rename from gdxapp4d-chain-music-msx/src/main/chain/music/Hybris_0.mp3 rename to gdxapp4d-chain-default-music/src/main/chain/music-msx/Hybris_0.mp3 diff --git a/gdxapp4d-chain-music-msx/src/main/chain/music/Jorito-copyisprofile.mp3 b/gdxapp4d-chain-default-music/src/main/chain/music-msx/Jorito-copyisprofile.mp3 similarity index 100% rename from gdxapp4d-chain-music-msx/src/main/chain/music/Jorito-copyisprofile.mp3 rename to gdxapp4d-chain-default-music/src/main/chain/music-msx/Jorito-copyisprofile.mp3 diff --git a/gdxapp4d-chain-music-msx/src/main/chain/music/golvellius_medley_bart_roijmans_2014_192kbps.mp3 b/gdxapp4d-chain-default-music/src/main/chain/music-msx/golvellius_medley_bart_roijmans_2014_192kbps.mp3 similarity index 100% rename from gdxapp4d-chain-music-msx/src/main/chain/music/golvellius_medley_bart_roijmans_2014_192kbps.mp3 rename to gdxapp4d-chain-default-music/src/main/chain/music-msx/golvellius_medley_bart_roijmans_2014_192kbps.mp3 diff --git a/gdxapp4d-chain-music-msx/src/main/chain/music/magical_tree_jorito.mp3 b/gdxapp4d-chain-default-music/src/main/chain/music-msx/magical_tree_jorito.mp3 similarity index 100% rename from gdxapp4d-chain-music-msx/src/main/chain/music/magical_tree_jorito.mp3 rename to gdxapp4d-chain-default-music/src/main/chain/music-msx/magical_tree_jorito.mp3 diff --git a/gdxapp4d-chain-music-msx/src/main/chain/music/meits_illusion_city_-_the_one_who_rules_the_heaven.mp3 b/gdxapp4d-chain-default-music/src/main/chain/music-msx/meits_illusion_city_-_the_one_who_rules_the_heaven.mp3 similarity index 100% rename from gdxapp4d-chain-music-msx/src/main/chain/music/meits_illusion_city_-_the_one_who_rules_the_heaven.mp3 rename to gdxapp4d-chain-default-music/src/main/chain/music-msx/meits_illusion_city_-_the_one_who_rules_the_heaven.mp3 diff --git a/gdxapp4d-chain-music-templeos/src/main/chain/music/000-playlist.m3u b/gdxapp4d-chain-default-music/src/main/chain/music-templeos/000-playlist.m3u similarity index 100% rename from gdxapp4d-chain-music-templeos/src/main/chain/music/000-playlist.m3u rename to gdxapp4d-chain-default-music/src/main/chain/music-templeos/000-playlist.m3u diff --git a/gdxapp4d-chain-music-templeos/src/main/chain/music/beeble-i-used-temple-os-to-write.mp3 b/gdxapp4d-chain-default-music/src/main/chain/music-templeos/beeble-i-used-temple-os-to-write.mp3 similarity index 100% rename from gdxapp4d-chain-music-templeos/src/main/chain/music/beeble-i-used-temple-os-to-write.mp3 rename to gdxapp4d-chain-default-music/src/main/chain/music-templeos/beeble-i-used-temple-os-to-write.mp3 diff --git a/gdxapp4d-chain-music-templeos/src/main/chain/music/panoramacircle-waterfowl.mp3 b/gdxapp4d-chain-default-music/src/main/chain/music-templeos/panoramacircle-waterfowl.mp3 similarity index 100% rename from gdxapp4d-chain-music-templeos/src/main/chain/music/panoramacircle-waterfowl.mp3 rename to gdxapp4d-chain-default-music/src/main/chain/music-templeos/panoramacircle-waterfowl.mp3 diff --git a/gdxapp4d-chain-music-templeos/src/main/chain/music/ryanfarran-risen-temple-os.mp3 b/gdxapp4d-chain-default-music/src/main/chain/music-templeos/ryanfarran-risen-temple-os.mp3 similarity index 100% rename from gdxapp4d-chain-music-templeos/src/main/chain/music/ryanfarran-risen-temple-os.mp3 rename to gdxapp4d-chain-default-music/src/main/chain/music-templeos/ryanfarran-risen-temple-os.mp3 diff --git a/gdxapp4d-chain-music-templeos/src/main/chain/music/sanctumwave-devine-intellect.mp3 b/gdxapp4d-chain-default-music/src/main/chain/music-templeos/sanctumwave-devine-intellect.mp3 similarity index 100% rename from gdxapp4d-chain-music-templeos/src/main/chain/music/sanctumwave-devine-intellect.mp3 rename to gdxapp4d-chain-default-music/src/main/chain/music-templeos/sanctumwave-devine-intellect.mp3 diff --git a/gdxapp4d-chain-music-templeos/src/main/chain/music/sanctumwave-nightwalk.mp3 b/gdxapp4d-chain-default-music/src/main/chain/music-templeos/sanctumwave-nightwalk.mp3 similarity index 100% rename from gdxapp4d-chain-music-templeos/src/main/chain/music/sanctumwave-nightwalk.mp3 rename to gdxapp4d-chain-default-music/src/main/chain/music-templeos/sanctumwave-nightwalk.mp3 diff --git a/gdxapp4d-chain-music-templeos/src/main/chain/music/sanctumwave-risen.mp3 b/gdxapp4d-chain-default-music/src/main/chain/music-templeos/sanctumwave-risen.mp3 similarity index 100% rename from gdxapp4d-chain-music-templeos/src/main/chain/music/sanctumwave-risen.mp3 rename to gdxapp4d-chain-default-music/src/main/chain/music-templeos/sanctumwave-risen.mp3 diff --git a/gdxapp4d-chain-music-templeos/src/main/chain/music/theselfhelpgroup-temple-os.mp3 b/gdxapp4d-chain-default-music/src/main/chain/music-templeos/theselfhelpgroup-temple-os.mp3 similarity index 100% rename from gdxapp4d-chain-music-templeos/src/main/chain/music/theselfhelpgroup-temple-os.mp3 rename to gdxapp4d-chain-default-music/src/main/chain/music-templeos/theselfhelpgroup-temple-os.mp3 diff --git a/gdxapp4d-app-hewallet/src/main/chain/warp-sea.xml b/gdxapp4d-chain-default-music/src/main/chain/warp-sea.xml similarity index 56% rename from gdxapp4d-app-hewallet/src/main/chain/warp-sea.xml rename to gdxapp4d-chain-default-music/src/main/chain/warp-sea.xml index 55ae2081..d0dcd659 100644 --- a/gdxapp4d-app-hewallet/src/main/chain/warp-sea.xml +++ b/gdxapp4d-chain-default-music/src/main/chain/warp-sea.xml @@ -3,7 +3,10 @@ xmlns:link="http://warp-sea.x4o.distributedrebirth.love/xml/ns/warp-sea-link" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://wrap-sea.x4o.distributedrebirth.love/xml/ns/warp-sea-root http://warp-sea.x4o.distributedrebirth.love/xml/ns/warp-sea-root-1.0.xsd"> - - + + + + + diff --git a/gdxapp4d-chain-sys-unicode4d/pom.xml b/gdxapp4d-chain-font-unicode4d/pom.xml similarity index 92% rename from gdxapp4d-chain-sys-unicode4d/pom.xml rename to gdxapp4d-chain-font-unicode4d/pom.xml index 16736c89..aa1397ec 100644 --- a/gdxapp4d-chain-sys-unicode4d/pom.xml +++ b/gdxapp4d-chain-font-unicode4d/pom.xml @@ -5,7 +5,7 @@ gdxapp4d 0.0.1-SNAPSHOT - gdxapp4d-chain-sys-unicode4d + gdxapp4d-chain-font-unicode4d pom diff --git a/gdxapp4d-chain-sys-unicode4d/src/main/chain/plane0/code-2000.ttf b/gdxapp4d-chain-font-unicode4d/src/main/chain/plane0/code-2000.ttf similarity index 100% rename from gdxapp4d-chain-sys-unicode4d/src/main/chain/plane0/code-2000.ttf rename to gdxapp4d-chain-font-unicode4d/src/main/chain/plane0/code-2000.ttf diff --git a/gdxapp4d-chain-sys-unicode4d/src/main/chain/plane0/fa-solid-900.ttf b/gdxapp4d-chain-font-unicode4d/src/main/chain/plane0/fa-solid-900.ttf similarity index 100% rename from gdxapp4d-chain-sys-unicode4d/src/main/chain/plane0/fa-solid-900.ttf rename to gdxapp4d-chain-font-unicode4d/src/main/chain/plane0/fa-solid-900.ttf diff --git a/gdxapp4d-chain-sys-unicode4d/src/main/chain/plane0/free-sans.ttf b/gdxapp4d-chain-font-unicode4d/src/main/chain/plane0/free-sans.ttf similarity index 100% rename from gdxapp4d-chain-sys-unicode4d/src/main/chain/plane0/free-sans.ttf rename to gdxapp4d-chain-font-unicode4d/src/main/chain/plane0/free-sans.ttf diff --git a/gdxapp4d-chain-sys-unicode4d/src/main/chain/plane0/new-gardiner-bmp.ttf b/gdxapp4d-chain-font-unicode4d/src/main/chain/plane0/new-gardiner-bmp.ttf similarity index 100% rename from gdxapp4d-chain-sys-unicode4d/src/main/chain/plane0/new-gardiner-bmp.ttf rename to gdxapp4d-chain-font-unicode4d/src/main/chain/plane0/new-gardiner-bmp.ttf diff --git a/gdxapp4d-chain-sys-unicode4d/src/main/chain/plane0/noto-sans-balinese.ttf b/gdxapp4d-chain-font-unicode4d/src/main/chain/plane0/noto-sans-balinese.ttf similarity index 100% rename from gdxapp4d-chain-sys-unicode4d/src/main/chain/plane0/noto-sans-balinese.ttf rename to gdxapp4d-chain-font-unicode4d/src/main/chain/plane0/noto-sans-balinese.ttf diff --git a/gdxapp4d-chain-sys-unicode4d/src/main/chain/plane0/noto-sans-bamum.ttf b/gdxapp4d-chain-font-unicode4d/src/main/chain/plane0/noto-sans-bamum.ttf similarity index 100% rename from gdxapp4d-chain-sys-unicode4d/src/main/chain/plane0/noto-sans-bamum.ttf rename to gdxapp4d-chain-font-unicode4d/src/main/chain/plane0/noto-sans-bamum.ttf diff --git a/gdxapp4d-chain-sys-unicode4d/src/main/chain/plane0/noto-sans-batak.ttf b/gdxapp4d-chain-font-unicode4d/src/main/chain/plane0/noto-sans-batak.ttf similarity index 100% rename from gdxapp4d-chain-sys-unicode4d/src/main/chain/plane0/noto-sans-batak.ttf rename to gdxapp4d-chain-font-unicode4d/src/main/chain/plane0/noto-sans-batak.ttf diff --git a/gdxapp4d-chain-sys-unicode4d/src/main/chain/plane0/noto-sans-glagolitic.ttf b/gdxapp4d-chain-font-unicode4d/src/main/chain/plane0/noto-sans-glagolitic.ttf similarity index 100% rename from gdxapp4d-chain-sys-unicode4d/src/main/chain/plane0/noto-sans-glagolitic.ttf rename to gdxapp4d-chain-font-unicode4d/src/main/chain/plane0/noto-sans-glagolitic.ttf diff --git a/gdxapp4d-chain-sys-unicode4d/src/main/chain/plane0/noto-sans-javanese.ttf b/gdxapp4d-chain-font-unicode4d/src/main/chain/plane0/noto-sans-javanese.ttf similarity index 100% rename from gdxapp4d-chain-sys-unicode4d/src/main/chain/plane0/noto-sans-javanese.ttf rename to gdxapp4d-chain-font-unicode4d/src/main/chain/plane0/noto-sans-javanese.ttf diff --git a/gdxapp4d-chain-sys-unicode4d/src/main/chain/plane0/noto-sans-lepcha.ttf b/gdxapp4d-chain-font-unicode4d/src/main/chain/plane0/noto-sans-lepcha.ttf similarity index 100% rename from gdxapp4d-chain-sys-unicode4d/src/main/chain/plane0/noto-sans-lepcha.ttf rename to gdxapp4d-chain-font-unicode4d/src/main/chain/plane0/noto-sans-lepcha.ttf diff --git a/gdxapp4d-chain-sys-unicode4d/src/main/chain/plane0/noto-sans-lisu.ttf b/gdxapp4d-chain-font-unicode4d/src/main/chain/plane0/noto-sans-lisu.ttf similarity index 100% rename from gdxapp4d-chain-sys-unicode4d/src/main/chain/plane0/noto-sans-lisu.ttf rename to gdxapp4d-chain-font-unicode4d/src/main/chain/plane0/noto-sans-lisu.ttf diff --git a/gdxapp4d-chain-sys-unicode4d/src/main/chain/plane0/noto-sans-meetei-mayek.ttf b/gdxapp4d-chain-font-unicode4d/src/main/chain/plane0/noto-sans-meetei-mayek.ttf similarity index 100% rename from gdxapp4d-chain-sys-unicode4d/src/main/chain/plane0/noto-sans-meetei-mayek.ttf rename to gdxapp4d-chain-font-unicode4d/src/main/chain/plane0/noto-sans-meetei-mayek.ttf diff --git a/gdxapp4d-chain-sys-unicode4d/src/main/chain/plane0/noto-sans-new-tai-lue.ttf b/gdxapp4d-chain-font-unicode4d/src/main/chain/plane0/noto-sans-new-tai-lue.ttf similarity index 100% rename from gdxapp4d-chain-sys-unicode4d/src/main/chain/plane0/noto-sans-new-tai-lue.ttf rename to gdxapp4d-chain-font-unicode4d/src/main/chain/plane0/noto-sans-new-tai-lue.ttf diff --git a/gdxapp4d-chain-sys-unicode4d/src/main/chain/plane0/noto-sans-samaritan.ttf b/gdxapp4d-chain-font-unicode4d/src/main/chain/plane0/noto-sans-samaritan.ttf similarity index 100% rename from gdxapp4d-chain-sys-unicode4d/src/main/chain/plane0/noto-sans-samaritan.ttf rename to gdxapp4d-chain-font-unicode4d/src/main/chain/plane0/noto-sans-samaritan.ttf diff --git a/gdxapp4d-chain-sys-unicode4d/src/main/chain/plane0/noto-sans-sinhala.ttf b/gdxapp4d-chain-font-unicode4d/src/main/chain/plane0/noto-sans-sinhala.ttf similarity index 100% rename from gdxapp4d-chain-sys-unicode4d/src/main/chain/plane0/noto-sans-sinhala.ttf rename to gdxapp4d-chain-font-unicode4d/src/main/chain/plane0/noto-sans-sinhala.ttf diff --git a/gdxapp4d-chain-sys-unicode4d/src/main/chain/plane0/noto-sans-sundanese.ttf b/gdxapp4d-chain-font-unicode4d/src/main/chain/plane0/noto-sans-sundanese.ttf similarity index 100% rename from gdxapp4d-chain-sys-unicode4d/src/main/chain/plane0/noto-sans-sundanese.ttf rename to gdxapp4d-chain-font-unicode4d/src/main/chain/plane0/noto-sans-sundanese.ttf diff --git a/gdxapp4d-chain-sys-unicode4d/src/main/chain/plane0/noto-sans-syloti-nagri.ttf b/gdxapp4d-chain-font-unicode4d/src/main/chain/plane0/noto-sans-syloti-nagri.ttf similarity index 100% rename from gdxapp4d-chain-sys-unicode4d/src/main/chain/plane0/noto-sans-syloti-nagri.ttf rename to gdxapp4d-chain-font-unicode4d/src/main/chain/plane0/noto-sans-syloti-nagri.ttf diff --git a/gdxapp4d-chain-sys-unicode4d/src/main/chain/plane0/noto-sans-tagalog.ttf b/gdxapp4d-chain-font-unicode4d/src/main/chain/plane0/noto-sans-tagalog.ttf similarity index 100% rename from gdxapp4d-chain-sys-unicode4d/src/main/chain/plane0/noto-sans-tagalog.ttf rename to gdxapp4d-chain-font-unicode4d/src/main/chain/plane0/noto-sans-tagalog.ttf diff --git a/gdxapp4d-chain-sys-unicode4d/src/main/chain/plane0/noto-sans-tagbanwa.ttf b/gdxapp4d-chain-font-unicode4d/src/main/chain/plane0/noto-sans-tagbanwa.ttf similarity index 100% rename from gdxapp4d-chain-sys-unicode4d/src/main/chain/plane0/noto-sans-tagbanwa.ttf rename to gdxapp4d-chain-font-unicode4d/src/main/chain/plane0/noto-sans-tagbanwa.ttf diff --git a/gdxapp4d-chain-sys-unicode4d/src/main/chain/plane0/noto-sans-tai-le.ttf b/gdxapp4d-chain-font-unicode4d/src/main/chain/plane0/noto-sans-tai-le.ttf similarity index 100% rename from gdxapp4d-chain-sys-unicode4d/src/main/chain/plane0/noto-sans-tai-le.ttf rename to gdxapp4d-chain-font-unicode4d/src/main/chain/plane0/noto-sans-tai-le.ttf diff --git a/gdxapp4d-chain-sys-unicode4d/src/main/chain/plane0/noto-sans-tai-tham.ttf b/gdxapp4d-chain-font-unicode4d/src/main/chain/plane0/noto-sans-tai-tham.ttf similarity index 100% rename from gdxapp4d-chain-sys-unicode4d/src/main/chain/plane0/noto-sans-tai-tham.ttf rename to gdxapp4d-chain-font-unicode4d/src/main/chain/plane0/noto-sans-tai-tham.ttf diff --git a/gdxapp4d-chain-sys-unicode4d/src/main/chain/plane0/noto-sans-tai-viet.ttf b/gdxapp4d-chain-font-unicode4d/src/main/chain/plane0/noto-sans-tai-viet.ttf similarity index 100% rename from gdxapp4d-chain-sys-unicode4d/src/main/chain/plane0/noto-sans-tai-viet.ttf rename to gdxapp4d-chain-font-unicode4d/src/main/chain/plane0/noto-sans-tai-viet.ttf diff --git a/gdxapp4d-chain-sys-unicode4d/src/main/chain/plane0/noto-serif-tibetan.ttf b/gdxapp4d-chain-font-unicode4d/src/main/chain/plane0/noto-serif-tibetan.ttf similarity index 100% rename from gdxapp4d-chain-sys-unicode4d/src/main/chain/plane0/noto-serif-tibetan.ttf rename to gdxapp4d-chain-font-unicode4d/src/main/chain/plane0/noto-serif-tibetan.ttf diff --git a/gdxapp4d-chain-sys-unicode4d/src/main/chain/plane1/code-2001.ttf b/gdxapp4d-chain-font-unicode4d/src/main/chain/plane1/code-2001.ttf similarity index 100% rename from gdxapp4d-chain-sys-unicode4d/src/main/chain/plane1/code-2001.ttf rename to gdxapp4d-chain-font-unicode4d/src/main/chain/plane1/code-2001.ttf diff --git a/gdxapp4d-chain-sys-unicode4d/src/main/chain/plane1/new-gardiner-smp.ttf b/gdxapp4d-chain-font-unicode4d/src/main/chain/plane1/new-gardiner-smp.ttf similarity index 100% rename from gdxapp4d-chain-sys-unicode4d/src/main/chain/plane1/new-gardiner-smp.ttf rename to gdxapp4d-chain-font-unicode4d/src/main/chain/plane1/new-gardiner-smp.ttf diff --git a/gdxapp4d-chain-sys-unicode4d/src/main/chain/plane1/noto-sans-brahmi.ttf b/gdxapp4d-chain-font-unicode4d/src/main/chain/plane1/noto-sans-brahmi.ttf similarity index 100% rename from gdxapp4d-chain-sys-unicode4d/src/main/chain/plane1/noto-sans-brahmi.ttf rename to gdxapp4d-chain-font-unicode4d/src/main/chain/plane1/noto-sans-brahmi.ttf diff --git a/gdxapp4d-chain-sys-unicode4d/src/main/chain/plane2/code-2002.ttf b/gdxapp4d-chain-font-unicode4d/src/main/chain/plane2/code-2002.ttf similarity index 100% rename from gdxapp4d-chain-sys-unicode4d/src/main/chain/plane2/code-2002.ttf rename to gdxapp4d-chain-font-unicode4d/src/main/chain/plane2/code-2002.ttf diff --git a/gdxapp4d-chain-sys-unicode4d/src/main/chain/warp-sea.xml b/gdxapp4d-chain-font-unicode4d/src/main/chain/warp-sea.xml similarity index 100% rename from gdxapp4d-chain-sys-unicode4d/src/main/chain/warp-sea.xml rename to gdxapp4d-chain-font-unicode4d/src/main/chain/warp-sea.xml diff --git a/gdxapp4d-chain-sys-unicode4d/src/main/nodejs/conv-font.js b/gdxapp4d-chain-font-unicode4d/src/main/nodejs/conv-font.js similarity index 100% rename from gdxapp4d-chain-sys-unicode4d/src/main/nodejs/conv-font.js rename to gdxapp4d-chain-font-unicode4d/src/main/nodejs/conv-font.js diff --git a/gdxapp4d-chain-sys-unicode4d/src/main/nodejs/conv-font.sh b/gdxapp4d-chain-font-unicode4d/src/main/nodejs/conv-font.sh similarity index 100% rename from gdxapp4d-chain-sys-unicode4d/src/main/nodejs/conv-font.sh rename to gdxapp4d-chain-font-unicode4d/src/main/nodejs/conv-font.sh diff --git a/gdxapp4d-chain-sys-unicode4d/src/main/nodejs/package-lock.json b/gdxapp4d-chain-font-unicode4d/src/main/nodejs/package-lock.json similarity index 100% rename from gdxapp4d-chain-sys-unicode4d/src/main/nodejs/package-lock.json rename to gdxapp4d-chain-font-unicode4d/src/main/nodejs/package-lock.json diff --git a/gdxapp4d-chain-sys-unicode4d/src/main/nodejs/package.json b/gdxapp4d-chain-font-unicode4d/src/main/nodejs/package.json similarity index 100% rename from gdxapp4d-chain-sys-unicode4d/src/main/nodejs/package.json rename to gdxapp4d-chain-font-unicode4d/src/main/nodejs/package.json diff --git a/gdxapp4d-chain-music-msx/src/main/chain/warp-sea.xml b/gdxapp4d-chain-music-msx/src/main/chain/warp-sea.xml deleted file mode 100644 index 7d4134bd..00000000 --- a/gdxapp4d-chain-music-msx/src/main/chain/warp-sea.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - diff --git a/gdxapp4d-chain-music-msx/pom.xml b/gdxapp4d-chain-sys-default/pom.xml similarity index 86% rename from gdxapp4d-chain-music-msx/pom.xml rename to gdxapp4d-chain-sys-default/pom.xml index 75d80052..4f6d3ae2 100644 --- a/gdxapp4d-chain-music-msx/pom.xml +++ b/gdxapp4d-chain-sys-default/pom.xml @@ -5,6 +5,6 @@ gdxapp4d 0.0.1-SNAPSHOT - gdxapp4d-chain-music-msx + gdxapp4d-chain-sys-default pom \ No newline at end of file diff --git a/gdxapp4d-chain-music-templeos/src/main/chain/warp-sea.xml b/gdxapp4d-chain-sys-default/src/main/chain/warp-sea.xml similarity index 61% rename from gdxapp4d-chain-music-templeos/src/main/chain/warp-sea.xml rename to gdxapp4d-chain-sys-default/src/main/chain/warp-sea.xml index f932b61c..c307d67a 100644 --- a/gdxapp4d-chain-music-templeos/src/main/chain/warp-sea.xml +++ b/gdxapp4d-chain-sys-default/src/main/chain/warp-sea.xml @@ -3,8 +3,10 @@ xmlns:link="http://warp-sea.x4o.distributedrebirth.love/xml/ns/warp-sea-link" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://wrap-sea.x4o.distributedrebirth.love/xml/ns/warp-sea-root http://warp-sea.x4o.distributedrebirth.love/xml/ns/warp-sea-root-1.0.xsd"> - - - + + + + + diff --git a/gdxapp4d-chain-sys-engine-fuel/pom.xml b/gdxapp4d-chain-sys-engine-fuel/pom.xml deleted file mode 100644 index 5a618e5c..00000000 --- a/gdxapp4d-chain-sys-engine-fuel/pom.xml +++ /dev/null @@ -1,10 +0,0 @@ - - 4.0.0 - - love.distributedrebirth.gdxapp4d - gdxapp4d - 0.0.1-SNAPSHOT - - gdxapp4d-chain-sys-engine-fuel - pom - \ No newline at end of file diff --git a/gdxapp4d-chain-sys-engine-fuel/src/main/chain/warp-sea.xml b/gdxapp4d-chain-sys-engine-fuel/src/main/chain/warp-sea.xml deleted file mode 100644 index 9dcedbce..00000000 --- a/gdxapp4d-chain-sys-engine-fuel/src/main/chain/warp-sea.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/gdxapp4d-chain-sys-engine/src/main/chain/warp-sea.xml b/gdxapp4d-chain-sys-engine/src/main/chain/warp-sea.xml index bc5493b6..6f5993b3 100644 --- a/gdxapp4d-chain-sys-engine/src/main/chain/warp-sea.xml +++ b/gdxapp4d-chain-sys-engine/src/main/chain/warp-sea.xml @@ -4,13 +4,11 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://wrap-sea.x4o.distributedrebirth.love/xml/ns/warp-sea-root http://warp-sea.x4o.distributedrebirth.love/xml/ns/warp-sea-root-1.0.xsd"> - + - + - - diff --git a/gdxapp4d-chain-vrlib/pom.xml b/gdxapp4d-chain-vrlib/pom.xml new file mode 100644 index 00000000..8e5cf62d --- /dev/null +++ b/gdxapp4d-chain-vrlib/pom.xml @@ -0,0 +1,24 @@ + + 4.0.0 + + love.distributedrebirth.gdxapp4d + gdxapp4d + 0.0.1-SNAPSHOT + + gdxapp4d-chain-vrlib + pom + + + love.distributedrebirth.gdxapp4d + gdxapp4d-vrgem4 + ${project.version} + provided + + + love.distributedrebirth.gdxapp4d + gdxapp4d-vrsys5 + ${project.version} + provided + + + \ No newline at end of file diff --git a/gdxapp4d-vrgem4/src/main/chain/warp-sea.xml b/gdxapp4d-chain-vrlib/src/main/chain/warp-sea.xml similarity index 77% rename from gdxapp4d-vrgem4/src/main/chain/warp-sea.xml rename to gdxapp4d-chain-vrlib/src/main/chain/warp-sea.xml index 52e89601..41ff74b0 100644 --- a/gdxapp4d-vrgem4/src/main/chain/warp-sea.xml +++ b/gdxapp4d-chain-vrlib/src/main/chain/warp-sea.xml @@ -3,7 +3,8 @@ xmlns:link="http://warp-sea.x4o.distributedrebirth.love/xml/ns/warp-sea-link" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://wrap-sea.x4o.distributedrebirth.love/xml/ns/warp-sea-root http://warp-sea.x4o.distributedrebirth.love/xml/ns/warp-sea-root-1.0.xsd"> - + + diff --git a/gdxapp4d-vrsys5/src/main/chain/warp-sea.xml b/gdxapp4d-vrsys5/src/main/chain/warp-sea.xml deleted file mode 100644 index 3ed3d582..00000000 --- a/gdxapp4d-vrsys5/src/main/chain/warp-sea.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - diff --git a/pom.xml b/pom.xml index 0522d6a4..13f81ed8 100644 --- a/pom.xml +++ b/pom.xml @@ -12,12 +12,11 @@ gdxapp4d-app-notepad gdxapp4d-app-tosamp gdxapp4d-boot-desktop + gdxapp4d-chain-default-music gdxapp4d-chain-dep-osgi-scr - gdxapp4d-chain-music-msx - gdxapp4d-chain-music-templeos + gdxapp4d-chain-font-unicode4d + gdxapp4d-chain-sys-default gdxapp4d-chain-sys-engine - gdxapp4d-chain-sys-engine-fuel - gdxapp4d-chain-sys-unicode4d gdxapp4d-lib-basicwd gdxapp4d-lib-imxmi gdxapp4d-lib-numberxd @@ -29,6 +28,8 @@ gdxapp4d-app-calculator gdxapp4d-app-hewallet gdxapp4d-vrsys5 + gdxapp4d-chain-default-apps + gdxapp4d-chain-vrlib UTF-8