From f0c0919bce7df8f9f6c654ce47698a717e79302d Mon Sep 17 00:00:00 2001 From: Poma123 Date: Sat, 16 Nov 2019 14:08:38 +0100 Subject: [PATCH 01/12] Add DisenchanterEvent --- .../Slimefun/Events/DisenchanterEvent.java | 46 +++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 src/main/java/me/mrCookieSlime/Slimefun/Events/DisenchanterEvent.java diff --git a/src/main/java/me/mrCookieSlime/Slimefun/Events/DisenchanterEvent.java b/src/main/java/me/mrCookieSlime/Slimefun/Events/DisenchanterEvent.java new file mode 100644 index 000000000..308e4adca --- /dev/null +++ b/src/main/java/me/mrCookieSlime/Slimefun/Events/DisenchanterEvent.java @@ -0,0 +1,46 @@ +package me.mrCookieSlime.Slimefun.Events; + +import me.mrCookieSlime.Slimefun.Objects.MultiBlock; + +import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SlimefunItem; +import org.bukkit.block.Block; +import org.bukkit.entity.Player; +import org.bukkit.event.Cancellable; +import org.bukkit.event.Event; +import org.bukkit.event.HandlerList; + +public class DisenchanterEvent extends Event implements Cancellable { + + private static final HandlerList handlers = new HandlerList(); + + + private SlimefunItem sfItem; + private boolean cancelled; + + public HandlerList getHandlers() { + return handlers; + } + + public static HandlerList getHandlerList() { + return handlers; + } + + public DisenchanterEvent(SlimefunItem sfItem) { + this.sfItem = sfItem; + } + + public SlimefunItem getSfItem() { + return this.sfItem; + } + + @Override + public boolean isCancelled() { + return this.cancelled; + } + + @Override + public void setCancelled(boolean cancel) { + this.cancelled = cancel; + } + +} From c6428c0e4bd44c5ecbf80c85f51fe27778d3869b Mon Sep 17 00:00:00 2001 From: Poma123 Date: Sat, 16 Nov 2019 14:09:09 +0100 Subject: [PATCH 02/12] Update AutoDisenchanter.java --- .../SlimefunItem/machines/electric/AutoDisenchanter.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/electric/AutoDisenchanter.java b/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/electric/AutoDisenchanter.java index 0bd27e613..9f6ec916e 100644 --- a/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/electric/AutoDisenchanter.java +++ b/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/electric/AutoDisenchanter.java @@ -5,9 +5,12 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; +import me.mrCookieSlime.Slimefun.Events.DisenchanterEvent; +import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.block.Block; import org.bukkit.enchantments.Enchantment; +import org.bukkit.event.Event; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.EnchantmentStorageMeta; @@ -94,6 +97,12 @@ public class AutoDisenchanter extends AContainer { return; } + final Object ev = new DisenchanterEvent(sfItem); + Bukkit.getPluginManager().callEvent((Event)ev); + if (((DisenchanterEvent)ev).isCancelled()) { + return; + } + // Disenchanting if (item != null && target != null && target.getType() == Material.BOOK) { int amount = 0; From 6f3bf2db13f9d6ac889a5151c8e522e7ac899194 Mon Sep 17 00:00:00 2001 From: Poma123 Date: Sat, 16 Nov 2019 15:49:06 +0100 Subject: [PATCH 03/12] Update DisenchanterEvent.java --- .../Slimefun/Events/DisenchanterEvent.java | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/src/main/java/me/mrCookieSlime/Slimefun/Events/DisenchanterEvent.java b/src/main/java/me/mrCookieSlime/Slimefun/Events/DisenchanterEvent.java index 308e4adca..5709974d5 100644 --- a/src/main/java/me/mrCookieSlime/Slimefun/Events/DisenchanterEvent.java +++ b/src/main/java/me/mrCookieSlime/Slimefun/Events/DisenchanterEvent.java @@ -1,20 +1,15 @@ package me.mrCookieSlime.Slimefun.Events; -import me.mrCookieSlime.Slimefun.Objects.MultiBlock; - -import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.SlimefunItem; -import org.bukkit.block.Block; -import org.bukkit.entity.Player; import org.bukkit.event.Cancellable; import org.bukkit.event.Event; import org.bukkit.event.HandlerList; +import org.bukkit.inventory.ItemStack; public class DisenchanterEvent extends Event implements Cancellable { private static final HandlerList handlers = new HandlerList(); - - private SlimefunItem sfItem; + private ItemStack sfItem; private boolean cancelled; public HandlerList getHandlers() { @@ -25,11 +20,12 @@ public class DisenchanterEvent extends Event implements Cancellable { return handlers; } - public DisenchanterEvent(SlimefunItem sfItem) { - this.sfItem = sfItem; + public DisenchanterEvent(ItemStack sfitem){ + super(true); + this.sfItem = sfitem; } - public SlimefunItem getSfItem() { + public ItemStack getSfItem() { return this.sfItem; } From fa57e6144790f0630c778879d1b138e84f8e6014 Mon Sep 17 00:00:00 2001 From: Poma123 Date: Sat, 16 Nov 2019 15:50:52 +0100 Subject: [PATCH 04/12] Update AutoDisenchanter.java --- .../SlimefunItem/machines/electric/AutoDisenchanter.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/electric/AutoDisenchanter.java b/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/electric/AutoDisenchanter.java index 9f6ec916e..b5da035bd 100644 --- a/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/electric/AutoDisenchanter.java +++ b/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/electric/AutoDisenchanter.java @@ -97,9 +97,9 @@ public class AutoDisenchanter extends AContainer { return; } - final Object ev = new DisenchanterEvent(sfItem); - Bukkit.getPluginManager().callEvent((Event)ev); - if (((DisenchanterEvent)ev).isCancelled()) { + DisenchanterEvent event = new DisenchanterEvent(item); + Bukkit.getPluginManager().callEvent(event); + if ((event).isCancelled()) { return; } From d18adecb9a2bf703f97e846aa05ec4c09cdfab00 Mon Sep 17 00:00:00 2001 From: Poma123 Date: Sat, 16 Nov 2019 16:26:28 +0100 Subject: [PATCH 05/12] Update DisenchanterEvent.java --- .../me/mrCookieSlime/Slimefun/Events/DisenchanterEvent.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/me/mrCookieSlime/Slimefun/Events/DisenchanterEvent.java b/src/main/java/me/mrCookieSlime/Slimefun/Events/DisenchanterEvent.java index 5709974d5..212577391 100644 --- a/src/main/java/me/mrCookieSlime/Slimefun/Events/DisenchanterEvent.java +++ b/src/main/java/me/mrCookieSlime/Slimefun/Events/DisenchanterEvent.java @@ -9,7 +9,7 @@ public class DisenchanterEvent extends Event implements Cancellable { private static final HandlerList handlers = new HandlerList(); - private ItemStack sfItem; + private final ItemStack sfItem; private boolean cancelled; public HandlerList getHandlers() { From 537fc57f48de0bac9e0ff80039ae93607aa79375 Mon Sep 17 00:00:00 2001 From: Poma123 Date: Sat, 16 Nov 2019 16:27:15 +0100 Subject: [PATCH 06/12] Update AutoDisenchanter.java --- .../SlimefunItem/machines/electric/AutoDisenchanter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/electric/AutoDisenchanter.java b/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/electric/AutoDisenchanter.java index b5da035bd..c21140793 100644 --- a/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/electric/AutoDisenchanter.java +++ b/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/electric/AutoDisenchanter.java @@ -99,7 +99,7 @@ public class AutoDisenchanter extends AContainer { DisenchanterEvent event = new DisenchanterEvent(item); Bukkit.getPluginManager().callEvent(event); - if ((event).isCancelled()) { + if event.isCancelled()) { return; } From 201159f3bfcb3899ca2434a2a7b931e36e201e1b Mon Sep 17 00:00:00 2001 From: Poma123 Date: Sat, 16 Nov 2019 16:29:59 +0100 Subject: [PATCH 07/12] Update AutoDisenchanter.java --- .../SlimefunItem/machines/electric/AutoDisenchanter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/electric/AutoDisenchanter.java b/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/electric/AutoDisenchanter.java index c21140793..73f154cfb 100644 --- a/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/electric/AutoDisenchanter.java +++ b/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/electric/AutoDisenchanter.java @@ -99,7 +99,7 @@ public class AutoDisenchanter extends AContainer { DisenchanterEvent event = new DisenchanterEvent(item); Bukkit.getPluginManager().callEvent(event); - if event.isCancelled()) { + if (event.isCancelled()) { return; } From 72a7f4598fee0dd9d9cc2811f313e66841cbda88 Mon Sep 17 00:00:00 2001 From: Poma123 Date: Sat, 16 Nov 2019 16:34:14 +0100 Subject: [PATCH 08/12] Update and rename DisenchanterEvent.java to AutoDisenchantEvent.java --- .../{DisenchanterEvent.java => AutoDisenchantEvent.java} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename src/main/java/me/mrCookieSlime/Slimefun/Events/{DisenchanterEvent.java => AutoDisenchantEvent.java} (85%) diff --git a/src/main/java/me/mrCookieSlime/Slimefun/Events/DisenchanterEvent.java b/src/main/java/me/mrCookieSlime/Slimefun/Events/AutoDisenchantEvent.java similarity index 85% rename from src/main/java/me/mrCookieSlime/Slimefun/Events/DisenchanterEvent.java rename to src/main/java/me/mrCookieSlime/Slimefun/Events/AutoDisenchantEvent.java index 212577391..10f1d7fc9 100644 --- a/src/main/java/me/mrCookieSlime/Slimefun/Events/DisenchanterEvent.java +++ b/src/main/java/me/mrCookieSlime/Slimefun/Events/AutoDisenchantEvent.java @@ -5,7 +5,7 @@ import org.bukkit.event.Event; import org.bukkit.event.HandlerList; import org.bukkit.inventory.ItemStack; -public class DisenchanterEvent extends Event implements Cancellable { +public class AutoDisenchantEvent extends Event implements Cancellable { private static final HandlerList handlers = new HandlerList(); @@ -20,7 +20,7 @@ public class DisenchanterEvent extends Event implements Cancellable { return handlers; } - public DisenchanterEvent(ItemStack sfitem){ + public AutoDisenchantEvent(ItemStack sfitem){ super(true); this.sfItem = sfitem; } From 212b7cffd34fc826ae7c9a87e5816e254dd108f7 Mon Sep 17 00:00:00 2001 From: Poma123 Date: Sat, 16 Nov 2019 16:35:22 +0100 Subject: [PATCH 09/12] Update AutoDisenchantEvent.java --- .../Slimefun/Events/AutoDisenchantEvent.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/me/mrCookieSlime/Slimefun/Events/AutoDisenchantEvent.java b/src/main/java/me/mrCookieSlime/Slimefun/Events/AutoDisenchantEvent.java index 10f1d7fc9..235a0a675 100644 --- a/src/main/java/me/mrCookieSlime/Slimefun/Events/AutoDisenchantEvent.java +++ b/src/main/java/me/mrCookieSlime/Slimefun/Events/AutoDisenchantEvent.java @@ -9,7 +9,7 @@ public class AutoDisenchantEvent extends Event implements Cancellable { private static final HandlerList handlers = new HandlerList(); - private final ItemStack sfItem; + private final ItemStack item; private boolean cancelled; public HandlerList getHandlers() { @@ -20,13 +20,13 @@ public class AutoDisenchantEvent extends Event implements Cancellable { return handlers; } - public AutoDisenchantEvent(ItemStack sfitem){ + public AutoDisenchantEvent(ItemStack item){ super(true); - this.sfItem = sfitem; + this.item = item; } - public ItemStack getSfItem() { - return this.sfItem; + public ItemStack getItem() { + return this.item; } @Override From 918d9c350624169c4c3d2335c9246e883c246b73 Mon Sep 17 00:00:00 2001 From: Poma123 Date: Sat, 16 Nov 2019 16:36:45 +0100 Subject: [PATCH 10/12] Update AutoDisenchanter.java --- .../SlimefunItem/machines/electric/AutoDisenchanter.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/electric/AutoDisenchanter.java b/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/electric/AutoDisenchanter.java index 73f154cfb..d51b88385 100644 --- a/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/electric/AutoDisenchanter.java +++ b/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/machines/electric/AutoDisenchanter.java @@ -5,7 +5,7 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; -import me.mrCookieSlime.Slimefun.Events.DisenchanterEvent; +import me.mrCookieSlime.Slimefun.Events.AutoDisenchantEvent; import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.block.Block; @@ -97,7 +97,7 @@ public class AutoDisenchanter extends AContainer { return; } - DisenchanterEvent event = new DisenchanterEvent(item); + AutoDisenchantEvent event = new AutoDisenchantEvent(item); Bukkit.getPluginManager().callEvent(event); if (event.isCancelled()) { return; From da0fe57ab71df18bd6ff7d2573678e29382fffe5 Mon Sep 17 00:00:00 2001 From: Poma123 Date: Sat, 16 Nov 2019 16:58:27 +0100 Subject: [PATCH 11/12] Update AutoDisenchantEvent.java --- .../Slimefun/Events/AutoDisenchantEvent.java | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/src/main/java/me/mrCookieSlime/Slimefun/Events/AutoDisenchantEvent.java b/src/main/java/me/mrCookieSlime/Slimefun/Events/AutoDisenchantEvent.java index 235a0a675..bb866cde7 100644 --- a/src/main/java/me/mrCookieSlime/Slimefun/Events/AutoDisenchantEvent.java +++ b/src/main/java/me/mrCookieSlime/Slimefun/Events/AutoDisenchantEvent.java @@ -12,18 +12,19 @@ public class AutoDisenchantEvent extends Event implements Cancellable { private final ItemStack item; private boolean cancelled; - public HandlerList getHandlers() { - return handlers; - } - - public static HandlerList getHandlerList() { - return handlers; - } - public AutoDisenchantEvent(ItemStack item){ super(true); this.item = item; } + + public HandlerList getHandlers() { + return handlers; + } + + public static HandlerList getHandlerList() { + return handlers; + } + public ItemStack getItem() { return this.item; From 87caf6ee45f4baeed36960a87ff4baaad589b379 Mon Sep 17 00:00:00 2001 From: Poma123 Date: Sat, 16 Nov 2019 17:03:56 +0100 Subject: [PATCH 12/12] Update AutoDisenchantEvent.java --- .../me/mrCookieSlime/Slimefun/Events/AutoDisenchantEvent.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/me/mrCookieSlime/Slimefun/Events/AutoDisenchantEvent.java b/src/main/java/me/mrCookieSlime/Slimefun/Events/AutoDisenchantEvent.java index bb866cde7..a4643aa63 100644 --- a/src/main/java/me/mrCookieSlime/Slimefun/Events/AutoDisenchantEvent.java +++ b/src/main/java/me/mrCookieSlime/Slimefun/Events/AutoDisenchantEvent.java @@ -12,7 +12,7 @@ public class AutoDisenchantEvent extends Event implements Cancellable { private final ItemStack item; private boolean cancelled; - public AutoDisenchantEvent(ItemStack item){ + public AutoDisenchantEvent(ItemStack item) { super(true); this.item = item; }