Skip to content

Commit db05bc8

Browse files
committed
Improve version detection on borge and fabric
1 parent aa53956 commit db05bc8

File tree

4 files changed

+19
-4
lines changed

4 files changed

+19
-4
lines changed

BlueMapCore/src/main/java/de/bluecolored/bluemap/core/MinecraftVersion.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public class MinecraftVersion implements Comparable<MinecraftVersion> {
3838

3939
private static final Pattern VERSION_REGEX = Pattern.compile("(?:(?<major>\\d+)\\.(?<minor>\\d+))(?:\\.(?<patch>\\d+))?(?:\\-(?:pre|rc)\\d+)?");
4040

41-
public static final MinecraftVersion LATEST_SUPPORTED = new MinecraftVersion(1, 19, 0);
41+
public static final MinecraftVersion LATEST_SUPPORTED = new MinecraftVersion(1, 19, 1);
4242
public static final MinecraftVersion EARLIEST_SUPPORTED = new MinecraftVersion(1, 13);
4343

4444
private final int major, minor, patch;

implementations/fabric-1.19/src/main/java/de/bluecolored/bluemap/fabric/FabricMod.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
import net.fabricmc.fabric.api.command.v2.CommandRegistrationCallback;
4242
import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents;
4343
import net.fabricmc.fabric.api.event.lifecycle.v1.ServerTickEvents;
44+
import net.minecraft.SharedConstants;
4445
import net.minecraft.server.MinecraftServer;
4546
import net.minecraft.server.network.ServerPlayerEntity;
4647
import net.minecraft.util.Identifier;
@@ -124,7 +125,11 @@ public void onInitialize() {
124125

125126
@Override
126127
public MinecraftVersion getMinecraftVersion() {
127-
return new MinecraftVersion(1, 19);
128+
try {
129+
return MinecraftVersion.of(SharedConstants.getGameVersion().getReleaseTarget());
130+
} catch (IllegalArgumentException ex) {
131+
return MinecraftVersion.LATEST_SUPPORTED;
132+
}
128133
}
129134

130135
@Override

implementations/forge-1.19.1/src/main/java/de/bluecolored/bluemap/forge/ForgeMod.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
import de.bluecolored.bluemap.core.BlueMap;
3636
import de.bluecolored.bluemap.core.MinecraftVersion;
3737
import de.bluecolored.bluemap.core.logger.Logger;
38+
import net.minecraft.SharedConstants;
3839
import net.minecraft.core.Registry;
3940
import net.minecraft.resources.ResourceKey;
4041
import net.minecraft.resources.ResourceLocation;
@@ -140,7 +141,11 @@ public void onTick(ServerTickEvent evt) {
140141

141142
@Override
142143
public MinecraftVersion getMinecraftVersion() {
143-
return new MinecraftVersion(1, 19, 1);
144+
try {
145+
return MinecraftVersion.of(SharedConstants.getCurrentVersion().getReleaseTarget());
146+
} catch (IllegalArgumentException ex) {
147+
return MinecraftVersion.LATEST_SUPPORTED;
148+
}
144149
}
145150

146151
@Override

implementations/forge-1.19/src/main/java/de/bluecolored/bluemap/forge/ForgeMod.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
import de.bluecolored.bluemap.core.BlueMap;
3636
import de.bluecolored.bluemap.core.MinecraftVersion;
3737
import de.bluecolored.bluemap.core.logger.Logger;
38+
import net.minecraft.SharedConstants;
3839
import net.minecraft.core.Registry;
3940
import net.minecraft.resources.ResourceKey;
4041
import net.minecraft.resources.ResourceLocation;
@@ -140,7 +141,11 @@ public void onTick(ServerTickEvent evt) {
140141

141142
@Override
142143
public MinecraftVersion getMinecraftVersion() {
143-
return new MinecraftVersion(1, 19, 0);
144+
try {
145+
return MinecraftVersion.of(SharedConstants.getCurrentVersion().getReleaseTarget());
146+
} catch (IllegalArgumentException ex) {
147+
return new MinecraftVersion(1, 19, 1);
148+
}
144149
}
145150

146151
@Override

0 commit comments

Comments
 (0)