TicketType Wrapper changes

Author: Rothes

bukkit/version/remapped/src/main/kotlin/io/github/rothes/esu/bukkit/module/optimizations/vanillatweaks/TicketTypeHandler.kt

@@ -1,13 +1,14 @@
 package io.github.rothes.esu.bukkit.module.optimizations.vanillatweaks
 
 import io.github.rothes.esu.bukkit.util.version.Versioned
+import net.minecraft.server.level.TicketType
 
 interface TicketTypeHandler {
 
-    fun getTicketTypeMap(): Map<String, TicketType>
+    fun getTicketTypeMap(): Map<String, NmsTicketType>
 
-    interface TicketType {
-        val handle: Any
+    interface NmsTicketType {
+        val handle: TicketType<*>
         val name: String
         var expiryTicks: Long
     }

bukkit/version/v1_17_1/src/main/kotlin/io/github/rothes/esu/bukkit/module/optimizations/vanillatweaks/v1/TicketTypeHandlerImpl.kt

@@ -15,20 +15,20 @@ object TicketTypeHandlerImpl: TicketTypeHandler {
     val map = TicketType::class.java.declaredFields
         .filter { it.type.isAssignableFrom(TicketType::class.java) }
         .map { it.accessibleGet(null) as TicketType<*> }
-        .map { getTicketType(it) }
+        .map { wrapTicketType(it) }
         .associateBy { it.name }
 
-    override fun getTicketTypeMap(): Map<String, TicketTypeHandler.TicketType> {
+    override fun getTicketTypeMap(): Map<String, TicketTypeHandler.NmsTicketType> {
         return map
     }
 
-    private fun getTicketType(handle: TicketType<*>): TicketTypeHandler.TicketType {
-        return if (expiryTicksFieldPrivate) TicketTypeCBImpl(handle) else TicketTypePaperImpl(handle)
+    private fun wrapTicketType(handle: TicketType<*>): TicketTypeHandler.NmsTicketType {
+        return if (expiryTicksFieldPrivate) NmsTicketTypeCBImpl(handle) else NmsTicketTypePaperImpl(handle)
     }
 
-    class TicketTypePaperImpl(
+    class NmsTicketTypePaperImpl(
         override val handle: TicketType<*>,
-    ): TicketTypeHandler.TicketType {
+    ): TicketTypeHandler.NmsTicketType {
 
         override val name: String = handle.toString()
 
@@ -40,9 +40,9 @@ object TicketTypeHandlerImpl: TicketTypeHandler {
     }
 
     // On Spigot, it's not public
-    class TicketTypeCBImpl(
+    class NmsTicketTypeCBImpl(
         override val handle: TicketType<*>,
-    ): TicketTypeHandler.TicketType {
+    ): TicketTypeHandler.NmsTicketType {
 
         override val name: String = handle.toString()
 

bukkit/version/v1_21_6/src/main/kotlin/io/github/rothes/esu/bukkit/module/optimizations/vanillatweaks/v21_6__paper/TicketTypeHandlerImpl.kt

@@ -14,17 +14,17 @@ object TicketTypeHandlerImpl: TicketTypeHandler {
         .entrySet()
         .associate {
             val name = KEY_HANDLER.getResourceKeyString(it.key)
-            name to TicketTypeMoonriseImpl(it.value, name)
+            name to NmsTicketTypeMoonriseImpl(it.value, name)
         }
 
-    override fun getTicketTypeMap(): Map<String, TicketTypeHandler.TicketType> {
+    override fun getTicketTypeMap(): Map<String, TicketTypeHandler.NmsTicketType> {
         return map
     }
 
-    class TicketTypeMoonriseImpl(
+    class NmsTicketTypeMoonriseImpl(
         override val handle: TicketType<*>,
         override val name: String,
-    ): TicketTypeHandler.TicketType {
+    ): TicketTypeHandler.NmsTicketType {
 
         override var expiryTicks: Long
             get() = handle.timeout()