From a47ed71799a2a0677a077b02c9020de03e94da44 Mon Sep 17 00:00:00 2001 From: Azalea Date: Fri, 16 Feb 2024 20:49:44 -0800 Subject: [PATCH 1/4] [F] Fix typos in readme --- README.md | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/README.md b/README.md index 097c7e74..329f94aa 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # AquaDX -Multipurpose game server powered by Spring Boot, for ALL.Net based games +Multipurpose game server powered by Spring Boot, for ALL.Net-based games This is an attempt to rebuild the [original Aqua server](https://dev.s-ul.net/NeumPhis/aqua) @@ -26,9 +26,9 @@ Check out these docs for more information. * [Frequently asked questions](docs/frequently_asked_questions.md) ### Notes -* Some game may require additional patches and these will not provided in this project and repository. You already found this, so you know where to find related resources too. -* This repository may contain untested, experimental implementation for few games which I can't test properly. If you couldn't find your wanted game in the above list, do not expect support. -* This server also provides a simple API for viewing play records and edit settings for some games. +* Some games may require additional patches and these will not provided in this project and repository. You already found this, so you know where to find related resources too. +* This repository may contain untested, experimental implementations for a few games which I can't test properly. If you couldn't find your wanted game in the above list, do not expect support. +* This server also provides a simple API for viewing play records and editing settings for some games. ### Usage @@ -37,28 +37,28 @@ Check out these docs for more information. 3. Extract the zip file to a folder. 4. Run `java -jar aqua.jar` in the folder. -By default, Aqua will use sqlite and save user data in data/db.sqlite. +By default, Aqua will use SQLite and save user data in `data/db.sqlite`. -If you want to use optional databases, edit configuration file then it will auto create the table and import some initial data. +If you want to use optional databases, please edit the configuration file then it will auto-create the table and import some initial data. ### Configuration Configuration is saved in `config/application.properties`, spring loads this file automatically. -* The host and port of game title servers can be overritten in `allnet.server.host` and `allnet.server.port`. By default it will send the same host and port the client used the request this information. -This will be sent to the game at booting and being used by following request. -* You can switch to MariaDB (or MySQL) database by commenting the Sqlite part. -* For some game, you might need to change some game specific config entries. +* The host and port of game title servers can be overwritten in `allnet.server.host` and `allnet.server.port`. By default it will send the same host and port the client used the request this information. +This will be sent to the game at booting and being used by the following request. +* You can switch to the MariaDB (or MySQL) database by commenting the Sqlite part. +* For some games, you might need to change some game-specific config entries. ### Building -You need to install JDK on your system. However, you don't need to care about Gradle, as wrapper script is included. +You need to install JDK on your system. However, you don't need to install Gradle separately, as the `gradlew` wrapper script is included. ``` gradlew clean build ``` -The `build/libs` folder will contain an jar file. +The `build/libs` folder will contain a jar file. ### Credit * **samnyan**: The creator and developer of the original Aqua server -* **Akasaka Ryuunosuke** : providing all the DIVA protocol information -* Dom Eori : Developer of forked Aqua server, from v0.0.17 and up +* **Akasaka Ryuunosuke**: providing all the DIVA protocol information +* Dom Eori: Developer of forked Aqua server, from v0.0.17 and up * All devs who contribute to the [MiniMe server](https://dev.s-ul.net/djhackers/minime) -* All contributors by merge request, issues and other channels +* All contributors by merge requests, issues and other channels From ccc2bcffce74846ce630203539db98c5b648f1ca Mon Sep 17 00:00:00 2001 From: zaphkito Date: Mon, 19 Feb 2024 04:12:53 +0800 Subject: [PATCH 2/4] Maimai 140 h031 event data --- .../mariadb/V252__add_maimai_140_h031_events.sql | 14 ++++++++++++++ .../mysql/V252__add_maimai_140_h031_events.sql | 14 ++++++++++++++ .../sqlite/V252__add_maimai_140_h031_events.sql | 14 ++++++++++++++ 3 files changed, 42 insertions(+) create mode 100644 src/main/resources/db/migration/mariadb/V252__add_maimai_140_h031_events.sql create mode 100644 src/main/resources/db/migration/mysql/V252__add_maimai_140_h031_events.sql create mode 100644 src/main/resources/db/migration/sqlite/V252__add_maimai_140_h031_events.sql diff --git a/src/main/resources/db/migration/mariadb/V252__add_maimai_140_h031_events.sql b/src/main/resources/db/migration/mariadb/V252__add_maimai_140_h031_events.sql new file mode 100644 index 00000000..18c01f8c --- /dev/null +++ b/src/main/resources/db/migration/mariadb/V252__add_maimai_140_h031_events.sql @@ -0,0 +1,14 @@ +INSERT INTO `maimai2_game_event` (`id`, `end_date`, `start_date`, `type`, `enable`) VALUES +(23120811, '2029-01-01 00:00:00.000000', '2019-01-01 00:00:00.000000', 0, '1'), +(23120821, '2029-01-01 00:00:00.000000', '2019-01-01 00:00:00.000000', 0, '1'), +(23120822, '2029-01-01 00:00:00.000000', '2019-01-01 00:00:00.000000', 0, '1'), +(23120823, '2029-01-01 00:00:00.000000', '2019-01-01 00:00:00.000000', 0, '1'), +(23120824, '2029-01-01 00:00:00.000000', '2019-01-01 00:00:00.000000', 0, '1'), +(23120825, '2029-01-01 00:00:00.000000', '2019-01-01 00:00:00.000000', 0, '1'), +(23120841, '2029-01-01 00:00:00.000000', '2019-01-01 00:00:00.000000', 0, '1'), +(23120842, '2029-01-01 00:00:00.000000', '2019-01-01 00:00:00.000000', 0, '1'), +(23120843, '2029-01-01 00:00:00.000000', '2019-01-01 00:00:00.000000', 0, '1'), +(23120844, '2029-01-01 00:00:00.000000', '2019-01-01 00:00:00.000000', 0, '1'), +(23120851, '2029-01-01 00:00:00.000000', '2019-01-01 00:00:00.000000', 0, '1'), +(23120852, '2029-01-01 00:00:00.000000', '2019-01-01 00:00:00.000000', 0, '1'), +(23122271, '2029-01-01 00:00:00.000000', '2019-01-01 00:00:00.000000', 0, '1'); \ No newline at end of file diff --git a/src/main/resources/db/migration/mysql/V252__add_maimai_140_h031_events.sql b/src/main/resources/db/migration/mysql/V252__add_maimai_140_h031_events.sql new file mode 100644 index 00000000..18c01f8c --- /dev/null +++ b/src/main/resources/db/migration/mysql/V252__add_maimai_140_h031_events.sql @@ -0,0 +1,14 @@ +INSERT INTO `maimai2_game_event` (`id`, `end_date`, `start_date`, `type`, `enable`) VALUES +(23120811, '2029-01-01 00:00:00.000000', '2019-01-01 00:00:00.000000', 0, '1'), +(23120821, '2029-01-01 00:00:00.000000', '2019-01-01 00:00:00.000000', 0, '1'), +(23120822, '2029-01-01 00:00:00.000000', '2019-01-01 00:00:00.000000', 0, '1'), +(23120823, '2029-01-01 00:00:00.000000', '2019-01-01 00:00:00.000000', 0, '1'), +(23120824, '2029-01-01 00:00:00.000000', '2019-01-01 00:00:00.000000', 0, '1'), +(23120825, '2029-01-01 00:00:00.000000', '2019-01-01 00:00:00.000000', 0, '1'), +(23120841, '2029-01-01 00:00:00.000000', '2019-01-01 00:00:00.000000', 0, '1'), +(23120842, '2029-01-01 00:00:00.000000', '2019-01-01 00:00:00.000000', 0, '1'), +(23120843, '2029-01-01 00:00:00.000000', '2019-01-01 00:00:00.000000', 0, '1'), +(23120844, '2029-01-01 00:00:00.000000', '2019-01-01 00:00:00.000000', 0, '1'), +(23120851, '2029-01-01 00:00:00.000000', '2019-01-01 00:00:00.000000', 0, '1'), +(23120852, '2029-01-01 00:00:00.000000', '2019-01-01 00:00:00.000000', 0, '1'), +(23122271, '2029-01-01 00:00:00.000000', '2019-01-01 00:00:00.000000', 0, '1'); \ No newline at end of file diff --git a/src/main/resources/db/migration/sqlite/V252__add_maimai_140_h031_events.sql b/src/main/resources/db/migration/sqlite/V252__add_maimai_140_h031_events.sql new file mode 100644 index 00000000..18c01f8c --- /dev/null +++ b/src/main/resources/db/migration/sqlite/V252__add_maimai_140_h031_events.sql @@ -0,0 +1,14 @@ +INSERT INTO `maimai2_game_event` (`id`, `end_date`, `start_date`, `type`, `enable`) VALUES +(23120811, '2029-01-01 00:00:00.000000', '2019-01-01 00:00:00.000000', 0, '1'), +(23120821, '2029-01-01 00:00:00.000000', '2019-01-01 00:00:00.000000', 0, '1'), +(23120822, '2029-01-01 00:00:00.000000', '2019-01-01 00:00:00.000000', 0, '1'), +(23120823, '2029-01-01 00:00:00.000000', '2019-01-01 00:00:00.000000', 0, '1'), +(23120824, '2029-01-01 00:00:00.000000', '2019-01-01 00:00:00.000000', 0, '1'), +(23120825, '2029-01-01 00:00:00.000000', '2019-01-01 00:00:00.000000', 0, '1'), +(23120841, '2029-01-01 00:00:00.000000', '2019-01-01 00:00:00.000000', 0, '1'), +(23120842, '2029-01-01 00:00:00.000000', '2019-01-01 00:00:00.000000', 0, '1'), +(23120843, '2029-01-01 00:00:00.000000', '2019-01-01 00:00:00.000000', 0, '1'), +(23120844, '2029-01-01 00:00:00.000000', '2019-01-01 00:00:00.000000', 0, '1'), +(23120851, '2029-01-01 00:00:00.000000', '2019-01-01 00:00:00.000000', 0, '1'), +(23120852, '2029-01-01 00:00:00.000000', '2019-01-01 00:00:00.000000', 0, '1'), +(23122271, '2029-01-01 00:00:00.000000', '2019-01-01 00:00:00.000000', 0, '1'); \ No newline at end of file From 295ae146585ed1e42daf00c3928067a989e7a221 Mon Sep 17 00:00:00 2001 From: zaphkito Date: Mon, 19 Feb 2024 04:40:48 +0800 Subject: [PATCH 3/4] Add maimai2 charge --- .../db/migration/mariadb/V253__add_maimai2_charge.sql | 5 +++++ .../db/migration/mysql/V253__add_maimai2_charge.sql | 5 +++++ .../db/migration/sqlite/V253__add_maimai2_charge.sql | 5 +++++ 3 files changed, 15 insertions(+) create mode 100644 src/main/resources/db/migration/mariadb/V253__add_maimai2_charge.sql create mode 100644 src/main/resources/db/migration/mysql/V253__add_maimai2_charge.sql create mode 100644 src/main/resources/db/migration/sqlite/V253__add_maimai2_charge.sql diff --git a/src/main/resources/db/migration/mariadb/V253__add_maimai2_charge.sql b/src/main/resources/db/migration/mariadb/V253__add_maimai2_charge.sql new file mode 100644 index 00000000..b4ad9b00 --- /dev/null +++ b/src/main/resources/db/migration/mariadb/V253__add_maimai2_charge.sql @@ -0,0 +1,5 @@ +INSERT INTO maimai2_game_charge (id, order_id, charge_id, price, start_date, end_date) VALUES (1, 1, 2, 1, '2019-01-01 00:00:00.000000', '2099-01-01 00:00:00.000000'); +INSERT INTO maimai2_game_charge (id, order_id, charge_id, price, start_date, end_date) VALUES (2, 2, 3, 2, '2019-01-01 00:00:00.000000', '2099-01-01 00:00:00.000000'); +INSERT INTO maimai2_game_charge (id, order_id, charge_id, price, start_date, end_date) VALUES (3, 3, 4, 3, '2019-01-01 00:00:00.000000', '2099-01-01 00:00:00.000000'); +INSERT INTO maimai2_game_charge (id, order_id, charge_id, price, start_date, end_date) VALUES (4, 4, 5, 4, '2019-01-01 00:00:00.000000', '2099-01-01 00:00:00.000000'); +INSERT INTO maimai2_game_charge (id, order_id, charge_id, price, start_date, end_date) VALUES (5, 5, 6, 5, '2019-01-01 00:00:00.000000', '2099-01-01 00:00:00.000000'); \ No newline at end of file diff --git a/src/main/resources/db/migration/mysql/V253__add_maimai2_charge.sql b/src/main/resources/db/migration/mysql/V253__add_maimai2_charge.sql new file mode 100644 index 00000000..b4ad9b00 --- /dev/null +++ b/src/main/resources/db/migration/mysql/V253__add_maimai2_charge.sql @@ -0,0 +1,5 @@ +INSERT INTO maimai2_game_charge (id, order_id, charge_id, price, start_date, end_date) VALUES (1, 1, 2, 1, '2019-01-01 00:00:00.000000', '2099-01-01 00:00:00.000000'); +INSERT INTO maimai2_game_charge (id, order_id, charge_id, price, start_date, end_date) VALUES (2, 2, 3, 2, '2019-01-01 00:00:00.000000', '2099-01-01 00:00:00.000000'); +INSERT INTO maimai2_game_charge (id, order_id, charge_id, price, start_date, end_date) VALUES (3, 3, 4, 3, '2019-01-01 00:00:00.000000', '2099-01-01 00:00:00.000000'); +INSERT INTO maimai2_game_charge (id, order_id, charge_id, price, start_date, end_date) VALUES (4, 4, 5, 4, '2019-01-01 00:00:00.000000', '2099-01-01 00:00:00.000000'); +INSERT INTO maimai2_game_charge (id, order_id, charge_id, price, start_date, end_date) VALUES (5, 5, 6, 5, '2019-01-01 00:00:00.000000', '2099-01-01 00:00:00.000000'); \ No newline at end of file diff --git a/src/main/resources/db/migration/sqlite/V253__add_maimai2_charge.sql b/src/main/resources/db/migration/sqlite/V253__add_maimai2_charge.sql new file mode 100644 index 00000000..b4ad9b00 --- /dev/null +++ b/src/main/resources/db/migration/sqlite/V253__add_maimai2_charge.sql @@ -0,0 +1,5 @@ +INSERT INTO maimai2_game_charge (id, order_id, charge_id, price, start_date, end_date) VALUES (1, 1, 2, 1, '2019-01-01 00:00:00.000000', '2099-01-01 00:00:00.000000'); +INSERT INTO maimai2_game_charge (id, order_id, charge_id, price, start_date, end_date) VALUES (2, 2, 3, 2, '2019-01-01 00:00:00.000000', '2099-01-01 00:00:00.000000'); +INSERT INTO maimai2_game_charge (id, order_id, charge_id, price, start_date, end_date) VALUES (3, 3, 4, 3, '2019-01-01 00:00:00.000000', '2099-01-01 00:00:00.000000'); +INSERT INTO maimai2_game_charge (id, order_id, charge_id, price, start_date, end_date) VALUES (4, 4, 5, 4, '2019-01-01 00:00:00.000000', '2099-01-01 00:00:00.000000'); +INSERT INTO maimai2_game_charge (id, order_id, charge_id, price, start_date, end_date) VALUES (5, 5, 6, 5, '2019-01-01 00:00:00.000000', '2099-01-01 00:00:00.000000'); \ No newline at end of file From 52e9285551ccd70f9778fe9575959d80b53768fb Mon Sep 17 00:00:00 2001 From: zaphkito Date: Wed, 21 Feb 2024 18:39:39 +0800 Subject: [PATCH 4/4] Add maimai 140 h041 event data --- .../db/migration/mariadb/V254__add_maimai_140_h041_events.sql | 4 ++++ .../db/migration/mysql/V254__add_maimai_140_h041_events.sql | 4 ++++ .../db/migration/sqlite/V254__add_maimai_140_h041_events.sql | 4 ++++ 3 files changed, 12 insertions(+) create mode 100644 src/main/resources/db/migration/mariadb/V254__add_maimai_140_h041_events.sql create mode 100644 src/main/resources/db/migration/mysql/V254__add_maimai_140_h041_events.sql create mode 100644 src/main/resources/db/migration/sqlite/V254__add_maimai_140_h041_events.sql diff --git a/src/main/resources/db/migration/mariadb/V254__add_maimai_140_h041_events.sql b/src/main/resources/db/migration/mariadb/V254__add_maimai_140_h041_events.sql new file mode 100644 index 00000000..1591cd8c --- /dev/null +++ b/src/main/resources/db/migration/mariadb/V254__add_maimai_140_h041_events.sql @@ -0,0 +1,4 @@ +INSERT INTO `maimai2_game_event` (`id`, `end_date`, `start_date`, `type`, `enable`) VALUES +(24011111, '2029-01-01 00:00:00.000000', '2019-01-01 00:00:00.000000', 0, '1'), +(24011121, '2029-01-01 00:00:00.000000', '2019-01-01 00:00:00.000000', 0, '1'), +(24011141, '2029-01-01 00:00:00.000000', '2019-01-01 00:00:00.000000', 0, '1'); \ No newline at end of file diff --git a/src/main/resources/db/migration/mysql/V254__add_maimai_140_h041_events.sql b/src/main/resources/db/migration/mysql/V254__add_maimai_140_h041_events.sql new file mode 100644 index 00000000..1591cd8c --- /dev/null +++ b/src/main/resources/db/migration/mysql/V254__add_maimai_140_h041_events.sql @@ -0,0 +1,4 @@ +INSERT INTO `maimai2_game_event` (`id`, `end_date`, `start_date`, `type`, `enable`) VALUES +(24011111, '2029-01-01 00:00:00.000000', '2019-01-01 00:00:00.000000', 0, '1'), +(24011121, '2029-01-01 00:00:00.000000', '2019-01-01 00:00:00.000000', 0, '1'), +(24011141, '2029-01-01 00:00:00.000000', '2019-01-01 00:00:00.000000', 0, '1'); \ No newline at end of file diff --git a/src/main/resources/db/migration/sqlite/V254__add_maimai_140_h041_events.sql b/src/main/resources/db/migration/sqlite/V254__add_maimai_140_h041_events.sql new file mode 100644 index 00000000..1591cd8c --- /dev/null +++ b/src/main/resources/db/migration/sqlite/V254__add_maimai_140_h041_events.sql @@ -0,0 +1,4 @@ +INSERT INTO `maimai2_game_event` (`id`, `end_date`, `start_date`, `type`, `enable`) VALUES +(24011111, '2029-01-01 00:00:00.000000', '2019-01-01 00:00:00.000000', 0, '1'), +(24011121, '2029-01-01 00:00:00.000000', '2019-01-01 00:00:00.000000', 0, '1'), +(24011141, '2029-01-01 00:00:00.000000', '2019-01-01 00:00:00.000000', 0, '1'); \ No newline at end of file