Merge branch 'master' into feature/sql
This commit is contained in:
commit
0929678d3b
|
@ -1 +1 @@
|
||||||
Subproject commit 59e2cd41072946a8f64efb67d57b8374c466036f
|
Subproject commit 13f60e6ee0ba39759d662bba5ae750a5918b564b
|
|
@ -267,7 +267,6 @@ public class ChunkAnvil118 extends MCAChunk {
|
||||||
y = (y & 0xF) / 4;
|
y = (y & 0xF) / 4;
|
||||||
int biomeIndex = y * 16 + z * 4 + x;
|
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);
|
long value = MCAMath.getValueFromLongArray(biomes, biomeIndex, bitsPerBiome);
|
||||||
if (value >= biomePalette.length) {
|
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)");
|
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)");
|
||||||
|
|
|
@ -109,7 +109,7 @@ public class LegacyBiomes {
|
||||||
}
|
}
|
||||||
|
|
||||||
public static String idFor(int legacyId) {
|
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];
|
return BIOME_IDS[legacyId];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -33,6 +33,7 @@
|
||||||
"humidity": 0.9,
|
"humidity": 0.9,
|
||||||
"temp": 0.8,
|
"temp": 0.8,
|
||||||
"watercolor": 6388580,
|
"watercolor": 6388580,
|
||||||
|
"grasscolor": "#6A7039",
|
||||||
"foliagecolor": 6975545
|
"foliagecolor": 6975545
|
||||||
},
|
},
|
||||||
"minecraft:forest": {
|
"minecraft:forest": {
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
org.gradle.jvmargs=-Xmx3G
|
org.gradle.jvmargs=-Xmx3G
|
||||||
org.gradle.daemon=false
|
org.gradle.daemon=false
|
||||||
|
|
||||||
coreVersion=1.7.1-sql
|
coreVersion=1.7.2-sql
|
||||||
|
|
|
@ -47,7 +47,7 @@ maps: [
|
||||||
# 0 is no ambient light, 1 is fully lighted.
|
# 0 is no ambient light, 1 is fully lighted.
|
||||||
# Changing this value requires a re-render of the map.
|
# Changing this value requires a re-render of the map.
|
||||||
# Default is 0
|
# Default is 0
|
||||||
ambientLight: 0
|
ambientLight: 0.1
|
||||||
|
|
||||||
# Defines the skylight level that the sky of the world is emitting.
|
# 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!
|
# This should always be equivalent to the maximum ingame sky-light for that world!
|
||||||
|
|
|
@ -8,14 +8,18 @@
|
||||||
# Default is "web"
|
# Default is "web"
|
||||||
webroot: "web"
|
webroot: "web"
|
||||||
|
|
||||||
# The IP-Adress that the webserver binds to.
|
# The IP-Address that the webserver binds to.
|
||||||
# Use "0.0.0.0" to bind to all available local adresses.
|
# Use "0.0.0.0" to bind to all available local addresses.
|
||||||
# If you only want to access it locally use "localhost".
|
# 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"
|
# Default is "0.0.0.0"
|
||||||
#ip: "localhost"
|
#ip: "localhost"
|
||||||
#ip: "123.45.6.78"
|
#ip: "123.45.6.78"
|
||||||
|
|
||||||
# The port that the webserver listenes to.
|
# The port that the webserver listens to.
|
||||||
# Default is 8100
|
# Default is 8100
|
||||||
port: 8100
|
port: 8100
|
||||||
|
|
||||||
|
|
|
@ -47,7 +47,7 @@ maps: [
|
||||||
# 0 is no ambient light, 1 is fully lighted.
|
# 0 is no ambient light, 1 is fully lighted.
|
||||||
# Changing this value requires a re-render of the map.
|
# Changing this value requires a re-render of the map.
|
||||||
# Default is 0
|
# Default is 0
|
||||||
ambientLight: 0
|
ambientLight: 0.1
|
||||||
|
|
||||||
# Defines the skylight level that the sky of the world is emitting.
|
# 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!
|
# This should always be equivalent to the maximum ingame sky-light for that world!
|
||||||
|
|
|
@ -13,14 +13,18 @@ enabled: true
|
||||||
# Default is "bluemap/web"
|
# Default is "bluemap/web"
|
||||||
webroot: "bluemap/web"
|
webroot: "bluemap/web"
|
||||||
|
|
||||||
# The IP-Adress that the webserver binds to.
|
# The IP-Address that the webserver binds to.
|
||||||
# Use "0.0.0.0" to bind to all available local adresses.
|
# Use "0.0.0.0" to bind to all available local addresses.
|
||||||
# If you only want to access it locally use "localhost".
|
# 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"
|
# Default is "0.0.0.0"
|
||||||
#ip: "localhost"
|
#ip: "localhost"
|
||||||
#ip: "123.45.6.78"
|
#ip: "123.45.6.78"
|
||||||
|
|
||||||
# The port that the webserver listenes to.
|
# The port that the webserver listens to.
|
||||||
# Default is 8100
|
# Default is 8100
|
||||||
port: 8100
|
port: 8100
|
||||||
|
|
||||||
|
|
|
@ -47,7 +47,7 @@ maps: [
|
||||||
# 0 is no ambient light, 1 is fully lighted.
|
# 0 is no ambient light, 1 is fully lighted.
|
||||||
# Changing this value requires a re-render of the map.
|
# Changing this value requires a re-render of the map.
|
||||||
# Default is 0
|
# Default is 0
|
||||||
ambientLight: 0
|
ambientLight: 0.1
|
||||||
|
|
||||||
# Defines the skylight level that the sky of the world is emitting.
|
# 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!
|
# This should always be equivalent to the maximum ingame sky-light for that world!
|
||||||
|
|
|
@ -13,14 +13,18 @@ enabled: true
|
||||||
# Default is "bluemap/web"
|
# Default is "bluemap/web"
|
||||||
webroot: "bluemap/web"
|
webroot: "bluemap/web"
|
||||||
|
|
||||||
# The IP-Adress that the webserver binds to.
|
# The IP-Address that the webserver binds to.
|
||||||
# Use "0.0.0.0" to bind to all available local adresses.
|
# Use "0.0.0.0" to bind to all available local addresses.
|
||||||
# If you only want to access it locally use "localhost".
|
# 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"
|
# Default is "0.0.0.0"
|
||||||
#ip: "localhost"
|
#ip: "localhost"
|
||||||
#ip: "123.45.6.78"
|
#ip: "123.45.6.78"
|
||||||
|
|
||||||
# The port that the webserver listenes to.
|
# The port that the webserver listens to.
|
||||||
# Default is 8100
|
# Default is 8100
|
||||||
port: 8100
|
port: 8100
|
||||||
|
|
||||||
|
|
|
@ -78,7 +78,7 @@ public class FabricMod implements ModInitializer, ServerInterface {
|
||||||
|
|
||||||
pluginInstance = new Plugin(
|
pluginInstance = new Plugin(
|
||||||
MinecraftVersion.of(net.minecraft.MinecraftVersion.CURRENT.getReleaseTarget()),
|
MinecraftVersion.of(net.minecraft.MinecraftVersion.CURRENT.getReleaseTarget()),
|
||||||
"fabric-1.17", this);
|
"fabric-1.18", this);
|
||||||
|
|
||||||
this.worldUUIDs = new ConcurrentHashMap<>();
|
this.worldUUIDs = new ConcurrentHashMap<>();
|
||||||
this.eventForwarder = new FabricEventForwarder(this);
|
this.eventForwarder = new FabricEventForwarder(this);
|
||||||
|
|
|
@ -47,7 +47,7 @@ maps: [
|
||||||
# 0 is no ambient light, 1 is fully lighted.
|
# 0 is no ambient light, 1 is fully lighted.
|
||||||
# Changing this value requires a re-render of the map.
|
# Changing this value requires a re-render of the map.
|
||||||
# Default is 0
|
# Default is 0
|
||||||
ambientLight: 0
|
ambientLight: 0.1
|
||||||
|
|
||||||
# Defines the skylight level that the sky of the world is emitting.
|
# 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!
|
# This should always be equivalent to the maximum ingame sky-light for that world!
|
||||||
|
|
|
@ -13,14 +13,18 @@ enabled: true
|
||||||
# Default is "bluemap/web"
|
# Default is "bluemap/web"
|
||||||
webroot: "bluemap/web"
|
webroot: "bluemap/web"
|
||||||
|
|
||||||
# The IP-Adress that the webserver binds to.
|
# The IP-Address that the webserver binds to.
|
||||||
# Use "0.0.0.0" to bind to all available local adresses.
|
# Use "0.0.0.0" to bind to all available local addresses.
|
||||||
# If you only want to access it locally use "localhost".
|
# 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"
|
# Default is "0.0.0.0"
|
||||||
#ip: "localhost"
|
#ip: "localhost"
|
||||||
#ip: "123.45.6.78"
|
#ip: "123.45.6.78"
|
||||||
|
|
||||||
# The port that the webserver listenes to.
|
# The port that the webserver listens to.
|
||||||
# Default is 8100
|
# Default is 8100
|
||||||
port: 8100
|
port: 8100
|
||||||
|
|
||||||
|
|
|
@ -47,7 +47,7 @@ maps: [
|
||||||
# 0 is no ambient light, 1 is fully lighted.
|
# 0 is no ambient light, 1 is fully lighted.
|
||||||
# Changing this value requires a re-render of the map.
|
# Changing this value requires a re-render of the map.
|
||||||
# Default is 0
|
# Default is 0
|
||||||
ambientLight: 0
|
ambientLight: 0.1
|
||||||
|
|
||||||
# Defines the skylight level that the sky of the world is emitting.
|
# 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!
|
# This should always be equivalent to the maximum ingame sky-light for that world!
|
||||||
|
|
|
@ -13,14 +13,18 @@ enabled: true
|
||||||
# Default is "bluemap/web"
|
# Default is "bluemap/web"
|
||||||
webroot: "bluemap/web"
|
webroot: "bluemap/web"
|
||||||
|
|
||||||
# The IP-Adress that the webserver binds to.
|
# The IP-Address that the webserver binds to.
|
||||||
# Use "0.0.0.0" to bind to all available local adresses.
|
# Use "0.0.0.0" to bind to all available local addresses.
|
||||||
# If you only want to access it locally use "localhost".
|
# 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"
|
# Default is "0.0.0.0"
|
||||||
#ip: "localhost"
|
#ip: "localhost"
|
||||||
#ip: "123.45.6.78"
|
#ip: "123.45.6.78"
|
||||||
|
|
||||||
# The port that the webserver listenes to.
|
# The port that the webserver listens to.
|
||||||
# Default is 8100
|
# Default is 8100
|
||||||
port: 8100
|
port: 8100
|
||||||
|
|
||||||
|
|
|
@ -47,7 +47,7 @@ maps: [
|
||||||
# 0 is no ambient light, 1 is fully lighted.
|
# 0 is no ambient light, 1 is fully lighted.
|
||||||
# Changing this value requires a re-render of the map.
|
# Changing this value requires a re-render of the map.
|
||||||
# Default is 0
|
# Default is 0
|
||||||
ambientLight: 0
|
ambientLight: 0.1
|
||||||
|
|
||||||
# Defines the skylight level that the sky of the world is emitting.
|
# 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!
|
# This should always be equivalent to the maximum ingame sky-light for that world!
|
||||||
|
|
|
@ -13,14 +13,18 @@ enabled: true
|
||||||
# Default is "bluemap/web"
|
# Default is "bluemap/web"
|
||||||
webroot: "bluemap/web"
|
webroot: "bluemap/web"
|
||||||
|
|
||||||
# The IP-Adress that the webserver binds to.
|
# The IP-Address that the webserver binds to.
|
||||||
# Use "0.0.0.0" to bind to all available local adresses.
|
# Use "0.0.0.0" to bind to all available local addresses.
|
||||||
# If you only want to access it locally use "localhost".
|
# 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"
|
# Default is "0.0.0.0"
|
||||||
#ip: "localhost"
|
#ip: "localhost"
|
||||||
#ip: "123.45.6.78"
|
#ip: "123.45.6.78"
|
||||||
|
|
||||||
# The port that the webserver listenes to.
|
# The port that the webserver listens to.
|
||||||
# Default is 8100
|
# Default is 8100
|
||||||
port: 8100
|
port: 8100
|
||||||
|
|
||||||
|
|
|
@ -47,7 +47,7 @@ maps: [
|
||||||
# 0 is no ambient light, 1 is fully lighted.
|
# 0 is no ambient light, 1 is fully lighted.
|
||||||
# Changing this value requires a re-render of the map.
|
# Changing this value requires a re-render of the map.
|
||||||
# Default is 0
|
# Default is 0
|
||||||
ambientLight: 0
|
ambientLight: 0.1
|
||||||
|
|
||||||
# Defines the skylight level that the sky of the world is emitting.
|
# 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!
|
# This should always be equivalent to the maximum ingame sky-light for that world!
|
||||||
|
|
|
@ -13,14 +13,18 @@ enabled: true
|
||||||
# Default is "bluemap/web"
|
# Default is "bluemap/web"
|
||||||
webroot: "bluemap/web"
|
webroot: "bluemap/web"
|
||||||
|
|
||||||
# The IP-Adress that the webserver binds to.
|
# The IP-Address that the webserver binds to.
|
||||||
# Use "0.0.0.0" to bind to all available local adresses.
|
# Use "0.0.0.0" to bind to all available local addresses.
|
||||||
# If you only want to access it locally use "localhost".
|
# 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"
|
# Default is "0.0.0.0"
|
||||||
#ip: "localhost"
|
#ip: "localhost"
|
||||||
#ip: "123.45.6.78"
|
#ip: "123.45.6.78"
|
||||||
|
|
||||||
# The port that the webserver listenes to.
|
# The port that the webserver listens to.
|
||||||
# Default is 8100
|
# Default is 8100
|
||||||
port: 8100
|
port: 8100
|
||||||
|
|
||||||
|
|
|
@ -47,7 +47,7 @@ maps: [
|
||||||
# 0 is no ambient light, 1 is fully lighted.
|
# 0 is no ambient light, 1 is fully lighted.
|
||||||
# Changing this value requires a re-render of the map.
|
# Changing this value requires a re-render of the map.
|
||||||
# Default is 0
|
# Default is 0
|
||||||
ambientLight: 0
|
ambientLight: 0.1
|
||||||
|
|
||||||
# Defines the skylight level that the sky of the world is emitting.
|
# 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!
|
# This should always be equivalent to the maximum ingame sky-light for that world!
|
||||||
|
|
|
@ -13,14 +13,18 @@ enabled: true
|
||||||
# Default is "bluemap/web"
|
# Default is "bluemap/web"
|
||||||
webroot: "bluemap/web"
|
webroot: "bluemap/web"
|
||||||
|
|
||||||
# The IP-Adress that the webserver binds to.
|
# The IP-Address that the webserver binds to.
|
||||||
# Use "0.0.0.0" to bind to all available local adresses.
|
# Use "0.0.0.0" to bind to all available local addresses.
|
||||||
# If you only want to access it locally use "localhost".
|
# 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"
|
# Default is "0.0.0.0"
|
||||||
#ip: "localhost"
|
#ip: "localhost"
|
||||||
#ip: "123.45.6.78"
|
#ip: "123.45.6.78"
|
||||||
|
|
||||||
# The port that the webserver listenes to.
|
# The port that the webserver listens to.
|
||||||
# Default is 8100
|
# Default is 8100
|
||||||
port: 8100
|
port: 8100
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue