Fix some color issues

This commit is contained in:
Blue (Lukas Rieger) 2019-12-29 18:52:12 +01:00
parent 2d7ee65a0e
commit 29feb3e4a9
9 changed files with 6378 additions and 6356 deletions

View File

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

View File

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

View File

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

View File

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

View File

@ -1,449 +1,467 @@
{ {
"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,
"foliagecolor": "#6A7039",
"grasscolor": "#6A7039",
"watercolor": 6388580 "watercolor": 6388580
}, },
"river": { "minecraft:river": {
"id": 7, "id": 7,
"humidity": 0.5, "humidity": 0.5,
"temp": 0.5, "temp": 0.5,
"watercolor": 4159204 "watercolor": 4159204
}, },
"nether": { "minecraft:nether": {
"id": 8, "id": 8,
"humidity": 0.0, "humidity": 0.0,
"temp": 2.0, "temp": 2.0,
"watercolor": 4159204 "watercolor": 4159204
}, },
"the_end": { "minecraft:the_end": {
"id": 9, "id": 9,
"humidity": 0.5, "humidity": 0.5,
"temp": 0.5, "temp": 0.5,
"watercolor": 4159204 "watercolor": 4159204
}, },
"frozen_ocean": { "minecraft:frozen_ocean": {
"id": 10, "id": 10,
"humidity": 0.5, "humidity": 0.5,
"temp": 0.0, "temp": 0.0,
"watercolor": 3750089 "watercolor": 3750089
}, },
"frozen_river": { "minecraft:frozen_river": {
"id": 11, "id": 11,
"humidity": 0.5, "humidity": 0.5,
"temp": 0.0, "temp": 0.0,
"watercolor": 3750089 "watercolor": 3750089
}, },
"snowy_tundra": { "minecraft:snowy_tundra": {
"id": 12, "id": 12,
"humidity": 0.5, "humidity": 0.5,
"temp": 0.0, "temp": 0.0,
"watercolor": 4159204 "watercolor": 4159204
}, },
"snowy_mountains": { "minecraft:snowy_mountains": {
"id": 13, "id": 13,
"humidity": 0.5, "humidity": 0.5,
"temp": 0.0, "temp": 0.0,
"watercolor": 4159204 "watercolor": 4159204
}, },
"mushroom_fields": { "minecraft:mushroom_fields": {
"id": 14, "id": 14,
"humidity": 1.0, "humidity": 1.0,
"temp": 0.9, "temp": 0.9,
"watercolor": 4159204 "watercolor": 4159204
}, },
"mushroom_field_shore": { "minecraft:mushroom_field_shore": {
"id": 15, "id": 15,
"humidity": 1.0, "humidity": 1.0,
"temp": 0.9, "temp": 0.9,
"watercolor": 4159204 "watercolor": 4159204
}, },
"beach": { "minecraft:beach": {
"id": 16, "id": 16,
"humidity": 0.4, "humidity": 0.4,
"temp": 0.8, "temp": 0.8,
"watercolor": 4159204 "watercolor": 4159204
}, },
"desert_hills": { "minecraft:desert_hills": {
"id": 17, "id": 17,
"humidity": 0.0, "humidity": 0.0,
"temp": 2.0, "temp": 2.0,
"watercolor": 4159204 "watercolor": 4159204
}, },
"wooded_hills": { "minecraft:wooded_hills": {
"id": 18, "id": 18,
"humidity": 0.8, "humidity": 0.8,
"temp": 0.7, "temp": 0.7,
"watercolor": 4159204 "watercolor": 4159204
}, },
"taiga_hills": { "minecraft:taiga_hills": {
"id": 19, "id": 19,
"humidity": 0.8, "humidity": 0.8,
"temp": 0.25, "temp": 0.25,
"watercolor": 4159204 "watercolor": 4159204
}, },
"mountain_edge": { "minecraft:mountain_edge": {
"id": 20, "id": 20,
"humidity": 0.3, "humidity": 0.3,
"temp": 0.2, "temp": 0.2,
"watercolor": 4159204 "watercolor": 4159204
}, },
"jungle": { "minecraft:jungle": {
"id": 21, "id": 21,
"humidity": 0.9, "humidity": 0.9,
"temp": 0.95, "temp": 0.95,
"watercolor": 4159204 "watercolor": 4159204
}, },
"jungle_hills": { "minecraft:jungle_hills": {
"id": 22, "id": 22,
"humidity": 0.9, "humidity": 0.9,
"temp": 0.95, "temp": 0.95,
"watercolor": 4159204 "watercolor": 4159204
}, },
"jungle_edge": { "minecraft:jungle_edge": {
"id": 23, "id": 23,
"humidity": 0.8, "humidity": 0.8,
"temp": 0.95, "temp": 0.95,
"watercolor": 4159204 "watercolor": 4159204
}, },
"deep_ocean": { "minecraft:deep_ocean": {
"id": 24, "id": 24,
"humidity": 0.5, "humidity": 0.5,
"temp": 0.5, "temp": 0.5,
"watercolor": 4159204 "watercolor": 4159204
}, },
"stone_shore": { "minecraft:stone_shore": {
"id": 25, "id": 25,
"humidity": 0.3, "humidity": 0.3,
"temp": 0.2, "temp": 0.2,
"watercolor": 4159204 "watercolor": 4159204
}, },
"snowy_beach": { "minecraft:snowy_beach": {
"id": 26, "id": 26,
"humidity": 0.3, "humidity": 0.3,
"temp": 0.05, "temp": 0.05,
"watercolor": 4020182 "watercolor": 4020182
}, },
"birch_forest": { "minecraft:birch_forest": {
"id": 27, "id": 27,
"humidity": 0.6, "humidity": 0.6,
"temp": 0.6, "temp": 0.6,
"watercolor": 4159204 "watercolor": 4159204
}, },
"birch_forest_hills": { "minecraft:birch_forest_hills": {
"id": 28, "id": 28,
"humidity": 0.6, "humidity": 0.6,
"temp": 0.6, "temp": 0.6,
"watercolor": 4159204 "watercolor": 4159204
}, },
"dark_forest": { "minecraft:dark_forest": {
"id": 29, "id": 29,
"humidity": 0.8, "humidity": 0.8,
"temp": 0.7, "temp": 0.7,
"foliagecolor": "#5528340a",
"grasscolor": "#8828340a",
"watercolor": 4159204 "watercolor": 4159204
}, },
"snowy_taiga": { "minecraft:snowy_taiga": {
"id": 30, "id": 30,
"humidity": 0.4, "humidity": 0.4,
"temp": -0.5, "temp": -0.5,
"watercolor": 4020182 "watercolor": 4020182
}, },
"snowy_taiga_hills": { "minecraft:snowy_taiga_hills": {
"id": 31, "id": 31,
"humidity": 0.4, "humidity": 0.4,
"temp": -0.5, "temp": -0.5,
"watercolor": 4020182 "watercolor": 4020182
}, },
"giant_tree_taiga": { "minecraft:giant_tree_taiga": {
"id": 32, "id": 32,
"humidity": 0.8, "humidity": 0.8,
"temp": 0.3, "temp": 0.3,
"watercolor": 4159204 "watercolor": 4159204
}, },
"giant_tree_taiga_hills": { "minecraft:giant_tree_taiga_hills": {
"id": 33, "id": 33,
"humidity": 0.8, "humidity": 0.8,
"temp": 0.3, "temp": 0.3,
"watercolor": 4159204 "watercolor": 4159204
}, },
"wooded_mountains": { "minecraft:wooded_mountains": {
"id": 34, "id": 34,
"humidity": 0.3, "humidity": 0.3,
"temp": 0.2, "temp": 0.2,
"watercolor": 4159204 "watercolor": 4159204
}, },
"savanna": { "minecraft:savanna": {
"id": 35, "id": 35,
"humidity": 0.0, "humidity": 0.0,
"temp": 1.2, "temp": 1.2,
"watercolor": 4159204 "watercolor": 4159204
}, },
"savanna_plateau": { "minecraft:savanna_plateau": {
"id": 36, "id": 36,
"humidity": 0.0, "humidity": 0.0,
"temp": 1.0, "temp": 1.0,
"watercolor": 4159204 "watercolor": 4159204
}, },
"badlands": { "minecraft:badlands": {
"id": 37, "id": 37,
"humidity": 0.0, "humidity": 0.0,
"temp": 2.0, "temp": 2.0,
"foliagecolor": "#9e814d",
"grasscolor": "#90814d",
"watercolor": 4159204 "watercolor": 4159204
}, },
"wooded_badlands_plateau": { "minecraft:wooded_badlands_plateau": {
"id": 38, "id": 38,
"humidity": 0.0, "humidity": 0.0,
"temp": 2.0, "temp": 2.0,
"foliagecolor": "#9e814d",
"grasscolor": "#90814d",
"watercolor": 4159204 "watercolor": 4159204
}, },
"badlands_plateau": { "minecraft:badlands_plateau": {
"id": 39, "id": 39,
"humidity": 0.0, "humidity": 0.0,
"temp": 2.0, "temp": 2.0,
"foliagecolor": "#9e814d",
"grasscolor": "#90814d",
"watercolor": 4159204 "watercolor": 4159204
}, },
"small_end_islands": { "minecraft:small_end_islands": {
"id": 40, "id": 40,
"humidity": 0.5, "humidity": 0.5,
"temp": 0.5, "temp": 0.5,
"watercolor": 4159204 "watercolor": 4159204
}, },
"end_midlands": { "minecraft:end_midlands": {
"id": 41, "id": 41,
"humidity": 0.5, "humidity": 0.5,
"temp": 0.5, "temp": 0.5,
"watercolor": 4159204 "watercolor": 4159204
}, },
"end_highlands": { "minecraft:end_highlands": {
"id": 42, "id": 42,
"humidity": 0.5, "humidity": 0.5,
"temp": 0.5, "temp": 0.5,
"watercolor": 4159204 "watercolor": 4159204
}, },
"end_barrens": { "minecraft:end_barrens": {
"id": 43, "id": 43,
"humidity": 0.5, "humidity": 0.5,
"temp": 0.5, "temp": 0.5,
"watercolor": 4159204 "watercolor": 4159204
}, },
"warm_ocean": { "minecraft:warm_ocean": {
"id": 44, "id": 44,
"humidity": 0.5, "humidity": 0.5,
"temp": 0.5, "temp": 0.5,
"watercolor": 4445678 "watercolor": 4445678
}, },
"lukewarm_ocean": { "minecraft:lukewarm_ocean": {
"id": 45, "id": 45,
"humidity": 0.5, "humidity": 0.5,
"temp": 0.5, "temp": 0.5,
"watercolor": 4566514 "watercolor": 4566514
}, },
"cold_ocean": { "minecraft:cold_ocean": {
"id": 46, "id": 46,
"humidity": 0.5, "humidity": 0.5,
"temp": 0.5, "temp": 0.5,
"watercolor": 4020182 "watercolor": 4020182
}, },
"deep_warm_ocean": { "minecraft:deep_warm_ocean": {
"id": 47, "id": 47,
"humidity": 0.5, "humidity": 0.5,
"temp": 0.5, "temp": 0.5,
"watercolor": 4445678 "watercolor": 4445678
}, },
"deep_lukewarm_ocean": { "minecraft:deep_lukewarm_ocean": {
"id": 48, "id": 48,
"humidity": 0.5, "humidity": 0.5,
"temp": 0.5, "temp": 0.5,
"watercolor": 4566514 "watercolor": 4566514
}, },
"deep_cold_ocean": { "minecraft:deep_cold_ocean": {
"id": 49, "id": 49,
"humidity": 0.5, "humidity": 0.5,
"temp": 0.5, "temp": 0.5,
"watercolor": 4020182 "watercolor": 4020182
}, },
"deep_frozen_ocean": { "minecraft:deep_frozen_ocean": {
"id": 50, "id": 50,
"humidity": 0.5, "humidity": 0.5,
"temp": 0.5, "temp": 0.5,
"watercolor": 3750089 "watercolor": 3750089
}, },
"the_void": { "minecraft:the_void": {
"id": 127, "id": 127,
"humidity": 0.5, "humidity": 0.5,
"temp": 0.5, "temp": 0.5,
"watercolor": 4159204 "watercolor": 4159204
}, },
"sunflower_plains": { "minecraft:sunflower_plains": {
"id": 129, "id": 129,
"humidity": 0.4, "humidity": 0.4,
"temp": 0.8, "temp": 0.8,
"watercolor": 4159204 "watercolor": 4159204
}, },
"desert_lakes": { "minecraft:desert_lakes": {
"id": 130, "id": 130,
"humidity": 0.0, "humidity": 0.0,
"temp": 2.0, "temp": 2.0,
"watercolor": 4159204 "watercolor": 4159204
}, },
"gravelly_mountains": { "minecraft:gravelly_mountains": {
"id": 131, "id": 131,
"humidity": 0.3, "humidity": 0.3,
"temp": 0.2, "temp": 0.2,
"watercolor": 4159204 "watercolor": 4159204
}, },
"flower_forest": { "minecraft:flower_forest": {
"id": 132, "id": 132,
"humidity": 0.8, "humidity": 0.8,
"temp": 0.7, "temp": 0.7,
"watercolor": 4159204 "watercolor": 4159204
}, },
"taiga_mountains": { "minecraft:taiga_mountains": {
"id": 133, "id": 133,
"humidity": 0.8, "humidity": 0.8,
"temp": 0.25, "temp": 0.25,
"watercolor": 4159204 "watercolor": 4159204
}, },
"swamp_hills": { "minecraft:swamp_hills": {
"id": 134, "id": 134,
"humidity": 0.9, "humidity": 0.9,
"temp": 0.8, "temp": 0.8,
"foliagecolor": "#6A7039",
"grasscolor": "#6A7039",
"watercolor": 6388580 "watercolor": 6388580
}, },
"ice_spikes": { "minecraft:ice_spikes": {
"id": 140, "id": 140,
"humidity": 0.5, "humidity": 0.5,
"temp": 0.0, "temp": 0.0,
"watercolor": 4159204 "watercolor": 4159204
}, },
"modified_jungle": { "minecraft:modified_jungle": {
"id": 149, "id": 149,
"humidity": 0.9, "humidity": 0.9,
"temp": 0.95, "temp": 0.95,
"watercolor": 4159204 "watercolor": 4159204
}, },
"modified_jungle_edge": { "minecraft:modified_jungle_edge": {
"id": 151, "id": 151,
"humidity": 0.8, "humidity": 0.8,
"temp": 0.95, "temp": 0.95,
"watercolor": 4159204 "watercolor": 4159204
}, },
"tall_birch_forest": { "minecraft:tall_birch_forest": {
"id": 155, "id": 155,
"humidity": 0.6, "humidity": 0.6,
"temp": 0.6, "temp": 0.6,
"watercolor": 4159204 "watercolor": 4159204
}, },
"tall_birch_hills": { "minecraft:tall_birch_hills": {
"id": 156, "id": 156,
"humidity": 0.6, "humidity": 0.6,
"temp": 0.6, "temp": 0.6,
"watercolor": 4159204 "watercolor": 4159204
}, },
"dark_forest_hills": { "minecraft:dark_forest_hills": {
"id": 157, "id": 157,
"humidity": 0.8, "humidity": 0.8,
"temp": 0.7, "temp": 0.7,
"foliagecolor": "#5528340a",
"grasscolor": "#8828340a",
"watercolor": 4159204 "watercolor": 4159204
}, },
"snowy_taiga_mountains": { "minecraft:snowy_taiga_mountains": {
"id": 158, "id": 158,
"humidity": 0.4, "humidity": 0.4,
"temp": -0.5, "temp": -0.5,
"watercolor": 4020182 "watercolor": 4020182
}, },
"giant_spruce_taiga": { "minecraft:giant_spruce_taiga": {
"id": 160, "id": 160,
"humidity": 0.8, "humidity": 0.8,
"temp": 0.25, "temp": 0.25,
"watercolor": 4159204 "watercolor": 4159204
}, },
"giant_spruce_taiga_hills": { "minecraft:giant_spruce_taiga_hills": {
"id": 161, "id": 161,
"humidity": 0.8, "humidity": 0.8,
"temp": 0.25, "temp": 0.25,
"watercolor": 4159204 "watercolor": 4159204
}, },
"modified_gravelly_mountains": { "minecraft:modified_gravelly_mountains": {
"id": 162, "id": 162,
"humidity": 0.3, "humidity": 0.3,
"temp": 0.2, "temp": 0.2,
"watercolor": 4159204 "watercolor": 4159204
}, },
"shattered_savanna": { "minecraft:shattered_savanna": {
"id": 163, "id": 163,
"humidity": 0.0, "humidity": 0.0,
"temp": 1.1, "temp": 1.1,
"watercolor": 4159204 "watercolor": 4159204
}, },
"shattered_savanna_plateau": { "minecraft:shattered_savanna_plateau": {
"id": 164, "id": 164,
"humidity": 0.0, "humidity": 0.0,
"temp": 1.0, "temp": 1.0,
"watercolor": 4159204 "watercolor": 4159204
}, },
"eroded_badlands": { "minecraft:eroded_badlands": {
"id": 165, "id": 165,
"humidity": 0.0, "humidity": 0.0,
"temp": 2.0, "temp": 2.0,
"foliagecolor": "#9e814d",
"grasscolor": "#90814d",
"watercolor": 4159204 "watercolor": 4159204
}, },
"modified_wooded_badlands_plateau": { "minecraft:modified_wooded_badlands_plateau": {
"id": 166, "id": 166,
"humidity": 0.0, "humidity": 0.0,
"temp": 2.0, "temp": 2.0,
"watercolor": 4159204 "watercolor": 4159204
}, },
"modified_badlands_plateau": { "minecraft:modified_badlands_plateau": {
"id": 167, "id": 167,
"humidity": 0.0, "humidity": 0.0,
"temp": 2.0, "temp": 2.0,
"foliagecolor": "#9e814d",
"grasscolor": "#90814d",
"watercolor": 4159204 "watercolor": 4159204
}, },
"bamboo_jungle": { "minecraft:bamboo_jungle": {
"id": 168, "id": 168,
"humidity": 0.9, "humidity": 0.9,
"temp": 0.95, "temp": 0.95,
"watercolor": 4159204 "watercolor": 4159204
}, },
"bamboo_jungle_hills": { "minecraft:bamboo_jungle_hills": {
"id": 169, "id": 169,
"humidity": 0.9, "humidity": 0.9,
"temp": 0.95, "temp": 0.95,

View File

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

File diff suppressed because it is too large Load Diff