1.20.4 NeoForge networking fixes (#729)

* Update NeoForge * Localize the NeoForge networking errors * Fix Open Book message on NeoForge disconnecting players
VazkiiMods · Feb 26, 2024 · b328454 · b328454
1 parent 0e43b26
commit b328454
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 5 deletions.
diff --git a/NeoForge/build.gradle b/NeoForge/build.gradle
@@ -37,7 +37,7 @@ runs {
 }
 
 dependencies {
-    implementation "net.neoforged:neoforge:20.4.124-beta"
+    implementation "net.neoforged:neoforge:20.4.173"
     implementation project(":Xplat")
 
     compileOnly "mezz.jei:jei-1.20.4-common-api:17.0.0.30"

diff --git a/NeoForge/src/main/java/vazkii/patchouli/neoforge/network/NeoForgeMessageOpenBookGui.java b/NeoForge/src/main/java/vazkii/patchouli/neoforge/network/NeoForgeMessageOpenBookGui.java
@@ -14,7 +14,12 @@ public record NeoForgeMessageOpenBookGui(ResourceLocation book, @Nullable Resour
 	public static final ResourceLocation ID = new ResourceLocation(PatchouliAPI.MOD_ID, "open_book");
 
 	public NeoForgeMessageOpenBookGui(FriendlyByteBuf buf) {
-		this(buf.readResourceLocation(), ResourceLocation.tryParse(buf.readUtf()), buf.readVarInt());
+		this(buf.readResourceLocation(), getEntry(buf), buf.readVarInt());
+	}
+
+	private static ResourceLocation getEntry(FriendlyByteBuf buf) {
+		String entry = buf.readUtf();
+		return entry.isEmpty() ? null : new ResourceLocation(entry);
 	}
 
 	public void write(FriendlyByteBuf buf) {

diff --git a/...src/main/java/vazkii/patchouli/neoforge/network/handler/NeoForgeClientPayloadHandler.java b/...src/main/java/vazkii/patchouli/neoforge/network/handler/NeoForgeClientPayloadHandler.java
@@ -20,7 +20,7 @@ public void handleData(final NeoForgeMessageOpenBookGui data, final PlayPayloadC
 		})
 				.exceptionally(e -> {
 					// Handle exception
-					context.packetHandler().disconnect(Component.translatable("patchouli.networking.failed", e.getMessage()));
+					context.packetHandler().disconnect(Component.translatable("patchouli.networking.open_book.failed", e.getMessage()));
 					return null;
 				});
 	}
@@ -31,7 +31,7 @@ public void handleData(final NeoForgeMessageReloadBookContents data, final PlayP
 		})
 				.exceptionally(e -> {
 					// Handle exception
-					context.packetHandler().disconnect(Component.translatable("patchouli.networking.failed", e.getMessage()));
+					context.packetHandler().disconnect(Component.translatable("patchouli.networking.reload_contents.failed", e.getMessage()));
 					return null;
 				});
 	}

diff --git a/Xplat/src/main/resources/assets/patchouli/lang/en_us.json b/Xplat/src/main/resources/assets/patchouli/lang/en_us.json
@@ -97,5 +97,8 @@
 	"patchouli.gui.lexicon.button.visualize.info": "(Click again to clear)",
 	"patchouli.gui.lexicon.button.history": "History",
 	"patchouli.gui.lexicon.button.mark_all_read": "Mark all as read",
-	"patchouli.gui.lexicon.button.mark_category_read": "Mark this category as read"
+	"patchouli.gui.lexicon.button.mark_category_read": "Mark this category as read",
+
+	"patchouli.networking.open_book.failed": "Failed to open book %s",
+	"patchouli.networking.reload_contents.invalid": "Failed to reload contents %S"
 }