Fix display name breaking if some mod accesses it too early

Patbox · Oct 17, 2022 · 78dd71d · 78dd71d
1 parent a7c632f
commit 78dd71d
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 5 deletions.
diff --git a/build.gradle b/build.gradle
@@ -35,10 +35,10 @@ dependencies {
 	modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
 
 	//modCompileOnly "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
-	//modLocalRuntime("net.fabricmc.fabric-api:fabric-api:${project.fabric_version}")
+	modLocalRuntime("net.fabricmc.fabric-api:fabric-api:${project.fabric_version}")
 
 	modCompileOnly fabricApi.module("fabric-api-base", project.fabric_version)
-	modLocalRuntime fabricApi.module("fabric-api-base", project.fabric_version)
+	//modLocalRuntime fabricApi.module("fabric-api-base", project.fabric_version)
 
 	modCompileOnly fabricApi.module("fabric-message-api-v1", project.fabric_version)
 

diff --git a/gradle.properties b/gradle.properties
@@ -11,7 +11,7 @@ loader_version=0.14.8
 fabric_version=0.59.0+1.19.2
 
 # Mod Properties
-	mod_version = 2.0.0+1.19.2
+	mod_version = 2.0.1+1.19.2
 	maven_group = eu.pb4
 	archives_base_name = styled-chat
 

diff --git a/src/main/java/eu/pb4/styledchat/StyledChatUtils.java b/src/main/java/eu/pb4/styledchat/StyledChatUtils.java
@@ -489,11 +489,17 @@ public static void sendAutocompliton(ServerPlayerEntity player) {
     }
 
     public static ChatStyle getPersonalStyle(ServerPlayerEntity player) {
-        return ((ExtPlayNetworkHandler) player.networkHandler).styledChat$getStyle();
+        if (player.networkHandler != null) {
+            return ((ExtPlayNetworkHandler) player.networkHandler).styledChat$getStyle();
+        } else {
+            return ChatStyle.EMPTY;
+        }
     }
 
     public static void updateStyle(ServerPlayerEntity player) {
-        ((ExtPlayNetworkHandler) player.networkHandler).styledChat$setStyle(createStyleOf(player));
+        if (player.networkHandler != null) {
+            ((ExtPlayNetworkHandler) player.networkHandler).styledChat$setStyle(createStyleOf(player));
+        }
     }
 
     @Nullable

diff --git a/src/main/java/eu/pb4/styledchat/config/ChatStyle.java b/src/main/java/eu/pb4/styledchat/config/ChatStyle.java
@@ -24,6 +24,7 @@
 import java.util.Map;
 
 public class ChatStyle {
+    public static final ChatStyle EMPTY = new ChatStyle(new ChatStyleData());
     public final MinecraftPredicate require;
 
     public final TextNode displayName;