diff --git a/BlueMapCommon/BlueMapVue b/BlueMapCommon/BlueMapVue index 59e2cd41..13f60e6e 160000 --- a/BlueMapCommon/BlueMapVue +++ b/BlueMapCommon/BlueMapVue @@ -1 +1 @@ -Subproject commit 59e2cd41072946a8f64efb67d57b8374c466036f +Subproject commit 13f60e6ee0ba39759d662bba5ae750a5918b564b diff --git a/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/mca/ChunkAnvil118.java b/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/mca/ChunkAnvil118.java index c4ff5f91..3b2fab56 100644 --- a/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/mca/ChunkAnvil118.java +++ b/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/mca/ChunkAnvil118.java @@ -267,7 +267,6 @@ public class ChunkAnvil118 extends MCAChunk { y = (y & 0xF) / 4; int biomeIndex = y * 16 + z * 4 + x; - // this.biomes.length == bits per biome -- because -> available longs * 64 (bits per long) / 64 (biomes per section, 4*4*4) long value = MCAMath.getValueFromLongArray(biomes, biomeIndex, bitsPerBiome); if (value >= biomePalette.length) { Logger.global.noFloodWarning("biomepalettewarning", "Got biome-palette value " + value + " but palette has size of " + biomePalette.length + "! (Future occasions of this error will not be logged)"); diff --git a/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/mca/LegacyBiomes.java b/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/mca/LegacyBiomes.java index 902a8562..35330aa5 100644 --- a/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/mca/LegacyBiomes.java +++ b/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/mca/LegacyBiomes.java @@ -109,7 +109,7 @@ public class LegacyBiomes { } public static String idFor(int legacyId) { - if (legacyId < 0 || legacyId > BIOME_IDS.length) legacyId = 0; + if (legacyId < 0 || legacyId >= BIOME_IDS.length) legacyId = 0; return BIOME_IDS[legacyId]; } diff --git a/BlueMapCore/src/main/resourceExtensions/mc1_18/assets/minecraft/biomes.json b/BlueMapCore/src/main/resourceExtensions/mc1_18/assets/minecraft/biomes.json index 7f502091..9b422c98 100644 --- a/BlueMapCore/src/main/resourceExtensions/mc1_18/assets/minecraft/biomes.json +++ b/BlueMapCore/src/main/resourceExtensions/mc1_18/assets/minecraft/biomes.json @@ -33,6 +33,7 @@ "humidity": 0.9, "temp": 0.8, "watercolor": 6388580, + "grasscolor": "#6A7039", "foliagecolor": 6975545 }, "minecraft:forest": { diff --git a/gradle.properties b/gradle.properties index a6d952b6..5fd53cf7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ org.gradle.jvmargs=-Xmx3G org.gradle.daemon=false -coreVersion=1.7.1-sql +coreVersion=1.7.2-sql diff --git a/implementations/cli/src/main/resources/de/bluecolored/bluemap/render.conf b/implementations/cli/src/main/resources/de/bluecolored/bluemap/render.conf index c4edf54a..8eaf874e 100644 --- a/implementations/cli/src/main/resources/de/bluecolored/bluemap/render.conf +++ b/implementations/cli/src/main/resources/de/bluecolored/bluemap/render.conf @@ -47,7 +47,7 @@ maps: [ # 0 is no ambient light, 1 is fully lighted. # Changing this value requires a re-render of the map. # Default is 0 - ambientLight: 0 + ambientLight: 0.1 # Defines the skylight level that the sky of the world is emitting. # This should always be equivalent to the maximum ingame sky-light for that world! diff --git a/implementations/cli/src/main/resources/de/bluecolored/bluemap/webserver.conf b/implementations/cli/src/main/resources/de/bluecolored/bluemap/webserver.conf index ca23be1f..ad6aa67d 100644 --- a/implementations/cli/src/main/resources/de/bluecolored/bluemap/webserver.conf +++ b/implementations/cli/src/main/resources/de/bluecolored/bluemap/webserver.conf @@ -8,14 +8,18 @@ # Default is "web" webroot: "web" -# The IP-Adress that the webserver binds to. -# Use "0.0.0.0" to bind to all available local adresses. +# The IP-Address that the webserver binds to. +# Use "0.0.0.0" to bind to all available local addresses. # If you only want to access it locally use "localhost". +# +# LEAVE THIS SETTING AS IT IS if you don't have a good reason to change it! +# The default setting (0.0.0.0) is working on almost all servers. +# # Default is "0.0.0.0" #ip: "localhost" #ip: "123.45.6.78" -# The port that the webserver listenes to. +# The port that the webserver listens to. # Default is 8100 port: 8100 diff --git a/implementations/fabric-1.16.2/src/main/resources/de/bluecolored/bluemap/render.conf b/implementations/fabric-1.16.2/src/main/resources/de/bluecolored/bluemap/render.conf index 93109526..7853552a 100644 --- a/implementations/fabric-1.16.2/src/main/resources/de/bluecolored/bluemap/render.conf +++ b/implementations/fabric-1.16.2/src/main/resources/de/bluecolored/bluemap/render.conf @@ -47,7 +47,7 @@ maps: [ # 0 is no ambient light, 1 is fully lighted. # Changing this value requires a re-render of the map. # Default is 0 - ambientLight: 0 + ambientLight: 0.1 # Defines the skylight level that the sky of the world is emitting. # This should always be equivalent to the maximum ingame sky-light for that world! diff --git a/implementations/fabric-1.16.2/src/main/resources/de/bluecolored/bluemap/webserver.conf b/implementations/fabric-1.16.2/src/main/resources/de/bluecolored/bluemap/webserver.conf index 6af072df..8c14fd9d 100644 --- a/implementations/fabric-1.16.2/src/main/resources/de/bluecolored/bluemap/webserver.conf +++ b/implementations/fabric-1.16.2/src/main/resources/de/bluecolored/bluemap/webserver.conf @@ -13,14 +13,18 @@ enabled: true # Default is "bluemap/web" webroot: "bluemap/web" -# The IP-Adress that the webserver binds to. -# Use "0.0.0.0" to bind to all available local adresses. +# The IP-Address that the webserver binds to. +# Use "0.0.0.0" to bind to all available local addresses. # If you only want to access it locally use "localhost". +# +# LEAVE THIS SETTING AS IT IS if you don't have a good reason to change it! +# The default setting (0.0.0.0) is working on almost all servers. +# # Default is "0.0.0.0" #ip: "localhost" #ip: "123.45.6.78" -# The port that the webserver listenes to. +# The port that the webserver listens to. # Default is 8100 port: 8100 diff --git a/implementations/fabric-1.17/src/main/resources/de/bluecolored/bluemap/render.conf b/implementations/fabric-1.17/src/main/resources/de/bluecolored/bluemap/render.conf index 93109526..7853552a 100644 --- a/implementations/fabric-1.17/src/main/resources/de/bluecolored/bluemap/render.conf +++ b/implementations/fabric-1.17/src/main/resources/de/bluecolored/bluemap/render.conf @@ -47,7 +47,7 @@ maps: [ # 0 is no ambient light, 1 is fully lighted. # Changing this value requires a re-render of the map. # Default is 0 - ambientLight: 0 + ambientLight: 0.1 # Defines the skylight level that the sky of the world is emitting. # This should always be equivalent to the maximum ingame sky-light for that world! diff --git a/implementations/fabric-1.17/src/main/resources/de/bluecolored/bluemap/webserver.conf b/implementations/fabric-1.17/src/main/resources/de/bluecolored/bluemap/webserver.conf index 6af072df..8c14fd9d 100644 --- a/implementations/fabric-1.17/src/main/resources/de/bluecolored/bluemap/webserver.conf +++ b/implementations/fabric-1.17/src/main/resources/de/bluecolored/bluemap/webserver.conf @@ -13,14 +13,18 @@ enabled: true # Default is "bluemap/web" webroot: "bluemap/web" -# The IP-Adress that the webserver binds to. -# Use "0.0.0.0" to bind to all available local adresses. +# The IP-Address that the webserver binds to. +# Use "0.0.0.0" to bind to all available local addresses. # If you only want to access it locally use "localhost". +# +# LEAVE THIS SETTING AS IT IS if you don't have a good reason to change it! +# The default setting (0.0.0.0) is working on almost all servers. +# # Default is "0.0.0.0" #ip: "localhost" #ip: "123.45.6.78" -# The port that the webserver listenes to. +# The port that the webserver listens to. # Default is 8100 port: 8100 diff --git a/implementations/fabric-1.18/src/main/java/de/bluecolored/bluemap/fabric/FabricMod.java b/implementations/fabric-1.18/src/main/java/de/bluecolored/bluemap/fabric/FabricMod.java index 302655d6..a9717c6d 100644 --- a/implementations/fabric-1.18/src/main/java/de/bluecolored/bluemap/fabric/FabricMod.java +++ b/implementations/fabric-1.18/src/main/java/de/bluecolored/bluemap/fabric/FabricMod.java @@ -78,7 +78,7 @@ public class FabricMod implements ModInitializer, ServerInterface { pluginInstance = new Plugin( MinecraftVersion.of(net.minecraft.MinecraftVersion.CURRENT.getReleaseTarget()), - "fabric-1.17", this); + "fabric-1.18", this); this.worldUUIDs = new ConcurrentHashMap<>(); this.eventForwarder = new FabricEventForwarder(this); diff --git a/implementations/fabric-1.18/src/main/resources/de/bluecolored/bluemap/render.conf b/implementations/fabric-1.18/src/main/resources/de/bluecolored/bluemap/render.conf index 0e7d8279..5a0ff02f 100644 --- a/implementations/fabric-1.18/src/main/resources/de/bluecolored/bluemap/render.conf +++ b/implementations/fabric-1.18/src/main/resources/de/bluecolored/bluemap/render.conf @@ -47,7 +47,7 @@ maps: [ # 0 is no ambient light, 1 is fully lighted. # Changing this value requires a re-render of the map. # Default is 0 - ambientLight: 0 + ambientLight: 0.1 # Defines the skylight level that the sky of the world is emitting. # This should always be equivalent to the maximum ingame sky-light for that world! diff --git a/implementations/fabric-1.18/src/main/resources/de/bluecolored/bluemap/webserver.conf b/implementations/fabric-1.18/src/main/resources/de/bluecolored/bluemap/webserver.conf index 6af072df..8c14fd9d 100644 --- a/implementations/fabric-1.18/src/main/resources/de/bluecolored/bluemap/webserver.conf +++ b/implementations/fabric-1.18/src/main/resources/de/bluecolored/bluemap/webserver.conf @@ -13,14 +13,18 @@ enabled: true # Default is "bluemap/web" webroot: "bluemap/web" -# The IP-Adress that the webserver binds to. -# Use "0.0.0.0" to bind to all available local adresses. +# The IP-Address that the webserver binds to. +# Use "0.0.0.0" to bind to all available local addresses. # If you only want to access it locally use "localhost". +# +# LEAVE THIS SETTING AS IT IS if you don't have a good reason to change it! +# The default setting (0.0.0.0) is working on almost all servers. +# # Default is "0.0.0.0" #ip: "localhost" #ip: "123.45.6.78" -# The port that the webserver listenes to. +# The port that the webserver listens to. # Default is 8100 port: 8100 diff --git a/implementations/forge-1.16.2/src/main/resources/de/bluecolored/bluemap/render.conf b/implementations/forge-1.16.2/src/main/resources/de/bluecolored/bluemap/render.conf index 93109526..7853552a 100644 --- a/implementations/forge-1.16.2/src/main/resources/de/bluecolored/bluemap/render.conf +++ b/implementations/forge-1.16.2/src/main/resources/de/bluecolored/bluemap/render.conf @@ -47,7 +47,7 @@ maps: [ # 0 is no ambient light, 1 is fully lighted. # Changing this value requires a re-render of the map. # Default is 0 - ambientLight: 0 + ambientLight: 0.1 # Defines the skylight level that the sky of the world is emitting. # This should always be equivalent to the maximum ingame sky-light for that world! diff --git a/implementations/forge-1.16.2/src/main/resources/de/bluecolored/bluemap/webserver.conf b/implementations/forge-1.16.2/src/main/resources/de/bluecolored/bluemap/webserver.conf index 6af072df..8c14fd9d 100644 --- a/implementations/forge-1.16.2/src/main/resources/de/bluecolored/bluemap/webserver.conf +++ b/implementations/forge-1.16.2/src/main/resources/de/bluecolored/bluemap/webserver.conf @@ -13,14 +13,18 @@ enabled: true # Default is "bluemap/web" webroot: "bluemap/web" -# The IP-Adress that the webserver binds to. -# Use "0.0.0.0" to bind to all available local adresses. +# The IP-Address that the webserver binds to. +# Use "0.0.0.0" to bind to all available local addresses. # If you only want to access it locally use "localhost". +# +# LEAVE THIS SETTING AS IT IS if you don't have a good reason to change it! +# The default setting (0.0.0.0) is working on almost all servers. +# # Default is "0.0.0.0" #ip: "localhost" #ip: "123.45.6.78" -# The port that the webserver listenes to. +# The port that the webserver listens to. # Default is 8100 port: 8100 diff --git a/implementations/forge-1.17.1/src/main/resources/de/bluecolored/bluemap/render.conf b/implementations/forge-1.17.1/src/main/resources/de/bluecolored/bluemap/render.conf index 0e7d8279..5a0ff02f 100644 --- a/implementations/forge-1.17.1/src/main/resources/de/bluecolored/bluemap/render.conf +++ b/implementations/forge-1.17.1/src/main/resources/de/bluecolored/bluemap/render.conf @@ -47,7 +47,7 @@ maps: [ # 0 is no ambient light, 1 is fully lighted. # Changing this value requires a re-render of the map. # Default is 0 - ambientLight: 0 + ambientLight: 0.1 # Defines the skylight level that the sky of the world is emitting. # This should always be equivalent to the maximum ingame sky-light for that world! diff --git a/implementations/forge-1.17.1/src/main/resources/de/bluecolored/bluemap/webserver.conf b/implementations/forge-1.17.1/src/main/resources/de/bluecolored/bluemap/webserver.conf index 6af072df..8c14fd9d 100644 --- a/implementations/forge-1.17.1/src/main/resources/de/bluecolored/bluemap/webserver.conf +++ b/implementations/forge-1.17.1/src/main/resources/de/bluecolored/bluemap/webserver.conf @@ -13,14 +13,18 @@ enabled: true # Default is "bluemap/web" webroot: "bluemap/web" -# The IP-Adress that the webserver binds to. -# Use "0.0.0.0" to bind to all available local adresses. +# The IP-Address that the webserver binds to. +# Use "0.0.0.0" to bind to all available local addresses. # If you only want to access it locally use "localhost". +# +# LEAVE THIS SETTING AS IT IS if you don't have a good reason to change it! +# The default setting (0.0.0.0) is working on almost all servers. +# # Default is "0.0.0.0" #ip: "localhost" #ip: "123.45.6.78" -# The port that the webserver listenes to. +# The port that the webserver listens to. # Default is 8100 port: 8100 diff --git a/implementations/spigot/src/main/resources/de/bluecolored/bluemap/render.conf b/implementations/spigot/src/main/resources/de/bluecolored/bluemap/render.conf index 5374a569..ca63f7e6 100644 --- a/implementations/spigot/src/main/resources/de/bluecolored/bluemap/render.conf +++ b/implementations/spigot/src/main/resources/de/bluecolored/bluemap/render.conf @@ -47,7 +47,7 @@ maps: [ # 0 is no ambient light, 1 is fully lighted. # Changing this value requires a re-render of the map. # Default is 0 - ambientLight: 0 + ambientLight: 0.1 # Defines the skylight level that the sky of the world is emitting. # This should always be equivalent to the maximum ingame sky-light for that world! diff --git a/implementations/spigot/src/main/resources/de/bluecolored/bluemap/webserver.conf b/implementations/spigot/src/main/resources/de/bluecolored/bluemap/webserver.conf index 6af072df..8c14fd9d 100644 --- a/implementations/spigot/src/main/resources/de/bluecolored/bluemap/webserver.conf +++ b/implementations/spigot/src/main/resources/de/bluecolored/bluemap/webserver.conf @@ -13,14 +13,18 @@ enabled: true # Default is "bluemap/web" webroot: "bluemap/web" -# The IP-Adress that the webserver binds to. -# Use "0.0.0.0" to bind to all available local adresses. +# The IP-Address that the webserver binds to. +# Use "0.0.0.0" to bind to all available local addresses. # If you only want to access it locally use "localhost". +# +# LEAVE THIS SETTING AS IT IS if you don't have a good reason to change it! +# The default setting (0.0.0.0) is working on almost all servers. +# # Default is "0.0.0.0" #ip: "localhost" #ip: "123.45.6.78" -# The port that the webserver listenes to. +# The port that the webserver listens to. # Default is 8100 port: 8100 diff --git a/implementations/sponge-8.0.0/src/main/resources/de/bluecolored/bluemap/render.conf b/implementations/sponge-8.0.0/src/main/resources/de/bluecolored/bluemap/render.conf index 93109526..7853552a 100644 --- a/implementations/sponge-8.0.0/src/main/resources/de/bluecolored/bluemap/render.conf +++ b/implementations/sponge-8.0.0/src/main/resources/de/bluecolored/bluemap/render.conf @@ -47,7 +47,7 @@ maps: [ # 0 is no ambient light, 1 is fully lighted. # Changing this value requires a re-render of the map. # Default is 0 - ambientLight: 0 + ambientLight: 0.1 # Defines the skylight level that the sky of the world is emitting. # This should always be equivalent to the maximum ingame sky-light for that world! diff --git a/implementations/sponge-8.0.0/src/main/resources/de/bluecolored/bluemap/webserver.conf b/implementations/sponge-8.0.0/src/main/resources/de/bluecolored/bluemap/webserver.conf index 6af072df..8c14fd9d 100644 --- a/implementations/sponge-8.0.0/src/main/resources/de/bluecolored/bluemap/webserver.conf +++ b/implementations/sponge-8.0.0/src/main/resources/de/bluecolored/bluemap/webserver.conf @@ -13,14 +13,18 @@ enabled: true # Default is "bluemap/web" webroot: "bluemap/web" -# The IP-Adress that the webserver binds to. -# Use "0.0.0.0" to bind to all available local adresses. +# The IP-Address that the webserver binds to. +# Use "0.0.0.0" to bind to all available local addresses. # If you only want to access it locally use "localhost". +# +# LEAVE THIS SETTING AS IT IS if you don't have a good reason to change it! +# The default setting (0.0.0.0) is working on almost all servers. +# # Default is "0.0.0.0" #ip: "localhost" #ip: "123.45.6.78" -# The port that the webserver listenes to. +# The port that the webserver listens to. # Default is 8100 port: 8100