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/sql

This commit is contained in:
Lukas Rieger (Blue) 2021-12-02 14:11:37 +01:00
parent f03b6f5045 6186b16e8d
commit 0929678d3b
No known key found for this signature in database
GPG Key ID: 2D09EC5ED2687FF2
22 changed files with 69 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BlueMapCommon/BlueMapVue

@ -1 +1 @@
Subproject commit 59e2cd41072946a8f64efb67d57b8374c466036f
Subproject commit 13f60e6ee0ba39759d662bba5ae750a5918b564b

1
BlueMapCore/src/main/java/de/bluecolored/bluemap/core/mca/ChunkAnvil118.java
View File

@ -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)");

2
BlueMapCore/src/main/java/de/bluecolored/bluemap/core/mca/LegacyBiomes.java
View File

@ -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];
}

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

@ -33,6 +33,7 @@
"humidity": 0.9,
"temp": 0.8,
"watercolor": 6388580,
"grasscolor": "#6A7039",
"foliagecolor": 6975545
},
"minecraft:forest": {

2
gradle.properties
View File

@ -1,4 +1,4 @@
org.gradle.jvmargs=-Xmx3G
org.gradle.daemon=false
coreVersion=1.7.1-sql
coreVersion=1.7.2-sql

2
implementations/cli/src/main/resources/de/bluecolored/bluemap/render.conf
View File

@ -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!

10
implementations/cli/src/main/resources/de/bluecolored/bluemap/webserver.conf
View File

@ -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

2
implementations/fabric-1.16.2/src/main/resources/de/bluecolored/bluemap/render.conf
View File

@ -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!

10
implementations/fabric-1.16.2/src/main/resources/de/bluecolored/bluemap/webserver.conf
View File

@ -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

2
implementations/fabric-1.17/src/main/resources/de/bluecolored/bluemap/render.conf
View File

@ -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!

10
implementations/fabric-1.17/src/main/resources/de/bluecolored/bluemap/webserver.conf
View File

@ -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

2
implementations/fabric-1.18/src/main/java/de/bluecolored/bluemap/fabric/FabricMod.java
View File

@ -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);

2
implementations/fabric-1.18/src/main/resources/de/bluecolored/bluemap/render.conf
View File

@ -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!

10
implementations/fabric-1.18/src/main/resources/de/bluecolored/bluemap/webserver.conf
View File

@ -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

2
implementations/forge-1.16.2/src/main/resources/de/bluecolored/bluemap/render.conf
View File

@ -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!

10
implementations/forge-1.16.2/src/main/resources/de/bluecolored/bluemap/webserver.conf
View File

@ -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

2
implementations/forge-1.17.1/src/main/resources/de/bluecolored/bluemap/render.conf
View File

@ -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!

10
implementations/forge-1.17.1/src/main/resources/de/bluecolored/bluemap/webserver.conf
View File

@ -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

2
implementations/spigot/src/main/resources/de/bluecolored/bluemap/render.conf
View File

@ -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!

10
implementations/spigot/src/main/resources/de/bluecolored/bluemap/webserver.conf
View File

@ -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

2
implementations/sponge-8.0.0/src/main/resources/de/bluecolored/bluemap/render.conf
View File

@ -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!

10
implementations/sponge-8.0.0/src/main/resources/de/bluecolored/bluemap/webserver.conf
View File

@ -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