Support 1.18 worlds, add fabric 1.18 support, start adding forge 1.17.1

Author: TBlueF

BlueMapCore/build.gradle

@@ -34,13 +34,27 @@ license {
 }
 
 //resource Extensions
+String[] resourceIds = [
+    "1_12", "1_13", "1_15", "1_16", "1_18"
+];
+
 task zipResourceExtensions {
-   dependsOn 'zipResourceExtensions1_12'
-   dependsOn 'zipResourceExtensions1_13'
-   dependsOn 'zipResourceExtensions1_15'
-   dependsOn 'zipResourceExtensions1_16'
+    for (String id : resourceIds) {
+        dependsOn "zipResourceExtensions$id"
+    }
+}
+
+for (String id : resourceIds) zipResourcesTask(id)
+void zipResourcesTask(String resourceId) {
+    task ("zipResourceExtensions$resourceId", type: Zip) {
+        from fileTree("src/main/resourceExtensions/mc$resourceId")
+        archiveName 'resourceExtensions.zip'
+        destinationDir(file("src/main/resources/de/bluecolored/bluemap/mc$resourceId/"))
+        outputs.upToDateWhen{ false }
+    }
 }
 
+/*
 task zipResourceExtensions1_12(type: Zip) {
    from fileTree('src/main/resourceExtensions/mc1_12')
    archiveName 'resourceExtensions.zip'
@@ -68,6 +82,7 @@ task zipResourceExtensions1_16(type: Zip) {
    destinationDir(file('src/main/resources/de/bluecolored/bluemap/mc1_16/'))
    outputs.upToDateWhen { false }
 }
+*/
 
 //always update the zip before build
 processResources.dependsOn(zipResourceExtensions)

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

@@ -148,7 +148,8 @@ public enum MinecraftResource {
         MC_1_15 (new MinecraftVersion(1, 15), "mc1_15", "https://launcher.mojang.com/v1/objects/e3f78cd16f9eb9a52307ed96ebec64241cc5b32d/client.jar"),
         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_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");
 
         private final MinecraftVersion version;
         private final String resourcePrefix;

BlueMapCore/src/main/java/de/bluecolored/bluemap/core/mca/ChunkAnvil113.java

@@ -61,6 +61,8 @@ public ChunkAnvil113(MCAWorld world, CompoundTag chunkTag) {
                 Section section = new Section(sectionTag);
                 if (section.getSectionY() >= 0 && section.getSectionY() < sections.length) sections[section.getSectionY()] = section;
             }
+        } else {
+            sections = new Section[0];
         }
 
         Tag<?> tag = levelData.get("Biomes"); //tag can be byte-array or int-array
@@ -116,14 +118,14 @@ public LightData getLightData(int x, int y, int z, LightData target) {
     }
 
     @Override
-    public int getBiome(int x, int y, int z) {
+    public String getBiome(int x, int y, int z) {
         x = x & 0xF; // Math.floorMod(pos.getX(), 16)
         z = z & 0xF;
         int biomeIntIndex = z * 16 + x;
 
-        if (biomeIntIndex >= this.biomes.length) return Biome.DEFAULT.getNumeralId();
+        if (biomeIntIndex >= this.biomes.length) return Biome.DEFAULT.getFullId();
 
-        return biomes[biomeIntIndex];
+        return LegacyBiomes.idFor(biomes[biomeIntIndex]);
     }
 
     private class Section {

BlueMapCore/src/main/java/de/bluecolored/bluemap/core/mca/ChunkAnvil115.java

@@ -61,6 +61,8 @@ public ChunkAnvil115(MCAWorld world, CompoundTag chunkTag) {
                 Section section = new Section(sectionTag);
                 if (section.getSectionY() >= 0 && section.getSectionY() < sections.length) sections[section.getSectionY()] = section;
             }
+        } else {
+            sections = new Section[0];
         }
 
         Tag<?> tag = levelData.get("Biomes"); //tag can be byte-array or int-array
@@ -116,16 +118,16 @@ public LightData getLightData(int x, int y, int z, LightData target) {
     }
 
     @Override
-    public int getBiome(int x, int y, int z) {
+    public String getBiome(int x, int y, int z) {
         x = (x & 0xF) / 4; // Math.floorMod(pos.getX(), 16)
         z = (z & 0xF) / 4;
         y = y / 4;
         int biomeIntIndex = y * 16 + z * 4 + x;
 
-        if (biomeIntIndex < 0) return Biome.DEFAULT.getNumeralId();
-        if (biomeIntIndex >= this.biomes.length) return Biome.DEFAULT.getNumeralId();
+        if (biomeIntIndex < 0) return Biome.DEFAULT.getFullId();
+        if (biomeIntIndex >= this.biomes.length) return Biome.DEFAULT.getFullId();
 
-        return biomes[biomeIntIndex];
+        return LegacyBiomes.idFor(biomes[biomeIntIndex]);
     }
 
     private static class Section {

BlueMapCore/src/main/java/de/bluecolored/bluemap/core/mca/ChunkAnvil116.java

@@ -82,6 +82,8 @@ public ChunkAnvil116(MCAWorld world, CompoundTag chunkTag) {
             for (Section section : sectionList) {
                 sections[section.sectionY - sectionMin] = section;
             }
+        } else {
+            sections = new Section[0];
         }
 
         Tag<?> tag = levelData.get("Biomes"); //tag can be byte-array or int-array
@@ -130,8 +132,8 @@ public LightData getLightData(int x, int y, int z, LightData target) {
     }
 
     @Override
-    public int getBiome(int x, int y, int z) {
-        if (biomes.length < 16) return Biome.DEFAULT.getNumeralId();
+    public String getBiome(int x, int y, int z) {
+        if (biomes.length < 16) return Biome.DEFAULT.getFullId();
 
         x = (x & 0xF) / 4; // Math.floorMod(pos.getX(), 16)
         z = (z & 0xF) / 4;
@@ -142,7 +144,7 @@ public int getBiome(int x, int y, int z) {
         if (biomeIntIndex >= biomes.length) biomeIntIndex -= (((biomeIntIndex - biomes.length) >> 4) + 1) * 16;
         if (biomeIntIndex < 0) biomeIntIndex -= (biomeIntIndex >> 4) * 16;
 
-        return biomes[biomeIntIndex];
+        return LegacyBiomes.idFor(biomes[biomeIntIndex]);
     }
 
     @Override