2020-08-11 19:20:44 +00:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
From: MeFisto94 <MeFisto94@users.noreply.github.com>
|
|
|
|
Date: Tue, 11 Aug 2020 19:17:46 +0200
|
|
|
|
Subject: [PATCH] Add a way to get translation keys for blocks, entities and
|
|
|
|
materials
|
|
|
|
|
|
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/Material.java b/src/main/java/org/bukkit/Material.java
|
2021-02-21 20:55:01 +00:00
|
|
|
index 2e959d195f7a5e723952e421aeaeeb463f07d3f5..2a3becabbd10fa8ffd19f35a3f6d8a6bfcb388c3 100644
|
2020-08-11 19:20:44 +00:00
|
|
|
--- a/src/main/java/org/bukkit/Material.java
|
|
|
|
+++ b/src/main/java/org/bukkit/Material.java
|
2021-02-21 20:55:01 +00:00
|
|
|
@@ -3577,6 +3577,16 @@ public enum Material implements Keyed {
|
2020-08-11 19:20:44 +00:00
|
|
|
}
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * Return the translation key for the Material, so the client can translate it into the active
|
|
|
|
+ * locale when using a TranslatableComponent.
|
|
|
|
+ * @return the translation key
|
|
|
|
+ */
|
|
|
|
+ @NotNull
|
|
|
|
+ public String getTranslationKey() {
|
|
|
|
+ return Bukkit.getUnsafe().getTranslationKey(this);
|
|
|
|
+ }
|
|
|
|
// Paper end
|
|
|
|
|
|
|
|
/**
|
|
|
|
diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java
|
2021-03-09 01:11:17 +00:00
|
|
|
index b824a1b0590014d428e64f789008454bd241996a..23d0798d479fc3dd9cc4c41f7999a889987b9ab0 100644
|
2020-08-11 19:20:44 +00:00
|
|
|
--- a/src/main/java/org/bukkit/UnsafeValues.java
|
|
|
|
+++ b/src/main/java/org/bukkit/UnsafeValues.java
|
2021-03-09 01:11:17 +00:00
|
|
|
@@ -95,5 +95,27 @@ public interface UnsafeValues {
|
2020-08-11 19:20:44 +00:00
|
|
|
byte[] serializeItem(ItemStack item);
|
|
|
|
|
|
|
|
ItemStack deserializeItem(byte[] data);
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * Return the translation key for the Material, so the client can translate it into the active
|
|
|
|
+ * locale when using a TranslatableComponent.
|
|
|
|
+ * @return the translation key
|
|
|
|
+ */
|
|
|
|
+ String getTranslationKey(Material mat);
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * Return the translation key for the Block, so the client can translate it into the active
|
|
|
|
+ * locale when using a TranslatableComponent.
|
|
|
|
+ * @return the translation key
|
|
|
|
+ */
|
|
|
|
+ String getTranslationKey(org.bukkit.block.Block block);
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * Return the translation key for the EntityType, so the client can translate it into the active
|
|
|
|
+ * locale when using a TranslatableComponent.<br>
|
|
|
|
+ * This is <code>null</code>, when the EntityType isn't known to NMS (custom entities)
|
|
|
|
+ * @return the translation key
|
|
|
|
+ */
|
|
|
|
+ String getTranslationKey(org.bukkit.entity.EntityType type);
|
|
|
|
// Paper end
|
|
|
|
}
|
|
|
|
diff --git a/src/main/java/org/bukkit/block/Block.java b/src/main/java/org/bukkit/block/Block.java
|
|
|
|
index f8c599718143fe638de422fd4625f353ee6c54ae..7616c5601adee3cbe0e5f722646a2458b535ab77 100644
|
|
|
|
--- a/src/main/java/org/bukkit/block/Block.java
|
|
|
|
+++ b/src/main/java/org/bukkit/block/Block.java
|
|
|
|
@@ -573,5 +573,13 @@ public interface Block extends Metadatable {
|
|
|
|
*/
|
|
|
|
@NotNull
|
|
|
|
com.destroystokyo.paper.block.BlockSoundGroup getSoundGroup();
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * Return the translation key for the Block, so the client can translate it into the active
|
|
|
|
+ * locale when using a TranslatableComponent.
|
|
|
|
+ * @return the translation key
|
|
|
|
+ */
|
|
|
|
+ @NotNull
|
|
|
|
+ String getTranslationKey();
|
|
|
|
// Paper end
|
|
|
|
}
|
|
|
|
diff --git a/src/main/java/org/bukkit/entity/EntityType.java b/src/main/java/org/bukkit/entity/EntityType.java
|
|
|
|
index 774363a8186b3861f10c0452ac63726cae365169..692b75eb78405874077c850bfc72e247ccc80860 100644
|
|
|
|
--- a/src/main/java/org/bukkit/entity/EntityType.java
|
|
|
|
+++ b/src/main/java/org/bukkit/entity/EntityType.java
|
|
|
|
@@ -414,4 +414,15 @@ public enum EntityType implements Keyed {
|
|
|
|
public boolean isAlive() {
|
|
|
|
return living;
|
|
|
|
}
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * Return the translation key for the EntityType, so the client can translate it into the active
|
|
|
|
+ * locale when using a TranslatableComponent.<br>
|
|
|
|
+ * This is <code>null</code>, when the EntityType isn't known to NMS (custom entities)
|
|
|
|
+ * @return the translation key
|
|
|
|
+ */
|
|
|
|
+ @Nullable
|
|
|
|
+ String getTranslationKey() {
|
|
|
|
+ return org.bukkit.Bukkit.getUnsafe().getTranslationKey(this);
|
|
|
|
+ }
|
|
|
|
}
|