From db05bc89b0af34383518a916a95174ce7bcac3b2 Mon Sep 17 00:00:00 2001
From: "Lukas Rieger (Blue)" <TBlueF@users.noreply.github.com>
Date: Wed, 3 Aug 2022 23:13:00 +0200
Subject: [PATCH] Improve version detection on borge and fabric

---
 .../java/de/bluecolored/bluemap/core/MinecraftVersion.java | 2 +-
 .../main/java/de/bluecolored/bluemap/fabric/FabricMod.java | 7 ++++++-
 .../main/java/de/bluecolored/bluemap/forge/ForgeMod.java   | 7 ++++++-
 .../main/java/de/bluecolored/bluemap/forge/ForgeMod.java   | 7 ++++++-
 4 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/MinecraftVersion.java b/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/MinecraftVersion.java
index 00b02415..c2865c7a 100644
--- a/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/MinecraftVersion.java
+++ b/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/MinecraftVersion.java
@@ -38,7 +38,7 @@ public class MinecraftVersion implements Comparable<MinecraftVersion> {
 
     private static final Pattern VERSION_REGEX = Pattern.compile("(?:(?<major>\\d+)\\.(?<minor>\\d+))(?:\\.(?<patch>\\d+))?(?:\\-(?:pre|rc)\\d+)?");
 
-    public static final MinecraftVersion LATEST_SUPPORTED = new MinecraftVersion(1, 19, 0);
+    public static final MinecraftVersion LATEST_SUPPORTED = new MinecraftVersion(1, 19, 1);
     public static final MinecraftVersion EARLIEST_SUPPORTED = new MinecraftVersion(1, 13);
 
     private final int major, minor, patch;
diff --git a/implementations/fabric-1.19/src/main/java/de/bluecolored/bluemap/fabric/FabricMod.java b/implementations/fabric-1.19/src/main/java/de/bluecolored/bluemap/fabric/FabricMod.java
index 4a8d08d0..fe03837c 100644
--- a/implementations/fabric-1.19/src/main/java/de/bluecolored/bluemap/fabric/FabricMod.java
+++ b/implementations/fabric-1.19/src/main/java/de/bluecolored/bluemap/fabric/FabricMod.java
@@ -41,6 +41,7 @@
 import net.fabricmc.fabric.api.command.v2.CommandRegistrationCallback;
 import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents;
 import net.fabricmc.fabric.api.event.lifecycle.v1.ServerTickEvents;
+import net.minecraft.SharedConstants;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.util.Identifier;
@@ -124,7 +125,11 @@ public void onInitialize() {
 
     @Override
     public MinecraftVersion getMinecraftVersion() {
-        return new MinecraftVersion(1, 19);
+        try {
+            return MinecraftVersion.of(SharedConstants.getGameVersion().getReleaseTarget());
+        } catch (IllegalArgumentException ex) {
+            return MinecraftVersion.LATEST_SUPPORTED;
+        }
     }
 
     @Override
diff --git a/implementations/forge-1.19.1/src/main/java/de/bluecolored/bluemap/forge/ForgeMod.java b/implementations/forge-1.19.1/src/main/java/de/bluecolored/bluemap/forge/ForgeMod.java
index e45a043b..3af9a1e3 100644
--- a/implementations/forge-1.19.1/src/main/java/de/bluecolored/bluemap/forge/ForgeMod.java
+++ b/implementations/forge-1.19.1/src/main/java/de/bluecolored/bluemap/forge/ForgeMod.java
@@ -35,6 +35,7 @@
 import de.bluecolored.bluemap.core.BlueMap;
 import de.bluecolored.bluemap.core.MinecraftVersion;
 import de.bluecolored.bluemap.core.logger.Logger;
+import net.minecraft.SharedConstants;
 import net.minecraft.core.Registry;
 import net.minecraft.resources.ResourceKey;
 import net.minecraft.resources.ResourceLocation;
@@ -140,7 +141,11 @@ public void onTick(ServerTickEvent evt) {
 
     @Override
     public MinecraftVersion getMinecraftVersion() {
-        return new MinecraftVersion(1, 19, 1);
+        try {
+            return MinecraftVersion.of(SharedConstants.getCurrentVersion().getReleaseTarget());
+        } catch (IllegalArgumentException ex) {
+            return MinecraftVersion.LATEST_SUPPORTED;
+        }
     }
 
     @Override
diff --git a/implementations/forge-1.19/src/main/java/de/bluecolored/bluemap/forge/ForgeMod.java b/implementations/forge-1.19/src/main/java/de/bluecolored/bluemap/forge/ForgeMod.java
index 6a94e82c..37376b86 100644
--- a/implementations/forge-1.19/src/main/java/de/bluecolored/bluemap/forge/ForgeMod.java
+++ b/implementations/forge-1.19/src/main/java/de/bluecolored/bluemap/forge/ForgeMod.java
@@ -35,6 +35,7 @@
 import de.bluecolored.bluemap.core.BlueMap;
 import de.bluecolored.bluemap.core.MinecraftVersion;
 import de.bluecolored.bluemap.core.logger.Logger;
+import net.minecraft.SharedConstants;
 import net.minecraft.core.Registry;
 import net.minecraft.resources.ResourceKey;
 import net.minecraft.resources.ResourceLocation;
@@ -140,7 +141,11 @@ public void onTick(ServerTickEvent evt) {
 
     @Override
     public MinecraftVersion getMinecraftVersion() {
-        return new MinecraftVersion(1, 19, 0);
+        try {
+            return MinecraftVersion.of(SharedConstants.getCurrentVersion().getReleaseTarget());
+        } catch (IllegalArgumentException ex) {
+            return new MinecraftVersion(1, 19, 1);
+        }
     }
 
     @Override