-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix deprecation warning in latest Spigot versions
This maintains backwards compatibility if the new event classes don't exist.
- Loading branch information
1 parent
c29fe0b
commit 3d76fbb
Showing
9 changed files
with
362 additions
and
203 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
95 changes: 95 additions & 0 deletions
95
src/main/java/me/pseudoknight/chspigot/abstraction/bukkit/BukkitMountListener.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,95 @@ | ||
| package me.pseudoknight.chspigot.abstraction.bukkit; | ||
|
|
||
| import com.laytonsmith.abstraction.Implementation; | ||
| import com.laytonsmith.abstraction.MCEntity; | ||
| import com.laytonsmith.abstraction.bukkit.entities.BukkitMCEntity; | ||
| import com.laytonsmith.annotations.abstraction; | ||
| import com.laytonsmith.commandhelper.CommandHelperPlugin; | ||
| import com.laytonsmith.core.events.Driver; | ||
| import com.laytonsmith.core.events.EventUtils; | ||
| import me.pseudoknight.chspigot.abstraction.MCEntityDismountEvent; | ||
| import me.pseudoknight.chspigot.abstraction.MCEntityMountEvent; | ||
| import org.bukkit.event.Event; | ||
| import org.bukkit.event.EventHandler; | ||
| import org.bukkit.event.EventPriority; | ||
| import org.bukkit.event.Listener; | ||
| import org.bukkit.event.entity.EntityDismountEvent; | ||
| import org.bukkit.event.entity.EntityMountEvent; | ||
|
|
||
| public class BukkitMountListener implements Listener { | ||
|
|
||
| private static BukkitMountListener listener; | ||
|
|
||
| public static void register() { | ||
| if(listener == null){ | ||
| listener = new BukkitMountListener(); | ||
| } | ||
| CommandHelperPlugin.self.registerEvents(listener); | ||
| } | ||
|
|
||
| public static void unregister() { | ||
| EntityMountEvent.getHandlerList().unregister(listener); | ||
| EntityDismountEvent.getHandlerList().unregister(listener); | ||
| } | ||
|
|
||
| @EventHandler(priority= EventPriority.LOWEST) | ||
| public void onEntityDismount(EntityDismountEvent event) { | ||
| BukkitEntityDismountEvent bede = new BukkitEntityDismountEvent(event); | ||
| EventUtils.TriggerListener(Driver.EXTENSION, "entity_dismount", bede); | ||
| } | ||
|
|
||
| @EventHandler(priority= EventPriority.LOWEST) | ||
| public void onEntityMount(EntityMountEvent event) { | ||
| BukkitEntityMountEvent beme = new BukkitEntityMountEvent(event); | ||
| EventUtils.TriggerListener(Driver.EXTENSION, "entity_mount", beme); | ||
| } | ||
|
|
||
| @abstraction(type = Implementation.Type.BUKKIT) | ||
| public static class BukkitEntityMountEvent implements MCEntityMountEvent { | ||
| EntityMountEvent e; | ||
|
|
||
| public BukkitEntityMountEvent(Event e) { | ||
| this.e = (EntityMountEvent) e; | ||
| } | ||
|
|
||
| @Override | ||
| public MCEntity getEntity() { | ||
| return new BukkitMCEntity(e.getEntity()); | ||
| } | ||
|
|
||
| @Override | ||
| public MCEntity getMount() { | ||
| return new BukkitMCEntity(e.getMount()); | ||
| } | ||
|
|
||
| @Override | ||
| public Object _GetObject() { | ||
| return e; | ||
| } | ||
| } | ||
|
|
||
| @abstraction(type = Implementation.Type.BUKKIT) | ||
| public static class BukkitEntityDismountEvent implements MCEntityDismountEvent { | ||
| EntityDismountEvent e; | ||
|
|
||
| public BukkitEntityDismountEvent(Event e) { | ||
| this.e = (EntityDismountEvent) e; | ||
| } | ||
|
|
||
| @Override | ||
| public MCEntity getEntity() { | ||
| return new BukkitMCEntity(e.getEntity()); | ||
| } | ||
|
|
||
| @Override | ||
| public MCEntity getDismounted() { | ||
| return new BukkitMCEntity(e.getDismounted()); | ||
| } | ||
|
|
||
| @Override | ||
| public Object _GetObject() { | ||
| return e; | ||
| } | ||
|
|
||
| } | ||
| } |
140 changes: 0 additions & 140 deletions
140
src/main/java/me/pseudoknight/chspigot/abstraction/spigot/SpigotEvents.java
This file was deleted.
Oops, something went wrong.
73 changes: 73 additions & 0 deletions
73
src/main/java/me/pseudoknight/chspigot/abstraction/spigot/SpigotItemDamageListener.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,73 @@ | ||
| package me.pseudoknight.chspigot.abstraction.spigot; | ||
|
|
||
| import com.laytonsmith.abstraction.Implementation; | ||
| import com.laytonsmith.abstraction.MCItemStack; | ||
| import com.laytonsmith.abstraction.MCPlayer; | ||
| import com.laytonsmith.abstraction.bukkit.BukkitMCItemStack; | ||
| import com.laytonsmith.abstraction.bukkit.entities.BukkitMCPlayer; | ||
| import com.laytonsmith.annotations.abstraction; | ||
| import com.laytonsmith.commandhelper.CommandHelperPlugin; | ||
| import com.laytonsmith.core.events.Driver; | ||
| import com.laytonsmith.core.events.EventUtils; | ||
| import me.pseudoknight.chspigot.abstraction.MCPlayerItemDamageEvent; | ||
| import org.bukkit.event.Event; | ||
| import org.bukkit.event.EventHandler; | ||
| import org.bukkit.event.EventPriority; | ||
| import org.bukkit.event.Listener; | ||
| import org.bukkit.event.player.PlayerItemDamageEvent; | ||
|
|
||
| public class SpigotItemDamageListener implements Listener { | ||
|
|
||
| private static SpigotItemDamageListener listener; | ||
|
|
||
| public static void register() { | ||
| if (listener == null) { | ||
| listener = new SpigotItemDamageListener(); | ||
| } | ||
| CommandHelperPlugin.self.registerEvents(listener); | ||
| } | ||
|
|
||
| public static void unregister() { | ||
| PlayerItemDamageEvent.getHandlerList().unregister(listener); | ||
| } | ||
|
|
||
| @EventHandler(priority = EventPriority.LOWEST) | ||
| public void onPlayerItemDamage(PlayerItemDamageEvent event) { | ||
| SpigotPlayerItemDamageEvent spide = new SpigotPlayerItemDamageEvent(event); | ||
| EventUtils.TriggerListener(Driver.EXTENSION, "item_damage", spide); | ||
| } | ||
|
|
||
| @abstraction(type = Implementation.Type.BUKKIT) | ||
| public static class SpigotPlayerItemDamageEvent implements MCPlayerItemDamageEvent { | ||
| PlayerItemDamageEvent e; | ||
|
|
||
| public SpigotPlayerItemDamageEvent(Event e) { | ||
| this.e = (PlayerItemDamageEvent) e; | ||
| } | ||
|
|
||
| @Override | ||
| public MCItemStack getItem() { | ||
| return new BukkitMCItemStack(e.getItem()); | ||
| } | ||
|
|
||
| @Override | ||
| public int getDamage() { | ||
| return e.getDamage(); | ||
| } | ||
|
|
||
| @Override | ||
| public void setDamage(int damage) { | ||
| e.setDamage(damage); | ||
| } | ||
|
|
||
| @Override | ||
| public MCPlayer getPlayer() { | ||
| return new BukkitMCPlayer(e.getPlayer()); | ||
| } | ||
|
|
||
| @Override | ||
| public Object _GetObject() { | ||
| return e; | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.