Update Forge version for language fix

EngineHub · Jun 27, 2020 · 89b3d91 · 89b3d91
1 parent 66047ad
commit 89b3d91
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/util/formatting/component/TextUtils.java b/worldedit-core/src/main/java/com/sk89q/worldedit/util/formatting/component/TextUtils.java
@@ -55,6 +55,9 @@ public static Component join(List<Component> components, Component joiner) {
      * @return A Java locale
      */
     public static Locale getLocaleByMinecraftTag(String locale) {
+        if (locale == null) {
+            return Locale.US;
+        }
         return Locale.forLanguageTag(locale.replace('_', '-'));
     }
 }
diff --git a/worldedit-forge/build.gradle.kts b/worldedit-forge/build.gradle.kts
@@ -16,7 +16,7 @@ val nextMajorMinecraftVersion: String = minecraftVersion.split('.').let { (usele
     "$useless.${major.toInt() + 1}"
 }
 val mappingsMinecraftVersion = "1.16"
-val forgeVersion = "32.0.6"
+val forgeVersion = "32.0.23"
 
 configurations.all {
     resolutionStrategy {

diff --git a/worldedit-forge/src/main/java/com/sk89q/worldedit/forge/ForgePlayer.java b/worldedit-forge/src/main/java/com/sk89q/worldedit/forge/ForgePlayer.java
@@ -34,6 +34,7 @@
 import com.sk89q.worldedit.util.HandSide;
 import com.sk89q.worldedit.util.Location;
 import com.sk89q.worldedit.util.formatting.WorldEditText;
+import com.sk89q.worldedit.util.formatting.component.TextUtils;
 import com.sk89q.worldedit.util.formatting.text.Component;
 import com.sk89q.worldedit.util.formatting.text.serializer.gson.GsonComponentSerializer;
 import com.sk89q.worldedit.world.World;
@@ -212,8 +213,7 @@ public void setFlying(boolean flying) {
 
     @Override
     public Locale getLocale() {
-        // TODO wait for upstream fix
-        return Locale.ENGLISH; //TextUtils.getLocaleByMinecraftTag(player.language);
+        return TextUtils.getLocaleByMinecraftTag(player.getLanguage());
     }
 
     @Override