HuskLegacy
/
HuskSync
forked from public-mirrors/HuskSync
1
0
Fork 0
Code Pull Requests Activity

Refactor package to net.william278; update dependencies & stop shading internal modules

Browse Source
feat/data-edit-commands
William 3 years ago
parent 2f3b0f37e8
commit a76aecdd23
61 changed files with 260 additions and 258 deletions
Show Stats Download Patch File Download Diff File

2
.gitignore vendored
Unescape Escape View File

@ -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/

4
api/build.gradle
Unescape Escape View File

@ -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 {

11
api/src/main/java/me/william278/husksync/bukkit/api/HuskSyncAPI.java → api/src/main/java/net/william278/husksync/bukkit/api/HuskSyncAPI.java
Unescape Escape View File

@ -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<UUID, CompletableFuture<PlayerData>> 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

4
api/src/main/java/me/william278/husksync/bukkit/api/events/SyncCompleteEvent.java → api/src/main/java/net/william278/husksync/bukkit/api/events/SyncCompleteEvent.java
Unescape Escape View File

@ -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;

4
api/src/main/java/me/william278/husksync/bukkit/api/events/SyncEvent.java → api/src/main/java/net/william278/husksync/bukkit/api/events/SyncEvent.java
Unescape Escape View File

@ -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;

6
api/src/main/java/me/william278/husksync/bukkit/data/DataSerializer.java → api/src/main/java/net/william278/husksync/bukkit/data/DataSerializer.java
Unescape Escape View File

@ -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 {

6
build.gradle
Unescape Escape View File

@ -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('')

13
bukkit/build.gradle
Unescape Escape View File

@ -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'
}

21
bukkit/src/main/java/me/william278/husksync/HuskSyncBukkit.java → bukkit/src/main/java/net/william278/husksync/HuskSyncBukkit.java
Unescape Escape View File

@ -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;

4
bukkit/src/main/java/me/william278/husksync/bukkit/config/ConfigLoader.java → bukkit/src/main/java/net/william278/husksync/bukkit/config/ConfigLoader.java
Unescape Escape View File

@ -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 {

2
bukkit/src/main/java/me/william278/husksync/bukkit/data/BukkitDataCache.java → bukkit/src/main/java/net/william278/husksync/bukkit/data/BukkitDataCache.java
Unescape Escape View File

@ -1,4 +1,4 @@
package me.william278.husksync.bukkit.data;
package net.william278.husksync.bukkit.data;
import java.util.HashMap;
import java.util.HashSet;

12
bukkit/src/main/java/me/william278/husksync/bukkit/data/DataViewer.java → bukkit/src/main/java/net/william278/husksync/bukkit/data/DataViewer.java
Unescape Escape View File

@ -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;

10
bukkit/src/main/java/me/william278/husksync/bukkit/listener/BukkitEventListener.java → bukkit/src/main/java/net/william278/husksync/bukkit/listener/BukkitEventListener.java
Unescape Escape View File

@ -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;

26
bukkit/src/main/java/me/william278/husksync/bukkit/listener/BukkitRedisListener.java → bukkit/src/main/java/net/william278/husksync/bukkit/listener/BukkitRedisListener.java
Unescape Escape View File

@ -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;

12
bukkit/src/main/java/me/william278/husksync/bukkit/migrator/MPDBDeserializer.java → bukkit/src/main/java/net/william278/husksync/bukkit/migrator/MPDBDeserializer.java
Unescape Escape View File

@ -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;

6
bukkit/src/main/java/me/william278/husksync/bukkit/util/BukkitUpdateChecker.java → bukkit/src/main/java/net/william278/husksync/bukkit/util/BukkitUpdateChecker.java
Unescape Escape View File

@ -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;

20
bukkit/src/main/java/me/william278/husksync/bukkit/util/PlayerSetter.java → bukkit/src/main/java/net/william278/husksync/bukkit/util/PlayerSetter.java
Unescape Escape View File

@ -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;

4
bukkit/src/main/java/me/william278/husksync/bukkit/util/nms/AdvancementUtils.java → bukkit/src/main/java/net/william278/husksync/bukkit/util/nms/AdvancementUtils.java
Unescape Escape View File

@ -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;

4
bukkit/src/main/java/me/william278/husksync/bukkit/util/nms/EntityUtils.java → bukkit/src/main/java/net/william278/husksync/bukkit/util/nms/EntityUtils.java
Unescape Escape View File

@ -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;

6
bukkit/src/main/java/me/william278/husksync/bukkit/util/nms/MinecraftVersionUtils.java → bukkit/src/main/java/net/william278/husksync/bukkit/util/nms/MinecraftVersionUtils.java
Unescape Escape View File

@ -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 {

2
bukkit/src/main/resources/plugin.yml
Unescape Escape View File

@ -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'

14
bungeecord/build.gradle
Unescape Escape View File

@ -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

30
bungeecord/src/main/java/me/william278/husksync/HuskSyncBungeeCord.java → bungeecord/src/main/java/net/william278/husksync/HuskSyncBungeeCord.java
Unescape Escape View File

@ -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()

24
bungeecord/src/main/java/me/william278/husksync/bungeecord/command/BungeeCommand.java → bungeecord/src/main/java/net/william278/husksync/bungeecord/command/BungeeCommand.java
Unescape Escape View File

@ -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;

8
bungeecord/src/main/java/me/william278/husksync/bungeecord/config/ConfigLoader.java → bungeecord/src/main/java/net/william278/husksync/bungeecord/config/ConfigLoader.java
Unescape Escape View File

@ -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;

6
bungeecord/src/main/java/me/william278/husksync/bungeecord/config/ConfigManager.java → bungeecord/src/main/java/net/william278/husksync/bungeecord/config/ConfigManager.java
Unescape Escape View File

@ -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;

10
bungeecord/src/main/java/me/william278/husksync/bungeecord/listener/BungeeEventListener.java → bungeecord/src/main/java/net/william278/husksync/bungeecord/listener/BungeeEventListener.java
Unescape Escape View File

@ -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;

18
bungeecord/src/main/java/me/william278/husksync/bungeecord/listener/BungeeRedisListener.java → bungeecord/src/main/java/net/william278/husksync/bungeecord/listener/BungeeRedisListener.java
Unescape Escape View File

@ -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;

4
bungeecord/src/main/java/me/william278/husksync/bungeecord/util/BungeeLogger.java → bungeecord/src/main/java/net/william278/husksync/bungeecord/util/BungeeLogger.java
Unescape Escape View File

@ -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;

6
bungeecord/src/main/java/me/william278/husksync/bungeecord/util/BungeeUpdateChecker.java → bungeecord/src/main/java/net/william278/husksync/bungeecord/util/BungeeUpdateChecker.java
Unescape Escape View File

@ -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;

2
bungeecord/src/main/resources/bungee.yml
Unescape Escape View File

@ -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'

2
common/build.gradle
Unescape Escape View File

@ -3,5 +3,5 @@ dependencies {
}
shadowJar {
relocate 'com.zaxxer', 'me.william278.husksync.libraries'
relocate 'com.zaxxer', 'net.william278.husksync.libraries'
}

2
common/src/main/java/me/william278/husksync/PlayerData.java → common/src/main/java/net/william278/husksync/PlayerData.java
Unescape Escape View File

@ -1,4 +1,4 @@
package me.william278.husksync;
package net.william278.husksync;
import java.io.*;
import java.time.Instant;

2
common/src/main/java/me/william278/husksync/Server.java → common/src/main/java/net/william278/husksync/Server.java
Unescape Escape View File

@ -1,4 +1,4 @@
package me.william278.husksync;
package net.william278.husksync;
import java.util.UUID;

2
common/src/main/java/me/william278/husksync/Settings.java → common/src/main/java/net/william278/husksync/Settings.java
Unescape Escape View File

@ -1,4 +1,4 @@
package me.william278.husksync;
package net.william278.husksync;
import java.util.ArrayList;

22
common/src/main/java/me/william278/husksync/migrator/MPDBMigrator.java → common/src/main/java/net/william278/husksync/migrator/MPDBMigrator.java
Unescape Escape View File

@ -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;

2
common/src/main/java/me/william278/husksync/migrator/MPDBPlayerData.java → common/src/main/java/net/william278/husksync/migrator/MPDBPlayerData.java
Unescape Escape View File

@ -1,4 +1,4 @@
package me.william278.husksync.migrator;
package net.william278.husksync.migrator;
import java.io.Serializable;
import java.util.UUID;

2
common/src/main/java/me/william278/husksync/proxy/command/HuskSyncCommand.java → common/src/main/java/net/william278/husksync/proxy/command/HuskSyncCommand.java
Unescape Escape View File

@ -1,4 +1,4 @@
package me.william278.husksync.proxy.command;
package net.william278.husksync.proxy.command;
public interface HuskSyncCommand {

16
common/src/main/java/me/william278/husksync/proxy/data/DataManager.java → common/src/main/java/net/william278/husksync/proxy/data/DataManager.java
Unescape Escape View File

@ -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.*;

6
common/src/main/java/me/william278/husksync/proxy/data/sql/Database.java → common/src/main/java/net/william278/husksync/proxy/data/sql/Database.java
Unescape Escape View File

@ -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;

6
common/src/main/java/me/william278/husksync/proxy/data/sql/MySQL.java → common/src/main/java/net/william278/husksync/proxy/data/sql/MySQL.java
Unescape Escape View File

@ -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;

6
common/src/main/java/me/william278/husksync/proxy/data/sql/SQLite.java → common/src/main/java/net/william278/husksync/proxy/data/sql/SQLite.java
Unescape Escape View File

@ -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;

4
common/src/main/java/me/william278/husksync/redis/RedisListener.java → common/src/main/java/net/william278/husksync/redis/RedisListener.java
Unescape Escape View File

@ -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;

6
common/src/main/java/me/william278/husksync/redis/RedisMessage.java → common/src/main/java/net/william278/husksync/redis/RedisMessage.java
Unescape Escape View File

@ -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.*;

2
common/src/main/java/me/william278/husksync/util/Logger.java → common/src/main/java/net/william278/husksync/util/Logger.java
Unescape Escape View File

@ -1,4 +1,4 @@
package me.william278.husksync.util;
package net.william278.husksync.util;
import java.util.logging.Level;

2
common/src/main/java/me/william278/husksync/util/MessageManager.java → common/src/main/java/net/william278/husksync/util/MessageManager.java
Unescape Escape View File

@ -1,4 +1,4 @@
package me.william278.husksync.util;
package net.william278.husksync.util;
import java.util.HashMap;

2
common/src/main/java/me/william278/husksync/util/ThrowSupplier.java → common/src/main/java/net/william278/husksync/util/ThrowSupplier.java
Unescape Escape View File

@ -1,4 +1,4 @@
package me.william278.husksync.util;
package net.william278.husksync.util;
public interface ThrowSupplier<T> {
T get() throws Exception;

2
common/src/main/java/me/william278/husksync/util/UpdateChecker.java → common/src/main/java/net/william278/husksync/util/UpdateChecker.java
Unescape Escape View File

@ -1,4 +1,4 @@
package me.william278.husksync.util;
package net.william278.husksync.util;
import java.io.BufferedReader;
import java.io.IOException;

2
common/src/main/java/me/william278/husksync/util/VersionUtils.java → common/src/main/java/net/william278/husksync/util/VersionUtils.java
Unescape Escape View File

@ -1,4 +1,4 @@
package me.william278.husksync.util;
package net.william278.husksync.util;
import java.util.Arrays;

4
gradle.properties
Unescape Escape View File

@ -1,5 +1,3 @@
org.gradle.parallel=true
javaVersion=16
plugin_version=1.3.3
plugin_version=1.4
plugin_archive=husksync

2
plugin/build.gradle
Unescape Escape View File

@ -19,7 +19,7 @@ shadowJar {
publishing {
publications {
mavenJava(MavenPublication) {
groupId = 'me.william278'
groupId = 'net.william278'
artifactId = 'husksync-plugin'
version = "$rootProject.version"

16
velocity/build.gradle
Unescape Escape View File

@ -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

26
velocity/src/main/java/me/william278/husksync/HuskSyncVelocity.java → velocity/src/main/java/net/william278/husksync/HuskSyncVelocity.java
Unescape Escape View File

@ -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()

24
velocity/src/main/java/me/william278/husksync/velocity/command/VelocityCommand.java → velocity/src/main/java/net/william278/husksync/velocity/command/VelocityCommand.java
Unescape Escape View File

@ -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.*;

8
velocity/src/main/java/me/william278/husksync/velocity/config/ConfigLoader.java → velocity/src/main/java/net/william278/husksync/velocity/config/ConfigLoader.java
Unescape Escape View File

@ -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;

6
velocity/src/main/java/me/william278/husksync/velocity/config/ConfigManager.java → velocity/src/main/java/net/william278/husksync/velocity/config/ConfigManager.java
Unescape Escape View File

@ -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;

13
velocity/src/main/java/me/william278/husksync/velocity/listener/VelocityEventListener.java → velocity/src/main/java/net/william278/husksync/velocity/listener/VelocityEventListener.java
Unescape Escape View File

@ -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, () -> {

18
velocity/src/main/java/me/william278/husksync/velocity/listener/VelocityRedisListener.java → velocity/src/main/java/net/william278/husksync/velocity/listener/VelocityRedisListener.java
Unescape Escape View File

@ -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;

4
velocity/src/main/java/me/william278/husksync/velocity/util/VelocityLogger.java → velocity/src/main/java/net/william278/husksync/velocity/util/VelocityLogger.java
Unescape Escape View File

@ -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;

6
velocity/src/main/java/me/william278/husksync/velocity/util/VelocityUpdateChecker.java → velocity/src/main/java/net/william278/husksync/velocity/util/VelocityUpdateChecker.java
Unescape Escape View File

@ -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;

2
velocity/src/main/resources/velocity-plugin.json
Unescape Escape View File

@ -8,5 +8,5 @@
"William278"
],
"dependencies": [],
"main": "me.william278.husksync.HuskSyncVelocity"
"main": "net.william278.husksync.HuskSyncVelocity"
}
Write Preview
Loading…
Cancel
Save