Commit Graph

189 Commits

Author SHA1 Message Date
mlus
cbcdc0e749 may fix #111
(cherry picked from commit befa36a303)
2025-09-16 14:14:39 +00:00
mlus
468b3182c3
Merge pull request #107 from EoD/make-configs-final-1.20.4
[1.20.4] make all config variables final
2025-08-01 11:54:00 +08:00
EoD
02de6b50d2 make all config variables final
the classes never change, even if the config is modified. Only the
values we read with get() inside the classes change.
2025-07-31 23:59:14 +00:00
mlus
c8a9792647
Merge pull request #106 from EoD/add-data_version-1.20.4
[1.20.4] add new data_version column to server_info table
2025-07-31 12:30:29 +08:00
EoD
b2f3aa5497 add new data_version column to server_info table 2025-07-30 23:28:34 +00:00
mlus
3d2eb77db1
Merge pull request #104 from mlus-asuka/backport-103-to-1.20.4
[Backport 1.20.4] Some SQL-related improvements
2025-07-30 12:45:18 +08:00
EoD
872168c88e extract addColumnIfNotExists into separate method
(cherry picked from commit 4fe13bd24d)
2025-07-30 04:03:06 +00:00
EoD
41732cbcd1 reformat insert into server_info for readability
Use the new format capabilities on SQL queries to make the insert more
readable.

(cherry picked from commit 7f06aa7511)
2025-07-30 04:03:06 +00:00
EoD
c434f3c6e4 allow format strings within SQL queries
This makes SQL queries more readable in some cases

(cherry picked from commit e1ac7adb11)
2025-07-30 04:03:06 +00:00
EoD
6ddd776468 clarify executeUpdate variants with and without db
(cherry picked from commit 8f77a96544)
2025-07-30 04:03:06 +00:00
mlus
9880c7e74c
Merge pull request #102 from mlus-asuka/backport-99-to-1.20.4
[Backport 1.20.4] make QueryResult AutoClosable
2025-07-29 18:40:02 +08:00
mlus
0b750ab852
Merge pull request #101 from mlus-asuka/backport-98-to-1.20.4
[Backport 1.20.4] remove duplicate UPDATE server_info
2025-07-29 18:37:28 +08:00
mlus
4eba9ad1d7
Merge pull request #100 from mlus-asuka/backport-97-to-1.20.4
[Backport 1.20.4] log the advancement's data type before altering
2025-07-29 18:36:05 +08:00
EoD
2c3512da8a make QueryResult AutoClosable
This allows QueryResults to be used within a try() block without
explicitely closing them.

(cherry picked from commit ad76e0e311)
2025-07-29 10:35:56 +00:00
EoD
3d111125a9 remove duplicate UPDATE server_info
the UPDATE is already happening in in the INSERT statement above

(cherry picked from commit 0e96107416)
2025-07-29 10:34:05 +00:00
EoD
0b4a6aa78a log the advancement's data type before altering
it seems that sometimes this is triggered on an existing database. This
should help identifying what is happening in these cases.

(cherry picked from commit 54cbb9c9a8)
2025-07-29 10:29:43 +00:00
mlus
675bf7e486
Merge pull request #95 from mlus-asuka/backport-93-to-1.20.4
[Backport 1.20.4] fix string to map generation with base64 encoding
2025-07-13 02:12:32 +08:00
EoD
9b7ebebf98 simplify and exit early in stringToGenericMap
(cherry picked from commit 53bdfe2309)
2025-07-12 05:14:33 +00:00
EoD
85f953a220 unify both stringToMap functions
(cherry picked from commit 228b835c2a)
2025-07-12 05:14:33 +00:00
EoD
db4af71215 fix string to map generation with base64 encoding
The new base64 encoding uses "=" characters as part of its encoding.
The previous code split those and trimmed them afterwards, making the
base64 not consistent with the rest of the code that assumed "=" are
still present, like "B64:e30=".

(cherry picked from commit de324a23be)
2025-07-12 05:14:33 +00:00
mlus
d657c7a819
Merge pull request #94 from mlus-asuka/backport-90-to-1.20.4
[Backport 1.20.4] unify item creation in curios and normal inventory
2025-07-11 12:48:26 +08:00
mlus
cc4e0cbbf9
Merge pull request #92 from EoD/remove-unnecessary-import-1.20.4
[1.20.4] remove unnecessary deserializeString import
2025-07-11 12:37:47 +08:00
EoD
6adb8c2622 unify item creation in curios and normal inventory
this also allows creation of placeholders within curios containers

(cherry picked from commit a70605a8b6)
2025-07-11 04:37:16 +00:00
EoD
a0f71ac6e5 remove unnecessary deserializeString import 2025-07-10 19:23:29 +00:00
mlus
3651c351cd
Merge pull request #89 from EoD/upgrade-items-between-versions-1.20.4
[1.20.4] properly upgrade items with newer MC versions
2025-07-07 00:08:07 +08:00
EoD
0e37cdc091 properly upgrade items with newer MC versions 2025-07-06 16:02:02 +00:00
mlus
ca2ef85dda
Merge pull request #86 from EoD/organize-imports-1.20.4
[1.20.4] optimize all imports
2025-06-18 12:28:50 +08:00
EoD
d69df0fa49 add vscode setting for IntelliJ-like imports 2025-06-17 23:52:11 +00:00
EoD
205d74e522 optimize all imports 2025-06-17 23:52:04 +00:00
mlus
02db84f9ce
Merge pull request #80 from mlus-asuka/1.20.4-dev
Fix error when no player in server
2025-06-06 13:14:58 +08:00
mlus
79e0e2cbe4 Fix error when no player in server 2025-06-06 13:09:32 +08:00
mlus
4bdad9f625
Merge pull request #78 from mlus-asuka/1.20.4-dev
Full tested ChatSync Feature
2025-06-05 13:18:23 +08:00
mlus
abae66a366
Merge branch '1.20.4' into 1.20.4-dev 2025-06-05 13:14:31 +08:00
mlus
0562b01138 Full tested ChatSync Feature 2025-06-05 12:43:41 +08:00
mlus
f8ea4039f6
Merge pull request #76 from mlus-asuka/backport-75-to-1.20.4
[Backport 1.20.4] bump mod version to 2.1.1
2025-05-19 13:12:50 +08:00
EoD
357579abbb bump mod version to 2.1.1
(cherry picked from commit e2b90ccf98)
2025-05-19 05:08:58 +00:00
mlus
54ec918259
Merge pull request #72 from mlus-asuka/backport-70-to-1.20.4
[Backport 1.20.4] fix XP being lost or duplicated
2025-05-19 01:38:34 +08:00
mlus
286bd107d9
Merge pull request #74 from mlus-asuka/backport-73-to-1.20.4
[Backport 1.20.4] use PAT in backport action
2025-05-19 01:38:06 +08:00
EoD
0203647818 use PAT in backport action
(cherry picked from commit e0f0b51851)
2025-05-18 17:32:38 +00:00
mlus
81b3914d3a
Merge pull request #71 from mlus-asuka/backport-67-to-1.20.4
[Backport 1.20.4] add action to automatically backport PRs
2025-05-19 01:27:31 +08:00
EoD
0bcdc86d32 fix XP being lost or duplicated
The current calculation did not work for larger amounts of levels
and either removed or added levels unintentionally.

(cherry picked from commit d83bad5a33)
2025-05-18 04:18:19 +00:00
EoD
2b835996c0 add action to automatically backport PRs
(cherry picked from commit 5ba7cc2972)
2025-05-18 04:16:59 +00:00
mlus
fe86792731
Merge pull request #69 from EoD/fix-language-files-1.20.4
[Backport 1.20.4] language file fix + remove unused override in the language files
2025-05-18 12:16:27 +08:00
EoD
26421096ac remove unused override in the language files 2025-05-17 19:21:58 +00:00
mlus
cf43f35ee9 language file fix 2025-05-17 19:21:58 +00:00
mlus
74451eecff
Merge pull request #65 from EoD/1.20.4-neoforge
Add support for 1.20.4 using NeoForge 20.4.248
2025-05-05 02:53:30 +08:00
EoD
22b628bdcb fix sophisticated backpack integration for 1.20.4 2025-05-04 18:43:11 +00:00
EoD
9eb8bdc4a0 add support for Minecraft 1.20.4 with ModDevGradle 2025-05-04 18:43:11 +00:00
EoD
bcb55c5a67 Revert "register JDBC driver to work around Forge bug"
This reverts commit ce0e173a9e.
2025-05-04 18:21:32 +00:00
mlus
606b9e1c1e
Merge pull request #62 from EoD/version-compat
encode unknown items using Paper
2025-05-05 02:03:03 +08:00