From fd9676f6f5880ab9375883053c7f28a01a917c71 Mon Sep 17 00:00:00 2001 From: ineanto Date: Sun, 22 Sep 2024 16:39:13 +0200 Subject: [PATCH] feat: reworked project structure, 1.20 to 1.21.1 mappings and more --- .idea/gradle.xml | 8 +- .idea/misc.xml | 2 +- CHANGELOG.secret.log | 6 +- api/build.gradle.kts | 11 - .../java/xyz/ineanto/nicko/api/NickoAPI.java | 4 - build.gradle.kts | 136 ++++- common/build.gradle.kts | 108 ---- .../xyz/ineanto/nicko/mapping/Mapping.java | 18 - .../ineanto/nicko/mapping/MappingManager.java | 20 - gradle/wrapper/gradle-wrapper.jar | Bin 60756 -> 43453 bytes gradle/wrapper/gradle-wrapper.properties | 5 +- gradlew | 41 +- gradlew.bat | 35 +- mappings/DISCLAIMER.md | 10 + mappings/build.gradle.kts | 7 + .../xyz/ineanto/nicko/mapping/Mapping.java | 11 + mappings/v1_20/build.gradle.kts | 2 +- .../nicko/mapping/v1_20/Mapping1_20.java | 15 +- mappings/v1_20_2/build.gradle.kts | 9 + .../nicko/mapping/v1_20_2/Mapping1_20_2.java | 54 ++ mappings/v1_20_4/build.gradle.kts | 9 + .../nicko/mapping/v1_20_4/Mapping1_20_4.java | 54 ++ mappings/v1_20_6/build.gradle.kts | 9 + .../nicko/mapping/v1_20_6/Mapping1_20_6.java | 53 ++ mappings/v1_21/build.gradle.kts | 9 + .../nicko/mapping/v1_21/Mapping1_21.java | 53 ++ settings.gradle.kts | 33 +- .../main/java/xyz/ineanto/nicko/Nicko.java | 11 +- .../xyz/ineanto/nicko/anvil/AnvilManager.java | 0 .../nicko/appearance/ActionResult.java | 0 .../nicko/appearance/AppearanceManager.java | 12 +- .../appearance/random/RandomNameFetcher.java | 0 .../ineanto/nicko/command/NickoCommand.java | 0 .../ineanto/nicko/config/Configuration.java | 0 .../nicko/config/ConfigurationManager.java | 0 .../nicko/config/DataSourceConfiguration.java | 0 .../nicko/config/DefaultDataSources.java | 0 .../config/SQLDataSourceConfiguration.java | 0 .../nicko/event/PlayerJoinListener.java | 0 .../nicko/event/PlayerQuitListener.java | 0 .../event/custom/PlayerDisguiseEvent.java | 0 .../java/xyz/ineanto/nicko/gui/AdminGUI.java | 0 .../ineanto/nicko/gui/CacheManagementGUI.java | 0 .../java/xyz/ineanto/nicko/gui/ChoiceGUI.java | 0 .../java/xyz/ineanto/nicko/gui/HomeGUI.java | 2 +- .../ineanto/nicko/gui/InvalidateSkinGUI.java | 0 .../xyz/ineanto/nicko/gui/PlayerCheckGUI.java | 0 .../ineanto/nicko/gui/PlayerCheckGUIData.java | 0 .../xyz/ineanto/nicko/gui/SettingsGUI.java | 0 .../ineanto/nicko/gui/items/ItemDefaults.java | 0 .../gui/items/admin/ManageCacheItem.java | 0 .../gui/items/admin/ManagePlayerItem.java | 0 .../gui/items/admin/cache/CacheEntryItem.java | 0 .../admin/cache/CacheStatisticsItem.java | 0 .../admin/cache/InvalidateCacheItem.java | 0 .../items/admin/cache/InvalidateSkinItem.java | 0 .../admin/check/PlayerInformationItem.java | 0 .../gui/items/appearance/ChangeBothItem.java | 0 .../gui/items/appearance/ChangeNameItem.java | 0 .../gui/items/appearance/ChangeSkinItem.java | 0 .../nicko/gui/items/common/GoBackItem.java | 0 .../gui/items/common/ScrollDownItem.java | 0 .../nicko/gui/items/common/ScrollUpItem.java | 0 .../gui/items/common/choice/CancelItem.java | 0 .../items/common/choice/ChoiceCallback.java | 0 .../gui/items/common/choice/ConfirmItem.java | 0 .../nicko/gui/items/home/AdminAccessItem.java | 0 .../nicko/gui/items/home/ExitItem.java | 0 .../nicko/gui/items/home/RandomSkinItem.java | 0 .../nicko/gui/items/home/ResetItem.java | 0 .../gui/items/home/SettingsAccessItem.java | 0 .../items/settings/LanguageCyclingItem.java | 0 .../items/settings/RandomSkinCyclingItem.java | 0 .../nicko/language/CustomLanguage.java | 0 .../xyz/ineanto/nicko/language/Language.java | 0 .../ineanto/nicko/language/LanguageKey.java | 0 .../nicko/language/PlayerLanguage.java | 0 .../ineanto/nicko/language/Translation.java | 0 .../ineanto/nicko/mapping/MappingManager.java | 27 + .../migration/ConfigurationMigrator.java | 0 .../nicko/migration/CustomLocaleMigrator.java | 0 .../xyz/ineanto/nicko/migration/Migrator.java | 0 .../xyz/ineanto/nicko/mojang/MojangAPI.java | 0 .../xyz/ineanto/nicko/mojang/MojangSkin.java | 0 .../xyz/ineanto/nicko/mojang/MojangUtils.java | 0 .../nicko/placeholder/NickoExpansion.java | 2 +- .../ineanto/nicko/profile/NickoProfile.java | 0 .../java/xyz/ineanto/nicko/storage/Cache.java | 0 .../ineanto/nicko/storage/CacheProvider.java | 0 .../nicko/storage/PlayerDataStore.java | 0 .../xyz/ineanto/nicko/storage/Storage.java | 0 .../nicko/storage/StorageProvider.java | 0 .../nicko/storage/json/JSONStorage.java | 0 .../storage/json/JSONStorageProvider.java | 0 .../ineanto/nicko/storage/map/MapCache.java | 0 .../nicko/storage/map/MapCacheProvider.java | 0 .../nicko/storage/mariadb/MariaDBStorage.java | 0 .../mariadb/MariaDBStorageProvider.java | 2 +- .../nicko/storage/mysql/MySQLStorage.java | 0 .../storage/mysql/MySQLStorageProvider.java | 2 +- .../nicko/storage/name/PlayerNameStore.java | 0 .../nicko/storage/redis/RedisCache.java | 0 .../storage/redis/RedisCacheProvider.java | 0 .../xyz/ineanto/nicko/version/Version.java | 0 .../ineanto/nicko/wrapper/AbstractPacket.java | 0 .../WrapperPlayServerEntityDestroy.java | 0 .../wrapper/WrapperPlayServerRespawn.java | 0 .../wrapper/WrapperPlayServerSpawnEntity.java | 0 .../WrapperPlayerServerPlayerInfo.java | 0 .../WrapperPlayerServerPlayerInfoRemove.java | 0 src/main/resources/config.yml | 50 ++ src/main/resources/en.yml | 153 ++++++ src/main/resources/fr.yml | 155 ++++++ src/main/resources/names.txt | 490 ++++++++++++++++++ src/main/resources/plugin.yml | 19 + 115 files changed, 1399 insertions(+), 248 deletions(-) delete mode 100644 api/build.gradle.kts delete mode 100644 api/src/main/java/xyz/ineanto/nicko/api/NickoAPI.java delete mode 100644 common/build.gradle.kts delete mode 100644 common/src/main/java/xyz/ineanto/nicko/mapping/Mapping.java delete mode 100644 common/src/main/java/xyz/ineanto/nicko/mapping/MappingManager.java create mode 100644 mappings/DISCLAIMER.md create mode 100644 mappings/build.gradle.kts create mode 100644 mappings/src/main/java/xyz/ineanto/nicko/mapping/Mapping.java create mode 100644 mappings/v1_20_2/build.gradle.kts create mode 100644 mappings/v1_20_2/src/main/java/xyz/ineanto/nicko/mapping/v1_20_2/Mapping1_20_2.java create mode 100644 mappings/v1_20_4/build.gradle.kts create mode 100644 mappings/v1_20_4/src/main/java/xyz/ineanto/nicko/mapping/v1_20_4/Mapping1_20_4.java create mode 100644 mappings/v1_20_6/build.gradle.kts create mode 100644 mappings/v1_20_6/src/main/java/xyz/ineanto/nicko/mapping/v1_20_6/Mapping1_20_6.java create mode 100644 mappings/v1_21/build.gradle.kts create mode 100644 mappings/v1_21/src/main/java/xyz/ineanto/nicko/mapping/v1_21/Mapping1_21.java rename {common/src => src}/main/java/xyz/ineanto/nicko/Nicko.java (94%) rename {common/src => src}/main/java/xyz/ineanto/nicko/anvil/AnvilManager.java (100%) rename {common/src => src}/main/java/xyz/ineanto/nicko/appearance/ActionResult.java (100%) rename {common/src => src}/main/java/xyz/ineanto/nicko/appearance/AppearanceManager.java (95%) rename {common/src => src}/main/java/xyz/ineanto/nicko/appearance/random/RandomNameFetcher.java (100%) rename {common/src => src}/main/java/xyz/ineanto/nicko/command/NickoCommand.java (100%) rename {common/src => src}/main/java/xyz/ineanto/nicko/config/Configuration.java (100%) rename {common/src => src}/main/java/xyz/ineanto/nicko/config/ConfigurationManager.java (100%) rename {common/src => src}/main/java/xyz/ineanto/nicko/config/DataSourceConfiguration.java (100%) rename {common/src => src}/main/java/xyz/ineanto/nicko/config/DefaultDataSources.java (100%) rename {common/src => src}/main/java/xyz/ineanto/nicko/config/SQLDataSourceConfiguration.java (100%) rename {common/src => src}/main/java/xyz/ineanto/nicko/event/PlayerJoinListener.java (100%) rename {common/src => src}/main/java/xyz/ineanto/nicko/event/PlayerQuitListener.java (100%) rename {common/src => src}/main/java/xyz/ineanto/nicko/event/custom/PlayerDisguiseEvent.java (100%) rename {common/src => src}/main/java/xyz/ineanto/nicko/gui/AdminGUI.java (100%) rename {common/src => src}/main/java/xyz/ineanto/nicko/gui/CacheManagementGUI.java (100%) rename {common/src => src}/main/java/xyz/ineanto/nicko/gui/ChoiceGUI.java (100%) rename {common/src => src}/main/java/xyz/ineanto/nicko/gui/HomeGUI.java (100%) rename {common/src => src}/main/java/xyz/ineanto/nicko/gui/InvalidateSkinGUI.java (100%) rename {common/src => src}/main/java/xyz/ineanto/nicko/gui/PlayerCheckGUI.java (100%) rename {common/src => src}/main/java/xyz/ineanto/nicko/gui/PlayerCheckGUIData.java (100%) rename {common/src => src}/main/java/xyz/ineanto/nicko/gui/SettingsGUI.java (100%) rename {common/src => src}/main/java/xyz/ineanto/nicko/gui/items/ItemDefaults.java (100%) rename {common/src => src}/main/java/xyz/ineanto/nicko/gui/items/admin/ManageCacheItem.java (100%) rename {common/src => src}/main/java/xyz/ineanto/nicko/gui/items/admin/ManagePlayerItem.java (100%) rename {common/src => src}/main/java/xyz/ineanto/nicko/gui/items/admin/cache/CacheEntryItem.java (100%) rename {common/src => src}/main/java/xyz/ineanto/nicko/gui/items/admin/cache/CacheStatisticsItem.java (100%) rename {common/src => src}/main/java/xyz/ineanto/nicko/gui/items/admin/cache/InvalidateCacheItem.java (100%) rename {common/src => src}/main/java/xyz/ineanto/nicko/gui/items/admin/cache/InvalidateSkinItem.java (100%) rename {common/src => src}/main/java/xyz/ineanto/nicko/gui/items/admin/check/PlayerInformationItem.java (100%) rename {common/src => src}/main/java/xyz/ineanto/nicko/gui/items/appearance/ChangeBothItem.java (100%) rename {common/src => src}/main/java/xyz/ineanto/nicko/gui/items/appearance/ChangeNameItem.java (100%) rename {common/src => src}/main/java/xyz/ineanto/nicko/gui/items/appearance/ChangeSkinItem.java (100%) rename {common/src => src}/main/java/xyz/ineanto/nicko/gui/items/common/GoBackItem.java (100%) rename {common/src => src}/main/java/xyz/ineanto/nicko/gui/items/common/ScrollDownItem.java (100%) rename {common/src => src}/main/java/xyz/ineanto/nicko/gui/items/common/ScrollUpItem.java (100%) rename {common/src => src}/main/java/xyz/ineanto/nicko/gui/items/common/choice/CancelItem.java (100%) rename {common/src => src}/main/java/xyz/ineanto/nicko/gui/items/common/choice/ChoiceCallback.java (100%) rename {common/src => src}/main/java/xyz/ineanto/nicko/gui/items/common/choice/ConfirmItem.java (100%) rename {common/src => src}/main/java/xyz/ineanto/nicko/gui/items/home/AdminAccessItem.java (100%) rename {common/src => src}/main/java/xyz/ineanto/nicko/gui/items/home/ExitItem.java (100%) rename {common/src => src}/main/java/xyz/ineanto/nicko/gui/items/home/RandomSkinItem.java (100%) rename {common/src => src}/main/java/xyz/ineanto/nicko/gui/items/home/ResetItem.java (100%) rename {common/src => src}/main/java/xyz/ineanto/nicko/gui/items/home/SettingsAccessItem.java (100%) rename {common/src => src}/main/java/xyz/ineanto/nicko/gui/items/settings/LanguageCyclingItem.java (100%) rename {common/src => src}/main/java/xyz/ineanto/nicko/gui/items/settings/RandomSkinCyclingItem.java (100%) rename {common/src => src}/main/java/xyz/ineanto/nicko/language/CustomLanguage.java (100%) rename {common/src => src}/main/java/xyz/ineanto/nicko/language/Language.java (100%) rename {common/src => src}/main/java/xyz/ineanto/nicko/language/LanguageKey.java (100%) rename {common/src => src}/main/java/xyz/ineanto/nicko/language/PlayerLanguage.java (100%) rename {common/src => src}/main/java/xyz/ineanto/nicko/language/Translation.java (100%) create mode 100644 src/main/java/xyz/ineanto/nicko/mapping/MappingManager.java rename {common/src => src}/main/java/xyz/ineanto/nicko/migration/ConfigurationMigrator.java (100%) rename {common/src => src}/main/java/xyz/ineanto/nicko/migration/CustomLocaleMigrator.java (100%) rename {common/src => src}/main/java/xyz/ineanto/nicko/migration/Migrator.java (100%) rename {common/src => src}/main/java/xyz/ineanto/nicko/mojang/MojangAPI.java (100%) rename {common/src => src}/main/java/xyz/ineanto/nicko/mojang/MojangSkin.java (100%) rename {common/src => src}/main/java/xyz/ineanto/nicko/mojang/MojangUtils.java (100%) rename {common/src => src}/main/java/xyz/ineanto/nicko/placeholder/NickoExpansion.java (98%) rename {common/src => src}/main/java/xyz/ineanto/nicko/profile/NickoProfile.java (100%) rename {common/src => src}/main/java/xyz/ineanto/nicko/storage/Cache.java (100%) rename {common/src => src}/main/java/xyz/ineanto/nicko/storage/CacheProvider.java (100%) rename {common/src => src}/main/java/xyz/ineanto/nicko/storage/PlayerDataStore.java (100%) rename {common/src => src}/main/java/xyz/ineanto/nicko/storage/Storage.java (100%) rename {common/src => src}/main/java/xyz/ineanto/nicko/storage/StorageProvider.java (100%) rename {common/src => src}/main/java/xyz/ineanto/nicko/storage/json/JSONStorage.java (100%) rename {common/src => src}/main/java/xyz/ineanto/nicko/storage/json/JSONStorageProvider.java (100%) rename {common/src => src}/main/java/xyz/ineanto/nicko/storage/map/MapCache.java (100%) rename {common/src => src}/main/java/xyz/ineanto/nicko/storage/map/MapCacheProvider.java (100%) rename {common/src => src}/main/java/xyz/ineanto/nicko/storage/mariadb/MariaDBStorage.java (100%) rename {common/src => src}/main/java/xyz/ineanto/nicko/storage/mariadb/MariaDBStorageProvider.java (98%) rename {common/src => src}/main/java/xyz/ineanto/nicko/storage/mysql/MySQLStorage.java (100%) rename {common/src => src}/main/java/xyz/ineanto/nicko/storage/mysql/MySQLStorageProvider.java (98%) rename {common/src => src}/main/java/xyz/ineanto/nicko/storage/name/PlayerNameStore.java (100%) rename {common/src => src}/main/java/xyz/ineanto/nicko/storage/redis/RedisCache.java (100%) rename {common/src => src}/main/java/xyz/ineanto/nicko/storage/redis/RedisCacheProvider.java (100%) rename {common/src => src}/main/java/xyz/ineanto/nicko/version/Version.java (100%) rename {common/src => src}/main/java/xyz/ineanto/nicko/wrapper/AbstractPacket.java (100%) rename {common/src => src}/main/java/xyz/ineanto/nicko/wrapper/WrapperPlayServerEntityDestroy.java (100%) rename {common/src => src}/main/java/xyz/ineanto/nicko/wrapper/WrapperPlayServerRespawn.java (100%) rename {common/src => src}/main/java/xyz/ineanto/nicko/wrapper/WrapperPlayServerSpawnEntity.java (100%) rename {common/src => src}/main/java/xyz/ineanto/nicko/wrapper/WrapperPlayerServerPlayerInfo.java (100%) rename {common/src => src}/main/java/xyz/ineanto/nicko/wrapper/WrapperPlayerServerPlayerInfoRemove.java (100%) create mode 100644 src/main/resources/config.yml create mode 100644 src/main/resources/en.yml create mode 100644 src/main/resources/fr.yml create mode 100644 src/main/resources/names.txt create mode 100644 src/main/resources/plugin.yml diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 436a660..2d2d684 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -5,14 +5,16 @@