Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-18 08:57:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated Upstream (Paper)

Browse Source 
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@afe633d convert API/server tests to mockito (#8848)
PaperMC/Paper@03a4e7a Updated Upstream (Bukkit/CraftBukkit) (#8832)
PaperMC/Paper@5c87711 Make sure Registry is loaded after Bukkit.setServer() (#8853)
This commit is contained in:
granny
2023-02-15 18:34:28 -08:00
parent 08aa4dccaa
commit c795c61137
14 changed files with 52 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
patches/server/0295-Language-API.patch
View File

@@ -5,31 +5,23 @@ Subject: [PATCH] Language API
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 0f0a1c1730cdcddc05b0d04411d79c54741a6b45..4a8aafd341fdad4b5ae326c4759b3381f5061fb5 100644
index 72d9726ac8d06502f6123aea039e026ad6529661..c32e32005968b46d1f7d5162ab15c61e36f398f5 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -251,6 +251,7 @@ import org.bukkit.scoreboard.Criteria;
import org.bukkit.structure.StructureManager;
import org.bukkit.util.StringUtil;
import org.bukkit.util.permissions.DefaultPermissions;
+import org.jetbrains.annotations.NotNull;
import org.yaml.snakeyaml.Yaml;
import org.yaml.snakeyaml.constructor.SafeConstructor;
import org.yaml.snakeyaml.error.MarkedYAMLException;
@@ -320,6 +321,20 @@ public final class CraftServer implements Server {
this.structureManager = new CraftStructureManager(console.getStructureManager());
@@ -321,6 +321,20 @@ public final class CraftServer implements Server {
Bukkit.setServer(this);
io.papermc.paper.world.structure.PaperConfiguredStructure.init(); // Paper
+ // Purpur start
+ org.purpurmc.purpur.language.Language.setLanguage(new org.purpurmc.purpur.language.Language() {
+ private net.minecraft.locale.Language language = net.minecraft.locale.Language.getInstance();
+ @Override
+ public boolean has(@NotNull String key) {
+ public boolean has(@org.jetbrains.annotations.NotNull String key) {
+ return language.has(key);
+ }
+
+ @Override
+ public @NotNull String getOrDefault(@NotNull String key) {
+ public @org.jetbrains.annotations.NotNull String getOrDefault(@org.jetbrains.annotations.NotNull String key) {
+ return language.getOrDefault(key);
+ }
+ });