diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..676b922 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +SpectrumSurvival \ No newline at end of file diff --git a/settings.gradle.kts b/settings.gradle.kts index c458a8f..837cbe2 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,2 +1,2 @@ -rootProject.name = "MinestomGameJam" +rootProject.name = "SpectrumSurvival" diff --git a/src/main/java/dev/celestialfox/spectrumsurvival/Server.java b/src/main/java/dev/celestialfox/spectrumsurvival/Server.java index 1195a5b..48d24b4 100644 --- a/src/main/java/dev/celestialfox/spectrumsurvival/Server.java +++ b/src/main/java/dev/celestialfox/spectrumsurvival/Server.java @@ -13,6 +13,7 @@ import net.kyori.adventure.text.format.NamedTextColor; import net.minestom.server.MinecraftServer; import net.minestom.server.adventure.audience.Audiences; import net.minestom.server.command.CommandManager; +import net.minestom.server.extras.bungee.BungeeCordProxy; import net.minestom.server.timer.TaskSchedule; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -46,6 +47,7 @@ public class Server { MinecraftServer.getBlockManager().registerHandler("minecraft:spruce_wall_sign", SignHandler::new); // Server Start + BungeeCordProxy.enable(); server.start(Settings.getIP(), Settings.getPort()); logger.info("Server Started at " + Settings.getIP() + ":" + Settings.getPort() + " (MC: " + MinecraftServer.VERSION_NAME + ")"); } @@ -74,16 +76,22 @@ public class Server { public static NamedTextColor randomMadeByColor() { Random random = new Random(); int num = random.nextInt(4); - if (num == 0) { - return NamedTextColor.BLUE; - } else if (num == 1) { - return NamedTextColor.GRAY; - } else if (num == 2) { - return NamedTextColor.GOLD; - } else if (num == 3) { - return NamedTextColor.GREEN; - } else { - return NamedTextColor.BLUE; + switch (num) { + case 0 -> { + return NamedTextColor.BLUE; + } + case 1 -> { + return NamedTextColor.GRAY; + } + case 2 -> { + return NamedTextColor.GOLD; + } + case 3 -> { + return NamedTextColor.GREEN; + } + default -> { + return NamedTextColor.RED; + } } } } \ No newline at end of file diff --git a/src/main/java/dev/celestialfox/spectrumsurvival/game/commands/AboutCommand.java b/src/main/java/dev/celestialfox/spectrumsurvival/game/commands/AboutCommand.java index 9892c22..4c9425f 100644 --- a/src/main/java/dev/celestialfox/spectrumsurvival/game/commands/AboutCommand.java +++ b/src/main/java/dev/celestialfox/spectrumsurvival/game/commands/AboutCommand.java @@ -39,5 +39,10 @@ public class AboutCommand extends Command { } } }), ArgumentType.String("arg1")); + addSyntax(((sender, context) -> { + if (sender instanceof Player player) { + player.sendMessage(Component.text("Use §e/about us §ror §e/about game", NamedTextColor.GRAY)); + } + })); } }