Upstream/Quests
1
0
Fork 0
mirror of https://github.com/PikaMug/Quests.git synced 2024-11-21 18:15:32 +01:00
Code Issues Projects Releases Wiki Activity

Only get package name for 1.8, part 2. See #2216

Browse Source
This commit is contained in:
PikaMug 2024-05-29 14:43:48 -04:00
parent 5d9bab93c3
commit dde8aa252b
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
core/src/main/java/me/pikamug/quests/nms/BukkitActionBarProvider.java
View File

@ -18,19 +18,20 @@ public abstract class BukkitActionBarProvider {
private static BukkitActionBarProvider loaded;
static {
final String internalsName = Bukkit.getServer().getClass().getPackage().getName().split("\\.")[3];
final String bukkitVersion = Bukkit.getServer().getBukkitVersion().split("-")[0];
try {
final String packageName = BukkitActionBarProvider.class.getPackage().getName();
if (internalsName.startsWith("v1_8_R")) {
final String packageName = BukkitParticleProvider.class.getPackage().getName();
if (bukkitVersion.startsWith("1.8.") || bukkitVersion.equals("1.8")) {
final String internalsName = Bukkit.getServer().getClass().getPackage().getName().split("\\.")[3];
loaded = (BukkitActionBarProvider) Class.forName(packageName + ".BukkitActionBarProvider_" + internalsName)
.newInstance();
} else {
// Should not be an issue because single thread, alternatives welcome!
// Referencing subclass should not be an issue because single thread, alternatives welcome!
loaded = new BukkitActionBarProvider_Modern();
}
} catch (final ClassNotFoundException | InstantiationException | IllegalAccessException
| ClassCastException exception) {
Bukkit.getLogger().severe("[Quests] No valid action bar implementation for version " + internalsName);
Bukkit.getLogger().severe("[Quests] No valid action bar implementation for version " + bukkitVersion);
}
}

11
core/src/main/java/me/pikamug/quests/nms/BukkitTitleProvider.java
View File

@ -18,19 +18,20 @@ public abstract class BukkitTitleProvider {
private static BukkitTitleProvider loaded;
static {
final String internalsName = Bukkit.getServer().getClass().getPackage().getName().split("\\.")[3];
final String bukkitVersion = Bukkit.getServer().getBukkitVersion().split("-")[0];
try {
final String packageName = BukkitTitleProvider.class.getPackage().getName();
if (internalsName.startsWith("v1_8_R")) {
final String packageName = BukkitParticleProvider.class.getPackage().getName();
if (bukkitVersion.startsWith("1.8.") || bukkitVersion.equals("1.8")) {
final String internalsName = Bukkit.getServer().getClass().getPackage().getName().split("\\.")[3];
loaded = (BukkitTitleProvider) Class.forName(packageName + ".BukkitTitleProvider_" + internalsName)
.newInstance();
} else {
// Should not be an issue because single thread, alternatives welcome!
// Referencing subclass should not be an issue because single thread, alternatives welcome!
loaded = new BukkitTitleProvider_Modern();
}
} catch (final ClassNotFoundException | InstantiationException | IllegalAccessException
| ClassCastException exception) {
Bukkit.getLogger().severe("[Quests] No valid title implementation for version " + internalsName);
Bukkit.getLogger().severe("[Quests] No valid title implementation for version " + bukkitVersion);
}
}