Skip to content
This repository was archived by the owner on Apr 23, 2025. It is now read-only.

Commit 256f8c9

Browse files
StillLuttoStillLutto
committed
refactor: even more refactoring
1 parent 1f965fc commit 256f8c9

File tree

22 files changed

+34
-47
lines changed

22 files changed

+34
-47
lines changed

‎api/src/main/java/com/undefined/api/scheduler/Scheduler.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import org.bukkit.scheduler.BukkitTask
99
* @param runnable the code to be executed synchronously
1010
* @return the BukkitTask that represents the scheduled task
1111
*/
12-
fun sync(runnable: BukkitRunnable.() -> Unit): BukkitTask = com.undefined.api.scheduler.createRunnable(runnable)
12+
fun sync(runnable: BukkitRunnable.() -> Unit): BukkitTask = createRunnable(runnable)
1313
.runTask(com.undefined.api.API.plugin)
1414

1515
/**
@@ -18,7 +18,7 @@ fun sync(runnable: BukkitRunnable.() -> Unit): BukkitTask = com.undefined.api.sc
1818
* @param runnable the code to be executed asynchronously.
1919
* @return the [BukkitTask] associated with the scheduled task.
2020
*/
21-
fun async(runnable: BukkitRunnable.() -> Unit): BukkitTask = com.undefined.api.scheduler.createRunnable(runnable)
21+
fun async(runnable: BukkitRunnable.() -> Unit): BukkitTask = createRunnable(runnable)
2222
.runTaskAsynchronously(com.undefined.api.API.plugin)
2323

2424
/**

‎common/src/main/java/com/undefined/api/command/BaseUndefinedCommand.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,9 @@ package com.undefined.api.command
22

33
import com.undefined.api.command.info.AllCommand
44
import com.undefined.api.command.sub.*
5-
import com.undefined.api.command.sub.ListSubCommand
65
import org.bukkit.command.CommandSender
76
import org.bukkit.command.ConsoleCommandSender
87
import org.bukkit.entity.Player
9-
import java.util.UUID
108

119
abstract class BaseUndefinedCommand {
1210

‎common/src/main/java/com/undefined/api/command/UndefinedCommand.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,12 @@ import com.undefined.api.command.info.AllCommand
44
import com.undefined.api.command.sub.UndefinedSubCommand
55
import com.undefined.api.nms.extensions.getPrivateField
66
import org.bukkit.Bukkit
7-
import org.bukkit.command.Command
87
import org.bukkit.command.CommandMap
98
import org.bukkit.command.CommandSender
109
import org.bukkit.command.ConsoleCommandSender
1110
import org.bukkit.command.defaults.BukkitCommand
1211
import org.bukkit.entity.Player
1312
import org.bukkit.util.StringUtil
14-
import java.util.*
1513

1614

1715
class UndefinedCommand(name: String, permission: String? = null, description: String = "", aliases: List<String> = emptyList()): BaseUndefinedCommand() {

‎common/src/main/java/com/undefined/api/command/sub/EnumSubCommand.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package com.undefined.api.command.sub
22

33
import com.undefined.api.command.info.EnumSubCommandInfo
44
import org.bukkit.command.CommandSender
5-
import java.util.*
65

76
class EnumSubCommand<T: Enum<T>>(
87
val enumClass: Class<T>

‎common/src/main/java/com/undefined/api/command/sub/ListSubCommand.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package com.undefined.api.command.sub
22

33
import com.undefined.api.command.info.ListSubCommandInfo
44
import org.bukkit.command.CommandSender
5-
import java.util.UUID
65

76
class ListSubCommand<T>(
87
private val subList: CommandSender.() -> List<T>,

‎common/src/main/java/com/undefined/api/command/sub/PlayerSubCommand.kt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package com.undefined.api.command.sub
33
import com.undefined.api.command.info.TargetCommand
44
import org.bukkit.Bukkit
55
import org.bukkit.command.CommandSender
6-
import java.util.*
76

87
class PlayerSubCommand: UndefinedSubCommand("undefined_api_players") {
98

@@ -23,11 +22,8 @@ class PlayerSubCommand: UndefinedSubCommand("undefined_api_players") {
2322
val offinePlayer = Bukkit.getOfflinePlayer(arg[indexOf])
2423
if (!offinePlayer.isOnline) return false
2524

26-
2725
targetExe.forEach { execution ->
28-
2926
if (!execution.invoke(TargetCommand(commandSender, offinePlayer.player!!))) return false
30-
3127
}
3228
return true
3329
}

‎common/src/main/java/com/undefined/api/command/sub/UndefinedSubCommand.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package com.undefined.api.command.sub
22

33
import com.undefined.api.command.BaseUndefinedCommand
44
import org.bukkit.command.CommandSender
5-
import java.util.UUID
65

76
open class UndefinedSubCommand(val name: String): BaseUndefinedCommand() {
87
override fun getNames(sender: CommandSender): List<String> = listOf(name)

‎v1_20_4/src/main/java/com/undefined/api/nms/v1_20_4/NMSManager.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,5 @@ import com.undefined.api.nms.EntityInteract
1010
* - [entityInteraction]: A hashmap that maps `NMSPlayer` instances to a lambda function representing the player's interaction action.
1111
*/
1212
object NMSManager {
13-
val entityInteraction: HashMap<com.undefined.api.nms.interfaces.NMSEntity, EntityInteract.() -> Unit> = hashMapOf()
13+
val entityInteraction: HashMap<NMSEntity, EntityInteract.() -> Unit> = hashMapOf()
1414
}

‎v1_20_4/src/main/java/com/undefined/api/nms/v1_20_4/entity/NMSEntity.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
@file:Suppress("DEPRECATION")
2+
13
package com.undefined.api.nms.v1_20_4.entity
24

35
import com.google.common.collect.ImmutableList
@@ -145,7 +147,6 @@ open class NMSEntity(override val entityType: EntityType): NMSEntity {
145147
viewers.remove(player)
146148
}
147149

148-
149150
override fun spawn(newLocation: Location) {
150151
if (viewers.isEmpty()) return
151152

‎v1_20_4/src/main/java/com/undefined/api/nms/v1_20_4/entity/NMSLivingEntity.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ import com.undefined.api.nms.interfaces.NMSLivingEntity
44
import com.undefined.api.nms.toDeltaValue
55
import com.undefined.api.nms.toRotationValue
66
import com.undefined.api.nms.v1_20_4.extensions.sendPacket
7-
import net.minecraft.network.protocol.game.*
8-
import net.minecraft.network.syncher.EntityDataAccessor
9-
import net.minecraft.network.syncher.EntityDataSerializers
10-
import net.minecraft.network.syncher.SynchedEntityData
7+
import net.minecraft.network.protocol.game.ClientboundEntityEventPacket
8+
import net.minecraft.network.protocol.game.ClientboundHurtAnimationPacket
9+
import net.minecraft.network.protocol.game.ClientboundMoveEntityPacket
10+
import net.minecraft.network.protocol.game.ClientboundRotateHeadPacket
1111
import org.bukkit.Location
1212
import org.bukkit.entity.EntityType
1313

‎v1_20_4/src/main/java/com/undefined/api/nms/v1_20_4/entity/entityClasses/NMSItemEntity.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@ import com.undefined.api.nms.interfaces.NMSItemEntity
55
import com.undefined.api.nms.v1_20_4.SpigotNMSMappings
66
import com.undefined.api.nms.v1_20_4.entity.NMSEntity
77
import net.minecraft.network.syncher.EntityDataAccessor
8-
import net.minecraft.network.syncher.EntityDataSerializers
9-
import net.minecraft.network.syncher.SynchedEntityData
108
import net.minecraft.world.entity.Entity
119
import net.minecraft.world.entity.item.ItemEntity
1210
import net.minecraft.world.level.Level

‎v1_20_4/src/main/java/com/undefined/api/nms/v1_20_4/entity/entityClasses/display/NMSTextDisplayEntity.kt

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,21 @@
11
package com.undefined.api.nms.v1_20_4.entity.entityClasses.display
22

33
import com.undefined.api.nms.interfaces.display.NMSTextDisplay
4-
import com.undefined.api.nms.v1_20_4.SpigotNMSMappings
54
import com.undefined.api.nms.v1_20_4.extensions.DATA_BACKGROUND_COLOR_ID
65
import net.minecraft.network.chat.Component
76
import net.minecraft.world.entity.Display
8-
import net.minecraft.world.entity.Display.BlockDisplay
97
import net.minecraft.world.entity.Display.TextDisplay
108
import net.minecraft.world.entity.Entity
119
import net.minecraft.world.level.Level
1210
import org.bukkit.Location
1311
import org.bukkit.entity.EntityType
14-
import java.lang.reflect.Method
1512

1613
class NMSTextDisplayEntity(text: String) : NMSDisplayEntity(EntityType.TEXT_DISPLAY), NMSTextDisplay {
1714

1815
override var text: String = text
1916
set(value) {
2017
entity?.let {
21-
val textEntity = it as Display.TextDisplay
18+
val textEntity = it as TextDisplay
2219
textEntity.text = Component.literal(value)
2320
sendMetaPackets()
2421
field = value
@@ -28,7 +25,7 @@ class NMSTextDisplayEntity(text: String) : NMSDisplayEntity(EntityType.TEXT_DISP
2825
override var width: Float = 200F
2926
set(value) {
3027
entity?.let {
31-
val textEntity = it as Display.TextDisplay
28+
val textEntity = it as TextDisplay
3229
textEntity.width = value
3330
sendMetaPackets()
3431
field = value
@@ -38,7 +35,7 @@ class NMSTextDisplayEntity(text: String) : NMSDisplayEntity(EntityType.TEXT_DISP
3835
override var backGroundColor: Int = 1073741824
3936
set(value) {
4037
entity?.let {
41-
val textEntity = it as Display.TextDisplay
38+
val textEntity = it as TextDisplay
4239
textEntity.entityData.set(textEntity.DATA_BACKGROUND_COLOR_ID(), value)
4340
sendMetaPackets()
4441
field = value
@@ -48,7 +45,7 @@ class NMSTextDisplayEntity(text: String) : NMSDisplayEntity(EntityType.TEXT_DISP
4845
override var textOpacity: Byte = -1
4946
set(value) {
5047
entity?.let {
51-
val textEntity = it as Display.TextDisplay
48+
val textEntity = it as TextDisplay
5249
textEntity.textOpacity = value
5350
sendMetaPackets()
5451
field = value

‎v1_20_4/src/main/java/com/undefined/api/nms/v1_20_4/event/PacketListenerManager.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,8 +254,9 @@ class PacketListenerManager {
254254
private fun handleArmorChange(player: Player, msg: ClientboundContainerSetSlotPacket) {
255255
val sPlayer = (player as CraftPlayer).handle
256256
val windowID = sPlayer.containerMenu.containerId
257+
val containerID = msg.getContainerID()
257258

258-
val containerID = msg.getContainerID().takeIf { windowID != it } ?: return
259+
if (containerID != windowID) return
259260
val slot = msg.getContainerSlot()
260261

261262
if (!armorSlots.containsKey(slot)) return

‎v1_20_6/src/main/java/com/undefined/api/nms/v1_20_6/entity/NMSEntity.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
@file:Suppress("DEPRECATION")
2+
13
package com.undefined.api.nms.v1_20_6.entity
24

35
import com.google.common.collect.ImmutableList

‎v1_20_6/src/main/java/com/undefined/api/nms/v1_20_6/entity/entityClass/display/NMSTextDisplayEntity.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ class NMSTextDisplayEntity(text: String) : NMSDisplayEntity(EntityType.TEXT_DISP
1515
override var text: String = text
1616
set(value) {
1717
entity?.let {
18-
val textEntity = it as Display.TextDisplay
18+
val textEntity = it as TextDisplay
1919
textEntity.text = Component.literal(value)
2020
sendMetaPackets()
2121
field = value
@@ -25,7 +25,7 @@ class NMSTextDisplayEntity(text: String) : NMSDisplayEntity(EntityType.TEXT_DISP
2525
override var width: Float = 200F
2626
set(value) {
2727
entity?.let {
28-
val textEntity = it as Display.TextDisplay
28+
val textEntity = it as TextDisplay
2929
textEntity.width = value
3030
sendMetaPackets()
3131
field = value
@@ -35,7 +35,7 @@ class NMSTextDisplayEntity(text: String) : NMSDisplayEntity(EntityType.TEXT_DISP
3535
override var backGroundColor: Int = 1073741824
3636
set(value) {
3737
entity?.let {
38-
val textEntity = it as Display.TextDisplay
38+
val textEntity = it as TextDisplay
3939
textEntity.entityData.set(textEntity.DATA_BACKGROUND_COLOR_ID(), value)
4040
sendMetaPackets()
4141
field = value
@@ -45,7 +45,7 @@ class NMSTextDisplayEntity(text: String) : NMSDisplayEntity(EntityType.TEXT_DISP
4545
override var textOpacity: Byte = -1
4646
set(value) {
4747
entity?.let {
48-
val textEntity = it as Display.TextDisplay
48+
val textEntity = it as TextDisplay
4949
textEntity.textOpacity = value
5050
sendMetaPackets()
5151
field = value

‎v1_21/src/main/java/com/undefined/api/nms/v1_21/NMSManager.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,5 @@ import com.undefined.api.nms.interfaces.NMSEntity
1010
* - [entityInteraction]: A hashmap that maps `NMSPlayer` instances to a lambda function representing the player's interaction action.
1111
*/
1212
object NMSManager {
13-
val entityInteraction: HashMap<com.undefined.api.nms.interfaces.NMSEntity, EntityInteract.() -> Unit> = hashMapOf()
13+
val entityInteraction: HashMap<NMSEntity, EntityInteract.() -> Unit> = hashMapOf()
1414
}

‎v1_21/src/main/java/com/undefined/api/nms/v1_21/entity/NMSEntity.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
@file:Suppress("DEPRECATION")
2+
13
package com.undefined.api.nms.v1_21.entity
24

35
import com.google.common.collect.ImmutableList

‎v1_21/src/main/java/com/undefined/api/nms/v1_21/entity/NMSLivingEntity.kt

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,10 @@ import com.undefined.api.nms.interfaces.NMSLivingEntity
44
import com.undefined.api.nms.toDeltaValue
55
import com.undefined.api.nms.toRotationValue
66
import com.undefined.api.nms.v1_21.extensions.sendPacket
7-
import net.minecraft.network.protocol.game.*
8-
import net.minecraft.network.syncher.EntityDataAccessor
9-
import net.minecraft.network.syncher.EntityDataSerializers
10-
import net.minecraft.network.syncher.SynchedEntityData
11-
import org.bukkit.Bukkit
7+
import net.minecraft.network.protocol.game.ClientboundEntityEventPacket
8+
import net.minecraft.network.protocol.game.ClientboundHurtAnimationPacket
9+
import net.minecraft.network.protocol.game.ClientboundMoveEntityPacket
10+
import net.minecraft.network.protocol.game.ClientboundRotateHeadPacket
1211
import org.bukkit.Location
1312
import org.bukkit.entity.EntityType
1413

‎v1_21/src/main/java/com/undefined/api/nms/v1_21/entity/entityClass/display/NMSTextDisplayEntity.kt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,13 @@
11
package com.undefined.api.nms.v1_21.entity.entityClass.display
22

33
import com.undefined.api.nms.interfaces.display.NMSTextDisplay
4-
import com.undefined.api.nms.v1_21.SpigotNMSMappings
54
import com.undefined.api.nms.v1_21.extensions.DATA_BACKGROUND_COLOR_ID
65
import net.minecraft.network.chat.Component
7-
import net.minecraft.world.entity.Display
86
import net.minecraft.world.entity.Display.TextDisplay
97
import net.minecraft.world.entity.Entity
108
import net.minecraft.world.level.Level
119
import org.bukkit.Location
1210
import org.bukkit.entity.EntityType
13-
import java.lang.reflect.Method
1411

1512

1613
class NMSTextDisplayEntity(text: String) : NMSDisplayEntity(EntityType.TEXT_DISPLAY), NMSTextDisplay {

‎v1_21/src/main/java/com/undefined/api/nms/v1_21/event/PacketListenerManager.kt

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
package com.undefined.api.nms.v1_21.event
22

3-
import com.undefined.api.customEvents.*
3+
import com.undefined.api.customEvents.ParticleEvent
4+
import com.undefined.api.customEvents.SoundEvent
5+
import com.undefined.api.customEvents.SoundStopEvent
46
import com.undefined.api.customEvents.block.BlockGroupUpdateEvent
57
import com.undefined.api.customEvents.block.BlockUpdateEvent
6-
import com.undefined.api.customEvents.entity.*
8+
import com.undefined.api.customEvents.entity.EntityExtinguishEvent
9+
import com.undefined.api.customEvents.entity.EntityIgniteEvent
710
import com.undefined.api.customEvents.entity.player.PlayerArmSwingEvent
811
import com.undefined.api.customEvents.entity.player.PlayerArmorChangeEvent
912
import com.undefined.api.customEvents.entity.player.PlayerMainHandSwitchEvent
@@ -31,7 +34,6 @@ import org.bukkit.craftbukkit.CraftSound
3134
import org.bukkit.craftbukkit.CraftWorld
3235
import org.bukkit.craftbukkit.block.data.CraftBlockData
3336
import org.bukkit.craftbukkit.entity.CraftPlayer
34-
import org.bukkit.craftbukkit.inventory.CraftItemStack
3537
import org.bukkit.entity.LivingEntity
3638
import org.bukkit.entity.Player
3739
import org.bukkit.event.player.PlayerJoinEvent

‎v1_21/src/main/java/com/undefined/api/nms/v1_21/event/UndefinedDuplexHandler.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import io.netty.channel.ChannelDuplexHandler
44
import io.netty.channel.ChannelHandlerContext
55
import io.netty.channel.ChannelPromise
66
import net.minecraft.network.protocol.Packet
7-
import org.bukkit.Material
87

98
/**
109
* A custom ChannelDuplexHandler that allows performing custom logic on incoming and outgoing channel events.

‎v1_21/src/main/java/com/undefined/api/nms/v1_21/extensions/ServerboundInteractPacketExtension.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ fun ServerboundInteractPacket.getEntityID() = getPrivateField<Int>(SpigotNMSMapp
1818
*/
1919
fun ServerboundInteractPacket.isAttacking(): Boolean {
2020
val firstChar = getActionFirstChar()
21-
return firstChar[0] == '1'
21+
return firstChar == '1'
2222
}
2323

2424
/**

0 commit comments

Comments
 (0)