Skip to content

Commit 1cf4f15

Browse files
ArikSquadArikSquad
committed
fix: correct class names
1 parent 8daa33b commit 1cf4f15

5 files changed

Lines changed: 19 additions & 15 deletions

File tree

type.skywarslobby/src/main/java/net/swofty/type/skywarslobby/SkywarsLobbyScoreboard.java renamed to type.skywarslobby/src/main/java/net/swofty/type/skywarslobby/SkyWarsLobbyScoreboard.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import java.util.List;
2525
import java.util.Locale;
2626

27-
public class SkywarsLobbyScoreboard {
27+
public class SkyWarsLobbyScoreboard {
2828
private static final HypixelScoreboard scoreboard = new HypixelScoreboard();
2929
private static Integer animationFrame = 0;
3030

@@ -65,7 +65,7 @@ public static void start() {
6565
List<String> lines = new ArrayList<>();
6666
lines.add("§7" + new SimpleDateFormat(I18n.string("scoreboard.common.date_format", l)).format(new Date()) + " §8" + HypixelConst.getServerName());
6767
lines.add("§7 ");
68-
lines.add(I18n.string("scoreboard.skywars_lobby.your_level_label", l) + " " + SkywarsLevelColor.getLevelDisplay(level));
68+
lines.add(I18n.string("scoreboard.skywars_lobby.your_level_label", l) + " " + SkyWarsLevelColor.getLevelDisplay(level));
6969
lines.add("§7 ");
7070
lines.add(I18n.string("scoreboard.skywars_lobby.solo_kills_label", l) + soloKills);
7171
lines.add(I18n.string("scoreboard.skywars_lobby.solo_wins_label", l) + soloWins);

type.skywarslobby/src/main/java/net/swofty/type/skywarslobby/TypeSkywarsLobbyLoader.java renamed to type.skywarslobby/src/main/java/net/swofty/type/skywarslobby/TypeSkyWarsLobbyLoader.java

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,20 @@
1111
import net.swofty.proxyapi.redis.ServiceToClient;
1212
import net.swofty.type.generic.HypixelConst;
1313
import net.swofty.type.generic.HypixelGenericLoader;
14+
import net.swofty.type.generic.command.HypixelCommand;
1415
import net.swofty.type.generic.data.GameDataHandler;
1516
import net.swofty.type.generic.data.handlers.SkywarsDataHandler;
16-
import net.swofty.type.generic.command.HypixelCommand;
1717
import net.swofty.type.generic.entity.hologram.PlayerHolograms;
1818
import net.swofty.type.generic.entity.npc.HypixelNPC;
1919
import net.swofty.type.generic.event.HypixelEventClass;
2020
import net.swofty.type.generic.tab.TablistManager;
2121
import net.swofty.type.generic.tab.TablistModule;
2222
import net.swofty.type.lobby.LobbyTypeLoader;
23-
import net.swofty.type.lobby.events.*;
23+
import net.swofty.type.lobby.events.LobbyBlockBreak;
24+
import net.swofty.type.lobby.events.LobbyItemEvents;
25+
import net.swofty.type.lobby.events.LobbyLaunchPadEvents;
26+
import net.swofty.type.lobby.events.LobbyPlayerJoinEvents;
27+
import net.swofty.type.lobby.events.LobbyPlayerMove;
2428
import net.swofty.type.lobby.item.LobbyItem;
2529
import net.swofty.type.lobby.item.LobbyItemHandler;
2630
import net.swofty.type.lobby.item.impl.HidePlayers;
@@ -32,22 +36,22 @@
3236
import net.swofty.type.lobby.parkour.Parkour;
3337
import net.swofty.type.skywarslobby.hologram.LeaderboardHologramManager;
3438
import net.swofty.type.skywarslobby.hologram.SoulWellHologramManager;
35-
import net.swofty.type.skywarslobby.parkour.SkywarsLobbyParkour;
3639
import net.swofty.type.skywarslobby.item.SkywarsMenuItem;
3740
import net.swofty.type.skywarslobby.kit.SkywarsKitRegistry;
3841
import net.swofty.type.skywarslobby.level.SkywarsLevelRegistry;
42+
import net.swofty.type.skywarslobby.parkour.SkywarsLobbyParkour;
3943
import net.swofty.type.skywarslobby.perk.SkywarsPerkRegistry;
4044
import net.swofty.type.skywarslobby.soulwell.SoulWellParticleManager;
4145
import net.swofty.type.skywarslobby.soulwell.SoulWellUpgradeRegistry;
42-
import net.swofty.type.skywarslobby.util.SkywarsLobbyMap;
46+
import net.swofty.type.skywarslobby.util.SkyWarsLobbyMap;
4347
import org.jetbrains.annotations.Nullable;
4448
import org.tinylog.Logger;
4549

4650
import java.util.ArrayList;
4751
import java.util.List;
4852
import java.util.Map;
4953

50-
public class TypeSkywarsLobbyLoader implements LobbyTypeLoader {
54+
public class TypeSkyWarsLobbyLoader implements LobbyTypeLoader {
5155
@Getter
5256
private final LobbyItemHandler itemHandler = new LobbyItemHandler();
5357
@Getter
@@ -73,10 +77,10 @@ public void afterInitialize(MinecraftServer server) {
7377
SoulWellUpgradeRegistry.initialize();
7478
Logger.info("Initialized SkyWars kit, perk, level, and soul well upgrade registries");
7579

76-
SkywarsLobbyScoreboard.start();
80+
SkyWarsLobbyScoreboard.start();
7781

7882
// Place map item frames in the lobby
79-
SkywarsLobbyMap skywarsLobbyMap = new SkywarsLobbyMap();
83+
SkyWarsLobbyMap skywarsLobbyMap = new SkyWarsLobbyMap();
8084
skywarsLobbyMap.placeItemFrames(HypixelConst.getInstanceContainer());
8185

8286
// Initialize parkour manager

‎type.skywarslobby/src/main/java/net/swofty/type/skywarslobby/events/ActionPlayerDisconnect.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55
import net.swofty.type.generic.event.HypixelEvent;
66
import net.swofty.type.generic.event.HypixelEventClass;
77
import net.swofty.type.generic.user.HypixelPlayer;
8-
import net.swofty.type.skywarslobby.SkywarsLobbyScoreboard;
8+
import net.swofty.type.skywarslobby.SkyWarsLobbyScoreboard;
99

1010
public class ActionPlayerDisconnect implements HypixelEventClass {
1111

1212
@HypixelEvent(node = EventNodes.PLAYER, requireDataLoaded = false)
1313
public void run(PlayerDisconnectEvent event) {
1414
HypixelPlayer player = (HypixelPlayer) event.getPlayer();
15-
SkywarsLobbyScoreboard.removeCache(player);
15+
SkyWarsLobbyScoreboard.removeCache(player);
1616
}
1717
}
1818

‎type.skywarslobby/src/main/java/net/swofty/type/skywarslobby/events/ActionPlayerSpawn.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
package net.swofty.type.skywarslobby.events;
22

33
import lombok.SneakyThrows;
4-
import net.minestom.server.event.player.PlayerSpawnEvent;
54
import net.minestom.server.entity.GameMode;
5+
import net.minestom.server.event.player.PlayerSpawnEvent;
66
import net.swofty.type.generic.event.EventNodes;
77
import net.swofty.type.generic.event.HypixelEvent;
88
import net.swofty.type.generic.event.HypixelEventClass;
99
import net.swofty.type.generic.user.HypixelPlayer;
1010
import net.swofty.type.skywarslobby.hologram.LeaderboardHologramManager;
1111
import net.swofty.type.skywarslobby.hologram.SoulWellHologramManager;
12-
import net.swofty.type.skywarslobby.util.SkywarsLobbyMap;
12+
import net.swofty.type.skywarslobby.util.SkyWarsLobbyMap;
1313

1414
public class ActionPlayerSpawn implements HypixelEventClass {
1515

@@ -20,7 +20,7 @@ public void run(PlayerSpawnEvent event) {
2020
player.setGameMode(GameMode.SURVIVAL);
2121

2222
// Send map data to player
23-
SkywarsLobbyMap skywarsLobbyMap = new SkywarsLobbyMap();
23+
SkyWarsLobbyMap skywarsLobbyMap = new SkyWarsLobbyMap();
2424
skywarsLobbyMap.sendMapData(player);
2525

2626
// Spawn leaderboard holograms for this player

type.skywarslobby/src/main/java/net/swofty/type/skywarslobby/util/SkywarsLobbyMap.java renamed to type.skywarslobby/src/main/java/net/swofty/type/skywarslobby/util/SkyWarsLobbyMap.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import net.minestom.server.coordinate.Pos;
44
import net.swofty.type.generic.utility.AbstractMapSystem;
55

6-
public class SkywarsLobbyMap extends AbstractMapSystem {
6+
public class SkyWarsLobbyMap extends AbstractMapSystem {
77

88
@Override
99
protected MapConfiguration getConfiguration() {

0 commit comments

Comments
 (0)