From 4d8ab12cc609e745386e40a4b8b2e474503b5496 Mon Sep 17 00:00:00 2001 From: LMBishop <13875753+LMBishop@users.noreply.github.com> Date: Sat, 27 Mar 2021 20:37:19 +0000 Subject: Fix null command - Closes #155 --- gradlew | 0 libs/IridiumSkyblock-2.6.7.jar | Bin 0 -> 1591042 bytes src/main/java/com/leonardobishop/quests/Quests.java | 2 +- 3 files changed, 1 insertion(+), 1 deletion(-) mode change 100644 => 100755 gradlew create mode 100644 libs/IridiumSkyblock-2.6.7.jar diff --git a/gradlew b/gradlew old mode 100644 new mode 100755 diff --git a/libs/IridiumSkyblock-2.6.7.jar b/libs/IridiumSkyblock-2.6.7.jar new file mode 100644 index 00000000..4cc372ac Binary files /dev/null and b/libs/IridiumSkyblock-2.6.7.jar differ diff --git a/src/main/java/com/leonardobishop/quests/Quests.java b/src/main/java/com/leonardobishop/quests/Quests.java index 1997699b..1da974a3 100644 --- a/src/main/java/com/leonardobishop/quests/Quests.java +++ b/src/main/java/com/leonardobishop/quests/Quests.java @@ -156,7 +156,7 @@ public class Quests extends JavaPlugin { dataGenerator(); 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(new MenuController(this), this); Bukkit.getPluginManager().registerEvents(new EventPlayerLeave(this), this); -- cgit v1.2.3-70-g09d2 From c411cfdcc2c1dcb0d20e9e749f33b8c5960fca79 Mon Sep 17 00:00:00 2001 From: LMBishop <13875753+LMBishop@users.noreply.github.com> Date: Mon, 29 Mar 2021 19:17:53 +0100 Subject: Fix enchantments not working in later ItemGetter(s) --- .../quests/hooks/itemgetter/ItemGetterLatest.java | 22 ++++++++++++---------- .../quests/hooks/itemgetter/ItemGetter_1_13.java | 20 +++++++++++--------- .../types/dependent/CitizensDeliverTaskType.java | 3 ++- 3 files changed, 25 insertions(+), 20 deletions(-) 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 ccced949..d9d4ec82 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,8 @@ public final class CitizensDeliverTaskType extends TaskType { ItemStack is; if (configBlock instanceof ConfigurationSection) { - is = Quests.get().getItemStack(null, (org.bukkit.configuration.ConfigurationSection) configBlock); + is = Quests.get().getItemStack("", (org.bukkit.configuration.ConfigurationSection) configBlock); + player.getInventory().addItem(is); } else { material = Material.getMaterial(String.valueOf(configBlock)); -- cgit v1.2.3-70-g09d2 From 5e81bf4631e2c2ce5925dda5c34b3d7e8cec490d Mon Sep 17 00:00:00 2001 From: LMBishop <13875753+LMBishop@users.noreply.github.com> Date: Mon, 29 Mar 2021 19:18:32 +0100 Subject: Remove test line --- .../quests/quests/tasktypes/types/dependent/CitizensDeliverTaskType.java | 1 - 1 file changed, 1 deletion(-) 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 d9d4ec82..57ca29f8 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 @@ -122,7 +122,6 @@ public final class CitizensDeliverTaskType extends TaskType { ItemStack is; if (configBlock instanceof ConfigurationSection) { is = Quests.get().getItemStack("", (org.bukkit.configuration.ConfigurationSection) configBlock); - player.getInventory().addItem(is); } else { material = Material.getMaterial(String.valueOf(configBlock)); -- cgit v1.2.3-70-g09d2 From 3367b55d7042da6490c81d98c74eaae54dea0ef3 Mon Sep 17 00:00:00 2001 From: LMBishop <13875753+LMBishop@users.noreply.github.com> Date: Mon, 29 Mar 2021 19:42:25 +0100 Subject: Update version number --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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) { -- cgit v1.2.3-70-g09d2