Some tweaks

Author: Hugman76

src/main/java/fr/hugman/uhc/api/gui/UHCConfigGuiElements.java

@@ -2,7 +2,6 @@
 
 import eu.pb4.sgui.api.elements.GuiElementBuilder;
 import fr.hugman.uhc.api.config.UHCConfig;
-import fr.hugman.uhc.api.game.UHCGameTeamSize;
 import fr.hugman.uhc.api.gui.creator.UHCModulesGui;
 import fr.hugman.uhc.api.module.UHCModule;
 import fr.hugman.uhc.api.registry.UHCRegistryKeys;
@@ -19,6 +18,7 @@
 import java.util.ArrayList;
 import java.util.stream.Collectors;
 
+//TODO: custom icons
 public class UHCConfigGuiElements {
     public static GuiElementBuilder back(ServerPlayerEntity player, Runnable runnable) {
         return new GuiElementBuilder(Items.STRUCTURE_VOID)
@@ -93,11 +93,16 @@ public static GuiElementBuilder timers(ServerPlayerEntity player, UHCConfig conf
         return element;
     }
 
-    public static GuiElementBuilder modules(ServerPlayerEntity player, UHCConfig config, boolean editable) {
-        var element = new GuiElementBuilder()
+    public static GuiElementBuilder modules(ServerPlayerEntity player) {
+        return new GuiElementBuilder()
                 .setItem(Items.KNOWLEDGE_BOOK)
                 .hideDefaultTooltip()
                 .noDefaults()
+                .setName(Text.translatable("text.uhc.modules"));
+    }
+
+    public static GuiElementBuilder modules(ServerPlayerEntity player, UHCConfig config, boolean editable) {
+        var element = modules(player)
                 .setName(Text.translatable("text.uhc.modules").append(" ").append(
                         Text.literal("(").append(String.valueOf(config.modules().size())).append(Text.literal(")"))
                 ));

src/main/java/fr/hugman/uhc/api/modifier/Modifier.java

@@ -9,7 +9,6 @@ public interface Modifier {
 
     ModifierType<?> getType();
 
-    //TODO: make them fire events instead
     default void enable(UHCPlayerManager playerManager) {
     }
 

src/main/java/fr/hugman/uhc/impl/game/ModuleManager.java

@@ -86,18 +86,13 @@ public boolean enableModule(RegistryEntry<UHCModule> module) {
         if (modules.contains(module)) {
             return false;
         }
-
-        //TODO: send feedback to all players in game (chat + title)
-
         return modules.add(module);
     }
 
     public boolean disableModule(RegistryEntry<UHCModule> module) {
         if (!modules.contains(module)) {
             return false;
         }
-
-        //TODO: send feedback to all players in game (chat + title)
         return modules.remove(module);
     }
 

src/main/java/fr/hugman/uhc/impl/game/phase/UHCActive.java

@@ -33,6 +33,7 @@
 import xyz.nucleoid.plasmid.api.game.common.GlobalWidgets;
 import xyz.nucleoid.plasmid.api.game.common.team.GameTeam;
 import xyz.nucleoid.plasmid.api.game.event.GameActivityEvents;
+import xyz.nucleoid.plasmid.api.game.event.GameEventListeners;
 import xyz.nucleoid.plasmid.api.game.event.GamePlayerEvents;
 import xyz.nucleoid.plasmid.api.game.player.JoinAcceptor;
 import xyz.nucleoid.plasmid.api.game.player.JoinAcceptorResult;
@@ -436,6 +437,9 @@ private EventResult onPlayerDeath(ServerPlayerEntity player, DamageSource source
             }
         }
         this.spawnLogic.spawnPlayerAtCenter(player);
+        if(source.getAttacker() instanceof ServerPlayerEntity attacker && this.playerManager.get(attacker) instanceof UHCParticipant participant) {
+            participant.addKill();
+        }
         return EventResult.DENY;
     }
 }

src/main/java/fr/hugman/uhc/impl/game/ui/element/ModulesUiElement.java

@@ -1,9 +1,8 @@
 package fr.hugman.uhc.impl.game.ui.element;
 
-import eu.pb4.sgui.api.elements.GuiElementBuilder;
 import eu.pb4.sgui.api.elements.GuiElementInterface;
+import fr.hugman.uhc.api.gui.UHCConfigGuiElements;
 import fr.hugman.uhc.impl.game.ModuleManager;
-import net.minecraft.item.Items;
 import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.text.Text;
 import net.minecraft.util.Formatting;
@@ -21,9 +20,7 @@ public ModulesUiElement(ServerPlayerEntity player) {
 
     @Override
     public GuiElementInterface createMainElement() {
-        //TODO: custom icon
-        return new GuiElementBuilder(Items.KNOWLEDGE_BOOK)
-                .setItemName(Text.translatable("text.uhc.modules"))
+        return UHCConfigGuiElements.modules(player)
                 .setCallback((index, type, action, gui) -> {
                     if (!WaitingLobbyUiElement.isClick(type, gui)) {
                         return;

src/main/resources/data/uhc/lang/en_us.json

@@ -126,5 +126,6 @@
   "ui.uhc.click_to_remove": "Click to Remove",
   "ui.uhc.click_to_edit": "Click to Edit",
   "ui.uhc.launch": "Launch",
-  "ui.uhc.select_team_size.title": "Select a team size"
+  "ui.uhc.select_team_size.title": "Select a team size",
+  "text.uhc.kills": "Kills"
 }