diff --git a/InvUI/src/main/java/de/studiocode/invui/resourcepack/ForceResourcePack.java b/InvUI/src/main/java/de/studiocode/invui/resourcepack/ForceResourcePack.java index d7953c4..ec422b0 100644 --- a/InvUI/src/main/java/de/studiocode/invui/resourcepack/ForceResourcePack.java +++ b/InvUI/src/main/java/de/studiocode/invui/resourcepack/ForceResourcePack.java @@ -1,7 +1,7 @@ package de.studiocode.invui.resourcepack; import de.studiocode.invui.InvUI; -import de.studiocode.invui.resourcepack.Icon.MaterialIcon; +import de.studiocode.invui.util.reflection.ReflectionRegistry; import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; @@ -20,19 +20,14 @@ import static org.bukkit.event.player.PlayerResourcePackStatusEvent.Status.DECLI */ public class ForceResourcePack implements Listener { - private static final String RP_VERSION = "v0.7"; + private static final String RP_VERSION = "v0.8"; /** * A resource pack with all the {@link Icon}s */ - public static final String LIGHT_RESOURCE_PACK_URL = - "https://github.com/NichtStudioCode/InvUIRP/releases/download/" + RP_VERSION + "-light/InvUIRP.zip"; - - /** - * A resource pack that also provides all {@link MaterialIcon}s - */ - public static final String COMPLETE_RESOURCE_PACK_URL = - "https://github.com/NichtStudioCode/InvUIRP/releases/download/" + RP_VERSION + "/InvUIRP.zip"; + public static final String RESOURCE_PACK_URL = + "https://github.com/NichtStudioCode/InvUIRP/releases/download/" + + RP_VERSION + (ReflectionRegistry.VERSION > 14 ? "" : "-legacy") + "/InvUIRP.zip"; private static final ForceResourcePack INSTANCE = new ForceResourcePack(); diff --git a/InvUI/src/main/java/de/studiocode/invui/util/reflection/ReflectionRegistry.java b/InvUI/src/main/java/de/studiocode/invui/util/reflection/ReflectionRegistry.java index 20dd4c1..2d65980 100644 --- a/InvUI/src/main/java/de/studiocode/invui/util/reflection/ReflectionRegistry.java +++ b/InvUI/src/main/java/de/studiocode/invui/util/reflection/ReflectionRegistry.java @@ -6,6 +6,8 @@ import static de.studiocode.invui.util.reflection.ReflectionUtils.*; public class ReflectionRegistry { + public static final int VERSION = getVersion(); + public static final String NET_MINECRAFT_SERVER_PACKAGE_PATH = getNMS(); public static final String CRAFT_BUKKIT_PACKAGE_PATH = getCB(); public static final String BUKKIT_PACKAGE_PATH = "org.bukkit."; diff --git a/InvUI/src/main/java/de/studiocode/invui/util/reflection/ReflectionUtils.java b/InvUI/src/main/java/de/studiocode/invui/util/reflection/ReflectionUtils.java index 7ada448..08146ec 100644 --- a/InvUI/src/main/java/de/studiocode/invui/util/reflection/ReflectionUtils.java +++ b/InvUI/src/main/java/de/studiocode/invui/util/reflection/ReflectionUtils.java @@ -22,6 +22,12 @@ public class ReflectionUtils { return "net.minecraft.server." + version + "."; } + protected static int getVersion() { + String version = Bukkit.getVersion(); + version = version.substring(version.indexOf("MC: "), version.length() - 1).substring(4); + return Integer.parseInt(version.split("\\.")[1]); + } + public static Class getBukkitClass(String path) { try { return Class.forName(BUKKIT_PACKAGE_PATH + path);