cleanup some warnings

Author: OmniacDev

src/jvmMain/kotlin/OfflinePlayer.kt

@@ -48,24 +48,24 @@ class OfflinePlayer(override var uuid: UUID) :
         get() = Server.instance.bannedPlayers.isBanned(this.getEntityName())
         set(value) {
             if (value) {
-                Server.instance.bannedPlayers.addBan(this.getEntityName()!!, null, null, null)
+                Server.instance.bannedPlayers.addBan(this.getEntityName(), null, null, null)
             } else {
-                Server.instance.bannedPlayers.remove(this.getEntityName()!!)
+                Server.instance.bannedPlayers.remove(this.getEntityName())
             }
         }
 
     override var isWhitelisted: Boolean
-        get() = Server.instance.isWhitelisted(getEntityName()!!.lowercase())
+        get() = Server.instance.isWhitelisted(getEntityName().lowercase())
         set(value) {
             if (value) {
-                Server.instance.addWhitelist(getEntityName()!!.lowercase())
+                Server.instance.addWhitelist(getEntityName().lowercase())
             } else {
-                Server.instance.removeWhitelist(getEntityName()!!.lowercase())
+                Server.instance.removeWhitelist(getEntityName().lowercase())
             }
         }
 
     override val player: Player?
-        get() = if (getEntityName() != null) Server.instance.getPlayerExact(getEntityName()!!) else null
+        get() = Server.instance.getPlayerExact(getEntityName())
 
     override val firstPlayed: Long
         get() = namedTag.getLong("firstPlayed")

src/jvmMain/kotlin/Player.kt

@@ -1116,7 +1116,6 @@ open class Player(
 
     fun checkNearEntities() {
         for (entity in level!!.getNearbyEntities(boundingBox.grow(1.0, 0.5, 1.0), this)) {
-            if (entity == null) continue
             entity.scheduleUpdate()
 
             if (!entity.isAlive() || !this.isAlive()) {
@@ -1485,8 +1484,8 @@ open class Player(
 
         adventureSettings.init(nbt)
 
-        val level: Level?
-        if (Server.instance.getLevelByName(nbt.getString("Level")).also { level = it } == null) {
+        val level: Level? = Server.instance.getLevelByName(nbt.getString("Level"))
+        if (level == null) {
             this.level = Server.instance.defaultLevel
             nbt.putString("Level", this.level!!.getLevelName())
             val spawnLocation = this.level!!.safeSpawn
@@ -1905,10 +1904,10 @@ open class Player(
         get() = this
 
     override val firstPlayed: Long?
-        get() = if (this.namedTag != null) namedTag!!.getLong("firstPlayed") else null
+        get() = namedTag.getLong("firstPlayed")
 
     override val lastPlayed: Long?
-        get() = if (this.namedTag != null) namedTag!!.getLong("lastPlayed") else null
+        get() = namedTag.getLong("lastPlayed")
 
     override fun hasPlayedBefore(): Boolean {
         return this.playedBefore
@@ -2908,18 +2907,16 @@ open class Player(
                 //鞘翅检查和耐久计算
                 if (this.isGliding()) {
                     val playerInventory = this.inventory
-                    if (playerInventory != null) {
-                        val chestplate = playerInventory.chestplate
-                        if ((chestplate == null || chestplate.id != ItemID.ELYTRA)) {
+                    val chestplate = playerInventory.chestplate
+                    if (chestplate.id != ItemID.ELYTRA) {
+                        this.setGliding(false)
+                    } else if (this.age % (20 * (chestplate.getEnchantmentLevel(Enchantment.ID_DURABILITY) + 1)) == 0 && !isCreative) {
+                        val newDamage = chestplate.damage + 1
+                        if (newDamage < chestplate.maxDurability) {
+                            chestplate.damage = newDamage
+                            playerInventory.setChestplate(chestplate)
+                        } else {
                             this.setGliding(false)
-                        } else if (this.age % (20 * (chestplate.getEnchantmentLevel(Enchantment.ID_DURABILITY) + 1)) == 0 && !isCreative) {
-                            val newDamage = chestplate.damage + 1
-                            if (newDamage < chestplate.maxDurability) {
-                                chestplate.damage = newDamage
-                                playerInventory.setChestplate(chestplate)
-                            } else {
-                                this.setGliding(false)
-                            }
                         }
                     }
                 }
@@ -3830,38 +3827,38 @@ open class Player(
         saveNBT()
 
         if (this.level != null) {
-            namedTag!!.putString("Level", level!!.getLevelName())
+            namedTag.putString("Level", level!!.getLevelName())
 
             val achievements = CompoundTag()
             for (achievement in this.achievements) {
                 achievements.putByte(achievement!!, 1)
             }
 
-            namedTag!!.putCompound("Achievements", achievements)
-            namedTag!!.putInt("playerGameType", this.gamemode)
-            namedTag!!.putLong("lastPlayed", System.currentTimeMillis() / 1000)
-            namedTag!!.putString("lastIP", this.address)
-            namedTag!!.putInt("EXP", this.experience)
-            namedTag!!.putInt("expLevel", this.experienceLevel)
-            namedTag!!.putInt("foodLevel", foodData!!.getFood())
-            namedTag!!.putFloat("foodSaturationLevel", foodData!!.getSaturation())
-            namedTag!!.putInt("enchSeed", this.enchSeed)
+            namedTag.putCompound("Achievements", achievements)
+            namedTag.putInt("playerGameType", this.gamemode)
+            namedTag.putLong("lastPlayed", System.currentTimeMillis() / 1000)
+            namedTag.putString("lastIP", this.address)
+            namedTag.putInt("EXP", this.experience)
+            namedTag.putInt("expLevel", this.experienceLevel)
+            namedTag.putInt("foodLevel", foodData!!.getFood())
+            namedTag.putFloat("foodSaturationLevel", foodData!!.getSaturation())
+            namedTag.putInt("enchSeed", this.enchSeed)
 
             val fogIdentifiers = ListTag<StringTag>()
             val userProvidedFogIds = ListTag<StringTag>()
             fogStack.forEach { fog ->
                 userProvidedFogIds.add(StringTag(fog.first))
                 fogIdentifiers.add(StringTag(fog.second))
             }
-            namedTag!!.putList("fogIdentifiers", fogIdentifiers)
-            namedTag!!.putList("userProvidedFogIds", userProvidedFogIds)
+            namedTag.putList("fogIdentifiers", fogIdentifiers)
+            namedTag.putList("userProvidedFogIds", userProvidedFogIds)
 
-            namedTag!!.putInt("TimeSinceRest", this.timeSinceRest)
+            namedTag.putInt("TimeSinceRest", this.timeSinceRest)
 
-            if (getEntityName().isNotBlank() && this.namedTag != null) {
+            if (getEntityName().isNotBlank()) {
                 Server.instance.saveOfflinePlayerData(
                     uuid,
-                    namedTag!!, async
+                    namedTag, async
                 )
             }
         }
@@ -3896,7 +3893,7 @@ open class Player(
             params.add(this.displayName)
 
             run switch@{
-                when (if (cause == null) DamageCause.CUSTOM else cause.cause) {
+                when (cause?.cause ?: DamageCause.CUSTOM) {
                     DamageCause.ENTITY_ATTACK -> if (cause is EntityDamageByEntityEvent) {
                         val e = cause.damager
                         killer = e
@@ -4034,11 +4031,9 @@ open class Player(
                     }
                 }
 
-                if (this.offhandInventory != null) {
-                    offhandInventory.contents.forEach { (slot, item) ->
-                        if (!item.keepOnDeath()) {
-                            offhandInventory.clear(slot)
-                        }
+                offhandInventory.contents.forEach { (slot, item) ->
+                    if (!item.keepOnDeath()) {
+                        offhandInventory.clear(slot)
                     }
                 }
             }
@@ -5102,7 +5097,7 @@ open class Player(
         if (near) {
             var inventory: Inventory? = this.inventory
             if (entity is EntityArrow && entity.hadCollision) {
-                val item = if (entity.getArrowItem() != null) entity.getArrowItem() else ItemArrow()
+                val item = entity.getArrowItem()
                 if (!this.isCreative) {
                     // Should only collect to the offhand slot if the item matches what is already there
                     if (offhandInventory.getItem(0).id == item.id && offhandInventory.canAddItem(
@@ -5263,7 +5258,7 @@ open class Player(
 
     override fun hashCode(): Int {
         if ((this.hash == 0) || (this.hash == 485)) {
-            this.hash = (485 + (if (getUniqueID() != null) getUniqueID().hashCode() else 0))
+            this.hash = (485 + getUniqueID().hashCode())
         }
 
         return this.hash

src/jvmMain/kotlin/block/BlockAzalea.kt

@@ -59,7 +59,7 @@ open class BlockAzalea @JvmOverloads constructor(blockstate: BlockState = proper
         val aged = chance > 0.8
         if (type == Level.BLOCK_UPDATE_NORMAL) {
             val down = down()
-            if (down != null && !BlockFlower.isSupportValid(down)) {
+            if (!BlockFlower.isSupportValid(down)) {
                 level.useBreakOn(this.position)
                 return Level.BLOCK_UPDATE_NORMAL
             }
@@ -92,7 +92,7 @@ open class BlockAzalea @JvmOverloads constructor(blockstate: BlockState = proper
         player: Player?
     ): Boolean {
         val down = down()
-        if (down != null && BlockFlower.isSupportValid(down)) {
+        if (BlockFlower.isSupportValid(down)) {
             level.setBlock(block.position, this, direct = true, update = true)
             return true
         }

src/jvmMain/kotlin/block/BlockBubbleColumn.kt

@@ -68,49 +68,47 @@ class BlockBubbleColumn @JvmOverloads constructor(blockstate: BlockState = prope
     }
 
     override fun onEntityCollide(entity: Entity) {
-        if (entity != null) {
-            if (entity.canBeMovedByCurrents()) {
-                if (up().isAir) {
-                    if (isDragDown) {
-                        entity.motion.y = max(-0.9, entity.motion.y - 0.03)
-                    } else {
-                        if (entity is EntityPhysical && entity.motion.y < -entity.getGravity() * 8) {
-                            entity.motion.y = (-entity.getGravity() * 2).toDouble()
-                        }
-                        entity.motion.y = min(1.8, entity.motion.y + 0.1)
+        if (entity.canBeMovedByCurrents()) {
+            if (up().isAir) {
+                if (isDragDown) {
+                    entity.motion.y = max(-0.9, entity.motion.y - 0.03)
+                } else {
+                    if (entity is EntityPhysical && entity.motion.y < -entity.getGravity() * 8) {
+                        entity.motion.y = (-entity.getGravity() * 2).toDouble()
                     }
+                    entity.motion.y = min(1.8, entity.motion.y + 0.1)
+                }
 
-                    val random = ThreadLocalRandom.current()
-                    for (i in 0..1) {
-                        level.addParticle(
-                            SplashParticle(
-                                position.add(
-                                    random.nextFloat().toDouble(),
-                                    (random.nextFloat() + 1).toDouble(),
-                                    random.nextFloat().toDouble()
-                                )
+                val random = ThreadLocalRandom.current()
+                for (i in 0..1) {
+                    level.addParticle(
+                        SplashParticle(
+                            position.add(
+                                random.nextFloat().toDouble(),
+                                (random.nextFloat() + 1).toDouble(),
+                                random.nextFloat().toDouble()
                             )
                         )
-                        level.addParticle(
-                            BubbleParticle(
-                                position.add(
-                                    random.nextFloat().toDouble(),
-                                    (random.nextFloat() + 1).toDouble(),
-                                    random.nextFloat().toDouble()
-                                )
+                    )
+                    level.addParticle(
+                        BubbleParticle(
+                            position.add(
+                                random.nextFloat().toDouble(),
+                                (random.nextFloat() + 1).toDouble(),
+                                random.nextFloat().toDouble()
                             )
                         )
-                    }
+                    )
+                }
+            } else {
+                if (isDragDown) {
+                    entity.motion.y = max(-0.3, entity.motion.y - 0.3)
                 } else {
-                    if (isDragDown) {
-                        entity.motion.y = max(-0.3, entity.motion.y - 0.3)
-                    } else {
-                        entity.motion.y = min(0.7, entity.motion.y + 0.06)
-                    }
+                    entity.motion.y = min(0.7, entity.motion.y + 0.06)
                 }
-                entity.motionChanged = true
-                entity.resetFallDistance()
             }
+            entity.motionChanged = true
+            entity.resetFallDistance()
         }
     }
 

src/jvmMain/kotlin/block/BlockComposter.kt

@@ -95,7 +95,7 @@ class BlockComposter @JvmOverloads constructor(blockstate: BlockState = properti
             return true
         }
 
-        if (player != null && !player.isCreative) {
+        if (!player.isCreative) {
             item.setCount(item.getCount() - 1)
         }
 
@@ -120,11 +120,9 @@ class BlockComposter @JvmOverloads constructor(blockstate: BlockState = properti
         val event = ComposterEmptyEvent(this, player!!, item!!, ItemBoneMeal(), 0)
         Server.instance.pluginManager.callEvent(event)
         if (!event.cancelled) {
-            setPropertyValue<Int, IntPropertyType>(CommonBlockProperties.COMPOSTER_FILL_LEVEL, event.getNewLevel())
+            setPropertyValue(CommonBlockProperties.COMPOSTER_FILL_LEVEL, event.getNewLevel())
             level.setBlock(this.position, this, direct = true, update = true)
-            if (item != null) {
-                level.dropItem(position.add(0.5, 0.85, 0.5), event.getDrop(), event.motion, false, 10)
-            }
+            level.dropItem(position.add(0.5, 0.85, 0.5), event.getDrop(), event.motion, false, 10)
             level.addSound(position.add(0.5, 0.5, 0.5), Sound.BLOCK_COMPOSTER_EMPTY)
             return event.getDrop()
         }

src/jvmMain/kotlin/block/BlockConcretePowder.kt

@@ -37,7 +37,7 @@ abstract class BlockConcretePowder(blockState: BlockState) : BlockFallable(block
 
     override fun place(
         item: Item?,
-        b: Block,
+        block: Block,
         target: Block?,
         face: BlockFace,
         fx: Double,
@@ -48,8 +48,8 @@ abstract class BlockConcretePowder(blockState: BlockState) : BlockFallable(block
         var concrete = false
 
         for (side in 1..5) {
-            val block = this.getSide(fromIndex(side))
-            if (block.id == BlockID.FLOWING_WATER || block.id == BlockID.WATER) {
+            val side = this.getSide(fromIndex(side))
+            if (side.id == BlockID.FLOWING_WATER || side.id == BlockID.WATER) {
                 concrete = true
                 break
             }

src/jvmMain/kotlin/block/BlockLichen.kt

@@ -86,7 +86,7 @@ abstract class BlockLichen(blockState: BlockState) : BlockTransparent(blockState
     override fun onUpdate(type: Int): Int {
         for (side in BlockFace.entries) {
             val support = this.getSide(side)
-            if (isGrowthToSide(side) && support != null && !support.isSolid) {
+            if (isGrowthToSide(side) && !support.isSolid) {
                 this.witherAtSide(side)
             }
         }

src/jvmMain/kotlin/block/BlockObsidian.kt

@@ -27,7 +27,7 @@ class BlockObsidian(blockState: BlockState = properties.defaultState) : BlockSol
             this.west(), this.east(),
         )
         for (aNearby in nearby) {
-            if (aNearby != null && aNearby.id == BlockID.PORTAL) {
+            if (aNearby.id == BlockID.PORTAL) {
                 aNearby.onBreak(item)
             }
         }

src/jvmMain/kotlin/block/BlockPortal.kt

@@ -47,10 +47,8 @@ class BlockPortal @JvmOverloads constructor(blockstate: BlockState = properties.
         var result = super.onBreak(item)
         for (face in BlockFace.entries) {
             val b = this.getSide(face)
-            if (b != null) {
-                if (b is BlockPortal) {
-                    result = result and b.onBreak(item)
-                }
+            if (b is BlockPortal) {
+                result = result and b.onBreak(item)
             }
         }
         return result

src/jvmMain/kotlin/block/BlockPressurePlateBase.kt

@@ -3,7 +3,6 @@ package org.chorus_oss.chorus.block
 import org.chorus_oss.chorus.Player
 import org.chorus_oss.chorus.Server
 import org.chorus_oss.chorus.block.property.CommonBlockProperties
-import org.chorus_oss.chorus.block.property.type.IntPropertyType
 import org.chorus_oss.chorus.entity.Entity
 import org.chorus_oss.chorus.event.Event
 import org.chorus_oss.chorus.event.block.BlockRedstoneEvent
@@ -189,7 +188,7 @@ abstract class BlockPressurePlateBase(blockState: BlockState) : BlockFlowable(bl
         return true
     }
 
-    override fun getWeakPower(side: BlockFace): Int {
+    override fun getWeakPower(face: BlockFace): Int {
         return redstonePower
     }
 
@@ -198,9 +197,9 @@ abstract class BlockPressurePlateBase(blockState: BlockState) : BlockFlowable(bl
     }
 
     var redstonePower: Int
-        get() = getPropertyValue<Int, IntPropertyType>(CommonBlockProperties.REDSTONE_SIGNAL)
+        get() = getPropertyValue(CommonBlockProperties.REDSTONE_SIGNAL)
         set(power) {
-            setPropertyValue<Int, IntPropertyType>(CommonBlockProperties.REDSTONE_SIGNAL, power)
+            setPropertyValue(CommonBlockProperties.REDSTONE_SIGNAL, power)
         }
 
     protected fun playOnSound() {