Skip to content

Commit 19b7d17

Browse files
LarsEsDochLarsEsDoch
committed
Improved code quality
1 parent eca8e83 commit 19b7d17

File tree

8 files changed

+73
-53
lines changed

8 files changed

+73
-53
lines changed

‎src/main/java/dev/lars/utilsmanager/UtilsManager.java‎

Lines changed: 5 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@
1515
import dev.lars.utilsmanager.features.timer.Timer;
1616
import dev.lars.utilsmanager.integrations.discord.DiscordBot;
1717
import dev.lars.utilsmanager.listener.player.BedListener;
18-
import dev.lars.utilsmanager.listener.player.SpawnElytraListener;
19-
import dev.lars.utilsmanager.listener.teleporter.FloorTeleporterListener;
2018
import dev.lars.utilsmanager.listener.teleporter.TeleporterListener;
2119
import dev.lars.utilsmanager.plugin.Registrar;
2220
import dev.lars.utilsmanager.quest.QuestManager;
@@ -33,23 +31,16 @@ public final class UtilsManager extends JavaPlugin {
3331
private static UtilsManager instance;
3432
private ProtocolManager protocolManager;
3533

36-
private Timer timer;
3734
private BackpackManager backpackManager;
38-
private RealTime realTime;
3935
private TablistManager tablistManager;
4036
private RankManager rankManager;
4137
private EntitySummons entitySummons;
42-
private SpawnElytraListener spawnElytraListener;
4338
private QuestManager questManager;
4439
private BanManager banManager;
45-
private FloorTeleporterListener floorTeleporterListener;
4640
private CourtManager courtManager;
47-
private TeleporterListener teleporterListener;
48-
private BedListener bedListener;
4941
private FreeCamManager freeCamManager;
5042
private DiscordBot discordBot;
5143
private KickManager kickManager;
52-
private MaintenanceManager maintenanceManager;
5344
private PlaytimeManager playtimeManager;
5445

5546
@Override
@@ -82,18 +73,16 @@ private void initializeManagers() {
8273
backpackManager = new BackpackManager();
8374
tablistManager = new TablistManager();
8475
rankManager = new RankManager();
85-
timer = new Timer();
86-
realTime = new RealTime();
87-
bedListener = new BedListener();
76+
new Timer();
77+
new RealTime();
78+
new BedListener();
8879
entitySummons = new EntitySummons();
89-
spawnElytraListener = new SpawnElytraListener();
90-
floorTeleporterListener = new FloorTeleporterListener();
9180
courtManager = new CourtManager();
9281
banManager = new BanManager();
93-
teleporterListener = new TeleporterListener();
82+
new TeleporterListener();
9483
freeCamManager = new FreeCamManager();
9584
kickManager = new KickManager();
96-
maintenanceManager = new MaintenanceManager();
85+
new MaintenanceManager();
9786
playtimeManager = new PlaytimeManager();
9887
questManager = new QuestManager();
9988
}
@@ -124,7 +113,6 @@ private void registerEventsAndCommands() {
124113

125114
private void startBackgroundTasks() {
126115
banManager.run();
127-
teleporterListener.checkTeleportTime();
128116
playtimeManager.updateTime();
129117
}
130118

@@ -154,10 +142,6 @@ public CourtManager getCourtManager() {
154142
return courtManager;
155143
}
156144

157-
public RealTime getRealTime() {
158-
return realTime;
159-
}
160-
161145
public TablistManager getTablistManager() {
162146
return tablistManager;
163147
}

‎src/main/java/dev/lars/utilsmanager/commands/teleport/home/SetHomeCommand.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
import dev.lars.apimanager.apis.homeAPI.HomeAPI;
44
import dev.lars.apimanager.apis.languageAPI.LanguageAPI;
55
import dev.lars.utilsmanager.UtilsManager;
6-
import dev.lars.utilsmanager.features.freecam.FreeCamLeaveListener;
7-
import dev.lars.utilsmanager.features.freecam.FreeCamManager;
86
import dev.lars.utilsmanager.utils.Statements;
97
import io.papermc.paper.command.brigadier.BasicCommand;
108
import io.papermc.paper.command.brigadier.CommandSourceStack;

‎src/main/java/dev/lars/utilsmanager/commands/teleport/spawn/SpawnCommand.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import io.papermc.paper.command.brigadier.CommandSourceStack;
99
import net.kyori.adventure.text.Component;
1010
import net.kyori.adventure.text.format.NamedTextColor;
11-
import org.bukkit.Bukkit;
1211
import org.bukkit.Location;
1312
import org.bukkit.Sound;
1413
import org.bukkit.entity.Player;

‎src/main/java/dev/lars/utilsmanager/features/maintenance/MaintenanceManager.java‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,7 @@
1818

1919
public class MaintenanceManager {
2020

21-
public void maintenanceManager() {
22-
run();
23-
}
24-
25-
private void run() {
21+
public MaintenanceManager() {
2622
Bukkit.getScheduler().runTaskTimerAsynchronously(UtilsManager.getInstance(), bukkitTask -> {
2723
if (ServerSettingsAPI.getApi().isMaintenanceEnabled()) {
2824
Instant maintenanceEnd = ServerSettingsAPI.getApi().getMaintenanceEstimatedEnd();

‎src/main/java/dev/lars/utilsmanager/listener/server/ServerPingListener.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ private static Component centerLines(List<String> lines, int width, net.kyori.ad
118118
String pad = " ".repeat(padding);
119119
result = result.append(Component.text(pad)).append(Component.text(line, color));
120120
if (i < lines.size() - 1) {
121-
result = result.append(Component.text("\n")); // removed the extra single space here
121+
result = result.append(Component.text("\n"));
122122
}
123123
}
124124
return result;

‎src/main/java/dev/lars/utilsmanager/listener/teleporter/FloorTeleporterListener.java‎

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,31 @@ public class FloorTeleporterListener implements Listener {
2222

2323
private final Map<UUID, Double> lastY = new HashMap<>();
2424
private final Map<UUID, Long> teleportCooldown = new HashMap<>();
25-
private static final long COOLDOWN_TICKS = 10L; // 0.5 seconds
25+
private static final long COOLDOWN_TICKS = 10L;
26+
27+
public FloorTeleporterListener() {
28+
Bukkit.getScheduler().runTaskTimer(UtilsManager.getInstance(), () -> {
29+
for (Player player : Bukkit.getOnlinePlayers()) {
30+
if (player.isSneaking() && !isOnCooldown(player.getUniqueId())) {
31+
if (isOnDaylightDetector(player)) {
32+
teleportDown(player);
33+
}
34+
}
35+
}
36+
}, 1L, 1L);
37+
}
2638

2739
@EventHandler
2840
public void onPlayerMove(PlayerMoveEvent event) {
2941
Player player = event.getPlayer();
3042
UUID playerId = player.getUniqueId();
43+
Location from = event.getFrom();
3144
Location to = event.getTo();
3245

46+
if (from.getY() == to.getY()) {
47+
return;
48+
}
49+
3350
if (isOnCooldown(playerId)) {
3451
return;
3552
}
@@ -44,8 +61,6 @@ public void onPlayerMove(PlayerMoveEvent event) {
4461

4562
if (currentY > previousY) {
4663
teleportUp(player);
47-
} else if (player.isSneaking()) {
48-
teleportDown(player);
4964
}
5065
}
5166

‎src/main/java/dev/lars/utilsmanager/listener/teleporter/TeleporterListener.java‎

Lines changed: 45 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
import dev.lars.apimanager.ApiManager;
44
import dev.lars.apimanager.apis.languageAPI.LanguageAPI;
55
import dev.lars.apimanager.apis.serverSettingsAPI.ServerSettingsAPI;
6-
import dev.lars.utilsmanager.UtilsManager;
76
import dev.lars.utilsmanager.utils.Statements;
87
import net.kyori.adventure.text.Component;
98
import net.kyori.adventure.text.format.NamedTextColor;
9+
import net.kyori.adventure.title.Title;
1010
import org.bukkit.Bukkit;
1111
import org.bukkit.Location;
1212
import org.bukkit.Material;
@@ -15,16 +15,15 @@
1515
import org.bukkit.event.Listener;
1616
import org.bukkit.potion.PotionEffect;
1717
import org.bukkit.potion.PotionEffectType;
18-
import org.bukkit.scheduler.BukkitRunnable;
1918

2019
import java.util.HashMap;
2120
import java.util.Map;
2221

2322
public class TeleporterListener implements Listener {
2423
Map<Player, Integer> data = new HashMap<>();
2524

26-
public void checkTeleportTime() {
27-
Bukkit.getScheduler().runTaskTimerAsynchronously(ApiManager.getInstance(), bukkitTask -> {
25+
public TeleporterListener() {
26+
Bukkit.getScheduler().runTaskTimer(ApiManager.getInstance(), bukkitTask -> {
2827
Location loc = ServerSettingsAPI.getApi().getSpawnLocation();
2928
if (loc == null) return;
3029
for (Player player: Bukkit.getOnlinePlayers()) {
@@ -33,34 +32,58 @@ public void checkTeleportTime() {
3332
}
3433
if (player.getLocation().getBlockX() == loc.getBlockX() && player.getLocation().getBlockZ() == loc.getBlockZ() && player.getLocation().getBlock().getType() == Material.SCULK_SENSOR) {
3534
if (!data.containsKey(player)) {
36-
player.addPotionEffect(new PotionEffect(PotionEffectType.BLINDNESS, 150, 0));
37-
player.addPotionEffect(new PotionEffect(PotionEffectType.NAUSEA, 150, 255));
35+
player.addPotionEffect(new PotionEffect(PotionEffectType.DARKNESS, 130, 0));
36+
player.addPotionEffect(new PotionEffect(PotionEffectType.NAUSEA, 170, 255));
3837
data.put(player, 6);
3938
}
4039
data.put(player, data.get(player) - 1);
4140
switch (data.get(player)) {
4241
case 5: {
43-
player.sendTitle(NamedTextColor.DARK_RED + "5", "", 10, 20, 10);
42+
player.showTitle(Title.title(
43+
Component.text("5", NamedTextColor.DARK_RED),
44+
Component.empty(),
45+
10, 20, 10
46+
));
4447
break;
4548
}
4649
case 4: {
47-
player.sendTitle(NamedTextColor.RED + "4", "", 10, 20, 10);
50+
player.showTitle(Title.title(
51+
Component.text("4", NamedTextColor.RED),
52+
Component.empty(),
53+
10, 20, 10
54+
));
4855
break;
4956
}
5057
case 3: {
51-
player.sendTitle(NamedTextColor.GOLD + "3", "", 10, 20, 10);
58+
player.showTitle(Title.title(
59+
Component.text("3", NamedTextColor.GOLD),
60+
Component.empty(),
61+
10, 20, 10
62+
));
5263
break;
5364
}
5465
case 2: {
55-
player.sendTitle(NamedTextColor.YELLOW + "2", "", 10, 20, 10);
66+
player.showTitle(Title.title(
67+
Component.text("2", NamedTextColor.YELLOW),
68+
Component.empty(),
69+
10, 20, 10
70+
));
5671
break;
5772
}
5873
case 1: {
59-
player.sendTitle(NamedTextColor.GREEN+ "1", "", 10, 20, 10);
74+
player.showTitle(Title.title(
75+
Component.text("1", NamedTextColor.GREEN),
76+
Component.empty(),
77+
10, 50, 10
78+
));
6079
break;
6180
}
6281
case 0: {
63-
player.sendTitle(NamedTextColor.LIGHT_PURPLE + "Spawn!", "", 10, 30, 10);
82+
player.showTitle(Title.title(
83+
Component.text("Spawn!", NamedTextColor.LIGHT_PURPLE),
84+
Component.empty(),
85+
10, 10, 10
86+
));
6487
player.teleport(loc);
6588
if (LanguageAPI.getApi().getLanguage(player) == 2) {
6689
player.sendMessage(Statements.getPrefix().append(Component.text("Du wurdest zum Spawn teleportiert.", NamedTextColor.GREEN)));
@@ -79,17 +102,22 @@ public void checkTeleportTime() {
79102
if (!data.containsKey(player)) {
80103
return;
81104
}
105+
Component canceledMessage;
82106
if (LanguageAPI.getApi().getLanguage(player) == 2) {
83-
player.sendMessage(NamedTextColor.RED + "Abgebrochen!");
107+
canceledMessage = Component.text("Abgebrochen!", NamedTextColor.RED);
84108
} else {
85-
player.sendMessage(NamedTextColor.RED + "Canceled!");
109+
canceledMessage = Component.text("Canceled!", NamedTextColor.RED);
86110
}
87-
player.sendTitle(" ", "", 0, 10, 0);
88-
player.removePotionEffect(PotionEffectType.BLINDNESS);
111+
player.showTitle(Title.title(
112+
Component.empty(),
113+
canceledMessage,
114+
10, 10, 5
115+
));
116+
player.removePotionEffect(PotionEffectType.DARKNESS);
89117
player.removePotionEffect(PotionEffectType.NAUSEA);
90118
data.remove(player);
91119
return;
92120
}
93121
}, 20, 20);
94122
}
95-
}
123+
}

‎src/main/java/dev/lars/utilsmanager/plugin/Registrar.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
import dev.lars.utilsmanager.commands.admin.*;
44
import dev.lars.utilsmanager.commands.economy.*;
55
import dev.lars.utilsmanager.commands.player.*;
6-
import dev.lars.utilsmanager.commands.teleport.spawn.SetSpawnCommand;
7-
import dev.lars.utilsmanager.commands.teleport.spawn.SpawnCommand;
8-
import dev.lars.utilsmanager.commands.teleport.spawn.ToggleBedCommand;
96
import dev.lars.utilsmanager.commands.teleport.home.DeleteHomeCommand;
107
import dev.lars.utilsmanager.commands.teleport.home.HomeCommand;
118
import dev.lars.utilsmanager.commands.teleport.home.SetHomeCommand;
9+
import dev.lars.utilsmanager.commands.teleport.spawn.SetSpawnCommand;
10+
import dev.lars.utilsmanager.commands.teleport.spawn.SpawnCommand;
11+
import dev.lars.utilsmanager.commands.teleport.spawn.ToggleBedCommand;
1212
import dev.lars.utilsmanager.features.backpack.BackpackCommand;
1313
import dev.lars.utilsmanager.features.backpack.BackpackConfigurationCommand;
1414
import dev.lars.utilsmanager.features.backpack.BackpackManager;

0 commit comments

Comments
 (0)