Skip to content

Commit

Permalink
add missing blocks and block colors
Browse files Browse the repository at this point in the history 
closes #68
closes #73
  • Loading branch information
@granny
granny committed Dec 12, 2024
1 parent 7d04354 commit 7321d93
Show file tree
Hide file tree
Showing 2 changed files with 170 additions and 22 deletions.
114 changes: 94 additions & 20 deletions core/src/main/java/net/pl3x/map/core/configuration/ColorsConfig.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -978,6 +978,98 @@ Setting a color to black (#000000) will make it invisible.""")
put("minecraft:yellow_wool", 0xF9C628);
put("minecraft:zombie_head", 0x52763F);
put("minecraft:zombie_wall_head", 0x52763F);
put("minecraft:oxidized_copper_grate", 0x52A385);
put("minecraft:weathered_copper_door", 0x6E966D);
put("minecraft:chiseled_tuff_bricks", 0x6E726A);
put("minecraft:polished_tuff", 0x626864);
put("minecraft:oxidized_copper_bulb", 0x45836C);
put("minecraft:waxed_copper_bulb", 0x9A5638);
put("minecraft:waxed_weathered_copper_door", 0x6E966D);
put("minecraft:waxed_weathered_chiseled_copper", 0x69966E);
put("minecraft:waxed_copper_door", 0xC06D52);
put("minecraft:waxed_exposed_copper_trapdoor", 0xA17D69);
put("minecraft:copper_door", 0xC06D52);
put("minecraft:tuff_brick_slab", 0x6E726A);
put("minecraft:waxed_exposed_copper_door", 0x876B62);
put("minecraft:exposed_copper_grate", 0xA27E68);
put("minecraft:copper_bulb", 0x9A5638);
put("minecraft:weathered_chiseled_copper", 0x69966E);
put("minecraft:trial_spawner", 0x385162);
put("minecraft:waxed_oxidized_copper_trapdoor", 0x52A385);
put("minecraft:waxed_weathered_copper_grate", 0x6A9A6F);
put("minecraft:exposed_copper_trapdoor", 0xA17D69);
put("minecraft:chiseled_copper", 0xB76449);
put("minecraft:chiseled_resin_bricks", 0xC95519);
put("minecraft:chiseled_tuff", 0x595E57);
put("minecraft:closed_eyeblossom", 0x007C00);
put("minecraft:copper_grate", 0xC06C4F);
put("minecraft:copper_trapdoor", 0xBF6A4F);
put("minecraft:crafter", 0x6F6061);
put("minecraft:creaking_heart", 0x483A34);
put("minecraft:exposed_chiseled_copper", 0x9A7764);
put("minecraft:exposed_copper_bulb", 0x856A59);
put("minecraft:exposed_copper_door", 0xA47B6A);
put("minecraft:heavy_core", 0x51555D);
put("minecraft:open_eyeblossom", 0x007C00);
put("minecraft:oxidized_chiseled_copper", 0x53A184);
put("minecraft:oxidized_copper_door", 0x52A084);
put("minecraft:oxidized_copper_trapdoor", 0x54A385);
put("minecraft:pale_hanging_moss", 0x636862);
put("minecraft:pale_moss_block", 0x6B7169);
put("minecraft:pale_moss_carpet", 0x6B7169);
put("minecraft:pale_oak_button", 0x000000);
put("minecraft:pale_oak_door", 0xE4DAD8);
put("minecraft:pale_oak_fence", 0xE4DAD8);
put("minecraft:pale_oak_fence_gate", 0xE4DAD8);
put("minecraft:pale_oak_hanging_sign", 0xE4DAD8);
put("minecraft:pale_oak_leaves", 0x757A73);
put("minecraft:pale_oak_log", 0x574D4B);
put("minecraft:pale_oak_planks", 0xE4DAD8);
put("minecraft:pale_oak_pressure_plate", 0xE4DAD8);
put("minecraft:pale_oak_sapling", 0x6E6A63);
put("minecraft:pale_oak_sign", 0xE4DAD8);
put("minecraft:pale_oak_slab", 0xE4DAD8);
put("minecraft:pale_oak_stairs", 0xE4DAD8);
put("minecraft:pale_oak_trapdoor", 0xE4DAD8);
put("minecraft:pale_oak_wall_hanging_sign", 0xE4DAD8);
put("minecraft:pale_oak_wall_sign", 0xE4DAD8);
put("minecraft:pale_oak_wood", 0x574D4B);
put("minecraft:polished_tuff_slab", 0x626864);
put("minecraft:polished_tuff_stairs", 0x626864);
put("minecraft:polished_tuff_wall", 0x626864);
put("minecraft:potted_closed_eyeblossom", 0x007C00);
put("minecraft:potted_open_eyeblossom", 0x007C00);
put("minecraft:potted_pale_oak_sapling", 0x6E6A63);
put("minecraft:resin_block", 0xD96319);
put("minecraft:resin_bricks", 0xCE5918);
put("minecraft:resin_brick_slab", 0xCE5918);
put("minecraft:resin_brick_stairs", 0xCE5918);
put("minecraft:resin_brick_wall", 0xCE5918);
put("minecraft:resin_clump", 0xDF701B);
put("minecraft:stripped_pale_oak_log", 0xF6EEED);
put("minecraft:stripped_pale_oak_wood", 0xF6EEED);
put("minecraft:tuff_bricks", 0x62675F);
put("minecraft:tuff_brick_stairs", 0x62675F);
put("minecraft:tuff_brick_wall", 0x62675F);
put("minecraft:tuff_slab", 0x62675F);
put("minecraft:tuff_stairs", 0x62675F);
put("minecraft:tuff_wall", 0x62675F);
put("minecraft:vault", 0x34454F);
put("minecraft:waxed_chiseled_copper", 0x53A184);
put("minecraft:waxed_copper_grate", 0xC06C4F);
put("minecraft:waxed_copper_trapdoor", 0xBF6A4F);
put("minecraft:waxed_exposed_chiseled_copper", 0x9A7764);
put("minecraft:waxed_exposed_copper_bulb", 0x856A59);
put("minecraft:waxed_exposed_copper_grate", 0xA27E68);
put("minecraft:waxed_oxidized_chiseled_copper", 0x53A184);
put("minecraft:waxed_oxidized_copper_bulb", 0x45836C);
put("minecraft:waxed_oxidized_copper_door", 0x52A084);
put("minecraft:waxed_oxidized_copper_grate", 0x52A385);
put("minecraft:waxed_weathered_copper_bulb", 0x5B7D63);
put("minecraft:waxed_weathered_copper_trapdoor", 0x6D9A6E);
put("minecraft:weathered_copper_bulb", 0x5B7D63);
put("minecraft:weathered_copper_grate", 0x6A9A6F);
put("minecraft:weathered_copper_trapdoor", 0x6D9A6E);
}};

@Key("biomes.colors")
Expand Down Expand Up @@ -1049,26 +1141,6 @@ Setting a color to black (#000000) will make it invisible.""")
put("minecraft:windswept_hills", 0x597D72);
put("minecraft:windswept_savanna", 0xE5DA87);
put("minecraft:wooded_badlands", 0xB09765);
put("minecraft:oxidized_copper_grate", 0x52A385);
put("minecraft:weathered_copper_door", 0x6E966D);
put("minecraft:chiseled_tuff_bricks", 0x6E726A);
put("minecraft:polished_tuff", 0x626864);
put("minecraft:oxidized_copper_bulb", 0x45836C);
put("minecraft:waxed_copper_bulb", 0x9A5638);
put("minecraft:waxed_weathered_copper_door", 0x6E966D);
put("minecraft:waxed_weathered_chiseled_copper", 0x69966E);
put("minecraft:waxed_copper_door", 0xC06D52);
put("minecraft:waxed_exposed_copper_trapdoor", 0xA17D69);
put("minecraft:copper_door", 0xC06D52);
put("minecraft:tuff_brick_slab", 0x6E726A);
put("minecraft:waxed_exposed_copper_door", 0x876B62);
put("minecraft:exposed_copper_grate", 0xA27E68);
put("minecraft:copper_bulb", 0x9A5638);
put("minecraft:weathered_chiseled_copper", 0x69966E);
put("minecraft:trial_spawner", 0x385162);
put("minecraft:waxed_oxidized_copper_trapdoor", 0x52A385);
put("minecraft:waxed_weathered_copper_grate", 0x69966E);
put("minecraft:exposed_copper_trapdoor", 0xA17D69);
}};

@Key("blocks.air")
Expand Down Expand Up @@ -1238,6 +1310,8 @@ Setting a color to black (#000000) will make it invisible.""")
add("minecraft:warped_trapdoor");
add("minecraft:white_carpet");
add("minecraft:yellow_carpet");
add("minecraft:pale_moss_carpet");
add("minecraft:pale_oak_pressure_plate");
}};

@Key("biomes.color-overrides.foliage")
Expand Down
78 changes: 76 additions & 2 deletions core/src/main/java/net/pl3x/map/core/world/Blocks.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -413,7 +413,7 @@ public class Blocks {
public static final Block GRANITE_SLAB = register(new Block(378, "minecraft:granite_slab", 0x976D4D));
public static final Block GRANITE_STAIRS = register(new Block(379, "minecraft:granite_stairs", 0x976D4D));
public static final Block GRANITE_WALL = register(new Block(380, "minecraft:granite_wall", 0x976D4D));
public static final Block GRASS = register(new Block(381, "minecraft:grass", 0x007C00));
public static final Block GRASS = register(new Block(381, "minecraft:grass", 0x007C00)); // TODO: remove in the future
public static final Block GRASS_BLOCK = register(new Block(382, "minecraft:grass_block", 0x7FB238));
public static final Block GRAVEL = register(new Block(383, "minecraft:gravel", 0x707070));
public static final Block GRAY_BANNER = register(new Block(384, "minecraft:gray_banner", 0x8F7748));
Expand Down Expand Up @@ -1053,10 +1053,84 @@ public class Blocks {
public static final Block WEATHERED_CHISELED_COPPER = register(new Block(1018, "minecraft:weathered_chiseled_copper", 0x69966E));
public static final Block TRIAL_SPAWNER = register(new Block(1019, "minecraft:trial_spawner", 0x385162));
public static final Block WAXED_OXIDIZED_COPPER_TRAPDOOR = register(new Block(1020, "minecraft:waxed_oxidized_copper_trapdoor", 0x52A385));
public static final Block WAXED_WEATHERED_COPPER_GRATE = register(new Block(1021, "minecraft:waxed_weathered_copper_grate", 0x69966E));
public static final Block WAXED_WEATHERED_COPPER_GRATE = register(new Block(1021, "minecraft:waxed_weathered_copper_grate", 0x6A9A6F));
public static final Block EXPOSED_COPPER_TRAPDOOR = register(new Block(1022, "minecraft:exposed_copper_trapdoor", 0xA17D69));
public static final Block SHORT_GRASS = register(new Block(1023, "minecraft:short_grass", 0x007C00));

// TODO: update indexes
public static final Block CHISELED_COPPER = register(new Block(-1, "minecraft:chiseled_copper", 0xB76449));
public static final Block CHISELED_RESIN_BRICKS = register(new Block(-1, "minecraft:chiseled_resin_bricks", 0xC95519));
public static final Block CHISELED_TUFF = register(new Block(-1, "minecraft:chiseled_tuff", 0x595E57));
public static final Block CLOSED_EYEBLOSSOM = register(new Block(-1, "minecraft:closed_eyeblossom", 0x007C00));
public static final Block COPPER_GRATE = register(new Block(-1, "minecraft:copper_grate", 0xC06C4F));
public static final Block COPPER_TRAPDOOR = register(new Block(-1, "minecraft:copper_trapdoor", 0xBF6A4F));
public static final Block CRAFTER = register(new Block(-1, "minecraft:crafter", 0x6F6061));
public static final Block CREAKING_HEART = register(new Block(-1, "minecraft:creaking_heart", 0x483A34));
public static final Block EXPOSED_CHISELED_COPPER = register(new Block(-1, "minecraft:exposed_chiseled_copper", 0x9A7764));
public static final Block EXPOSED_COPPER_BULB = register(new Block(-1, "minecraft:exposed_copper_bulb", 0x856A59));
public static final Block EXPOSED_COPPER_DOOR = register(new Block(-1, "minecraft:exposed_copper_door", 0xA47B6A));
public static final Block HEAVY_CORE = register(new Block(-1, "minecraft:heavy_core", 0x51555D));
public static final Block OPEN_EYEBLOSSOM = register(new Block(-1, "minecraft:open_eyeblossom", 0x007C00));
public static final Block OXIDIZED_CHISELED_COPPER = register(new Block(-1, "minecraft:oxidized_chiseled_copper", 0x53A184));
public static final Block OXIDIZED_COPPER_DOOR = register(new Block(-1, "minecraft:oxidized_copper_door", 0x52A084));
public static final Block OXIDIZED_COPPER_TRAPDOOR = register(new Block(-1, "minecraft:oxidized_copper_trapdoor", 0x54A385));
public static final Block PALE_HANGING_MOSS = register(new Block(-1, "minecraft:pale_hanging_moss", 0x636862));
public static final Block PALE_MOSS_BLOCK = register(new Block(-1, "minecraft:pale_moss_block", 0x6B7169));
public static final Block PALE_MOSS_CARPET = register(new Block(-1, "minecraft:pale_moss_carpet", 0x6B7169));
public static final Block PALE_OAK_BUTTON = register(new Block(-1, "minecraft:pale_oak_button", 0x000000));
public static final Block PALE_OAK_DOOR = register(new Block(-1, "minecraft:pale_oak_door", 0xE4DAD8));
public static final Block PALE_OAK_FENCE = register(new Block(-1, "minecraft:pale_oak_fence", 0xE4DAD8));
public static final Block PALE_OAK_FENCE_GATE = register(new Block(-1, "minecraft:pale_oak_fence_gate", 0xE4DAD8));
public static final Block PALE_OAK_HANGING_SIGN = register(new Block(-1, "minecraft:pale_oak_hanging_sign", 0xE4DAD8));
public static final Block PALE_OAK_LEAVES = register(new Block(-1, "minecraft:pale_oak_leaves", 0x757A73));
public static final Block PALE_OAK_LOG = register(new Block(-1, "minecraft:pale_oak_log", 0x574D4B));
public static final Block PALE_OAK_PLANKS = register(new Block(-1, "minecraft:pale_oak_planks", 0xE4DAD8));
public static final Block PALE_OAK_PRESSURE_PLATE = register(new Block(-1, "minecraft:pale_oak_pressure_plate", 0xE4DAD8));
public static final Block PALE_OAK_SAPLING = register(new Block(-1, "minecraft:pale_oak_sapling", 0x6E6A63));
public static final Block PALE_OAK_SIGN = register(new Block(-1, "minecraft:pale_oak_sign", 0xE4DAD8));
public static final Block PALE_OAK_SLAB = register(new Block(-1, "minecraft:pale_oak_slab", 0xE4DAD8));
public static final Block PALE_OAK_STAIRS = register(new Block(-1, "minecraft:pale_oak_stairs", 0xE4DAD8));
public static final Block PALE_OAK_TRAPDOOR = register(new Block(-1, "minecraft:pale_oak_trapdoor", 0xE4DAD8));
public static final Block PALE_OAK_WALL_HANGING_SIGN = register(new Block(-1, "minecraft:pale_oak_wall_hanging_sign", 0xE4DAD8));
public static final Block PALE_OAK_WALL_SIGN = register(new Block(-1, "minecraft:pale_oak_wall_sign", 0xE4DAD8));
public static final Block PALE_OAK_WOOD = register(new Block(-1, "minecraft:pale_oak_wood", 0x574D4B));
public static final Block POLISHED_TUFF_SLAB = register(new Block(-1, "minecraft:polished_tuff_slab", 0x626864));
public static final Block POLISHED_TUFF_STAIRS = register(new Block(-1, "minecraft:polished_tuff_stairs", 0x626864));
public static final Block POLISHED_TUFF_WALL = register(new Block(-1, "minecraft:polished_tuff_wall", 0x626864));
public static final Block POTTED_CLOSED_EYEBLOSSOM = register(new Block(-1, "minecraft:potted_closed_eyeblossom", 0x000000));
public static final Block POTTED_OPEN_EYEBLOSSOM = register(new Block(-1, "minecraft:potted_open_eyeblossom", 0x000000));
public static final Block POTTED_PALE_OAK_SAPLING = register(new Block(-1, "minecraft:potted_pale_oak_sapling", 0x000000));
public static final Block RESIN_BLOCK = register(new Block(-1, "minecraft:resin_block", 0xD96319));
public static final Block RESIN_BRICKS = register(new Block(-1, "minecraft:resin_bricks", 0xCE5918));
public static final Block RESIN_BRICK_SLAB = register(new Block(-1, "minecraft:resin_brick_slab", 0xCE5918));
public static final Block RESIN_BRICK_STAIRS = register(new Block(-1, "minecraft:resin_brick_stairs", 0xCE5918));
public static final Block RESIN_BRICK_WALL = register(new Block(-1, "minecraft:resin_brick_wall", 0xCE5918));
public static final Block RESIN_CLUMP = register(new Block(-1, "minecraft:resin_clump", 0xDF701B));
public static final Block STRIPPED_PALE_OAK_LOG = register(new Block(-1, "minecraft:stripped_pale_oak_log", 0xF6EEED));
public static final Block STRIPPED_PALE_OAK_WOOD = register(new Block(-1, "minecraft:stripped_pale_oak_wood", 0xF6EEED));
public static final Block TUFF_BRICKS = register(new Block(-1, "minecraft:tuff_bricks", 0x62675F));
public static final Block TUFF_BRICK_STAIRS = register(new Block(-1, "minecraft:tuff_brick_stairs", 0x62675F));
public static final Block TUFF_BRICK_WALL = register(new Block(-1, "minecraft:tuff_brick_wall", 0x62675F));
public static final Block TUFF_SLAB = register(new Block(-1, "minecraft:tuff_slab", 0x62675F));
public static final Block TUFF_STAIRS = register(new Block(-1, "minecraft:tuff_stairs", 0x62675F));
public static final Block TUFF_WALL = register(new Block(-1, "minecraft:tuff_wall", 0x62675F));
public static final Block VAULT = register(new Block(-1, "minecraft:vault", 0x34454F));
public static final Block WAXED_CHISELED_COPPER = register(new Block(-1, "minecraft:waxed_chiseled_copper", 0x53A184));
public static final Block WAXED_COPPER_GRATE = register(new Block(-1, "minecraft:waxed_copper_grate", 0xC06C4F));
public static final Block WAXED_COPPER_TRAPDOOR = register(new Block(-1, "minecraft:waxed_copper_trapdoor", 0xBF6A4F));
public static final Block WAXED_EXPOSED_CHISELED_COPPER = register(new Block(-1, "minecraft:waxed_exposed_chiseled_copper", 0x9A7764));
public static final Block WAXED_EXPOSED_COPPER_BULB = register(new Block(-1, "minecraft:waxed_exposed_copper_bulb", 0x856A59));
public static final Block WAXED_EXPOSED_COPPER_GRATE = register(new Block(-1, "minecraft:waxed_exposed_copper_grate", 0xA27E68));
public static final Block WAXED_OXIDIZED_CHISELED_COPPER = register(new Block(-1, "minecraft:waxed_oxidized_chiseled_copper", 0x53A184));
public static final Block WAXED_OXIDIZED_COPPER_BULB = register(new Block(-1, "minecraft:waxed_oxidized_copper_bulb", 0x45836C));
public static final Block WAXED_OXIDIZED_COPPER_DOOR = register(new Block(-1, "minecraft:waxed_oxidized_copper_door", 0x52A084));
public static final Block WAXED_OXIDIZED_COPPER_GRATE = register(new Block(-1, "minecraft:waxed_oxidized_copper_grate", 0x52A385));
public static final Block WAXED_WEATHERED_COPPER_BULB = register(new Block(-1, "minecraft:waxed_weathered_copper_bulb", 0x5B7D63));
public static final Block WAXED_WEATHERED_COPPER_TRAPDOOR = register(new Block(-1, "minecraft:waxed_weathered_copper_trapdoor", 0x6D9A6E));
public static final Block WEATHERED_COPPER_BULB = register(new Block(-1, "minecraft:weathered_copper_bulb", 0x5B7D63));
public static final Block WEATHERED_COPPER_GRATE = register(new Block(-1, "minecraft:weathered_copper_grate", 0x6A9A6F));
public static final Block WEATHERED_COPPER_TRAPDOOR = register(new Block(-1, "minecraft:weathered_copper_trapdoor", 0x6D9A6E));

private static @NotNull Block register(@NotNull Block block) {
blocks.put(block.getKey(), block);
return block;
Expand Down

0 comments on commit 7321d93

Please sign in to comment.