SteamWar/Paper
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix some tests and DoNotUse violations

Browse Source
This commit is contained in:
Jake Potrebic
2022-12-08 09:06:14 -08:00
parent c29c901ae8
commit b344c04a4a
5 changed files with 175 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
patches/api/Add-Material-Tags.patch
View File

@@ -223,7 +223,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ */
+ public static final MaterialSetTag DOORS = new MaterialSetTag(keyFor("doors"))
+ .endsWith("_DOOR")
+ .ensureSize("DOORS", 10).lock();
+ .ensureSize("DOORS", 11).lock();
+
+ /**
+ * Covers all dyes.
@@ -237,14 +237,14 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ */
+ public static final MaterialSetTag FENCE_GATES = new MaterialSetTag(keyFor("fence_gates"))
+ .endsWith("_GATE")
+ .ensureSize("FENCE_GATES", 9).lock();
+ .ensureSize("FENCE_GATES", 10).lock();
+
+ /**
+ * Covers all variants of fences.
+ */
+ public static final MaterialSetTag FENCES = new MaterialSetTag(keyFor("fences"))
+ .endsWith("_FENCE")
+ .ensureSize("FENCES", 10).lock();
+ .ensureSize("FENCES", 11).lock();
+
+ /**
+ * Covers all variants of fish buckets.
@@ -358,7 +358,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ */
+ public static final MaterialSetTag PRESSURE_PLATES = new MaterialSetTag(keyFor("pressure_plates"))
+ .endsWith("_PRESSURE_PLATE")
+ .ensureSize("PRESSURE_PLATES", 13).lock();
+ .ensureSize("PRESSURE_PLATES", 14).lock();
+
+ /**
+ * Covers the variants of prismarine blocks.
@@ -430,14 +430,14 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ .endsWith("_HEAD")
+ .endsWith("_SKULL")
+ .not(Material.PISTON_HEAD)
+ .ensureSize("SKULLS", 12).lock();
+ .ensureSize("SKULLS", 14).lock();
+
+ /**
+ * Covers all spawn egg items.
+ */
+ public static final MaterialSetTag SPAWN_EGGS = new MaterialSetTag(keyFor("spawn_eggs"))
+ .endsWith("_SPAWN_EGG")
+ .ensureSize("SPAWN_EGGS", 71).lock();
+ .ensureSize("SPAWN_EGGS", 76).lock();
+
+ /**
+ * Covers all colors of stained glass.
@@ -458,7 +458,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ */
+ public static final MaterialSetTag TRAPDOORS = new MaterialSetTag(keyFor("trapdoors"))
+ .endsWith("_TRAPDOOR")
+ .ensureSize("TRAPDOORS", 10).lock();
+ .ensureSize("TRAPDOORS", 11).lock();
+
+ /**
+ * Covers all wood variants of doors.
@@ -466,7 +466,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ public static final MaterialSetTag WOODEN_DOORS = new MaterialSetTag(keyFor("wooden_doors"))
+ .endsWith("_DOOR")
+ .not(Material.IRON_DOOR)
+ .ensureSize("WOODEN_DOORS", 9).lock();
+ .ensureSize("WOODEN_DOORS", 10).lock();
+
+ /**
+ * Covers all wood variants of fences.
@@ -474,7 +474,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ public static final MaterialSetTag WOODEN_FENCES = new MaterialSetTag(keyFor("wooden_fences"))
+ .endsWith("_FENCE")
+ .not(Material.NETHER_BRICK_FENCE)
+ .ensureSize("WOODEN_FENCES", 9).lock();
+ .ensureSize("WOODEN_FENCES", 10).lock();
+
+ /**
+ * Covers all wood variants of trapdoors.
@@ -482,14 +482,14 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ public static final MaterialSetTag WOODEN_TRAPDOORS = new MaterialSetTag(keyFor("wooden_trapdoors"))
+ .endsWith("_TRAPDOOR")
+ .not(Material.IRON_TRAPDOOR)
+ .ensureSize("WOODEN_TRAPDOORS", 9).lock();
+ .ensureSize("WOODEN_TRAPDOORS", 10).lock();
+
+ /**
+ * Covers the wood variants of gates.
+ */
+ public static final MaterialSetTag WOODEN_GATES = new MaterialSetTag(keyFor("wooden_gates"))
+ .endsWith("_GATE")
+ .ensureSize("WOODEN_GATES", 9).lock();
+ .ensureSize("WOODEN_GATES", 10).lock();
+
+ /**
+ * Covers the variants of purpur.
@@ -503,7 +503,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ */
+ public static final MaterialSetTag SIGNS = new MaterialSetTag(keyFor("signs"))
+ .endsWith("_SIGN")
+ .ensureSize("SIGNS", 18).lock();
+ .ensureSize("SIGNS", 40).lock();
+
+ /**
+ * Covers the variants of a regular torch.
@@ -596,7 +596,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ .endsWith("_HELMET")
+ .add(SKULLS)
+ .add(Material.CARVED_PUMPKIN)
+ .ensureSize("HEAD_EQUIPPABLE", 20).lock();
+ .ensureSize("HEAD_EQUIPPABLE", 22).lock();
+
+ /**
+ * Covers the variants of chestplate.
@@ -831,6 +831,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+package io.papermc.paper.tag;
+
+import com.google.common.collect.Lists;
+import java.util.Collections;
+import org.bukkit.Keyed;
+import org.bukkit.NamespacedKey;
+import org.bukkit.Tag;
@@ -900,7 +901,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ @NotNull
+ @Override
+ public Set<T> getValues() {
+ return tagged;
+ return Collections.unmodifiableSet(tagged);
+ }
+
+ @Override