2021-09-05 23:29:02 +02:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
From: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
|
|
|
|
Date: Mon, 16 Aug 2021 01:31:54 -0500
|
|
|
|
Subject: [PATCH] Add '/paper mobcaps' and '/paper playermobcaps'
|
|
|
|
|
|
|
|
Add commands to get the mobcaps for a world, as well as the mobcaps for
|
|
|
|
each player when per-player mob spawning is enabled.
|
|
|
|
|
|
|
|
Also has a hover text on each mob category listing what entity types are
|
|
|
|
in said category
|
|
|
|
|
2022-07-09 01:01:42 +02:00
|
|
|
diff --git a/src/main/java/io/papermc/paper/command/PaperCommand.java b/src/main/java/io/papermc/paper/command/PaperCommand.java
|
2022-09-26 10:02:51 +02:00
|
|
|
index a7b78508ef78229835805300e62a306a3f1ddf6d..724592234e2a178a518f6ab7d09c3180780371a7 100644
|
2022-07-09 01:01:42 +02:00
|
|
|
--- a/src/main/java/io/papermc/paper/command/PaperCommand.java
|
|
|
|
+++ b/src/main/java/io/papermc/paper/command/PaperCommand.java
|
|
|
|
@@ -5,6 +5,7 @@ import io.papermc.paper.command.subcommands.DumpItemCommand;
|
|
|
|
import io.papermc.paper.command.subcommands.EntityCommand;
|
|
|
|
import io.papermc.paper.command.subcommands.FixLightCommand;
|
|
|
|
import io.papermc.paper.command.subcommands.HeapDumpCommand;
|
|
|
|
+import io.papermc.paper.command.subcommands.MobcapsCommand;
|
|
|
|
import io.papermc.paper.command.subcommands.ReloadCommand;
|
|
|
|
import io.papermc.paper.command.subcommands.SyncLoadInfoCommand;
|
|
|
|
import io.papermc.paper.command.subcommands.VersionCommand;
|
|
|
|
@@ -48,6 +49,7 @@ public final class PaperCommand extends Command {
|
2022-09-26 10:02:51 +02:00
|
|
|
commands.put(Set.of("debug", "chunkinfo", "holderinfo"), new ChunkDebugCommand());
|
2022-07-09 01:01:42 +02:00
|
|
|
commands.put(Set.of("syncloadinfo"), new SyncLoadInfoCommand());
|
|
|
|
commands.put(Set.of("dumpitem"), new DumpItemCommand());
|
|
|
|
+ commands.put(Set.of("mobcaps", "playermobcaps"), new MobcapsCommand());
|
|
|
|
|
|
|
|
return commands.entrySet().stream()
|
|
|
|
.flatMap(entry -> entry.getKey().stream().map(s -> Map.entry(s, entry.getValue())))
|
|
|
|
diff --git a/src/main/java/io/papermc/paper/command/subcommands/MobcapsCommand.java b/src/main/java/io/papermc/paper/command/subcommands/MobcapsCommand.java
|
|
|
|
new file mode 100644
|
2022-12-08 00:49:41 +01:00
|
|
|
index 0000000000000000000000000000000000000000..99c41a39cdad0271d089c6e03bebfdafba1aaa57
|
2022-07-09 01:01:42 +02:00
|
|
|
--- /dev/null
|
|
|
|
+++ b/src/main/java/io/papermc/paper/command/subcommands/MobcapsCommand.java
|
|
|
|
@@ -0,0 +1,229 @@
|
|
|
|
+package io.papermc.paper.command.subcommands;
|
|
|
|
+
|
2021-09-05 23:29:02 +02:00
|
|
|
+import com.google.common.collect.ImmutableMap;
|
2022-07-09 01:01:42 +02:00
|
|
|
+import io.papermc.paper.command.CommandUtil;
|
|
|
|
+import io.papermc.paper.command.PaperSubcommand;
|
|
|
|
+import java.util.ArrayList;
|
|
|
|
+import java.util.Collections;
|
|
|
|
+import java.util.List;
|
|
|
|
+import java.util.Map;
|
|
|
|
+import java.util.function.ToIntFunction;
|
2021-09-05 23:29:02 +02:00
|
|
|
+import net.kyori.adventure.text.Component;
|
|
|
|
+import net.kyori.adventure.text.ComponentLike;
|
2021-11-28 07:56:41 +01:00
|
|
|
+import net.kyori.adventure.text.JoinConfiguration;
|
2021-09-05 23:29:02 +02:00
|
|
|
+import net.kyori.adventure.text.TextComponent;
|
|
|
|
+import net.kyori.adventure.text.format.NamedTextColor;
|
|
|
|
+import net.kyori.adventure.text.format.TextColor;
|
2022-12-08 00:49:41 +01:00
|
|
|
+import net.minecraft.core.registries.BuiltInRegistries;
|
2022-07-09 01:01:42 +02:00
|
|
|
+import net.minecraft.server.level.ServerLevel;
|
|
|
|
+import net.minecraft.server.level.ServerPlayer;
|
2021-09-05 23:29:02 +02:00
|
|
|
+import net.minecraft.world.entity.MobCategory;
|
|
|
|
+import net.minecraft.world.level.NaturalSpawner;
|
2022-07-09 01:01:42 +02:00
|
|
|
+import org.bukkit.Bukkit;
|
|
|
|
+import org.bukkit.World;
|
|
|
|
+import org.bukkit.command.CommandSender;
|
|
|
|
+import org.bukkit.craftbukkit.CraftWorld;
|
|
|
|
+import org.bukkit.craftbukkit.entity.CraftPlayer;
|
|
|
|
+import org.bukkit.entity.Player;
|
|
|
|
+import org.checkerframework.checker.nullness.qual.NonNull;
|
|
|
|
+import org.checkerframework.checker.nullness.qual.Nullable;
|
|
|
|
+import org.checkerframework.framework.qual.DefaultQualifier;
|
|
|
|
+
|
|
|
|
+@DefaultQualifier(NonNull.class)
|
|
|
|
+public final class MobcapsCommand implements PaperSubcommand {
|
|
|
|
+ static final Map<MobCategory, TextColor> MOB_CATEGORY_COLORS = ImmutableMap.<MobCategory, TextColor>builder()
|
2021-09-05 23:29:02 +02:00
|
|
|
+ .put(MobCategory.MONSTER, NamedTextColor.RED)
|
|
|
|
+ .put(MobCategory.CREATURE, NamedTextColor.GREEN)
|
|
|
|
+ .put(MobCategory.AMBIENT, NamedTextColor.GRAY)
|
2021-11-25 07:31:14 +01:00
|
|
|
+ .put(MobCategory.AXOLOTLS, TextColor.color(0x7324FF))
|
2021-09-05 23:29:02 +02:00
|
|
|
+ .put(MobCategory.UNDERGROUND_WATER_CREATURE, TextColor.color(0x3541E6))
|
|
|
|
+ .put(MobCategory.WATER_CREATURE, TextColor.color(0x006EFF))
|
|
|
|
+ .put(MobCategory.WATER_AMBIENT, TextColor.color(0x00B3FF))
|
|
|
|
+ .put(MobCategory.MISC, TextColor.color(0x636363))
|
|
|
|
+ .build();
|
|
|
|
+
|
2022-07-09 01:01:42 +02:00
|
|
|
+ @Override
|
|
|
|
+ public boolean execute(final CommandSender sender, final String subCommand, final String[] args) {
|
|
|
|
+ switch (subCommand) {
|
|
|
|
+ case "mobcaps" -> this.printMobcaps(sender, args);
|
|
|
|
+ case "playermobcaps" -> this.printPlayerMobcaps(sender, args);
|
|
|
|
+ }
|
|
|
|
+ return true;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public List<String> tabComplete(final CommandSender sender, final String subCommand, final String[] args) {
|
|
|
|
+ return switch (subCommand) {
|
|
|
|
+ case "mobcaps" -> CommandUtil.getListMatchingLast(sender, args, this.suggestMobcaps(args));
|
|
|
|
+ case "playermobcaps" -> CommandUtil.getListMatchingLast(sender, args, this.suggestPlayerMobcaps(sender, args));
|
|
|
|
+ default -> throw new IllegalArgumentException();
|
|
|
|
+ };
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ private List<String> suggestMobcaps(final String[] args) {
|
|
|
|
+ if (args.length == 1) {
|
2021-09-05 23:29:02 +02:00
|
|
|
+ final List<String> worlds = new ArrayList<>(Bukkit.getWorlds().stream().map(World::getName).toList());
|
|
|
|
+ worlds.add("*");
|
|
|
|
+ return worlds;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ return Collections.emptyList();
|
|
|
|
+ }
|
|
|
|
+
|
2022-07-09 01:01:42 +02:00
|
|
|
+ private List<String> suggestPlayerMobcaps(final CommandSender sender, final String[] args) {
|
|
|
|
+ if (args.length == 1) {
|
2021-09-05 23:29:02 +02:00
|
|
|
+ final List<String> list = new ArrayList<>();
|
|
|
|
+ for (final Player player : Bukkit.getOnlinePlayers()) {
|
|
|
|
+ if (!(sender instanceof Player senderPlayer) || senderPlayer.canSee(player)) {
|
|
|
|
+ list.add(player.getName());
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ return list;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ return Collections.emptyList();
|
|
|
|
+ }
|
|
|
|
+
|
2022-07-09 01:01:42 +02:00
|
|
|
+ private void printMobcaps(final CommandSender sender, final String[] args) {
|
2021-09-05 23:29:02 +02:00
|
|
|
+ final List<World> worlds;
|
2022-07-09 01:01:42 +02:00
|
|
|
+ if (args.length == 0) {
|
2021-09-05 23:29:02 +02:00
|
|
|
+ if (sender instanceof Player player) {
|
|
|
|
+ worlds = List.of(player.getWorld());
|
|
|
|
+ } else {
|
|
|
|
+ sender.sendMessage(Component.text("Must specify a world! ex: '/paper mobcaps world'", NamedTextColor.RED));
|
|
|
|
+ return;
|
|
|
|
+ }
|
2022-07-09 01:01:42 +02:00
|
|
|
+ } else if (args.length == 1) {
|
|
|
|
+ final String input = args[0];
|
2021-09-05 23:29:02 +02:00
|
|
|
+ if (input.equals("*")) {
|
|
|
|
+ worlds = Bukkit.getWorlds();
|
|
|
|
+ } else {
|
2022-07-09 01:01:42 +02:00
|
|
|
+ final @Nullable World world = Bukkit.getWorld(input);
|
2021-09-05 23:29:02 +02:00
|
|
|
+ if (world == null) {
|
|
|
|
+ sender.sendMessage(Component.text("'" + input + "' is not a valid world!", NamedTextColor.RED));
|
|
|
|
+ return;
|
|
|
|
+ } else {
|
|
|
|
+ worlds = List.of(world);
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ } else {
|
|
|
|
+ sender.sendMessage(Component.text("Too many arguments!", NamedTextColor.RED));
|
|
|
|
+ return;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ for (final World world : worlds) {
|
|
|
|
+ final ServerLevel level = ((CraftWorld) world).getHandle();
|
2022-07-09 01:01:42 +02:00
|
|
|
+ final NaturalSpawner.@Nullable SpawnState state = level.getChunkSource().getLastSpawnState();
|
2021-09-05 23:29:02 +02:00
|
|
|
+
|
|
|
|
+ final int chunks;
|
|
|
|
+ if (state == null) {
|
|
|
|
+ chunks = 0;
|
|
|
|
+ } else {
|
|
|
|
+ chunks = state.getSpawnableChunkCount();
|
|
|
|
+ }
|
2021-11-28 07:56:41 +01:00
|
|
|
+ sender.sendMessage(Component.join(JoinConfiguration.noSeparators(),
|
2021-09-05 23:29:02 +02:00
|
|
|
+ Component.text("Mobcaps for world: "),
|
|
|
|
+ Component.text(world.getName(), NamedTextColor.AQUA),
|
|
|
|
+ Component.text(" (" + chunks + " spawnable chunks)")
|
|
|
|
+ ));
|
|
|
|
+
|
2022-07-09 01:01:42 +02:00
|
|
|
+ sender.sendMessage(createMobcapsComponent(
|
2021-09-05 23:29:02 +02:00
|
|
|
+ category -> {
|
|
|
|
+ if (state == null) {
|
|
|
|
+ return 0;
|
|
|
|
+ } else {
|
|
|
|
+ return state.getMobCategoryCounts().getOrDefault(category, 0);
|
|
|
|
+ }
|
|
|
|
+ },
|
|
|
|
+ category -> NaturalSpawner.globalLimitForCategory(level, category, chunks)
|
|
|
|
+ ));
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+
|
2022-07-09 01:01:42 +02:00
|
|
|
+ private void printPlayerMobcaps(final CommandSender sender, final String[] args) {
|
|
|
|
+ final @Nullable Player player;
|
|
|
|
+ if (args.length == 0) {
|
2021-09-05 23:29:02 +02:00
|
|
|
+ if (sender instanceof Player pl) {
|
|
|
|
+ player = pl;
|
|
|
|
+ } else {
|
|
|
|
+ sender.sendMessage(Component.text("Must specify a player! ex: '/paper playermobcount playerName'", NamedTextColor.RED));
|
|
|
|
+ return;
|
|
|
|
+ }
|
2022-07-09 01:01:42 +02:00
|
|
|
+ } else if (args.length == 1) {
|
|
|
|
+ final String input = args[0];
|
2021-09-05 23:29:02 +02:00
|
|
|
+ player = Bukkit.getPlayerExact(input);
|
|
|
|
+ if (player == null) {
|
|
|
|
+ sender.sendMessage(Component.text("Could not find player named '" + input + "'", NamedTextColor.RED));
|
|
|
|
+ return;
|
|
|
|
+ }
|
|
|
|
+ } else {
|
|
|
|
+ sender.sendMessage(Component.text("Too many arguments!", NamedTextColor.RED));
|
|
|
|
+ return;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ final ServerPlayer serverPlayer = ((CraftPlayer) player).getHandle();
|
|
|
|
+ final ServerLevel level = serverPlayer.getLevel();
|
|
|
|
+
|
2022-06-09 10:51:45 +02:00
|
|
|
+ if (!level.paperConfig().entities.spawning.perPlayerMobSpawns) {
|
2021-09-05 23:29:02 +02:00
|
|
|
+ sender.sendMessage(Component.text("Use '/paper mobcaps' for worlds where per-player mob spawning is disabled.", NamedTextColor.RED));
|
|
|
|
+ return;
|
|
|
|
+ }
|
|
|
|
+
|
2021-11-28 07:56:41 +01:00
|
|
|
+ sender.sendMessage(Component.join(JoinConfiguration.noSeparators(), Component.text("Mobcaps for player: "), Component.text(player.getName(), NamedTextColor.GREEN)));
|
2022-07-09 01:01:42 +02:00
|
|
|
+ sender.sendMessage(createMobcapsComponent(
|
2021-09-05 23:29:02 +02:00
|
|
|
+ category -> level.chunkSource.chunkMap.getMobCountNear(serverPlayer, category),
|
2022-02-12 20:44:54 +01:00
|
|
|
+ category -> level.getWorld().getSpawnLimitUnsafe(org.bukkit.craftbukkit.util.CraftSpawnCategory.toBukkit(category))
|
2021-09-05 23:29:02 +02:00
|
|
|
+ ));
|
|
|
|
+ }
|
|
|
|
+
|
2022-07-09 01:01:42 +02:00
|
|
|
+ private static Component createMobcapsComponent(final ToIntFunction<MobCategory> countGetter, final ToIntFunction<MobCategory> limitGetter) {
|
2021-09-05 23:29:02 +02:00
|
|
|
+ return MOB_CATEGORY_COLORS.entrySet().stream()
|
|
|
|
+ .map(entry -> {
|
|
|
|
+ final MobCategory category = entry.getKey();
|
|
|
|
+ final TextColor color = entry.getValue();
|
|
|
|
+
|
2021-11-28 07:56:41 +01:00
|
|
|
+ final Component categoryHover = Component.join(JoinConfiguration.noSeparators(),
|
2021-09-05 23:29:02 +02:00
|
|
|
+ Component.text("Entity types in category ", TextColor.color(0xE0E0E0)),
|
|
|
|
+ Component.text(category.getName(), color),
|
|
|
|
+ Component.text(':', NamedTextColor.GRAY),
|
|
|
|
+ Component.newline(),
|
|
|
|
+ Component.newline(),
|
2022-12-08 00:49:41 +01:00
|
|
|
+ BuiltInRegistries.ENTITY_TYPE.entrySet().stream()
|
2021-09-05 23:29:02 +02:00
|
|
|
+ .filter(it -> it.getValue().getCategory() == category)
|
|
|
|
+ .map(it -> Component.translatable(it.getValue().getDescriptionId()))
|
|
|
|
+ .collect(Component.toComponent(Component.text(", ", NamedTextColor.GRAY)))
|
|
|
|
+ );
|
|
|
|
+
|
|
|
|
+ final Component categoryComponent = Component.text()
|
|
|
|
+ .content(" " + category.getName())
|
|
|
|
+ .color(color)
|
|
|
|
+ .hoverEvent(categoryHover)
|
|
|
|
+ .build();
|
|
|
|
+
|
|
|
|
+ final TextComponent.Builder builder = Component.text()
|
|
|
|
+ .append(
|
|
|
|
+ categoryComponent,
|
|
|
|
+ Component.text(": ", NamedTextColor.GRAY)
|
|
|
|
+ );
|
|
|
|
+ final int limit = limitGetter.applyAsInt(category);
|
|
|
|
+ if (limit != -1) {
|
|
|
|
+ builder.append(
|
|
|
|
+ Component.text(countGetter.applyAsInt(category)),
|
|
|
|
+ Component.text("/", NamedTextColor.GRAY),
|
|
|
|
+ Component.text(limit)
|
|
|
|
+ );
|
|
|
|
+ } else {
|
|
|
|
+ builder.append(Component.text()
|
|
|
|
+ .append(
|
|
|
|
+ Component.text('n'),
|
|
|
|
+ Component.text("/", NamedTextColor.GRAY),
|
|
|
|
+ Component.text('a')
|
|
|
|
+ )
|
|
|
|
+ .hoverEvent(Component.text("This category does not naturally spawn.")));
|
|
|
|
+ }
|
|
|
|
+ return builder;
|
|
|
|
+ })
|
|
|
|
+ .map(ComponentLike::asComponent)
|
|
|
|
+ .collect(Component.toComponent(Component.newline()));
|
|
|
|
+ }
|
2022-07-09 01:01:42 +02:00
|
|
|
+}
|
2021-09-05 23:29:02 +02:00
|
|
|
diff --git a/src/main/java/net/minecraft/world/level/NaturalSpawner.java b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
|
2022-12-07 22:05:01 +01:00
|
|
|
index bf3fb416d36a19958033cdbf5cc313556fa0201b..0a49769bfa83d0b9c435e3ab4bba85979d660ff8 100644
|
2021-09-05 23:29:02 +02:00
|
|
|
--- a/src/main/java/net/minecraft/world/level/NaturalSpawner.java
|
|
|
|
+++ b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
|
2022-12-07 22:05:01 +01:00
|
|
|
@@ -192,6 +192,16 @@ public final class NaturalSpawner {
|
2021-09-05 23:29:02 +02:00
|
|
|
world.getProfiler().pop();
|
|
|
|
}
|
|
|
|
|
|
|
|
+ // Paper start
|
|
|
|
+ public static int globalLimitForCategory(final ServerLevel level, final MobCategory category, final int spawnableChunkCount) {
|
2022-02-12 20:44:54 +01:00
|
|
|
+ final int categoryLimit = level.getWorld().getSpawnLimitUnsafe(CraftSpawnCategory.toBukkit(category));
|
2021-09-16 23:40:11 +02:00
|
|
|
+ if (categoryLimit < 1) {
|
|
|
|
+ return categoryLimit;
|
|
|
|
+ }
|
|
|
|
+ return categoryLimit * spawnableChunkCount / NaturalSpawner.MAGIC_NUMBER;
|
2021-09-05 23:29:02 +02:00
|
|
|
+ }
|
|
|
|
+ // Paper end
|
|
|
|
+
|
|
|
|
public static void spawnCategoryForChunk(MobCategory group, ServerLevel world, LevelChunk chunk, NaturalSpawner.SpawnPredicate checker, NaturalSpawner.AfterSpawnCallback runner) {
|
2022-06-08 12:20:57 +02:00
|
|
|
// Paper start - add parameters and int ret type
|
2022-02-02 21:57:11 +01:00
|
|
|
spawnCategoryForChunk(group, world, chunk, checker, runner, Integer.MAX_VALUE, null);
|
2022-02-12 20:44:54 +01:00
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
2022-12-19 11:46:55 +01:00
|
|
|
index caa9885dd942fc5b82ba6b820d89f1b1a7ffda20..9ab3f3a490e55211670e2847f03bd4f8229162da 100644
|
2022-02-12 20:44:54 +01:00
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
2022-12-16 02:16:34 +01:00
|
|
|
@@ -2183,6 +2183,11 @@ public final class CraftServer implements Server {
|
2022-02-12 20:44:54 +01:00
|
|
|
|
|
|
|
@Override
|
|
|
|
public int getSpawnLimit(SpawnCategory spawnCategory) {
|
|
|
|
+ // Paper start
|
|
|
|
+ return this.getSpawnLimitUnsafe(spawnCategory);
|
|
|
|
+ }
|
|
|
|
+ public int getSpawnLimitUnsafe(final SpawnCategory spawnCategory) {
|
|
|
|
+ // Paper end
|
|
|
|
return this.spawnCategoryLimit.getOrDefault(spawnCategory, -1);
|
|
|
|
}
|
|
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
2023-01-27 21:52:04 +01:00
|
|
|
index 9942c1de6d8e087520c9e795a9f775f59bfa8942..c093401834d7111857a0d49e60faa36ee22aae40 100644
|
2022-02-12 20:44:54 +01:00
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
2022-12-07 22:05:01 +01:00
|
|
|
@@ -1700,9 +1700,14 @@ public class CraftWorld extends CraftRegionAccessor implements World {
|
2022-02-12 20:44:54 +01:00
|
|
|
Validate.notNull(spawnCategory, "SpawnCategory cannot be null");
|
|
|
|
Validate.isTrue(CraftSpawnCategory.isValidForLimits(spawnCategory), "SpawnCategory." + spawnCategory + " are not supported.");
|
|
|
|
|
|
|
|
+ // Paper start
|
|
|
|
+ return this.getSpawnLimitUnsafe(spawnCategory);
|
|
|
|
+ }
|
|
|
|
+ public final int getSpawnLimitUnsafe(final SpawnCategory spawnCategory) {
|
|
|
|
int limit = this.spawnCategoryLimit.getOrDefault(spawnCategory, -1);
|
|
|
|
if (limit < 0) {
|
|
|
|
- limit = this.server.getSpawnLimit(spawnCategory);
|
|
|
|
+ limit = this.server.getSpawnLimitUnsafe(spawnCategory);
|
|
|
|
+ // Paper end
|
|
|
|
}
|
|
|
|
return limit;
|
|
|
|
}
|
2022-07-09 01:01:42 +02:00
|
|
|
diff --git a/src/test/java/io/papermc/paper/command/subcommands/MobcapsCommandTest.java b/src/test/java/io/papermc/paper/command/subcommands/MobcapsCommandTest.java
|
2021-09-05 23:29:02 +02:00
|
|
|
new file mode 100644
|
2022-07-09 01:01:42 +02:00
|
|
|
index 0000000000000000000000000000000000000000..f1dd3bca7fa0df8b6ed177bb435877229af1c0c5
|
2021-09-05 23:29:02 +02:00
|
|
|
--- /dev/null
|
2022-07-09 01:01:42 +02:00
|
|
|
+++ b/src/test/java/io/papermc/paper/command/subcommands/MobcapsCommandTest.java
|
|
|
|
@@ -0,0 +1,20 @@
|
|
|
|
+package io.papermc.paper.command.subcommands;
|
2021-09-05 23:29:02 +02:00
|
|
|
+
|
|
|
|
+import java.util.HashSet;
|
|
|
|
+import java.util.Set;
|
|
|
|
+import net.minecraft.world.entity.MobCategory;
|
|
|
|
+import org.junit.Assert;
|
|
|
|
+import org.junit.Test;
|
|
|
|
+
|
2022-07-09 01:01:42 +02:00
|
|
|
+public class MobcapsCommandTest {
|
2021-09-05 23:29:02 +02:00
|
|
|
+ @Test
|
|
|
|
+ public void testMobCategoryColors() {
|
|
|
|
+ final Set<String> missing = new HashSet<>();
|
|
|
|
+ for (final MobCategory value : MobCategory.values()) {
|
2022-07-09 01:01:42 +02:00
|
|
|
+ if (!MobcapsCommand.MOB_CATEGORY_COLORS.containsKey(value)) {
|
2021-09-05 23:29:02 +02:00
|
|
|
+ missing.add(value.getName());
|
|
|
|
+ }
|
|
|
|
+ }
|
2022-07-09 01:01:42 +02:00
|
|
|
+ Assert.assertTrue("MobcapsCommand.MOB_CATEGORY_COLORS map missing TextColors for [" + String.join(", ", missing + "]"), missing.isEmpty());
|
2021-09-05 23:29:02 +02:00
|
|
|
+ }
|
|
|
|
+}
|