Fix code style;

Fix config naming;
feat/data-edit-commands
HarvelsX 3 years ago
parent c5f63b4d65
commit e96ff83f82
No known key found for this signature in database
GPG Key ID: 9637BCFE856BB8F3

@ -26,7 +26,7 @@ public class ConfigLoader {
Settings.syncFlight = config.getBoolean("synchronisation_settings.flight", false); Settings.syncFlight = config.getBoolean("synchronisation_settings.flight", false);
// Future // Future
Settings.useNativeImplementation = config.getBoolean("useNativeImplementation", false); Settings.useNativeImplementation = config.getBoolean("native_advancement_synchronization", false);
} }
} }

@ -164,18 +164,18 @@ public class PlayerSetter {
= DataSerializer.deserializeAdvancementData(data.getSerializedAdvancements()); = DataSerializer.deserializeAdvancementData(data.getSerializedAdvancements());
if (Settings.useNativeImplementation) { if (Settings.useNativeImplementation) {
try { try {
nativeSyncPlayerAdvancements(player, advancementRecords); nativeSyncPlayerAdvancements(player, advancementRecords);
} catch (Exception e) { } catch (Exception e) {
plugin.getLogger().log(Level.WARNING, plugin.getLogger().log(Level.WARNING,
"Your server does not support a native implementation of achievements synchronization"); "Your server does not support a native implementation of achievements synchronization");
plugin.getLogger().log(Level.WARNING, plugin.getLogger().log(Level.WARNING,
"Your server version {0}. Please disable using native implementation!", Bukkit.getVersion()); "Your server version {0}. Please disable using native implementation!", Bukkit.getVersion());
Settings.useNativeImplementation = false; Settings.useNativeImplementation = false;
setPlayerAdvancements(player, advancementRecords, data); setPlayerAdvancements(player, advancementRecords, data);
plugin.getLogger().log(Level.SEVERE, e.getMessage(), e); plugin.getLogger().log(Level.SEVERE, e.getMessage(), e);
} }
} else { } else {
setPlayerAdvancements(player, advancementRecords, data); setPlayerAdvancements(player, advancementRecords, data);
} }

@ -15,7 +15,7 @@ public class EntityUtils {
GET_HANDLE = ThrowSupplier.get(() -> CRAFT_ENTITY.getDeclaredMethod("getHandle")); GET_HANDLE = ThrowSupplier.get(() -> CRAFT_ENTITY.getDeclaredMethod("getHandle"));
} }
public static Object getHandle (LivingEntity livingEntity) throws RuntimeException { public static Object getHandle(LivingEntity livingEntity) throws RuntimeException {
try { try {
return GET_HANDLE.invoke(livingEntity); return GET_HANDLE.invoke(livingEntity);
} catch (IllegalAccessException | InvocationTargetException e) { } catch (IllegalAccessException | InvocationTargetException e) {

@ -8,24 +8,23 @@ public class MinecraftVersionUtils {
public final static String CRAFTBUKKIT_PACKAGE_PATH = Bukkit.getServer().getClass().getPackage().getName(); public final static String CRAFTBUKKIT_PACKAGE_PATH = Bukkit.getServer().getClass().getPackage().getName();
public final static String PACKAGE_VERSION = CRAFTBUKKIT_PACKAGE_PATH.split("\\.")[3]; public final static String PACKAGE_VERSION = CRAFTBUKKIT_PACKAGE_PATH.split("\\.")[3];
public final static String SERVER_VERSION = Bukkit.getBukkitVersion().split("-")[0];
public final static String MINECRAFT_PACKAGE = compare("1.17") < 0 ? public final static String MINECRAFT_PACKAGE = compare("1.17") < 0 ?
"net.minecraft.server.".concat(PACKAGE_VERSION) : "net.minecraft.server"; "net.minecraft.server.".concat(PACKAGE_VERSION) : "net.minecraft.server";
public final static String SERVER_VERSION = Bukkit.getBukkitVersion().split("-")[0];
public static int compare(String version) { public static int compare(String version) {
if(version == null) return 1; if (version == null) return 1;
String[] as = SERVER_VERSION.split("\\."); String[] as = SERVER_VERSION.split("\\.");
String[] bs = version.split("\\."); String[] bs = version.split("\\.");
int length = Math.max(as.length, bs.length); int length = Math.max(as.length, bs.length);
for(int i = 0; i < length; i++) { for (int i = 0; i < length; i++) {
int a = i < as.length ? Integer.parseInt(as[i]) : 0; int a = i < as.length ? Integer.parseInt(as[i]) : 0;
int b = i < bs.length ? Integer.parseInt(bs[i]) : 0; int b = i < bs.length ? Integer.parseInt(bs[i]) : 0;
if(a < b) return -1; if (a < b) return -1;
if(a > b) return 1; if (a > b) return 1;
} }
return 0; return 0;

Loading…
Cancel
Save