Skip to content

Commit 6c64801

Browse files
sysnote8mainsysnote8main
committed
feat: many packages migrated to kotlin
1 parent 3a20566 commit 6c64801

Some content is hidden

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

87 files changed

+2468
-3206
lines changed

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

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -231,22 +231,20 @@ public void onEnable() {
231231

232232
Match match = DataMgr.getMatchFromId(MatchMgr.matchcount);
233233

234-
org.bukkit.scoreboard.Team bteam0 = scoreboard
235-
.registerNewTeam(match.getTeam0().getTeamColor().getColorName());
236-
bteam0.setColor(match.getTeam0().getTeamColor().getChatColor());
234+
org.bukkit.scoreboard.Team bteam0 = scoreboard.registerNewTeam(match.team0.getTeamColor().getColorName());
235+
bteam0.setColor(match.team0.getTeamColor().getChatColor());
237236
bteam0.setNameTagVisibility(NameTagVisibility.HIDE_FOR_OTHER_TEAMS);
238237
bteam0.setOption(org.bukkit.scoreboard.Team.Option.COLLISION_RULE,
239238
org.bukkit.scoreboard.Team.OptionStatus.NEVER);
240239

241-
org.bukkit.scoreboard.Team bteam1 = scoreboard
242-
.registerNewTeam(match.getTeam1().getTeamColor().getColorName());
243-
bteam1.setColor(match.getTeam1().getTeamColor().getChatColor());
240+
org.bukkit.scoreboard.Team bteam1 = scoreboard.registerNewTeam(match.team1.getTeamColor().getColorName());
241+
bteam1.setColor(match.team1.getTeamColor().getChatColor());
244242
bteam1.setNameTagVisibility(NameTagVisibility.HIDE_FOR_OTHER_TEAMS);
245243
bteam1.setOption(org.bukkit.scoreboard.Team.Option.COLLISION_RULE,
246244
org.bukkit.scoreboard.Team.OptionStatus.NEVER);
247245

248-
match.getTeam0().setTeam(bteam0);
249-
match.getTeam1().setTeam(bteam1);
246+
match.team0.setTeam(bteam0);
247+
match.team1.setTeam(bteam1);
250248

251249
ArmorStandMgr.ArmorStandEquipPacketSender(w);
252250
}
@@ -405,8 +403,8 @@ public void onDisable() {
405403
// 塗りリセット
406404
for (PaintData data : DataMgr.getBlockDataMap().values()) {
407405
data.getBlock().setType(data.getOriginalType());
408-
if (data.getBlockData() != null)
409-
data.getBlock().setBlockData(data.getBlockData());
406+
if (data.blockData != null)
407+
data.getBlock().setBlockData(data.blockData);
410408
}
411409
DataMgr.getBlockDataMap().clear();
412410

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

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ object Animation {
5959
10,
6060
)
6161
} else {
62-
if (winteam === DataMgr.getPlayerData(player).team) {
62+
if (winteam === DataMgr.getPlayerData(player)?.team!!) {
6363
player.sendTitle(
6464
ChatColor.GREEN.toString() + "You Win!",
6565
(
@@ -88,7 +88,7 @@ object Animation {
8888
player.playSound(player.getLocation(), Sound.ENTITY_ZOMBIE_INFECT, 13.0f, 1.5f)
8989
}
9090
if (i == 40) {
91-
if (winteam === DataMgr.getPlayerData(player).team) {
91+
if (winteam === DataMgr.getPlayerData(player)?.team!!) {
9292
SclatUtil.playGameSound(
9393
player,
9494
SoundType.CONGRATULATIONS,
@@ -132,7 +132,7 @@ object Animation {
132132
g = g + 2
133133
}
134134
if (i == 35) {
135-
if (winteam === DataMgr.getPlayerData(player).team) {
135+
if (winteam === DataMgr.getPlayerData(player)?.team!!) {
136136
player.sendTitle(
137137
ChatColor.GREEN.toString() + "Knock Out !!",
138138
(
@@ -160,7 +160,7 @@ object Animation {
160160
player.playSound(player.getLocation(), Sound.ENTITY_ZOMBIE_INFECT, 13.0f, 1.5f)
161161
}
162162
if (i == 40) {
163-
if (winteam === DataMgr.getPlayerData(player).team) {
163+
if (winteam === DataMgr.getPlayerData(player)?.team!!) {
164164
SclatUtil.playGameSound(
165165
player,
166166
SoundType.CONGRATULATIONS,
@@ -197,16 +197,16 @@ object Animation {
197197
team0color +
198198
DataMgr
199199
.getPlayerData(player)
200-
.match
201-
.getTeam0()
200+
?.match
201+
?.team0
202202
?.teamColor
203203
?.colorName!! + "Team" +
204204
ChatColor.RESET + " : " + Random().nextInt(10).toString() + " Kill " +
205205
team1color +
206206
DataMgr
207207
.getPlayerData(player)
208-
.match
209-
.getTeam1()
208+
?.match
209+
?.team1
210210
?.teamColor
211211
?.colorName!! + "Team" +
212212
ChatColor.RESET + " : " + Random().nextInt(10).toString() + " Kill"
@@ -229,16 +229,16 @@ object Animation {
229229
team0color +
230230
DataMgr
231231
.getPlayerData(player)
232-
.match
233-
.getTeam0()
232+
?.match
233+
?.team0
234234
?.teamColor
235235
?.colorName!! +
236236
"Team" + ChatColor.RESET + " : " + team0point.toString() + " Kill " +
237237
team1color +
238238
DataMgr
239239
.getPlayerData(player)
240-
.match
241-
.getTeam1()
240+
?.match
241+
?.team1
242242
?.teamColor
243243
?.colorName!! +
244244
"Team" + ChatColor.RESET + " : " + team1point.toString() + " Kill"
@@ -248,22 +248,22 @@ object Animation {
248248
10,
249249
)
250250
} else {
251-
if (winteam === DataMgr.getPlayerData(player).team) {
251+
if (winteam === DataMgr.getPlayerData(player)?.team!!) {
252252
player.sendTitle(
253253
ChatColor.GREEN.toString() + "You Win!",
254254
(
255255
team0color +
256256
DataMgr
257257
.getPlayerData(player)
258-
.match
259-
.getTeam0()
258+
?.match
259+
?.team0
260260
?.teamColor
261261
?.colorName!! +
262262
"Team" + ChatColor.RESET + " : " + team0point.toString() + " Kill " + team1color +
263263
DataMgr
264264
.getPlayerData(player)
265-
.match
266-
.getTeam1()
265+
?.match
266+
?.team1
267267
?.teamColor
268268
?.colorName!! +
269269
"Team" + ChatColor.RESET + " : " + team1point.toString() + " Kill"
@@ -279,15 +279,15 @@ object Animation {
279279
team0color +
280280
DataMgr
281281
.getPlayerData(player)
282-
.match
283-
.getTeam0()
282+
?.match
283+
?.team0
284284
?.teamColor
285285
?.colorName!! +
286286
"Team" + ChatColor.RESET + " : " + team0point.toString() + " Kill " + team1color +
287287
DataMgr
288288
.getPlayerData(player)
289-
.match
290-
.getTeam1()
289+
?.match
290+
?.team1
291291
?.teamColor
292292
?.colorName!! +
293293
"Team" + ChatColor.RESET + " : " + team1point.toString() + " Kill"
@@ -301,7 +301,7 @@ object Animation {
301301
player.playSound(player.getLocation(), Sound.ENTITY_ZOMBIE_INFECT, 13.0f, 1.5f)
302302
}
303303
if (i == 40) {
304-
if (winteam === DataMgr.getPlayerData(player).team) {
304+
if (winteam === DataMgr.getPlayerData(player)?.team!!) {
305305
SclatUtil.playGameSound(
306306
player,
307307
SoundType.CONGRATULATIONS,

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

Lines changed: 20 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ object SclatUtil {
105105

106106
for (player in Sclat.getPlugin().getServer().getOnlinePlayers()) {
107107
BungeeCordMgr.PlayerSendServer(player, "sclat")
108-
DataMgr.getPlayerData(player).setServerName("Sclat")
108+
DataMgr.getPlayerData(player)?.setServerName("Sclat")
109109
}
110110
val task: BukkitRunnable =
111111
object : BukkitRunnable() {
@@ -123,7 +123,7 @@ object SclatUtil {
123123
commands.add(
124124
(
125125
"map " + Sclat.conf.getServers().getString("ServerName") + " " +
126-
DataMgr.getMapRandom(if (MatchMgr.mapcount == 0) 0 else MatchMgr.mapcount - 1).getMapName()
126+
DataMgr.getMapRandom(if (MatchMgr.mapcount == 0) 0 else MatchMgr.mapcount - 1)?.mapName!!
127127
),
128128
)
129129
commands.add("stop")
@@ -179,8 +179,7 @@ object SclatUtil {
179179
buff.append(message)
180180
if (type == MessageType.TEAM) {
181181
for (player in Sclat.getPlugin().getServer().getOnlinePlayers()) {
182-
val playerTeam = DataMgr.getPlayerData(player).team
183-
if (playerTeam == null) continue
182+
val playerTeam = DataMgr.getPlayerData(player)?.team ?: continue
184183
if (team == null) continue
185184
if (playerTeam != team) continue
186185
player.sendMessage(buff.toString())
@@ -228,7 +227,7 @@ object SclatUtil {
228227
override fun run() {
229228
try {
230229
BungeeCordMgr.PlayerSendServer(player, "sclat")
231-
DataMgr.getPlayerData(player).setServerName("Sclat")
230+
DataMgr.getPlayerData(player)?.setServerName("Sclat")
232231
} catch (e: Exception) {
233232
}
234233
}
@@ -243,20 +242,20 @@ object SclatUtil {
243242
accuracy: Int,
244243
player: Player?,
245244
) {
246-
val s_locs: MutableList<Location> = getSphere(center, radius - 0.5, accuracy)
245+
val sLocs: MutableList<Location> = getSphere(center, radius - 0.5, accuracy)
247246
val bd =
248247
DataMgr
249248
.getPlayerData(player)
250-
.team
251-
.teamColor!!
252-
.getWool()
249+
?.team
250+
?.teamColor!!
251+
.wool!!
253252
.createBlockData()
254-
for (o_player in Sclat.getPlugin().getServer().getOnlinePlayers()) {
255-
if (DataMgr.getPlayerData(o_player).settings.ShowEffect_BombEx()) {
256-
for (loc in s_locs) {
257-
if (o_player.getWorld() === loc.getWorld()) {
258-
if (o_player.getLocation().distanceSquared(loc) < Sclat.PARTICLE_RENDER_DISTANCE_SQUARED) {
259-
o_player.spawnParticle<BlockData?>(
253+
for (oPlayer in Sclat.getPlugin().getServer().getOnlinePlayers()) {
254+
if (DataMgr.getPlayerData(oPlayer)?.settings?.ShowEffect_BombEx()!!) {
255+
for (loc in sLocs) {
256+
if (oPlayer.getWorld() === loc.getWorld()) {
257+
if (oPlayer.getLocation().distanceSquared(loc) < Sclat.PARTICLE_RENDER_DISTANCE_SQUARED) {
258+
oPlayer.spawnParticle<BlockData?>(
260259
Particle.BLOCK_DUST,
261260
loc,
262261
0,
@@ -283,9 +282,9 @@ object SclatUtil {
283282
val playerData = DataMgr.getPlayerData(player)
284283

285284
if (player.getWorld() !== center.getWorld()) continue
286-
if (playerData.armor < 10000.0) continue
285+
if (playerData?.armor!! < 10000.0) continue
287286
if (player.getGameMode() == GameMode.SPECTATOR) continue
288-
if (playerData.team == DataMgr.getPlayerData(shooter).team) continue
287+
if (playerData.team!! == DataMgr.getPlayerData(shooter)?.team!!) continue
289288

290289
val distance = player.getLocation().distance(center)
291290

@@ -319,13 +318,13 @@ object SclatUtil {
319318
*
320319
* //攻撃判定の処理 for (Player target :
321320
* Main.getPlugin().getServer().getOnlinePlayers()) {
322-
* if(!DataMgr.getPlayerData(target).isInMatch() || target.getWorld() !=
321+
* if(!DataMgr.getPlayerData(target)?.isInMatch!! || target.getWorld() !=
323322
* player.getWorld()) continue; if (target.getLocation().distance(center) <=
324323
* radius) { double gear = SclatDamageType.SUB_WEAPON == type ?
325324
* Gear.getGearInfluence(player, Gear.Type.SUB_SPEC_UP) : 1.0; double damage =
326325
* (radius - target.getLocation().distance(center)) * damageRate * gear;
327-
* if(DataMgr.getPlayerData(player).getTeam() !=
328-
* DataMgr.getPlayerData(target).getTeam() &&
326+
* if(DataMgr.getPlayerData(player)?.team!! !=
327+
* DataMgr.getPlayerData(target)?.team!! &&
329328
* target.getGameMode().equals(GameMode.ADVENTURE)){ Sclat.giveDamage(player,
330329
* target, damage, type.getName());
331330
*
@@ -348,7 +347,7 @@ object SclatUtil {
348347
damageType: String?,
349348
): Boolean {
350349
var damage = damage
351-
val targetData = DataMgr.getPlayerData(target)
350+
val targetData = DataMgr.getPlayerData(target)!!
352351
val playerData = DataMgr.getPlayerData(player)
353352
if (target.hasPotionEffect(PotionEffectType.FIRE_RESISTANCE)) {
354353
damage = damage * 0.6

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ object Sphere {
4848
r: Double,
4949
r_accuracy: Double,
5050
accuracy: Int,
51-
): MutableList<Location?> {
52-
val tempList: MutableList<Location?> = ArrayList<Location?>()
51+
): MutableList<Location> {
52+
val tempList: MutableList<Location> = mutableListOf()
5353
var tr = 1
5454
while (tr <= r) {
5555
var t = 0

‎src/main/java/be4rjp/sclat/api/packet/WorldPackets.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ object WorldPackets {
105105
packet.getBooleans().write(3, player.getGameMode() == GameMode.CREATIVE)
106106

107107
// Update your local data manager
108-
DataMgr.getPlayerData(player).fov = fov
108+
DataMgr.getPlayerData(player)?.fov = fov
109109

110110
return Packets.sendServerPacket(player, packet)
111111
}

‎src/main/java/be4rjp/sclat/api/team/TeamLoc.kt‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,15 @@ import java.util.Collections
88
*
99
* @author Be4rJP
1010
*/
11-
class TeamLoc(val map: MapData) {
11+
class TeamLoc(
12+
val map: MapData,
13+
) {
1214
private val list0: MutableList<Location?>? = null
1315

1416
private val list1: MutableList<Location?>? = null
1517

16-
fun SetupTeam0Loc() {
17-
val l = map.getTeam0Loc()
18+
fun setupTeam0Loc() {
19+
val l = map.team0Loc
1820
// l.setX(l.getBlockX() + 0.5D);
1921
// l.setZ(l.getBlockZ() + 0.5D);
2022
// Location l1 = new Location(l.getWorld(), l.getBlockX() + 1D, l.getBlockY(),
@@ -32,8 +34,8 @@ class TeamLoc(val map: MapData) {
3234
Collections.shuffle(list0)
3335
}
3436

35-
fun SetupTeam1Loc() {
36-
val l = map.getTeam1Loc()
37+
fun setupTeam1Loc() {
38+
val l = map.team1Loc!!
3739
l.setX(l.getBlockX() + 0.5)
3840
l.setZ(l.getBlockZ() + 0.5)
3941
val l1 = Location(l.getWorld(), l.getBlockX() + 1.0, l.getBlockY().toDouble(), l.getBlockZ() + 1.0)
@@ -47,11 +49,7 @@ class TeamLoc(val map: MapData) {
4749
Collections.shuffle(list1)
4850
}
4951

50-
fun getTeam0Loc(i: Int): Location? {
51-
return list0!!.get(i)
52-
}
52+
fun getTeam0Loc(i: Int): Location? = list0!!.get(i)
5353

54-
fun getTeam1Loc(i: Int): Location? {
55-
return list1!!.get(i)
56-
}
54+
fun getTeam1Loc(i: Int): Location? = list1!!.get(i)
5755
}

‎src/main/java/be4rjp/sclat/api/wiremesh/WiremeshListTask.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class WiremeshListTask(
2626

2727
init {
2828
// 先に対象のブロックとそのBlockDataを取得して保存しておく
29-
val list = RegionBlocks(firstPoint, secondPoint).getBlocks()
29+
val list = RegionBlocks(firstPoint, secondPoint).blocks
3030

3131
for (block in list) {
3232
if (!blockList.contains(block) && (

‎src/main/java/be4rjp/sclat/commands/SclatCommandExecutor.kt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ class SclatCommandExecutor :
219219
if (sender is Player) {
220220
val serverName: String? = args[1]
221221
for (ss in ServerStatusManager.serverList) {
222-
if (ss.getServerName() == serverName) {
222+
if (ss.serverName == serverName) {
223223
val commands: MutableList<String?> = ArrayList<String?>()
224224
commands.add("mod " + sender.getName())
225225
commands.add("stop")
@@ -240,8 +240,8 @@ class SclatCommandExecutor :
240240
object : BukkitRunnable() {
241241
override fun run() {
242242
try {
243-
BungeeCordMgr.PlayerSendServer(sender, ss.getServerName())
244-
DataMgr.getPlayerData(sender).setServerName(ss.getDisplayName())
243+
BungeeCordMgr.PlayerSendServer(sender, ss.serverName)
244+
DataMgr.getPlayerData(sender)?.setServerName(ss.displayName)
245245
} catch (ignored: Exception) {
246246
}
247247
}
@@ -270,11 +270,11 @@ class SclatCommandExecutor :
270270
if (args[1] == "mt") {
271271
val server: String? = args[2]
272272
for (ss in ServerStatusManager.serverList) {
273-
if (ss.getServerName() == server) {
274-
ss.setMaintenance(args[3] == "true")
273+
if (ss.serverName == server) {
274+
ss.isMaintenance = (args[3] == "true")
275275
sender.sendMessage(
276276
(
277-
"Switched " + ss.getDisplayName() + " §rto " +
277+
"Switched " + ss.displayName + " §rto " +
278278
(if (args[3] == "true") "§cMAINTENANCE" else "§6NORMAL")
279279
),
280280
)

0 commit comments

Comments
 (0)