diff --git a/.gitignore b/.gitignore index b1946b65..68b6a914 100644 --- a/.gitignore +++ b/.gitignore @@ -106,7 +106,7 @@ build/ # Ignore Gradle GUI config gradle-app.setting -# me.william278.crossserversync.bungeecord.data.DataManager.PlayerDataCache of project +# net.william278.crossserversync.bungeecord.data.DataManager.PlayerDataCache of project .gradletasknamecache **/build/ diff --git a/api/build.gradle b/api/build.gradle index f78c2524..3320a187 100644 --- a/api/build.gradle +++ b/api/build.gradle @@ -5,10 +5,10 @@ plugins { } dependencies { - compileOnly project(path: ':common', configuration: 'shadow') + implementation project(path: ':common') compileOnly 'org.spigotmc:spigot-api:1.16.5-R0.1-SNAPSHOT' - compileOnly 'org.jetbrains:annotations:22.0.0' + compileOnly 'org.jetbrains:annotations:23.0.0' } repositories { diff --git a/api/src/main/java/me/william278/husksync/bukkit/api/HuskSyncAPI.java b/api/src/main/java/net/william278/husksync/bukkit/api/HuskSyncAPI.java similarity index 84% rename from api/src/main/java/me/william278/husksync/bukkit/api/HuskSyncAPI.java rename to api/src/main/java/net/william278/husksync/bukkit/api/HuskSyncAPI.java index 7459b631..375f4ded 100644 --- a/api/src/main/java/me/william278/husksync/bukkit/api/HuskSyncAPI.java +++ b/api/src/main/java/net/william278/husksync/bukkit/api/HuskSyncAPI.java @@ -1,8 +1,9 @@ -package me.william278.husksync.bukkit.api; +package net.william278.husksync.bukkit.api; -import me.william278.husksync.PlayerData; -import me.william278.husksync.Settings; -import me.william278.husksync.redis.RedisMessage; +import net.william278.husksync.PlayerData; +import net.william278.husksync.Settings; +import net.william278.husksync.redis.RedisMessage; +import net.william278.husksync.bukkit.data.DataSerializer; import java.io.IOException; import java.util.HashMap; @@ -37,7 +38,7 @@ public class HuskSyncAPI { public static HashMap> apiRequests = new HashMap<>(); /** - * Returns a {@link CompletableFuture} that will fetch the {@link PlayerData} for a user given their {@link UUID}, which contains synchronised data that can then be deserialized into ItemStacks and other usable values using the {@link me.william278.husksync.bukkit.data.DataSerializer} class. If no data could be returned, such as if an invalid UUID is specified, the CompletableFuture will be cancelled. Note that this only returns the last cached data of the user; not necessarily the current state of their inventory if they are online. + * Returns a {@link CompletableFuture} that will fetch the {@link PlayerData} for a user given their {@link UUID}, which contains synchronised data that can then be deserialized into ItemStacks and other usable values using the {@link DataSerializer} class. If no data could be returned, such as if an invalid UUID is specified, the CompletableFuture will be cancelled. Note that this only returns the last cached data of the user; not necessarily the current state of their inventory if they are online. * * @param playerUUID The {@link UUID} of the player to get data for * @return a {@link CompletableFuture} with the user's {@link PlayerData} accessible on completion diff --git a/api/src/main/java/me/william278/husksync/bukkit/api/events/SyncCompleteEvent.java b/api/src/main/java/net/william278/husksync/bukkit/api/events/SyncCompleteEvent.java similarity index 91% rename from api/src/main/java/me/william278/husksync/bukkit/api/events/SyncCompleteEvent.java rename to api/src/main/java/net/william278/husksync/bukkit/api/events/SyncCompleteEvent.java index 236ba2ea..43b7fdb3 100644 --- a/api/src/main/java/me/william278/husksync/bukkit/api/events/SyncCompleteEvent.java +++ b/api/src/main/java/net/william278/husksync/bukkit/api/events/SyncCompleteEvent.java @@ -1,6 +1,6 @@ -package me.william278.husksync.bukkit.api.events; +package net.william278.husksync.bukkit.api.events; -import me.william278.husksync.PlayerData; +import net.william278.husksync.PlayerData; import org.bukkit.entity.Player; import org.bukkit.event.HandlerList; import org.bukkit.event.player.PlayerEvent; diff --git a/api/src/main/java/me/william278/husksync/bukkit/api/events/SyncEvent.java b/api/src/main/java/net/william278/husksync/bukkit/api/events/SyncEvent.java similarity index 95% rename from api/src/main/java/me/william278/husksync/bukkit/api/events/SyncEvent.java rename to api/src/main/java/net/william278/husksync/bukkit/api/events/SyncEvent.java index e53294f3..a8e8976b 100644 --- a/api/src/main/java/me/william278/husksync/bukkit/api/events/SyncEvent.java +++ b/api/src/main/java/net/william278/husksync/bukkit/api/events/SyncEvent.java @@ -1,6 +1,6 @@ -package me.william278.husksync.bukkit.api.events; +package net.william278.husksync.bukkit.api.events; -import me.william278.husksync.PlayerData; +import net.william278.husksync.PlayerData; import org.bukkit.entity.Player; import org.bukkit.event.Cancellable; import org.bukkit.event.HandlerList; diff --git a/api/src/main/java/me/william278/husksync/bukkit/data/DataSerializer.java b/api/src/main/java/net/william278/husksync/bukkit/data/DataSerializer.java similarity index 99% rename from api/src/main/java/me/william278/husksync/bukkit/data/DataSerializer.java rename to api/src/main/java/net/william278/husksync/bukkit/data/DataSerializer.java index edd5d219..e04c1186 100644 --- a/api/src/main/java/me/william278/husksync/bukkit/data/DataSerializer.java +++ b/api/src/main/java/net/william278/husksync/bukkit/data/DataSerializer.java @@ -1,6 +1,6 @@ -package me.william278.husksync.bukkit.data; +package net.william278.husksync.bukkit.data; -import me.william278.husksync.redis.RedisMessage; +import net.william278.husksync.redis.RedisMessage; import org.bukkit.*; import org.bukkit.advancement.Advancement; import org.bukkit.advancement.AdvancementProgress; @@ -20,7 +20,7 @@ import java.time.Instant; import java.util.*; /** - * Class that contains static methods for serializing and deserializing data from {@link me.william278.husksync.PlayerData} + * Class that contains static methods for serializing and deserializing data from {@link net.william278.husksync.PlayerData} */ public class DataSerializer { diff --git a/build.gradle b/build.gradle index d084d4d0..ab426c50 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,7 @@ plugins { id 'java' } -group 'me.william278' +group 'net.william278' version "$ext.plugin_version+${versionMetadata()}" ext { @@ -34,7 +34,7 @@ allprojects { } dependencies { - implementation('redis.clients:jedis:4.1.1') { + implementation('redis.clients:jedis:4.2.3') { //noinspection GroovyAssignabilityCheck exclude module: 'slf4j-api' } @@ -50,7 +50,7 @@ subprojects { version rootProject.version archivesBaseName = "${rootProject.name}-${project.name.capitalize()}" - if (['bukkit', 'bungeecord', 'velocity', 'plugin'].contains(project.name)) { + if (['bukkit', 'bungeecord', 'velocity', 'api', 'plugin'].contains(project.name)) { shadowJar { destinationDirectory.set(file("$rootDir/target")) archiveClassifier.set('') diff --git a/bukkit/build.gradle b/bukkit/build.gradle index 56ade4ee..6febf18e 100644 --- a/bukkit/build.gradle +++ b/bukkit/build.gradle @@ -1,19 +1,18 @@ dependencies { implementation project(':api') - implementation project(path: ':common', configuration: 'shadow') + implementation project(path: ':common') implementation 'org.bstats:bstats-bukkit:3.0.0' implementation 'de.themoep:minedown:1.7.1-SNAPSHOT' compileOnly 'net.craftersland.data:bridge:4.0.1' compileOnly 'org.spigotmc:spigot-api:1.16.5-R0.1-SNAPSHOT' - compileOnly 'org.jetbrains:annotations:22.0.0' + compileOnly 'org.jetbrains:annotations:23.0.0' } shadowJar { - relocate 'de.themoep', 'me.william278.husksync.libraries' - relocate 'org.bstats', 'me.william278.husksync.libraries.bstats' - - relocate 'redis.clients', 'me.william278.husksync.libraries' - relocate 'org.apache', 'me.william278.husksync.libraries' + relocate 'de.themoep', 'net.william278.husksync.libraries' + relocate 'org.bstats', 'net.william278.husksync.libraries.bstats' + relocate 'redis.clients', 'net.william278.husksync.libraries' + relocate 'org.apache', 'net.william278.husksync.libraries' } \ No newline at end of file diff --git a/bukkit/src/main/java/me/william278/husksync/HuskSyncBukkit.java b/bukkit/src/main/java/net/william278/husksync/HuskSyncBukkit.java similarity index 91% rename from bukkit/src/main/java/me/william278/husksync/HuskSyncBukkit.java rename to bukkit/src/main/java/net/william278/husksync/HuskSyncBukkit.java index 2dbefb50..164d07e9 100644 --- a/bukkit/src/main/java/me/william278/husksync/HuskSyncBukkit.java +++ b/bukkit/src/main/java/net/william278/husksync/HuskSyncBukkit.java @@ -1,13 +1,14 @@ -package me.william278.husksync; - -import me.william278.husksync.bukkit.util.BukkitUpdateChecker; -import me.william278.husksync.bukkit.util.PlayerSetter; -import me.william278.husksync.bukkit.config.ConfigLoader; -import me.william278.husksync.bukkit.data.BukkitDataCache; -import me.william278.husksync.bukkit.listener.BukkitRedisListener; -import me.william278.husksync.bukkit.listener.BukkitEventListener; -import me.william278.husksync.bukkit.migrator.MPDBDeserializer; -import me.william278.husksync.redis.RedisMessage; +package net.william278.husksync; + +import net.william278.husksync.Settings; +import net.william278.husksync.bukkit.util.BukkitUpdateChecker; +import net.william278.husksync.bukkit.util.PlayerSetter; +import net.william278.husksync.bukkit.config.ConfigLoader; +import net.william278.husksync.bukkit.data.BukkitDataCache; +import net.william278.husksync.bukkit.listener.BukkitRedisListener; +import net.william278.husksync.bukkit.listener.BukkitEventListener; +import net.william278.husksync.bukkit.migrator.MPDBDeserializer; +import net.william278.husksync.redis.RedisMessage; import org.bstats.bukkit.Metrics; import org.bukkit.Bukkit; import org.bukkit.entity.Player; diff --git a/bukkit/src/main/java/me/william278/husksync/bukkit/config/ConfigLoader.java b/bukkit/src/main/java/net/william278/husksync/bukkit/config/ConfigLoader.java similarity index 95% rename from bukkit/src/main/java/me/william278/husksync/bukkit/config/ConfigLoader.java rename to bukkit/src/main/java/net/william278/husksync/bukkit/config/ConfigLoader.java index 4c9fbdc7..82a38d27 100644 --- a/bukkit/src/main/java/me/william278/husksync/bukkit/config/ConfigLoader.java +++ b/bukkit/src/main/java/net/william278/husksync/bukkit/config/ConfigLoader.java @@ -1,6 +1,6 @@ -package me.william278.husksync.bukkit.config; +package net.william278.husksync.bukkit.config; -import me.william278.husksync.Settings; +import net.william278.husksync.Settings; import org.bukkit.configuration.file.FileConfiguration; public class ConfigLoader { diff --git a/bukkit/src/main/java/me/william278/husksync/bukkit/data/BukkitDataCache.java b/bukkit/src/main/java/net/william278/husksync/bukkit/data/BukkitDataCache.java similarity index 97% rename from bukkit/src/main/java/me/william278/husksync/bukkit/data/BukkitDataCache.java rename to bukkit/src/main/java/net/william278/husksync/bukkit/data/BukkitDataCache.java index 441e31e2..50996600 100644 --- a/bukkit/src/main/java/me/william278/husksync/bukkit/data/BukkitDataCache.java +++ b/bukkit/src/main/java/net/william278/husksync/bukkit/data/BukkitDataCache.java @@ -1,4 +1,4 @@ -package me.william278.husksync.bukkit.data; +package net.william278.husksync.bukkit.data; import java.util.HashMap; import java.util.HashSet; diff --git a/bukkit/src/main/java/me/william278/husksync/bukkit/data/DataViewer.java b/bukkit/src/main/java/net/william278/husksync/bukkit/data/DataViewer.java similarity index 93% rename from bukkit/src/main/java/me/william278/husksync/bukkit/data/DataViewer.java rename to bukkit/src/main/java/net/william278/husksync/bukkit/data/DataViewer.java index 43134b51..24f2a299 100644 --- a/bukkit/src/main/java/me/william278/husksync/bukkit/data/DataViewer.java +++ b/bukkit/src/main/java/net/william278/husksync/bukkit/data/DataViewer.java @@ -1,10 +1,10 @@ -package me.william278.husksync.bukkit.data; +package net.william278.husksync.bukkit.data; -import me.william278.husksync.HuskSyncBukkit; -import me.william278.husksync.PlayerData; -import me.william278.husksync.Settings; -import me.william278.husksync.bukkit.util.PlayerSetter; -import me.william278.husksync.redis.RedisMessage; +import net.william278.husksync.HuskSyncBukkit; +import net.william278.husksync.PlayerData; +import net.william278.husksync.Settings; +import net.william278.husksync.bukkit.util.PlayerSetter; +import net.william278.husksync.redis.RedisMessage; import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.bukkit.inventory.Inventory; diff --git a/bukkit/src/main/java/me/william278/husksync/bukkit/listener/BukkitEventListener.java b/bukkit/src/main/java/net/william278/husksync/bukkit/listener/BukkitEventListener.java similarity index 96% rename from bukkit/src/main/java/me/william278/husksync/bukkit/listener/BukkitEventListener.java rename to bukkit/src/main/java/net/william278/husksync/bukkit/listener/BukkitEventListener.java index 8503d344..a823aeea 100644 --- a/bukkit/src/main/java/me/william278/husksync/bukkit/listener/BukkitEventListener.java +++ b/bukkit/src/main/java/net/william278/husksync/bukkit/listener/BukkitEventListener.java @@ -1,9 +1,9 @@ -package me.william278.husksync.bukkit.listener; +package net.william278.husksync.bukkit.listener; -import me.william278.husksync.HuskSyncBukkit; -import me.william278.husksync.Settings; -import me.william278.husksync.bukkit.data.DataViewer; -import me.william278.husksync.bukkit.util.PlayerSetter; +import net.william278.husksync.HuskSyncBukkit; +import net.william278.husksync.Settings; +import net.william278.husksync.bukkit.data.DataViewer; +import net.william278.husksync.bukkit.util.PlayerSetter; import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; diff --git a/bukkit/src/main/java/me/william278/husksync/bukkit/listener/BukkitRedisListener.java b/bukkit/src/main/java/net/william278/husksync/bukkit/listener/BukkitRedisListener.java similarity index 94% rename from bukkit/src/main/java/me/william278/husksync/bukkit/listener/BukkitRedisListener.java rename to bukkit/src/main/java/net/william278/husksync/bukkit/listener/BukkitRedisListener.java index a8dc339e..28f972f5 100644 --- a/bukkit/src/main/java/me/william278/husksync/bukkit/listener/BukkitRedisListener.java +++ b/bukkit/src/main/java/net/william278/husksync/bukkit/listener/BukkitRedisListener.java @@ -1,18 +1,18 @@ -package me.william278.husksync.bukkit.listener; +package net.william278.husksync.bukkit.listener; import de.themoep.minedown.MineDown; -import me.william278.husksync.HuskSyncBukkit; -import me.william278.husksync.PlayerData; -import me.william278.husksync.Settings; -import me.william278.husksync.bukkit.api.HuskSyncAPI; -import me.william278.husksync.bukkit.config.ConfigLoader; -import me.william278.husksync.bukkit.data.DataViewer; -import me.william278.husksync.bukkit.migrator.MPDBDeserializer; -import me.william278.husksync.bukkit.util.PlayerSetter; -import me.william278.husksync.migrator.MPDBPlayerData; -import me.william278.husksync.redis.RedisListener; -import me.william278.husksync.redis.RedisMessage; -import me.william278.husksync.util.MessageManager; +import net.william278.husksync.HuskSyncBukkit; +import net.william278.husksync.PlayerData; +import net.william278.husksync.Settings; +import net.william278.husksync.bukkit.api.HuskSyncAPI; +import net.william278.husksync.bukkit.config.ConfigLoader; +import net.william278.husksync.bukkit.data.DataViewer; +import net.william278.husksync.bukkit.migrator.MPDBDeserializer; +import net.william278.husksync.bukkit.util.PlayerSetter; +import net.william278.husksync.migrator.MPDBPlayerData; +import net.william278.husksync.redis.RedisListener; +import net.william278.husksync.redis.RedisMessage; +import net.william278.husksync.util.MessageManager; import org.bukkit.Bukkit; import org.bukkit.entity.Player; diff --git a/bukkit/src/main/java/me/william278/husksync/bukkit/migrator/MPDBDeserializer.java b/bukkit/src/main/java/net/william278/husksync/bukkit/migrator/MPDBDeserializer.java similarity index 93% rename from bukkit/src/main/java/me/william278/husksync/bukkit/migrator/MPDBDeserializer.java rename to bukkit/src/main/java/net/william278/husksync/bukkit/migrator/MPDBDeserializer.java index f2709cf9..cdaa4a5e 100644 --- a/bukkit/src/main/java/me/william278/husksync/bukkit/migrator/MPDBDeserializer.java +++ b/bukkit/src/main/java/net/william278/husksync/bukkit/migrator/MPDBDeserializer.java @@ -1,10 +1,10 @@ -package me.william278.husksync.bukkit.migrator; +package net.william278.husksync.bukkit.migrator; -import me.william278.husksync.HuskSyncBukkit; -import me.william278.husksync.PlayerData; -import me.william278.husksync.bukkit.util.PlayerSetter; -import me.william278.husksync.bukkit.data.DataSerializer; -import me.william278.husksync.migrator.MPDBPlayerData; +import net.william278.husksync.HuskSyncBukkit; +import net.william278.husksync.PlayerData; +import net.william278.husksync.bukkit.util.PlayerSetter; +import net.william278.husksync.bukkit.data.DataSerializer; +import net.william278.husksync.migrator.MPDBPlayerData; import net.craftersland.data.bridge.PD; import org.bukkit.Bukkit; import org.bukkit.event.inventory.InventoryType; diff --git a/bukkit/src/main/java/me/william278/husksync/bukkit/util/BukkitUpdateChecker.java b/bukkit/src/main/java/net/william278/husksync/bukkit/util/BukkitUpdateChecker.java similarity index 73% rename from bukkit/src/main/java/me/william278/husksync/bukkit/util/BukkitUpdateChecker.java rename to bukkit/src/main/java/net/william278/husksync/bukkit/util/BukkitUpdateChecker.java index 6e927c93..c25327a1 100644 --- a/bukkit/src/main/java/me/william278/husksync/bukkit/util/BukkitUpdateChecker.java +++ b/bukkit/src/main/java/net/william278/husksync/bukkit/util/BukkitUpdateChecker.java @@ -1,7 +1,7 @@ -package me.william278.husksync.bukkit.util; +package net.william278.husksync.bukkit.util; -import me.william278.husksync.HuskSyncBukkit; -import me.william278.husksync.util.UpdateChecker; +import net.william278.husksync.HuskSyncBukkit; +import net.william278.husksync.util.UpdateChecker; import java.util.logging.Level; diff --git a/bukkit/src/main/java/me/william278/husksync/bukkit/util/PlayerSetter.java b/bukkit/src/main/java/net/william278/husksync/bukkit/util/PlayerSetter.java similarity index 97% rename from bukkit/src/main/java/me/william278/husksync/bukkit/util/PlayerSetter.java rename to bukkit/src/main/java/net/william278/husksync/bukkit/util/PlayerSetter.java index 0dda1aaa..00434b3d 100644 --- a/bukkit/src/main/java/me/william278/husksync/bukkit/util/PlayerSetter.java +++ b/bukkit/src/main/java/net/william278/husksync/bukkit/util/PlayerSetter.java @@ -1,13 +1,13 @@ -package me.william278.husksync.bukkit.util; - -import me.william278.husksync.HuskSyncBukkit; -import me.william278.husksync.PlayerData; -import me.william278.husksync.Settings; -import me.william278.husksync.bukkit.api.events.SyncCompleteEvent; -import me.william278.husksync.bukkit.api.events.SyncEvent; -import me.william278.husksync.bukkit.data.DataSerializer; -import me.william278.husksync.bukkit.util.nms.AdvancementUtils; -import me.william278.husksync.redis.RedisMessage; +package net.william278.husksync.bukkit.util; + +import net.william278.husksync.HuskSyncBukkit; +import net.william278.husksync.PlayerData; +import net.william278.husksync.Settings; +import net.william278.husksync.bukkit.api.events.SyncCompleteEvent; +import net.william278.husksync.bukkit.api.events.SyncEvent; +import net.william278.husksync.bukkit.data.DataSerializer; +import net.william278.husksync.bukkit.util.nms.AdvancementUtils; +import net.william278.husksync.redis.RedisMessage; import org.bukkit.*; import org.bukkit.advancement.Advancement; import org.bukkit.advancement.AdvancementProgress; diff --git a/bukkit/src/main/java/me/william278/husksync/bukkit/util/nms/AdvancementUtils.java b/bukkit/src/main/java/net/william278/husksync/bukkit/util/nms/AdvancementUtils.java similarity index 98% rename from bukkit/src/main/java/me/william278/husksync/bukkit/util/nms/AdvancementUtils.java rename to bukkit/src/main/java/net/william278/husksync/bukkit/util/nms/AdvancementUtils.java index 304cd401..f8da0527 100644 --- a/bukkit/src/main/java/me/william278/husksync/bukkit/util/nms/AdvancementUtils.java +++ b/bukkit/src/main/java/net/william278/husksync/bukkit/util/nms/AdvancementUtils.java @@ -1,6 +1,6 @@ -package me.william278.husksync.bukkit.util.nms; +package net.william278.husksync.bukkit.util.nms; -import me.william278.husksync.util.ThrowSupplier; +import net.william278.husksync.util.ThrowSupplier; import org.bukkit.advancement.Advancement; import org.bukkit.entity.Player; diff --git a/bukkit/src/main/java/me/william278/husksync/bukkit/util/nms/EntityUtils.java b/bukkit/src/main/java/net/william278/husksync/bukkit/util/nms/EntityUtils.java similarity index 87% rename from bukkit/src/main/java/me/william278/husksync/bukkit/util/nms/EntityUtils.java rename to bukkit/src/main/java/net/william278/husksync/bukkit/util/nms/EntityUtils.java index a85ab647..9eaeaea6 100644 --- a/bukkit/src/main/java/me/william278/husksync/bukkit/util/nms/EntityUtils.java +++ b/bukkit/src/main/java/net/william278/husksync/bukkit/util/nms/EntityUtils.java @@ -1,6 +1,6 @@ -package me.william278.husksync.bukkit.util.nms; +package net.william278.husksync.bukkit.util.nms; -import me.william278.husksync.util.ThrowSupplier; +import net.william278.husksync.util.ThrowSupplier; import org.bukkit.entity.LivingEntity; import java.lang.reflect.InvocationTargetException; diff --git a/bukkit/src/main/java/me/william278/husksync/bukkit/util/nms/MinecraftVersionUtils.java b/bukkit/src/main/java/net/william278/husksync/bukkit/util/nms/MinecraftVersionUtils.java similarity index 86% rename from bukkit/src/main/java/me/william278/husksync/bukkit/util/nms/MinecraftVersionUtils.java rename to bukkit/src/main/java/net/william278/husksync/bukkit/util/nms/MinecraftVersionUtils.java index 7e786b73..45069210 100644 --- a/bukkit/src/main/java/me/william278/husksync/bukkit/util/nms/MinecraftVersionUtils.java +++ b/bukkit/src/main/java/net/william278/husksync/bukkit/util/nms/MinecraftVersionUtils.java @@ -1,7 +1,7 @@ -package me.william278.husksync.bukkit.util.nms; +package net.william278.husksync.bukkit.util.nms; -import me.william278.husksync.util.ThrowSupplier; -import me.william278.husksync.util.VersionUtils; +import net.william278.husksync.util.ThrowSupplier; +import net.william278.husksync.util.VersionUtils; import org.bukkit.Bukkit; public class MinecraftVersionUtils { diff --git a/bukkit/src/main/resources/plugin.yml b/bukkit/src/main/resources/plugin.yml index 8fa51720..109cff7d 100644 --- a/bukkit/src/main/resources/plugin.yml +++ b/bukkit/src/main/resources/plugin.yml @@ -1,6 +1,6 @@ name: HuskSync version: ${version} -main: me.william278.husksync.HuskSyncBukkit +main: net.william278.husksync.HuskSyncBukkit api-version: 1.16 author: William278 description: 'A modern, cross-server player data synchronization system' diff --git a/bungeecord/build.gradle b/bungeecord/build.gradle index 7ffb9e9e..fa2f7f99 100644 --- a/bungeecord/build.gradle +++ b/bungeecord/build.gradle @@ -1,5 +1,5 @@ dependencies { - implementation project(path: ':common', configuration: 'shadow') + implementation project(path: ':common') implementation 'com.zaxxer:HikariCP:5.0.1' implementation 'org.bstats:bstats-bungeecord:3.0.0' @@ -10,14 +10,14 @@ dependencies { } shadowJar { - relocate 'de.themoep', 'me.william278.husksync.libraries' - relocate 'net.byteflux', 'me.william278.husksync.libraries' - relocate 'org.bstats', 'me.william278.husksync.libraries.bstats' + relocate 'de.themoep', 'net.william278.husksync.libraries' + relocate 'net.byteflux', 'net.william278.husksync.libraries' + relocate 'org.bstats', 'net.william278.husksync.libraries.bstats' - relocate 'redis.clients', 'me.william278.husksync.libraries' - relocate 'org.apache', 'me.william278.husksync.libraries' + relocate 'redis.clients', 'net.william278.husksync.libraries' + relocate 'org.apache', 'net.william278.husksync.libraries' - relocate 'com.zaxxer', 'me.william278.husksync.libraries' + relocate 'com.zaxxer', 'net.william278.husksync.libraries' dependencies { //noinspection GroovyAssignabilityCheck diff --git a/bungeecord/src/main/java/me/william278/husksync/HuskSyncBungeeCord.java b/bungeecord/src/main/java/net/william278/husksync/HuskSyncBungeeCord.java similarity index 86% rename from bungeecord/src/main/java/me/william278/husksync/HuskSyncBungeeCord.java rename to bungeecord/src/main/java/net/william278/husksync/HuskSyncBungeeCord.java index 095c226a..831e56ec 100644 --- a/bungeecord/src/main/java/me/william278/husksync/HuskSyncBungeeCord.java +++ b/bungeecord/src/main/java/net/william278/husksync/HuskSyncBungeeCord.java @@ -1,16 +1,18 @@ -package me.william278.husksync; - -import me.william278.husksync.bungeecord.command.BungeeCommand; -import me.william278.husksync.bungeecord.config.ConfigLoader; -import me.william278.husksync.bungeecord.config.ConfigManager; -import me.william278.husksync.bungeecord.listener.BungeeEventListener; -import me.william278.husksync.bungeecord.listener.BungeeRedisListener; -import me.william278.husksync.bungeecord.util.BungeeLogger; -import me.william278.husksync.bungeecord.util.BungeeUpdateChecker; -import me.william278.husksync.migrator.MPDBMigrator; -import me.william278.husksync.proxy.data.DataManager; -import me.william278.husksync.redis.RedisMessage; -import me.william278.husksync.util.Logger; +package net.william278.husksync; + +import net.william278.husksync.Server; +import net.william278.husksync.Settings; +import net.william278.husksync.bungeecord.command.BungeeCommand; +import net.william278.husksync.bungeecord.config.ConfigLoader; +import net.william278.husksync.bungeecord.config.ConfigManager; +import net.william278.husksync.bungeecord.listener.BungeeEventListener; +import net.william278.husksync.bungeecord.listener.BungeeRedisListener; +import net.william278.husksync.bungeecord.util.BungeeLogger; +import net.william278.husksync.bungeecord.util.BungeeUpdateChecker; +import net.william278.husksync.migrator.MPDBMigrator; +import net.william278.husksync.proxy.data.DataManager; +import net.william278.husksync.redis.RedisMessage; +import net.william278.husksync.util.Logger; import net.byteflux.libby.BungeeLibraryManager; import net.byteflux.libby.Library; import net.md_5.bungee.api.ProxyServer; @@ -155,7 +157,7 @@ public final class HuskSyncBungeeCord extends Plugin { Library mySqlLib = Library.builder() .groupId("mysql") .artifactId("mysql-connector-java") - .version("8.0.27") + .version("8.0.29") .build(); Library sqLiteLib = Library.builder() diff --git a/bungeecord/src/main/java/me/william278/husksync/bungeecord/command/BungeeCommand.java b/bungeecord/src/main/java/net/william278/husksync/bungeecord/command/BungeeCommand.java similarity index 97% rename from bungeecord/src/main/java/me/william278/husksync/bungeecord/command/BungeeCommand.java rename to bungeecord/src/main/java/net/william278/husksync/bungeecord/command/BungeeCommand.java index 47d9a7d4..f3064ffb 100644 --- a/bungeecord/src/main/java/me/william278/husksync/bungeecord/command/BungeeCommand.java +++ b/bungeecord/src/main/java/net/william278/husksync/bungeecord/command/BungeeCommand.java @@ -1,17 +1,17 @@ -package me.william278.husksync.bungeecord.command; +package net.william278.husksync.bungeecord.command; import de.themoep.minedown.MineDown; -import me.william278.husksync.HuskSyncBungeeCord; -import me.william278.husksync.PlayerData; -import me.william278.husksync.Server; -import me.william278.husksync.Settings; -import me.william278.husksync.bungeecord.config.ConfigLoader; -import me.william278.husksync.bungeecord.config.ConfigManager; -import me.william278.husksync.bungeecord.util.BungeeUpdateChecker; -import me.william278.husksync.migrator.MPDBMigrator; -import me.william278.husksync.proxy.command.HuskSyncCommand; -import me.william278.husksync.redis.RedisMessage; -import me.william278.husksync.util.MessageManager; +import net.william278.husksync.HuskSyncBungeeCord; +import net.william278.husksync.PlayerData; +import net.william278.husksync.Server; +import net.william278.husksync.Settings; +import net.william278.husksync.bungeecord.config.ConfigLoader; +import net.william278.husksync.bungeecord.config.ConfigManager; +import net.william278.husksync.bungeecord.util.BungeeUpdateChecker; +import net.william278.husksync.migrator.MPDBMigrator; +import net.william278.husksync.proxy.command.HuskSyncCommand; +import net.william278.husksync.redis.RedisMessage; +import net.william278.husksync.util.MessageManager; import net.md_5.bungee.api.CommandSender; import net.md_5.bungee.api.ProxyServer; import net.md_5.bungee.api.connection.ProxiedPlayer; diff --git a/bungeecord/src/main/java/me/william278/husksync/bungeecord/config/ConfigLoader.java b/bungeecord/src/main/java/net/william278/husksync/bungeecord/config/ConfigLoader.java similarity index 95% rename from bungeecord/src/main/java/me/william278/husksync/bungeecord/config/ConfigLoader.java rename to bungeecord/src/main/java/net/william278/husksync/bungeecord/config/ConfigLoader.java index 32991e3d..e4e0d3a6 100644 --- a/bungeecord/src/main/java/me/william278/husksync/bungeecord/config/ConfigLoader.java +++ b/bungeecord/src/main/java/net/william278/husksync/bungeecord/config/ConfigLoader.java @@ -1,8 +1,8 @@ -package me.william278.husksync.bungeecord.config; +package net.william278.husksync.bungeecord.config; -import me.william278.husksync.HuskSyncBungeeCord; -import me.william278.husksync.Settings; -import me.william278.husksync.util.MessageManager; +import net.william278.husksync.HuskSyncBungeeCord; +import net.william278.husksync.Settings; +import net.william278.husksync.util.MessageManager; import net.md_5.bungee.config.Configuration; import java.util.HashMap; diff --git a/bungeecord/src/main/java/me/william278/husksync/bungeecord/config/ConfigManager.java b/bungeecord/src/main/java/net/william278/husksync/bungeecord/config/ConfigManager.java similarity index 95% rename from bungeecord/src/main/java/me/william278/husksync/bungeecord/config/ConfigManager.java rename to bungeecord/src/main/java/net/william278/husksync/bungeecord/config/ConfigManager.java index 2bb222a2..b38dd470 100644 --- a/bungeecord/src/main/java/me/william278/husksync/bungeecord/config/ConfigManager.java +++ b/bungeecord/src/main/java/net/william278/husksync/bungeecord/config/ConfigManager.java @@ -1,7 +1,7 @@ -package me.william278.husksync.bungeecord.config; +package net.william278.husksync.bungeecord.config; -import me.william278.husksync.HuskSyncBungeeCord; -import me.william278.husksync.Settings; +import net.william278.husksync.HuskSyncBungeeCord; +import net.william278.husksync.Settings; import net.md_5.bungee.config.Configuration; import net.md_5.bungee.config.ConfigurationProvider; import net.md_5.bungee.config.YamlConfiguration; diff --git a/bungeecord/src/main/java/me/william278/husksync/bungeecord/listener/BungeeEventListener.java b/bungeecord/src/main/java/net/william278/husksync/bungeecord/listener/BungeeEventListener.java similarity index 89% rename from bungeecord/src/main/java/me/william278/husksync/bungeecord/listener/BungeeEventListener.java rename to bungeecord/src/main/java/net/william278/husksync/bungeecord/listener/BungeeEventListener.java index 5da1e610..c1340f89 100644 --- a/bungeecord/src/main/java/me/william278/husksync/bungeecord/listener/BungeeEventListener.java +++ b/bungeecord/src/main/java/net/william278/husksync/bungeecord/listener/BungeeEventListener.java @@ -1,9 +1,9 @@ -package me.william278.husksync.bungeecord.listener; +package net.william278.husksync.bungeecord.listener; -import me.william278.husksync.HuskSyncBungeeCord; -import me.william278.husksync.PlayerData; -import me.william278.husksync.Settings; -import me.william278.husksync.redis.RedisMessage; +import net.william278.husksync.HuskSyncBungeeCord; +import net.william278.husksync.PlayerData; +import net.william278.husksync.Settings; +import net.william278.husksync.redis.RedisMessage; import net.md_5.bungee.api.ProxyServer; import net.md_5.bungee.api.connection.ProxiedPlayer; import net.md_5.bungee.api.event.PostLoginEvent; diff --git a/bungeecord/src/main/java/me/william278/husksync/bungeecord/listener/BungeeRedisListener.java b/bungeecord/src/main/java/net/william278/husksync/bungeecord/listener/BungeeRedisListener.java similarity index 96% rename from bungeecord/src/main/java/me/william278/husksync/bungeecord/listener/BungeeRedisListener.java rename to bungeecord/src/main/java/net/william278/husksync/bungeecord/listener/BungeeRedisListener.java index 9da0e646..377acb42 100644 --- a/bungeecord/src/main/java/me/william278/husksync/bungeecord/listener/BungeeRedisListener.java +++ b/bungeecord/src/main/java/net/william278/husksync/bungeecord/listener/BungeeRedisListener.java @@ -1,14 +1,14 @@ -package me.william278.husksync.bungeecord.listener; +package net.william278.husksync.bungeecord.listener; import de.themoep.minedown.MineDown; -import me.william278.husksync.HuskSyncBungeeCord; -import me.william278.husksync.Server; -import me.william278.husksync.util.MessageManager; -import me.william278.husksync.PlayerData; -import me.william278.husksync.Settings; -import me.william278.husksync.migrator.MPDBMigrator; -import me.william278.husksync.redis.RedisListener; -import me.william278.husksync.redis.RedisMessage; +import net.william278.husksync.HuskSyncBungeeCord; +import net.william278.husksync.Server; +import net.william278.husksync.util.MessageManager; +import net.william278.husksync.PlayerData; +import net.william278.husksync.Settings; +import net.william278.husksync.migrator.MPDBMigrator; +import net.william278.husksync.redis.RedisListener; +import net.william278.husksync.redis.RedisMessage; import net.md_5.bungee.api.ChatMessageType; import net.md_5.bungee.api.ProxyServer; import net.md_5.bungee.api.connection.ProxiedPlayer; diff --git a/bungeecord/src/main/java/me/william278/husksync/bungeecord/util/BungeeLogger.java b/bungeecord/src/main/java/net/william278/husksync/bungeecord/util/BungeeLogger.java similarity index 87% rename from bungeecord/src/main/java/me/william278/husksync/bungeecord/util/BungeeLogger.java rename to bungeecord/src/main/java/net/william278/husksync/bungeecord/util/BungeeLogger.java index cd1f7828..481e6983 100644 --- a/bungeecord/src/main/java/me/william278/husksync/bungeecord/util/BungeeLogger.java +++ b/bungeecord/src/main/java/net/william278/husksync/bungeecord/util/BungeeLogger.java @@ -1,6 +1,6 @@ -package me.william278.husksync.bungeecord.util; +package net.william278.husksync.bungeecord.util; -import me.william278.husksync.util.Logger; +import net.william278.husksync.util.Logger; import java.util.logging.Level; diff --git a/bungeecord/src/main/java/me/william278/husksync/bungeecord/util/BungeeUpdateChecker.java b/bungeecord/src/main/java/net/william278/husksync/bungeecord/util/BungeeUpdateChecker.java similarity index 72% rename from bungeecord/src/main/java/me/william278/husksync/bungeecord/util/BungeeUpdateChecker.java rename to bungeecord/src/main/java/net/william278/husksync/bungeecord/util/BungeeUpdateChecker.java index 0457a467..06b0caae 100644 --- a/bungeecord/src/main/java/me/william278/husksync/bungeecord/util/BungeeUpdateChecker.java +++ b/bungeecord/src/main/java/net/william278/husksync/bungeecord/util/BungeeUpdateChecker.java @@ -1,7 +1,7 @@ -package me.william278.husksync.bungeecord.util; +package net.william278.husksync.bungeecord.util; -import me.william278.husksync.HuskSyncBungeeCord; -import me.william278.husksync.util.UpdateChecker; +import net.william278.husksync.HuskSyncBungeeCord; +import net.william278.husksync.util.UpdateChecker; import java.util.logging.Level; diff --git a/bungeecord/src/main/resources/bungee.yml b/bungeecord/src/main/resources/bungee.yml index 3076d001..844687bb 100644 --- a/bungeecord/src/main/resources/bungee.yml +++ b/bungeecord/src/main/resources/bungee.yml @@ -1,5 +1,5 @@ name: HuskSync version: ${version} -main: me.william278.husksync.HuskSyncBungeeCord +main: net.william278.husksync.HuskSyncBungeeCord author: William278 description: 'A modern, cross-server player data synchronization system' \ No newline at end of file diff --git a/common/build.gradle b/common/build.gradle index c488fde9..750e7078 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -3,5 +3,5 @@ dependencies { } shadowJar { - relocate 'com.zaxxer', 'me.william278.husksync.libraries' + relocate 'com.zaxxer', 'net.william278.husksync.libraries' } \ No newline at end of file diff --git a/common/src/main/java/me/william278/husksync/PlayerData.java b/common/src/main/java/net/william278/husksync/PlayerData.java similarity index 99% rename from common/src/main/java/me/william278/husksync/PlayerData.java rename to common/src/main/java/net/william278/husksync/PlayerData.java index 8a311ff7..82927a66 100644 --- a/common/src/main/java/me/william278/husksync/PlayerData.java +++ b/common/src/main/java/net/william278/husksync/PlayerData.java @@ -1,4 +1,4 @@ -package me.william278.husksync; +package net.william278.husksync; import java.io.*; import java.time.Instant; diff --git a/common/src/main/java/me/william278/husksync/Server.java b/common/src/main/java/net/william278/husksync/Server.java similarity index 90% rename from common/src/main/java/me/william278/husksync/Server.java rename to common/src/main/java/net/william278/husksync/Server.java index 986ca4c4..1c88d1c1 100644 --- a/common/src/main/java/me/william278/husksync/Server.java +++ b/common/src/main/java/net/william278/husksync/Server.java @@ -1,4 +1,4 @@ -package me.william278.husksync; +package net.william278.husksync; import java.util.UUID; diff --git a/common/src/main/java/me/william278/husksync/Settings.java b/common/src/main/java/net/william278/husksync/Settings.java similarity index 98% rename from common/src/main/java/me/william278/husksync/Settings.java rename to common/src/main/java/net/william278/husksync/Settings.java index 5013fe16..7e0cea9c 100644 --- a/common/src/main/java/me/william278/husksync/Settings.java +++ b/common/src/main/java/net/william278/husksync/Settings.java @@ -1,4 +1,4 @@ -package me.william278.husksync; +package net.william278.husksync; import java.util.ArrayList; diff --git a/common/src/main/java/me/william278/husksync/migrator/MPDBMigrator.java b/common/src/main/java/net/william278/husksync/migrator/MPDBMigrator.java similarity index 96% rename from common/src/main/java/me/william278/husksync/migrator/MPDBMigrator.java rename to common/src/main/java/net/william278/husksync/migrator/MPDBMigrator.java index 32b5bcfb..cf16fc93 100644 --- a/common/src/main/java/me/william278/husksync/migrator/MPDBMigrator.java +++ b/common/src/main/java/net/william278/husksync/migrator/MPDBMigrator.java @@ -1,14 +1,14 @@ -package me.william278.husksync.migrator; - -import me.william278.husksync.PlayerData; -import me.william278.husksync.Server; -import me.william278.husksync.Settings; -import me.william278.husksync.proxy.data.DataManager; -import me.william278.husksync.proxy.data.sql.Database; -import me.william278.husksync.proxy.data.sql.MySQL; -import me.william278.husksync.redis.RedisListener; -import me.william278.husksync.redis.RedisMessage; -import me.william278.husksync.util.Logger; +package net.william278.husksync.migrator; + +import net.william278.husksync.PlayerData; +import net.william278.husksync.Server; +import net.william278.husksync.Settings; +import net.william278.husksync.proxy.data.DataManager; +import net.william278.husksync.proxy.data.sql.Database; +import net.william278.husksync.proxy.data.sql.MySQL; +import net.william278.husksync.redis.RedisListener; +import net.william278.husksync.redis.RedisMessage; +import net.william278.husksync.util.Logger; import java.io.IOException; import java.sql.Connection; diff --git a/common/src/main/java/me/william278/husksync/migrator/MPDBPlayerData.java b/common/src/main/java/net/william278/husksync/migrator/MPDBPlayerData.java similarity index 94% rename from common/src/main/java/me/william278/husksync/migrator/MPDBPlayerData.java rename to common/src/main/java/net/william278/husksync/migrator/MPDBPlayerData.java index 2630edf1..e83228c8 100644 --- a/common/src/main/java/me/william278/husksync/migrator/MPDBPlayerData.java +++ b/common/src/main/java/net/william278/husksync/migrator/MPDBPlayerData.java @@ -1,4 +1,4 @@ -package me.william278.husksync.migrator; +package net.william278.husksync.migrator; import java.io.Serializable; import java.util.UUID; diff --git a/common/src/main/java/me/william278/husksync/proxy/command/HuskSyncCommand.java b/common/src/main/java/net/william278/husksync/proxy/command/HuskSyncCommand.java similarity index 92% rename from common/src/main/java/me/william278/husksync/proxy/command/HuskSyncCommand.java rename to common/src/main/java/net/william278/husksync/proxy/command/HuskSyncCommand.java index bb62d9d0..65da55a7 100644 --- a/common/src/main/java/me/william278/husksync/proxy/command/HuskSyncCommand.java +++ b/common/src/main/java/net/william278/husksync/proxy/command/HuskSyncCommand.java @@ -1,4 +1,4 @@ -package me.william278.husksync.proxy.command; +package net.william278.husksync.proxy.command; public interface HuskSyncCommand { diff --git a/common/src/main/java/me/william278/husksync/proxy/data/DataManager.java b/common/src/main/java/net/william278/husksync/proxy/data/DataManager.java similarity index 98% rename from common/src/main/java/me/william278/husksync/proxy/data/DataManager.java rename to common/src/main/java/net/william278/husksync/proxy/data/DataManager.java index 2bafbf03..e51df57c 100644 --- a/common/src/main/java/me/william278/husksync/proxy/data/DataManager.java +++ b/common/src/main/java/net/william278/husksync/proxy/data/DataManager.java @@ -1,11 +1,11 @@ -package me.william278.husksync.proxy.data; - -import me.william278.husksync.PlayerData; -import me.william278.husksync.Settings; -import me.william278.husksync.proxy.data.sql.Database; -import me.william278.husksync.proxy.data.sql.MySQL; -import me.william278.husksync.proxy.data.sql.SQLite; -import me.william278.husksync.util.Logger; +package net.william278.husksync.proxy.data; + +import net.william278.husksync.PlayerData; +import net.william278.husksync.Settings; +import net.william278.husksync.proxy.data.sql.Database; +import net.william278.husksync.proxy.data.sql.MySQL; +import net.william278.husksync.proxy.data.sql.SQLite; +import net.william278.husksync.util.Logger; import java.io.File; import java.sql.*; diff --git a/common/src/main/java/me/william278/husksync/proxy/data/sql/Database.java b/common/src/main/java/net/william278/husksync/proxy/data/sql/Database.java similarity index 90% rename from common/src/main/java/me/william278/husksync/proxy/data/sql/Database.java rename to common/src/main/java/net/william278/husksync/proxy/data/sql/Database.java index d25f64e2..5b237011 100644 --- a/common/src/main/java/me/william278/husksync/proxy/data/sql/Database.java +++ b/common/src/main/java/net/william278/husksync/proxy/data/sql/Database.java @@ -1,7 +1,7 @@ -package me.william278.husksync.proxy.data.sql; +package net.william278.husksync.proxy.data.sql; -import me.william278.husksync.Settings; -import me.william278.husksync.util.Logger; +import net.william278.husksync.Settings; +import net.william278.husksync.util.Logger; import java.sql.Connection; import java.sql.SQLException; diff --git a/common/src/main/java/me/william278/husksync/proxy/data/sql/MySQL.java b/common/src/main/java/net/william278/husksync/proxy/data/sql/MySQL.java similarity index 96% rename from common/src/main/java/me/william278/husksync/proxy/data/sql/MySQL.java rename to common/src/main/java/net/william278/husksync/proxy/data/sql/MySQL.java index e010d5f8..0d3571de 100644 --- a/common/src/main/java/me/william278/husksync/proxy/data/sql/MySQL.java +++ b/common/src/main/java/net/william278/husksync/proxy/data/sql/MySQL.java @@ -1,8 +1,8 @@ -package me.william278.husksync.proxy.data.sql; +package net.william278.husksync.proxy.data.sql; import com.zaxxer.hikari.HikariDataSource; -import me.william278.husksync.Settings; -import me.william278.husksync.util.Logger; +import net.william278.husksync.Settings; +import net.william278.husksync.util.Logger; import java.sql.Connection; import java.sql.SQLException; diff --git a/common/src/main/java/me/william278/husksync/proxy/data/sql/SQLite.java b/common/src/main/java/net/william278/husksync/proxy/data/sql/SQLite.java similarity index 97% rename from common/src/main/java/me/william278/husksync/proxy/data/sql/SQLite.java rename to common/src/main/java/net/william278/husksync/proxy/data/sql/SQLite.java index 158f9a30..ee0715c6 100644 --- a/common/src/main/java/me/william278/husksync/proxy/data/sql/SQLite.java +++ b/common/src/main/java/net/william278/husksync/proxy/data/sql/SQLite.java @@ -1,8 +1,8 @@ -package me.william278.husksync.proxy.data.sql; +package net.william278.husksync.proxy.data.sql; import com.zaxxer.hikari.HikariDataSource; -import me.william278.husksync.Settings; -import me.william278.husksync.util.Logger; +import net.william278.husksync.Settings; +import net.william278.husksync.util.Logger; import java.io.File; import java.io.IOException; diff --git a/common/src/main/java/me/william278/husksync/redis/RedisListener.java b/common/src/main/java/net/william278/husksync/redis/RedisListener.java similarity index 98% rename from common/src/main/java/me/william278/husksync/redis/RedisListener.java rename to common/src/main/java/net/william278/husksync/redis/RedisListener.java index ceed919f..a3d83c7d 100644 --- a/common/src/main/java/me/william278/husksync/redis/RedisListener.java +++ b/common/src/main/java/net/william278/husksync/redis/RedisListener.java @@ -1,6 +1,6 @@ -package me.william278.husksync.redis; +package net.william278.husksync.redis; -import me.william278.husksync.Settings; +import net.william278.husksync.Settings; import redis.clients.jedis.*; import redis.clients.jedis.exceptions.JedisConnectionException; import redis.clients.jedis.exceptions.JedisException; diff --git a/common/src/main/java/me/william278/husksync/redis/RedisMessage.java b/common/src/main/java/net/william278/husksync/redis/RedisMessage.java similarity index 98% rename from common/src/main/java/me/william278/husksync/redis/RedisMessage.java rename to common/src/main/java/net/william278/husksync/redis/RedisMessage.java index 8bddd49d..b9b0f360 100644 --- a/common/src/main/java/me/william278/husksync/redis/RedisMessage.java +++ b/common/src/main/java/net/william278/husksync/redis/RedisMessage.java @@ -1,7 +1,7 @@ -package me.william278.husksync.redis; +package net.william278.husksync.redis; -import me.william278.husksync.PlayerData; -import me.william278.husksync.Settings; +import net.william278.husksync.PlayerData; +import net.william278.husksync.Settings; import redis.clients.jedis.Jedis; import java.io.*; diff --git a/common/src/main/java/me/william278/husksync/util/Logger.java b/common/src/main/java/net/william278/husksync/util/Logger.java similarity index 90% rename from common/src/main/java/me/william278/husksync/util/Logger.java rename to common/src/main/java/net/william278/husksync/util/Logger.java index e6e1db7d..3e076f65 100644 --- a/common/src/main/java/me/william278/husksync/util/Logger.java +++ b/common/src/main/java/net/william278/husksync/util/Logger.java @@ -1,4 +1,4 @@ -package me.william278.husksync.util; +package net.william278.husksync.util; import java.util.logging.Level; diff --git a/common/src/main/java/me/william278/husksync/util/MessageManager.java b/common/src/main/java/net/william278/husksync/util/MessageManager.java similarity index 98% rename from common/src/main/java/me/william278/husksync/util/MessageManager.java rename to common/src/main/java/net/william278/husksync/util/MessageManager.java index 62839c94..ef953659 100644 --- a/common/src/main/java/me/william278/husksync/util/MessageManager.java +++ b/common/src/main/java/net/william278/husksync/util/MessageManager.java @@ -1,4 +1,4 @@ -package me.william278.husksync.util; +package net.william278.husksync.util; import java.util.HashMap; diff --git a/common/src/main/java/me/william278/husksync/util/ThrowSupplier.java b/common/src/main/java/net/william278/husksync/util/ThrowSupplier.java similarity index 87% rename from common/src/main/java/me/william278/husksync/util/ThrowSupplier.java rename to common/src/main/java/net/william278/husksync/util/ThrowSupplier.java index e7eba2a9..5825b2de 100644 --- a/common/src/main/java/me/william278/husksync/util/ThrowSupplier.java +++ b/common/src/main/java/net/william278/husksync/util/ThrowSupplier.java @@ -1,4 +1,4 @@ -package me.william278.husksync.util; +package net.william278.husksync.util; public interface ThrowSupplier { T get() throws Exception; diff --git a/common/src/main/java/me/william278/husksync/util/UpdateChecker.java b/common/src/main/java/net/william278/husksync/util/UpdateChecker.java similarity index 97% rename from common/src/main/java/me/william278/husksync/util/UpdateChecker.java rename to common/src/main/java/net/william278/husksync/util/UpdateChecker.java index adae5f15..54ec946c 100644 --- a/common/src/main/java/me/william278/husksync/util/UpdateChecker.java +++ b/common/src/main/java/net/william278/husksync/util/UpdateChecker.java @@ -1,4 +1,4 @@ -package me.william278.husksync.util; +package net.william278.husksync.util; import java.io.BufferedReader; import java.io.IOException; diff --git a/common/src/main/java/me/william278/husksync/util/VersionUtils.java b/common/src/main/java/net/william278/husksync/util/VersionUtils.java similarity index 97% rename from common/src/main/java/me/william278/husksync/util/VersionUtils.java rename to common/src/main/java/net/william278/husksync/util/VersionUtils.java index fe825c63..1bbcd858 100644 --- a/common/src/main/java/me/william278/husksync/util/VersionUtils.java +++ b/common/src/main/java/net/william278/husksync/util/VersionUtils.java @@ -1,4 +1,4 @@ -package me.william278.husksync.util; +package net.william278.husksync.util; import java.util.Arrays; diff --git a/gradle.properties b/gradle.properties index d38f53d6..86c87c62 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,3 @@ -org.gradle.parallel=true javaVersion=16 - -plugin_version=1.3.3 +plugin_version=1.4 plugin_archive=husksync \ No newline at end of file diff --git a/plugin/build.gradle b/plugin/build.gradle index 07a32b67..46edd2ea 100644 --- a/plugin/build.gradle +++ b/plugin/build.gradle @@ -19,7 +19,7 @@ shadowJar { publishing { publications { mavenJava(MavenPublication) { - groupId = 'me.william278' + groupId = 'net.william278' artifactId = 'husksync-plugin' version = "$rootProject.version" diff --git a/velocity/build.gradle b/velocity/build.gradle index 724b0f2d..81b738d5 100644 --- a/velocity/build.gradle +++ b/velocity/build.gradle @@ -1,5 +1,5 @@ dependencies { - implementation project(path: ':common', configuration: 'shadow') + implementation project(path: ':common') implementation 'com.zaxxer:HikariCP:5.0.1' implementation 'org.bstats:bstats-velocity:3.0.0' @@ -10,14 +10,12 @@ dependencies { } shadowJar { - relocate 'de.themoep', 'me.william278.husksync.libraries' - relocate 'net.byteflux', 'me.william278.husksync.libraries' - relocate 'org.bstats', 'me.william278.husksync.libraries.bstats' - - relocate 'redis.clients', 'me.william278.husksync.libraries' - relocate 'org.apache', 'me.william278.husksync.libraries' - - relocate 'com.zaxxer', 'me.william278.husksync.libraries' + relocate 'de.themoep', 'net.william278.husksync.libraries' + relocate 'net.byteflux', 'net.william278.husksync.libraries' + relocate 'org.bstats', 'net.william278.husksync.libraries.bstats' + relocate 'redis.clients', 'net.william278.husksync.libraries' + relocate 'org.apache', 'net.william278.husksync.libraries' + relocate 'com.zaxxer', 'net.william278.husksync.libraries' dependencies { //noinspection GroovyAssignabilityCheck diff --git a/velocity/src/main/java/me/william278/husksync/HuskSyncVelocity.java b/velocity/src/main/java/net/william278/husksync/HuskSyncVelocity.java similarity index 89% rename from velocity/src/main/java/me/william278/husksync/HuskSyncVelocity.java rename to velocity/src/main/java/net/william278/husksync/HuskSyncVelocity.java index 5ba19987..56accde0 100644 --- a/velocity/src/main/java/me/william278/husksync/HuskSyncVelocity.java +++ b/velocity/src/main/java/net/william278/husksync/HuskSyncVelocity.java @@ -1,4 +1,4 @@ -package me.william278.husksync; +package net.william278.husksync; import com.google.inject.Inject; import com.velocitypowered.api.command.CommandManager; @@ -10,16 +10,18 @@ import com.velocitypowered.api.plugin.Plugin; import com.velocitypowered.api.plugin.PluginContainer; import com.velocitypowered.api.plugin.annotation.DataDirectory; import com.velocitypowered.api.proxy.ProxyServer; -import me.william278.husksync.migrator.MPDBMigrator; -import me.william278.husksync.proxy.data.DataManager; -import me.william278.husksync.redis.RedisMessage; -import me.william278.husksync.velocity.command.VelocityCommand; -import me.william278.husksync.velocity.config.ConfigLoader; -import me.william278.husksync.velocity.config.ConfigManager; -import me.william278.husksync.velocity.listener.VelocityEventListener; -import me.william278.husksync.velocity.listener.VelocityRedisListener; -import me.william278.husksync.velocity.util.VelocityLogger; -import me.william278.husksync.velocity.util.VelocityUpdateChecker; +import net.william278.husksync.Server; +import net.william278.husksync.Settings; +import net.william278.husksync.migrator.MPDBMigrator; +import net.william278.husksync.proxy.data.DataManager; +import net.william278.husksync.redis.RedisMessage; +import net.william278.husksync.velocity.command.VelocityCommand; +import net.william278.husksync.velocity.config.ConfigLoader; +import net.william278.husksync.velocity.config.ConfigManager; +import net.william278.husksync.velocity.listener.VelocityEventListener; +import net.william278.husksync.velocity.listener.VelocityRedisListener; +import net.william278.husksync.velocity.util.VelocityLogger; +import net.william278.husksync.velocity.util.VelocityUpdateChecker; import net.byteflux.libby.Library; import net.byteflux.libby.VelocityLibraryManager; import org.bstats.velocity.Metrics; @@ -202,7 +204,7 @@ public class HuskSyncVelocity { Library mySqlLib = Library.builder() .groupId("mysql") .artifactId("mysql-connector-java") - .version("8.0.27") + .version("8.0.29") .build(); Library sqLiteLib = Library.builder() diff --git a/velocity/src/main/java/me/william278/husksync/velocity/command/VelocityCommand.java b/velocity/src/main/java/net/william278/husksync/velocity/command/VelocityCommand.java similarity index 97% rename from velocity/src/main/java/me/william278/husksync/velocity/command/VelocityCommand.java rename to velocity/src/main/java/net/william278/husksync/velocity/command/VelocityCommand.java index db924620..9efe62d8 100644 --- a/velocity/src/main/java/me/william278/husksync/velocity/command/VelocityCommand.java +++ b/velocity/src/main/java/net/william278/husksync/velocity/command/VelocityCommand.java @@ -1,20 +1,20 @@ -package me.william278.husksync.velocity.command; +package net.william278.husksync.velocity.command; import com.velocitypowered.api.command.CommandSource; import com.velocitypowered.api.command.SimpleCommand; import com.velocitypowered.api.proxy.Player; import de.themoep.minedown.adventure.MineDown; -import me.william278.husksync.HuskSyncVelocity; -import me.william278.husksync.PlayerData; -import me.william278.husksync.Server; -import me.william278.husksync.Settings; -import me.william278.husksync.migrator.MPDBMigrator; -import me.william278.husksync.proxy.command.HuskSyncCommand; -import me.william278.husksync.redis.RedisMessage; -import me.william278.husksync.util.MessageManager; -import me.william278.husksync.velocity.util.VelocityUpdateChecker; -import me.william278.husksync.velocity.config.ConfigLoader; -import me.william278.husksync.velocity.config.ConfigManager; +import net.william278.husksync.HuskSyncVelocity; +import net.william278.husksync.PlayerData; +import net.william278.husksync.Server; +import net.william278.husksync.Settings; +import net.william278.husksync.migrator.MPDBMigrator; +import net.william278.husksync.proxy.command.HuskSyncCommand; +import net.william278.husksync.redis.RedisMessage; +import net.william278.husksync.util.MessageManager; +import net.william278.husksync.velocity.util.VelocityUpdateChecker; +import net.william278.husksync.velocity.config.ConfigLoader; +import net.william278.husksync.velocity.config.ConfigManager; import java.io.IOException; import java.util.*; diff --git a/velocity/src/main/java/me/william278/husksync/velocity/config/ConfigLoader.java b/velocity/src/main/java/net/william278/husksync/velocity/config/ConfigLoader.java similarity index 96% rename from velocity/src/main/java/me/william278/husksync/velocity/config/ConfigLoader.java rename to velocity/src/main/java/net/william278/husksync/velocity/config/ConfigLoader.java index e3d52dea..12f170fa 100644 --- a/velocity/src/main/java/me/william278/husksync/velocity/config/ConfigLoader.java +++ b/velocity/src/main/java/net/william278/husksync/velocity/config/ConfigLoader.java @@ -1,8 +1,8 @@ -package me.william278.husksync.velocity.config; +package net.william278.husksync.velocity.config; -import me.william278.husksync.HuskSyncVelocity; -import me.william278.husksync.Settings; -import me.william278.husksync.util.MessageManager; +import net.william278.husksync.HuskSyncVelocity; +import net.william278.husksync.Settings; +import net.william278.husksync.util.MessageManager; import ninja.leaping.configurate.ConfigurationNode; import java.util.HashMap; diff --git a/velocity/src/main/java/me/william278/husksync/velocity/config/ConfigManager.java b/velocity/src/main/java/net/william278/husksync/velocity/config/ConfigManager.java similarity index 96% rename from velocity/src/main/java/me/william278/husksync/velocity/config/ConfigManager.java rename to velocity/src/main/java/net/william278/husksync/velocity/config/ConfigManager.java index f5731194..215e8aa7 100644 --- a/velocity/src/main/java/me/william278/husksync/velocity/config/ConfigManager.java +++ b/velocity/src/main/java/net/william278/husksync/velocity/config/ConfigManager.java @@ -1,7 +1,7 @@ -package me.william278.husksync.velocity.config; +package net.william278.husksync.velocity.config; -import me.william278.husksync.HuskSyncVelocity; -import me.william278.husksync.Settings; +import net.william278.husksync.HuskSyncVelocity; +import net.william278.husksync.Settings; import ninja.leaping.configurate.ConfigurationNode; import ninja.leaping.configurate.yaml.YAMLConfigurationLoader; import org.yaml.snakeyaml.DumperOptions; diff --git a/velocity/src/main/java/me/william278/husksync/velocity/listener/VelocityEventListener.java b/velocity/src/main/java/net/william278/husksync/velocity/listener/VelocityEventListener.java similarity index 85% rename from velocity/src/main/java/me/william278/husksync/velocity/listener/VelocityEventListener.java rename to velocity/src/main/java/net/william278/husksync/velocity/listener/VelocityEventListener.java index d035e971..f374aaa7 100644 --- a/velocity/src/main/java/me/william278/husksync/velocity/listener/VelocityEventListener.java +++ b/velocity/src/main/java/net/william278/husksync/velocity/listener/VelocityEventListener.java @@ -1,12 +1,13 @@ -package me.william278.husksync.velocity.listener; +package net.william278.husksync.velocity.listener; +import com.velocitypowered.api.event.PostOrder; import com.velocitypowered.api.event.Subscribe; import com.velocitypowered.api.event.connection.PostLoginEvent; import com.velocitypowered.api.proxy.Player; -import me.william278.husksync.HuskSyncVelocity; -import me.william278.husksync.PlayerData; -import me.william278.husksync.Settings; -import me.william278.husksync.redis.RedisMessage; +import net.william278.husksync.HuskSyncVelocity; +import net.william278.husksync.PlayerData; +import net.william278.husksync.Settings; +import net.william278.husksync.redis.RedisMessage; import java.io.IOException; import java.util.Map; @@ -16,7 +17,7 @@ public class VelocityEventListener { private static final HuskSyncVelocity plugin = HuskSyncVelocity.getInstance(); - @Subscribe + @Subscribe(order = PostOrder.FIRST) public void onPostLogin(PostLoginEvent event) { final Player player = event.getPlayer(); plugin.getProxyServer().getScheduler().buildTask(plugin, () -> { diff --git a/velocity/src/main/java/me/william278/husksync/velocity/listener/VelocityRedisListener.java b/velocity/src/main/java/net/william278/husksync/velocity/listener/VelocityRedisListener.java similarity index 96% rename from velocity/src/main/java/me/william278/husksync/velocity/listener/VelocityRedisListener.java rename to velocity/src/main/java/net/william278/husksync/velocity/listener/VelocityRedisListener.java index 6434f336..5ac95d91 100644 --- a/velocity/src/main/java/me/william278/husksync/velocity/listener/VelocityRedisListener.java +++ b/velocity/src/main/java/net/william278/husksync/velocity/listener/VelocityRedisListener.java @@ -1,15 +1,15 @@ -package me.william278.husksync.velocity.listener; +package net.william278.husksync.velocity.listener; import com.velocitypowered.api.proxy.Player; import de.themoep.minedown.adventure.MineDown; -import me.william278.husksync.HuskSyncVelocity; -import me.william278.husksync.PlayerData; -import me.william278.husksync.Server; -import me.william278.husksync.Settings; -import me.william278.husksync.migrator.MPDBMigrator; -import me.william278.husksync.redis.RedisListener; -import me.william278.husksync.redis.RedisMessage; -import me.william278.husksync.util.MessageManager; +import net.william278.husksync.HuskSyncVelocity; +import net.william278.husksync.PlayerData; +import net.william278.husksync.Server; +import net.william278.husksync.Settings; +import net.william278.husksync.migrator.MPDBMigrator; +import net.william278.husksync.redis.RedisListener; +import net.william278.husksync.redis.RedisMessage; +import net.william278.husksync.util.MessageManager; import java.io.IOException; import java.util.Objects; diff --git a/velocity/src/main/java/me/william278/husksync/velocity/util/VelocityLogger.java b/velocity/src/main/java/net/william278/husksync/velocity/util/VelocityLogger.java similarity index 91% rename from velocity/src/main/java/me/william278/husksync/velocity/util/VelocityLogger.java rename to velocity/src/main/java/net/william278/husksync/velocity/util/VelocityLogger.java index 05e364ff..4c7022e8 100644 --- a/velocity/src/main/java/me/william278/husksync/velocity/util/VelocityLogger.java +++ b/velocity/src/main/java/net/william278/husksync/velocity/util/VelocityLogger.java @@ -1,6 +1,6 @@ -package me.william278.husksync.velocity.util; +package net.william278.husksync.velocity.util; -import me.william278.husksync.util.Logger; +import net.william278.husksync.util.Logger; import java.util.logging.Level; diff --git a/velocity/src/main/java/me/william278/husksync/velocity/util/VelocityUpdateChecker.java b/velocity/src/main/java/net/william278/husksync/velocity/util/VelocityUpdateChecker.java similarity index 73% rename from velocity/src/main/java/me/william278/husksync/velocity/util/VelocityUpdateChecker.java rename to velocity/src/main/java/net/william278/husksync/velocity/util/VelocityUpdateChecker.java index f7c55c81..3799bba1 100644 --- a/velocity/src/main/java/me/william278/husksync/velocity/util/VelocityUpdateChecker.java +++ b/velocity/src/main/java/net/william278/husksync/velocity/util/VelocityUpdateChecker.java @@ -1,7 +1,7 @@ -package me.william278.husksync.velocity.util; +package net.william278.husksync.velocity.util; -import me.william278.husksync.HuskSyncVelocity; -import me.william278.husksync.util.UpdateChecker; +import net.william278.husksync.HuskSyncVelocity; +import net.william278.husksync.util.UpdateChecker; import java.util.logging.Level; diff --git a/velocity/src/main/resources/velocity-plugin.json b/velocity/src/main/resources/velocity-plugin.json index 2f9d0417..ee4c3bab 100644 --- a/velocity/src/main/resources/velocity-plugin.json +++ b/velocity/src/main/resources/velocity-plugin.json @@ -8,5 +8,5 @@ "William278" ], "dependencies": [], - "main": "me.william278.husksync.HuskSyncVelocity" + "main": "net.william278.husksync.HuskSyncVelocity" } \ No newline at end of file