Upstream
/
BlueMap
mirror of https://github.com/BlueMap-Minecraft/BlueMap.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into feature/v2

This commit is contained in:
Lukas Rieger (Blue) 2022-06-07 21:45:35 +02:00
parent 8e8934a8c4 a53b3daa28
commit 7f5a54f37a
No known key found for this signature in database
GPG Key ID: 2D09EC5ED2687FF2
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
BlueMapCore/src/main/java/de/bluecolored/bluemap/core/MinecraftVersion.java
View File

@ -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, 18, 0);
public static final MinecraftVersion LATEST_SUPPORTED = new MinecraftVersion(1, 19, 0);
public static final MinecraftVersion EARLIEST_SUPPORTED = new MinecraftVersion(1, 13);
private final int major, minor, patch;
@ -149,7 +149,8 @@ public class MinecraftVersion implements Comparable<MinecraftVersion> {
MC_1_16 (new MinecraftVersion(1, 16), "mc1_16", "https://launcher.mojang.com/v1/objects/228fdf45541c4c2fe8aec4f20e880cb8fcd46621/client.jar"),
MC_1_16_2 (new MinecraftVersion(1, 16, 2), "mc1_16", "https://launcher.mojang.com/v1/objects/653e97a2d1d76f87653f02242d243cdee48a5144/client.jar"),
MC_1_17 (new MinecraftVersion(1, 17), "mc1_16", "https://launcher.mojang.com/v1/objects/1cf89c77ed5e72401b869f66410934804f3d6f52/client.jar"),
MC_1_18 (new MinecraftVersion(1, 18), "mc1_18", "https://launcher.mojang.com/v1/objects/020aa79e63a7aab5d6f30e5ec7a6c08baee6b64c/client.jar");
MC_1_18 (new MinecraftVersion(1, 18), "mc1_18", "https://launcher.mojang.com/v1/objects/020aa79e63a7aab5d6f30e5ec7a6c08baee6b64c/client.jar"),
MC_1_19 (new MinecraftVersion(1, 19), "mc1_18", "https://launcher.mojang.com/v1/objects/c0898ec7c6a5a2eaa317770203a1554260699994/client.jar");
private final MinecraftVersion version;
private final String resourcePrefix;

7
BlueMapCore/src/main/resourceExtensions/mc1_18/assets/minecraft/biomes.json
View File

@ -36,6 +36,13 @@
"grasscolor": "#6A7039",
"foliagecolor": 6975545
},
"minecraft:mangrove_swamp": {
"humidity": 0.9,
"temperature": 0.8,
"watercolor": "#3A7A6A",
"grasscolor": "#6A7039",
"foliagecolor": "#8DB127"
},
"minecraft:forest": {
"humidity": 0.8,
"temperature": 0.7,