1.19.2 Version!

.gitignore

@@ -2,3 +2,8 @@
 *.iml
 /mapsync/
 /data/
+.vscode/
+**/.factorypath
+server/package-lock.json
+server/yarn.lock
+

.vscode/launch.json

@@ -0,0 +1,16 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+
+
+        {
+            "type": "java",
+            "name": "Current File",
+            "request": "launch",
+            "mainClass": "${file}"
+        }
+    ]
+}

.vscode/settings.json

@@ -0,0 +1,4 @@
+{
+    "java.compile.nullAnalysis.mode": "automatic",
+    "java.configuration.updateBuildConfiguration": "interactive"
+}

mod/common/src/main/java/gjum/minecraft/mapsync/common/MapSyncMod.java

@@ -9,6 +9,7 @@
 import net.minecraft.client.KeyMapping;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.multiplayer.ServerData;
+import net.minecraft.client.server.IntegratedServer;
 import net.minecraft.network.protocol.game.ClientboundLoginPacket;
 import net.minecraft.network.protocol.game.ClientboundRespawnPacket;
 import org.apache.logging.log4j.LogManager;
@@ -37,7 +38,7 @@ public static MapSyncMod getMod() {
 		return INSTANCE;
 	}
 
-	private static final KeyMapping openGuiKey = new KeyMapping(
+	public static final KeyMapping openGuiKey = new KeyMapping(
 			"key.map-sync.openGui",
 			InputConstants.Type.KEYSYM,
 			GLFW.GLFW_KEY_COMMA,
@@ -101,7 +102,8 @@ public void handleRespawn(ClientboundRespawnPacket packet) {
 	 * only null when not connected to a server
 	 */
 	public @Nullable ServerConfig getServerConfig() {
-		final ServerData currentServer = Minecraft.getInstance().getCurrentServer();
+		final Minecraft instance = Minecraft.getInstance();
+		final ServerData currentServer = instance.getCurrentServer();
 		if (currentServer == null) {
 			serverConfig = null;
 			return null;

mod/common/src/main/java/gjum/minecraft/mapsync/common/ModGui.java

@@ -6,7 +6,7 @@
 import net.minecraft.client.gui.components.Button;
 import net.minecraft.client.gui.components.EditBox;
 import net.minecraft.client.gui.screens.Screen;
-import net.minecraft.network.chat.TextComponent;
+import net.minecraft.network.chat.Component;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.List;
@@ -27,7 +27,7 @@ public class ModGui extends Screen {
 	Button syncServerConnectBtn;
 
 	public ModGui(Screen parentScreen) {
-		super(new TextComponent("Map-Sync"));
+		super(Component.literal("Map-Sync"));
 		this.parentScreen = parentScreen;
 	}
 
@@ -50,15 +50,17 @@ protected void init() {
 					right - 100,
 					top,
 					100, 20,
-					new TextComponent("Close"),
+					Component.literal("Close"),
 					button -> minecraft.setScreen(parentScreen)));
+
+			final Minecraft gameInstance = Minecraft.getInstance();
 
-			if (serverConfig != null) {
+			if (serverConfig != null && !gameInstance.isLocalServer()) {
 				addWidget(syncServerAddressField = new EditBox(font,
 						left,
 						top + 40,
 						innerWidth - 110, 20,
-						new TextComponent("Sync Server Address")));
+						Component.literal("Sync Server Address")));
 				syncServerAddressField.setMaxLength(256);
 				syncServerAddressField.setValue(String.join(" ",
 						serverConfig.getSyncServerAddresses()));
@@ -67,7 +69,7 @@ protected void init() {
 						right - 100,
 						top + 40,
 						100, 20,
-						new TextComponent("Connect"),
+						Component.literal("Connect"),
 						this::connectClicked));
 			}
 		} catch (Throwable e) {
@@ -91,12 +93,18 @@ public void connectClicked(Button btn) {
 	@Override
 	public void render(@NotNull PoseStack poseStack, int i, int j, float f) {
 		try {
+			renderBackground(poseStack);
+			drawCenteredString(poseStack, font, title, width / 2, top, 0xFFFFFF);
+
+			 Minecraft gameInstance = Minecraft.getInstance();
+			 if (gameInstance.isLocalServer()) {
+				drawCenteredString(poseStack, font, "Map-Sync only runs with proper servers!", width/2, 2 * top, 0xFFFFFF);
+				return;
+			 }
+
 			// wait for init() to finish
 			if (syncServerAddressField == null) return;
 			if (syncServerConnectBtn == null) return;
-
-			renderBackground(poseStack);
-			drawCenteredString(poseStack, font, title, width / 2, top, 0xFFFFFF);
 			syncServerAddressField.render(poseStack, i, j, f);
 
 			var dimensionState = getMod().getDimensionState();

mod/common/src/main/java/gjum/minecraft/mapsync/common/mixins/MixinClientPacketListener.java

@@ -68,14 +68,16 @@ protected void onHandleBlockDestruction(ClientboundBlockDestructionPacket packet
 		}
 	}
 
-	@Inject(method = "handleBlockBreakAck", at = @At("RETURN"))
-	protected void onHandleBlockBreakAck(ClientboundBlockBreakAckPacket packet, CallbackInfo ci) {
+	@Inject(method = "handleBlockChangedAck", at = @At("RETURN"))
+	protected void onHandleBlockChangedAck(ClientboundBlockChangedAckPacket packet, CallbackInfo ci) {
+		return;
+		/* It seems like 1.19 cannot figure the fuck out what this event is??? 	
 		if (!Minecraft.getInstance().isSameThread()) return; // will be called again on mc thread in a moment
 		try {
 			BlockPos pos = packet.pos();
 			getMod().handleMcChunkPartialChange(pos.getX() >> 4, pos.getZ() >> 4);
 		} catch (Throwable e) {
 			printErrorRateLimited(e);
-		}
+		}*/
 	}
 }

mod/common/src/main/java/gjum/minecraft/mapsync/common/net/SyncClient.java

@@ -23,8 +23,11 @@
 import org.jetbrains.annotations.Nullable;
 
 import javax.crypto.*;
+import javax.crypto.spec.OAEPParameterSpec;
+import javax.crypto.spec.PSource;
 import javax.crypto.spec.SecretKeySpec;
 import java.security.*;
+import java.security.spec.MGF1ParameterSpec;
 import java.util.*;
 import java.util.concurrent.ThreadLocalRandom;
 import java.util.concurrent.TimeUnit;
@@ -267,7 +270,7 @@ void setUpEncryption(ChannelHandlerContext ctx, ClientboundEncryptionRequestPack
 						encrypt(packet.publicKey, sharedSecret),
 						encrypt(packet.publicKey, packet.verifyToken)));
 			} catch (NoSuchAlgorithmException | InvalidKeyException | NoSuchPaddingException | BadPaddingException |
-			         IllegalBlockSizeException e) {
+			         IllegalBlockSizeException | InvalidAlgorithmParameterException e) {
 				shutDown();
 				throw new RuntimeException(e);
 			}
@@ -283,9 +286,11 @@ void setUpEncryption(ChannelHandlerContext ctx, ClientboundEncryptionRequestPack
 		}
 	}
 
-	private static byte[] encrypt(PublicKey key, byte[] data) throws NoSuchPaddingException, NoSuchAlgorithmException, BadPaddingException, IllegalBlockSizeException, InvalidKeyException {
-		Cipher cipher = Cipher.getInstance("RSA/ECB/PKCS1Padding");
-		cipher.init(Cipher.ENCRYPT_MODE, key);
+	private static byte[] encrypt(PublicKey key, byte[] data) throws NoSuchPaddingException, NoSuchAlgorithmException, BadPaddingException, IllegalBlockSizeException, InvalidKeyException, InvalidAlgorithmParameterException {
+		Cipher cipher = Cipher.getInstance("RSA/NONE/OAEPPadding"); // RSA_PKCS1_PADDING is no longer supported for private decryption
+		// https://docs.openssl.org/master/man3/RSA_public_encrypt/#description
+		OAEPParameterSpec oaepParams = new OAEPParameterSpec("SHA-1", "MGF1", new MGF1ParameterSpec("SHA-1"), PSource.PSpecified.DEFAULT);
+		cipher.init(Cipher.ENCRYPT_MODE, key, oaepParams);
 		return cipher.doFinal(data);
 	}
 }

mod/forge/src/main/java/gjum/minecraft/mapsync/forge/ForgeMapSyncMod.java

@@ -3,8 +3,8 @@
 import gjum.minecraft.mapsync.common.MapSyncMod;
 import gjum.minecraft.mapsync.common.ModGui;
 import net.minecraft.client.KeyMapping;
-import net.minecraftforge.client.ClientRegistry;
-import net.minecraftforge.client.ConfigGuiHandler;
+import net.minecraftforge.client.ConfigScreenHandler;
+import net.minecraftforge.client.event.RegisterKeyMappingsEvent;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.event.TickEvent;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
@@ -36,8 +36,8 @@ public void clientSetup(FMLClientSetupEvent event) {
 
 		// Register hook for the mod list
 		ModLoadingContext.get().registerExtensionPoint(
-				ConfigGuiHandler.ConfigGuiFactory.class,
-				() -> new ConfigGuiHandler.ConfigGuiFactory(
+				ConfigScreenHandler.ConfigScreenFactory.class,
+				() -> new ConfigScreenHandler.ConfigScreenFactory(
 						(minecraft, previousScreen) -> new ModGui(previousScreen)
 				)
 		);
@@ -56,6 +56,12 @@ public void onClientTick(TickEvent.ClientTickEvent event) {
 
 	@Override
 	public void registerKeyBinding(KeyMapping mapping) {
-		ClientRegistry.registerKeyBinding(mapping);
+		return;
+		// ClientRegistry.registerKeyBinding(mapping);
+	}
+
+	@SubscribeEvent
+	 public static void registerKeyMappingsEvent(RegisterKeyMappingsEvent event) {
+		event.register(ForgeMapSyncMod.openGuiKey);
 	}
 }

mod/gradle.properties

@@ -2,7 +2,7 @@ org.gradle.jvmargs=-Xmx2048M
 
 archives_base_name=MapSync
 maven_group=gjum.minecraft.mapsync
-mod_version=2.0.1-1.18.2
+mod_version=2.0.1-1.19.2
 mod_display_name=MapSync
 mod_description=Share map data with your friends, live, and privately.
 mod_authors=Gjum,Protonull,okx,Huskydog9988,specificlanguage,SirAlador,klaribot
@@ -11,14 +11,14 @@ mod_home_url=https://github.com/CivPlatform/map-sync
 mod_source_url=https://github.com/CivPlatform/map-sync
 mod_issues_url=https://github.com/CivPlatform/map-sync/issues
 
-minecraft_version=1.18.2
+minecraft_version=1.19.2
 # https://parchmentmc.org/docs/getting-started
-parchment_version=2022.11.06
+parchment_version=2022.11.27
 enabled_platforms=fabric,forge
 
 # https://fabricmc.net/versions.html
-fabric_loader_version=0.15.10
-fabric_api_version=0.77.0+1.18.2
+fabric_loader_version=0.15.11
+fabric_api_version=0.77.0+1.19.2
 
-forge_version=1.18.2-40.2.0
-forge_major_version=40
+forge_version=1.19.2-43.3.2
+forge_major_version=43

mod/temp.update.sh

@@ -0,0 +1,2 @@
+./gradlew -PUPDATE_SRGS="https://gist.githubusercontent.com/amadornes/e00ea624b3cccc84fbca0800f651b546/raw/raw_mappings.tsrg;https://gist.githubusercontent.com/SizableShrimp/882a671ff74256d150776da08c89ef72/raw/forge_1.19_renames.tsrg" updateEverything 
+

server/src/constants.ts

@@ -1,6 +1,6 @@
 export const SUPPORTED_VERSIONS = new Set([
-    "2.0.1-1.18.2+fabric",
-    "2.0.1-1.18.2+forge",
+    "2.0.1-1.19.2+fabric",
+    "2.0.1-1.19.2+forge",
 ]);
 
 // SHA1 produces 160-bit (20-byte) hashes

server/src/server.ts

@@ -45,7 +45,7 @@ export class TcpServer {
         return crypto.privateDecrypt(
             {
                 key: this.keyPair.privateKey,
-                padding: crypto.constants.RSA_PKCS1_PADDING,
+                padding: crypto.constants.RSA_PKCS1_OAEP_PADDING,
             },
             buf,
         );