From 9f20e7a17453652fe6b88dd119f66322907f29e3 Mon Sep 17 00:00:00 2001
From: Mike Primm <mike@primmhome.com>
Date: Tue, 7 Jun 2022 19:29:41 -0500
Subject: [PATCH] Bandaid compile errors in Fabric 1.19 code

---
 bukkit-helper/.project                        | 37 ++++++++++---------
 .../org/dynmap/fabric_1_19/FabricServer.java  |  4 +-
 .../mixin/ServerPlayNetworkHandlerMixin.java  |  5 +--
 3 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/bukkit-helper/.project b/bukkit-helper/.project
index e86ee638..b372cd57 100644
--- a/bukkit-helper/.project
+++ b/bukkit-helper/.project
@@ -2,32 +2,35 @@
 <projectDescription>
 	<name>Dynmap(Spigot-Common)</name>
 	<comment>bukkit-helper</comment>
-	<projects/>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
 	<natures>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
 	</natures>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments/>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
-			<arguments/>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments/>
-		</buildCommand>
-	</buildSpec>
-	<linkedResources/>
 	<filteredResources>
 		<filter>
 			<id>1</id>
+			<name></name>
 			<type>30</type>
-			<name/>
 			<matcher>
 				<id>org.eclipse.core.resources.regexFilterMatcher</id>
 				<arguments>node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
diff --git a/fabric-1.19/src/main/java/org/dynmap/fabric_1_19/FabricServer.java b/fabric-1.19/src/main/java/org/dynmap/fabric_1_19/FabricServer.java
index f6a84c41..645dd540 100644
--- a/fabric-1.19/src/main/java/org/dynmap/fabric_1_19/FabricServer.java
+++ b/fabric-1.19/src/main/java/org/dynmap/fabric_1_19/FabricServer.java
@@ -6,7 +6,7 @@ import net.fabricmc.loader.api.ModContainer;
 import net.minecraft.block.AbstractSignBlock;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
-import net.minecraft.network.MessageType;
+import net.minecraft.network.message.MessageType;
 import net.minecraft.server.BannedIpList;
 import net.minecraft.server.BannedPlayerList;
 import net.minecraft.server.MinecraftServer;
@@ -21,9 +21,9 @@ import net.minecraft.util.registry.Registry;
 import net.minecraft.world.World;
 import net.minecraft.world.biome.Biome;
 import org.dynmap.DynmapChunk;
-import org.dynmap.DynmapCommonAPIListener;
 import org.dynmap.DynmapWorld;
 import org.dynmap.Log;
+import org.dynmap.DynmapCommonAPIListener;
 import org.dynmap.common.BiomeMap;
 import org.dynmap.common.DynmapListenerManager;
 import org.dynmap.common.DynmapPlayer;
diff --git a/fabric-1.19/src/main/java/org/dynmap/fabric_1_19/mixin/ServerPlayNetworkHandlerMixin.java b/fabric-1.19/src/main/java/org/dynmap/fabric_1_19/mixin/ServerPlayNetworkHandlerMixin.java
index 89afc9bc..cabe6a5a 100644
--- a/fabric-1.19/src/main/java/org/dynmap/fabric_1_19/mixin/ServerPlayNetworkHandlerMixin.java
+++ b/fabric-1.19/src/main/java/org/dynmap/fabric_1_19/mixin/ServerPlayNetworkHandlerMixin.java
@@ -3,8 +3,7 @@ package org.dynmap.fabric_1_19.mixin;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.entity.BlockEntity;
 import net.minecraft.block.entity.SignBlockEntity;
-import net.minecraft.network.MessageType;
-import net.minecraft.network.encryption.SignedChatMessage;
+import net.minecraft.network.message.SignedMessage;
 import net.minecraft.network.packet.c2s.play.UpdateSignC2SPacket;
 import net.minecraft.server.filter.FilteredMessage;
 import net.minecraft.server.filter.TextStream;
@@ -40,7 +39,7 @@ public abstract class ServerPlayNetworkHandlerMixin {
                     shift = At.Shift.BEFORE
             )
     )
-    public void onGameMessage(FilteredMessage<SignedChatMessage> message, CallbackInfo ci) {
+    public void onGameMessage(FilteredMessage<SignedMessage> message, CallbackInfo ci) {
         ServerChatEvents.EVENT.invoker().onChatMessage(player, message.raw().getContent().getString());
     }