From 7bba6d08637105a65503708f0a752aa4b866c46b Mon Sep 17 00:00:00 2001 From: Bruno Saad Date: Tue, 7 Jun 2022 16:48:43 +0000 Subject: [PATCH] Adding new blocks for 1.19 --- resource/blocks.json | 83 ++++++++++++++++++++++++++++++++++ src/Resource/BlockType.inc.cpp | 45 ++++++++++++++++-- 2 files changed, 123 insertions(+), 5 deletions(-) diff --git a/resource/blocks.json b/resource/blocks.json index 78c0d4c..cfb908f 100644 --- a/resource/blocks.json +++ b/resource/blocks.json @@ -599,6 +599,7 @@ "texture": "flowering_azalea_top" }, "flowering_azalea_leaves": {}, + "frogspawn": {}, "frosted_ice": { "texture": "frosted_ice_0" }, @@ -889,6 +890,44 @@ "magma_block": { "texture": "magma" }, + "mangrove_button": null, + "mangrove_door": { + "texture": "mangrove_door_top" + }, + "mangrove_fence": { + "texture": "mangrove_planks" + }, + "mangrove_fence_gate": { + "texture": "mangrove_planks" + }, + "mangrove_leaves": { + "foliage": true + }, + "mangrove_log": { + "texture": "mangrove_log_top" + }, + "mangrove_planks": {}, + "mangrove_pressure_plate": { + "texture": "mangrove_planks" + }, + "mangrove_propagule": {}, + "mangrove_roots": { + "texture": "mangrove_roots_top" + }, + "mangrove_sign": { + "texture": "mangrove_planks" + }, + "mangrove_slab": { + "texture": "mangrove_planks" + }, + "mangrove_stairs": { + "texture": "mangrove_planks" + }, + "mangrove_trapdoor": {}, + "mangrove_wall_sign": null, + "mangrove_wood": { + "texture": "mangrove_log" + }, "medium_amethyst_bud": null, "melon": { "texture": "melon_top" @@ -921,6 +960,20 @@ }, "mossy_stone_bricks": {}, "moving_piston": null, + "mud": {}, + "mud_brick_slab": { + "texture": "mud_bricks" + }, + "mud_brick_stairs": { + "texture": "mud_bricks" + }, + "mud_brick_wall": { + "texture": "mud_bricks" + }, + "mud_bricks": {}, + "muddy_mangrove_roots": { + "texture": "muddy_mangrove_roots_top" + }, "mushroom_stem": {}, "mycelium": { "texture": "mycelium_top" @@ -988,6 +1041,9 @@ "texture": "observer_top" }, "obsidian": {}, + "ochre_froglight": { + "texture": "ochre_froglight_top" + }, "orange_banner": null, "orange_bed": null, "orange_candle": null, @@ -1019,6 +1075,10 @@ "texture": "oxidized_cut_copper" }, "packed_ice": {}, + "packed_mud": {}, + "pearlescent_froglight": { + "texture": "pearlescent_froglight_top" + }, "peony": { "texture": "peony_top" }, @@ -1180,6 +1240,9 @@ "potted_lily_of_the_valley": { "texture": "lily_of_the_valley" }, + "potted_mangrove_propagule": { + "texture": "mangrove_propagule" + }, "potted_oak_sapling": { "texture": "oak_sapling" }, @@ -1341,6 +1404,9 @@ "redstone_wire": { "texture": "redstone_block" }, + "reinforced_deepslate": { + "texture": "reinforced_deepslate_top" + }, "repeater": {}, "repeating_command_block": { "texture": "repeating_command_block_front" @@ -1368,9 +1434,17 @@ "scaffolding": { "texture": "scaffolding_top" }, + "sculk": {}, + "sculk_catalyst": { + "texture": "sculk_catalyst_top" + }, "sculk_sensor": { "texture": "sculk_sensor_top" }, + "sculk_shrieker": { + "texture": "sculk_shrieker_top" + }, + "sculk_vein": {}, "sea_lantern": {}, "sea_pickle": {}, "seagrass": null, @@ -1532,6 +1606,12 @@ "stripped_jungle_wood": { "texture": "stripped_jungle_log" }, + "stripped_mangrove_log": { + "texture": "stripped_mangrove_log_top" + }, + "stripped_mangrove_wood": { + "texture": "stripped_mangrove_log" + }, "stripped_oak_log": { "texture": "stripped_oak_log_top" }, @@ -1588,6 +1668,9 @@ "turtle_egg": {}, "twisting_vines": {}, "twisting_vines_plant": {}, + "verdant_froglight": { + "texture": "verdant_froglight_top" + }, "vine": { "grass": true }, diff --git a/src/Resource/BlockType.inc.cpp b/src/Resource/BlockType.inc.cpp index 9a4ff17..bc6c087 100644 --- a/src/Resource/BlockType.inc.cpp +++ b/src/Resource/BlockType.inc.cpp @@ -98,7 +98,7 @@ {"minecraft:brain_coral_block", {BLOCK_OPAQUE, {207, 91, 159}}}, {"minecraft:brain_coral_fan", {0, {0, 0, 0}}}, {"minecraft:brain_coral_wall_fan", {0, {0, 0, 0}}}, -{"minecraft:brewing_stand", {BLOCK_OPAQUE, {123, 101, 81}}}, +{"minecraft:brewing_stand", {BLOCK_OPAQUE, {122, 100, 80}}}, {"minecraft:brick_slab", {BLOCK_OPAQUE, {150, 97, 83}}}, {"minecraft:brick_stairs", {BLOCK_OPAQUE, {150, 97, 83}}}, {"minecraft:brick_wall", {BLOCK_OPAQUE, {150, 97, 83}}}, @@ -164,7 +164,7 @@ {"minecraft:cobblestone_stairs", {BLOCK_OPAQUE, {127, 127, 127}}}, {"minecraft:cobblestone_wall", {BLOCK_OPAQUE, {127, 127, 127}}}, {"minecraft:cobweb", {BLOCK_OPAQUE, {228, 233, 234}}}, -{"minecraft:cocoa", {BLOCK_OPAQUE, {156, 94, 43}}}, +{"minecraft:cocoa", {BLOCK_OPAQUE, {154, 91, 40}}}, {"minecraft:command_block", {BLOCK_OPAQUE, {181, 136, 108}}}, {"minecraft:comparator", {BLOCK_OPAQUE, {166, 161, 159}}}, {"minecraft:composter", {BLOCK_OPAQUE, {88, 61, 23}}}, @@ -321,6 +321,7 @@ {"minecraft:flower_pot", {BLOCK_OPAQUE, {124, 68, 53}}}, {"minecraft:flowering_azalea", {BLOCK_OPAQUE, {112, 121, 64}}}, {"minecraft:flowering_azalea_leaves", {BLOCK_OPAQUE, {99, 111, 60}}}, +{"minecraft:frogspawn", {BLOCK_OPAQUE, {105, 90, 82}}}, {"minecraft:frosted_ice", {BLOCK_OPAQUE, {140, 181, 252}}}, {"minecraft:furnace", {BLOCK_OPAQUE, {110, 109, 109}}}, {"minecraft:gilded_blackstone", {BLOCK_OPAQUE, {55, 42, 38}}}, @@ -487,6 +488,22 @@ {"minecraft:magenta_wall_banner", {0, {0, 0, 0}}}, {"minecraft:magenta_wool", {BLOCK_OPAQUE, {189, 68, 179}}}, {"minecraft:magma_block", {BLOCK_OPAQUE, {142, 63, 31}}}, +{"minecraft:mangrove_button", {0, {0, 0, 0}}}, +{"minecraft:mangrove_door", {BLOCK_OPAQUE, {112, 48, 46}}}, +{"minecraft:mangrove_fence", {BLOCK_OPAQUE, {117, 54, 48}}}, +{"minecraft:mangrove_fence_gate", {BLOCK_OPAQUE, {117, 54, 48}}}, +{"minecraft:mangrove_leaves", {BLOCK_OPAQUE|BLOCK_FOLIAGE, {129, 128, 128}}}, +{"minecraft:mangrove_log", {BLOCK_OPAQUE, {102, 48, 42}}}, +{"minecraft:mangrove_planks", {BLOCK_OPAQUE, {117, 54, 48}}}, +{"minecraft:mangrove_pressure_plate", {BLOCK_OPAQUE, {117, 54, 48}}}, +{"minecraft:mangrove_propagule", {BLOCK_OPAQUE, {96, 174, 83}}}, +{"minecraft:mangrove_roots", {BLOCK_OPAQUE, {74, 59, 38}}}, +{"minecraft:mangrove_sign", {BLOCK_OPAQUE, {117, 54, 48}}}, +{"minecraft:mangrove_slab", {BLOCK_OPAQUE, {117, 54, 48}}}, +{"minecraft:mangrove_stairs", {BLOCK_OPAQUE, {117, 54, 48}}}, +{"minecraft:mangrove_trapdoor", {BLOCK_OPAQUE, {110, 46, 42}}}, +{"minecraft:mangrove_wall_sign", {0, {0, 0, 0}}}, +{"minecraft:mangrove_wood", {BLOCK_OPAQUE, {83, 66, 41}}}, {"minecraft:medium_amethyst_bud", {0, {0, 0, 0}}}, {"minecraft:melon", {BLOCK_OPAQUE, {111, 144, 30}}}, {"minecraft:melon_stem", {BLOCK_OPAQUE|BLOCK_GRASS, {153, 153, 153}}}, @@ -501,6 +518,12 @@ {"minecraft:mossy_stone_brick_wall", {BLOCK_OPAQUE, {115, 121, 105}}}, {"minecraft:mossy_stone_bricks", {BLOCK_OPAQUE, {115, 121, 105}}}, {"minecraft:moving_piston", {0, {0, 0, 0}}}, +{"minecraft:mud", {BLOCK_OPAQUE, {60, 57, 60}}}, +{"minecraft:mud_brick_slab", {BLOCK_OPAQUE, {137, 103, 79}}}, +{"minecraft:mud_brick_stairs", {BLOCK_OPAQUE, {137, 103, 79}}}, +{"minecraft:mud_brick_wall", {BLOCK_OPAQUE, {137, 103, 79}}}, +{"minecraft:mud_bricks", {BLOCK_OPAQUE, {137, 103, 79}}}, +{"minecraft:muddy_mangrove_roots", {BLOCK_OPAQUE, {70, 58, 45}}}, {"minecraft:mushroom_stem", {BLOCK_OPAQUE, {203, 196, 185}}}, {"minecraft:mycelium", {BLOCK_OPAQUE, {111, 98, 101}}}, {"minecraft:nether_brick_fence", {BLOCK_OPAQUE, {44, 21, 26}}}, @@ -534,6 +557,7 @@ {"minecraft:oak_wood", {BLOCK_OPAQUE, {109, 85, 50}}}, {"minecraft:observer", {BLOCK_OPAQUE, {98, 98, 98}}}, {"minecraft:obsidian", {BLOCK_OPAQUE, {15, 10, 24}}}, +{"minecraft:ochre_froglight", {BLOCK_OPAQUE, {250, 245, 206}}}, {"minecraft:orange_banner", {0, {0, 0, 0}}}, {"minecraft:orange_bed", {0, {0, 0, 0}}}, {"minecraft:orange_candle", {0, {0, 0, 0}}}, @@ -555,6 +579,8 @@ {"minecraft:oxidized_cut_copper_slab", {BLOCK_OPAQUE, {79, 153, 126}}}, {"minecraft:oxidized_cut_copper_stairs", {BLOCK_OPAQUE, {79, 153, 126}}}, {"minecraft:packed_ice", {BLOCK_OPAQUE, {141, 180, 250}}}, +{"minecraft:packed_mud", {BLOCK_OPAQUE, {142, 106, 79}}}, +{"minecraft:pearlescent_froglight", {BLOCK_OPAQUE, {245, 240, 239}}}, {"minecraft:peony", {BLOCK_OPAQUE, {129, 126, 139}}}, {"minecraft:petrified_oak_slab", {BLOCK_OPAQUE, {162, 130, 78}}}, {"minecraft:pink_banner", {0, {0, 0, 0}}}, @@ -572,8 +598,8 @@ {"minecraft:pink_tulip", {0, {0, 0, 0}}}, {"minecraft:pink_wall_banner", {0, {0, 0, 0}}}, {"minecraft:pink_wool", {BLOCK_OPAQUE, {237, 141, 172}}}, -{"minecraft:piston", {BLOCK_OPAQUE, {110, 104, 96}}}, -{"minecraft:piston_head", {BLOCK_OPAQUE, {154, 127, 87}}}, +{"minecraft:piston", {BLOCK_OPAQUE, {109, 104, 96}}}, +{"minecraft:piston_head", {BLOCK_OPAQUE, {153, 127, 85}}}, {"minecraft:player_head", {0, {0, 0, 0}}}, {"minecraft:player_wall_head", {0, {0, 0, 0}}}, {"minecraft:podzol", {BLOCK_OPAQUE, {91, 63, 24}}}, @@ -623,6 +649,7 @@ {"minecraft:potted_flowering_azalea_bush", {BLOCK_OPAQUE, {112, 121, 64}}}, {"minecraft:potted_jungle_sapling", {BLOCK_OPAQUE, {47, 81, 16}}}, {"minecraft:potted_lily_of_the_valley", {BLOCK_OPAQUE, {123, 174, 95}}}, +{"minecraft:potted_mangrove_propagule", {BLOCK_OPAQUE, {96, 174, 83}}}, {"minecraft:potted_oak_sapling", {BLOCK_OPAQUE, {77, 106, 40}}}, {"minecraft:potted_orange_tulip", {BLOCK_OPAQUE, {93, 142, 30}}}, {"minecraft:potted_oxeye_daisy", {BLOCK_OPAQUE, {179, 202, 143}}}, @@ -706,6 +733,7 @@ {"minecraft:redstone_torch", {0, {0, 0, 0}}}, {"minecraft:redstone_wall_torch", {0, {0, 0, 0}}}, {"minecraft:redstone_wire", {BLOCK_OPAQUE, {175, 24, 5}}}, +{"minecraft:reinforced_deepslate", {BLOCK_OPAQUE, {80, 82, 78}}}, {"minecraft:repeater", {BLOCK_OPAQUE, {160, 157, 156}}}, {"minecraft:repeating_command_block", {BLOCK_OPAQUE, {129, 111, 176}}}, {"minecraft:respawn_anchor", {BLOCK_OPAQUE, {75, 26, 144}}}, @@ -717,7 +745,11 @@ {"minecraft:sandstone_stairs", {BLOCK_OPAQUE, {223, 214, 170}}}, {"minecraft:sandstone_wall", {BLOCK_OPAQUE, {223, 214, 170}}}, {"minecraft:scaffolding", {BLOCK_OPAQUE, {174, 134, 80}}}, +{"minecraft:sculk", {BLOCK_OPAQUE, {12, 29, 36}}}, +{"minecraft:sculk_catalyst", {BLOCK_OPAQUE, {15, 31, 38}}}, {"minecraft:sculk_sensor", {BLOCK_OPAQUE, {7, 70, 84}}}, +{"minecraft:sculk_shrieker", {BLOCK_OPAQUE, {198, 205, 169}}}, +{"minecraft:sculk_vein", {BLOCK_OPAQUE, {7, 48, 57}}}, {"minecraft:sea_lantern", {BLOCK_OPAQUE, {172, 199, 190}}}, {"minecraft:sea_pickle", {BLOCK_OPAQUE, {90, 97, 39}}}, {"minecraft:seagrass", {0, {0, 0, 0}}}, @@ -770,7 +802,7 @@ {"minecraft:spruce_trapdoor", {BLOCK_OPAQUE, {103, 79, 47}}}, {"minecraft:spruce_wall_sign", {0, {0, 0, 0}}}, {"minecraft:spruce_wood", {BLOCK_OPAQUE, {58, 37, 16}}}, -{"minecraft:sticky_piston", {BLOCK_OPAQUE, {110, 104, 96}}}, +{"minecraft:sticky_piston", {BLOCK_OPAQUE, {109, 104, 96}}}, {"minecraft:stone", {BLOCK_OPAQUE, {125, 125, 125}}}, {"minecraft:stone_brick_slab", {BLOCK_OPAQUE, {122, 121, 122}}}, {"minecraft:stone_brick_stairs", {BLOCK_OPAQUE, {122, 121, 122}}}, @@ -791,6 +823,8 @@ {"minecraft:stripped_dark_oak_wood", {BLOCK_OPAQUE, {72, 56, 36}}}, {"minecraft:stripped_jungle_log", {BLOCK_OPAQUE, {165, 122, 81}}}, {"minecraft:stripped_jungle_wood", {BLOCK_OPAQUE, {171, 132, 84}}}, +{"minecraft:stripped_mangrove_log", {BLOCK_OPAQUE, {109, 43, 43}}}, +{"minecraft:stripped_mangrove_wood", {BLOCK_OPAQUE, {119, 54, 47}}}, {"minecraft:stripped_oak_log", {BLOCK_OPAQUE, {160, 129, 77}}}, {"minecraft:stripped_oak_wood", {BLOCK_OPAQUE, {177, 144, 86}}}, {"minecraft:stripped_spruce_log", {BLOCK_OPAQUE, {105, 80, 46}}}, @@ -820,6 +854,7 @@ {"minecraft:turtle_egg", {BLOCK_OPAQUE, {228, 226, 191}}}, {"minecraft:twisting_vines", {BLOCK_OPAQUE, {20, 143, 124}}}, {"minecraft:twisting_vines_plant", {BLOCK_OPAQUE, {20, 135, 122}}}, +{"minecraft:verdant_froglight", {BLOCK_OPAQUE, {229, 244, 228}}}, {"minecraft:vine", {BLOCK_OPAQUE|BLOCK_GRASS, {116, 116, 116}}}, {"minecraft:void_air", {0, {0, 0, 0}}}, {"minecraft:wall_sign", {0, {0, 0, 0}}},