Skip to content

Commit

Permalink
Updated test files
Browse files Browse the repository at this point in the history
  • Loading branch information
SmokeyStack committed Jun 8, 2024
1 parent 72fe896 commit e2a2783
Show file tree
Hide file tree
Showing 192 changed files with 189 additions and 195 deletions.
4 changes: 0 additions & 4 deletions test/BlockTest.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,6 @@ TEST(BlockTest, BlockBasic) {
mod->Subscribe("block_basic_box_collision_vector", new Block(BlockProperty().SetBoxCollision(std::vector<int>{-4, 0, -4}, std::vector<int>{8, 8, 8})));
mod->Subscribe("block_basic_box_selection_bool", new Block(BlockProperty().SetBoxSelection(false)));
mod->Subscribe("block_basic_box_selection_vector", new Block(BlockProperty().SetBoxSelection(std::vector<int>{-4, 0, -4}, std::vector<int>{8, 8, 8})));
mod->Subscribe("block_basic_creative_category", new Block(BlockProperty().SetCreativeCategory(adk::CreativeCategory::CONSTRUCTION)));
mod->Subscribe("block_basic_creative_group", new Block(BlockProperty().SetCreativeCategory(adk::CreativeCategory::CONSTRUCTION, adk::CreativeGroup::SMITHINGTEMPLATES)));
mod->Subscribe("block_basic_filter_tags", new Block(BlockProperty().SetBlockPlacementFilter(filter_tags)));
mod->Subscribe("block_basic_filter_states", new Block(BlockProperty().SetBlockPlacementFilter(filter_states)));

Expand All @@ -105,8 +103,6 @@ TEST(BlockTest, BlockBasic) {
EXPECT_EQ(true, CompareFiles("./files/blocks/block_basic_box_collision_vector.json", "./BP/blocks/block_basic_box_collision_vector.json")) << "SetBoxCollision (vector) is not working as expected";
EXPECT_EQ(true, CompareFiles("./files/blocks/block_basic_box_selection_bool.json", "./BP/blocks/block_basic_box_selection_bool.json")) << "SetBoxSelection (bool) is not working as expected";
EXPECT_EQ(true, CompareFiles("./files/blocks/block_basic_box_selection_vector.json", "./BP/blocks/block_basic_box_selection_vector.json")) << "SetBoxSelection (vector) is not working as expected";
EXPECT_EQ(true, CompareFiles("./files/blocks/block_basic_creative_category.json", "./BP/blocks/block_basic_creative_category.json")) << "SetCreativeCategory (category) is not working as expected";
EXPECT_EQ(true, CompareFiles("./files/blocks/block_basic_creative_group.json", "./BP/blocks/block_basic_creative_group.json")) << "SetCreativeCategory (group) is not working as expected";
EXPECT_EQ(true, CompareFiles("./files/blocks/block_basic_filter_tags.json", "./BP/blocks/block_basic_filter_tags.json")) << "SetBlockPlacementFilter (tags) is not working as expected";
EXPECT_EQ(true, CompareFiles("./files/blocks/block_basic_filter_states.json", "./BP/blocks/block_basic_filter_states.json")) << "SetBlockPlacementFilter (states) is not working as expected";
}
Expand Down
2 changes: 1 addition & 1 deletion test/files/blocks/block_basic.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"format_version":"1.20.80","minecraft:block":{"description":{"identifier":"custom_namespace:block_basic"}}}
{"format_version":"1.21.10","minecraft:block":{"description":{"identifier":"custom_namespace:block_basic"}}}
2 changes: 1 addition & 1 deletion test/files/blocks/block_basic_box_collision_bool.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"format_version":"1.20.80","minecraft:block":{"components":{"minecraft:collision_box":false},"description":{"identifier":"custom_namespace:block_basic_box_collision_bool"}}}
{"format_version":"1.21.10","minecraft:block":{"components":{"minecraft:collision_box":false},"description":{"identifier":"custom_namespace:block_basic_box_collision_bool"}}}
2 changes: 1 addition & 1 deletion test/files/blocks/block_basic_box_collision_vector.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"format_version":"1.20.80","minecraft:block":{"components":{"minecraft:collision_box":{"origin":[-4,0,-4],"size":[8,8,8]}},"description":{"identifier":"custom_namespace:block_basic_box_collision_vector"}}}
{"format_version":"1.21.10","minecraft:block":{"components":{"minecraft:collision_box":{"origin":[-4,0,-4],"size":[8,8,8]}},"description":{"identifier":"custom_namespace:block_basic_box_collision_vector"}}}
2 changes: 1 addition & 1 deletion test/files/blocks/block_basic_box_selection_bool.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"format_version":"1.20.80","minecraft:block":{"components":{"minecraft:selection_box":false},"description":{"identifier":"custom_namespace:block_basic_box_selection_bool"}}}
{"format_version":"1.21.10","minecraft:block":{"components":{"minecraft:selection_box":false},"description":{"identifier":"custom_namespace:block_basic_box_selection_bool"}}}
2 changes: 1 addition & 1 deletion test/files/blocks/block_basic_box_selection_vector.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"format_version":"1.20.80","minecraft:block":{"components":{"minecraft:selection_box":{"origin":[-4,0,-4],"size":[8,8,8]}},"description":{"identifier":"custom_namespace:block_basic_box_selection_vector"}}}
{"format_version":"1.21.10","minecraft:block":{"components":{"minecraft:selection_box":{"origin":[-4,0,-4],"size":[8,8,8]}},"description":{"identifier":"custom_namespace:block_basic_box_selection_vector"}}}
2 changes: 1 addition & 1 deletion test/files/blocks/block_basic_crafting.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"format_version":"1.20.80","minecraft:block":{"components":{"minecraft:crafting_table":{"crafting_tags":["crafting_table"],"table_name":"Custom Crafting Table"}},"description":{"identifier":"custom_namespace:block_basic_crafting"}}}
{"format_version":"1.21.10","minecraft:block":{"components":{"minecraft:crafting_table":{"crafting_tags":["crafting_table"],"table_name":"Custom Crafting Table"}},"description":{"identifier":"custom_namespace:block_basic_crafting"}}}
1 change: 0 additions & 1 deletion test/files/blocks/block_basic_creative_category.json

This file was deleted.

1 change: 0 additions & 1 deletion test/files/blocks/block_basic_creative_group.json

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"format_version":"1.20.80","minecraft:block":{"components":{"minecraft:destructible_by_explosion":false},"description":{"identifier":"custom_namespace:block_basic_destructible_by_explosion_bool"}}}
{"format_version":"1.21.10","minecraft:block":{"components":{"minecraft:destructible_by_explosion":false},"description":{"identifier":"custom_namespace:block_basic_destructible_by_explosion_bool"}}}
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"format_version":"1.20.80","minecraft:block":{"components":{"minecraft:destructible_by_explosion":{"explosion_resistance":5.5}},"description":{"identifier":"custom_namespace:block_basic_destructible_by_explosion_double"}}}
{"format_version":"1.21.10","minecraft:block":{"components":{"minecraft:destructible_by_explosion":{"explosion_resistance":5.5}},"description":{"identifier":"custom_namespace:block_basic_destructible_by_explosion_double"}}}
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"format_version":"1.20.80","minecraft:block":{"components":{"minecraft:destructible_by_mining":false},"description":{"identifier":"custom_namespace:block_basic_destructible_by_mining_bool"}}}
{"format_version":"1.21.10","minecraft:block":{"components":{"minecraft:destructible_by_mining":false},"description":{"identifier":"custom_namespace:block_basic_destructible_by_mining_bool"}}}
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"format_version":"1.20.80","minecraft:block":{"components":{"minecraft:destructible_by_mining":{"seconds_to_destroy":5.5}},"description":{"identifier":"custom_namespace:block_basic_destructible_by_mining_double"}}}
{"format_version":"1.21.10","minecraft:block":{"components":{"minecraft:destructible_by_mining":{"seconds_to_destroy":5.5}},"description":{"identifier":"custom_namespace:block_basic_destructible_by_mining_double"}}}
2 changes: 1 addition & 1 deletion test/files/blocks/block_basic_display_name.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"format_version":"1.20.80","minecraft:block":{"components":{"minecraft:display_name":"Custom Name"},"description":{"identifier":"custom_namespace:block_basic_display_name"}}}
{"format_version":"1.21.10","minecraft:block":{"components":{"minecraft:display_name":"Custom Name"},"description":{"identifier":"custom_namespace:block_basic_display_name"}}}
2 changes: 1 addition & 1 deletion test/files/blocks/block_basic_filter_states.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"format_version":"1.20.80","minecraft:block":{"components":{"minecraft:placement_filter":{"conditions":[{"allowed_faces":["up"],"block_filter":[{"name":"minecraft:dirt"},{"name":"minecraft:stone"}]}]}},"description":{"identifier":"custom_namespace:block_basic_filter_states"}}}
{"format_version":"1.21.10","minecraft:block":{"components":{"minecraft:placement_filter":{"conditions":[{"allowed_faces":["up"],"block_filter":[{"name":"minecraft:dirt"},{"name":"minecraft:stone"}]}]}},"description":{"identifier":"custom_namespace:block_basic_filter_states"}}}
2 changes: 1 addition & 1 deletion test/files/blocks/block_basic_filter_tags.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"format_version":"1.20.80","minecraft:block":{"components":{"minecraft:placement_filter":{"conditions":[{"allowed_faces":["up"],"block_filter":[{"tags":"q.any_tag('dirt','stone')"}]}]}},"description":{"identifier":"custom_namespace:block_basic_filter_tags"}}}
{"format_version":"1.21.10","minecraft:block":{"components":{"minecraft:placement_filter":{"conditions":[{"allowed_faces":["up"],"block_filter":[{"tags":"q.any_tag('dirt','stone')"}]}]}},"description":{"identifier":"custom_namespace:block_basic_filter_tags"}}}
2 changes: 1 addition & 1 deletion test/files/blocks/block_basic_flammable_bool.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"format_version":"1.20.80","minecraft:block":{"components":{"minecraft:flammable":false},"description":{"identifier":"custom_namespace:block_basic_flammable_bool"}}}
{"format_version":"1.21.10","minecraft:block":{"components":{"minecraft:flammable":false},"description":{"identifier":"custom_namespace:block_basic_flammable_bool"}}}
2 changes: 1 addition & 1 deletion test/files/blocks/block_basic_flammable_object.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"format_version":"1.20.80","minecraft:block":{"components":{"minecraft:flammable":{"catch_chance_modifier":5,"destroy_chance_modifier":5}},"description":{"identifier":"custom_namespace:block_basic_flammable_object"}}}
{"format_version":"1.21.10","minecraft:block":{"components":{"minecraft:flammable":{"catch_chance_modifier":5,"destroy_chance_modifier":5}},"description":{"identifier":"custom_namespace:block_basic_flammable_object"}}}
2 changes: 1 addition & 1 deletion test/files/blocks/block_basic_friction.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"format_version":"1.20.80","minecraft:block":{"components":{"minecraft:friction":0.5},"description":{"identifier":"custom_namespace:block_basic_friction"}}}
{"format_version":"1.21.10","minecraft:block":{"components":{"minecraft:friction":0.5},"description":{"identifier":"custom_namespace:block_basic_friction"}}}
2 changes: 1 addition & 1 deletion test/files/blocks/block_basic_light_dampening.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"format_version":"1.20.80","minecraft:block":{"components":{"minecraft:light_dampening":5},"description":{"identifier":"custom_namespace:block_basic_light_dampening"}}}
{"format_version":"1.21.10","minecraft:block":{"components":{"minecraft:light_dampening":5},"description":{"identifier":"custom_namespace:block_basic_light_dampening"}}}
2 changes: 1 addition & 1 deletion test/files/blocks/block_basic_light_emission.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"format_version":"1.20.80","minecraft:block":{"components":{"minecraft:light_emission":5},"description":{"identifier":"custom_namespace:block_basic_light_emission"}}}
{"format_version":"1.21.10","minecraft:block":{"components":{"minecraft:light_emission":5},"description":{"identifier":"custom_namespace:block_basic_light_emission"}}}
2 changes: 1 addition & 1 deletion test/files/blocks/block_basic_loot.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"format_version":"1.20.80","minecraft:block":{"components":{"minecraft:loot":"path/to/loot.json"},"description":{"identifier":"custom_namespace:block_basic_loot"}}}
{"format_version":"1.21.10","minecraft:block":{"components":{"minecraft:loot":"path/to/loot.json"},"description":{"identifier":"custom_namespace:block_basic_loot"}}}
2 changes: 1 addition & 1 deletion test/files/blocks/block_basic_map_color_hex.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"format_version":"1.20.80","minecraft:block":{"components":{"minecraft:map_color":"#FF9900"},"description":{"identifier":"custom_namespace:block_basic_map_color_hex"}}}
{"format_version":"1.21.10","minecraft:block":{"components":{"minecraft:map_color":"#FF9900"},"description":{"identifier":"custom_namespace:block_basic_map_color_hex"}}}
2 changes: 1 addition & 1 deletion test/files/blocks/block_basic_map_color_rgb.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"format_version":"1.20.80","minecraft:block":{"components":{"minecraft:map_color":[33,33,33]},"description":{"identifier":"custom_namespace:block_basic_map_color_rgb"}}}
{"format_version":"1.21.10","minecraft:block":{"components":{"minecraft:map_color":[33,33,33]},"description":{"identifier":"custom_namespace:block_basic_map_color_rgb"}}}
2 changes: 1 addition & 1 deletion test/files/blocks/block_basic_rotation.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"format_version":"1.20.80","minecraft:block":{"components":{"minecraft:transformation":{"rotation":[90,90,90]}},"description":{"identifier":"custom_namespace:block_basic_rotation"}}}
{"format_version":"1.21.10","minecraft:block":{"components":{"minecraft:transformation":{"rotation":[90,90,90]}},"description":{"identifier":"custom_namespace:block_basic_rotation"}}}
2 changes: 1 addition & 1 deletion test/files/blocks/block_basic_scale.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"format_version":"1.20.80","minecraft:block":{"description":{"identifier":"custom_namespace:block_basic_scale"}}}
{"format_version":"1.21.10","minecraft:block":{"description":{"identifier":"custom_namespace:block_basic_scale"}}}
2 changes: 1 addition & 1 deletion test/files/blocks/block_basic_translation.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"format_version":"1.20.80","minecraft:block":{"description":{"identifier":"custom_namespace:block_basic_translation"}}}
{"format_version":"1.21.10","minecraft:block":{"description":{"identifier":"custom_namespace:block_basic_translation"}}}
2 changes: 1 addition & 1 deletion test/files/items/item_armor.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"format_version":"1.20.80","minecraft:item":{"components":{"minecraft:durability":{"damage_chance":{"max":100,"min":60},"max_durability":55},"minecraft:enchantable":{"slot":"armor_head","value":15},"minecraft:repairable":{"repair_items":[{"items":["minecraft:leather"],"repair_amount":"math.floor(q.max_durability * 0.25)"}]},"minecraft:tags":{"tags":["minecraft:is_armor","minecraft:trimmable_armors"]},"minecraft:wearable":{"protection":1,"slot":"slot.armor.head"}},"description":{"identifier":"custom_namespace:item_armor"}}}
{"format_version":"1.21.10","minecraft:item":{"components":{"minecraft:durability":{"damage_chance":{"max":100,"min":60},"max_durability":55},"minecraft:enchantable":{"slot":"armor_head","value":15},"minecraft:repairable":{"repair_items":[{"items":["minecraft:leather"],"repair_amount":"math.floor(q.max_durability * 0.25)"}]},"minecraft:tags":{"tags":["minecraft:is_armor","minecraft:trimmable_armors"]},"minecraft:wearable":{"protection":1,"slot":"slot.armor.head"}},"description":{"identifier":"custom_namespace:item_armor"}}}
2 changes: 1 addition & 1 deletion test/files/items/item_armor_allow_off_hand.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"format_version":"1.20.80","minecraft:item":{"components":{"minecraft:allow_off_hand":{"value":true},"minecraft:durability":{"damage_chance":{"max":100,"min":60},"max_durability":55},"minecraft:enchantable":{"slot":"armor_head","value":15},"minecraft:repairable":{"repair_items":[{"items":["minecraft:leather"],"repair_amount":"math.floor(q.max_durability * 0.25)"}]},"minecraft:tags":{"tags":["minecraft:is_armor","minecraft:trimmable_armors"]},"minecraft:wearable":{"protection":1,"slot":"slot.armor.head"}},"description":{"identifier":"custom_namespace:item_armor_allow_off_hand"}}}
{"format_version":"1.21.10","minecraft:item":{"components":{"minecraft:allow_off_hand":{"value":true},"minecraft:durability":{"damage_chance":{"max":100,"min":60},"max_durability":55},"minecraft:enchantable":{"slot":"armor_head","value":15},"minecraft:repairable":{"repair_items":[{"items":["minecraft:leather"],"repair_amount":"math.floor(q.max_durability * 0.25)"}]},"minecraft:tags":{"tags":["minecraft:is_armor","minecraft:trimmable_armors"]},"minecraft:wearable":{"protection":1,"slot":"slot.armor.head"}},"description":{"identifier":"custom_namespace:item_armor_allow_off_hand"}}}
2 changes: 1 addition & 1 deletion test/files/items/item_armor_block_placer.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"format_version":"1.20.80","minecraft:item":{"components":{"minecraft:block_placer":{"block":"minecraft:bedrock"},"minecraft:durability":{"damage_chance":{"max":100,"min":60},"max_durability":55},"minecraft:enchantable":{"slot":"armor_head","value":15},"minecraft:repairable":{"repair_items":[{"items":["minecraft:leather"],"repair_amount":"math.floor(q.max_durability * 0.25)"}]},"minecraft:tags":{"tags":["minecraft:is_armor","minecraft:trimmable_armors"]},"minecraft:wearable":{"protection":1,"slot":"slot.armor.head"}},"description":{"identifier":"custom_namespace:item_armor_block_placer"}}}
{"format_version":"1.21.10","minecraft:item":{"components":{"minecraft:block_placer":{"block":"minecraft:bedrock"},"minecraft:durability":{"damage_chance":{"max":100,"min":60},"max_durability":55},"minecraft:enchantable":{"slot":"armor_head","value":15},"minecraft:repairable":{"repair_items":[{"items":["minecraft:leather"],"repair_amount":"math.floor(q.max_durability * 0.25)"}]},"minecraft:tags":{"tags":["minecraft:is_armor","minecraft:trimmable_armors"]},"minecraft:wearable":{"protection":1,"slot":"slot.armor.head"}},"description":{"identifier":"custom_namespace:item_armor_block_placer"}}}
2 changes: 1 addition & 1 deletion test/files/items/item_armor_block_placer_use_on.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"format_version":"1.20.80","minecraft:item":{"components":{"minecraft:block_placer":{"block":"minecraft:bedrock","use_on":["minecraft:grass","minecraft:glass"]},"minecraft:durability":{"damage_chance":{"max":100,"min":60},"max_durability":55},"minecraft:enchantable":{"slot":"armor_head","value":15},"minecraft:repairable":{"repair_items":[{"items":["minecraft:leather"],"repair_amount":"math.floor(q.max_durability * 0.25)"}]},"minecraft:tags":{"tags":["minecraft:is_armor","minecraft:trimmable_armors"]},"minecraft:wearable":{"protection":1,"slot":"slot.armor.head"}},"description":{"identifier":"custom_namespace:item_armor_block_placer_use_on"}}}
{"format_version":"1.21.10","minecraft:item":{"components":{"minecraft:block_placer":{"block":"minecraft:bedrock","use_on":["minecraft:grass","minecraft:glass"]},"minecraft:durability":{"damage_chance":{"max":100,"min":60},"max_durability":55},"minecraft:enchantable":{"slot":"armor_head","value":15},"minecraft:repairable":{"repair_items":[{"items":["minecraft:leather"],"repair_amount":"math.floor(q.max_durability * 0.25)"}]},"minecraft:tags":{"tags":["minecraft:is_armor","minecraft:trimmable_armors"]},"minecraft:wearable":{"protection":1,"slot":"slot.armor.head"}},"description":{"identifier":"custom_namespace:item_armor_block_placer_use_on"}}}
2 changes: 1 addition & 1 deletion test/files/items/item_armor_can_destroy_in_creative.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"format_version":"1.20.80","minecraft:item":{"components":{"minecraft:can_destroy_in_creative":{"value":false},"minecraft:durability":{"damage_chance":{"max":100,"min":60},"max_durability":55},"minecraft:enchantable":{"slot":"armor_head","value":15},"minecraft:repairable":{"repair_items":[{"items":["minecraft:leather"],"repair_amount":"math.floor(q.max_durability * 0.25)"}]},"minecraft:tags":{"tags":["minecraft:is_armor","minecraft:trimmable_armors"]},"minecraft:wearable":{"protection":1,"slot":"slot.armor.head"}},"description":{"identifier":"custom_namespace:item_armor_can_destroy_in_creative"}}}
{"format_version":"1.21.10","minecraft:item":{"components":{"minecraft:can_destroy_in_creative":{"value":false},"minecraft:durability":{"damage_chance":{"max":100,"min":60},"max_durability":55},"minecraft:enchantable":{"slot":"armor_head","value":15},"minecraft:repairable":{"repair_items":[{"items":["minecraft:leather"],"repair_amount":"math.floor(q.max_durability * 0.25)"}]},"minecraft:tags":{"tags":["minecraft:is_armor","minecraft:trimmable_armors"]},"minecraft:wearable":{"protection":1,"slot":"slot.armor.head"}},"description":{"identifier":"custom_namespace:item_armor_can_destroy_in_creative"}}}
Loading

0 comments on commit e2a2783

Please sign in to comment.