mirror of
https://github.com/BlueMap-Minecraft/BlueMap.git
synced 2024-06-29 16:04:43 +02:00
Fix some color issues
This commit is contained in:
Blue (Lukas Rieger)
parent
2d7ee65a0e
commit
29feb3e4a9
|
|
@ -42,7 +42,7 @@ public BlockIdMapper() throws IOException {
|
||||||
mappings = new HashMap<>();
|
mappings = new HashMap<>();
|
||||||
|
|
||||||
GsonConfigurationLoader loader = GsonConfigurationLoader.builder()
|
GsonConfigurationLoader loader = GsonConfigurationLoader.builder()
|
||||||
.setURL(getClass().getResource("/blockIdMappings.json"))
|
.setURL(getClass().getResource("/blockIds.json"))
|
||||||
.build();
|
.build();
|
||||||
|
|
||||||
ConfigurationNode node = loader.load();
|
ConfigurationNode node = loader.load();
|
||||||
|
|
|
||||||
|
|
@ -84,7 +84,7 @@ public void loadColorConfig(File configFile) throws IOException {
|
||||||
colorFunction = this::getWaterAverageColor;
|
colorFunction = this::getWaterAverageColor;
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
final Vector3f color = MathUtils.color3FromInt(ConfigUtils.readInt(entry.getValue()));
|
final Vector3f color = MathUtils.color3FromInt(ConfigUtils.readColorInt(entry.getValue()));
|
||||||
colorFunction = context -> color;
|
colorFunction = context -> color;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -133,12 +133,12 @@ public static void writeVector4f(ConfigurationNode vectorNode, Vector4f v){
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Returns an integer The value can be a normal integer, an integer in String-Format, or a string in hexadecimal format prefixed with #.
|
* Returns an color-integer. The value can be a normal integer, an integer in String-Format, or a string in hexadecimal format prefixed with # (css-style: e.g. #f16 becomes #ff1166).
|
||||||
* @param node The Configuration Node with the value
|
* @param node The Configuration Node with the value
|
||||||
* @return The parsed Integer
|
* @return The parsed Integer
|
||||||
* @throws NumberFormatException If the value is not formatted correctly or if there is no value present.
|
* @throws NumberFormatException If the value is not formatted correctly or if there is no value present.
|
||||||
*/
|
*/
|
||||||
public static int readInt(ConfigurationNode node) throws NumberFormatException {
|
public static int readColorInt(ConfigurationNode node) throws NumberFormatException {
|
||||||
Object value = node.getValue();
|
Object value = node.getValue();
|
||||||
|
|
||||||
if (value == null) throw new NumberFormatException("No value!");
|
if (value == null) throw new NumberFormatException("No value!");
|
||||||
|
|
@ -150,7 +150,11 @@ public static int readInt(ConfigurationNode node) throws NumberFormatException {
|
||||||
String val = value.toString();
|
String val = value.toString();
|
||||||
|
|
||||||
if (val.charAt(0) == '#') {
|
if (val.charAt(0) == '#') {
|
||||||
return Integer.parseInt(val.substring(1), 16);
|
val = val.substring(1);
|
||||||
|
if (val.length() == 3) val = "f" + val;
|
||||||
|
if (val.length() == 4) val = "" + val.charAt(0) + val.charAt(0) + val.charAt(1) + val.charAt(1) + val.charAt(2) + val.charAt(2) + val.charAt(3) + val.charAt(3);
|
||||||
|
if (val.length() == 6) val = "ff" + val;
|
||||||
|
return Integer.parseUnsignedInt(val, 16);
|
||||||
}
|
}
|
||||||
|
|
||||||
return Integer.parseInt(val);
|
return Integer.parseInt(val);
|
||||||
|
|
|
||||||
|
|
@ -96,9 +96,9 @@ public static Biome create(String id, ConfigurationNode node) {
|
||||||
biome.ordinal = node.getNode("id").getInt(biome.ordinal);
|
biome.ordinal = node.getNode("id").getInt(biome.ordinal);
|
||||||
biome.humidity = node.getNode("humidity").getFloat(biome.humidity);
|
biome.humidity = node.getNode("humidity").getFloat(biome.humidity);
|
||||||
biome.temp = node.getNode("temp").getFloat(biome.temp);
|
biome.temp = node.getNode("temp").getFloat(biome.temp);
|
||||||
try { biome.waterColor = MathUtils.color3FromInt(ConfigUtils.readInt(node.getNode("watercolor"))); } catch (NumberFormatException ignored) {}
|
try { biome.waterColor = MathUtils.color3FromInt(ConfigUtils.readColorInt(node.getNode("watercolor"))); } catch (NumberFormatException ignored) {}
|
||||||
try { biome.overlayFoliageColor = MathUtils.color4FromInt(ConfigUtils.readInt(node.getNode("foliagecolor"))); } catch (NumberFormatException ignored) {}
|
try { biome.overlayFoliageColor = MathUtils.color4FromInt(ConfigUtils.readColorInt(node.getNode("foliagecolor"))); } catch (NumberFormatException ignored) {}
|
||||||
try { biome.overlayGrassColor = MathUtils.color4FromInt(ConfigUtils.readInt(node.getNode("grasscolor"))); } catch (NumberFormatException ignored) {}
|
try { biome.overlayGrassColor = MathUtils.color4FromInt(ConfigUtils.readColorInt(node.getNode("grasscolor"))); } catch (NumberFormatException ignored) {}
|
||||||
|
|
||||||
return biome;
|
return biome;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,452 +1,470 @@
|
||||||
{
|
{
|
||||||
"ocean": {
|
"minecraft:ocean": {
|
||||||
"id": 0,
|
"id": 0,
|
||||||
"humidity": 0.5,
|
"humidity": 0.5,
|
||||||
"temp": 0.5,
|
"temp": 0.5,
|
||||||
"watercolor": 4159204
|
"watercolor": 4159204
|
||||||
},
|
},
|
||||||
"plains": {
|
"minecraft:plains": {
|
||||||
"id": 1,
|
"id": 1,
|
||||||
"humidity": 0.4,
|
"humidity": 0.4,
|
||||||
"temp": 0.8,
|
"temp": 0.8,
|
||||||
"watercolor": 4159204
|
"watercolor": 4159204
|
||||||
},
|
},
|
||||||
"desert": {
|
"minecraft:desert": {
|
||||||
"id": 2,
|
"id": 2,
|
||||||
"humidity": 0.0,
|
"humidity": 0.0,
|
||||||
"temp": 2.0,
|
"temp": 2.0,
|
||||||
"watercolor": 4159204
|
"watercolor": 4159204
|
||||||
},
|
},
|
||||||
"mountains": {
|
"minecraft:mountains": {
|
||||||
"id": 3,
|
"id": 3,
|
||||||
"humidity": 0.3,
|
"humidity": 0.3,
|
||||||
"temp": 0.2,
|
"temp": 0.2,
|
||||||
"watercolor": 4159204
|
"watercolor": 4159204
|
||||||
},
|
},
|
||||||
"forest": {
|
"minecraft:forest": {
|
||||||
"id": 4,
|
"id": 4,
|
||||||
"humidity": 0.8,
|
"humidity": 0.8,
|
||||||
"temp": 0.7,
|
"temp": 0.7,
|
||||||
"watercolor": 4159204
|
"watercolor": 4159204
|
||||||
},
|
},
|
||||||
"taiga": {
|
"minecraft:taiga": {
|
||||||
"id": 5,
|
"id": 5,
|
||||||
"humidity": 0.8,
|
"humidity": 0.8,
|
||||||
"temp": 0.25,
|
"temp": 0.25,
|
||||||
"watercolor": 4159204
|
"watercolor": 4159204
|
||||||
},
|
},
|
||||||
"swamp": {
|
"minecraft:swamp": {
|
||||||
"id": 6,
|
"id": 6,
|
||||||
"humidity": 0.9,
|
"humidity": 0.9,
|
||||||
"temp": 0.8,
|
"temp": 0.8,
|
||||||
"watercolor": 6388580
|
"foliagecolor": "#6A7039",
|
||||||
},
|
"grasscolor": "#6A7039",
|
||||||
"river": {
|
"watercolor": 6388580
|
||||||
"id": 7,
|
},
|
||||||
"humidity": 0.5,
|
"minecraft:river": {
|
||||||
"temp": 0.5,
|
"id": 7,
|
||||||
"watercolor": 4159204
|
"humidity": 0.5,
|
||||||
},
|
"temp": 0.5,
|
||||||
"nether": {
|
"watercolor": 4159204
|
||||||
"id": 8,
|
},
|
||||||
"humidity": 0.0,
|
"minecraft:nether": {
|
||||||
"temp": 2.0,
|
"id": 8,
|
||||||
"watercolor": 4159204
|
"humidity": 0.0,
|
||||||
},
|
"temp": 2.0,
|
||||||
"the_end": {
|
"watercolor": 4159204
|
||||||
"id": 9,
|
},
|
||||||
"humidity": 0.5,
|
"minecraft:the_end": {
|
||||||
"temp": 0.5,
|
"id": 9,
|
||||||
"watercolor": 4159204
|
"humidity": 0.5,
|
||||||
},
|
"temp": 0.5,
|
||||||
"frozen_ocean": {
|
"watercolor": 4159204
|
||||||
"id": 10,
|
},
|
||||||
"humidity": 0.5,
|
"minecraft:frozen_ocean": {
|
||||||
"temp": 0.0,
|
"id": 10,
|
||||||
"watercolor": 3750089
|
"humidity": 0.5,
|
||||||
},
|
"temp": 0.0,
|
||||||
"frozen_river": {
|
"watercolor": 3750089
|
||||||
"id": 11,
|
},
|
||||||
"humidity": 0.5,
|
"minecraft:frozen_river": {
|
||||||
"temp": 0.0,
|
"id": 11,
|
||||||
"watercolor": 3750089
|
"humidity": 0.5,
|
||||||
},
|
"temp": 0.0,
|
||||||
"snowy_tundra": {
|
"watercolor": 3750089
|
||||||
"id": 12,
|
},
|
||||||
"humidity": 0.5,
|
"minecraft:snowy_tundra": {
|
||||||
"temp": 0.0,
|
"id": 12,
|
||||||
"watercolor": 4159204
|
"humidity": 0.5,
|
||||||
},
|
"temp": 0.0,
|
||||||
"snowy_mountains": {
|
"watercolor": 4159204
|
||||||
"id": 13,
|
},
|
||||||
"humidity": 0.5,
|
"minecraft:snowy_mountains": {
|
||||||
"temp": 0.0,
|
"id": 13,
|
||||||
"watercolor": 4159204
|
"humidity": 0.5,
|
||||||
},
|
"temp": 0.0,
|
||||||
"mushroom_fields": {
|
"watercolor": 4159204
|
||||||
"id": 14,
|
},
|
||||||
"humidity": 1.0,
|
"minecraft:mushroom_fields": {
|
||||||
"temp": 0.9,
|
"id": 14,
|
||||||
"watercolor": 4159204
|
"humidity": 1.0,
|
||||||
},
|
"temp": 0.9,
|
||||||
"mushroom_field_shore": {
|
"watercolor": 4159204
|
||||||
"id": 15,
|
},
|
||||||
"humidity": 1.0,
|
"minecraft:mushroom_field_shore": {
|
||||||
"temp": 0.9,
|
"id": 15,
|
||||||
"watercolor": 4159204
|
"humidity": 1.0,
|
||||||
},
|
"temp": 0.9,
|
||||||
"beach": {
|
"watercolor": 4159204
|
||||||
"id": 16,
|
},
|
||||||
"humidity": 0.4,
|
"minecraft:beach": {
|
||||||
"temp": 0.8,
|
"id": 16,
|
||||||
"watercolor": 4159204
|
"humidity": 0.4,
|
||||||
},
|
"temp": 0.8,
|
||||||
"desert_hills": {
|
"watercolor": 4159204
|
||||||
"id": 17,
|
},
|
||||||
"humidity": 0.0,
|
"minecraft:desert_hills": {
|
||||||
"temp": 2.0,
|
"id": 17,
|
||||||
"watercolor": 4159204
|
"humidity": 0.0,
|
||||||
},
|
"temp": 2.0,
|
||||||
"wooded_hills": {
|
"watercolor": 4159204
|
||||||
"id": 18,
|
},
|
||||||
"humidity": 0.8,
|
"minecraft:wooded_hills": {
|
||||||
"temp": 0.7,
|
"id": 18,
|
||||||
"watercolor": 4159204
|
"humidity": 0.8,
|
||||||
},
|
"temp": 0.7,
|
||||||
"taiga_hills": {
|
"watercolor": 4159204
|
||||||
"id": 19,
|
},
|
||||||
"humidity": 0.8,
|
"minecraft:taiga_hills": {
|
||||||
"temp": 0.25,
|
"id": 19,
|
||||||
"watercolor": 4159204
|
"humidity": 0.8,
|
||||||
},
|
"temp": 0.25,
|
||||||
"mountain_edge": {
|
"watercolor": 4159204
|
||||||
"id": 20,
|
},
|
||||||
"humidity": 0.3,
|
"minecraft:mountain_edge": {
|
||||||
"temp": 0.2,
|
"id": 20,
|
||||||
"watercolor": 4159204
|
"humidity": 0.3,
|
||||||
},
|
"temp": 0.2,
|
||||||
"jungle": {
|
"watercolor": 4159204
|
||||||
"id": 21,
|
},
|
||||||
"humidity": 0.9,
|
"minecraft:jungle": {
|
||||||
"temp": 0.95,
|
"id": 21,
|
||||||
"watercolor": 4159204
|
"humidity": 0.9,
|
||||||
},
|
"temp": 0.95,
|
||||||
"jungle_hills": {
|
"watercolor": 4159204
|
||||||
"id": 22,
|
},
|
||||||
"humidity": 0.9,
|
"minecraft:jungle_hills": {
|
||||||
"temp": 0.95,
|
"id": 22,
|
||||||
"watercolor": 4159204
|
"humidity": 0.9,
|
||||||
},
|
"temp": 0.95,
|
||||||
"jungle_edge": {
|
"watercolor": 4159204
|
||||||
"id": 23,
|
},
|
||||||
"humidity": 0.8,
|
"minecraft:jungle_edge": {
|
||||||
"temp": 0.95,
|
"id": 23,
|
||||||
"watercolor": 4159204
|
"humidity": 0.8,
|
||||||
},
|
"temp": 0.95,
|
||||||
"deep_ocean": {
|
"watercolor": 4159204
|
||||||
"id": 24,
|
},
|
||||||
"humidity": 0.5,
|
"minecraft:deep_ocean": {
|
||||||
"temp": 0.5,
|
"id": 24,
|
||||||
"watercolor": 4159204
|
"humidity": 0.5,
|
||||||
},
|
"temp": 0.5,
|
||||||
"stone_shore": {
|
"watercolor": 4159204
|
||||||
"id": 25,
|
},
|
||||||
"humidity": 0.3,
|
"minecraft:stone_shore": {
|
||||||
"temp": 0.2,
|
"id": 25,
|
||||||
"watercolor": 4159204
|
"humidity": 0.3,
|
||||||
},
|
"temp": 0.2,
|
||||||
"snowy_beach": {
|
"watercolor": 4159204
|
||||||
"id": 26,
|
},
|
||||||
"humidity": 0.3,
|
"minecraft:snowy_beach": {
|
||||||
"temp": 0.05,
|
"id": 26,
|
||||||
"watercolor": 4020182
|
"humidity": 0.3,
|
||||||
},
|
"temp": 0.05,
|
||||||
"birch_forest": {
|
"watercolor": 4020182
|
||||||
"id": 27,
|
},
|
||||||
"humidity": 0.6,
|
"minecraft:birch_forest": {
|
||||||
"temp": 0.6,
|
"id": 27,
|
||||||
"watercolor": 4159204
|
"humidity": 0.6,
|
||||||
},
|
"temp": 0.6,
|
||||||
"birch_forest_hills": {
|
"watercolor": 4159204
|
||||||
"id": 28,
|
},
|
||||||
"humidity": 0.6,
|
"minecraft:birch_forest_hills": {
|
||||||
"temp": 0.6,
|
"id": 28,
|
||||||
"watercolor": 4159204
|
"humidity": 0.6,
|
||||||
},
|
"temp": 0.6,
|
||||||
"dark_forest": {
|
"watercolor": 4159204
|
||||||
"id": 29,
|
},
|
||||||
"humidity": 0.8,
|
"minecraft:dark_forest": {
|
||||||
"temp": 0.7,
|
"id": 29,
|
||||||
"watercolor": 4159204
|
"humidity": 0.8,
|
||||||
},
|
"temp": 0.7,
|
||||||
"snowy_taiga": {
|
"foliagecolor": "#5528340a",
|
||||||
"id": 30,
|
"grasscolor": "#8828340a",
|
||||||
"humidity": 0.4,
|
"watercolor": 4159204
|
||||||
"temp": -0.5,
|
},
|
||||||
"watercolor": 4020182
|
"minecraft:snowy_taiga": {
|
||||||
},
|
"id": 30,
|
||||||
"snowy_taiga_hills": {
|
"humidity": 0.4,
|
||||||
"id": 31,
|
"temp": -0.5,
|
||||||
"humidity": 0.4,
|
"watercolor": 4020182
|
||||||
"temp": -0.5,
|
},
|
||||||
"watercolor": 4020182
|
"minecraft:snowy_taiga_hills": {
|
||||||
},
|
"id": 31,
|
||||||
"giant_tree_taiga": {
|
"humidity": 0.4,
|
||||||
"id": 32,
|
"temp": -0.5,
|
||||||
"humidity": 0.8,
|
"watercolor": 4020182
|
||||||
"temp": 0.3,
|
},
|
||||||
"watercolor": 4159204
|
"minecraft:giant_tree_taiga": {
|
||||||
},
|
"id": 32,
|
||||||
"giant_tree_taiga_hills": {
|
"humidity": 0.8,
|
||||||
"id": 33,
|
"temp": 0.3,
|
||||||
"humidity": 0.8,
|
"watercolor": 4159204
|
||||||
"temp": 0.3,
|
},
|
||||||
"watercolor": 4159204
|
"minecraft:giant_tree_taiga_hills": {
|
||||||
},
|
"id": 33,
|
||||||
"wooded_mountains": {
|
"humidity": 0.8,
|
||||||
"id": 34,
|
"temp": 0.3,
|
||||||
"humidity": 0.3,
|
"watercolor": 4159204
|
||||||
"temp": 0.2,
|
},
|
||||||
"watercolor": 4159204
|
"minecraft:wooded_mountains": {
|
||||||
},
|
"id": 34,
|
||||||
"savanna": {
|
"humidity": 0.3,
|
||||||
"id": 35,
|
"temp": 0.2,
|
||||||
"humidity": 0.0,
|
"watercolor": 4159204
|
||||||
"temp": 1.2,
|
},
|
||||||
"watercolor": 4159204
|
"minecraft:savanna": {
|
||||||
},
|
"id": 35,
|
||||||
"savanna_plateau": {
|
"humidity": 0.0,
|
||||||
"id": 36,
|
"temp": 1.2,
|
||||||
"humidity": 0.0,
|
"watercolor": 4159204
|
||||||
"temp": 1.0,
|
},
|
||||||
"watercolor": 4159204
|
"minecraft:savanna_plateau": {
|
||||||
},
|
"id": 36,
|
||||||
"badlands": {
|
"humidity": 0.0,
|
||||||
"id": 37,
|
"temp": 1.0,
|
||||||
"humidity": 0.0,
|
"watercolor": 4159204
|
||||||
"temp": 2.0,
|
},
|
||||||
"watercolor": 4159204
|
"minecraft:badlands": {
|
||||||
},
|
"id": 37,
|
||||||
"wooded_badlands_plateau": {
|
"humidity": 0.0,
|
||||||
"id": 38,
|
"temp": 2.0,
|
||||||
"humidity": 0.0,
|
"foliagecolor": "#9e814d",
|
||||||
"temp": 2.0,
|
"grasscolor": "#90814d",
|
||||||
"watercolor": 4159204
|
"watercolor": 4159204
|
||||||
},
|
},
|
||||||
"badlands_plateau": {
|
"minecraft:wooded_badlands_plateau": {
|
||||||
"id": 39,
|
"id": 38,
|
||||||
"humidity": 0.0,
|
"humidity": 0.0,
|
||||||
"temp": 2.0,
|
"temp": 2.0,
|
||||||
"watercolor": 4159204
|
"foliagecolor": "#9e814d",
|
||||||
},
|
"grasscolor": "#90814d",
|
||||||
"small_end_islands": {
|
"watercolor": 4159204
|
||||||
"id": 40,
|
},
|
||||||
"humidity": 0.5,
|
"minecraft:badlands_plateau": {
|
||||||
"temp": 0.5,
|
"id": 39,
|
||||||
"watercolor": 4159204
|
"humidity": 0.0,
|
||||||
},
|
"temp": 2.0,
|
||||||
"end_midlands": {
|
"foliagecolor": "#9e814d",
|
||||||
"id": 41,
|
"grasscolor": "#90814d",
|
||||||
"humidity": 0.5,
|
"watercolor": 4159204
|
||||||
"temp": 0.5,
|
},
|
||||||
"watercolor": 4159204
|
"minecraft:small_end_islands": {
|
||||||
},
|
"id": 40,
|
||||||
"end_highlands": {
|
"humidity": 0.5,
|
||||||
"id": 42,
|
"temp": 0.5,
|
||||||
"humidity": 0.5,
|
"watercolor": 4159204
|
||||||
"temp": 0.5,
|
},
|
||||||
"watercolor": 4159204
|
"minecraft:end_midlands": {
|
||||||
},
|
"id": 41,
|
||||||
"end_barrens": {
|
"humidity": 0.5,
|
||||||
"id": 43,
|
"temp": 0.5,
|
||||||
"humidity": 0.5,
|
"watercolor": 4159204
|
||||||
"temp": 0.5,
|
},
|
||||||
"watercolor": 4159204
|
"minecraft:end_highlands": {
|
||||||
},
|
"id": 42,
|
||||||
"warm_ocean": {
|
"humidity": 0.5,
|
||||||
"id": 44,
|
"temp": 0.5,
|
||||||
"humidity": 0.5,
|
"watercolor": 4159204
|
||||||
"temp": 0.5,
|
},
|
||||||
"watercolor": 4445678
|
"minecraft:end_barrens": {
|
||||||
},
|
"id": 43,
|
||||||
"lukewarm_ocean": {
|
"humidity": 0.5,
|
||||||
"id": 45,
|
"temp": 0.5,
|
||||||
"humidity": 0.5,
|
"watercolor": 4159204
|
||||||
"temp": 0.5,
|
},
|
||||||
"watercolor": 4566514
|
"minecraft:warm_ocean": {
|
||||||
},
|
"id": 44,
|
||||||
"cold_ocean": {
|
"humidity": 0.5,
|
||||||
"id": 46,
|
"temp": 0.5,
|
||||||
"humidity": 0.5,
|
"watercolor": 4445678
|
||||||
"temp": 0.5,
|
},
|
||||||
"watercolor": 4020182
|
"minecraft:lukewarm_ocean": {
|
||||||
},
|
"id": 45,
|
||||||
"deep_warm_ocean": {
|
"humidity": 0.5,
|
||||||
"id": 47,
|
"temp": 0.5,
|
||||||
"humidity": 0.5,
|
"watercolor": 4566514
|
||||||
"temp": 0.5,
|
},
|
||||||
"watercolor": 4445678
|
"minecraft:cold_ocean": {
|
||||||
},
|
"id": 46,
|
||||||
"deep_lukewarm_ocean": {
|
"humidity": 0.5,
|
||||||
"id": 48,
|
"temp": 0.5,
|
||||||
"humidity": 0.5,
|
"watercolor": 4020182
|
||||||
"temp": 0.5,
|
},
|
||||||
"watercolor": 4566514
|
"minecraft:deep_warm_ocean": {
|
||||||
},
|
"id": 47,
|
||||||
"deep_cold_ocean": {
|
"humidity": 0.5,
|
||||||
"id": 49,
|
"temp": 0.5,
|
||||||
"humidity": 0.5,
|
"watercolor": 4445678
|
||||||
"temp": 0.5,
|
},
|
||||||
"watercolor": 4020182
|
"minecraft:deep_lukewarm_ocean": {
|
||||||
},
|
"id": 48,
|
||||||
"deep_frozen_ocean": {
|
"humidity": 0.5,
|
||||||
"id": 50,
|
"temp": 0.5,
|
||||||
"humidity": 0.5,
|
"watercolor": 4566514
|
||||||
"temp": 0.5,
|
},
|
||||||
"watercolor": 3750089
|
"minecraft:deep_cold_ocean": {
|
||||||
},
|
"id": 49,
|
||||||
"the_void": {
|
"humidity": 0.5,
|
||||||
"id": 127,
|
"temp": 0.5,
|
||||||
"humidity": 0.5,
|
"watercolor": 4020182
|
||||||
"temp": 0.5,
|
},
|
||||||
"watercolor": 4159204
|
"minecraft:deep_frozen_ocean": {
|
||||||
},
|
"id": 50,
|
||||||
"sunflower_plains": {
|
"humidity": 0.5,
|
||||||
"id": 129,
|
"temp": 0.5,
|
||||||
"humidity": 0.4,
|
"watercolor": 3750089
|
||||||
"temp": 0.8,
|
},
|
||||||
"watercolor": 4159204
|
"minecraft:the_void": {
|
||||||
},
|
"id": 127,
|
||||||
"desert_lakes": {
|
"humidity": 0.5,
|
||||||
"id": 130,
|
"temp": 0.5,
|
||||||
"humidity": 0.0,
|
"watercolor": 4159204
|
||||||
"temp": 2.0,
|
},
|
||||||
"watercolor": 4159204
|
"minecraft:sunflower_plains": {
|
||||||
},
|
"id": 129,
|
||||||
"gravelly_mountains": {
|
"humidity": 0.4,
|
||||||
"id": 131,
|
"temp": 0.8,
|
||||||
"humidity": 0.3,
|
"watercolor": 4159204
|
||||||
"temp": 0.2,
|
},
|
||||||
"watercolor": 4159204
|
"minecraft:desert_lakes": {
|
||||||
},
|
"id": 130,
|
||||||
"flower_forest": {
|
"humidity": 0.0,
|
||||||
"id": 132,
|
"temp": 2.0,
|
||||||
"humidity": 0.8,
|
"watercolor": 4159204
|
||||||
"temp": 0.7,
|
},
|
||||||
"watercolor": 4159204
|
"minecraft:gravelly_mountains": {
|
||||||
},
|
"id": 131,
|
||||||
"taiga_mountains": {
|
"humidity": 0.3,
|
||||||
"id": 133,
|
"temp": 0.2,
|
||||||
"humidity": 0.8,
|
"watercolor": 4159204
|
||||||
"temp": 0.25,
|
},
|
||||||
"watercolor": 4159204
|
"minecraft:flower_forest": {
|
||||||
},
|
"id": 132,
|
||||||
"swamp_hills": {
|
"humidity": 0.8,
|
||||||
"id": 134,
|
"temp": 0.7,
|
||||||
"humidity": 0.9,
|
"watercolor": 4159204
|
||||||
"temp": 0.8,
|
},
|
||||||
"watercolor": 6388580
|
"minecraft:taiga_mountains": {
|
||||||
},
|
"id": 133,
|
||||||
"ice_spikes": {
|
"humidity": 0.8,
|
||||||
"id": 140,
|
"temp": 0.25,
|
||||||
"humidity": 0.5,
|
"watercolor": 4159204
|
||||||
"temp": 0.0,
|
},
|
||||||
"watercolor": 4159204
|
"minecraft:swamp_hills": {
|
||||||
},
|
"id": 134,
|
||||||
"modified_jungle": {
|
"humidity": 0.9,
|
||||||
"id": 149,
|
"temp": 0.8,
|
||||||
"humidity": 0.9,
|
"foliagecolor": "#6A7039",
|
||||||
"temp": 0.95,
|
"grasscolor": "#6A7039",
|
||||||
"watercolor": 4159204
|
"watercolor": 6388580
|
||||||
},
|
},
|
||||||
"modified_jungle_edge": {
|
"minecraft:ice_spikes": {
|
||||||
"id": 151,
|
"id": 140,
|
||||||
"humidity": 0.8,
|
"humidity": 0.5,
|
||||||
"temp": 0.95,
|
"temp": 0.0,
|
||||||
"watercolor": 4159204
|
"watercolor": 4159204
|
||||||
},
|
},
|
||||||
"tall_birch_forest": {
|
"minecraft:modified_jungle": {
|
||||||
"id": 155,
|
"id": 149,
|
||||||
"humidity": 0.6,
|
"humidity": 0.9,
|
||||||
"temp": 0.6,
|
"temp": 0.95,
|
||||||
"watercolor": 4159204
|
"watercolor": 4159204
|
||||||
},
|
},
|
||||||
"tall_birch_hills": {
|
"minecraft:modified_jungle_edge": {
|
||||||
"id": 156,
|
"id": 151,
|
||||||
"humidity": 0.6,
|
"humidity": 0.8,
|
||||||
"temp": 0.6,
|
"temp": 0.95,
|
||||||
"watercolor": 4159204
|
"watercolor": 4159204
|
||||||
},
|
},
|
||||||
"dark_forest_hills": {
|
"minecraft:tall_birch_forest": {
|
||||||
"id": 157,
|
"id": 155,
|
||||||
"humidity": 0.8,
|
"humidity": 0.6,
|
||||||
"temp": 0.7,
|
"temp": 0.6,
|
||||||
"watercolor": 4159204
|
"watercolor": 4159204
|
||||||
},
|
},
|
||||||
"snowy_taiga_mountains": {
|
"minecraft:tall_birch_hills": {
|
||||||
"id": 158,
|
"id": 156,
|
||||||
"humidity": 0.4,
|
"humidity": 0.6,
|
||||||
"temp": -0.5,
|
"temp": 0.6,
|
||||||
"watercolor": 4020182
|
"watercolor": 4159204
|
||||||
},
|
},
|
||||||
"giant_spruce_taiga": {
|
"minecraft:dark_forest_hills": {
|
||||||
"id": 160,
|
"id": 157,
|
||||||
"humidity": 0.8,
|
"humidity": 0.8,
|
||||||
"temp": 0.25,
|
"temp": 0.7,
|
||||||
"watercolor": 4159204
|
"foliagecolor": "#5528340a",
|
||||||
},
|
"grasscolor": "#8828340a",
|
||||||
"giant_spruce_taiga_hills": {
|
"watercolor": 4159204
|
||||||
"id": 161,
|
},
|
||||||
"humidity": 0.8,
|
"minecraft:snowy_taiga_mountains": {
|
||||||
"temp": 0.25,
|
"id": 158,
|
||||||
"watercolor": 4159204
|
"humidity": 0.4,
|
||||||
},
|
"temp": -0.5,
|
||||||
"modified_gravelly_mountains": {
|
"watercolor": 4020182
|
||||||
"id": 162,
|
},
|
||||||
"humidity": 0.3,
|
"minecraft:giant_spruce_taiga": {
|
||||||
"temp": 0.2,
|
"id": 160,
|
||||||
"watercolor": 4159204
|
"humidity": 0.8,
|
||||||
},
|
"temp": 0.25,
|
||||||
"shattered_savanna": {
|
"watercolor": 4159204
|
||||||
"id": 163,
|
},
|
||||||
"humidity": 0.0,
|
"minecraft:giant_spruce_taiga_hills": {
|
||||||
"temp": 1.1,
|
"id": 161,
|
||||||
"watercolor": 4159204
|
"humidity": 0.8,
|
||||||
},
|
"temp": 0.25,
|
||||||
"shattered_savanna_plateau": {
|
"watercolor": 4159204
|
||||||
"id": 164,
|
},
|
||||||
"humidity": 0.0,
|
"minecraft:modified_gravelly_mountains": {
|
||||||
"temp": 1.0,
|
"id": 162,
|
||||||
"watercolor": 4159204
|
"humidity": 0.3,
|
||||||
},
|
"temp": 0.2,
|
||||||
"eroded_badlands": {
|
"watercolor": 4159204
|
||||||
"id": 165,
|
},
|
||||||
"humidity": 0.0,
|
"minecraft:shattered_savanna": {
|
||||||
"temp": 2.0,
|
"id": 163,
|
||||||
"watercolor": 4159204
|
"humidity": 0.0,
|
||||||
},
|
"temp": 1.1,
|
||||||
"modified_wooded_badlands_plateau": {
|
"watercolor": 4159204
|
||||||
"id": 166,
|
},
|
||||||
"humidity": 0.0,
|
"minecraft:shattered_savanna_plateau": {
|
||||||
"temp": 2.0,
|
"id": 164,
|
||||||
"watercolor": 4159204
|
"humidity": 0.0,
|
||||||
},
|
"temp": 1.0,
|
||||||
"modified_badlands_plateau": {
|
"watercolor": 4159204
|
||||||
"id": 167,
|
},
|
||||||
"humidity": 0.0,
|
"minecraft:eroded_badlands": {
|
||||||
"temp": 2.0,
|
"id": 165,
|
||||||
"watercolor": 4159204
|
"humidity": 0.0,
|
||||||
},
|
"temp": 2.0,
|
||||||
"bamboo_jungle": {
|
"foliagecolor": "#9e814d",
|
||||||
"id": 168,
|
"grasscolor": "#90814d",
|
||||||
"humidity": 0.9,
|
"watercolor": 4159204
|
||||||
"temp": 0.95,
|
},
|
||||||
"watercolor": 4159204
|
"minecraft:modified_wooded_badlands_plateau": {
|
||||||
},
|
"id": 166,
|
||||||
"bamboo_jungle_hills": {
|
"humidity": 0.0,
|
||||||
"id": 169,
|
"temp": 2.0,
|
||||||
"humidity": 0.9,
|
"watercolor": 4159204
|
||||||
"temp": 0.95,
|
},
|
||||||
"watercolor": 4159204
|
"minecraft:modified_badlands_plateau": {
|
||||||
}
|
"id": 167,
|
||||||
|
"humidity": 0.0,
|
||||||
|
"temp": 2.0,
|
||||||
|
"foliagecolor": "#9e814d",
|
||||||
|
"grasscolor": "#90814d",
|
||||||
|
"watercolor": 4159204
|
||||||
|
},
|
||||||
|
"minecraft:bamboo_jungle": {
|
||||||
|
"id": 168,
|
||||||
|
"humidity": 0.9,
|
||||||
|
"temp": 0.95,
|
||||||
|
"watercolor": 4159204
|
||||||
|
},
|
||||||
|
"minecraft:bamboo_jungle_hills": {
|
||||||
|
"id": 169,
|
||||||
|
"humidity": 0.9,
|
||||||
|
"temp": 0.95,
|
||||||
|
"watercolor": 4159204
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -1,12 +1,12 @@
|
||||||
{
|
{
|
||||||
"default": "@foliage",
|
"default": "@foliage",
|
||||||
"minecraft:water" : "@water",
|
"minecraft:water": "@water",
|
||||||
"minecraft:grass_block" : "@grass",
|
"minecraft:grass_block": "@grass",
|
||||||
"minecraft:grass" : "@grass",
|
"minecraft:grass": "@grass",
|
||||||
"minecraft:tall_grass" : "@grass",
|
"minecraft:tall_grass": "@grass",
|
||||||
"minecraft:fern" : "@grass",
|
"minecraft:fern": "@grass",
|
||||||
"minecraft:large_fern" : "@grass",
|
"minecraft:large_fern": "@grass",
|
||||||
"minecraft:redstone_wire" : "#ff0000",
|
"minecraft:redstone_wire": "#ff0000",
|
||||||
"minecraft:birch_leaves" : "#86a863",
|
"minecraft:birch_leaves": "#86a863",
|
||||||
"minecraft:spruce_leaves" : "#51946b"
|
"minecraft:spruce_leaves": "#51946b"
|
||||||
}
|
}
|
||||||
File diff suppressed because it is too large
Load Diff
1487
BlueMapCore/src/main/resources/blockIds.json
Normal file
1487
BlueMapCore/src/main/resources/blockIds.json
Normal file
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user