mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

make tests pass

Browse source
This commit is contained in:
Jake Potrebic 2023-03-14 16:29:38 -07:00
parent 0f17027652
commit dbeef458b2
No known key found for this signature in database
GPG key ID: ECE0B3C133C016C5
10 changed files with 103 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

27
patches/api/0153-Add-Material-Tags.patch
View file

@ -114,10 +114,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..0c3cd2856f7df3702ec0ff6b8dba1e052929863e
index 0000000000000000000000000000000000000000..7836ca97d2aa3a9c08e2ce69936bd801c857ad85
--- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/MaterialTags.java
@@ -0,0 +1,704 @@
@@ -0,0 +1,705 @@
+/*
+ * Copyright (c) 2018 Daniel Ennis (Aikar) MIT License
+ *
@ -223,7 +223,7 @@ index 0000000000000000000000000000000000000000..0c3cd2856f7df3702ec0ff6b8dba1e05
+ */
+ public static final MaterialSetTag DOORS = new MaterialSetTag(keyFor("doors"))
+ .endsWith("_DOOR")
+ .ensureSize("DOORS", 11).lock();
+ .ensureSize("DOORS", 12).lock();
+
+ /**
+ * Covers all dyes.
@ -237,14 +237,14 @@ index 0000000000000000000000000000000000000000..0c3cd2856f7df3702ec0ff6b8dba1e05
+ */
+ public static final MaterialSetTag FENCE_GATES = new MaterialSetTag(keyFor("fence_gates"))
+ .endsWith("_GATE")
+ .ensureSize("FENCE_GATES", 10).lock();
+ .ensureSize("FENCE_GATES", 11).lock();
+
+ /**
+ * Covers all variants of fences.
+ */
+ public static final MaterialSetTag FENCES = new MaterialSetTag(keyFor("fences"))
+ .endsWith("_FENCE")
+ .ensureSize("FENCES", 11).lock();
+ .ensureSize("FENCES", 12).lock();
+
+ /**
+ * Covers all variants of fish buckets.
@ -358,7 +358,7 @@ index 0000000000000000000000000000000000000000..0c3cd2856f7df3702ec0ff6b8dba1e05
+ */
+ public static final MaterialSetTag PRESSURE_PLATES = new MaterialSetTag(keyFor("pressure_plates"))
+ .endsWith("_PRESSURE_PLATE")
+ .ensureSize("PRESSURE_PLATES", 14).lock();
+ .ensureSize("PRESSURE_PLATES", 15).lock();
+
+ /**
+ * Covers the variants of prismarine blocks.
@ -429,6 +429,7 @@ index 0000000000000000000000000000000000000000..0c3cd2856f7df3702ec0ff6b8dba1e05
+ public static final MaterialSetTag SKULLS = new MaterialSetTag(keyFor("skulls"))
+ .endsWith("_HEAD")
+ .endsWith("_SKULL")
+ .not(Material.POTTERY_SHARD_SKULL)
+ .not(Material.PISTON_HEAD)
+ .ensureSize("SKULLS", 14).lock();
+
@ -437,7 +438,7 @@ index 0000000000000000000000000000000000000000..0c3cd2856f7df3702ec0ff6b8dba1e05
+ */
+ public static final MaterialSetTag SPAWN_EGGS = new MaterialSetTag(keyFor("spawn_eggs"))
+ .endsWith("_SPAWN_EGG")
+ .ensureSize("SPAWN_EGGS", 76).lock();
+ .ensureSize("SPAWN_EGGS", 77).lock();
+
+ /**
+ * Covers all colors of stained glass.
@ -458,7 +459,7 @@ index 0000000000000000000000000000000000000000..0c3cd2856f7df3702ec0ff6b8dba1e05
+ */
+ public static final MaterialSetTag TRAPDOORS = new MaterialSetTag(keyFor("trapdoors"))
+ .endsWith("_TRAPDOOR")
+ .ensureSize("TRAPDOORS", 11).lock();
+ .ensureSize("TRAPDOORS", 12).lock();
+
+ /**
+ * Covers all wood variants of doors.
@ -466,7 +467,7 @@ index 0000000000000000000000000000000000000000..0c3cd2856f7df3702ec0ff6b8dba1e05
+ public static final MaterialSetTag WOODEN_DOORS = new MaterialSetTag(keyFor("wooden_doors"))
+ .endsWith("_DOOR")
+ .not(Material.IRON_DOOR)
+ .ensureSize("WOODEN_DOORS", 10).lock();
+ .ensureSize("WOODEN_DOORS", 11).lock();
+
+ /**
+ * Covers all wood variants of fences.
@ -474,7 +475,7 @@ index 0000000000000000000000000000000000000000..0c3cd2856f7df3702ec0ff6b8dba1e05
+ public static final MaterialSetTag WOODEN_FENCES = new MaterialSetTag(keyFor("wooden_fences"))
+ .endsWith("_FENCE")
+ .not(Material.NETHER_BRICK_FENCE)
+ .ensureSize("WOODEN_FENCES", 10).lock();
+ .ensureSize("WOODEN_FENCES", 11).lock();
+
+ /**
+ * Covers all wood variants of trapdoors.
@ -482,14 +483,14 @@ index 0000000000000000000000000000000000000000..0c3cd2856f7df3702ec0ff6b8dba1e05
+ public static final MaterialSetTag WOODEN_TRAPDOORS = new MaterialSetTag(keyFor("wooden_trapdoors"))
+ .endsWith("_TRAPDOOR")
+ .not(Material.IRON_TRAPDOOR)
+ .ensureSize("WOODEN_TRAPDOORS", 10).lock();
+ .ensureSize("WOODEN_TRAPDOORS", 11).lock();
+
+ /**
+ * Covers the wood variants of gates.
+ */
+ public static final MaterialSetTag WOODEN_GATES = new MaterialSetTag(keyFor("wooden_gates"))
+ .endsWith("_GATE")
+ .ensureSize("WOODEN_GATES", 10).lock();
+ .ensureSize("WOODEN_GATES", 11).lock();
+
+ /**
+ * Covers the variants of purpur.
@ -503,7 +504,7 @@ index 0000000000000000000000000000000000000000..0c3cd2856f7df3702ec0ff6b8dba1e05
+ */
+ public static final MaterialSetTag SIGNS = new MaterialSetTag(keyFor("signs"))
+ .endsWith("_SIGN")
+ .ensureSize("SIGNS", 40).lock();
+ .ensureSize("SIGNS", 44).lock();
+
+ /**
+ * Covers the variants of a regular torch.

22
patches/api/0415-Add-missing-isFuel-Material-entries.patch
View file

@ -5,7 +5,7 @@ Subject: [PATCH] Add missing isFuel Material entries
diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java
index ddcd5038e00fde469012171eef114df677cf2ecc..3376473ebcc9396ee334a40600b4f62117f6b2a0 100644
index 5387070a2f668871334ef522d8a3c645d899372a..bd32af93807815e23b9cf5e51ba6025170a1dee7 100644
--- a/src/main/java/org/bukkit/Material.java
+++ b/src/main/java/org/bukkit/Material.java
@@ -7696,6 +7696,7 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
@ -52,7 +52,7 @@ index ddcd5038e00fde469012171eef114df677cf2ecc..3376473ebcc9396ee334a40600b4f621
case BIRCH_LOG:
case BIRCH_PLANKS:
case BIRCH_PRESSURE_PLATE:
@@ -7741,6 +7761,22 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
@@ -7741,6 +7761,24 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
case BROWN_WOOL:
case CARTOGRAPHY_TABLE:
case CHARCOAL:
@ -64,6 +64,7 @@ index ddcd5038e00fde469012171eef114df677cf2ecc..3376473ebcc9396ee334a40600b4f621
+ case CHERRY_FENCE:
+ case CHERRY_FENCE_GATE:
+ case CHERRY_HANGING_SIGN:
+ case CHERRY_LOG:
+ case CHERRY_PLANKS:
+ case CHERRY_PRESSURE_PLATE:
+ case CHERRY_SAPLING:
@ -71,11 +72,12 @@ index ddcd5038e00fde469012171eef114df677cf2ecc..3376473ebcc9396ee334a40600b4f621
+ case CHERRY_SLAB:
+ case CHERRY_STAIRS:
+ case CHERRY_TRAPDOOR:
+ case CHERRY_WOOD:
+ // Paper end
case CHEST:
case CHISELED_BOOKSHELF:
case COAL:
@@ -7757,6 +7793,7 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
@@ -7757,6 +7795,7 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
case DARK_OAK_DOOR:
case DARK_OAK_FENCE:
case DARK_OAK_FENCE_GATE:
@ -83,7 +85,7 @@ index ddcd5038e00fde469012171eef114df677cf2ecc..3376473ebcc9396ee334a40600b4f621
case DARK_OAK_LOG:
case DARK_OAK_PLANKS:
case DARK_OAK_PRESSURE_PLATE:
@@ -7785,6 +7822,7 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
@@ -7785,6 +7824,7 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
case JUNGLE_DOOR:
case JUNGLE_FENCE:
case JUNGLE_FENCE_GATE:
@ -91,7 +93,7 @@ index ddcd5038e00fde469012171eef114df677cf2ecc..3376473ebcc9396ee334a40600b4f621
case JUNGLE_LOG:
case JUNGLE_PLANKS:
case JUNGLE_PRESSURE_PLATE:
@@ -7816,6 +7854,7 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
@@ -7816,6 +7856,7 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
case MANGROVE_DOOR:
case MANGROVE_FENCE:
case MANGROVE_FENCE_GATE:
@ -99,7 +101,7 @@ index ddcd5038e00fde469012171eef114df677cf2ecc..3376473ebcc9396ee334a40600b4f621
case MANGROVE_LOG:
case MANGROVE_PLANKS:
case MANGROVE_PRESSURE_PLATE:
@@ -7833,6 +7872,7 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
@@ -7833,6 +7874,7 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
case OAK_DOOR:
case OAK_FENCE:
case OAK_FENCE_GATE:
@ -107,7 +109,7 @@ index ddcd5038e00fde469012171eef114df677cf2ecc..3376473ebcc9396ee334a40600b4f621
case OAK_LOG:
case OAK_PLANKS:
case OAK_PRESSURE_PLATE:
@@ -7862,6 +7902,7 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
@@ -7862,6 +7904,7 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
case SPRUCE_DOOR:
case SPRUCE_FENCE:
case SPRUCE_FENCE_GATE:
@ -115,11 +117,15 @@ index ddcd5038e00fde469012171eef114df677cf2ecc..3376473ebcc9396ee334a40600b4f621
case SPRUCE_LOG:
case SPRUCE_PLANKS:
case SPRUCE_PRESSURE_PLATE:
@@ -7874,6 +7915,7 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
@@ -7874,8 +7917,11 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
case STICK:
case STRIPPED_ACACIA_LOG:
case STRIPPED_ACACIA_WOOD:
+ case STRIPPED_BAMBOO_BLOCK: // Paper
case STRIPPED_BIRCH_LOG:
case STRIPPED_BIRCH_WOOD:
+ case STRIPPED_CHERRY_LOG: // Paper
+ case STRIPPED_CHERRY_WOOD: // Paper
case STRIPPED_DARK_OAK_LOG:
case STRIPPED_DARK_OAK_WOOD:
case STRIPPED_JUNGLE_LOG:

21
patches/api/0419-Add-missing-biome-enum.patch Normal file
View file

@ -0,0 +1,21 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Jake Potrebic <jake.m.potrebic@gmail.com>
Date: Tue, 14 Mar 2023 16:28:02 -0700
Subject: [PATCH] Add missing biome enum
diff --git a/src/main/java/org/bukkit/block/Biome.java b/src/main/java/org/bukkit/block/Biome.java
index d56e1b50dd7da18f40278cec4bfdc9414aae0be1..8228cc9f5005c13964e05fa654c5009c17e0c471 100644
--- a/src/main/java/org/bukkit/block/Biome.java
+++ b/src/main/java/org/bukkit/block/Biome.java
@@ -67,6 +67,10 @@ public enum Biome implements Keyed, net.kyori.adventure.translation.Translatable
LUSH_CAVES,
DEEP_DARK,
MEADOW,
+ // Paper start - add missing biome
+ @org.jetbrains.annotations.ApiStatus.Experimental
+ CHERRY_GROVE,
+ // Paper end
GROVE,
SNOWY_SLOPES,
FROZEN_PEAKS,