Skip to content

Commit 43265d9

Browse files
sysnote8mainsysnote8main
committed
feat: migrate listener and lobby package
1 parent b68076e commit 43265d9

File tree

3 files changed

+195
-198
lines changed

3 files changed

+195
-198
lines changed

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

Lines changed: 28 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,37 @@
1+
package be4rjp.sclat.listener
12

2-
package be4rjp.sclat.listener;
3-
4-
import be4rjp.sclat.api.player.PlayerData;
5-
import be4rjp.sclat.data.DataMgr;
6-
import org.bukkit.entity.Player;
7-
import org.bukkit.event.EventHandler;
8-
import org.bukkit.event.Listener;
9-
import org.bukkit.event.entity.FoodLevelChangeEvent;
10-
import org.bukkit.event.player.PlayerItemHeldEvent;
11-
import org.bukkit.event.player.PlayerMoveEvent;
3+
import be4rjp.sclat.data.DataMgr.getPlayerData
4+
import org.bukkit.event.EventHandler
5+
import org.bukkit.event.Listener
6+
import org.bukkit.event.entity.FoodLevelChangeEvent
7+
import org.bukkit.event.player.PlayerItemHeldEvent
8+
import org.bukkit.event.player.PlayerMoveEvent
129

1310
/**
1411
*
1512
* @author Be4rJP
1613
*/
17-
public class SquidListener implements Listener {
18-
@EventHandler
19-
public void onPlayerMove(PlayerMoveEvent event) {
20-
Player player = event.getPlayer();
21-
SquidListenerMgr.CheckOnInk(player);
22-
}
14+
class SquidListener : Listener {
15+
@EventHandler
16+
fun onPlayerMove(event: PlayerMoveEvent) {
17+
val player = event.getPlayer()
18+
SquidListenerMgr.checkOnInk(player)
19+
}
2320

24-
@EventHandler
25-
public void onPlayerSwitchSlot(PlayerItemHeldEvent event) {
26-
Player player = event.getPlayer();
27-
PlayerData data = DataMgr.getPlayerData(player);
28-
SquidListenerMgr.CheckOnInk(player);
29-
if (player.getInventory().getItem(event.getNewSlot()) == null) {
30-
data.setIsSquid(true);
31-
return;
32-
}
33-
data.setIsSquid(false);
34-
}
21+
@EventHandler
22+
fun onPlayerSwitchSlot(event: PlayerItemHeldEvent) {
23+
val player = event.getPlayer()
24+
val data = getPlayerData(player)
25+
SquidListenerMgr.checkOnInk(player)
26+
if (player.getInventory().getItem(event.getNewSlot()) == null) {
27+
data!!.setIsSquid(true)
28+
return
29+
}
30+
data!!.setIsSquid(false)
31+
}
3532

36-
@EventHandler
37-
public void onFoodLevelChange(FoodLevelChangeEvent event) {
38-
event.setCancelled(true);
39-
}
33+
@EventHandler
34+
fun onFoodLevelChange(event: FoodLevelChangeEvent) {
35+
event.setCancelled(true)
36+
}
4037
}

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

Lines changed: 85 additions & 84 deletions
Original file line numberDiff line numberDiff line change
@@ -1,97 +1,98 @@
1+
package be4rjp.sclat.listener
12

2-
package be4rjp.sclat.listener;
3-
4-
import be4rjp.sclat.api.player.PlayerData;
5-
import be4rjp.sclat.api.team.Team;
6-
import be4rjp.sclat.data.DataMgr;
7-
import be4rjp.sclat.manager.DeathMgr;
8-
import java.util.ArrayList;
9-
import java.util.List;
10-
import org.bukkit.GameMode;
11-
import org.bukkit.Location;
12-
import org.bukkit.Material;
13-
import org.bukkit.block.Block;
14-
import org.bukkit.block.BlockFace;
15-
import org.bukkit.entity.Player;
3+
import be4rjp.sclat.data.DataMgr.blockDataMap
4+
import be4rjp.sclat.data.DataMgr.getPlayerData
5+
import be4rjp.sclat.manager.DeathMgr
6+
import org.bukkit.GameMode
7+
import org.bukkit.Material
8+
import org.bukkit.block.Block
9+
import org.bukkit.block.BlockFace
10+
import org.bukkit.entity.Player
1611

1712
/**
1813
*
1914
* @author Be4rJP
2015
*/
21-
public class SquidListenerMgr {
22-
public static void CheckOnInk(Player player) {
23-
PlayerData data = DataMgr.getPlayerData(player);
24-
if (!data.isInMatch())
25-
return;
26-
Location loc = player.getLocation();
27-
Block playerblock = player.getLocation().getBlock();
28-
Block b1 = loc.add(0, -0.5, 0).getBlock();
29-
Block b2 = player.getLocation().getBlock().getRelative(BlockFace.NORTH);
30-
Block b3 = player.getLocation().getBlock().getRelative(BlockFace.EAST);
31-
Block b4 = player.getLocation().getBlock().getRelative(BlockFace.SOUTH);
32-
Block b5 = player.getLocation().getBlock().getRelative(BlockFace.WEST);
33-
34-
List<Block> list = new ArrayList<>();
35-
list.add(b1);
36-
list.add(b2);
37-
list.add(b3);
38-
list.add(b4);
39-
list.add(b5);
16+
object SquidListenerMgr {
17+
fun checkOnInk(player: Player) {
18+
val data = getPlayerData(player)
19+
if (!data!!.isInMatch()) return
20+
val loc = player.getLocation()
21+
val playerblock = player.getLocation().getBlock()
22+
val b1 = loc.add(0.0, -0.5, 0.0).getBlock()
23+
val b2 = player.getLocation().getBlock().getRelative(BlockFace.NORTH)
24+
val b3 = player.getLocation().getBlock().getRelative(BlockFace.EAST)
25+
val b4 = player.getLocation().getBlock().getRelative(BlockFace.SOUTH)
26+
val b5 = player.getLocation().getBlock().getRelative(BlockFace.WEST)
4027

41-
if (playerblock.getType() == Material.WATER && player.getGameMode().equals(GameMode.ADVENTURE))
42-
DeathMgr.PlayerDeathRunnable(player, player, "water");
28+
val list: MutableList<Block> = ArrayList<Block>()
29+
list.add(b1)
30+
list.add(b2)
31+
list.add(b3)
32+
list.add(b4)
33+
list.add(b5)
4334

44-
try {
45-
if (data.match.getMapData().getVoidY() != 0) {
46-
if (player.getLocation().getY() <= data.match.getMapData().getVoidY()) {
47-
DeathMgr.PlayerDeathRunnable(player, player, "fall");
48-
}
49-
}
50-
} catch (Exception e) {
51-
}
35+
if (playerblock.getType() == Material.WATER && player.getGameMode() == GameMode.ADVENTURE) {
36+
DeathMgr.PlayerDeathRunnable(
37+
player,
38+
player,
39+
"water",
40+
)
41+
}
5242

53-
// if(!DataMgr.getBlockDataMap().containsKey(b2) ||
54-
// !DataMgr.getBlockDataMap().containsKey(b3) ||
55-
// !DataMgr.getBlockDataMap().containsKey(b4) ||
56-
// !DataMgr.getBlockDataMap().containsKey(b5) ||
57-
// !DataMgr.getBlockDataMap().containsKey(b1))
58-
// return;
43+
try {
44+
if (data.match.mapData!!.voidY != 0) {
45+
if (player.getLocation().getY() <= data.match.mapData!!.voidY) {
46+
DeathMgr.PlayerDeathRunnable(player, player, "fall")
47+
}
48+
}
49+
} catch (e: Exception) {
50+
}
5951

60-
Team team = DataMgr.getPlayerData(player).team;
61-
Material p = Material.getMaterial(data.team.getTeamColor().concrete.toString() + "_POWDER");
52+
// if(!DataMgr.getBlockDataMap().containsKey(b2) ||
53+
// !DataMgr.getBlockDataMap().containsKey(b3) ||
54+
// !DataMgr.getBlockDataMap().containsKey(b4) ||
55+
// !DataMgr.getBlockDataMap().containsKey(b5) ||
56+
// !DataMgr.getBlockDataMap().containsKey(b1))
57+
// return;
58+
val team = getPlayerData(player)!!.team
59+
val p =
60+
Material.getMaterial(
61+
data.team.teamColor!!
62+
.concrete
63+
.toString() + "_POWDER",
64+
)
6265

63-
for (Block block : list) {
64-
if (!block.equals(b1)) {
65-
if (DataMgr.getBlockDataMap().containsKey(block)) {
66-
if (DataMgr.getBlockDataMap().get(block).team == data.team) {
67-
if (!data.getIsSquid() || block.getType().equals(Material.AIR))
68-
continue;
69-
data.setIsOnInk(true);
70-
player.setAllowFlight(true);
71-
player.setFlying(true);
72-
return;
73-
}
74-
}
75-
} else {
76-
if (DataMgr.getBlockDataMap().containsKey(block)) {
77-
if (DataMgr.getBlockDataMap().get(block).team == data.team) {
78-
if (!data.getIsSquid() || block.getType().equals(Material.AIR))
79-
continue;
80-
data.setIsOnInk(true);
81-
if (!data.getIsUsingJetPack()) {
82-
player.setAllowFlight(false);
83-
player.setFlying(false);
84-
}
85-
return;
86-
}
87-
}
88-
}
89-
}
66+
for (block in list) {
67+
if (block != b1) {
68+
if (blockDataMap.containsKey(block)) {
69+
if (blockDataMap.get(block)!!.team == data.team) {
70+
if (!data.getIsSquid() || block.getType() == Material.AIR) continue
71+
data.setIsOnInk(true)
72+
player.setAllowFlight(true)
73+
player.setFlying(true)
74+
return
75+
}
76+
}
77+
} else {
78+
if (blockDataMap.containsKey(block)) {
79+
if (blockDataMap.get(block)!!.team == data.team) {
80+
if (!data.getIsSquid() || block.getType() == Material.AIR) continue
81+
data.setIsOnInk(true)
82+
if (!data.getIsUsingJetPack()) {
83+
player.setAllowFlight(false)
84+
player.setFlying(false)
85+
}
86+
return
87+
}
88+
}
89+
}
90+
}
9091

91-
data.setIsOnInk(false);
92-
if (!data.getIsUsingJetPack()) {
93-
player.setAllowFlight(false);
94-
player.setFlying(false);
95-
}
96-
}
92+
data.setIsOnInk(false)
93+
if (!data.getIsUsingJetPack()) {
94+
player.setAllowFlight(false)
95+
player.setFlying(false)
96+
}
97+
}
9798
}

0 commit comments

Comments
 (0)