Skip to content
This repository was archived by the owner on Dec 7, 2022. It is now read-only.

Commit 7a164d7

Browse files
committed
Add kills and deaths stats
1 parent d810fe9 commit 7a164d7

File tree

30 files changed

+362
-69
lines changed

30 files changed

+362
-69
lines changed

src/main/java/in/twizmwaz/cardinal/chat/ChatConstant.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -356,6 +356,7 @@ public enum ChatConstant {
356356
UI_FLAG_PICKED_UP("userInterface.flagPickedUp"),
357357
UI_FLAG_DROPPED("userInterface.flagDropped"),
358358
UI_FLAG_RESPAWNED("userInterface.flagRespawned"),
359+
UI_STATS_DISPLAY("userInterface.statsDisplay"),
359360

360361
UI_DEATH_RESPAWN_UNCONFIRMED("userInterface.deathRespawnUnconfirmed"),
361362
UI_DEATH_RESPAWN_UNCONFIRMED_TIME("userInterface.deathRespawnUnconfirmedTime"),

src/main/java/in/twizmwaz/cardinal/command/ModesCommand.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import java.util.Collections;
2222
import java.util.HashMap;
2323
import java.util.List;
24+
import java.util.Map;
2425

2526
public class ModesCommand {
2627

@@ -30,7 +31,7 @@ public static void modes(final CommandContext cmd, CommandSender sender) throws
3031
throw new CommandException(ChatConstant.ERROR_NO_RESULT_MATCH.getMessage(ChatUtil.getLocale(sender)));
3132
}
3233
ModuleCollection<MonumentModes> modes = GameHandler.getGameHandler().getMatch().getModules().getModules(MonumentModes.class);
33-
HashMap<MonumentModes, Integer> modesWithTime = new HashMap<>();
34+
Map<MonumentModes, Integer> modesWithTime = new HashMap<>();
3435
for (MonumentModes modeForTime : modes) {
3536
modesWithTime.put(modeForTime, modeForTime.getTimeAfter());
3637
}

src/main/java/in/twizmwaz/cardinal/command/SettingCommands.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import com.sk89q.minecraft.util.commands.CommandException;
66
import in.twizmwaz.cardinal.chat.ChatConstant;
77
import in.twizmwaz.cardinal.chat.LocalizedChatMessage;
8-
import in.twizmwaz.cardinal.event.PlayerVisibilityChangeEvent;
8+
import in.twizmwaz.cardinal.event.PlayerSettingChangeEvent;
99
import in.twizmwaz.cardinal.settings.Setting;
1010
import in.twizmwaz.cardinal.settings.SettingValue;
1111
import in.twizmwaz.cardinal.settings.Settings;
@@ -48,11 +48,11 @@ public static void set(final CommandContext cmd, CommandSender sender) throws Co
4848
if (value == null) {
4949
throw new CommandException(ChatConstant.ERROR_NO_VALUE_MATCH.getMessage(ChatUtil.getLocale(sender)));
5050
}
51+
SettingValue oldValue = setting.getValueByPlayer((Player) sender);
5152
setting.setValueByPlayer((Player) sender, value);
5253
sender.sendMessage(ChatColor.YELLOW + setting.getNames().get(0) + ": " + ChatColor.WHITE + value.getValue());
53-
if (Settings.getSettingByName("Observers") != null && setting.equals(Settings.getSettingByName("Observers"))) {
54-
Bukkit.getServer().getPluginManager().callEvent(new PlayerVisibilityChangeEvent((Player) sender));
55-
}
54+
55+
Bukkit.getServer().getPluginManager().callEvent(new PlayerSettingChangeEvent((Player) sender, setting, oldValue, value));
5656
}
5757

5858
@Command(aliases = {"toggle"}, desc = "Toggle a setting.", usage = "<setting>", min = 1)
Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
package in.twizmwaz.cardinal.event;
2+
3+
import in.twizmwaz.cardinal.settings.Setting;
4+
import in.twizmwaz.cardinal.settings.SettingValue;
5+
import org.bukkit.entity.Player;
6+
import org.bukkit.event.HandlerList;
7+
import org.bukkit.event.player.PlayerEvent;
8+
9+
public class PlayerSettingChangeEvent extends PlayerEvent {
10+
11+
private static final HandlerList handlers = new HandlerList();
12+
13+
private final Setting setting;
14+
private final SettingValue newValue;
15+
private final SettingValue oldValue;
16+
17+
public PlayerSettingChangeEvent(Player player, Setting setting, SettingValue oldValue, SettingValue newValue) {
18+
super(player);
19+
20+
this.setting = setting;
21+
this.newValue = newValue;
22+
this.oldValue = oldValue;
23+
}
24+
25+
public static HandlerList getHandlerList() {
26+
return handlers;
27+
}
28+
29+
@Override
30+
public HandlerList getHandlers() {
31+
return handlers;
32+
}
33+
34+
public Setting getSetting() {
35+
return setting;
36+
}
37+
38+
public SettingValue getOldValue() {
39+
return oldValue;
40+
}
41+
42+
public SettingValue getNewValue() {
43+
return newValue;
44+
}
45+
46+
}

src/main/java/in/twizmwaz/cardinal/event/PlayerVisibilityChangeEvent.java

Lines changed: 0 additions & 24 deletions
This file was deleted.

src/main/java/in/twizmwaz/cardinal/module/ModuleFactory.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@
6565
import in.twizmwaz.cardinal.module.modules.sound.SoundModuleBuilder;
6666
import in.twizmwaz.cardinal.module.modules.spawn.SpawnModuleBuilder;
6767
import in.twizmwaz.cardinal.module.modules.startTimer.StartTimerBuilder;
68+
import in.twizmwaz.cardinal.module.modules.stats.StatsBuilder;
6869
import in.twizmwaz.cardinal.module.modules.tasker.TaskerModuleBuilder;
6970
import in.twizmwaz.cardinal.module.modules.team.TeamModuleBuilder;
7071
import in.twizmwaz.cardinal.module.modules.teamManager.TeamManagerModuleBuilder;
@@ -183,7 +184,8 @@ private void addBuilders() {
183184
CraftingModuleBuilder.class,
184185
PostBuilder.class,
185186
FlagBuilder.class,
186-
NetBuilder.class
187+
NetBuilder.class,
188+
StatsBuilder.class
187189
));
188190
}
189191

src/main/java/in/twizmwaz/cardinal/module/modules/armorKeep/ArmorKeep.java

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,17 @@
1212
import org.bukkit.inventory.PlayerInventory;
1313

1414
import java.util.HashMap;
15+
import java.util.Map;
1516

1617
public class ArmorKeep implements Module {
1718

1819
private final Material type;
1920
private final int damageValue;
2021

21-
private HashMap<Player, ItemStack> helmet;
22-
private HashMap<Player, ItemStack> chestplate;
23-
private HashMap<Player, ItemStack> leggings;
24-
private HashMap<Player, ItemStack> boots;
22+
private Map<Player, ItemStack> helmet;
23+
private Map<Player, ItemStack> chestplate;
24+
private Map<Player, ItemStack> leggings;
25+
private Map<Player, ItemStack> boots;
2526

2627
protected ArmorKeep(Material type, int damageValue) {
2728
this.type = type;
@@ -46,7 +47,7 @@ public void unload() {
4647
public void onPlayerDeath(PlayerDeathEvent event) {
4748
Player player = event.getEntity();
4849
PlayerInventory inventory = player.getInventory();
49-
HashMap<Integer, ItemStack> itemsToKeep = new HashMap<>();
50+
Map<Integer, ItemStack> itemsToKeep = new HashMap<>();
5051
if (inventory.getHelmet() != null) {
5152
if (inventory.getHelmet().getType().equals(type) && inventory.getHelmet().getDurability() == damageValue) {
5253
helmet.put(player, inventory.getHelmet());

src/main/java/in/twizmwaz/cardinal/module/modules/classModule/ClassModule.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,12 @@
1818
import org.bukkit.event.HandlerList;
1919

2020
import java.util.HashMap;
21+
import java.util.Map;
2122
import java.util.UUID;
2223

2324
public class ClassModule implements Module {
2425

25-
public static HashMap<UUID, ClassModule> playerClass = new HashMap<>();
26+
public static Map<UUID, ClassModule> playerClass = new HashMap<>();
2627

2728
private final String name;
2829
private final String description;

src/main/java/in/twizmwaz/cardinal/module/modules/damageIndicator/DamageIndicator.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
import java.util.ArrayList;
3232
import java.util.HashMap;
3333
import java.util.List;
34+
import java.util.Map;
3435
import java.util.UUID;
3536

3637
public class DamageIndicator implements Module {
@@ -40,7 +41,7 @@ public class DamageIndicator implements Module {
4041

4142
public static double OFFSET = (WIDTH - ZOMBIE_HIT_BOX) / 2;
4243

43-
private HashMap<UUID, PlayerBoundingBox> boundingBoxes = new HashMap<>();
44+
private Map<UUID, PlayerBoundingBox> boundingBoxes = new HashMap<>();
4445

4546
@Override
4647
public void unload() {

src/main/java/in/twizmwaz/cardinal/module/modules/destroyable/DestroyableObjective.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public class DestroyableObjective implements GameObjective {
6565

6666
private Set<UUID> playersTouched;
6767
private double size;
68-
private HashMap<UUID, Integer> playersCompleted;
68+
private Map<UUID, Integer> playersCompleted;
6969
private List<Block> monument;
7070

7171
private double complete;

0 commit comments

Comments
 (0)