Skip to content

Commit 7d17787

Browse files
sysnote8mainsysnote8main
committed
feat: migrate all manager classes to kotlin
1 parent 4d1d07a commit 7d17787

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+9184
-6968
lines changed

‎src/main/java/be4rjp/sclat/Sclat.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ class Sclat :
207207
match.team0!!.team = bteam0
208208
match.team1!!.team = bteam1
209209

210-
ArmorStandMgr.ArmorStandEquipPacketSender(w)
210+
ArmorStandMgr.ArmorStandEquipPacketSender(w!!)
211211
}
212212

213213
// -------------------------------------------------------------------

‎src/main/java/be4rjp/sclat/api/SclatUtil.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,7 @@ object SclatUtil {
372372
}
373373
} else {
374374
target.gameMode = GameMode.SPECTATOR
375-
DeathMgr.PlayerDeathRunnable(target, player, damageType)
375+
DeathMgr.playerDeathRunnable(target, player!!, damageType!!)
376376
targetData.armor = 0.0
377377
return true
378378
}

‎src/main/java/be4rjp/sclat/api/holo/RankingHolograms.kt‎

Lines changed: 39 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -191,47 +191,50 @@ class RankingHolograms(
191191

192192
if (rankingType == RankingType.TOTAL) {
193193
val uuid = RankMgr.ranking.get(i)
194-
val mcid = Sclat.conf?.uUIDCash!!.getString(uuid)
194+
val mcid = Sclat.conf?.uUIDCash!!.getString(uuid!!)
195195

196196
val rank = PlayerStatusMgr.getRank(uuid)
197197

198198
if (rank != 0) {
199-
armorStand.customName = CraftChatMessage.fromStringOrNull(
200-
(
201-
"§e" + (i + 1).toString() + "位 §f" + mcid +
202-
" §6Rank : §r" + rank + " [§b " + RankMgr.toABCRank(rank) + " §f]"
203-
),
204-
)
199+
armorStand.customName =
200+
CraftChatMessage.fromStringOrNull(
201+
(
202+
"§e" + (i + 1).toString() + "位 §f" + mcid +
203+
" §6Rank : §r" + rank + " [§b " + RankMgr.toABCRank(rank) + " §f]"
204+
),
205+
)
205206
} else {
206207
armorStand.customName = CraftChatMessage.fromStringOrNull("--")
207208
}
208209
}
209210

210211
if (rankingType == RankingType.KILL) {
211212
val uuid = RankMgr.killRanking.get(i)
212-
val mcid = Sclat.conf?.uUIDCash!!.getString(uuid)
213+
val mcid = Sclat.conf?.uUIDCash!!.getString(uuid!!)
213214

214215
val kill = PlayerStatusMgr.getKill(uuid)
215216

216217
if (kill != 0) {
217-
armorStand.customName = CraftChatMessage.fromStringOrNull(
218-
"§e" + (i + 1).toString() + "位 §f" + mcid + " §6Kill(s) : §r" + kill,
219-
)
218+
armorStand.customName =
219+
CraftChatMessage.fromStringOrNull(
220+
"§e" + (i + 1).toString() + "位 §f" + mcid + " §6Kill(s) : §r" + kill,
221+
)
220222
} else {
221223
armorStand.customName = CraftChatMessage.fromStringOrNull("--")
222224
}
223225
}
224226

225227
if (rankingType == RankingType.PAINT) {
226228
val uuid = RankMgr.paintRanking.get(i)
227-
val mcid = Sclat.conf?.uUIDCash!!.getString(uuid)
229+
val mcid = Sclat.conf?.uUIDCash!!.getString(uuid!!)
228230

229231
val paint = PlayerStatusMgr.getPaint(uuid)
230232

231233
if (paint != 0) {
232-
armorStand.customName = CraftChatMessage.fromStringOrNull(
233-
"§e" + (i + 1).toString() + "位 §f" + mcid + " §6Paint(s) : §r" + paint,
234-
)
234+
armorStand.customName =
235+
CraftChatMessage.fromStringOrNull(
236+
"§e" + (i + 1).toString() + "位 §f" + mcid + " §6Paint(s) : §r" + paint,
237+
)
235238
} else {
236239
armorStand.customName = CraftChatMessage.fromStringOrNull("--")
237240
}
@@ -252,12 +255,13 @@ class RankingHolograms(
252255

253256
val rank = PlayerStatusMgr.getRank(player.uniqueId.toString())
254257

255-
you.customName = CraftChatMessage.fromStringOrNull(
256-
(
257-
"§aYou ->> §e" + (if (rank == 0) "-" else ranking) +
258-
"位 §f" + mcid + " §6Rank : §r" + rank + " [§b " + RankMgr.toABCRank(rank) + " §f]"
259-
),
260-
)
258+
you.customName =
259+
CraftChatMessage.fromStringOrNull(
260+
(
261+
"§aYou ->> §e" + (if (rank == 0) "-" else ranking) +
262+
"位 §f" + mcid + " §6Rank : §r" + rank + " [§b " + RankMgr.toABCRank(rank) + " §f]"
263+
),
264+
)
261265
}
262266

263267
if (rankingType == RankingType.KILL) {
@@ -270,12 +274,13 @@ class RankingHolograms(
270274

271275
val kill = PlayerStatusMgr.getKill(player.uniqueId.toString())
272276

273-
you.customName = CraftChatMessage.fromStringOrNull(
274-
(
275-
"§aYou ->> §e" + (if (kill == 0) "-" else ranking) +
276-
"位 §f" + mcid + " §6Kill(s) : §r" + kill
277-
),
278-
)
277+
you.customName =
278+
CraftChatMessage.fromStringOrNull(
279+
(
280+
"§aYou ->> §e" + (if (kill == 0) "-" else ranking) +
281+
"位 §f" + mcid + " §6Kill(s) : §r" + kill
282+
),
283+
)
279284
}
280285

281286
if (rankingType == RankingType.PAINT) {
@@ -288,12 +293,13 @@ class RankingHolograms(
288293

289294
val paint = PlayerStatusMgr.getPaint(player.uniqueId.toString())
290295

291-
you.customName = CraftChatMessage.fromStringOrNull(
292-
(
293-
"§aYou ->> §e" +
294-
(if (paint == 0) "-" else ranking) + "位 §f" + mcid + " §6Paint(s) : §r" + paint
295-
),
296-
)
296+
you.customName =
297+
CraftChatMessage.fromStringOrNull(
298+
(
299+
"§aYou ->> §e" +
300+
(if (paint == 0) "-" else ranking) + "位 §f" + mcid + " §6Paint(s) : §r" + paint
301+
),
302+
)
297303
}
298304
list.add(you)
299305
} catch (e: Exception) {

‎src/main/java/be4rjp/sclat/data/Area.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ class Area(
207207
for (block in this.blist) {
208208
// Block b =
209209
// block.getLocation().getWorld().getHighestBlockAt(block.getLocation());
210-
PaintMgr.PaintByTeam(block, team, match)
210+
PaintMgr.paintByTeam(block, team!!, match!!)
211211
}
212212

213213
for (sl in this.shulkerBoxes) {

‎src/main/java/be4rjp/sclat/data/MatchServerRunnable.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ class MatchServerRunnable(
2929
override fun run() {
3030
if (waitTime == 30) {
3131
for (player in plugin.server.onlinePlayers) {
32-
BungeeCordMgr.PlayerSendServer(player, serverStatus.serverName)
32+
BungeeCordMgr.PlayerSendServer(player, serverStatus.serverName!!)
3333
DataMgr.getPlayerData(player)?.setServerName(serverStatus.displayName)
3434
}
3535
}

‎src/main/java/be4rjp/sclat/data/TrapData.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ class TrapData(
188188
while (i <= maxDist) {
189189
val pLocs = getSphere(location, i.toDouble(), 20)
190190
for (loc in pLocs) {
191-
PaintMgr.Paint(loc, player, false)
191+
PaintMgr.paint(loc, player, false)
192192
}
193193
i++
194194
}

‎src/main/java/be4rjp/sclat/listener/SquidListenerMgr.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ object SquidListenerMgr {
3333
list.add(b5)
3434

3535
if (playerblock.type == Material.WATER && player.gameMode == GameMode.ADVENTURE) {
36-
DeathMgr.PlayerDeathRunnable(
36+
DeathMgr.playerDeathRunnable(
3737
player,
3838
player,
3939
"water",
@@ -43,7 +43,7 @@ object SquidListenerMgr {
4343
try {
4444
if (data.match?.mapData!!.voidY != 0) {
4545
if (player.location.y <= data.match?.mapData!!.voidY) {
46-
DeathMgr.PlayerDeathRunnable(player, player, "fall")
46+
DeathMgr.playerDeathRunnable(player, player, "fall")
4747
}
4848
}
4949
} catch (e: Exception) {

0 commit comments

Comments
 (0)