forked from PaperMC/Paper
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Updated Upstream (Bukkit/CraftBukkit)
Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 69fa469 Add some missing deprecation annotations f850da2 Update Maven plugins/versions 8d8400d Use regular compiler seeing as ECJ doesn't support Java 21 JRE c29e168 Revert "BUILDTOOLS-676: Downgrade Maven compiler version" 07bce71 SPIGOT-7355: More field renames and fixes 6a8ea76 Fix bad merge in penultimate commit 50a7920 Fix imports in previous commit 83640dd PR-995: Add required feature to MinecraftExperimental for easy lookups fc1f96c BUILDTOOLS-676: Downgrade Maven compiler version CraftBukkit Changes: 90f1059 Fix item placement 661afb4 SPIGOT-7633: Clearer error message for missing particle data 807b465 SPIGOT-7634: Armadillo updates infrequently 590cf09 Fix unit tests always seeing Mojang server as unavailable 7c7ac5e SPIGOT-7636: Fix clearing ItemMeta 4a72905 SPIGOT-7635: Fix Player#transfer and cookie methods ebb50e1 Fix incorrect Vault implementation b33fed8 Update Maven plugins/versions 6f00f06 SPIGOT-7632: Control middle clicking chest does not copy contents db821f4 Use regular compiler seeing as ECJ doesn't support Java 21 JRE 8a29767 Revert "BUILDTOOLS-676: Downgrade Maven compiler version" 0297f87 SPIGOT-7355: More field renames and fixes 2d03bdf SPIGOT-7629: Fix loading banner patterns e77951f Fix equality of deserialized display names c66f3e4 SPIGOT-7631: Fix deserialisation of BlockStateMeta 9c2c7be SPIGOT-7630: Fix crash saving unticked leashed entities 8c1e7c8 PR-1384: Disable certain PlayerProfile tests, if Mojang's services or internet are not available ced93d5 SPIGOT-7626: sendSignChange() has no effect c77362c SPIGOT-7625: ItemStack with lore cannot be serialized in 1.20.5 ff20043 SPIGOT-7620: Fix server crash when hoppers transfer items to double chests 8b4abeb BUILDTOOLS-676: Downgrade Maven compiler version
- Loading branch information
Showing
247 changed files
with
946 additions
and
969 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -12,7 +12,7 @@ Co-authored-by: Riley Park <[email protected]> | |
| Co-authored-by: Jake Potrebic <[email protected]> | ||
|
|
||
| diff --git a/build.gradle.kts b/build.gradle.kts | ||
| index a1f46208d1f39de54b73c66c3c4284b6f8c86864..be4d301b305f5cd92d2ff352bfb9c6ff9f82fd9b 100644 | ||
| index a918fd14c95e714e935758d60bccd72755e00b11..768024b2b4584fd7dd86f068c0e79c89ffc5faa1 100644 | ||
| --- a/build.gradle.kts | ||
| +++ b/build.gradle.kts | ||
| @@ -105,6 +105,12 @@ tasks.test { | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -8,12 +8,12 @@ Co-authored-by: Jake Potrebic <[email protected]> | |
| Co-authored-by: Yannick Lamprecht <[email protected]> | ||
|
|
||
| diff --git a/build.gradle.kts b/build.gradle.kts | ||
| index f605e7e0f812a2297b1cecf3f37b69a8edc6b4a5..ec60a4b804d9d077fdb7d88519b7fb8816aeab9f 100644 | ||
| index 2f266350a787a4cfdfda1b0e760bfb7604cac43c..c23ee26662657baa496d6048b9a8ba39b4998e72 100644 | ||
| --- a/build.gradle.kts | ||
| +++ b/build.gradle.kts | ||
| @@ -11,12 +11,28 @@ java { | ||
|
|
||
| val annotationsVersion = "24.0.1" | ||
| val annotationsVersion = "24.1.0" | ||
| val bungeeCordChatVersion = "1.20-R0.2" | ||
| +val adventureVersion = "4.17.0-SNAPSHOT" | ||
| +val apiAndDocs: Configuration by configurations.creating { | ||
|
|
@@ -1106,7 +1106,7 @@ index b79daa857fc686f00ac06b8851e0ab68d83ae949..45d996878ba8d314a47078589b6da59d | |
| public void setCustomName(@Nullable String name); | ||
| } | ||
| diff --git a/src/main/java/org/bukkit/NamespacedKey.java b/src/main/java/org/bukkit/NamespacedKey.java | ||
| index ae7b51341fb66c41b8a7c4604fd273d876e311be..4034fcb9abc39b12f0de47c4b679f2ef82353c89 100644 | ||
| index 9562fcd522b2e2b24ec57fbf18ddeebba3e50abf..9b61129c3ef83d0bfceba54aba2effa12bc90678 100644 | ||
| --- a/src/main/java/org/bukkit/NamespacedKey.java | ||
| +++ b/src/main/java/org/bukkit/NamespacedKey.java | ||
| @@ -19,7 +19,7 @@ import org.jetbrains.annotations.Nullable; | ||
|
|
@@ -1150,7 +1150,7 @@ index ae7b51341fb66c41b8a7c4604fd273d876e311be..4034fcb9abc39b12f0de47c4b679f2ef | |
| } | ||
|
|
||
| @Override | ||
| @@ -247,4 +247,24 @@ public final class NamespacedKey { | ||
| @@ -248,4 +248,24 @@ public final class NamespacedKey { | ||
| public static NamespacedKey fromString(@NotNull String key) { | ||
| return fromString(key, null); | ||
| } | ||
|
|
@@ -1430,10 +1430,10 @@ index bfa9846d93317d07e55b6d7b971326fa07cae27d..3bf7db7eac81e3cc6f5c6700637d10d1 | |
| throw new UnsupportedOperationException("Not supported yet."); | ||
| } | ||
| diff --git a/src/main/java/org/bukkit/Sound.java b/src/main/java/org/bukkit/Sound.java | ||
| index bd3861c4c2eabca93065c0a6e24e0d3603d86db2..ddc4c5097214371108dc945371e1d28811352c38 100644 | ||
| index 72260e6284e3f5ce1813635aa07518c47dbf0899..375172e05a78611deb3003f780867516cb6cd1a4 100644 | ||
| --- a/src/main/java/org/bukkit/Sound.java | ||
| +++ b/src/main/java/org/bukkit/Sound.java | ||
| @@ -10,7 +10,7 @@ import org.jetbrains.annotations.NotNull; | ||
| @@ -11,7 +11,7 @@ import org.jetbrains.annotations.NotNull; | ||
| * guarantee values will not be removed from this Enum. As such, you should not | ||
| * depend on the ordinal values of this class. | ||
| */ | ||
|
|
@@ -1442,7 +1442,7 @@ index bd3861c4c2eabca93065c0a6e24e0d3603d86db2..ddc4c5097214371108dc945371e1d288 | |
|
|
||
| AMBIENT_BASALT_DELTAS_ADDITIONS("ambient.basalt_deltas.additions"), | ||
| AMBIENT_BASALT_DELTAS_LOOP("ambient.basalt_deltas.loop"), | ||
| @@ -1727,4 +1727,11 @@ public enum Sound implements Keyed { | ||
| @@ -1725,4 +1725,11 @@ public enum Sound implements Keyed { | ||
| public NamespacedKey getKey() { | ||
| return key; | ||
| } | ||
|
|
@@ -2182,10 +2182,10 @@ index b7d8dd30360a38dbdc7bbce40c8e6ced7261f833..0817f2395c2b18828565435568ce651f | |
| public void sendRawMessage(@Nullable UUID sender, @NotNull String message); | ||
| } | ||
| diff --git a/src/main/java/org/bukkit/enchantments/Enchantment.java b/src/main/java/org/bukkit/enchantments/Enchantment.java | ||
| index f9965740ffa267caa698f854120a5d89727c6d37..dddd0e74962d5713c4bb6219fba48aae5763e9ea 100644 | ||
| index 18983f405b2f6c4159dba5c99674ae7729905cc4..a82d6f469aca02fb28b1b3ad84dc40415f1f1ade 100644 | ||
| --- a/src/main/java/org/bukkit/enchantments/Enchantment.java | ||
| +++ b/src/main/java/org/bukkit/enchantments/Enchantment.java | ||
| @@ -317,6 +317,19 @@ public abstract class Enchantment implements Keyed, Translatable { | ||
| @@ -318,6 +318,19 @@ public abstract class Enchantment implements Keyed, Translatable { | ||
| * @return True if the enchantment may be applied, otherwise False | ||
| */ | ||
| public abstract boolean canEnchantItem(@NotNull ItemStack item); | ||
|
|
@@ -3279,10 +3279,10 @@ index 3c2ea8fec3a748cab7f5ad9100d12bd8213ec6c9..03b4e0300d228e3f3a9f4f75c96e0cf9 | |
| * Gets how much EXP the Player should have at respawn. | ||
| * <p> | ||
| diff --git a/src/main/java/org/bukkit/event/inventory/InventoryType.java b/src/main/java/org/bukkit/event/inventory/InventoryType.java | ||
| index a2e9bedc4d7c56f1ae6bd6ace2dff41537e41829..c3aeb1b622509ecd9e2230ce82e3bf07899fa540 100644 | ||
| index 45acff6f8b4859b6e111d925ae01d59dd361b8c9..f5bdd6b6df126abfa26ce727c80a5772d2ab1a1b 100644 | ||
| --- a/src/main/java/org/bukkit/event/inventory/InventoryType.java | ||
| +++ b/src/main/java/org/bukkit/event/inventory/InventoryType.java | ||
| @@ -163,6 +163,18 @@ public enum InventoryType { | ||
| @@ -164,6 +164,18 @@ public enum InventoryType { | ||
| private final String title; | ||
| private final boolean isCreatable; | ||
|
|
||
|
|
@@ -3301,15 +3301,15 @@ index a2e9bedc4d7c56f1ae6bd6ace2dff41537e41829..c3aeb1b622509ecd9e2230ce82e3bf07 | |
| private InventoryType(int defaultSize, /*@NotNull*/ String defaultTitle) { | ||
| this(defaultSize, defaultTitle, true); | ||
| } | ||
| @@ -171,6 +183,7 @@ public enum InventoryType { | ||
| @@ -172,6 +184,7 @@ public enum InventoryType { | ||
| size = defaultSize; | ||
| title = defaultTitle; | ||
| this.isCreatable = isCreatable; | ||
| + this.defaultTitleComponent = net.kyori.adventure.text.Component.text(defaultTitle); // Paper - Adventure | ||
| } | ||
|
|
||
| public int getDefaultSize() { | ||
| @@ -178,6 +191,7 @@ public enum InventoryType { | ||
| @@ -179,6 +192,7 @@ public enum InventoryType { | ||
| } | ||
|
|
||
| @NotNull | ||
|
|
@@ -4323,7 +4323,7 @@ index 60ebfab9596f26cfd2d75a43f3f88f2dd56575f3..dbaf54018a7dd392378869a5a302a880 | |
| + // Paper end - Adventure | ||
| } | ||
| diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java | ||
| index 88cdce67e6a55712cb56e946f2f09c82ddbc1d15..e76c847e57f3d32757129d56922862a4202c9d07 100644 | ||
| index cf1733bc76d1e29ad0f533f6e49818f83e8e3358..f2a6f62f0344684668febc0999b81748c6737826 100644 | ||
| --- a/src/main/java/org/bukkit/inventory/ItemStack.java | ||
| +++ b/src/main/java/org/bukkit/inventory/ItemStack.java | ||
| @@ -23,7 +23,7 @@ import org.jetbrains.annotations.Nullable; | ||
|
|
@@ -4335,7 +4335,7 @@ index 88cdce67e6a55712cb56e946f2f09c82ddbc1d15..e76c847e57f3d32757129d56922862a4 | |
| private Material type = Material.AIR; | ||
| private int amount = 0; | ||
| private MaterialData data = null; | ||
| @@ -613,4 +613,21 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat | ||
| @@ -614,4 +614,21 @@ public class ItemStack implements Cloneable, ConfigurationSerializable, Translat | ||
| public String getTranslationKey() { | ||
| return Bukkit.getUnsafe().getTranslationKey(this); | ||
| } | ||
|
|
@@ -4753,7 +4753,7 @@ index bd512a7840d4686759097ee4cbd8b375c530956b..f2242ddc4085f7e7cdd748d860857822 | |
| + // Paper end - adventure | ||
| } | ||
| diff --git a/src/main/java/org/bukkit/map/MapCursor.java b/src/main/java/org/bukkit/map/MapCursor.java | ||
| index 4ddddc5d91a5febba2fd4dea3a15092f4ec32a6f..f9803c7483f7458fed1f22ddfda6e7ef03cfc688 100644 | ||
| index 9679cc595b5009990d8441a6344505eef1f5d265..f973f0f3925819765412f6f134e553d7d74f1467 100644 | ||
| --- a/src/main/java/org/bukkit/map/MapCursor.java | ||
| +++ b/src/main/java/org/bukkit/map/MapCursor.java | ||
| @@ -12,7 +12,7 @@ public final class MapCursor { | ||
|
|
@@ -5028,7 +5028,7 @@ index 78fd35e6115072c6bc2ff5a899ffc2edb8f45801..22b1dc5fd4d453161a5ee520072f8e8f | |
|
|
||
| /** | ||
| diff --git a/src/main/java/org/bukkit/scoreboard/Scoreboard.java b/src/main/java/org/bukkit/scoreboard/Scoreboard.java | ||
| index 083bb2c92a2c557e10b705b773ced97401586c3c..d5723e977d9a25701a4f387f1b26d2414e0fffb8 100644 | ||
| index bf52375e9ed9ec172eca1d27c06c379e3fc216bc..e6aeb01e80fb63a4ebd6a7cbda1815e49775246d 100644 | ||
| --- a/src/main/java/org/bukkit/scoreboard/Scoreboard.java | ||
| +++ b/src/main/java/org/bukkit/scoreboard/Scoreboard.java | ||
| @@ -26,6 +26,71 @@ public interface Scoreboard { | ||
|
|
@@ -5103,31 +5103,33 @@ index 083bb2c92a2c557e10b705b773ced97401586c3c..d5723e977d9a25701a4f387f1b26d241 | |
| /** | ||
| * Registers an Objective on this Scoreboard | ||
| * | ||
| @@ -37,9 +102,10 @@ public interface Scoreboard { | ||
| @@ -37,10 +102,11 @@ public interface Scoreboard { | ||
| * characters. | ||
| * @throws IllegalArgumentException if an objective by that name already | ||
| * exists | ||
| - * @deprecated use {@link #registerNewObjective(String, Criteria, String)} | ||
| + * @deprecated use {@link #registerNewObjective(String, Criteria, net.kyori.adventure.text.Component)} | ||
| */ | ||
| @Deprecated | ||
| @NotNull | ||
| + @Deprecated // Paper | ||
| Objective registerNewObjective(@NotNull String name, @NotNull String criteria, @NotNull String displayName); | ||
|
|
||
| /** | ||
| @@ -54,9 +120,10 @@ public interface Scoreboard { | ||
| @@ -55,10 +121,11 @@ public interface Scoreboard { | ||
| * characters. | ||
| * @throws IllegalArgumentException if an objective by that name already | ||
| * exists | ||
| - * @deprecated use {@link #registerNewObjective(String, Criteria, String, RenderType)} | ||
| + * @deprecated use {@link #registerNewObjective(String, Criteria, net.kyori.adventure.text.Component, RenderType)} | ||
| */ | ||
| @Deprecated | ||
| @NotNull | ||
| + @Deprecated // Paper | ||
| Objective registerNewObjective(@NotNull String name, @NotNull String criteria, @NotNull String displayName, @NotNull RenderType renderType); | ||
|
|
||
| /** | ||
| @@ -70,8 +137,10 @@ public interface Scoreboard { | ||
| @@ -72,8 +139,10 @@ public interface Scoreboard { | ||
| * characters. | ||
| * @throws IllegalArgumentException if an objective by that name already | ||
| * exists | ||
|
|
@@ -5138,7 +5140,7 @@ index 083bb2c92a2c557e10b705b773ced97401586c3c..d5723e977d9a25701a4f387f1b26d241 | |
| Objective registerNewObjective(@NotNull String name, @NotNull Criteria criteria, @NotNull String displayName); | ||
|
|
||
| /** | ||
| @@ -86,8 +155,10 @@ public interface Scoreboard { | ||
| @@ -88,8 +157,10 @@ public interface Scoreboard { | ||
| * characters. | ||
| * @throws IllegalArgumentException if an objective by that name already | ||
| * exists | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.