stijn/HungerGames
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: stijn:646b9a2a35e1a3dec2b53dfabe63b21cdb4071d5
Branches Tags
stijn:master
..
compare: stijn:cf011ae72f74e1bbc62138eb8eb6d629b1b2b27b
Branches Tags
stijn:master

No commits in common. "646b9a2a35e1a3dec2b53dfabe63b21cdb4071d5" and "cf011ae72f74e1bbc62138eb8eb6d629b1b2b27b" have entirely different histories.
646b9a2a35 ... cf011ae72f

3 changed files with 10 additions and 31 deletions
Show Stats Expand all files Collapse all files

30
src/main/java/com/alttd/hunger_games/config/Messages.java
View File

@ -82,7 +82,6 @@ public class Messages extends AbstractConfig {
public static String BORDER_SHRINK = "<red>The border is shrinking to <size> blocks!</red>"; public static String BORDER_SHRINK = "<red>The border is shrinking to <size> blocks!</red>";
public static String CHEST_EMPTY = "<red>This chest is empty!</red>"; public static String CHEST_EMPTY = "<red>This chest is empty!</red>";
public static String WINNER = "<gold><player> has won the Hunger Games!</gold>"; public static String WINNER = "<gold><player> has won the Hunger Games!</gold>";
public static String PLAYER_DEATH = "<red><player> has died! <gold><remaining></gold> players remaining.</red>";
@SuppressWarnings("unused") @SuppressWarnings("unused")
private static void load() { private static void load() {
@ -91,18 +90,6 @@ public class Messages extends AbstractConfig {
BORDER_SHRINK = config.getString(prefix, "border-shrink", BORDER_SHRINK); BORDER_SHRINK = config.getString(prefix, "border-shrink", BORDER_SHRINK);
CHEST_EMPTY = config.getString(prefix, "chest-empty", CHEST_EMPTY); CHEST_EMPTY = config.getString(prefix, "chest-empty", CHEST_EMPTY);
WINNER = config.getString(prefix, "winner", WINNER); WINNER = config.getString(prefix, "winner", WINNER);
PLAYER_DEATH = config.getString(prefix, "player-death", PLAYER_DEATH);
}
}
public static class START_ROUND {
private static final String prefix = "start-round.";
public static String CAN_NOT_START_ROUND = "<red>Unable to start the round, current state is <round_state></red>";
@SuppressWarnings("unused")
private static void load() {
CAN_NOT_START_ROUND = config.getString(prefix, "can-not-start", CAN_NOT_START_ROUND);
} }
} }
@ -166,15 +153,14 @@ public class Messages extends AbstractConfig {
public static class STATS { public static class STATS {
private static final String prefix = "stats."; private static final String prefix = "stats.";
public static String STATS_FORMAT = """ public static String STATS_FORMAT = "<gold>Stats for <player>:</gold>\n" +
<gold>Stats for <player>:</gold> "<green>Kills: <gold><kills></gold></green>\n" +
<green>Kills: <gold><kills></gold></green> "<green>Deaths: <gold><deaths></gold></green>\n" +
<green>Deaths: <gold><deaths></gold></green> "<green>Damage Dealt: <gold><damage_dealt></gold></green>\n" +
<green>Damage Dealt: <gold><damage_dealt></gold></green> "<green>Damage Taken: <gold><damage_taken></gold></green>\n" +
<green>Damage Taken: <gold><damage_taken></gold></green> "<green>Wins: <gold><wins></gold></green>\n" +
<green>Wins: <gold><wins></gold></green> "<green>Rounds Played: <gold><rounds_played></gold></green>\n" +
<green>Rounds Played: <gold><rounds_played></gold></green> "<green>K/D Ratio: <gold><kd_ratio></gold></green>";
<green>K/D Ratio: <gold><kd_ratio></gold></green>""";
@SuppressWarnings("unused") @SuppressWarnings("unused")
private static void load() { private static void load() {

1
src/main/java/com/alttd/hunger_games/event_listeners/PlayerDamageListener.java
View File

@ -42,7 +42,6 @@ public class PlayerDamageListener implements Listener {
@EventHandler @EventHandler
public void onPlayerDeath(PlayerDeathEvent event) { public void onPlayerDeath(PlayerDeathEvent event) {
Player player = event.getPlayer(); Player player = event.getPlayer();
event.deathMessage(null);
playerService.handlePlayerDeath(player); playerService.handlePlayerDeath(player);
statService.addDeath(player.getUniqueId()); statService.addDeath(player.getUniqueId());

10
src/main/java/com/alttd/hunger_games/services/PlayerService.java
View File

@ -4,8 +4,6 @@ import com.alttd.hunger_games.config.Messages;
import com.alttd.hunger_games.data_objects.DESTINATION; import com.alttd.hunger_games.data_objects.DESTINATION;
import com.alttd.hunger_games.data_objects.PLAYER_STATE; import com.alttd.hunger_games.data_objects.PLAYER_STATE;
import com.alttd.hunger_games.data_objects.ROUND_STATE; import com.alttd.hunger_games.data_objects.ROUND_STATE;
import net.kyori.adventure.text.minimessage.MiniMessage;
import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@ -78,7 +76,7 @@ public class PlayerService implements RoundListener {
PLAYER_STATE playerState = optionalPlayerState.get(); PLAYER_STATE playerState = optionalPlayerState.get();
if (playerState == PLAYER_STATE.SPECTATING) { if (playerState == PLAYER_STATE.SPECTATING) {
playerTeleporterService.teleportPlayer(player, DESTINATION.SPECTATOR_AREA); //TODO: teleport player to spectator location
} }
roundService.setPlayerState(player.getUniqueId(), playerState); roundService.setPlayerState(player.getUniqueId(), playerState);
@ -106,11 +104,7 @@ public class PlayerService implements RoundListener {
public void handlePlayerDeath(Player player) { public void handlePlayerDeath(Player player) {
UUID uuid = player.getUniqueId(); UUID uuid = player.getUniqueId();
roundService.setPlayerState(uuid, PLAYER_STATE.SPECTATING); roundService.setPlayerState(uuid, PLAYER_STATE.SPECTATING);
// TODO: send a message when a player is killed
int remaining = roundService.getPlayers(PLAYER_STATE.REGISTERED).size();
Bukkit.broadcast(MiniMessage.miniMessage().deserialize(Messages.GAME.PLAYER_DEATH,
Placeholder.component("player", player.name()),
Placeholder.unparsed("remaining", String.valueOf(remaining))));
} }
public void handlePlayerRespawn(Player player) { public void handlePlayerRespawn(Player player) {