diff options
| -rw-r--r-- | build.gradle | 2 | ||||
| -rwxr-xr-x[-rw-r--r--] | gradlew | 0 | ||||
| -rw-r--r-- | libs/IridiumSkyblock-2.6.7.jar | bin | 0 -> 1591042 bytes | |||
| -rw-r--r-- | src/main/java/com/leonardobishop/quests/Quests.java | 2 | ||||
| -rw-r--r-- | src/main/java/com/leonardobishop/quests/hooks/itemgetter/ItemGetterLatest.java | 22 | ||||
| -rw-r--r-- | src/main/java/com/leonardobishop/quests/hooks/itemgetter/ItemGetter_1_13.java | 20 | ||||
| -rw-r--r-- | src/main/java/com/leonardobishop/quests/quests/tasktypes/types/dependent/CitizensDeliverTaskType.java | 2 |
7 files changed, 26 insertions, 22 deletions
diff --git a/build.gradle b/build.gradle index a8293a36..ce32af69 100644 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,7 @@ plugins { } group = 'com.leonardobishop' -version = '2.16' +version = '2.16.1' processResources { from(sourceSets.main.resources.srcDirs) { diff --git a/libs/IridiumSkyblock-2.6.7.jar b/libs/IridiumSkyblock-2.6.7.jar Binary files differnew file mode 100644 index 00000000..4cc372ac --- /dev/null +++ b/libs/IridiumSkyblock-2.6.7.jar diff --git a/src/main/java/com/leonardobishop/quests/Quests.java b/src/main/java/com/leonardobishop/quests/Quests.java index c2f9ac99..cbf802fb 100644 --- a/src/main/java/com/leonardobishop/quests/Quests.java +++ b/src/main/java/com/leonardobishop/quests/Quests.java @@ -174,7 +174,7 @@ public class Quests extends JavaPlugin { this.generateConfigurations(); this.setupVersionSpecific(); - Bukkit.getPluginCommand("quests").setExecutor(new CommandQuests(this)); + super.getCommand("quests").setExecutor(new CommandQuests(this)); Bukkit.getPluginManager().registerEvents(new EventPlayerJoin(this), this); Bukkit.getPluginManager().registerEvents(menuController, this); Bukkit.getPluginManager().registerEvents(new EventPlayerLeave(this), this); diff --git a/src/main/java/com/leonardobishop/quests/hooks/itemgetter/ItemGetterLatest.java b/src/main/java/com/leonardobishop/quests/hooks/itemgetter/ItemGetterLatest.java index 615d1741..2cb1ec88 100644 --- a/src/main/java/com/leonardobishop/quests/hooks/itemgetter/ItemGetterLatest.java +++ b/src/main/java/com/leonardobishop/quests/hooks/itemgetter/ItemGetterLatest.java @@ -190,16 +190,18 @@ public class ItemGetterLatest implements ItemGetter { levelName = "1"; } - NamespacedKey namespacedKey; - try { - namespacedKey = new NamespacedKey(namespace, ench); - } catch (Exception e) { - plugin.getQuestsLogger().debug("Unrecognised namespace: " + namespace); - continue; - } + // TODO i don't know how these namespaces work +// NamespacedKey namespacedKey; +// try { +// namespacedKey = new NamespacedKey(namespace, ench); +// } catch (Exception e) { +// plugin.getQuestsLogger().debug("Unrecognised namespace: " + namespace); +// e.printStackTrace(); +// continue; +// } Enchantment enchantment; - if ((enchantment = Enchantment.getByKey(namespacedKey)) == null) { - plugin.getQuestsLogger().debug("Unrecognised enchantment: " + namespacedKey); + if ((enchantment = Enchantment.getByName(ench)) == null) { + plugin.getQuestsLogger().debug("Unrecognised enchantment: " + ench); continue; } @@ -210,7 +212,7 @@ public class ItemGetterLatest implements ItemGetter { level = 1; } - is.addUnsafeEnchantment(enchantment, level); + ism.addEnchant(enchantment, level, true); } } } diff --git a/src/main/java/com/leonardobishop/quests/hooks/itemgetter/ItemGetter_1_13.java b/src/main/java/com/leonardobishop/quests/hooks/itemgetter/ItemGetter_1_13.java index aac4fec4..c3234a7f 100644 --- a/src/main/java/com/leonardobishop/quests/hooks/itemgetter/ItemGetter_1_13.java +++ b/src/main/java/com/leonardobishop/quests/hooks/itemgetter/ItemGetter_1_13.java @@ -180,16 +180,18 @@ public class ItemGetter_1_13 implements ItemGetter { levelName = "1"; } - NamespacedKey namespacedKey; - try { - namespacedKey = new NamespacedKey(namespace, ench); - } catch (Exception e) { - plugin.getQuestsLogger().debug("Unrecognised namespace: " + namespace); - continue; - } + // TODO i don't know how these namespaces work +// NamespacedKey namespacedKey; +// try { +// namespacedKey = new NamespacedKey(namespace, ench); +// } catch (Exception e) { +// plugin.getQuestsLogger().debug("Unrecognised namespace: " + namespace); +// e.printStackTrace(); +// continue; +// } Enchantment enchantment; - if ((enchantment = Enchantment.getByKey(namespacedKey)) == null) { - plugin.getQuestsLogger().debug("Unrecognised enchantment: " + namespacedKey); + if ((enchantment = Enchantment.getByName(ench)) == null) { + plugin.getQuestsLogger().debug("Unrecognised enchantment: " + ench); continue; } diff --git a/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/dependent/CitizensDeliverTaskType.java b/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/dependent/CitizensDeliverTaskType.java index 0d17b119..8afe3a4d 100644 --- a/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/dependent/CitizensDeliverTaskType.java +++ b/src/main/java/com/leonardobishop/quests/quests/tasktypes/types/dependent/CitizensDeliverTaskType.java @@ -121,7 +121,7 @@ public final class CitizensDeliverTaskType extends TaskType { ItemStack is; if (configBlock instanceof ConfigurationSection) { - is = plugin.getItemStack(null, (org.bukkit.configuration.ConfigurationSection) configBlock); + is = Quests.get().getItemStack("", (org.bukkit.configuration.ConfigurationSection) configBlock); } else { material = Material.getMaterial(String.valueOf(configBlock)); |