alexcrea/CustomAnvil
1
0
Fork 0
mirror of https://github.com/alexcrea/CustomAnvil.git synced 2026-06-24 00:26:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

append Event to the name of new events

Browse source
This commit is contained in:
alexcrea 2025-07-06 22:36:29 +02:00
parent 45c5649ee4
commit 6029193f6e
Signed by: alexcrea
GPG key ID: E346CD16413450E3
6 changed files with 20 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/xyz/alexcrea/cuanvil/api/event/listener/CAClickResultBypass.java → src/main/java/xyz/alexcrea/cuanvil/api/event/listener/CAClickResultBypassEvent.java
View file

@ -6,7 +6,7 @@ import org.bukkit.event.HandlerList;
import org.bukkit.event.inventory.InventoryClickEvent; import org.bukkit.event.inventory.InventoryClickEvent;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
public class CAClickResultBypass extends Event implements Cancellable { public class CAClickResultBypassEvent extends Event implements Cancellable {
private static final HandlerList HANDLERS = new HandlerList(); private static final HandlerList HANDLERS = new HandlerList();
@ -39,7 +39,7 @@ public class CAClickResultBypass extends Event implements Cancellable {
return event; return event;
} }
public CAClickResultBypass(@NotNull InventoryClickEvent event) { public CAClickResultBypassEvent(@NotNull InventoryClickEvent event) {
this.event = event; this.event = event;
} }
} }

4
src/main/java/xyz/alexcrea/cuanvil/api/event/listener/CAEarlyPreAnvilBypass.java → src/main/java/xyz/alexcrea/cuanvil/api/event/listener/CAEarlyPreAnvilBypassEventEvent.java
View file

@ -4,7 +4,7 @@ import org.bukkit.event.HandlerList;
import org.bukkit.event.inventory.PrepareAnvilEvent; import org.bukkit.event.inventory.PrepareAnvilEvent;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
public class CAEarlyPreAnvilBypass extends CAPreAnvilBypass { public class CAEarlyPreAnvilBypassEventEvent extends CAPreAnvilBypassEvent {
private static final HandlerList HANDLERS = new HandlerList(); private static final HandlerList HANDLERS = new HandlerList();
@ -17,7 +17,7 @@ public class CAEarlyPreAnvilBypass extends CAPreAnvilBypass {
return HANDLERS; return HANDLERS;
} }
public CAEarlyPreAnvilBypass(@NotNull PrepareAnvilEvent event) { public CAEarlyPreAnvilBypassEventEvent(@NotNull PrepareAnvilEvent event) {
super(event); super(event);
} }

4
src/main/java/xyz/alexcrea/cuanvil/api/event/listener/CAPreAnvilBypass.java → src/main/java/xyz/alexcrea/cuanvil/api/event/listener/CAPreAnvilBypassEvent.java
View file

@ -6,7 +6,7 @@ import org.bukkit.event.HandlerList;
import org.bukkit.event.inventory.PrepareAnvilEvent; import org.bukkit.event.inventory.PrepareAnvilEvent;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
public class CAPreAnvilBypass extends Event implements Cancellable { public class CAPreAnvilBypassEvent extends Event implements Cancellable {
private static final HandlerList HANDLERS = new HandlerList(); private static final HandlerList HANDLERS = new HandlerList();
@ -39,7 +39,7 @@ public class CAPreAnvilBypass extends Event implements Cancellable {
return event; return event;
} }
public CAPreAnvilBypass(@NotNull PrepareAnvilEvent event) { public CAPreAnvilBypassEvent(@NotNull PrepareAnvilEvent event) {
this.event = event; this.event = event;
} }

6
src/main/java/xyz/alexcrea/cuanvil/api/event/listener/CATreatAnvilResult.java → src/main/java/xyz/alexcrea/cuanvil/api/event/listener/CATreatAnvilResultEvent.java
View file

@ -1,16 +1,14 @@
package xyz.alexcrea.cuanvil.api.event.listener; package xyz.alexcrea.cuanvil.api.event.listener;
import org.bukkit.event.Cancellable;
import org.bukkit.event.Event; import org.bukkit.event.Event;
import org.bukkit.event.HandlerList; import org.bukkit.event.HandlerList;
import org.bukkit.event.inventory.InventoryClickEvent;
import org.bukkit.event.inventory.PrepareAnvilEvent; import org.bukkit.event.inventory.PrepareAnvilEvent;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import xyz.alexcrea.cuanvil.util.AnvilUseType; import xyz.alexcrea.cuanvil.util.AnvilUseType;
public class CATreatAnvilResult extends Event { public class CATreatAnvilResultEvent extends Event {
private static final HandlerList HANDLERS = new HandlerList(); private static final HandlerList HANDLERS = new HandlerList();
@ -33,7 +31,7 @@ public class CATreatAnvilResult extends Event {
private int levelCost; private int levelCost;
public CATreatAnvilResult(@NotNull PrepareAnvilEvent event, AnvilUseType useType, @Nullable ItemStack result, int levelCost) { public CATreatAnvilResultEvent(@NotNull PrepareAnvilEvent event, AnvilUseType useType, @Nullable ItemStack result, int levelCost) {
this.event = event; this.event = event;
this.useType = useType; this.useType = useType;
this.result = result; this.result = result;

20
src/main/kotlin/xyz/alexcrea/cuanvil/dependency/DependencyManager.kt
View file

@ -8,10 +8,10 @@ import org.bukkit.event.inventory.InventoryClickEvent
import org.bukkit.event.inventory.PrepareAnvilEvent import org.bukkit.event.inventory.PrepareAnvilEvent
import org.bukkit.inventory.AnvilInventory import org.bukkit.inventory.AnvilInventory
import org.bukkit.inventory.ItemStack import org.bukkit.inventory.ItemStack
import xyz.alexcrea.cuanvil.api.event.listener.CAClickResultBypass import xyz.alexcrea.cuanvil.api.event.listener.CAClickResultBypassEvent
import xyz.alexcrea.cuanvil.api.event.listener.CAEarlyPreAnvilBypass import xyz.alexcrea.cuanvil.api.event.listener.CAEarlyPreAnvilBypassEventEvent
import xyz.alexcrea.cuanvil.api.event.listener.CAPreAnvilBypass import xyz.alexcrea.cuanvil.api.event.listener.CAPreAnvilBypassEvent
import xyz.alexcrea.cuanvil.api.event.listener.CATreatAnvilResult import xyz.alexcrea.cuanvil.api.event.listener.CATreatAnvilResultEvent
import xyz.alexcrea.cuanvil.config.ConfigHolder import xyz.alexcrea.cuanvil.config.ConfigHolder
import xyz.alexcrea.cuanvil.dependency.datapack.DataPackDependency import xyz.alexcrea.cuanvil.dependency.datapack.DataPackDependency
import xyz.alexcrea.cuanvil.dependency.gui.ExternGuiTester import xyz.alexcrea.cuanvil.dependency.gui.ExternGuiTester
@ -145,7 +145,7 @@ object DependencyManager {
private fun earlyUnsafeTryEventPreAnvilBypass(event: PrepareAnvilEvent, player: HumanEntity): Boolean { private fun earlyUnsafeTryEventPreAnvilBypass(event: PrepareAnvilEvent, player: HumanEntity): Boolean {
// Run the event // Run the event
val bypassEvent = CAEarlyPreAnvilBypass(event) val bypassEvent = CAEarlyPreAnvilBypassEventEvent(event)
Bukkit.getPluginManager().callEvent(bypassEvent) Bukkit.getPluginManager().callEvent(bypassEvent)
var bypass = bypassEvent.isCancelled var bypass = bypassEvent.isCancelled
@ -181,7 +181,7 @@ object DependencyManager {
private fun unsafeTryEventPreAnvilBypass(event: PrepareAnvilEvent, player: HumanEntity): Boolean { private fun unsafeTryEventPreAnvilBypass(event: PrepareAnvilEvent, player: HumanEntity): Boolean {
// Run the event // Run the event
val bypassEvent = CAPreAnvilBypass(event) val bypassEvent = CAPreAnvilBypassEvent(event)
Bukkit.getPluginManager().callEvent(bypassEvent) Bukkit.getPluginManager().callEvent(bypassEvent)
var bypass = bypassEvent.isCancelled var bypass = bypassEvent.isCancelled
@ -203,8 +203,8 @@ object DependencyManager {
} }
// Return null if there was an issue // Return null if there was an issue
fun tryTreatAnvilResult(event: PrepareAnvilEvent, result: ItemStack, useType: AnvilUseType, cost: Int): CATreatAnvilResult? { fun tryTreatAnvilResult(event: PrepareAnvilEvent, result: ItemStack, useType: AnvilUseType, cost: Int): CATreatAnvilResultEvent? {
val treatEvent = CATreatAnvilResult(event, useType, result, cost) val treatEvent = CATreatAnvilResultEvent(event, useType, result, cost)
try { try {
unsafeTryTreatAnvilResult(treatEvent) unsafeTryTreatAnvilResult(treatEvent)
return treatEvent; return treatEvent;
@ -227,7 +227,7 @@ object DependencyManager {
} }
} }
private fun unsafeTryTreatAnvilResult(event: CATreatAnvilResult) { private fun unsafeTryTreatAnvilResult(event: CATreatAnvilResultEvent) {
Bukkit.getPluginManager().callEvent(event) Bukkit.getPluginManager().callEvent(event)
excellentEnchantsCompatibility?.treatAnvilResult(event) excellentEnchantsCompatibility?.treatAnvilResult(event)
@ -258,7 +258,7 @@ object DependencyManager {
private fun unsafeTryClickAnvilResultBypass(event: InventoryClickEvent, inventory: AnvilInventory): Boolean { private fun unsafeTryClickAnvilResultBypass(event: InventoryClickEvent, inventory: AnvilInventory): Boolean {
// Run the event // Run the event
val bypassEvent = CAClickResultBypass(event) val bypassEvent = CAClickResultBypassEvent(event)
Bukkit.getPluginManager().callEvent(bypassEvent) Bukkit.getPluginManager().callEvent(bypassEvent)
var bypass = bypassEvent.isCancelled var bypass = bypassEvent.isCancelled

4
src/main/kotlin/xyz/alexcrea/cuanvil/dependency/plugins/ExcellentEnchantsDependency.kt
View file

@ -8,7 +8,7 @@ import org.bukkit.event.inventory.PrepareAnvilEvent
import org.bukkit.inventory.ItemStack import org.bukkit.inventory.ItemStack
import org.bukkit.plugin.RegisteredListener import org.bukkit.plugin.RegisteredListener
import xyz.alexcrea.cuanvil.api.EnchantmentApi import xyz.alexcrea.cuanvil.api.EnchantmentApi
import xyz.alexcrea.cuanvil.api.event.listener.CATreatAnvilResult import xyz.alexcrea.cuanvil.api.event.listener.CATreatAnvilResultEvent
import xyz.alexcrea.cuanvil.enchant.wrapped.CAEEPreV5Enchantment import xyz.alexcrea.cuanvil.enchant.wrapped.CAEEPreV5Enchantment
import xyz.alexcrea.cuanvil.enchant.wrapped.CAEEV5Enchantment import xyz.alexcrea.cuanvil.enchant.wrapped.CAEEV5Enchantment
import xyz.alexcrea.cuanvil.enchant.wrapped.CALegacyEEEnchantment import xyz.alexcrea.cuanvil.enchant.wrapped.CALegacyEEEnchantment
@ -192,7 +192,7 @@ class ExcellentEnchantsDependency {
return handleRechargeMethod.invoke(this.usedAnvilListener, event, first, second) as Boolean return handleRechargeMethod.invoke(this.usedAnvilListener, event, first, second) as Boolean
} }
fun treatAnvilResult(event: CATreatAnvilResult) { fun treatAnvilResult(event: CATreatAnvilResultEvent) {
val result = event.result val result = event.result
if (result == null) return if (result == null) return