aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/api/0202-Add-methods-to-get-translation-keys.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/api/0202-Add-methods-to-get-translation-keys.patch')
-rw-r--r--patches/api/0202-Add-methods-to-get-translation-keys.patch30
1 files changed, 15 insertions, 15 deletions
diff --git a/patches/api/0202-Add-methods-to-get-translation-keys.patch b/patches/api/0202-Add-methods-to-get-translation-keys.patch
index 47ea45569b..9428781d37 100644
--- a/patches/api/0202-Add-methods-to-get-translation-keys.patch
+++ b/patches/api/0202-Add-methods-to-get-translation-keys.patch
@@ -144,10 +144,10 @@ index b3211a705acc26449675727823aa42ae6bacac4f..8b6584fae0a9d5cccbe350d889fa8b4a
+ // Paper end
}
diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java
-index 3913d0392131375d3e3b34c9da3dbbb341c8eb3b..5f10237b57909d8e457f831392a1629f9854987f 100644
+index fe63fef02ee208a5fc52d30a27519a0506c58f8c..8509519ec0d5509f45e43f28b5bb55d953cebb14 100644
--- a/src/main/java/org/bukkit/Material.java
+++ b/src/main/java/org/bukkit/Material.java
-@@ -135,7 +135,7 @@ import org.jetbrains.annotations.Nullable;
+@@ -136,7 +136,7 @@ import org.jetbrains.annotations.Nullable;
* An enum of all material IDs accepted by the official server and client
*/
@SuppressWarnings({"DeprecatedIsStillUsed", "deprecation"}) // Paper
@@ -156,7 +156,7 @@ index 3913d0392131375d3e3b34c9da3dbbb341c8eb3b..5f10237b57909d8e457f831392a1629f
//<editor-fold desc="Materials" defaultstate="collapsed">
AIR(9648, 0),
STONE(22948),
-@@ -4863,6 +4863,17 @@ public enum Material implements Keyed, Translatable {
+@@ -4834,6 +4834,17 @@ public enum Material implements Keyed, Translatable {
}
// Paper end
@@ -174,7 +174,7 @@ index 3913d0392131375d3e3b34c9da3dbbb341c8eb3b..5f10237b57909d8e457f831392a1629f
/**
* Do not use for any reason.
*
-@@ -5612,9 +5623,11 @@ public enum Material implements Keyed, Translatable {
+@@ -5583,9 +5594,11 @@ public enum Material implements Keyed, Translatable {
* material
* @see #getBlockTranslationKey()
* @see #getItemTranslationKey()
@@ -251,10 +251,10 @@ index 951c23491390c2c8693d415598ef2de712189220..21f9998b472dc18eb308554f5cdf467f
/**
* Maximum health of an Entity.
diff --git a/src/main/java/org/bukkit/block/Biome.java b/src/main/java/org/bukkit/block/Biome.java
-index f46932a12f46895ae10b63f7fbb54750da1bd2ba..b352886e697a1c9869226b583da5240592575064 100644
+index f04aa0300b240f78b56c389fb2851aa4d16fc724..739fef949defca7b6bf4e6b3e079446c24d9b34c 100644
--- a/src/main/java/org/bukkit/block/Biome.java
+++ b/src/main/java/org/bukkit/block/Biome.java
-@@ -22,7 +22,7 @@ import org.jetbrains.annotations.NotNull;
+@@ -20,7 +20,7 @@ import org.jetbrains.annotations.NotNull;
* There may be additional biomes present in the server, for example from a {@link DataPack}
* which can be accessed via {@link Registry#BIOME}.
*/
@@ -263,7 +263,7 @@ index f46932a12f46895ae10b63f7fbb54750da1bd2ba..b352886e697a1c9869226b583da52405
Biome OCEAN = getBiome("ocean");
Biome PLAINS = getBiome("plains");
-@@ -131,4 +131,11 @@ public interface Biome extends OldEnum<Biome>, Keyed {
+@@ -127,4 +127,11 @@ public interface Biome extends OldEnum<Biome>, Keyed {
static Biome[] values() {
return Lists.newArrayList(Registry.BIOME).toArray(new Biome[0]);
}
@@ -302,7 +302,7 @@ index 4e79dc21824e4b1f286c344b0733057be27fb6c5..afed7dfcbc878c19d3821dde77d6ade0
// Paper end
}
diff --git a/src/main/java/org/bukkit/block/BlockType.java b/src/main/java/org/bukkit/block/BlockType.java
-index f5b047345639cf8e55354cc514d18fd80ff1b712..1b026f88d3c231ca38dbe0c1b86124c1e8e2f8cf 100644
+index 95eb7d7718a74382289ac3a7b2d5fac4c9ec19a2..f0c3343e2006f244bb1f99c269bcbaa357feb25f 100644
--- a/src/main/java/org/bukkit/block/BlockType.java
+++ b/src/main/java/org/bukkit/block/BlockType.java
@@ -129,7 +129,7 @@ import org.jetbrains.annotations.Nullable;
@@ -314,7 +314,7 @@ index f5b047345639cf8e55354cc514d18fd80ff1b712..1b026f88d3c231ca38dbe0c1b86124c1
/**
* Typed represents a subtype of {@link BlockType}s that have a known block
-@@ -3641,4 +3641,13 @@ public interface BlockType extends Keyed, Translatable {
+@@ -3616,4 +3616,13 @@ public interface BlockType extends Keyed, Translatable {
@Nullable
@Deprecated(since = "1.20.6")
Material asMaterial();
@@ -374,10 +374,10 @@ index 865ab3d2015e114d3cac72e0e26e4086a3913b38..f4422da4ebb0dc6551305f3e8468817e
// Paper end
}
diff --git a/src/main/java/org/bukkit/entity/EntityType.java b/src/main/java/org/bukkit/entity/EntityType.java
-index 122ee01c4664617bb1b691d5ff24427abdbedcf2..5f06ccac0983dacd6a8c54b073c2dc786b373366 100644
+index dc944ad75f04f5d2f72639615f64b5bb2d1b4117..459af298c4e149c3c96cca088f6a3d0db1cf6192 100644
--- a/src/main/java/org/bukkit/entity/EntityType.java
+++ b/src/main/java/org/bukkit/entity/EntityType.java
-@@ -45,7 +45,7 @@ import org.jetbrains.annotations.Contract;
+@@ -43,7 +43,7 @@ import org.jetbrains.annotations.Contract;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -386,7 +386,7 @@ index 122ee01c4664617bb1b691d5ff24427abdbedcf2..5f06ccac0983dacd6a8c54b073c2dc78
// These strings MUST match the strings in nms.EntityTypes and are case sensitive.
/**
-@@ -474,10 +474,22 @@ public enum EntityType implements Keyed, Translatable {
+@@ -463,10 +463,22 @@ public enum EntityType implements Keyed, Translatable {
@Override
@NotNull
@@ -554,10 +554,10 @@ index a919d50b31ed48a43bc47596eae44b3d05a417ee..665fe4b551abcd33a4c9bab69746200c
// Paper end
}
diff --git a/src/main/java/org/bukkit/inventory/ItemType.java b/src/main/java/org/bukkit/inventory/ItemType.java
-index 3ca11be42a07466ab96bff304dc90cf73cbf1f0d..767f7a1912743133d1a5d98783260a2ff51f99c6 100644
+index 71c4f2cbf8310941b316357d0c799b1e31418d0f..ab5d544942b7a5387998353614a33ca692edb50e 100644
--- a/src/main/java/org/bukkit/inventory/ItemType.java
+++ b/src/main/java/org/bukkit/inventory/ItemType.java
-@@ -48,7 +48,7 @@ import org.jetbrains.annotations.Nullable;
+@@ -47,7 +47,7 @@ import org.jetbrains.annotations.Nullable;
* changes may occur. Do not use this API in plugins.
*/
@ApiStatus.Internal
@@ -566,7 +566,7 @@ index 3ca11be42a07466ab96bff304dc90cf73cbf1f0d..767f7a1912743133d1a5d98783260a2f
/**
* Typed represents a subtype of {@link ItemType}s that have a known item meta type
-@@ -2448,4 +2448,13 @@ public interface ItemType extends Keyed, Translatable {
+@@ -2409,4 +2409,13 @@ public interface ItemType extends Keyed, Translatable {
@Nullable
@Deprecated(since = "1.20.6")
Material asMaterial();