fixup tests and add missing API detected by those tests

PaperMC · Dec 8, 2023 · 7606e6d · 7606e6d
1 parent 8d8eb3b
commit 7606e6d
Show file tree

Hide file tree

Showing 9 changed files with 101 additions and 45 deletions.
diff --git a/patches/api/0154-Add-Material-Tags.patch b/patches/api/0154-Add-Material-Tags.patch
@@ -115,10 +115,10 @@ index 0000000000000000000000000000000000000000..a02a02aa0c87e0f0ed9e509e4dcab015
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/MaterialTags.java b/src/main/java/com/destroystokyo/paper/MaterialTags.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..f59151cec84fc0e300a8d759c6d74a804cbd047f
+index 0000000000000000000000000000000000000000..4e7a1e26d3dddd2ccba4fa5d02e6752313507612
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/MaterialTags.java
-@@ -0,0 +1,708 @@
+@@ -0,0 +1,717 @@
 +/*
 + * Copyright (c) 2018 Daniel Ennis (Aikar) MIT License
 + *
@@ -224,7 +224,7 @@ index 0000000000000000000000000000000000000000..f59151cec84fc0e300a8d759c6d74a80
 +     */
 +    public static final MaterialSetTag DOORS = new MaterialSetTag(keyFor("doors"))
 +        .endsWith("_DOOR")
-+        .ensureSize("DOORS", 12).lock();
++        .ensureSize("DOORS", 20).lock();
 +
 +    /**
 +     * Covers all dyes.
@@ -438,7 +438,7 @@ index 0000000000000000000000000000000000000000..f59151cec84fc0e300a8d759c6d74a80
 +     */
 +    public static final MaterialSetTag SPAWN_EGGS = new MaterialSetTag(keyFor("spawn_eggs"))
 +        .endsWith("_SPAWN_EGG")
-+        .ensureSize("SPAWN_EGGS", 77).lock();
++        .ensureSize("SPAWN_EGGS", 78).lock();
 +
 +    /**
 +     * Covers all colors of stained glass.
@@ -459,14 +459,15 @@ index 0000000000000000000000000000000000000000..f59151cec84fc0e300a8d759c6d74a80
 +     */
 +    public static final MaterialSetTag TRAPDOORS = new MaterialSetTag(keyFor("trapdoors"))
 +        .endsWith("_TRAPDOOR")
-+        .ensureSize("TRAPDOORS", 12).lock();
++        .ensureSize("TRAPDOORS", 20).lock();
 +
 +    /**
 +     * Covers all wood variants of doors.
 +     */
 +    public static final MaterialSetTag WOODEN_DOORS = new MaterialSetTag(keyFor("wooden_doors"))
 +        .endsWith("_DOOR")
 +        .not(Material.IRON_DOOR)
++        .notContains("COPPER")
 +        .ensureSize("WOODEN_DOORS", 11).lock();
 +
 +    /**
@@ -483,6 +484,7 @@ index 0000000000000000000000000000000000000000..f59151cec84fc0e300a8d759c6d74a80
 +    public static final MaterialSetTag WOODEN_TRAPDOORS = new MaterialSetTag(keyFor("wooden_trapdoors"))
 +        .endsWith("_TRAPDOOR")
 +        .not(Material.IRON_TRAPDOOR)
++        .notContains("COPPER")
 +        .ensureSize("WOODEN_TRAPDOORS", 11).lock();
 +
 +    /**
@@ -713,56 +715,63 @@ index 0000000000000000000000000000000000000000..f59151cec84fc0e300a8d759c6d74a80
 +     * Covers all oxidized copper blocks.
 +     */
 +    public static final MaterialSetTag OXIDIZED_COPPER_BLOCKS = new MaterialSetTag(keyFor("oxidized_copper_blocks"))
-+        .startsWith("OXIDIZED_").startsWith("WAXED_OXIDIZED_").ensureSize("OXIDIZED_COPPER_BLOCKS", 8).lock();
++        .startsWith("OXIDIZED_").startsWith("WAXED_OXIDIZED_").ensureSize("OXIDIZED_COPPER_BLOCKS", 18).lock();
 +
 +    /**
 +     * Covers all weathered copper blocks.
 +     */
 +    public static final MaterialSetTag WEATHERED_COPPER_BLOCKS = new MaterialSetTag(keyFor("weathered_copper_blocks"))
-+        .startsWith("WEATHERED_").startsWith("WAXED_WEATHERED_").ensureSize("WEATHERED_COPPER_BLOCKS", 8).lock();
++        .startsWith("WEATHERED_").startsWith("WAXED_WEATHERED_").ensureSize("WEATHERED_COPPER_BLOCKS", 18).lock();
 +
 +    /**
 +     * Covers all exposed copper blocks.
 +     */
 +    public static final MaterialSetTag EXPOSED_COPPER_BLOCKS = new MaterialSetTag(keyFor("exposed_copper_blocks"))
-+        .startsWith("EXPOSED_").startsWith("WAXED_EXPOSED_").ensureSize("EXPOSED_COPPER_BLOCKS", 8).lock();
++        .startsWith("EXPOSED_").startsWith("WAXED_EXPOSED_").ensureSize("EXPOSED_COPPER_BLOCKS", 18).lock();
 +
 +    /**
 +     * Covers all un-weathered copper blocks.
 +     */
 +    public static final MaterialSetTag UNAFFECTED_COPPER_BLOCKS = new MaterialSetTag(keyFor("unaffected_copper_blocks"))
-+        .startsWith("CUT_COPPER").startsWith("WAXED_CUT_COPPER").add(Material.COPPER_BLOCK).add(Material.WAXED_COPPER_BLOCK).ensureSize("UNAFFECTED_COPPER_BLOCKS", 8).lock();
++        .startsWith("CUT_COPPER").startsWith("WAXED_CUT_COPPER")
++        .startsWith("WAXED_COPPER_").startsWith("COPPER_")
++        .add(Material.CHISELED_COPPER, Material.WAXED_CHISELED_COPPER)
++        .not(Material.COPPER_INGOT, Material.COPPER_ORE)
++        .ensureSize("UNAFFECTED_COPPER_BLOCKS", 18).lock();
 +
 +    /**
 +     * Covers all waxed copper blocks.
 +     * <p>
 +     * Combine with other copper-related tags to filter is-waxed or not.
 +     */
 +    public static final MaterialSetTag WAXED_COPPER_BLOCKS = new MaterialSetTag(keyFor("waxed_copper_blocks"))
-+        .add(m -> m.name().startsWith("WAXED_") && m.name().contains("COPPER")).ensureSize("WAXED_COPPER_BLOCKS", 16).lock();
++        .add(m -> m.name().startsWith("WAXED_") && m.name().contains("COPPER")).ensureSize("WAXED_COPPER_BLOCKS", 36).lock();
 +
 +    /**
 +     * Covers all un-waxed copper blocks.
 +     * <p>
 +     * Combine with other copper-related tags to filter is-un-waxed or not.
 +     */
 +    public static final MaterialSetTag UNWAXED_COPPER_BLOCKS = new MaterialSetTag(keyFor("unwaxed_copper_blocks"))
-+        .contains("CUT_COPPER").endsWith("_COPPER").notContains("WAXED").add(Material.COPPER_BLOCK).not(Material.RAW_COPPER).ensureSize("UNWAXED_COPPER_BLOCKS", 16).lock();
++        .startsWith("EXPOSED_").startsWith("WEATHERED_").startsWith("OXIDIZED_")
++        .startsWith("CUT_COPPER")
++        .add(Material.COPPER_BLOCK, Material.CHISELED_COPPER, Material.COPPER_DOOR, Material.COPPER_TRAPDOOR, Material.COPPER_GRATE, Material.COPPER_BULB)
++        .ensureSize("UNWAXED_COPPER_BLOCKS", 36).lock();
 +
 +    /**
 +     * Covers all copper block variants.
 +     */
 +    public static final MaterialSetTag COPPER_BLOCKS = new MaterialSetTag(keyFor("copper_blocks"))
-+        .add(WAXED_COPPER_BLOCKS).add(UNWAXED_COPPER_BLOCKS).ensureSize("COPPER_BLOCKS", 32).lock();
++        .add(WAXED_COPPER_BLOCKS).add(UNWAXED_COPPER_BLOCKS).ensureSize("COPPER_BLOCKS", 72).lock();
 +
 +    /**
 +     * Covers all weathering/waxed states of the plain copper block.
 +     */
 +    public static final MaterialSetTag FULL_COPPER_BLOCKS = new MaterialSetTag(keyFor("full_copper_blocks"))
-+        .contains("OXIDIZED_COPPER")
-+        .contains("WEATHERED_COPPER")
-+        .contains("EXPOSED_COPPER")
-+        .contains("COPPER_BLOCK")
++        .endsWith("OXIDIZED_COPPER")
++        .endsWith("WEATHERED_COPPER")
++        .endsWith("EXPOSED_COPPER")
++        .endsWith("COPPER_BLOCK")
 +        .not(Material.RAW_COPPER_BLOCK)
 +        .ensureSize("FULL_COPPER_BLOCKS", 8).lock();
 +

diff --git a/patches/api/0258-Add-missing-effects.patch b/patches/api/0258-Add-missing-effects.patch
@@ -3,9 +3,10 @@ From: Ivan Pekov <[email protected]>
 Date: Tue, 5 Jan 2021 10:19:11 +0200
 Subject: [PATCH] Add missing effects
 
+Co-authored-by: Jake Potrebic <[email protected]>
 
 diff --git a/src/main/java/org/bukkit/Effect.java b/src/main/java/org/bukkit/Effect.java
-index 611b7df0e31de932f15c2f13bd8ed286e0b3b43f..9c18b58d37a2dc677ce7c22c5be833ef95bf7c03 100644
+index 611b7df0e31de932f15c2f13bd8ed286e0b3b43f..b8ad6ec6795433770604a1cc93384ef639e810bd 100644
 --- a/src/main/java/org/bukkit/Effect.java
 +++ b/src/main/java/org/bukkit/Effect.java
 @@ -132,12 +132,12 @@ public enum Effect {
@@ -24,7 +25,7 @@ index 611b7df0e31de932f15c2f13bd8ed286e0b3b43f..9c18b58d37a2dc677ce7c22c5be833ef
      /**
       * Visual effect of an instant splash potion breaking. Needs color data
       * value as additional info.
-@@ -337,21 +337,124 @@ public enum Effect {
+@@ -337,21 +337,146 @@ public enum Effect {
       * block.
       */
      OXIDISED_COPPER_SCRAPE(3005, Type.VISUAL),
@@ -122,13 +123,35 @@ index 611b7df0e31de932f15c2f13bd8ed286e0b3b43f..9c18b58d37a2dc677ce7c22c5be833ef
 +
 +    SOUND_STOP_JUKEBOX_SONG(1011, Type.SOUND),
 +
++    CRAFTER_CRAFT(1049, Type.SOUND),
++
++    CRAFTER_FAIL(1050, Type.SOUND),
++
++    /**
++     * {@link BlockFace} param is the direction to shoot
++     */
++    SHOOT_WHITE_SMOKE(2010, Type.VISUAL, BlockFace.class),
++
 +    PARTICLES_SCULK_CHARGE(3006, Type.VISUAL, Integer.class),
 +
 +    PARTICLES_SCULK_SHRIEK(3007, Type.SOUND),
 +
 +    PARTICLES_AND_SOUND_BRUSH_BLOCK_COMPLETE(3008, Type.VISUAL, org.bukkit.block.data.BlockData.class),
 +
-+    PARTICLES_EGG_CRACK(3009, Type.VISUAL)
++    PARTICLES_EGG_CRACK(3009, Type.VISUAL),
++
++    GUST_DUST(3010, Type.VISUAL),
++
++    TRIAL_SPAWNER_SPAWN(3011, Type.VISUAL),
++
++    TRIAL_SPAWNER_SPAWN_MOB_AT(3012, Type.VISUAL),
++
++    /**
++     * {@link Integer} param is the number of players
++     */
++    TRIAL_SPAWNER_DETECT_PLAYER(3013, Type.VISUAL, Integer.class),
++
++    TRIAL_SPAWNER_EJECT_ITEM(3014, Type.VISUAL),
      ;
 +    private static final org.apache.logging.log4j.Logger LOGGER = org.apache.logging.log4j.LogManager.getLogger();
 +    // Paper end
@@ -153,7 +176,7 @@ index 611b7df0e31de932f15c2f13bd8ed286e0b3b43f..9c18b58d37a2dc677ce7c22c5be833ef
      }
 
      /**
-@@ -367,8 +470,10 @@ public enum Effect {
+@@ -367,8 +492,10 @@ public enum Effect {
 
      /**
       * @return The type of the effect.
@@ -164,7 +187,7 @@ index 611b7df0e31de932f15c2f13bd8ed286e0b3b43f..9c18b58d37a2dc677ce7c22c5be833ef
      public Type getType() {
          return this.type;
      }
-@@ -379,8 +484,15 @@ public enum Effect {
+@@ -379,8 +506,15 @@ public enum Effect {
       */
      @Nullable
      public Class<?> getData() {
@@ -181,7 +204,7 @@ index 611b7df0e31de932f15c2f13bd8ed286e0b3b43f..9c18b58d37a2dc677ce7c22c5be833ef
 
      /**
       * Gets the Effect associated with the given ID.
-@@ -397,12 +509,26 @@ public enum Effect {
+@@ -397,12 +531,26 @@ public enum Effect {
 
      static {
          for (Effect effect : values()) {

diff --git a/patches/server/0389-Implement-Mob-Goal-API.patch b/patches/server/0389-Implement-Mob-Goal-API.patch
@@ -18,10 +18,10 @@ index 2566e25f10136ebccb6c9bbdd0722d6cf226f7aa..664fef8d6a901f0f4ebf03ad49a6baaf
      testImplementation("org.mockito:mockito-core:5.5.0")
 diff --git a/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java b/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..f80a6ad7638453348ee82ea00b166a3aac029142
+index 0000000000000000000000000000000000000000..5fb56067221434aa80e626437ed10f65bf416e4f
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java
-@@ -0,0 +1,374 @@
+@@ -0,0 +1,376 @@
 +package com.destroystokyo.paper.entity.ai;
 +
 +import com.destroystokyo.paper.entity.RangedEntity;
@@ -57,6 +57,7 @@ index 0000000000000000000000000000000000000000..f80a6ad7638453348ee82ea00b166a3a
 +import net.minecraft.world.entity.monster.RangedAttackMob;
 +import net.minecraft.world.entity.monster.SpellcasterIllager;
 +import net.minecraft.world.entity.monster.ZombifiedPiglin;
++import net.minecraft.world.entity.monster.breeze.Breeze;
 +import net.minecraft.world.entity.monster.piglin.AbstractPiglin;
 +import org.bukkit.NamespacedKey;
 +import org.bukkit.entity.AbstractHorse;
@@ -268,6 +269,7 @@ index 0000000000000000000000000000000000000000..f80a6ad7638453348ee82ea00b166a3a
 +        bukkitMap.put(net.minecraft.world.entity.monster.warden.Warden.class, org.bukkit.entity.Warden.class);
 +        bukkitMap.put(net.minecraft.world.entity.animal.allay.Allay.class, org.bukkit.entity.Allay.class);
 +        bukkitMap.put(net.minecraft.world.entity.animal.sniffer.Sniffer.class, org.bukkit.entity.Sniffer.class);
++        bukkitMap.put(Breeze.class, org.bukkit.entity.Breeze.class);
 +    }
 +
 +    public static String getUsableName(Class<?> clazz) {

diff --git a/patches/server/0493-Added-missing-default-perms-for-commands.patch b/patches/server/0493-Added-missing-default-perms-for-commands.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Added missing default perms for commands
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/permissions/CommandPermissions.java b/src/main/java/org/bukkit/craftbukkit/util/permissions/CommandPermissions.java
-index a9ea2e38e4673686c9994a58c94ad19e59fd423c..ea732f8fe7b5dd56aab5d3a061a1cad19c49ae0b 100644
+index a9ea2e38e4673686c9994a58c94ad19e59fd423c..dd95b3bfe59f2bb635afe92317288efcd2986326 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/permissions/CommandPermissions.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/permissions/CommandPermissions.java
-@@ -24,13 +24,73 @@ public final class CommandPermissions {
+@@ -24,13 +24,74 @@ public final class CommandPermissions {
          DefaultPermissions.registerPermission(CommandPermissions.PREFIX + "stop", "Allows the user to stop the server", PermissionDefault.OP, commands);
          DefaultPermissions.registerPermission(CommandPermissions.PREFIX + "list", "Allows the user to list all online players", PermissionDefault.OP, commands);
          DefaultPermissions.registerPermission(CommandPermissions.PREFIX + "gamemode", "Allows the user to change the gamemode of another player", PermissionDefault.OP, commands);
@@ -73,6 +73,7 @@ index a9ea2e38e4673686c9994a58c94ad19e59fd423c..ea732f8fe7b5dd56aab5d3a061a1cad1
 +        DefaultPermissions.registerPermission(CommandPermissions.PREFIX + "teammsg", "Allows the user to specify the message to send to team", PermissionDefault.TRUE, commands); // defaults to all players
 +        DefaultPermissions.registerPermission(CommandPermissions.PREFIX + "tellraw", "Allows the user to display a JSON message to players", PermissionDefault.OP, commands);
 +        DefaultPermissions.registerPermission(CommandPermissions.PREFIX + "time", "Allows the user to change or query the world's game time", PermissionDefault.OP, commands);
++        DefaultPermissions.registerPermission(CommandPermissions.PREFIX + "tick", "Allows the user to control the tick rate of the server", PermissionDefault.OP, commands);
 +        DefaultPermissions.registerPermission(CommandPermissions.PREFIX + "title", "Allows the user to manage screen titles", PermissionDefault.OP, commands);
 +        DefaultPermissions.registerPermission(CommandPermissions.PREFIX + "weather", "Allows the user to set the weather", PermissionDefault.OP, commands);
 +        DefaultPermissions.registerPermission(CommandPermissions.PREFIX + "whitelist", "Allows the user to manage the server whitelist", PermissionDefault.OP, commands);

diff --git a/patches/server/0528-Add-StructuresLocateEvent.patch b/patches/server/0528-Add-StructuresLocateEvent.patch
@@ -93,7 +93,7 @@ index 47b5930adf1870125b1ec063895b0652890a06de..253b4cf66e94faf0bc8861318ae7549f
      }
 diff --git a/src/test/java/io/papermc/paper/world/structure/ConfiguredStructureTest.java b/src/test/java/io/papermc/paper/world/structure/ConfiguredStructureTest.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..cc24d5746b96d8ac352a3ed0a675a7b159f8bd65
+index 0000000000000000000000000000000000000000..9178fe0d01b998ca1442bf2511f8fc00db9388ba
 --- /dev/null
 +++ b/src/test/java/io/papermc/paper/world/structure/ConfiguredStructureTest.java
 @@ -0,0 +1,96 @@
@@ -159,7 +159,7 @@ index 0000000000000000000000000000000000000000..cc24d5746b96d8ac352a3ed0a675a7b1
 +        for (Structure feature : structureRegistry) {
 +            final ResourceLocation key = structureRegistry.getKey(feature);
 +            assertNotNull(key, "Missing built-in registry key");
-+            if (key.equals(BuiltinStructures.ANCIENT_CITY.location()) || key.equals(BuiltinStructures.TRAIL_RUINS.location())) {
++            if (key.equals(BuiltinStructures.ANCIENT_CITY.location()) || key.equals(BuiltinStructures.TRAIL_RUINS.location()) || key.equals(BuiltinStructures.TRIAL_CHAMBERS.location())) {
 +                continue; // TODO remove when upstream adds "jigsaw" StructureType
 +            }
 +            if (DEFAULT_CONFIGURED_STRUCTURES.get(CraftNamespacedKey.fromMinecraft(key)) == null) {

diff --git a/patches/server/0621-Missing-Entity-API.patch b/patches/server/0621-Missing-Entity-API.patch
@@ -38,10 +38,10 @@ Co-authored-by: booky10 <[email protected]>
 Co-authored-by: Amin <[email protected]>
 
 diff --git a/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java b/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java
-index f80a6ad7638453348ee82ea00b166a3aac029142..a08c00b8c0488d18be5e182f7892e5ab71d12247 100644
+index 5fb56067221434aa80e626437ed10f65bf416e4f..cfe6a6f6bcfd7a3b29ab25f5a6745d31c18f338d 100644
 --- a/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java
 +++ b/src/main/java/com/destroystokyo/paper/entity/ai/MobGoalHelper.java
-@@ -164,7 +164,7 @@ public class MobGoalHelper {
+@@ -165,7 +165,7 @@ public class MobGoalHelper {
          bukkitMap.put(net.minecraft.world.entity.monster.Endermite.class, Endermite.class);
          bukkitMap.put(net.minecraft.world.entity.monster.Evoker.class, Evoker.class);
          bukkitMap.put(AbstractFish.class, Fish.class);

diff --git a/patches/server/0658-Add-more-advancement-API.patch b/patches/server/0658-Add-more-advancement-API.patch
@@ -189,7 +189,7 @@ index 812819e814cfbdb542051a7dbfe123d3c59e66bd..61d00421b295103a6964b22fe0dfaf09
                          {
 diff --git a/src/test/java/io/papermc/paper/advancement/AdvancementFrameTest.java b/src/test/java/io/papermc/paper/advancement/AdvancementFrameTest.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..d483fea98005426c91a3ed43f2f3ce72e140c3bc
+index 0000000000000000000000000000000000000000..47535c27d7cffc4b5ee6cc9e145b1087477eef79
 --- /dev/null
 +++ b/src/test/java/io/papermc/paper/advancement/AdvancementFrameTest.java
 @@ -0,0 +1,24 @@
@@ -213,7 +213,7 @@ index 0000000000000000000000000000000000000000..d483fea98005426c91a3ed43f2f3ce72
 +            final var frame = PaperAdvancementDisplay.asPaperFrame(advancementType);
 +            assertEquals(expectedTranslationKey, frame.translationKey(), "The translation keys should be the same");
 +            assertEquals(expectedColor, frame.color(), "The frame colors should be the same");
-+            assertEquals(advancementType.name(), AdvancementDisplay.Frame.NAMES.key(frame));
++            assertEquals(advancementType.getSerializedName(), AdvancementDisplay.Frame.NAMES.key(frame));
 +        }
 +    }
 +}