refactor: clean 130 files of code

Author: StillLutto

api/build.gradle.kts

@@ -2,22 +2,17 @@ plugins {
     kotlin("jvm") version "1.9.22"
 }
 
-repositories {
-}
-
-
 dependencies {
     compileOnly("org.spigotmc:spigot-api:1.20.6-R0.1-SNAPSHOT")
 }
 
 
 tasks {
-
     compileKotlin {
         kotlinOptions.jvmTarget = "21"
     }
-
 }
-kotlin{
+
+kotlin {
     jvmToolchain(21)
 }

api/src/main/java/com/undefined/api/API.kt

@@ -1,6 +1,5 @@
 package com.undefined.api
 
-
 import org.bukkit.plugin.java.JavaPlugin
 
 class API(javaPlugin: JavaPlugin) {
@@ -10,8 +9,7 @@ class API(javaPlugin: JavaPlugin) {
     }
 
     init {
-        com.undefined.api.API.Companion.plugin = javaPlugin
-
+        plugin = javaPlugin
     }
 
 }

api/src/main/java/com/undefined/api/customEvents/ParticleEvent.kt

@@ -15,5 +15,4 @@ class ParticleEvent(
     val yDist: Float,
     val zDist: Float,
     player: Player
-): UndefinedEvent() {
-}
+): UndefinedEvent()

api/src/main/java/com/undefined/api/customEvents/SoundEvent.kt

@@ -16,7 +16,6 @@ class SoundEvent(
 ) : UndefinedEvent()
 
 enum class SoundSource(name: String, id: Int) {
-
     MASTER("master",0),
     MUSIC("music",1),
     RECORDS("record",2),
@@ -27,5 +26,4 @@ enum class SoundSource(name: String, id: Int) {
     PLAYERS("players",7),
     AMBIENT("ambient",8),
     VOICE("voice",9)
-
 }

api/src/main/java/com/undefined/api/customEvents/block/BlockProgressUpdateEvent.kt

@@ -15,22 +15,18 @@ import kotlin.math.round
 
 class BlockProgressUpdateEvent(val location: Location, val stage: Int): UndefinedEvent()
 
-class BlockProgressManager(){
+class BlockProgressManager {
 
     private val blockList: HashMap<Location, Int> = hashMapOf()
 
     init {
-
         event<BlockDamageEvent> {
-
             val breakTime = getTimeNeeded(block, player)
+            val timeDetween = ceil(breakTime / 10).toInt()
 
             if (breakTime < 2 || player.gameMode != GameMode.SURVIVAL) return@event
 
-            val timeDetween = ceil(breakTime / 10).toInt()
-
             blockList[block.location] = 0
-
             Bukkit.getPluginManager().callEvent(BlockProgressUpdateEvent(block.location, 0))
 
             com.undefined.api.scheduler.repeatingTask(timeDetween) {
@@ -48,7 +44,6 @@ class BlockProgressManager(){
                 blockList[block.location] = stage
                 Bukkit.getPluginManager().callEvent(BlockProgressUpdateEvent(block.location, stage))
             }
-
         }
 
         event<BlockBreakEvent> {

api/src/main/java/com/undefined/api/customEvents/entity/player/PlayerArmorChangeEvent.kt

@@ -20,36 +20,21 @@ class PlayerArmorChangeManager {
         Pair("BOOTS", 36)
     )
 
-
     init {
-
         event<PlayerInteractEvent> {
-
             if (item == null) return@event
-
-            if (action == Action.RIGHT_CLICK_BLOCK) {
-                if (clickedBlock!!.state is InventoryHolder){
-                    return@event
-                }
-            }
-
+            if (action == Action.RIGHT_CLICK_BLOCK && clickedBlock!!.state is InventoryHolder) return@event
             if (action != Action.RIGHT_CLICK_AIR && action != Action.RIGHT_CLICK_BLOCK) return@event
 
             val name = item!!.type.name
+            val last = name.split("_").last()
 
             if (!name.contains("_")) return@event
-
-            val last = name.split("_").last
-
             if (!armorMap.containsKey(last)) return@event
 
             val slot = armorMap[last]!!
-
             Bukkit.getPluginManager().callEvent(PlayerArmorChangeEvent(player, item!!, slot))
-
         }
-
-
     }
 
 }

api/src/main/java/com/undefined/api/customEvents/entity/player/PlayerHitByPlayerEvent.kt

@@ -12,42 +12,41 @@ import org.bukkit.event.EventPriority
 import org.bukkit.event.entity.EntityDamageByEntityEvent
 import java.util.UUID
 
-
 /**
  * @hidden
  */
-class PlayerHitByPlayerManager(){
-    init {
+class PlayerHitByPlayerManager {
 
+    init {
         val enderCrystalMap: HashMap<EnderCrystal, UUID> = hashMapOf()
 
         event<EntityDamageByEntityEvent> (priority = EventPriority.HIGHEST) {
             if (isCancelled) return@event
             val player = entity as? Player ?: return@event
             val damagerPlayer = damager as? Player
-            if (damagerPlayer != null){
+            if (damagerPlayer != null) {
                 if (damagerPlayer == player) return@event
                 Bukkit.getPluginManager().callEvent(PlayerHitByPlayerEvent(player, damagerPlayer, HitCause.HAND))
                 return@event
             }
 
             val projectile = damager as? Projectile
-            if (projectile != null){
+            if (projectile != null) {
                 if (projectile.shooter is Player) {
                     if (projectile.shooter as Player == player) return@event
                     Bukkit.getPluginManager().callEvent(PlayerHitByPlayerEvent(player, projectile.shooter as Player, HitCause.PROJECTILE))
                 }
             }
 
             val tnt = damager as? TNTPrimed
-            if (tnt != null){
-                if (tnt.source is Player)
+            if (tnt != null) {
+                if (tnt.source is Player) {
                     if (tnt.source == player) return@event
                     Bukkit.getPluginManager().callEvent(PlayerHitByPlayerEvent(player, tnt.source as Player, HitCause.EXPLOSIVE))
+                }
             }
 
-            if (enderCrystalMap.containsKey(damager)){
-
+            if (enderCrystalMap.containsKey(damager)) {
                 val uuid = enderCrystalMap[damager]
 
                 if (uuid != null) {
@@ -64,18 +63,14 @@ class PlayerHitByPlayerManager(){
 
         event<EntityDamageByEntityEvent> (priority = EventPriority.HIGHEST) {
             if (isCancelled) return@event
-            val player = damager as? Player ?: return@event
-
-            if (entity is EnderCrystal){
 
+            val player = damager as? Player ?: return@event
+            if (entity is EnderCrystal) {
                 enderCrystalMap[entity as EnderCrystal] = player.uniqueId
                 delay(2) { enderCrystalMap.remove(entity as EnderCrystal) }
-
             }
-
         }
 
-
     }
 
 }
@@ -93,7 +88,7 @@ class PlayerHitByPlayerEvent(val hitPlayer: Player, val damager: Player, val hit
  * Enum class representing the cause of a hit.
  *
  */
-enum class HitCause(){
+enum class HitCause {
     HAND,
     PROJECTILE,
     END_CRYSTAL,

api/src/main/java/com/undefined/api/customEvents/entity/player/PlayerMainHandSwitchEvent.kt

@@ -4,5 +4,4 @@ import com.undefined.api.event.UndefinedEvent
 import org.bukkit.entity.Player
 import org.bukkit.inventory.ItemStack
 
-class PlayerMainHandSwitchEvent(val player: Player, val itemStack: ItemStack?): UndefinedEvent() {
-}
+class PlayerMainHandSwitchEvent(val player: Player, val itemStack: ItemStack?): UndefinedEvent()

api/src/main/java/com/undefined/api/customEvents/entity/player/PlayerUseItemEvent.kt

@@ -3,5 +3,4 @@ package com.undefined.api.customEvents.entity.player
 import com.undefined.api.event.UndefinedEvent
 import org.bukkit.entity.Player
 
-class PlayerUseItemEvent(val player: Player, val offhand: Boolean, val starting: Boolean): UndefinedEvent() {
-}
+class PlayerUseItemEvent(val player: Player, val offhand: Boolean, val starting: Boolean): UndefinedEvent()

api/src/main/java/com/undefined/api/event/Event.kt

@@ -1,6 +1,5 @@
 package com.undefined.api.event
 
-import com.undefined.api.API
 import org.bukkit.Bukkit
 import org.bukkit.event.Cancellable
 import org.bukkit.event.Event
@@ -28,7 +27,6 @@ inline fun <reified T : Event> event(
         priority,
         { _, event ->
             if (event is T) callback(event)
-
         },
         com.undefined.api.API.plugin,
         ignoreCancelled
@@ -38,7 +36,7 @@ inline fun <reified T : Event> event(
 /**
  * Implementation of the [Listener] interface that provides a method to unregister the listener from the [HandlerList].
  */
-class UndefinedListener: Listener{
+class UndefinedListener: Listener {
     fun unregister() = HandlerList.unregisterAll(this)
 }
 
@@ -47,7 +45,7 @@ class UndefinedListener: Listener{
  *
  * @property async Specifies whether the event should be handled asynchronously or not. Default value is false.
  */
-open class UndefinedEvent(async: Boolean = false): Event(async), Cancellable{
+open class UndefinedEvent(async: Boolean = false): Event(async), Cancellable {
 
     /**
      * Represents the cancellation status of an event.
@@ -63,6 +61,7 @@ open class UndefinedEvent(async: Boolean = false): Event(async), Cancellable{
      * @return true if the event has been cancelled, false otherwise
      */
     override fun isCancelled() = cancelled
+
     /**
      * Sets the cancellation state of the event. A cancelled event will not be called
      * by event handlers, and will not propagate to other event listeners.
@@ -72,6 +71,7 @@ open class UndefinedEvent(async: Boolean = false): Event(async), Cancellable{
     override fun setCancelled(cancel: Boolean) {
         cancelled = cancel
     }
+
     /**
      *
      * @hidden

api/src/main/java/com/undefined/api/nms/EntityInteract.kt

@@ -3,12 +3,9 @@ package com.undefined.api.nms
 import com.undefined.api.nms.interfaces.NMSEntity
 import org.bukkit.entity.Player
 
-
 class EntityInteract(val actionType: ClickType, val nmsEntity: NMSEntity, val player: Player)
 
 enum class ClickType {
-
     RIGHT_CLICK,
     LEFT_CLICK
-
 }

api/src/main/java/com/undefined/api/nms/ItemSlot.kt

@@ -1,25 +1,17 @@
 package com.undefined.api.nms
 
-enum class ItemSlot(val slot: Int){
-
+enum class ItemSlot(val slot: Int) {
     MAINHAND(0),
     OFFHAND(40),
     CHEST(38),
     LEGS(37),
     HEAD(39),
     FEET(36)
-
 }
 
 object ItemSlotObject{
     fun getItemSlotFromSlot(int: Int): ItemSlot?{
-
-        ItemSlot.entries.forEach() {
-            if (it.slot == int) {
-                return it
-            }
-        }
-
+        ItemSlot.entries.forEach { if (it.slot == int) return it }
         return null
     }
 }

api/src/main/java/com/undefined/api/nms/ServerPlayer.kt

@@ -8,12 +8,10 @@ import java.io.InputStreamReader
 import java.net.URI
 import kotlin.math.floor
 
-
 fun NMSLivingEntity.toDeltaValue(value: Double, newValue: Double) = (((newValue - value) * 32 * 128).toInt().toShort())
 
 fun NMSLivingEntity.toRotationValue(rotation: Float): Byte = floor(rotation * 256.0f / 360.0f).toInt().toByte()
 
-
 fun NMSPlayer.getSkinTexture(name: String): Array<String> {
 
     val textureProperty: JsonObject

api/src/main/java/com/undefined/api/nms/extensions/AnyExtensions.kt

@@ -1,5 +1,4 @@
 package com.undefined.api.nms.extensions
 
 fun <T : Any> Any.getPrivateField(fieldName: String): T = javaClass.getDeclaredField(fieldName).apply { isAccessible = true }[this] as T
-
 fun <T : Any> Any.getPrivateFieldFromSuper(fieldName: String): T = javaClass.superclass.getDeclaredField(fieldName).apply { isAccessible = true }[this] as T

api/src/main/java/com/undefined/api/nms/extensions/PlayerExtension.kt

@@ -4,9 +4,9 @@ import com.undefined.api.API
 import org.bukkit.entity.Player
 import org.bukkit.metadata.FixedMetadataValue
 
-fun Player.setMetaData(name: String, any: Any){
-    this.setMetadata(name, FixedMetadataValue(com.undefined.api.API.plugin, any))
+fun Player.setMetaData(name: String, any: Any) {
+    this.setMetadata(name, FixedMetadataValue(API.plugin, any))
 }
 
 fun Player.getMetaDataInfo(name: String): Any? = if (this.hasMetadata(name)) this.getMetadata(name)[0] else null
-fun Player.removeMetaData(name: String) = this.removeMetadata(name, com.undefined.api.API.plugin)
+fun Player.removeMetaData(name: String) = this.removeMetadata(name, API.plugin)