feat: unified generators and fixed stuff

Author: ArikSquad

commons/src/main/java/net/swofty/commons/bedwars/map/BedWarsMapsConfig.java

@@ -1,8 +1,8 @@
 package net.swofty.commons.bedwars.map;
 
 import lombok.Getter;
-import net.swofty.commons.bedwars.BedwarsGameType;
 import lombok.Setter;
+import net.swofty.commons.bedwars.BedwarsGameType;
 
 import java.util.List;
 import java.util.Map;
@@ -24,7 +24,7 @@ public static class MapEntry {
         @Setter
         public static class MapConfiguration {
             private List<BedwarsGameType> types;
-            private Map<String, TeamGeneratorConfig> generator;
+            private GeneratorSpeed generatorSpeed;
             private MapBounds bounds;
             private Map<TeamKey, MapTeam> teams;
             private MapLocations locations;
@@ -45,12 +45,6 @@ public static class MapBounds {
                 private MinMax z;
             }
 
-            @Getter
-            @Setter
-            public static class TeamGeneratorConfig {
-                private int delay;
-                private int amount;
-            }
 
             @Getter
             @Setter
@@ -106,18 +100,38 @@ public String chatColor() {
     }
 
     public enum GeneratorSpeed {
-        SLOW(0.7f),
-        MEDIUM(1.4f),
-        FAST(2f),
-        SUPER_FAST(2.2f);
+        // Base speed: 2 iron every 3 seconds (0.666... per second)
+        SLOW(2, 60, 1, 160),           // 2 iron/3s, 1 gold/8s
+        MEDIUM(4, 60, 2, 160),         // 4 iron/3s, 2 gold/8s (2x speed)
+        FAST(6, 60, 3, 160),           // 6 iron/3s, 3 gold/8s (3x speed)
+        SUPER_FAST(7, 60, 3, 160);     // 7 iron/3s, 3 gold/8s (3.3x speed)
+
+        @Getter
+        private final int ironAmount;      // items per drop
+        @Getter
+        private final int ironDelayTicks;  // ticks between drops (60 ticks = 3 seconds)
+        @Getter
+        private final int goldAmount;      // items per drop
+        @Getter
+        private final int goldDelayTicks;  // ticks between drops (160 ticks = 8 seconds)
 
-        public final float ironSpeed; // per second
         // These values are consistent among maps
-        public final float goldDelay = 8f;
         public final int diamondMax = 4;
         public final int emeraldMax = 2;
-        GeneratorSpeed(float speed) {
-            this.ironSpeed = speed;
+
+        GeneratorSpeed(int ironAmount, int ironDelayTicks, int goldAmount, int goldDelayTicks) {
+            this.ironAmount = ironAmount;
+            this.ironDelayTicks = ironDelayTicks;
+            this.goldAmount = goldAmount;
+            this.goldDelayTicks = goldDelayTicks;
+        }
+
+        public int getIronDelaySeconds() {
+            return ironDelayTicks / 20;
+        }
+
+        public int getGoldDelaySeconds() {
+            return goldDelayTicks / 20;
         }
     }
 

configuration/bedwars/maps.json

@@ -9,16 +9,7 @@
           "DOUBLES",
           "ULTIMATE_DOUBLES"
         ],
-        "generator": {
-          "iron": {
-            "delay": 3,
-            "amount": 2
-          },
-          "gold": {
-            "delay": 8,
-            "amount": 1
-          }
-        },
+        "generatorSpeed": "SLOW",
         "bounds": {
           "x": {
             "min": -100,
@@ -400,16 +391,6 @@
           "DOUBLES",
           "ULTIMATE_DOUBLES"
         ],
-        "generator": {
-          "gold": {
-            "delay": 8,
-            "amount": 1
-          },
-          "iron": {
-            "delay": 3,
-            "amount": 2
-          }
-        },
         "bounds": {
           "x": {
             "min": -100.0,
@@ -825,7 +806,8 @@
               }
             ]
           }
-        }
+        },
+        "generatorSpeed": "SLOW"
       }
     },
     {
@@ -837,16 +819,6 @@
           "DOUBLES",
           "ULTIMATE_DOUBLES"
         ],
-        "generator": {
-          "gold": {
-            "delay": 8,
-            "amount": 1
-          },
-          "iron": {
-            "delay": 3,
-            "amount": 2
-          }
-        },
         "bounds": {
           "x": {
             "min": -100.0,
@@ -1264,7 +1236,8 @@
               }
             ]
           }
-        }
+        },
+        "generatorSpeed": "SLOW"
       }
     },
     {
@@ -1276,16 +1249,6 @@
           "DOUBLES",
           "ULTIMATE_DOUBLES"
         ],
-        "generator": {
-          "gold": {
-            "delay": 8,
-            "amount": 1
-          },
-          "iron": {
-            "delay": 3,
-            "amount": 2
-          }
-        },
         "bounds": {
           "x": {
             "min": -100.0,
@@ -1703,7 +1666,8 @@
               }
             ]
           }
-        }
+        },
+        "generatorSpeed": "SLOW"
       }
     }
   ]

type.bedwarsconfigurator/src/main/java/net/swofty/type/bedwarsconfigurator/autosetup/AutoSetupSession.java

@@ -24,10 +24,7 @@ public class AutoSetupSession {
     private final Map<TeamKey, TeamConfig> teams = new EnumMap<>(TeamKey.class);
     private final List<Position> diamondGenerators = new ArrayList<>();
     private final List<Position> emeraldGenerators = new ArrayList<>();
-    private int ironDelay = 3;
-    private int ironAmount = 2;
-    private int goldDelay = 8;
-    private int goldAmount = 1;
+    private GeneratorSpeed generatorSpeed = GeneratorSpeed.SLOW;
     private int diamondAmount = 1;
     private int diamondMax = 4;
     private int emeraldAmount = 1;
@@ -93,10 +90,7 @@ public void clear() {
         teams.clear();
         diamondGenerators.clear();
         emeraldGenerators.clear();
-        ironDelay = 3;
-        ironAmount = 2;
-        goldDelay = 8;
-        goldAmount = 1;
+        generatorSpeed = GeneratorSpeed.SLOW;
         diamondAmount = 1;
         diamondMax = 4;
         emeraldAmount = 1;
@@ -137,17 +131,8 @@ public void loadFromMapEntry(BedWarsMapsConfig.MapEntry entry) {
         }
 
         // Load generator settings
-        if (config.getGenerator() != null) {
-            var ironGen = config.getGenerator().get("iron");
-            if (ironGen != null) {
-                ironDelay = ironGen.getDelay();
-                ironAmount = ironGen.getAmount();
-            }
-            var goldGen = config.getGenerator().get("gold");
-            if (goldGen != null) {
-                goldDelay = goldGen.getDelay();
-                goldAmount = goldGen.getAmount();
-            }
+        if (config.getGeneratorSpeed() != null) {
+            generatorSpeed = config.getGeneratorSpeed();
         }
 
         // Load teams
@@ -217,17 +202,7 @@ public MapEntry toMapEntry() {
         config.setTypes(new ArrayList<>(gameTypes));
 
         // Generator config
-        Map<String, MapEntry.MapConfiguration.TeamGeneratorConfig> generatorConfig = new HashMap<>();
-        MapEntry.MapConfiguration.TeamGeneratorConfig ironConfig = new MapEntry.MapConfiguration.TeamGeneratorConfig();
-        ironConfig.setDelay(ironDelay);
-        ironConfig.setAmount(ironAmount);
-        generatorConfig.put("iron", ironConfig);
-
-        MapEntry.MapConfiguration.TeamGeneratorConfig goldConfig = new MapEntry.MapConfiguration.TeamGeneratorConfig();
-        goldConfig.setDelay(goldDelay);
-        goldConfig.setAmount(goldAmount);
-        generatorConfig.put("gold", goldConfig);
-        config.setGenerator(generatorConfig);
+        config.setGeneratorSpeed(generatorSpeed);
 
         // Bounds
         if (hasBounds()) {

type.bedwarsconfigurator/src/main/java/net/swofty/type/bedwarsconfigurator/commands/AutoSetupCommand.java

@@ -12,6 +12,7 @@
 import net.minestom.server.instance.Instance;
 import net.swofty.commons.bedwars.BedwarsGameType;
 import net.swofty.commons.bedwars.map.BedWarsMapsConfig;
+import net.swofty.commons.bedwars.map.BedWarsMapsConfig.GeneratorSpeed;
 import net.swofty.commons.bedwars.map.BedWarsMapsConfig.PitchYawPosition;
 import net.swofty.commons.bedwars.map.BedWarsMapsConfig.Position;
 import net.swofty.commons.bedwars.map.BedWarsMapsConfig.TeamKey;
@@ -598,17 +599,43 @@ private void registerMapInfoCommand(MinestomCommand command) {
     }
 
     private void registerGeneratorSettingsCommand(MinestomCommand command) {
+        // Speed setting command
+        var speedArg = ArgumentType.String("speed");
+        speedArg.setSuggestionCallback((sender, ctx, suggestion) -> {
+            suggestion.addEntry(new SuggestionEntry("SLOW"));
+            suggestion.addEntry(new SuggestionEntry("MEDIUM"));
+            suggestion.addEntry(new SuggestionEntry("FAST"));
+            suggestion.addEntry(new SuggestionEntry("SUPER_FAST"));
+        });
+
+        command.addSyntax((sender, context) -> {
+            if (!(sender instanceof Player player)) return;
+            if (!permissionCheck(sender)) return;
+
+            String speedStr = context.get(speedArg);
+            AutoSetupSession session = AutoSetupSession.getOrCreate(player.getUuid(), player.getInstance());
+
+            try {
+                GeneratorSpeed speed = GeneratorSpeed.valueOf(speedStr.toUpperCase());
+                session.setGeneratorSpeed(speed);
+                player.sendMessage(Component.text("§aSet generator speed to " + speed.name() +
+                    " (" + speed.getIronAmount() + " iron/" + speed.getIronDelaySeconds() + "s, " +
+                    speed.getGoldAmount() + " gold/" + speed.getGoldDelaySeconds() + "s)"));
+            } catch (IllegalArgumentException e) {
+                player.sendMessage(Component.text("§cInvalid speed: " + speedStr));
+            }
+
+        }, ArgumentType.Literal("generator"), ArgumentType.Literal("speed"), speedArg);
+
+        // Diamond/Emerald settings (unchanged)
         var genTypeArg = ArgumentType.String("gentype");
         genTypeArg.setSuggestionCallback((sender, ctx, suggestion) -> {
-            suggestion.addEntry(new SuggestionEntry("iron"));
-            suggestion.addEntry(new SuggestionEntry("gold"));
             suggestion.addEntry(new SuggestionEntry("diamond"));
             suggestion.addEntry(new SuggestionEntry("emerald"));
         });
 
         var settingArg = ArgumentType.String("setting");
         settingArg.setSuggestionCallback((sender, ctx, suggestion) -> {
-            suggestion.addEntry(new SuggestionEntry("delay"));
             suggestion.addEntry(new SuggestionEntry("amount"));
             suggestion.addEntry(new SuggestionEntry("max"));
         });
@@ -626,14 +653,6 @@ private void registerGeneratorSettingsCommand(MinestomCommand command) {
             AutoSetupSession session = AutoSetupSession.getOrCreate(player.getUuid(), player.getInstance());
 
             switch (genType.toLowerCase()) {
-                case "iron" -> {
-                    if (setting.equals("delay")) session.setIronDelay(value);
-                    else if (setting.equals("amount")) session.setIronAmount(value);
-                }
-                case "gold" -> {
-                    if (setting.equals("delay")) session.setGoldDelay(value);
-                    else if (setting.equals("amount")) session.setGoldAmount(value);
-                }
                 case "diamond" -> {
                     if (setting.equals("amount")) session.setDiamondAmount(value);
                     else if (setting.equals("max")) session.setDiamondMax(value);

type.bedwarsgame/src/main/java/net/swofty/type/bedwarsgame/events/ActionGameDeath.java

@@ -20,15 +20,15 @@
 import net.minestom.server.tag.Tag;
 import net.minestom.server.timer.Task;
 import net.minestom.server.timer.TaskSchedule;
+import net.swofty.commons.bedwars.map.BedWarsMapsConfig;
+import net.swofty.commons.bedwars.map.BedWarsMapsConfig.MapTeam;
+import net.swofty.commons.bedwars.map.BedWarsMapsConfig.TeamKey;
 import net.swofty.type.bedwarsgame.TypeBedWarsGameLoader;
 import net.swofty.type.bedwarsgame.game.Game;
 import net.swofty.type.bedwarsgame.game.GameStatus;
 import net.swofty.type.bedwarsgame.shop.impl.AxeShopItem;
 import net.swofty.type.bedwarsgame.shop.impl.PickaxeShopItem;
 import net.swofty.type.bedwarsgame.user.BedWarsPlayer;
-import net.swofty.commons.bedwars.map.BedWarsMapsConfig;
-import net.swofty.commons.bedwars.map.BedWarsMapsConfig.MapTeam;
-import net.swofty.commons.bedwars.map.BedWarsMapsConfig.TeamKey;
 import net.swofty.type.generic.event.EventNodes;
 import net.swofty.type.generic.event.HypixelEvent;
 import net.swofty.type.generic.event.HypixelEventClass;
@@ -172,9 +172,19 @@ public void run(PlayerDeathEvent event) {
 		}
 
 		String teamName = player.getTag(Tag.String("team"));
+		TeamKey teamKey = game.getTeamManager().getTeamKeyByName(teamName);
+		if (teamName != null && teamKey == null) {
+			Logger.warn("Player {} has team tag '{}' that does not match any TeamKey", player.getUsername(), teamName);
+		}
 		TextColor victimTeamTextColor = NamedTextColor.GRAY;
+		if (teamKey != null) {
+			TextColor parsedColor = NamedTextColor.NAMES.value(teamKey.chatColor().toLowerCase());
+			if (parsedColor != null) {
+				victimTeamTextColor = parsedColor;
+			}
+		}
 
-		boolean bedExists = game.getTeamManager().getTeamBedStatus().getOrDefault(teamName, false);
+		boolean bedExists = teamKey != null && game.getTeamManager().isBedAlive(teamKey);
 
 		Component deathMessage = calculateDeathMessage(player, victimTeamTextColor);
 
@@ -218,12 +228,9 @@ public void run(PlayerDeathEvent event) {
 						player.teleport(new Pos(waitingPos.x(), waitingPos.y(), waitingPos.z()));
 						player.setGameMode(GameMode.ADVENTURE);
 					} else {
-						TeamKey playerTeamKey = game.getTeamManager().getTeamKeyByName(teamName);
-						MapTeam playerTeam = playerTeamKey != null
-								? game.getMapEntry().getConfiguration().getTeams().get(playerTeamKey)
-								: null;
+                        MapTeam playerTeam = game.getMapEntry().getConfiguration().getTeams().get(teamKey);
 
-						if (playerTeam != null && playerTeamKey != null) {
+						if (playerTeam != null) {
 							BedWarsMapsConfig.PitchYawPosition spawnPos = playerTeam.getSpawn();
 							player.teleport(new Pos(spawnPos.x(), spawnPos.y(), spawnPos.z(), spawnPos.pitch(), spawnPos.yaw()));
 							player.setGameMode(GameMode.SURVIVAL);
@@ -245,7 +252,7 @@ public void run(PlayerDeathEvent event) {
 							}
 
 							// equip the player with team armor
-							game.getTeamManager().equipTeamArmor(player, playerTeamKey);
+							game.getTeamManager().equipTeamArmor(player, teamKey);
 
 							Integer protectionLevel = player.getTag(Tag.Integer("upgrade_reinforced_armor"));
 							if (protectionLevel != null) {