Update nms-utilities

xenondevs · Aug 27, 2023 · cd79de5 · cd79de5
1 parent f62c136
commit cd79de5
Show file tree

Hide file tree

Showing 9 changed files with 23 additions and 24 deletions.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -50,7 +50,7 @@ maven-resolver-provider = { group = "org.apache.maven", name = "maven-resolver-p
 maven-resolver-transport-http = { group = "org.apache.maven.resolver", name = "maven-resolver-transport-http", version = "1.8.2" }
 minecraft-asset-downloader = { group = "xyz.xenondevs", name = "minecraft-asset-downloader", version = "1.3" }
 minecraft-model-renderer = { group = "xyz.xenondevs", name = "minecraft-model-renderer", version = "1.3" }
-nmsutilities = { group = "xyz.xenondevs", name = "nms-utilities", version = "0.13" }
+nmsutilities = { group = "xyz.xenondevs", name = "nms-utilities", version = "0.14" }
 paper-api = { group = "io.papermc.paper", name = "paper-api", version.ref = "paper" }
 resource-pack-obfuscator = { group = "xyz.xenondevs", name = "resource-pack-obfuscator", version = "0.4.1" }
 specialsource = { group = "net.md-5", name = "SpecialSource", version = "1.11.0" }

diff --git a/nova/src/main/kotlin/xyz/xenondevs/nova/data/recipe/RecipeManager.kt b/nova/src/main/kotlin/xyz/xenondevs/nova/data/recipe/RecipeManager.kt
@@ -14,6 +14,8 @@ import org.bukkit.inventory.CraftingInventory
 import org.bukkit.inventory.ItemStack
 import xyz.xenondevs.nmsutils.network.ClientboundPlaceGhostRecipePacket
 import xyz.xenondevs.nmsutils.network.event.PacketHandler
+import xyz.xenondevs.nmsutils.network.event.PacketListener
+import xyz.xenondevs.nmsutils.network.event.registerPacketListener
 import xyz.xenondevs.nmsutils.network.event.serverbound.ServerboundPlaceRecipePacketEvent
 import xyz.xenondevs.nova.LOGGER
 import xyz.xenondevs.nova.addon.AddonsInitializer
@@ -33,7 +35,6 @@ import xyz.xenondevs.nova.util.item.novaItem
 import xyz.xenondevs.nova.util.namespacedKey
 import xyz.xenondevs.nova.util.reflection.ReflectionRegistry
 import xyz.xenondevs.nova.util.registerEvents
-import xyz.xenondevs.nova.util.registerPacketListener
 import xyz.xenondevs.nova.util.resourceLocation
 import xyz.xenondevs.nova.util.runTask
 import xyz.xenondevs.nova.util.send
@@ -51,7 +52,7 @@ private val ALLOW_RESULT_OVERWRITE by MAIN_CONFIG.entry<Boolean>("debug", "allow
     stage = InternalInitStage.POST_WORLD,
     dependsOn = [AddonsInitializer::class, HooksLoader::class, VanillaRecipeTypes::class]
 )
-object RecipeManager : Listener {
+object RecipeManager : Listener, PacketListener {
 
     private val INTERNAL_RECIPES: Map<ResourceLocation, (ResourceLocation) -> MojangRecipe<*>> = mapOf(
         ResourceLocation("minecraft", "repair_item") to ::RepairItemRecipe

diff --git a/nova/src/main/kotlin/xyz/xenondevs/nova/item/logic/ItemListener.kt b/nova/src/main/kotlin/xyz/xenondevs/nova/item/logic/ItemListener.kt
@@ -15,6 +15,8 @@ import org.bukkit.event.player.PlayerItemDamageEvent
 import org.bukkit.inventory.EquipmentSlot
 import org.bukkit.inventory.ItemStack
 import xyz.xenondevs.nmsutils.network.event.PacketHandler
+import xyz.xenondevs.nmsutils.network.event.PacketListener
+import xyz.xenondevs.nmsutils.network.event.registerPacketListener
 import xyz.xenondevs.nmsutils.network.event.serverbound.ServerboundPlayerActionPacketEvent
 import xyz.xenondevs.nmsutils.network.event.serverbound.ServerboundUseItemPacketEvent
 import xyz.xenondevs.nova.initialize.InitFun
@@ -28,12 +30,11 @@ import xyz.xenondevs.nova.util.isCompletelyDenied
 import xyz.xenondevs.nova.util.item.novaItem
 import xyz.xenondevs.nova.util.item.takeUnlessEmpty
 import xyz.xenondevs.nova.util.registerEvents
-import xyz.xenondevs.nova.util.registerPacketListener
 import xyz.xenondevs.nova.world.block.event.BlockBreakActionEvent
 import java.util.*
 
 @InternalInit(stage = InternalInitStage.POST_WORLD_ASYNC)
-internal object ItemListener : Listener {
+internal object ItemListener : Listener, PacketListener {
 
     private val usedItems = WeakHashMap<Player, ItemStack>()
 

diff --git a/nova/src/main/kotlin/xyz/xenondevs/nova/item/logic/PacketItems.kt b/nova/src/main/kotlin/xyz/xenondevs/nova/item/logic/PacketItems.kt
@@ -31,12 +31,14 @@ import org.bukkit.entity.Player
 import org.bukkit.event.Listener
 import xyz.xenondevs.commons.collections.takeUnlessEmpty
 import xyz.xenondevs.nmsutils.network.event.PacketHandler
+import xyz.xenondevs.nmsutils.network.event.PacketListener
 import xyz.xenondevs.nmsutils.network.event.clientbound.ClientboundContainerSetContentPacketEvent
 import xyz.xenondevs.nmsutils.network.event.clientbound.ClientboundContainerSetSlotPacketEvent
 import xyz.xenondevs.nmsutils.network.event.clientbound.ClientboundMerchantOffersPacketEvent
 import xyz.xenondevs.nmsutils.network.event.clientbound.ClientboundSetEntityDataPacketEvent
 import xyz.xenondevs.nmsutils.network.event.clientbound.ClientboundSetEquipmentPacketEvent
 import xyz.xenondevs.nmsutils.network.event.clientbound.ClientboundUpdateRecipesPacketEvent
+import xyz.xenondevs.nmsutils.network.event.registerPacketListener
 import xyz.xenondevs.nmsutils.network.event.serverbound.ServerboundSetCreativeModeSlotPacketEvent
 import xyz.xenondevs.nova.data.recipe.RecipeManager
 import xyz.xenondevs.nova.data.resources.ResourceGeneration
@@ -65,7 +67,6 @@ import xyz.xenondevs.nova.util.item.ItemUtils
 import xyz.xenondevs.nova.util.item.novaCompoundOrNull
 import xyz.xenondevs.nova.util.item.novaItem
 import xyz.xenondevs.nova.util.registerEvents
-import xyz.xenondevs.nova.util.registerPacketListener
 import xyz.xenondevs.nova.util.serverPlayer
 import java.text.DecimalFormat
 import java.text.DecimalFormatSymbols
@@ -107,7 +108,7 @@ private val GLINT_ENCHANTMENT_TAG = ListTag().apply {
     stage = InternalInitStage.POST_WORLD,
     dependsOn = [ResourceGeneration.PreWorld::class]
 )
-internal object PacketItems : Listener {
+internal object PacketItems : Listener, PacketListener {
 
     val SERVER_SIDE_MATERIAL = Material.SHULKER_SHELL
     val SERVER_SIDE_ITEM = CraftMagicNumbers.getItem(SERVER_SIDE_MATERIAL)!!

diff --git a/nova/src/main/kotlin/xyz/xenondevs/nova/ui/overlay/bossbar/BossBarOverlayManager.kt b/nova/src/main/kotlin/xyz/xenondevs/nova/ui/overlay/bossbar/BossBarOverlayManager.kt
@@ -21,7 +21,10 @@ import xyz.xenondevs.nmsutils.bossbar.operation.UpdateProgressBossBarOperation
 import xyz.xenondevs.nmsutils.bossbar.operation.UpdatePropertiesBossBarOperation
 import xyz.xenondevs.nmsutils.bossbar.operation.UpdateStyleBossBarOperation
 import xyz.xenondevs.nmsutils.network.event.PacketHandler
+import xyz.xenondevs.nmsutils.network.event.PacketListener
 import xyz.xenondevs.nmsutils.network.event.clientbound.ClientboundBossEventPacketEvent
+import xyz.xenondevs.nmsutils.network.event.registerPacketListener
+import xyz.xenondevs.nmsutils.network.event.unregisterPacketListener
 import xyz.xenondevs.nova.NOVA_PLUGIN
 import xyz.xenondevs.nova.data.config.MAIN_CONFIG
 import xyz.xenondevs.nova.data.config.entry
@@ -37,17 +40,15 @@ import xyz.xenondevs.nova.ui.overlay.bossbar.vanilla.VanillaBossBarOverlayCompou
 import xyz.xenondevs.nova.ui.overlay.character.MovedFonts
 import xyz.xenondevs.nova.util.component.adventure.move
 import xyz.xenondevs.nova.util.registerEvents
-import xyz.xenondevs.nova.util.registerPacketListener
 import xyz.xenondevs.nova.util.runTaskTimer
 import xyz.xenondevs.nova.util.send
 import xyz.xenondevs.nova.util.unregisterEvents
-import xyz.xenondevs.nova.util.unregisterPacketListener
 import java.util.*
 import kotlin.math.max
 import net.minecraft.network.chat.Component as MojangComponent
 
 @InternalInit(stage = InternalInitStage.POST_WORLD)
-object BossBarOverlayManager : Listener {
+object BossBarOverlayManager : Listener, PacketListener {
 
     val ENABLED by MAIN_CONFIG.entry<Boolean>("overlay", "bossbar", "enabled")
     private val BAR_AMOUNT by MAIN_CONFIG.entry<Int>("overlay", "bossbar", "amount")

diff --git a/nova/src/main/kotlin/xyz/xenondevs/nova/util/EventUtils.kt b/nova/src/main/kotlin/xyz/xenondevs/nova/util/EventUtils.kt
@@ -42,14 +42,6 @@ val BlockPhysicsEvent.changed: BlockData
 
 fun callEvent(event: Event) = Bukkit.getPluginManager().callEvent(event)
 
-fun Any.registerPacketListener() {
-    PacketEventManager.registerListener(this)
-}
-
-fun Any.unregisterPacketListener() {
-    PacketEventManager.unregisterListener(this)
-}
-
 fun Listener.registerEvents() {
     Bukkit.getPluginManager().registerEvents(this, NOVA_PLUGIN)
 }

diff --git a/nova/src/main/kotlin/xyz/xenondevs/nova/world/block/hitbox/HitboxManager.kt b/nova/src/main/kotlin/xyz/xenondevs/nova/world/block/hitbox/HitboxManager.kt
@@ -14,14 +14,15 @@ import org.joml.Intersectionf
 import org.joml.Vector2f
 import org.joml.Vector3f
 import xyz.xenondevs.nmsutils.network.event.PacketHandler
+import xyz.xenondevs.nmsutils.network.event.PacketListener
 import xyz.xenondevs.nmsutils.network.event.clientbound.ServerboundInteractPacketEvent
+import xyz.xenondevs.nmsutils.network.event.registerPacketListener
 import xyz.xenondevs.nova.integration.protection.ProtectionManager
 import xyz.xenondevs.nova.player.WrappedPlayerInteractEvent
 import xyz.xenondevs.nova.util.bukkitEquipmentSlot
 import xyz.xenondevs.nova.util.concurrent.runIfTrueOnSimilarThread
 import xyz.xenondevs.nova.util.isCompletelyDenied
 import xyz.xenondevs.nova.util.registerEvents
-import xyz.xenondevs.nova.util.registerPacketListener
 import xyz.xenondevs.nova.util.runTask
 import xyz.xenondevs.nova.util.serverLevel
 import xyz.xenondevs.nova.util.toLocation
@@ -35,7 +36,7 @@ import java.util.*
 import org.bukkit.event.block.Action as BlockAction
 import xyz.xenondevs.nmsutils.network.event.clientbound.ServerboundInteractPacketEvent.Action as EntityAction
 
-internal object HitboxManager : Listener {
+internal object HitboxManager : Listener, PacketListener {
 
     private val physicalHitboxes = HashMap<PhysicalHitbox, FakeInteraction>()
     private val physicalHitboxesById = HashMap<Int, PhysicalHitbox>()

diff --git a/nova/src/main/kotlin/xyz/xenondevs/nova/world/block/logic/break/BlockBreaking.kt b/nova/src/main/kotlin/xyz/xenondevs/nova/world/block/logic/break/BlockBreaking.kt
@@ -15,6 +15,8 @@ import org.bukkit.event.Listener
 import org.bukkit.event.block.Action
 import org.bukkit.event.player.PlayerQuitEvent
 import xyz.xenondevs.nmsutils.network.event.PacketHandler
+import xyz.xenondevs.nmsutils.network.event.PacketListener
+import xyz.xenondevs.nmsutils.network.event.registerPacketListener
 import xyz.xenondevs.nmsutils.network.event.serverbound.ServerboundPlayerActionPacketEvent
 import xyz.xenondevs.nmsutils.network.packetHandler
 import xyz.xenondevs.nmsutils.util.removeIf
@@ -23,7 +25,6 @@ import xyz.xenondevs.nova.data.config.MAIN_CONFIG
 import xyz.xenondevs.nova.data.config.entry
 import xyz.xenondevs.nova.integration.customitems.CustomItemServiceManager
 import xyz.xenondevs.nova.util.registerEvents
-import xyz.xenondevs.nova.util.registerPacketListener
 import xyz.xenondevs.nova.util.runTask
 import xyz.xenondevs.nova.util.runTaskTimer
 import xyz.xenondevs.nova.util.send
@@ -38,7 +39,7 @@ import java.util.logging.Level
 
 private val BREAK_COOLDOWN by MAIN_CONFIG.entry<Int>("world", "block_breaking", "break_cooldown")
 
-internal object BlockBreaking : Listener {
+internal object BlockBreaking : Listener, PacketListener {
 
     private val breakCooldowns = ConcurrentHashMap<Player, Int>()
     private val playerBreakers = ConcurrentHashMap<Player, BlockBreaker>()

diff --git a/nova/src/main/kotlin/xyz/xenondevs/nova/world/block/logic/sound/SoundEngine.kt b/nova/src/main/kotlin/xyz/xenondevs/nova/world/block/logic/sound/SoundEngine.kt
@@ -5,14 +5,15 @@ import net.minecraft.resources.ResourceLocation
 import net.minecraft.sounds.SoundEvent
 import org.bukkit.event.Listener
 import xyz.xenondevs.nmsutils.network.event.PacketHandler
+import xyz.xenondevs.nmsutils.network.event.PacketListener
 import xyz.xenondevs.nmsutils.network.event.clientbound.ClientboundSoundEntityPacketEvent
 import xyz.xenondevs.nmsutils.network.event.clientbound.ClientboundSoundPacketEvent
+import xyz.xenondevs.nmsutils.network.event.registerPacketListener
 import xyz.xenondevs.nova.data.config.PermanentStorage
 import xyz.xenondevs.nova.util.registerEvents
-import xyz.xenondevs.nova.util.registerPacketListener
 import xyz.xenondevs.nova.util.take
 
-internal object SoundEngine : Listener {
+internal object SoundEngine : Listener, PacketListener {
 
     private val SOUND_OVERRIDES: HashSet<String> = PermanentStorage.retrieve("soundOverrides", ::HashSet)