From e02e4f4eda408ebf0241772b15bf899e7ecfd1c2 Mon Sep 17 00:00:00 2001 From: SammySemicolon Date: Thu, 5 Dec 2024 22:12:05 +0100 Subject: [PATCH] Fix the stupid thing and also datagen --- .../data/c/tags/block/fence_gates/wooden.json | 4 +- .../resources/data/c/tags/block/ores.json | 10 +- .../data/c/tags/block/storage_blocks.json | 34 +-- .../damage_type/can_trigger_magic_damage.json | 0 .../tags/damage_type/is_magic.json | 0 .../tags/item/nuggets/copper.json | 0 .../resources/data/c/tags/item/ores.json | 10 +- .../data/c/tags/item/storage_blocks.json | 34 +-- .../tags/block/tray_heat_sources.json | 12 +- .../misc/copper_ingot_from_nugget.json | 2 +- .../misc/copper_nugget_from_ingot.json | 2 +- .../spirit_crucible/repair/diamond.json | 14 +- .../recipe/spirit_crucible/repair/gold.json | 10 +- .../recipe/spirit_crucible/repair/iron.json | 10 +- .../spirit_crucible/repair/netherite.json | 12 +- .../recipe/spirit_crucible/repair/stone.json | 6 +- .../recipe/spirit_crucible/repair/wooden.json | 6 +- .../malum/tags/block/blighted_blocks.json | 4 +- .../malum/tags/block/blighted_plants.json | 6 +- .../data/malum/tags/block/rite_immune.json | 6 +- .../data/malum/tags/block/runewood_logs.json | 8 +- .../data/malum/tags/block/soulwood_logs.json | 10 +- .../data/malum/tags/block/tainted_rock.json | 84 +++--- .../malum/tags/block/tainted_rock_blocks.json | 8 +- .../malum/tags/block/tainted_rock_slabs.json | 12 +- .../malum/tags/block/tainted_rock_stairs.json | 6 +- .../malum/tags/block/tainted_rock_walls.json | 8 +- .../data/malum/tags/block/twisted_rock.json | 76 ++--- .../malum/tags/block/twisted_rock_blocks.json | 10 +- .../malum/tags/block/twisted_rock_slabs.json | 8 +- .../malum/tags/block/twisted_rock_stairs.json | 10 +- .../malum/tags/block/twisted_rock_walls.json | 10 +- .../tags/block/beacon_base_blocks.json | 16 +- .../data/minecraft/tags/block/buttons.json | 4 +- .../minecraft/tags/block/fence_gates.json | 4 +- .../data/minecraft/tags/block/leaves.json | 6 +- .../data/minecraft/tags/block/logs.json | 18 +- .../minecraft/tags/block/mineable/axe.json | 176 ++++++------ .../minecraft/tags/block/mineable/hoe.json | 14 +- .../tags/block/mineable/pickaxe.json | 268 +++++++++--------- .../minecraft/tags/block/mineable/shovel.json | 4 +- .../data/minecraft/tags/block/planks.json | 22 +- .../minecraft/tags/block/pressure_plates.json | 6 +- .../data/minecraft/tags/block/saplings.json | 4 +- .../data/minecraft/tags/block/signs.json | 4 +- .../data/minecraft/tags/block/slabs.json | 50 ++-- .../data/minecraft/tags/block/stairs.json | 50 ++-- .../minecraft/tags/block/standing_signs.json | 4 +- .../data/minecraft/tags/block/trapdoors.json | 4 +- .../tags/block/wall_post_override.json | 10 +- .../data/minecraft/tags/block/walls.json | 24 +- .../minecraft/tags/block/wooden_slabs.json | 20 +- .../minecraft/tags/block/wooden_stairs.json | 22 +- .../tags/block/wooden_trapdoors.json | 4 +- .../data/minecraft/tags/item/buttons.json | 4 +- .../data/minecraft/tags/item/leaves.json | 6 +- .../data/minecraft/tags/item/planks.json | 22 +- .../data/minecraft/tags/item/saplings.json | 4 +- .../data/minecraft/tags/item/slabs.json | 50 ++-- .../data/minecraft/tags/item/stairs.json | 50 ++-- .../data/minecraft/tags/item/trapdoors.json | 4 +- .../data/minecraft/tags/item/walls.json | 24 +- .../minecraft/tags/item/wooden_slabs.json | 20 +- .../minecraft/tags/item/wooden_stairs.json | 22 +- .../minecraft/tags/item/wooden_trapdoors.json | 4 +- .../neoforge/tags/block/stripped_logs.json | 6 +- .../neoforge/tags/item/stripped_logs.json | 6 +- .../farmersdelight/FarmersDelightCompat.java | 5 +- .../malum/mixin/MappedRegistryMixin.java | 2 +- .../registry/common/item/ItemRegistry.java | 8 +- .../malum/registry/common/item/ItemTiers.java | 93 +++--- 71 files changed, 748 insertions(+), 748 deletions(-) rename src/generated/resources/data/{forge => c}/tags/damage_type/can_trigger_magic_damage.json (100%) rename src/generated/resources/data/{forge => c}/tags/damage_type/is_magic.json (100%) rename src/generated/resources/data/{forge => c}/tags/item/nuggets/copper.json (100%) diff --git a/src/generated/resources/data/c/tags/block/fence_gates/wooden.json b/src/generated/resources/data/c/tags/block/fence_gates/wooden.json index 1e5b1b788..1bb88c472 100644 --- a/src/generated/resources/data/c/tags/block/fence_gates/wooden.json +++ b/src/generated/resources/data/c/tags/block/fence_gates/wooden.json @@ -1,6 +1,6 @@ { "values": [ - "malum:soulwood_planks_fence_gate", - "malum:runewood_planks_fence_gate" + "malum:runewood_planks_fence_gate", + "malum:soulwood_planks_fence_gate" ] } \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/block/ores.json b/src/generated/resources/data/c/tags/block/ores.json index c611380f7..3e0a84e17 100644 --- a/src/generated/resources/data/c/tags/block/ores.json +++ b/src/generated/resources/data/c/tags/block/ores.json @@ -1,12 +1,12 @@ { "values": [ - "malum:natural_quartz_ore", - "malum:deepslate_soulstone_ore", "malum:deepslate_quartz_ore", - "malum:brilliant_deepslate", - "malum:blazing_quartz_ore", "malum:soulstone_ore", + "malum:natural_quartz_ore", + "malum:brilliant_stone", "malum:cthonic_gold_ore", - "malum:brilliant_stone" + "malum:deepslate_soulstone_ore", + "malum:blazing_quartz_ore", + "malum:brilliant_deepslate" ] } \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/block/storage_blocks.json b/src/generated/resources/data/c/tags/block/storage_blocks.json index e51a9abb1..08e50f4de 100644 --- a/src/generated/resources/data/c/tags/block/storage_blocks.json +++ b/src/generated/resources/data/c/tags/block/storage_blocks.json @@ -1,27 +1,27 @@ { "values": [ + "malum:block_of_hallowed_gold", + "malum:block_of_soulstone", + "malum:block_of_malignant_pewter", + "malum:block_of_arcane_charcoal", + "malum:block_of_auric_embers", + "malum:block_of_rotting_essence", + "malum:block_of_void_salts", "malum:block_of_malignant_lead", - "malum:block_of_astral_weave", - "malum:block_of_mnemonic_fragment", + "malum:block_of_blazing_quartz", + "malum:block_of_alchemical_calx", "malum:block_of_raw_soulstone", - "malum:block_of_cthonic_gold", + "malum:block_of_null_slate", + "malum:block_of_mnemonic_fragment", "malum:cursed_sap_block", - "malum:block_of_living_flesh", - "malum:block_of_void_salts", + "malum:block_of_hex_ash", "malum:block_of_soul_stained_steel", - "malum:block_of_alchemical_calx", - "malum:mass_of_blighted_gunk", + "malum:block_of_brilliance", "malum:runic_sap_block", + "malum:block_of_cthonic_gold", + "malum:block_of_living_flesh", + "malum:mass_of_blighted_gunk", "malum:block_of_grim_talc", - "malum:block_of_arcane_charcoal", - "malum:block_of_rotting_essence", - "malum:block_of_malignant_pewter", - "malum:block_of_blazing_quartz", - "malum:block_of_auric_embers", - "malum:block_of_hex_ash", - "malum:block_of_soulstone", - "malum:block_of_null_slate", - "malum:block_of_hallowed_gold", - "malum:block_of_brilliance" + "malum:block_of_astral_weave" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/damage_type/can_trigger_magic_damage.json b/src/generated/resources/data/c/tags/damage_type/can_trigger_magic_damage.json similarity index 100% rename from src/generated/resources/data/forge/tags/damage_type/can_trigger_magic_damage.json rename to src/generated/resources/data/c/tags/damage_type/can_trigger_magic_damage.json diff --git a/src/generated/resources/data/forge/tags/damage_type/is_magic.json b/src/generated/resources/data/c/tags/damage_type/is_magic.json similarity index 100% rename from src/generated/resources/data/forge/tags/damage_type/is_magic.json rename to src/generated/resources/data/c/tags/damage_type/is_magic.json diff --git a/src/generated/resources/data/forge/tags/item/nuggets/copper.json b/src/generated/resources/data/c/tags/item/nuggets/copper.json similarity index 100% rename from src/generated/resources/data/forge/tags/item/nuggets/copper.json rename to src/generated/resources/data/c/tags/item/nuggets/copper.json diff --git a/src/generated/resources/data/c/tags/item/ores.json b/src/generated/resources/data/c/tags/item/ores.json index c611380f7..3e0a84e17 100644 --- a/src/generated/resources/data/c/tags/item/ores.json +++ b/src/generated/resources/data/c/tags/item/ores.json @@ -1,12 +1,12 @@ { "values": [ - "malum:natural_quartz_ore", - "malum:deepslate_soulstone_ore", "malum:deepslate_quartz_ore", - "malum:brilliant_deepslate", - "malum:blazing_quartz_ore", "malum:soulstone_ore", + "malum:natural_quartz_ore", + "malum:brilliant_stone", "malum:cthonic_gold_ore", - "malum:brilliant_stone" + "malum:deepslate_soulstone_ore", + "malum:blazing_quartz_ore", + "malum:brilliant_deepslate" ] } \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/storage_blocks.json b/src/generated/resources/data/c/tags/item/storage_blocks.json index e51a9abb1..08e50f4de 100644 --- a/src/generated/resources/data/c/tags/item/storage_blocks.json +++ b/src/generated/resources/data/c/tags/item/storage_blocks.json @@ -1,27 +1,27 @@ { "values": [ + "malum:block_of_hallowed_gold", + "malum:block_of_soulstone", + "malum:block_of_malignant_pewter", + "malum:block_of_arcane_charcoal", + "malum:block_of_auric_embers", + "malum:block_of_rotting_essence", + "malum:block_of_void_salts", "malum:block_of_malignant_lead", - "malum:block_of_astral_weave", - "malum:block_of_mnemonic_fragment", + "malum:block_of_blazing_quartz", + "malum:block_of_alchemical_calx", "malum:block_of_raw_soulstone", - "malum:block_of_cthonic_gold", + "malum:block_of_null_slate", + "malum:block_of_mnemonic_fragment", "malum:cursed_sap_block", - "malum:block_of_living_flesh", - "malum:block_of_void_salts", + "malum:block_of_hex_ash", "malum:block_of_soul_stained_steel", - "malum:block_of_alchemical_calx", - "malum:mass_of_blighted_gunk", + "malum:block_of_brilliance", "malum:runic_sap_block", + "malum:block_of_cthonic_gold", + "malum:block_of_living_flesh", + "malum:mass_of_blighted_gunk", "malum:block_of_grim_talc", - "malum:block_of_arcane_charcoal", - "malum:block_of_rotting_essence", - "malum:block_of_malignant_pewter", - "malum:block_of_blazing_quartz", - "malum:block_of_auric_embers", - "malum:block_of_hex_ash", - "malum:block_of_soulstone", - "malum:block_of_null_slate", - "malum:block_of_hallowed_gold", - "malum:block_of_brilliance" + "malum:block_of_astral_weave" ] } \ No newline at end of file diff --git a/src/generated/resources/data/farmersdelight/tags/block/tray_heat_sources.json b/src/generated/resources/data/farmersdelight/tags/block/tray_heat_sources.json index 85669e8d2..40f6e9e6d 100644 --- a/src/generated/resources/data/farmersdelight/tags/block/tray_heat_sources.json +++ b/src/generated/resources/data/farmersdelight/tags/block/tray_heat_sources.json @@ -1,14 +1,14 @@ { "values": [ - "malum:iridescent_wall_ether_torch", - "malum:ether_torch", - "malum:twisted_iridescent_ether_brazier", - "malum:iridescent_ether_torch", "malum:wall_ether_torch", + "malum:tainted_ether_brazier", "malum:tainted_iridescent_ether_brazier", - "malum:ether", + "malum:iridescent_ether_torch", + "malum:ether_torch", "malum:twisted_ether_brazier", - "malum:tainted_ether_brazier", + "malum:twisted_iridescent_ether_brazier", + "malum:iridescent_wall_ether_torch", + "malum:ether", "malum:iridescent_ether" ] } \ No newline at end of file diff --git a/src/generated/resources/data/malum/advancement/recipes/misc/copper_ingot_from_nugget.json b/src/generated/resources/data/malum/advancement/recipes/misc/copper_ingot_from_nugget.json index 162f1ea2e..74a2084da 100644 --- a/src/generated/resources/data/malum/advancement/recipes/misc/copper_ingot_from_nugget.json +++ b/src/generated/resources/data/malum/advancement/recipes/misc/copper_ingot_from_nugget.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "items": "#forge:ingots/copper" + "items": "#c:ingots/copper" } ] }, diff --git a/src/generated/resources/data/malum/advancement/recipes/misc/copper_nugget_from_ingot.json b/src/generated/resources/data/malum/advancement/recipes/misc/copper_nugget_from_ingot.json index b8c836909..83dc6c466 100644 --- a/src/generated/resources/data/malum/advancement/recipes/misc/copper_nugget_from_ingot.json +++ b/src/generated/resources/data/malum/advancement/recipes/misc/copper_nugget_from_ingot.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "items": "#forge:ingots/copper" + "items": "#c:ingots/copper" } ] }, diff --git a/src/generated/resources/data/malum/recipe/spirit_crucible/repair/diamond.json b/src/generated/resources/data/malum/recipe/spirit_crucible/repair/diamond.json index 2993afc53..433338e68 100644 --- a/src/generated/resources/data/malum/recipe/spirit_crucible/repair/diamond.json +++ b/src/generated/resources/data/malum/recipe/spirit_crucible/repair/diamond.json @@ -2,15 +2,15 @@ "type": "malum:spirit_repair", "durabilityPercentage": 0.5, "inputs": [ - "minecraft:diamond_boots", - "minecraft:diamond_sword", - "minecraft:diamond_shovel", - "minecraft:diamond_axe", + "minecraft:diamond_chestplate", "minecraft:diamond_hoe", + "minecraft:diamond_axe", + "minecraft:diamond_sword", "minecraft:diamond_helmet", - "minecraft:diamond_chestplate", - "minecraft:diamond_pickaxe", - "minecraft:diamond_leggings" + "minecraft:diamond_shovel", + "minecraft:diamond_boots", + "minecraft:diamond_leggings", + "minecraft:diamond_pickaxe" ], "itemIdRegex": ".*", "modIdRegex": ".*", diff --git a/src/generated/resources/data/malum/recipe/spirit_crucible/repair/gold.json b/src/generated/resources/data/malum/recipe/spirit_crucible/repair/gold.json index a5b724420..f26443eaa 100644 --- a/src/generated/resources/data/malum/recipe/spirit_crucible/repair/gold.json +++ b/src/generated/resources/data/malum/recipe/spirit_crucible/repair/gold.json @@ -2,14 +2,14 @@ "type": "malum:spirit_repair", "durabilityPercentage": 0.5, "inputs": [ - "minecraft:golden_axe", + "minecraft:golden_sword", "minecraft:golden_boots", - "minecraft:golden_hoe", - "minecraft:golden_pickaxe", - "minecraft:golden_shovel", "minecraft:golden_leggings", + "minecraft:golden_pickaxe", + "minecraft:golden_hoe", "minecraft:golden_helmet", - "minecraft:golden_sword", + "minecraft:golden_axe", + "minecraft:golden_shovel", "minecraft:golden_chestplate" ], "itemIdRegex": ".*", diff --git a/src/generated/resources/data/malum/recipe/spirit_crucible/repair/iron.json b/src/generated/resources/data/malum/recipe/spirit_crucible/repair/iron.json index 9d07f29c5..5a35e4fbc 100644 --- a/src/generated/resources/data/malum/recipe/spirit_crucible/repair/iron.json +++ b/src/generated/resources/data/malum/recipe/spirit_crucible/repair/iron.json @@ -3,15 +3,15 @@ "durabilityPercentage": 0.5, "inputs": [ "malum:crude_scythe", - "minecraft:iron_sword", - "minecraft:iron_chestplate", - "minecraft:iron_pickaxe", "minecraft:iron_shovel", - "minecraft:iron_boots", + "minecraft:iron_sword", "minecraft:iron_axe", "minecraft:iron_helmet", "minecraft:iron_hoe", - "minecraft:iron_leggings" + "minecraft:iron_pickaxe", + "minecraft:iron_boots", + "minecraft:iron_leggings", + "minecraft:iron_chestplate" ], "itemIdRegex": ".*", "modIdRegex": ".*", diff --git a/src/generated/resources/data/malum/recipe/spirit_crucible/repair/netherite.json b/src/generated/resources/data/malum/recipe/spirit_crucible/repair/netherite.json index 1176454ed..a87890051 100644 --- a/src/generated/resources/data/malum/recipe/spirit_crucible/repair/netherite.json +++ b/src/generated/resources/data/malum/recipe/spirit_crucible/repair/netherite.json @@ -3,14 +3,14 @@ "durabilityPercentage": 0.5, "inputs": [ "minecraft:netherite_pickaxe", - "minecraft:netherite_hoe", - "minecraft:netherite_chestplate", + "minecraft:netherite_shovel", + "minecraft:netherite_leggings", "minecraft:netherite_boots", + "minecraft:netherite_chestplate", + "minecraft:netherite_hoe", + "minecraft:netherite_helmet", "minecraft:netherite_axe", - "minecraft:netherite_leggings", - "minecraft:netherite_sword", - "minecraft:netherite_shovel", - "minecraft:netherite_helmet" + "minecraft:netherite_sword" ], "itemIdRegex": ".*", "modIdRegex": ".*", diff --git a/src/generated/resources/data/malum/recipe/spirit_crucible/repair/stone.json b/src/generated/resources/data/malum/recipe/spirit_crucible/repair/stone.json index 2548aa2f1..3638fb50d 100644 --- a/src/generated/resources/data/malum/recipe/spirit_crucible/repair/stone.json +++ b/src/generated/resources/data/malum/recipe/spirit_crucible/repair/stone.json @@ -3,10 +3,10 @@ "durabilityPercentage": 0.5, "inputs": [ "minecraft:stone_hoe", - "minecraft:stone_shovel", - "minecraft:stone_sword", + "minecraft:stone_axe", "minecraft:stone_pickaxe", - "minecraft:stone_axe" + "minecraft:stone_sword", + "minecraft:stone_shovel" ], "itemIdRegex": ".*", "modIdRegex": ".*", diff --git a/src/generated/resources/data/malum/recipe/spirit_crucible/repair/wooden.json b/src/generated/resources/data/malum/recipe/spirit_crucible/repair/wooden.json index ba74d0c58..17626fc8a 100644 --- a/src/generated/resources/data/malum/recipe/spirit_crucible/repair/wooden.json +++ b/src/generated/resources/data/malum/recipe/spirit_crucible/repair/wooden.json @@ -2,11 +2,11 @@ "type": "malum:spirit_repair", "durabilityPercentage": 0.5, "inputs": [ + "minecraft:wooden_hoe", "minecraft:wooden_shovel", - "minecraft:wooden_sword", "minecraft:wooden_axe", - "minecraft:wooden_hoe", - "minecraft:wooden_pickaxe" + "minecraft:wooden_pickaxe", + "minecraft:wooden_sword" ], "itemIdRegex": ".*", "modIdRegex": ".*", diff --git a/src/generated/resources/data/malum/tags/block/blighted_blocks.json b/src/generated/resources/data/malum/tags/block/blighted_blocks.json index 5b811ade6..073dd467c 100644 --- a/src/generated/resources/data/malum/tags/block/blighted_blocks.json +++ b/src/generated/resources/data/malum/tags/block/blighted_blocks.json @@ -1,7 +1,7 @@ { "values": [ - "malum:mass_of_blighted_gunk", + "malum:blighted_earth", "malum:blighted_soil", - "malum:blighted_earth" + "malum:mass_of_blighted_gunk" ] } \ No newline at end of file diff --git a/src/generated/resources/data/malum/tags/block/blighted_plants.json b/src/generated/resources/data/malum/tags/block/blighted_plants.json index 80d41476f..16453efc1 100644 --- a/src/generated/resources/data/malum/tags/block/blighted_plants.json +++ b/src/generated/resources/data/malum/tags/block/blighted_plants.json @@ -1,9 +1,9 @@ { "values": [ - "malum:tall_calcified_blight", - "malum:blighted_growth", + "malum:calcified_blight", "malum:soulwood_growth", "malum:clinging_blight", - "malum:calcified_blight" + "malum:blighted_growth", + "malum:tall_calcified_blight" ] } \ No newline at end of file diff --git a/src/generated/resources/data/malum/tags/block/rite_immune.json b/src/generated/resources/data/malum/tags/block/rite_immune.json index 597410ccf..e1fb51f31 100644 --- a/src/generated/resources/data/malum/tags/block/rite_immune.json +++ b/src/generated/resources/data/malum/tags/block/rite_immune.json @@ -2,9 +2,9 @@ "values": [ "#malum:tainted_rock", "#malum:twisted_rock", - "malum:runewood_totem_pole", - "malum:soulwood_totem_pole", + "malum:soulwood_totem_base", "malum:runewood_totem_base", - "malum:soulwood_totem_base" + "malum:runewood_totem_pole", + "malum:soulwood_totem_pole" ] } \ No newline at end of file diff --git a/src/generated/resources/data/malum/tags/block/runewood_logs.json b/src/generated/resources/data/malum/tags/block/runewood_logs.json index 36a5b45f3..b72fc68ca 100644 --- a/src/generated/resources/data/malum/tags/block/runewood_logs.json +++ b/src/generated/resources/data/malum/tags/block/runewood_logs.json @@ -1,10 +1,10 @@ { "values": [ + "malum:runewood_log", + "malum:stripped_runewood", "malum:exposed_runewood_log", - "malum:runewood", - "malum:revealed_runewood_log", "malum:stripped_runewood_log", - "malum:runewood_log", - "malum:stripped_runewood" + "malum:runewood", + "malum:revealed_runewood_log" ] } \ No newline at end of file diff --git a/src/generated/resources/data/malum/tags/block/soulwood_logs.json b/src/generated/resources/data/malum/tags/block/soulwood_logs.json index 876a87279..4afb3ed1f 100644 --- a/src/generated/resources/data/malum/tags/block/soulwood_logs.json +++ b/src/generated/resources/data/malum/tags/block/soulwood_logs.json @@ -1,11 +1,11 @@ { "values": [ - "malum:exposed_soulwood_log", - "malum:soulwood", - "malum:revealed_soulwood_log", - "malum:stripped_soulwood", "malum:blighted_soulwood", "malum:soulwood_log", - "malum:stripped_soulwood_log" + "malum:soulwood", + "malum:exposed_soulwood_log", + "malum:stripped_soulwood", + "malum:stripped_soulwood_log", + "malum:revealed_soulwood_log" ] } \ No newline at end of file diff --git a/src/generated/resources/data/malum/tags/block/tainted_rock.json b/src/generated/resources/data/malum/tags/block/tainted_rock.json index 7e3526cc1..6bffc9901 100644 --- a/src/generated/resources/data/malum/tags/block/tainted_rock.json +++ b/src/generated/resources/data/malum/tags/block/tainted_rock.json @@ -1,58 +1,58 @@ { "values": [ - "malum:runic_tainted_rock_tiles_wall", - "malum:tainted_rock_tiles_slab", - "malum:cut_tainted_rock", - "malum:tainted_rock_slab", - "malum:tainted_rock_bricks_slab", - "malum:tainted_rock_bricks_wall", - "malum:tainted_rock_item_stand", - "malum:polished_tainted_rock_stairs", - "malum:small_tainted_rock_bricks_slab", - "malum:runic_tainted_rock_bricks_wall", - "malum:spirit_catalyzer_component", - "malum:runic_small_tainted_rock_bricks_wall", + "malum:spirit_crucible_component", "malum:tainted_rock_column", - "malum:tainted_rock_button", + "malum:runic_tainted_rock_bricks_wall", + "malum:checkered_tainted_rock", "malum:small_tainted_rock_bricks", - "malum:smooth_tainted_rock_stairs", - "malum:runic_tainted_rock_bricks_stairs", - "malum:tainted_rock_stairs", - "malum:the_device", - "malum:tainted_rock", - "malum:tainted_rock_pressure_plate", "malum:runic_tainted_rock_tiles", + "malum:tainted_rock", + "malum:runic_tainted_rock_bricks", "malum:small_tainted_rock_bricks_wall", - "malum:polished_tainted_rock_slab", - "malum:spirit_crucible", + "malum:tainted_rock_button", "malum:polished_tainted_rock_wall", - "malum:runic_small_tainted_rock_bricks_stairs", "malum:smooth_tainted_rock_wall", - "malum:checkered_tainted_rock", + "malum:spirit_catalyzer_component", + "malum:repair_pylon_component", + "malum:polished_tainted_rock_slab", + "malum:runic_small_tainted_rock_bricks_stairs", + "malum:small_tainted_rock_bricks_slab", + "malum:runic_small_tainted_rock_bricks", + "malum:runic_tainted_rock_bricks_stairs", + "malum:tainted_ether_brazier", + "malum:tainted_rock_tiles", "malum:runic_tainted_rock_tiles_slab", - "malum:tainted_rock_wall", - "malum:tainted_iridescent_ether_brazier", - "malum:tainted_rock_tiles_stairs", - "malum:polished_tainted_rock", - "malum:runic_tainted_rock_bricks_slab", - "malum:smooth_tainted_rock_slab", - "malum:runic_tainted_rock_bricks", + "malum:tainted_rock_tiles_wall", "malum:runic_small_tainted_rock_bricks_slab", + "malum:spirit_catalyzer", + "malum:smooth_tainted_rock_slab", + "malum:tainted_rock_bricks_slab", + "malum:tainted_rock_bricks", + "malum:tainted_iridescent_ether_brazier", "malum:tainted_rock_item_pedestal", - "malum:smooth_tainted_rock", - "malum:runic_small_tainted_rock_bricks", + "malum:runic_small_tainted_rock_bricks_wall", + "malum:polished_tainted_rock", + "malum:tainted_rock_item_stand", + "malum:tainted_rock_stairs", + "malum:tainted_rock_tiles_stairs", + "malum:runic_tainted_rock_tiles_wall", "malum:runic_tainted_rock_tiles_stairs", - "malum:chiseled_tainted_rock", - "malum:tainted_rock_bricks", + "malum:smooth_tainted_rock", + "malum:tainted_rock_wall", + "malum:the_device", + "malum:tainted_rock_tiles_slab", + "malum:cut_tainted_rock", "malum:small_tainted_rock_bricks_stairs", - "malum:repair_pylon", - "malum:spirit_crucible_component", - "malum:tainted_rock_tiles", - "malum:tainted_rock_tiles_wall", - "malum:tainted_ether_brazier", - "malum:repair_pylon_component", - "malum:spirit_catalyzer", "malum:tainted_rock_column_cap", - "malum:tainted_rock_bricks_stairs" + "malum:tainted_rock_pressure_plate", + "malum:tainted_rock_slab", + "malum:smooth_tainted_rock_stairs", + "malum:tainted_rock_bricks_wall", + "malum:polished_tainted_rock_stairs", + "malum:repair_pylon", + "malum:tainted_rock_bricks_stairs", + "malum:chiseled_tainted_rock", + "malum:spirit_crucible", + "malum:runic_tainted_rock_bricks_slab" ] } \ No newline at end of file diff --git a/src/generated/resources/data/malum/tags/block/tainted_rock_blocks.json b/src/generated/resources/data/malum/tags/block/tainted_rock_blocks.json index 802b568dd..7241fafa6 100644 --- a/src/generated/resources/data/malum/tags/block/tainted_rock_blocks.json +++ b/src/generated/resources/data/malum/tags/block/tainted_rock_blocks.json @@ -1,13 +1,13 @@ { "values": [ "malum:small_tainted_rock_bricks", - "malum:tainted_rock", "malum:runic_tainted_rock_tiles", - "malum:polished_tainted_rock", + "malum:tainted_rock", "malum:runic_tainted_rock_bricks", - "malum:smooth_tainted_rock", "malum:runic_small_tainted_rock_bricks", + "malum:tainted_rock_tiles", "malum:tainted_rock_bricks", - "malum:tainted_rock_tiles" + "malum:polished_tainted_rock", + "malum:smooth_tainted_rock" ] } \ No newline at end of file diff --git a/src/generated/resources/data/malum/tags/block/tainted_rock_slabs.json b/src/generated/resources/data/malum/tags/block/tainted_rock_slabs.json index 338d78d7a..31f900c2f 100644 --- a/src/generated/resources/data/malum/tags/block/tainted_rock_slabs.json +++ b/src/generated/resources/data/malum/tags/block/tainted_rock_slabs.json @@ -1,13 +1,13 @@ { "values": [ - "malum:tainted_rock_tiles_slab", - "malum:tainted_rock_slab", - "malum:tainted_rock_bricks_slab", - "malum:small_tainted_rock_bricks_slab", "malum:polished_tainted_rock_slab", + "malum:small_tainted_rock_bricks_slab", "malum:runic_tainted_rock_tiles_slab", - "malum:runic_tainted_rock_bricks_slab", + "malum:runic_small_tainted_rock_bricks_slab", "malum:smooth_tainted_rock_slab", - "malum:runic_small_tainted_rock_bricks_slab" + "malum:tainted_rock_bricks_slab", + "malum:tainted_rock_tiles_slab", + "malum:tainted_rock_slab", + "malum:runic_tainted_rock_bricks_slab" ] } \ No newline at end of file diff --git a/src/generated/resources/data/malum/tags/block/tainted_rock_stairs.json b/src/generated/resources/data/malum/tags/block/tainted_rock_stairs.json index 4685755bc..41d43f114 100644 --- a/src/generated/resources/data/malum/tags/block/tainted_rock_stairs.json +++ b/src/generated/resources/data/malum/tags/block/tainted_rock_stairs.json @@ -1,13 +1,13 @@ { "values": [ - "malum:polished_tainted_rock_stairs", - "malum:smooth_tainted_rock_stairs", + "malum:runic_small_tainted_rock_bricks_stairs", "malum:runic_tainted_rock_bricks_stairs", "malum:tainted_rock_stairs", - "malum:runic_small_tainted_rock_bricks_stairs", "malum:tainted_rock_tiles_stairs", "malum:runic_tainted_rock_tiles_stairs", "malum:small_tainted_rock_bricks_stairs", + "malum:smooth_tainted_rock_stairs", + "malum:polished_tainted_rock_stairs", "malum:tainted_rock_bricks_stairs" ] } \ No newline at end of file diff --git a/src/generated/resources/data/malum/tags/block/tainted_rock_walls.json b/src/generated/resources/data/malum/tags/block/tainted_rock_walls.json index 6af4a9703..95cb7fe62 100644 --- a/src/generated/resources/data/malum/tags/block/tainted_rock_walls.json +++ b/src/generated/resources/data/malum/tags/block/tainted_rock_walls.json @@ -1,13 +1,13 @@ { "values": [ - "malum:runic_tainted_rock_tiles_wall", - "malum:tainted_rock_bricks_wall", "malum:runic_tainted_rock_bricks_wall", - "malum:runic_small_tainted_rock_bricks_wall", "malum:small_tainted_rock_bricks_wall", "malum:polished_tainted_rock_wall", "malum:smooth_tainted_rock_wall", + "malum:tainted_rock_tiles_wall", + "malum:runic_small_tainted_rock_bricks_wall", + "malum:runic_tainted_rock_tiles_wall", "malum:tainted_rock_wall", - "malum:tainted_rock_tiles_wall" + "malum:tainted_rock_bricks_wall" ] } \ No newline at end of file diff --git a/src/generated/resources/data/malum/tags/block/twisted_rock.json b/src/generated/resources/data/malum/tags/block/twisted_rock.json index 2a5e311c4..ed3dc86e1 100644 --- a/src/generated/resources/data/malum/tags/block/twisted_rock.json +++ b/src/generated/resources/data/malum/tags/block/twisted_rock.json @@ -1,52 +1,52 @@ { "values": [ - "malum:runic_twisted_rock_bricks_stairs", - "malum:runic_small_twisted_rock_bricks_slab", - "malum:twisted_rock_stairs", - "malum:twisted_rock_button", - "malum:twisted_rock_tiles", - "malum:twisted_iridescent_ether_brazier", + "malum:twisted_rock_wall", + "malum:runic_twisted_rock_tiles_slab", + "malum:the_vessel", + "malum:twisted_rock_bricks_wall", + "malum:checkered_twisted_rock", + "malum:runic_small_twisted_rock_bricks", "malum:polished_twisted_rock", - "malum:twisted_rock_column_cap", - "malum:runic_small_twisted_rock_bricks_wall", - "malum:runic_twisted_rock_tiles", + "malum:runic_twisted_rock_bricks", + "malum:twisted_rock_slab", + "malum:twisted_rock_tiles", + "malum:small_twisted_rock_bricks", + "malum:polished_twisted_rock_wall", "malum:chiseled_twisted_rock", + "malum:twisted_rock_column_cap", + "malum:twisted_rock_bricks_slab", "malum:small_twisted_rock_bricks_wall", - "malum:cut_twisted_rock", - "malum:polished_twisted_rock_wall", - "malum:twisted_rock_bricks_stairs", - "malum:twisted_rock_column", - "malum:twisted_rock_bricks", - "malum:runic_twisted_rock_tiles_slab", - "malum:twisted_rock_slab", - "malum:runic_twisted_rock_tiles_wall", - "malum:smooth_twisted_rock_stairs", + "malum:smooth_twisted_rock", "malum:smooth_twisted_rock_wall", + "malum:smooth_twisted_rock_stairs", "malum:runic_twisted_rock_bricks_wall", - "malum:twisted_rock_pressure_plate", - "malum:twisted_rock_wall", - "malum:polished_twisted_rock_stairs", - "malum:small_twisted_rock_bricks", - "malum:polished_twisted_rock_slab", - "malum:smooth_twisted_rock", - "malum:twisted_rock_tiles_slab", - "malum:runic_twisted_rock_bricks", "malum:runic_twisted_rock_bricks_slab", - "malum:small_twisted_rock_bricks_stairs", - "malum:smooth_twisted_rock_slab", + "malum:runic_twisted_rock_bricks_stairs", + "malum:runic_small_twisted_rock_bricks_slab", + "malum:twisted_rock_item_pedestal", "malum:twisted_rock_tiles_wall", - "malum:twisted_rock_bricks_slab", - "malum:runic_small_twisted_rock_bricks", - "malum:runic_twisted_rock_tiles_stairs", - "malum:small_twisted_rock_bricks_slab", - "malum:twisted_rock", + "malum:runic_twisted_rock_tiles_wall", + "malum:runic_twisted_rock_tiles", + "malum:twisted_rock_pressure_plate", + "malum:smooth_twisted_rock_slab", + "malum:runic_small_twisted_rock_bricks_wall", + "malum:twisted_rock_bricks_stairs", + "malum:twisted_rock_bricks", + "malum:twisted_rock_item_stand", + "malum:twisted_rock_column", "malum:twisted_ether_brazier", + "malum:twisted_rock_tiles_slab", + "malum:twisted_rock", + "malum:cut_twisted_rock", + "malum:twisted_iridescent_ether_brazier", "malum:twisted_rock_tiles_stairs", + "malum:polished_twisted_rock_slab", + "malum:small_twisted_rock_bricks_slab", + "malum:small_twisted_rock_bricks_stairs", + "malum:twisted_rock_button", "malum:runic_small_twisted_rock_bricks_stairs", - "malum:twisted_rock_bricks_wall", - "malum:checkered_twisted_rock", - "malum:twisted_rock_item_pedestal", - "malum:the_vessel", - "malum:twisted_rock_item_stand" + "malum:runic_twisted_rock_tiles_stairs", + "malum:twisted_rock_stairs", + "malum:polished_twisted_rock_stairs" ] } \ No newline at end of file diff --git a/src/generated/resources/data/malum/tags/block/twisted_rock_blocks.json b/src/generated/resources/data/malum/tags/block/twisted_rock_blocks.json index b6bf08867..6ae4d5bb7 100644 --- a/src/generated/resources/data/malum/tags/block/twisted_rock_blocks.json +++ b/src/generated/resources/data/malum/tags/block/twisted_rock_blocks.json @@ -1,13 +1,13 @@ { "values": [ - "malum:twisted_rock_tiles", + "malum:runic_small_twisted_rock_bricks", "malum:polished_twisted_rock", - "malum:runic_twisted_rock_tiles", - "malum:twisted_rock_bricks", + "malum:runic_twisted_rock_bricks", + "malum:twisted_rock_tiles", "malum:small_twisted_rock_bricks", "malum:smooth_twisted_rock", - "malum:runic_twisted_rock_bricks", - "malum:runic_small_twisted_rock_bricks", + "malum:runic_twisted_rock_tiles", + "malum:twisted_rock_bricks", "malum:twisted_rock" ] } \ No newline at end of file diff --git a/src/generated/resources/data/malum/tags/block/twisted_rock_slabs.json b/src/generated/resources/data/malum/tags/block/twisted_rock_slabs.json index 5c2a67f71..946f9f1c5 100644 --- a/src/generated/resources/data/malum/tags/block/twisted_rock_slabs.json +++ b/src/generated/resources/data/malum/tags/block/twisted_rock_slabs.json @@ -1,13 +1,13 @@ { "values": [ - "malum:runic_small_twisted_rock_bricks_slab", "malum:runic_twisted_rock_tiles_slab", "malum:twisted_rock_slab", - "malum:polished_twisted_rock_slab", - "malum:twisted_rock_tiles_slab", + "malum:twisted_rock_bricks_slab", "malum:runic_twisted_rock_bricks_slab", + "malum:runic_small_twisted_rock_bricks_slab", "malum:smooth_twisted_rock_slab", - "malum:twisted_rock_bricks_slab", + "malum:twisted_rock_tiles_slab", + "malum:polished_twisted_rock_slab", "malum:small_twisted_rock_bricks_slab" ] } \ No newline at end of file diff --git a/src/generated/resources/data/malum/tags/block/twisted_rock_stairs.json b/src/generated/resources/data/malum/tags/block/twisted_rock_stairs.json index e73d8800a..4520f4407 100644 --- a/src/generated/resources/data/malum/tags/block/twisted_rock_stairs.json +++ b/src/generated/resources/data/malum/tags/block/twisted_rock_stairs.json @@ -1,13 +1,13 @@ { "values": [ + "malum:smooth_twisted_rock_stairs", "malum:runic_twisted_rock_bricks_stairs", - "malum:twisted_rock_stairs", "malum:twisted_rock_bricks_stairs", - "malum:smooth_twisted_rock_stairs", - "malum:polished_twisted_rock_stairs", + "malum:twisted_rock_tiles_stairs", "malum:small_twisted_rock_bricks_stairs", + "malum:runic_small_twisted_rock_bricks_stairs", "malum:runic_twisted_rock_tiles_stairs", - "malum:twisted_rock_tiles_stairs", - "malum:runic_small_twisted_rock_bricks_stairs" + "malum:twisted_rock_stairs", + "malum:polished_twisted_rock_stairs" ] } \ No newline at end of file diff --git a/src/generated/resources/data/malum/tags/block/twisted_rock_walls.json b/src/generated/resources/data/malum/tags/block/twisted_rock_walls.json index 34b33c407..4d5b3f7fc 100644 --- a/src/generated/resources/data/malum/tags/block/twisted_rock_walls.json +++ b/src/generated/resources/data/malum/tags/block/twisted_rock_walls.json @@ -1,13 +1,13 @@ { "values": [ - "malum:runic_small_twisted_rock_bricks_wall", - "malum:small_twisted_rock_bricks_wall", + "malum:twisted_rock_wall", + "malum:twisted_rock_bricks_wall", "malum:polished_twisted_rock_wall", - "malum:runic_twisted_rock_tiles_wall", + "malum:small_twisted_rock_bricks_wall", "malum:smooth_twisted_rock_wall", "malum:runic_twisted_rock_bricks_wall", - "malum:twisted_rock_wall", "malum:twisted_rock_tiles_wall", - "malum:twisted_rock_bricks_wall" + "malum:runic_twisted_rock_tiles_wall", + "malum:runic_small_twisted_rock_bricks_wall" ] } \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/block/beacon_base_blocks.json b/src/generated/resources/data/minecraft/tags/block/beacon_base_blocks.json index 3830aa06d..040b2156c 100644 --- a/src/generated/resources/data/minecraft/tags/block/beacon_base_blocks.json +++ b/src/generated/resources/data/minecraft/tags/block/beacon_base_blocks.json @@ -1,15 +1,15 @@ { "values": [ - "malum:block_of_malignant_lead", - "malum:block_of_mnemonic_fragment", - "malum:block_of_raw_soulstone", - "malum:block_of_cthonic_gold", - "malum:block_of_soul_stained_steel", + "malum:block_of_hallowed_gold", + "malum:block_of_soulstone", "malum:block_of_malignant_pewter", + "malum:block_of_malignant_lead", "malum:block_of_blazing_quartz", - "malum:block_of_soulstone", + "malum:block_of_raw_soulstone", "malum:block_of_null_slate", - "malum:block_of_hallowed_gold", - "malum:block_of_brilliance" + "malum:block_of_mnemonic_fragment", + "malum:block_of_soul_stained_steel", + "malum:block_of_brilliance", + "malum:block_of_cthonic_gold" ] } \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/block/buttons.json b/src/generated/resources/data/minecraft/tags/block/buttons.json index 78b790481..9b09cfafd 100644 --- a/src/generated/resources/data/minecraft/tags/block/buttons.json +++ b/src/generated/resources/data/minecraft/tags/block/buttons.json @@ -1,9 +1,9 @@ { "values": [ - "malum:twisted_rock_button", + "malum:soulwood_planks_button", "malum:tainted_rock_button", "malum:runewood_planks_button", "malum:runewood_planks_button", - "malum:soulwood_planks_button" + "malum:twisted_rock_button" ] } \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/block/fence_gates.json b/src/generated/resources/data/minecraft/tags/block/fence_gates.json index 1e5b1b788..1bb88c472 100644 --- a/src/generated/resources/data/minecraft/tags/block/fence_gates.json +++ b/src/generated/resources/data/minecraft/tags/block/fence_gates.json @@ -1,6 +1,6 @@ { "values": [ - "malum:soulwood_planks_fence_gate", - "malum:runewood_planks_fence_gate" + "malum:runewood_planks_fence_gate", + "malum:soulwood_planks_fence_gate" ] } \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/block/leaves.json b/src/generated/resources/data/minecraft/tags/block/leaves.json index b580f0690..5f405f671 100644 --- a/src/generated/resources/data/minecraft/tags/block/leaves.json +++ b/src/generated/resources/data/minecraft/tags/block/leaves.json @@ -1,8 +1,8 @@ { "values": [ - "malum:budding_soulwood_leaves", - "malum:soulwood_leaves", "malum:azure_runewood_leaves", - "malum:runewood_leaves" + "malum:runewood_leaves", + "malum:budding_soulwood_leaves", + "malum:soulwood_leaves" ] } \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/block/logs.json b/src/generated/resources/data/minecraft/tags/block/logs.json index d3a9f3aef..88f2958d8 100644 --- a/src/generated/resources/data/minecraft/tags/block/logs.json +++ b/src/generated/resources/data/minecraft/tags/block/logs.json @@ -1,17 +1,17 @@ { "values": [ + "malum:blighted_soulwood", + "malum:runewood_log", + "malum:soulwood_log", + "malum:soulwood", + "malum:stripped_runewood", "malum:exposed_runewood_log", + "malum:stripped_runewood_log", "malum:runewood", - "malum:revealed_runewood_log", "malum:exposed_soulwood_log", - "malum:stripped_runewood_log", - "malum:soulwood", - "malum:runewood_log", - "malum:revealed_soulwood_log", "malum:stripped_soulwood", - "malum:blighted_soulwood", - "malum:stripped_runewood", - "malum:soulwood_log", - "malum:stripped_soulwood_log" + "malum:stripped_soulwood_log", + "malum:revealed_soulwood_log", + "malum:revealed_runewood_log" ] } \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/block/mineable/axe.json b/src/generated/resources/data/minecraft/tags/block/mineable/axe.json index 6b9bba92e..6a184ba71 100644 --- a/src/generated/resources/data/minecraft/tags/block/mineable/axe.json +++ b/src/generated/resources/data/minecraft/tags/block/mineable/axe.json @@ -1,111 +1,111 @@ { "values": [ - "malum:runewood_panel", - "malum:vertical_rustic_soulwood_planks_slab", - "malum:vertical_rustic_runewood_planks", - "malum:exposed_runewood_log", "malum:rustic_soulwood_planks", - "malum:runewood_obelisk", - "malum:runewood", - "malum:revealed_runewood_log", - "malum:iridescent_wall_ether_torch", - "malum:runic_workbench", - "malum:soulwood_panel", - "malum:ether_torch", - "malum:exposed_soulwood_log", - "malum:runewood_planks_stairs", - "malum:runewood_item_stand", - "malum:vertical_runewood_boards_stairs", - "malum:soulwood_beam", - "malum:iridescent_ether_torch", - "malum:solid_runewood_trapdoor", - "malum:soulwood_boards_wall", - "malum:runewood_item_pedestal", - "malum:spirit_altar", - "malum:vertical_soulwood_boards", - "malum:vertical_rustic_soulwood_planks", - "malum:runewood_planks_fence", - "malum:runewood_totem_pole", - "malum:soulwood_planks_fence_gate", - "malum:soulwood_planks", - "malum:runewood_planks_button", - "malum:soulwood_totem_pole", - "malum:rustic_soulwood_planks_stairs", - "malum:runewood_beam", - "malum:runewood_boards", - "malum:vertical_soulwood_planks", - "malum:wall_ether_torch", - "malum:rustic_runewood_tiles", - "malum:vertical_runewood_planks_stairs", - "malum:runewood_tiles_stairs", + "malum:vertical_soulwood_planks_slab", + "malum:soulwood_planks_button", + "malum:blighted_soulwood", "malum:vertical_runewood_planks_slab", + "malum:runewood_planks_pressure_plate", "malum:soulwood_tiles_stairs", - "malum:vertical_soulwood_boards_slab", + "malum:vertical_rustic_soulwood_planks_slab", + "malum:rustic_runewood_tiles", "malum:solid_soulwood_trapdoor", - "malum:soulwood_boards", + "malum:runewood_planks_fence_gate", + "malum:runewood_planks", + "malum:runewood_trapdoor", + "malum:runewood_planks_stairs", + "malum:soulwood_totem_base", + "malum:ritual_plinth", + "malum:soulwood_planks_stairs", "malum:rustic_runewood_planks_slab", - "malum:vertical_soulwood_boards_stairs", + "malum:soulwood_boards", + "malum:runewood_planks_button", + "malum:wall_ether_torch", + "malum:spirit_altar", + "malum:vertical_runewood_planks_stairs", + "malum:soulwood_tiles", + "malum:runewood_log", "malum:soulwood_trapdoor", - "malum:stripped_runewood_log", - "malum:runewood_planks", + "malum:soulwood_planks_slab", + "malum:soulwood_log", + "malum:soulwood", + "malum:soulwood_wall_sign", + "malum:runewood_planks_slab", + "malum:vertical_soulwood_boards_slab", + "malum:runewood_beam", + "malum:weavers_workbench", + "malum:stripped_runewood", + "malum:runewood_boards_wall", + "malum:soulwood_item_pedestal", "malum:brilliant_obelisk", + "malum:runewood_item_pedestal", "malum:vertical_rustic_soulwood_planks_stairs", - "malum:soulwood_tiles", + "malum:runewood_boards_slab", + "malum:runewood_tiles_slab", + "malum:runewood_planks_fence", + "malum:soulwood_tiles_slab", + "malum:vertical_soulwood_boards_stairs", + "malum:runewood_wall_sign", + "malum:runewood_boards_stairs", + "malum:cut_soulwood_planks", + "malum:runewood_obelisk_component", + "malum:vertical_rustic_soulwood_planks", + "malum:rustic_soulwood_tiles_stairs", + "malum:vertical_soulwood_boards", + "malum:exposed_runewood_log", + "malum:runewood_sign", + "malum:vertical_runewood_planks", + "malum:vertical_runewood_boards", + "malum:runewood_totem_base", + "malum:soulwood_boards_slab", + "malum:runewood_item_stand", + "malum:runewood_panel", + "malum:runewood_tiles", + "malum:vertical_runewood_boards_slab", + "malum:soulwood_planks_pressure_plate", + "malum:stripped_runewood_log", + "malum:runewood_door", + "malum:rustic_soulwood_tiles_slab", + "malum:runic_workbench", "malum:soulwood_boards_stairs", + "malum:runewood_obelisk", + "malum:iridescent_ether_torch", + "malum:soulwood_planks", + "malum:soulwood_planks_fence_gate", + "malum:vertical_runewood_boards_stairs", + "malum:rustic_runewood_tiles_stairs", + "malum:runewood", + "malum:rustic_soulwood_planks_stairs", + "malum:ether_torch", + "malum:vertical_rustic_runewood_planks_stairs", + "malum:runewood_tiles_stairs", + "malum:runewood_totem_pole", + "malum:exposed_soulwood_log", "malum:soulwood_item_stand", - "malum:rustic_soulwood_tiles_stairs", - "malum:soulwood", - "malum:runewood_obelisk_component", - "malum:runewood_log", - "malum:cut_soulwood_planks", - "malum:weavers_workbench", + "malum:soulwood_beam", "malum:rustic_runewood_planks_stairs", - "malum:soulwood_planks_slab", + "malum:soulwood_door", + "malum:iridescent_wall_ether_torch", + "malum:soulwood_boards_wall", + "malum:runewood_boards", "malum:soulwood_sign", - "malum:runewood_door", + "malum:stripped_soulwood", + "malum:vertical_rustic_runewood_planks", + "malum:cut_runewood_planks", "malum:rustic_soulwood_planks_slab", - "malum:runewood_boards_slab", - "malum:soulwood_wall_sign", - "malum:runewood_totem_base", - "malum:vertical_runewood_boards_slab", - "malum:soulwood_item_pedestal", - "malum:rustic_runewood_tiles_slab", - "malum:soulwood_boards_slab", - "malum:soulwood_totem_base", - "malum:runewood_boards_wall", + "malum:stripped_soulwood_log", + "malum:soulwood_totem_pole", + "malum:rustic_runewood_planks", + "malum:solid_runewood_trapdoor", "malum:revealed_soulwood_log", + "malum:vertical_soulwood_planks", "malum:vertical_soulwood_planks_stairs", - "malum:stripped_soulwood", - "malum:runewood_trapdoor", - "malum:vertical_soulwood_planks_slab", - "malum:blighted_soulwood", - "malum:vertical_rustic_runewood_planks_stairs", - "malum:runewood_sign", + "malum:rustic_runewood_tiles_slab", "malum:soulwood_planks_fence", - "malum:soulwood_planks_button", - "malum:runewood_tiles_slab", - "malum:rustic_soulwood_tiles_slab", - "malum:soulwood_door", - "malum:cut_runewood_planks", - "malum:vertical_runewood_boards", - "malum:stripped_runewood", - "malum:runewood_planks_pressure_plate", - "malum:vertical_runewood_planks", - "malum:ritual_plinth", "malum:brilliant_obelisk_component", - "malum:runewood_wall_sign", - "malum:runewood_planks_fence_gate", + "malum:soulwood_panel", "malum:vertical_rustic_runewood_planks_slab", - "malum:soulwood_log", "malum:rustic_soulwood_tiles", - "malum:runewood_tiles", - "malum:soulwood_planks_stairs", - "malum:soulwood_planks_pressure_plate", - "malum:runewood_planks_slab", - "malum:rustic_runewood_planks", - "malum:runewood_boards_stairs", - "malum:soulwood_tiles_slab", - "malum:stripped_soulwood_log", - "malum:rustic_runewood_tiles_stairs" + "malum:revealed_runewood_log" ] } \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/block/mineable/hoe.json b/src/generated/resources/data/minecraft/tags/block/mineable/hoe.json index 06f061b2f..7ba15ee90 100644 --- a/src/generated/resources/data/minecraft/tags/block/mineable/hoe.json +++ b/src/generated/resources/data/minecraft/tags/block/mineable/hoe.json @@ -1,16 +1,16 @@ { "values": [ - "malum:budding_soulwood_leaves", - "malum:soulwood_leaves", - "malum:block_of_astral_weave", - "malum:azure_runewood_leaves", "malum:hanging_soulwood_leaves", + "malum:azure_runewood_leaves", + "malum:blighted_earth", + "malum:blighted_soil", "malum:hanging_azure_runewood_leaves", "malum:runewood_leaves", - "malum:mass_of_blighted_gunk", "malum:hanging_runewood_leaves", - "malum:blighted_soil", + "malum:budding_soulwood_leaves", "malum:block_of_hex_ash", - "malum:blighted_earth" + "malum:soulwood_leaves", + "malum:mass_of_blighted_gunk", + "malum:block_of_astral_weave" ] } \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/block/mineable/pickaxe.json b/src/generated/resources/data/minecraft/tags/block/mineable/pickaxe.json index 072be7407..9e2ddb5a8 100644 --- a/src/generated/resources/data/minecraft/tags/block/mineable/pickaxe.json +++ b/src/generated/resources/data/minecraft/tags/block/mineable/pickaxe.json @@ -1,159 +1,159 @@ { "values": [ - "malum:runic_tainted_rock_tiles_wall", - "malum:tainted_rock_tiles_slab", - "malum:natural_quartz_ore", - "malum:arcane_spirited_glass", - "malum:runic_twisted_rock_bricks_stairs", - "malum:block_of_malignant_lead", - "malum:cut_tainted_rock", - "malum:tainted_rock_slab", - "malum:tainted_rock_bricks_slab", - "malum:tainted_rock_bricks_wall", - "malum:runic_small_twisted_rock_bricks_slab", - "malum:blazing_quartz_cluster", - "malum:deepslate_soulstone_ore", - "malum:twisted_rock_stairs", - "malum:block_of_astral_weave", - "malum:twisted_rock_button", - "malum:twisted_rock_tiles", - "malum:twisted_iridescent_ether_brazier", - "malum:tainted_rock_item_stand", - "malum:weeping_well_central_encasement", + "malum:weeping_well_central_pillar", + "malum:block_of_hallowed_gold", + "malum:spirit_crucible_component", + "malum:twisted_rock_wall", + "malum:runic_twisted_rock_tiles_slab", + "malum:the_vessel", + "malum:block_of_soulstone", + "malum:void_depot", "malum:deepslate_quartz_ore", - "malum:polished_twisted_rock", - "malum:weeping_well_central_encasement_support", - "malum:polished_tainted_rock_stairs", - "malum:small_tainted_rock_bricks_slab", - "malum:runic_tainted_rock_bricks_wall", - "malum:twisted_rock_column_cap", - "malum:weeping_well_corner", - "malum:block_of_mnemonic_fragment", - "malum:spirit_catalyzer_component", - "malum:runic_small_tainted_rock_bricks_wall", + "malum:block_of_malignant_pewter", + "malum:twisted_rock_bricks_wall", "malum:tainted_rock_column", - "malum:block_of_raw_soulstone", - "malum:runic_small_twisted_rock_bricks_wall", - "malum:tainted_rock_button", - "malum:runic_twisted_rock_tiles", - "malum:chiseled_twisted_rock", - "malum:small_twisted_rock_bricks_wall", - "malum:block_of_cthonic_gold", + "malum:checkered_twisted_rock", + "malum:runic_tainted_rock_bricks_wall", + "malum:soulstone_ore", + "malum:sacred_spirited_glass", + "malum:runic_small_twisted_rock_bricks", + "malum:checkered_tainted_rock", "malum:small_tainted_rock_bricks", - "malum:smooth_tainted_rock_stairs", - "malum:runic_tainted_rock_bricks_stairs", - "malum:tainted_rock_stairs", - "malum:the_device", - "malum:weeping_well_encasement_mirrored", - "malum:cut_twisted_rock", - "malum:polished_twisted_rock_wall", - "malum:block_of_living_flesh", - "malum:natural_quartz_cluster", - "malum:twisted_rock_bricks_stairs", - "malum:tainted_rock", - "malum:tainted_rock_pressure_plate", - "malum:twisted_rock_column", - "malum:twisted_rock_bricks", + "malum:polished_twisted_rock", "malum:runic_tainted_rock_tiles", - "malum:small_tainted_rock_bricks_wall", - "malum:runic_twisted_rock_tiles_slab", - "malum:polished_tainted_rock_slab", - "malum:spirit_crucible", + "malum:tainted_rock", + "malum:arcane_spirited_glass", + "malum:block_of_arcane_charcoal", + "malum:runic_twisted_rock_bricks", + "malum:spirit_mote", "malum:twisted_rock_slab", + "malum:twisted_rock_tiles", + "malum:runic_tainted_rock_bricks", + "malum:small_tainted_rock_bricks_wall", + "malum:aqueous_spirited_glass", + "malum:tainted_rock_button", + "malum:block_of_auric_embers", + "malum:small_twisted_rock_bricks", "malum:polished_tainted_rock_wall", + "malum:polished_twisted_rock_wall", + "malum:block_of_rotting_essence", + "malum:smooth_tainted_rock_wall", + "malum:chiseled_twisted_rock", + "malum:twisted_rock_column_cap", + "malum:twisted_rock_bricks_slab", + "malum:wicked_spirited_glass", + "malum:small_twisted_rock_bricks_wall", + "malum:weeping_well_central_encasement_support", "malum:block_of_void_salts", + "malum:smooth_twisted_rock", + "malum:smooth_twisted_rock_wall", + "malum:smooth_twisted_rock_stairs", "malum:weeping_well_side", - "malum:runic_twisted_rock_tiles_wall", + "malum:runic_twisted_rock_bricks_wall", + "malum:runic_twisted_rock_bricks_slab", + "malum:spirit_catalyzer_component", + "malum:repair_pylon_component", + "malum:block_of_malignant_lead", + "malum:polished_tainted_rock_slab", "malum:runic_small_tainted_rock_bricks_stairs", + "malum:small_tainted_rock_bricks_slab", + "malum:block_of_blazing_quartz", + "malum:weeping_well_encasement", + "malum:infernal_spirited_glass", + "malum:weeping_well_side_pillar", + "malum:block_of_alchemical_calx", + "malum:runic_small_tainted_rock_bricks", "malum:cthonic_gold_cluster", - "malum:smooth_tainted_rock_wall", - "malum:checkered_tainted_rock", - "malum:smooth_twisted_rock_stairs", - "malum:smooth_twisted_rock_wall", + "malum:block_of_raw_soulstone", + "malum:runic_tainted_rock_bricks_stairs", + "malum:tainted_ether_brazier", + "malum:weeping_well_core", + "malum:tainted_rock_tiles", "malum:runic_tainted_rock_tiles_slab", - "malum:tainted_rock_wall", + "malum:natural_quartz_cluster", + "malum:tainted_rock_tiles_wall", + "malum:runic_twisted_rock_bricks_stairs", + "malum:runic_small_tainted_rock_bricks_slab", + "malum:spirit_catalyzer", + "malum:weeping_well_corner", + "malum:smooth_tainted_rock_slab", + "malum:tainted_rock_bricks_slab", + "malum:block_of_null_slate", + "malum:block_of_mnemonic_fragment", + "malum:tainted_rock_bricks", "malum:tainted_iridescent_ether_brazier", - "malum:infernal_spirited_glass", - "malum:aqueous_spirited_glass", - "malum:runic_twisted_rock_bricks_wall", - "malum:tainted_rock_tiles_stairs", + "malum:tainted_rock_item_pedestal", + "malum:runic_small_twisted_rock_bricks_slab", + "malum:twisted_rock_item_pedestal", + "malum:runic_small_tainted_rock_bricks_wall", + "malum:eldritch_spirited_glass", + "malum:twisted_rock_tiles_wall", + "malum:runic_twisted_rock_tiles_wall", "malum:polished_tainted_rock", + "malum:weeping_well_bricks", + "malum:weeping_well_encasement_corner", + "malum:runic_twisted_rock_tiles", "malum:twisted_rock_pressure_plate", - "malum:block_of_soul_stained_steel", - "malum:block_of_alchemical_calx", - "malum:mass_of_blighted_gunk", - "malum:runic_tainted_rock_bricks_slab", - "malum:twisted_rock_wall", - "malum:smooth_tainted_rock_slab", - "malum:block_of_grim_talc", - "malum:void_depot", + "malum:smooth_twisted_rock_slab", + "malum:weeping_well_encasement_mirrored", + "malum:runic_small_twisted_rock_bricks_wall", + "malum:tainted_rock_item_stand", "malum:earthen_spirited_glass", - "malum:polished_twisted_rock_stairs", - "malum:small_twisted_rock_bricks", - "malum:polished_twisted_rock_slab", - "malum:smooth_twisted_rock", - "malum:runic_tainted_rock_bricks", - "malum:brilliant_deepslate", - "malum:spirit_mote", + "malum:block_of_hex_ash", + "malum:twisted_rock_bricks_stairs", + "malum:twisted_rock_bricks", + "malum:twisted_rock_item_stand", + "malum:tainted_rock_stairs", + "malum:tainted_rock_tiles_stairs", + "malum:runic_tainted_rock_tiles_wall", + "malum:natural_quartz_ore", + "malum:aerial_spirited_glass", + "malum:twisted_rock_column", + "malum:twisted_ether_brazier", "malum:twisted_rock_tiles_slab", - "malum:weeping_well_core", - "malum:runic_small_tainted_rock_bricks_slab", - "malum:blazing_quartz_ore", - "malum:block_of_arcane_charcoal", - "malum:runic_twisted_rock_bricks", - "malum:runic_twisted_rock_bricks_slab", - "malum:small_twisted_rock_bricks_stairs", - "malum:tainted_rock_item_pedestal", - "malum:smooth_tainted_rock", - "malum:runic_small_tainted_rock_bricks", - "malum:runic_tainted_rock_tiles_stairs", - "malum:smooth_twisted_rock_slab", - "malum:block_of_rotting_essence", - "malum:twisted_rock_tiles_wall", - "malum:chiseled_tainted_rock", - "malum:twisted_rock_bricks_slab", - "malum:runic_small_twisted_rock_bricks", - "malum:runic_twisted_rock_tiles_stairs", - "malum:tainted_rock_bricks", - "malum:small_twisted_rock_bricks_slab", + "malum:block_of_soul_stained_steel", "malum:twisted_rock", - "malum:eldritch_spirited_glass", - "malum:small_tainted_rock_bricks_stairs", - "malum:soulstone_ore", - "malum:weeping_well_side_pillar", - "malum:repair_pylon", - "malum:twisted_ether_brazier", - "malum:block_of_malignant_pewter", - "malum:weeping_well_encasement", - "malum:block_of_blazing_quartz", - "malum:block_of_auric_embers", - "malum:twisted_rock_tiles_stairs", - "malum:spirit_crucible_component", - "malum:tainted_rock_tiles", - "malum:tainted_rock_tiles_wall", - "malum:weeping_well_central_pillar", - "malum:block_of_hex_ash", - "malum:cthonic_gold_ore", - "malum:runic_small_twisted_rock_bricks_stairs", - "malum:twisted_rock_bricks_wall", - "malum:block_of_soulstone", - "malum:checkered_twisted_rock", - "malum:weeping_well_bricks", - "malum:tainted_ether_brazier", - "malum:block_of_null_slate", - "malum:twisted_rock_item_pedestal", - "malum:repair_pylon_component", - "malum:block_of_hallowed_gold", "malum:block_of_brilliance", + "malum:runic_tainted_rock_tiles_stairs", + "malum:cut_twisted_rock", + "malum:smooth_tainted_rock", + "malum:twisted_iridescent_ether_brazier", + "malum:tainted_rock_wall", "malum:brilliant_stone", - "malum:spirit_catalyzer", - "malum:sacred_spirited_glass", + "malum:the_device", + "malum:tainted_rock_tiles_slab", + "malum:cut_tainted_rock", + "malum:cthonic_gold_ore", + "malum:twisted_rock_tiles_stairs", + "malum:polished_twisted_rock_slab", + "malum:small_tainted_rock_bricks_stairs", + "malum:small_twisted_rock_bricks_slab", + "malum:deepslate_soulstone_ore", + "malum:block_of_cthonic_gold", + "malum:blazing_quartz_ore", + "malum:small_twisted_rock_bricks_stairs", "malum:tainted_rock_column_cap", + "malum:twisted_rock_button", + "malum:blazing_quartz_cluster", + "malum:tainted_rock_pressure_plate", + "malum:weeping_well_central_encasement", + "malum:brilliant_deepslate", + "malum:tainted_rock_slab", + "malum:smooth_tainted_rock_stairs", + "malum:tainted_rock_bricks_wall", + "malum:polished_tainted_rock_stairs", + "malum:block_of_living_flesh", + "malum:runic_small_twisted_rock_bricks_stairs", + "malum:runic_twisted_rock_tiles_stairs", + "malum:mass_of_blighted_gunk", + "malum:twisted_rock_stairs", + "malum:repair_pylon", "malum:tainted_rock_bricks_stairs", - "malum:weeping_well_encasement_corner", - "malum:aerial_spirited_glass", - "malum:the_vessel", - "malum:wicked_spirited_glass", - "malum:twisted_rock_item_stand" + "malum:block_of_grim_talc", + "malum:chiseled_tainted_rock", + "malum:spirit_crucible", + "malum:runic_tainted_rock_bricks_slab", + "malum:block_of_astral_weave", + "malum:polished_twisted_rock_stairs" ] } \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/block/mineable/shovel.json b/src/generated/resources/data/minecraft/tags/block/mineable/shovel.json index fed923d60..3bb396b18 100644 --- a/src/generated/resources/data/minecraft/tags/block/mineable/shovel.json +++ b/src/generated/resources/data/minecraft/tags/block/mineable/shovel.json @@ -1,8 +1,8 @@ { "values": [ "malum:block_of_void_salts", - "malum:mass_of_blighted_gunk", + "malum:blighted_earth", "malum:blighted_soil", - "malum:blighted_earth" + "malum:mass_of_blighted_gunk" ] } \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/block/planks.json b/src/generated/resources/data/minecraft/tags/block/planks.json index 0e7ee3d32..43f7f590c 100644 --- a/src/generated/resources/data/minecraft/tags/block/planks.json +++ b/src/generated/resources/data/minecraft/tags/block/planks.json @@ -1,22 +1,22 @@ { "values": [ - "malum:vertical_rustic_runewood_planks", "malum:rustic_soulwood_planks", - "malum:vertical_soulwood_boards", - "malum:vertical_rustic_soulwood_planks", - "malum:soulwood_planks", - "malum:runewood_boards", - "malum:vertical_soulwood_planks", "malum:rustic_runewood_tiles", - "malum:soulwood_boards", "malum:runewood_planks", + "malum:soulwood_boards", "malum:soulwood_tiles", "malum:cut_soulwood_planks", - "malum:cut_runewood_planks", - "malum:vertical_runewood_boards", + "malum:vertical_rustic_soulwood_planks", + "malum:vertical_soulwood_boards", "malum:vertical_runewood_planks", - "malum:rustic_soulwood_tiles", + "malum:vertical_runewood_boards", "malum:runewood_tiles", - "malum:rustic_runewood_planks" + "malum:soulwood_planks", + "malum:runewood_boards", + "malum:vertical_rustic_runewood_planks", + "malum:cut_runewood_planks", + "malum:rustic_runewood_planks", + "malum:vertical_soulwood_planks", + "malum:rustic_soulwood_tiles" ] } \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/block/pressure_plates.json b/src/generated/resources/data/minecraft/tags/block/pressure_plates.json index 0df2089f2..0e0fd9047 100644 --- a/src/generated/resources/data/minecraft/tags/block/pressure_plates.json +++ b/src/generated/resources/data/minecraft/tags/block/pressure_plates.json @@ -1,8 +1,8 @@ { "values": [ - "malum:tainted_rock_pressure_plate", - "malum:twisted_rock_pressure_plate", "malum:runewood_planks_pressure_plate", - "malum:soulwood_planks_pressure_plate" + "malum:soulwood_planks_pressure_plate", + "malum:twisted_rock_pressure_plate", + "malum:tainted_rock_pressure_plate" ] } \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/block/saplings.json b/src/generated/resources/data/minecraft/tags/block/saplings.json index 70dfd347a..e9439f262 100644 --- a/src/generated/resources/data/minecraft/tags/block/saplings.json +++ b/src/generated/resources/data/minecraft/tags/block/saplings.json @@ -1,6 +1,6 @@ { "values": [ - "malum:azure_runewood_sapling", - "malum:runewood_sapling" + "malum:runewood_sapling", + "malum:azure_runewood_sapling" ] } \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/block/signs.json b/src/generated/resources/data/minecraft/tags/block/signs.json index 4b896f3b1..c2d172b08 100644 --- a/src/generated/resources/data/minecraft/tags/block/signs.json +++ b/src/generated/resources/data/minecraft/tags/block/signs.json @@ -1,8 +1,8 @@ { "values": [ - "malum:soulwood_sign", "malum:soulwood_wall_sign", + "malum:runewood_wall_sign", "malum:runewood_sign", - "malum:runewood_wall_sign" + "malum:soulwood_sign" ] } \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/block/slabs.json b/src/generated/resources/data/minecraft/tags/block/slabs.json index 658be0b6f..f8056f555 100644 --- a/src/generated/resources/data/minecraft/tags/block/slabs.json +++ b/src/generated/resources/data/minecraft/tags/block/slabs.json @@ -1,38 +1,38 @@ { "values": [ - "malum:tainted_rock_tiles_slab", - "malum:vertical_rustic_soulwood_planks_slab", - "malum:tainted_rock_slab", - "malum:tainted_rock_bricks_slab", - "malum:runic_small_twisted_rock_bricks_slab", - "malum:small_tainted_rock_bricks_slab", - "malum:vertical_runewood_planks_slab", - "malum:vertical_soulwood_boards_slab", - "malum:rustic_runewood_planks_slab", "malum:runic_twisted_rock_tiles_slab", - "malum:polished_tainted_rock_slab", + "malum:vertical_soulwood_planks_slab", + "malum:vertical_runewood_planks_slab", + "malum:vertical_rustic_soulwood_planks_slab", "malum:twisted_rock_slab", - "malum:runic_tainted_rock_tiles_slab", + "malum:rustic_runewood_planks_slab", "malum:soulwood_planks_slab", - "malum:rustic_soulwood_planks_slab", + "malum:twisted_rock_bricks_slab", + "malum:runewood_planks_slab", + "malum:vertical_soulwood_boards_slab", + "malum:runic_twisted_rock_bricks_slab", + "malum:polished_tainted_rock_slab", + "malum:small_tainted_rock_bricks_slab", "malum:runewood_boards_slab", - "malum:runic_tainted_rock_bricks_slab", - "malum:vertical_runewood_boards_slab", + "malum:runewood_tiles_slab", + "malum:soulwood_tiles_slab", + "malum:runic_tainted_rock_tiles_slab", + "malum:runic_small_tainted_rock_bricks_slab", "malum:smooth_tainted_rock_slab", - "malum:rustic_runewood_tiles_slab", + "malum:tainted_rock_bricks_slab", + "malum:runic_small_twisted_rock_bricks_slab", "malum:soulwood_boards_slab", - "malum:polished_twisted_rock_slab", - "malum:twisted_rock_tiles_slab", - "malum:runic_small_tainted_rock_bricks_slab", - "malum:runic_twisted_rock_bricks_slab", - "malum:vertical_soulwood_planks_slab", - "malum:smooth_twisted_rock_slab", - "malum:twisted_rock_bricks_slab", - "malum:runewood_tiles_slab", + "malum:vertical_runewood_boards_slab", "malum:rustic_soulwood_tiles_slab", + "malum:smooth_twisted_rock_slab", + "malum:twisted_rock_tiles_slab", + "malum:tainted_rock_tiles_slab", + "malum:polished_twisted_rock_slab", "malum:small_twisted_rock_bricks_slab", + "malum:rustic_soulwood_planks_slab", + "malum:tainted_rock_slab", + "malum:rustic_runewood_tiles_slab", "malum:vertical_rustic_runewood_planks_slab", - "malum:runewood_planks_slab", - "malum:soulwood_tiles_slab" + "malum:runic_tainted_rock_bricks_slab" ] } \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/block/stairs.json b/src/generated/resources/data/minecraft/tags/block/stairs.json index 1d1bc1dcd..37f5522d5 100644 --- a/src/generated/resources/data/minecraft/tags/block/stairs.json +++ b/src/generated/resources/data/minecraft/tags/block/stairs.json @@ -1,38 +1,38 @@ { "values": [ - "malum:runic_twisted_rock_bricks_stairs", + "malum:soulwood_tiles_stairs", "malum:runewood_planks_stairs", + "malum:soulwood_planks_stairs", + "malum:vertical_runewood_planks_stairs", + "malum:smooth_twisted_rock_stairs", + "malum:runic_small_tainted_rock_bricks_stairs", + "malum:vertical_rustic_soulwood_planks_stairs", + "malum:vertical_soulwood_boards_stairs", + "malum:runic_tainted_rock_bricks_stairs", + "malum:runewood_boards_stairs", + "malum:runic_twisted_rock_bricks_stairs", + "malum:rustic_soulwood_tiles_stairs", + "malum:soulwood_boards_stairs", "malum:vertical_runewood_boards_stairs", - "malum:twisted_rock_stairs", - "malum:polished_tainted_rock_stairs", - "malum:smooth_tainted_rock_stairs", + "malum:twisted_rock_bricks_stairs", + "malum:rustic_runewood_tiles_stairs", "malum:rustic_soulwood_planks_stairs", - "malum:runic_tainted_rock_bricks_stairs", "malum:tainted_rock_stairs", - "malum:vertical_runewood_planks_stairs", + "malum:tainted_rock_tiles_stairs", + "malum:vertical_rustic_runewood_planks_stairs", "malum:runewood_tiles_stairs", - "malum:twisted_rock_bricks_stairs", - "malum:soulwood_tiles_stairs", - "malum:vertical_soulwood_boards_stairs", - "malum:vertical_rustic_soulwood_planks_stairs", - "malum:soulwood_boards_stairs", - "malum:rustic_soulwood_tiles_stairs", - "malum:runic_small_tainted_rock_bricks_stairs", - "malum:smooth_twisted_rock_stairs", + "malum:runic_tainted_rock_tiles_stairs", "malum:rustic_runewood_planks_stairs", - "malum:tainted_rock_tiles_stairs", - "malum:polished_twisted_rock_stairs", + "malum:twisted_rock_tiles_stairs", + "malum:small_tainted_rock_bricks_stairs", "malum:small_twisted_rock_bricks_stairs", + "malum:smooth_tainted_rock_stairs", + "malum:polished_tainted_rock_stairs", "malum:vertical_soulwood_planks_stairs", - "malum:runic_tainted_rock_tiles_stairs", - "malum:vertical_rustic_runewood_planks_stairs", - "malum:runic_twisted_rock_tiles_stairs", - "malum:small_tainted_rock_bricks_stairs", - "malum:soulwood_planks_stairs", - "malum:twisted_rock_tiles_stairs", "malum:runic_small_twisted_rock_bricks_stairs", - "malum:runewood_boards_stairs", - "malum:rustic_runewood_tiles_stairs", - "malum:tainted_rock_bricks_stairs" + "malum:runic_twisted_rock_tiles_stairs", + "malum:twisted_rock_stairs", + "malum:tainted_rock_bricks_stairs", + "malum:polished_twisted_rock_stairs" ] } \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/block/standing_signs.json b/src/generated/resources/data/minecraft/tags/block/standing_signs.json index 0c7e69e22..ef80a391e 100644 --- a/src/generated/resources/data/minecraft/tags/block/standing_signs.json +++ b/src/generated/resources/data/minecraft/tags/block/standing_signs.json @@ -1,6 +1,6 @@ { "values": [ - "malum:soulwood_sign", - "malum:runewood_sign" + "malum:runewood_sign", + "malum:soulwood_sign" ] } \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/block/trapdoors.json b/src/generated/resources/data/minecraft/tags/block/trapdoors.json index 0dc5bd545..41dbf47b8 100644 --- a/src/generated/resources/data/minecraft/tags/block/trapdoors.json +++ b/src/generated/resources/data/minecraft/tags/block/trapdoors.json @@ -1,8 +1,8 @@ { "values": [ - "malum:solid_runewood_trapdoor", "malum:solid_soulwood_trapdoor", + "malum:runewood_trapdoor", "malum:soulwood_trapdoor", - "malum:runewood_trapdoor" + "malum:solid_runewood_trapdoor" ] } \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/block/wall_post_override.json b/src/generated/resources/data/minecraft/tags/block/wall_post_override.json index 5ff7137b4..bd923e41d 100644 --- a/src/generated/resources/data/minecraft/tags/block/wall_post_override.json +++ b/src/generated/resources/data/minecraft/tags/block/wall_post_override.json @@ -1,12 +1,12 @@ { "values": [ - "malum:iridescent_wall_ether_torch", - "malum:ether_torch", - "malum:twisted_iridescent_ether_brazier", - "malum:iridescent_ether_torch", "malum:wall_ether_torch", + "malum:tainted_ether_brazier", "malum:tainted_iridescent_ether_brazier", + "malum:iridescent_ether_torch", + "malum:ether_torch", "malum:twisted_ether_brazier", - "malum:tainted_ether_brazier" + "malum:twisted_iridescent_ether_brazier", + "malum:iridescent_wall_ether_torch" ] } \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/block/walls.json b/src/generated/resources/data/minecraft/tags/block/walls.json index 71ac92a0a..d5059cb5b 100644 --- a/src/generated/resources/data/minecraft/tags/block/walls.json +++ b/src/generated/resources/data/minecraft/tags/block/walls.json @@ -1,24 +1,24 @@ { "values": [ - "malum:runic_tainted_rock_tiles_wall", - "malum:tainted_rock_bricks_wall", - "malum:soulwood_boards_wall", + "malum:twisted_rock_wall", + "malum:twisted_rock_bricks_wall", "malum:runic_tainted_rock_bricks_wall", - "malum:runic_small_tainted_rock_bricks_wall", - "malum:runic_small_twisted_rock_bricks_wall", - "malum:small_twisted_rock_bricks_wall", - "malum:polished_twisted_rock_wall", "malum:small_tainted_rock_bricks_wall", "malum:polished_tainted_rock_wall", - "malum:runic_twisted_rock_tiles_wall", + "malum:polished_twisted_rock_wall", "malum:smooth_tainted_rock_wall", + "malum:small_twisted_rock_bricks_wall", "malum:smooth_twisted_rock_wall", - "malum:tainted_rock_wall", "malum:runic_twisted_rock_bricks_wall", - "malum:twisted_rock_wall", "malum:runewood_boards_wall", - "malum:twisted_rock_tiles_wall", "malum:tainted_rock_tiles_wall", - "malum:twisted_rock_bricks_wall" + "malum:runic_small_tainted_rock_bricks_wall", + "malum:twisted_rock_tiles_wall", + "malum:runic_twisted_rock_tiles_wall", + "malum:runic_small_twisted_rock_bricks_wall", + "malum:runic_tainted_rock_tiles_wall", + "malum:tainted_rock_wall", + "malum:soulwood_boards_wall", + "malum:tainted_rock_bricks_wall" ] } \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/block/wooden_slabs.json b/src/generated/resources/data/minecraft/tags/block/wooden_slabs.json index a85aa861d..cd52a80cd 100644 --- a/src/generated/resources/data/minecraft/tags/block/wooden_slabs.json +++ b/src/generated/resources/data/minecraft/tags/block/wooden_slabs.json @@ -1,20 +1,20 @@ { "values": [ - "malum:vertical_rustic_soulwood_planks_slab", + "malum:vertical_soulwood_planks_slab", "malum:vertical_runewood_planks_slab", - "malum:vertical_soulwood_boards_slab", + "malum:vertical_rustic_soulwood_planks_slab", "malum:rustic_runewood_planks_slab", "malum:soulwood_planks_slab", - "malum:rustic_soulwood_planks_slab", + "malum:runewood_planks_slab", + "malum:vertical_soulwood_boards_slab", "malum:runewood_boards_slab", - "malum:vertical_runewood_boards_slab", - "malum:rustic_runewood_tiles_slab", - "malum:soulwood_boards_slab", - "malum:vertical_soulwood_planks_slab", "malum:runewood_tiles_slab", + "malum:soulwood_tiles_slab", + "malum:soulwood_boards_slab", + "malum:vertical_runewood_boards_slab", "malum:rustic_soulwood_tiles_slab", - "malum:vertical_rustic_runewood_planks_slab", - "malum:runewood_planks_slab", - "malum:soulwood_tiles_slab" + "malum:rustic_soulwood_planks_slab", + "malum:rustic_runewood_tiles_slab", + "malum:vertical_rustic_runewood_planks_slab" ] } \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/block/wooden_stairs.json b/src/generated/resources/data/minecraft/tags/block/wooden_stairs.json index c7bea09d9..c0604cca3 100644 --- a/src/generated/resources/data/minecraft/tags/block/wooden_stairs.json +++ b/src/generated/resources/data/minecraft/tags/block/wooden_stairs.json @@ -1,20 +1,20 @@ { "values": [ + "malum:soulwood_tiles_stairs", "malum:runewood_planks_stairs", - "malum:vertical_runewood_boards_stairs", - "malum:rustic_soulwood_planks_stairs", + "malum:soulwood_planks_stairs", "malum:vertical_runewood_planks_stairs", - "malum:runewood_tiles_stairs", - "malum:soulwood_tiles_stairs", - "malum:vertical_soulwood_boards_stairs", "malum:vertical_rustic_soulwood_planks_stairs", - "malum:soulwood_boards_stairs", + "malum:vertical_soulwood_boards_stairs", + "malum:runewood_boards_stairs", "malum:rustic_soulwood_tiles_stairs", - "malum:rustic_runewood_planks_stairs", - "malum:vertical_soulwood_planks_stairs", + "malum:soulwood_boards_stairs", + "malum:vertical_runewood_boards_stairs", + "malum:rustic_runewood_tiles_stairs", + "malum:rustic_soulwood_planks_stairs", "malum:vertical_rustic_runewood_planks_stairs", - "malum:soulwood_planks_stairs", - "malum:runewood_boards_stairs", - "malum:rustic_runewood_tiles_stairs" + "malum:runewood_tiles_stairs", + "malum:rustic_runewood_planks_stairs", + "malum:vertical_soulwood_planks_stairs" ] } \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/block/wooden_trapdoors.json b/src/generated/resources/data/minecraft/tags/block/wooden_trapdoors.json index 0dc5bd545..41dbf47b8 100644 --- a/src/generated/resources/data/minecraft/tags/block/wooden_trapdoors.json +++ b/src/generated/resources/data/minecraft/tags/block/wooden_trapdoors.json @@ -1,8 +1,8 @@ { "values": [ - "malum:solid_runewood_trapdoor", "malum:solid_soulwood_trapdoor", + "malum:runewood_trapdoor", "malum:soulwood_trapdoor", - "malum:runewood_trapdoor" + "malum:solid_runewood_trapdoor" ] } \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/item/buttons.json b/src/generated/resources/data/minecraft/tags/item/buttons.json index 78b790481..9b09cfafd 100644 --- a/src/generated/resources/data/minecraft/tags/item/buttons.json +++ b/src/generated/resources/data/minecraft/tags/item/buttons.json @@ -1,9 +1,9 @@ { "values": [ - "malum:twisted_rock_button", + "malum:soulwood_planks_button", "malum:tainted_rock_button", "malum:runewood_planks_button", "malum:runewood_planks_button", - "malum:soulwood_planks_button" + "malum:twisted_rock_button" ] } \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/item/leaves.json b/src/generated/resources/data/minecraft/tags/item/leaves.json index b580f0690..5f405f671 100644 --- a/src/generated/resources/data/minecraft/tags/item/leaves.json +++ b/src/generated/resources/data/minecraft/tags/item/leaves.json @@ -1,8 +1,8 @@ { "values": [ - "malum:budding_soulwood_leaves", - "malum:soulwood_leaves", "malum:azure_runewood_leaves", - "malum:runewood_leaves" + "malum:runewood_leaves", + "malum:budding_soulwood_leaves", + "malum:soulwood_leaves" ] } \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/item/planks.json b/src/generated/resources/data/minecraft/tags/item/planks.json index 0e7ee3d32..43f7f590c 100644 --- a/src/generated/resources/data/minecraft/tags/item/planks.json +++ b/src/generated/resources/data/minecraft/tags/item/planks.json @@ -1,22 +1,22 @@ { "values": [ - "malum:vertical_rustic_runewood_planks", "malum:rustic_soulwood_planks", - "malum:vertical_soulwood_boards", - "malum:vertical_rustic_soulwood_planks", - "malum:soulwood_planks", - "malum:runewood_boards", - "malum:vertical_soulwood_planks", "malum:rustic_runewood_tiles", - "malum:soulwood_boards", "malum:runewood_planks", + "malum:soulwood_boards", "malum:soulwood_tiles", "malum:cut_soulwood_planks", - "malum:cut_runewood_planks", - "malum:vertical_runewood_boards", + "malum:vertical_rustic_soulwood_planks", + "malum:vertical_soulwood_boards", "malum:vertical_runewood_planks", - "malum:rustic_soulwood_tiles", + "malum:vertical_runewood_boards", "malum:runewood_tiles", - "malum:rustic_runewood_planks" + "malum:soulwood_planks", + "malum:runewood_boards", + "malum:vertical_rustic_runewood_planks", + "malum:cut_runewood_planks", + "malum:rustic_runewood_planks", + "malum:vertical_soulwood_planks", + "malum:rustic_soulwood_tiles" ] } \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/item/saplings.json b/src/generated/resources/data/minecraft/tags/item/saplings.json index 70dfd347a..e9439f262 100644 --- a/src/generated/resources/data/minecraft/tags/item/saplings.json +++ b/src/generated/resources/data/minecraft/tags/item/saplings.json @@ -1,6 +1,6 @@ { "values": [ - "malum:azure_runewood_sapling", - "malum:runewood_sapling" + "malum:runewood_sapling", + "malum:azure_runewood_sapling" ] } \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/item/slabs.json b/src/generated/resources/data/minecraft/tags/item/slabs.json index 658be0b6f..f8056f555 100644 --- a/src/generated/resources/data/minecraft/tags/item/slabs.json +++ b/src/generated/resources/data/minecraft/tags/item/slabs.json @@ -1,38 +1,38 @@ { "values": [ - "malum:tainted_rock_tiles_slab", - "malum:vertical_rustic_soulwood_planks_slab", - "malum:tainted_rock_slab", - "malum:tainted_rock_bricks_slab", - "malum:runic_small_twisted_rock_bricks_slab", - "malum:small_tainted_rock_bricks_slab", - "malum:vertical_runewood_planks_slab", - "malum:vertical_soulwood_boards_slab", - "malum:rustic_runewood_planks_slab", "malum:runic_twisted_rock_tiles_slab", - "malum:polished_tainted_rock_slab", + "malum:vertical_soulwood_planks_slab", + "malum:vertical_runewood_planks_slab", + "malum:vertical_rustic_soulwood_planks_slab", "malum:twisted_rock_slab", - "malum:runic_tainted_rock_tiles_slab", + "malum:rustic_runewood_planks_slab", "malum:soulwood_planks_slab", - "malum:rustic_soulwood_planks_slab", + "malum:twisted_rock_bricks_slab", + "malum:runewood_planks_slab", + "malum:vertical_soulwood_boards_slab", + "malum:runic_twisted_rock_bricks_slab", + "malum:polished_tainted_rock_slab", + "malum:small_tainted_rock_bricks_slab", "malum:runewood_boards_slab", - "malum:runic_tainted_rock_bricks_slab", - "malum:vertical_runewood_boards_slab", + "malum:runewood_tiles_slab", + "malum:soulwood_tiles_slab", + "malum:runic_tainted_rock_tiles_slab", + "malum:runic_small_tainted_rock_bricks_slab", "malum:smooth_tainted_rock_slab", - "malum:rustic_runewood_tiles_slab", + "malum:tainted_rock_bricks_slab", + "malum:runic_small_twisted_rock_bricks_slab", "malum:soulwood_boards_slab", - "malum:polished_twisted_rock_slab", - "malum:twisted_rock_tiles_slab", - "malum:runic_small_tainted_rock_bricks_slab", - "malum:runic_twisted_rock_bricks_slab", - "malum:vertical_soulwood_planks_slab", - "malum:smooth_twisted_rock_slab", - "malum:twisted_rock_bricks_slab", - "malum:runewood_tiles_slab", + "malum:vertical_runewood_boards_slab", "malum:rustic_soulwood_tiles_slab", + "malum:smooth_twisted_rock_slab", + "malum:twisted_rock_tiles_slab", + "malum:tainted_rock_tiles_slab", + "malum:polished_twisted_rock_slab", "malum:small_twisted_rock_bricks_slab", + "malum:rustic_soulwood_planks_slab", + "malum:tainted_rock_slab", + "malum:rustic_runewood_tiles_slab", "malum:vertical_rustic_runewood_planks_slab", - "malum:runewood_planks_slab", - "malum:soulwood_tiles_slab" + "malum:runic_tainted_rock_bricks_slab" ] } \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/item/stairs.json b/src/generated/resources/data/minecraft/tags/item/stairs.json index 1d1bc1dcd..37f5522d5 100644 --- a/src/generated/resources/data/minecraft/tags/item/stairs.json +++ b/src/generated/resources/data/minecraft/tags/item/stairs.json @@ -1,38 +1,38 @@ { "values": [ - "malum:runic_twisted_rock_bricks_stairs", + "malum:soulwood_tiles_stairs", "malum:runewood_planks_stairs", + "malum:soulwood_planks_stairs", + "malum:vertical_runewood_planks_stairs", + "malum:smooth_twisted_rock_stairs", + "malum:runic_small_tainted_rock_bricks_stairs", + "malum:vertical_rustic_soulwood_planks_stairs", + "malum:vertical_soulwood_boards_stairs", + "malum:runic_tainted_rock_bricks_stairs", + "malum:runewood_boards_stairs", + "malum:runic_twisted_rock_bricks_stairs", + "malum:rustic_soulwood_tiles_stairs", + "malum:soulwood_boards_stairs", "malum:vertical_runewood_boards_stairs", - "malum:twisted_rock_stairs", - "malum:polished_tainted_rock_stairs", - "malum:smooth_tainted_rock_stairs", + "malum:twisted_rock_bricks_stairs", + "malum:rustic_runewood_tiles_stairs", "malum:rustic_soulwood_planks_stairs", - "malum:runic_tainted_rock_bricks_stairs", "malum:tainted_rock_stairs", - "malum:vertical_runewood_planks_stairs", + "malum:tainted_rock_tiles_stairs", + "malum:vertical_rustic_runewood_planks_stairs", "malum:runewood_tiles_stairs", - "malum:twisted_rock_bricks_stairs", - "malum:soulwood_tiles_stairs", - "malum:vertical_soulwood_boards_stairs", - "malum:vertical_rustic_soulwood_planks_stairs", - "malum:soulwood_boards_stairs", - "malum:rustic_soulwood_tiles_stairs", - "malum:runic_small_tainted_rock_bricks_stairs", - "malum:smooth_twisted_rock_stairs", + "malum:runic_tainted_rock_tiles_stairs", "malum:rustic_runewood_planks_stairs", - "malum:tainted_rock_tiles_stairs", - "malum:polished_twisted_rock_stairs", + "malum:twisted_rock_tiles_stairs", + "malum:small_tainted_rock_bricks_stairs", "malum:small_twisted_rock_bricks_stairs", + "malum:smooth_tainted_rock_stairs", + "malum:polished_tainted_rock_stairs", "malum:vertical_soulwood_planks_stairs", - "malum:runic_tainted_rock_tiles_stairs", - "malum:vertical_rustic_runewood_planks_stairs", - "malum:runic_twisted_rock_tiles_stairs", - "malum:small_tainted_rock_bricks_stairs", - "malum:soulwood_planks_stairs", - "malum:twisted_rock_tiles_stairs", "malum:runic_small_twisted_rock_bricks_stairs", - "malum:runewood_boards_stairs", - "malum:rustic_runewood_tiles_stairs", - "malum:tainted_rock_bricks_stairs" + "malum:runic_twisted_rock_tiles_stairs", + "malum:twisted_rock_stairs", + "malum:tainted_rock_bricks_stairs", + "malum:polished_twisted_rock_stairs" ] } \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/item/trapdoors.json b/src/generated/resources/data/minecraft/tags/item/trapdoors.json index 0dc5bd545..41dbf47b8 100644 --- a/src/generated/resources/data/minecraft/tags/item/trapdoors.json +++ b/src/generated/resources/data/minecraft/tags/item/trapdoors.json @@ -1,8 +1,8 @@ { "values": [ - "malum:solid_runewood_trapdoor", "malum:solid_soulwood_trapdoor", + "malum:runewood_trapdoor", "malum:soulwood_trapdoor", - "malum:runewood_trapdoor" + "malum:solid_runewood_trapdoor" ] } \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/item/walls.json b/src/generated/resources/data/minecraft/tags/item/walls.json index 71ac92a0a..d5059cb5b 100644 --- a/src/generated/resources/data/minecraft/tags/item/walls.json +++ b/src/generated/resources/data/minecraft/tags/item/walls.json @@ -1,24 +1,24 @@ { "values": [ - "malum:runic_tainted_rock_tiles_wall", - "malum:tainted_rock_bricks_wall", - "malum:soulwood_boards_wall", + "malum:twisted_rock_wall", + "malum:twisted_rock_bricks_wall", "malum:runic_tainted_rock_bricks_wall", - "malum:runic_small_tainted_rock_bricks_wall", - "malum:runic_small_twisted_rock_bricks_wall", - "malum:small_twisted_rock_bricks_wall", - "malum:polished_twisted_rock_wall", "malum:small_tainted_rock_bricks_wall", "malum:polished_tainted_rock_wall", - "malum:runic_twisted_rock_tiles_wall", + "malum:polished_twisted_rock_wall", "malum:smooth_tainted_rock_wall", + "malum:small_twisted_rock_bricks_wall", "malum:smooth_twisted_rock_wall", - "malum:tainted_rock_wall", "malum:runic_twisted_rock_bricks_wall", - "malum:twisted_rock_wall", "malum:runewood_boards_wall", - "malum:twisted_rock_tiles_wall", "malum:tainted_rock_tiles_wall", - "malum:twisted_rock_bricks_wall" + "malum:runic_small_tainted_rock_bricks_wall", + "malum:twisted_rock_tiles_wall", + "malum:runic_twisted_rock_tiles_wall", + "malum:runic_small_twisted_rock_bricks_wall", + "malum:runic_tainted_rock_tiles_wall", + "malum:tainted_rock_wall", + "malum:soulwood_boards_wall", + "malum:tainted_rock_bricks_wall" ] } \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/item/wooden_slabs.json b/src/generated/resources/data/minecraft/tags/item/wooden_slabs.json index a85aa861d..cd52a80cd 100644 --- a/src/generated/resources/data/minecraft/tags/item/wooden_slabs.json +++ b/src/generated/resources/data/minecraft/tags/item/wooden_slabs.json @@ -1,20 +1,20 @@ { "values": [ - "malum:vertical_rustic_soulwood_planks_slab", + "malum:vertical_soulwood_planks_slab", "malum:vertical_runewood_planks_slab", - "malum:vertical_soulwood_boards_slab", + "malum:vertical_rustic_soulwood_planks_slab", "malum:rustic_runewood_planks_slab", "malum:soulwood_planks_slab", - "malum:rustic_soulwood_planks_slab", + "malum:runewood_planks_slab", + "malum:vertical_soulwood_boards_slab", "malum:runewood_boards_slab", - "malum:vertical_runewood_boards_slab", - "malum:rustic_runewood_tiles_slab", - "malum:soulwood_boards_slab", - "malum:vertical_soulwood_planks_slab", "malum:runewood_tiles_slab", + "malum:soulwood_tiles_slab", + "malum:soulwood_boards_slab", + "malum:vertical_runewood_boards_slab", "malum:rustic_soulwood_tiles_slab", - "malum:vertical_rustic_runewood_planks_slab", - "malum:runewood_planks_slab", - "malum:soulwood_tiles_slab" + "malum:rustic_soulwood_planks_slab", + "malum:rustic_runewood_tiles_slab", + "malum:vertical_rustic_runewood_planks_slab" ] } \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/item/wooden_stairs.json b/src/generated/resources/data/minecraft/tags/item/wooden_stairs.json index c7bea09d9..c0604cca3 100644 --- a/src/generated/resources/data/minecraft/tags/item/wooden_stairs.json +++ b/src/generated/resources/data/minecraft/tags/item/wooden_stairs.json @@ -1,20 +1,20 @@ { "values": [ + "malum:soulwood_tiles_stairs", "malum:runewood_planks_stairs", - "malum:vertical_runewood_boards_stairs", - "malum:rustic_soulwood_planks_stairs", + "malum:soulwood_planks_stairs", "malum:vertical_runewood_planks_stairs", - "malum:runewood_tiles_stairs", - "malum:soulwood_tiles_stairs", - "malum:vertical_soulwood_boards_stairs", "malum:vertical_rustic_soulwood_planks_stairs", - "malum:soulwood_boards_stairs", + "malum:vertical_soulwood_boards_stairs", + "malum:runewood_boards_stairs", "malum:rustic_soulwood_tiles_stairs", - "malum:rustic_runewood_planks_stairs", - "malum:vertical_soulwood_planks_stairs", + "malum:soulwood_boards_stairs", + "malum:vertical_runewood_boards_stairs", + "malum:rustic_runewood_tiles_stairs", + "malum:rustic_soulwood_planks_stairs", "malum:vertical_rustic_runewood_planks_stairs", - "malum:soulwood_planks_stairs", - "malum:runewood_boards_stairs", - "malum:rustic_runewood_tiles_stairs" + "malum:runewood_tiles_stairs", + "malum:rustic_runewood_planks_stairs", + "malum:vertical_soulwood_planks_stairs" ] } \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/item/wooden_trapdoors.json b/src/generated/resources/data/minecraft/tags/item/wooden_trapdoors.json index 0dc5bd545..41dbf47b8 100644 --- a/src/generated/resources/data/minecraft/tags/item/wooden_trapdoors.json +++ b/src/generated/resources/data/minecraft/tags/item/wooden_trapdoors.json @@ -1,8 +1,8 @@ { "values": [ - "malum:solid_runewood_trapdoor", "malum:solid_soulwood_trapdoor", + "malum:runewood_trapdoor", "malum:soulwood_trapdoor", - "malum:runewood_trapdoor" + "malum:solid_runewood_trapdoor" ] } \ No newline at end of file diff --git a/src/generated/resources/data/neoforge/tags/block/stripped_logs.json b/src/generated/resources/data/neoforge/tags/block/stripped_logs.json index f765e90b3..396e77f6e 100644 --- a/src/generated/resources/data/neoforge/tags/block/stripped_logs.json +++ b/src/generated/resources/data/neoforge/tags/block/stripped_logs.json @@ -1,10 +1,10 @@ { "values": [ + "malum:stripped_runewood", "malum:exposed_runewood_log", "malum:stripped_runewood_log", - "malum:revealed_soulwood_log", "malum:stripped_soulwood", - "malum:stripped_runewood", - "malum:stripped_soulwood_log" + "malum:stripped_soulwood_log", + "malum:revealed_soulwood_log" ] } \ No newline at end of file diff --git a/src/generated/resources/data/neoforge/tags/item/stripped_logs.json b/src/generated/resources/data/neoforge/tags/item/stripped_logs.json index f765e90b3..396e77f6e 100644 --- a/src/generated/resources/data/neoforge/tags/item/stripped_logs.json +++ b/src/generated/resources/data/neoforge/tags/item/stripped_logs.json @@ -1,10 +1,10 @@ { "values": [ + "malum:stripped_runewood", "malum:exposed_runewood_log", "malum:stripped_runewood_log", - "malum:revealed_soulwood_log", "malum:stripped_soulwood", - "malum:stripped_runewood", - "malum:stripped_soulwood_log" + "malum:stripped_soulwood_log", + "malum:revealed_soulwood_log" ] } \ No newline at end of file diff --git a/src/main/java/com/sammy/malum/compability/farmersdelight/FarmersDelightCompat.java b/src/main/java/com/sammy/malum/compability/farmersdelight/FarmersDelightCompat.java index 59910d36f..12dc4448a 100644 --- a/src/main/java/com/sammy/malum/compability/farmersdelight/FarmersDelightCompat.java +++ b/src/main/java/com/sammy/malum/compability/farmersdelight/FarmersDelightCompat.java @@ -2,6 +2,7 @@ import com.sammy.malum.common.item.curiosities.MagicKnifeItem; import com.sammy.malum.registry.common.item.ItemRegistry; +import com.sammy.malum.registry.common.item.ItemTiers; import mezz.jei.api.constants.VanillaTypes; import mezz.jei.api.registration.IRecipeRegistration; import net.minecraft.world.item.Item; @@ -9,8 +10,6 @@ import net.neoforged.fml.ModList; import vectorwing.farmersdelight.common.utility.TextUtils; -import static com.sammy.malum.registry.common.item.ItemTiers.ItemTierEnum.SOUL_STAINED_STEEL; - public class FarmersDelightCompat { public static boolean LOADED; @@ -21,7 +20,7 @@ public static void init() { public static class LoadedOnly { public static Item makeMagicKnife(Item.Properties properties) { - return new MagicKnifeItem(SOUL_STAINED_STEEL, -1.5f, 0, 2, properties); + return new MagicKnifeItem(ItemTiers.SOUL_STAINED_STEEL, -1.5f, 0, 2, properties); } } diff --git a/src/main/java/com/sammy/malum/mixin/MappedRegistryMixin.java b/src/main/java/com/sammy/malum/mixin/MappedRegistryMixin.java index 6ed05f91c..e3ee950f7 100644 --- a/src/main/java/com/sammy/malum/mixin/MappedRegistryMixin.java +++ b/src/main/java/com/sammy/malum/mixin/MappedRegistryMixin.java @@ -21,7 +21,7 @@ public class MappedRegistryMixin { private void gsdg(Map, List>> tagMap, CallbackInfo ci) { } - @Inject(method = "createTag", at = @At("HEAD")) + @Inject(method = "createTag", at = @At("RETURN")) private void gsdgdd(TagKey key, CallbackInfoReturnable> cir) { MalumMod.innfddddsdjh(key); } diff --git a/src/main/java/com/sammy/malum/registry/common/item/ItemRegistry.java b/src/main/java/com/sammy/malum/registry/common/item/ItemRegistry.java index bc5913786..6f1fd9aa3 100644 --- a/src/main/java/com/sammy/malum/registry/common/item/ItemRegistry.java +++ b/src/main/java/com/sammy/malum/registry/common/item/ItemRegistry.java @@ -73,7 +73,7 @@ import java.util.stream.*; import static com.sammy.malum.MalumMod.*; -import static com.sammy.malum.registry.common.item.ItemTiers.ItemTierEnum.*; +import static com.sammy.malum.registry.common.item.ItemTiers.*; import static net.minecraft.world.item.Rarity.*; @SuppressWarnings("unused") @@ -627,15 +627,15 @@ public static DeferredHolder register(String name, Ite public static final DeferredHolder SOUL_HUNTER_LEGGINGS = register("soul_hunter_leggings", GEAR_PROPERTIES(), (p) -> new SoulHunterArmorItem(ArmorItem.Type.LEGGINGS, p)); public static final DeferredHolder SOUL_HUNTER_BOOTS = register("soul_hunter_boots", GEAR_PROPERTIES(), (p) -> new SoulHunterArmorItem(ArmorItem.Type.BOOTS, p)); - public static final DeferredHolder TYRVING = register("tyrving", GEAR_PROPERTIES(), (p) -> new TyrvingItem(ItemTiers.ItemTierEnum.TYRVING, 0, -0.3f, p)); + public static final DeferredHolder TYRVING = register("tyrving", GEAR_PROPERTIES(), (p) -> new TyrvingItem(ItemTiers.TYRVING, 0, -0.3f, p)); public static final DeferredHolder MALIGNANT_STRONGHOLD_HELMET = register("malignant_stronghold_helmet", GEAR_PROPERTIES(), (p) -> new MalignantStrongholdArmorItem(ArmorItem.Type.HELMET, p)); public static final DeferredHolder MALIGNANT_STRONGHOLD_CHESTPLATE = register("malignant_stronghold_chestplate", GEAR_PROPERTIES(), (p) -> new MalignantStrongholdArmorItem(ArmorItem.Type.CHESTPLATE, p)); public static final DeferredHolder MALIGNANT_STRONGHOLD_LEGGINGS = register("malignant_stronghold_leggings", GEAR_PROPERTIES(), (p) -> new MalignantStrongholdArmorItem(ArmorItem.Type.LEGGINGS, p)); public static final DeferredHolder MALIGNANT_STRONGHOLD_BOOTS = register("malignant_stronghold_boots", GEAR_PROPERTIES(), (p) -> new MalignantStrongholdArmorItem(ArmorItem.Type.BOOTS, p)); - public static final DeferredHolder WEIGHT_OF_WORLDS = register("weight_of_worlds", GEAR_PROPERTIES(), (p) -> new WeightOfWorldsItem(ItemTiers.ItemTierEnum.MALIGNANT_ALLOY, 2, -0.4f, p)); - public static final DeferredHolder EDGE_OF_DELIVERANCE = register("edge_of_deliverance", GEAR_PROPERTIES(), (p) -> new EdgeOfDeliveranceItem(ItemTiers.ItemTierEnum.MALIGNANT_ALLOY, 2, -0.2f, p)); + public static final DeferredHolder WEIGHT_OF_WORLDS = register("weight_of_worlds", GEAR_PROPERTIES(), (p) -> new WeightOfWorldsItem(ItemTiers.MALIGNANT_ALLOY, 2, -0.4f, p)); + public static final DeferredHolder EDGE_OF_DELIVERANCE = register("edge_of_deliverance", GEAR_PROPERTIES(), (p) -> new EdgeOfDeliveranceItem(ItemTiers.MALIGNANT_ALLOY, 2, -0.2f, p)); public static final DeferredHolder MNEMONIC_HEX_STAFF = register("mnemonic_hex_staff", GEAR_PROPERTIES(), (p) -> new HexStaffItem(HEX_STAFF, 5, p)); public static final DeferredHolder STAFF_OF_THE_AURIC_FLAME = register("staff_of_the_auric_flame", GEAR_PROPERTIES(), (p) -> new AuricFlameStaffItem(AURIC_STAFF, 7, p)); diff --git a/src/main/java/com/sammy/malum/registry/common/item/ItemTiers.java b/src/main/java/com/sammy/malum/registry/common/item/ItemTiers.java index 8cb1597e6..9be6058a1 100644 --- a/src/main/java/com/sammy/malum/registry/common/item/ItemTiers.java +++ b/src/main/java/com/sammy/malum/registry/common/item/ItemTiers.java @@ -1,5 +1,7 @@ package com.sammy.malum.registry.common.item; +import com.google.common.base.Suppliers; +import net.minecraft.tags.BlockTags; import net.minecraft.tags.TagKey; import net.minecraft.world.item.Item; import net.minecraft.world.item.Tier; @@ -8,57 +10,56 @@ import java.util.function.Supplier; -public class ItemTiers { - public enum ItemTierEnum implements Tier { - SOUL_STAINED_STEEL(1250, 7.5f, 2.5f, 3, 16, ItemRegistry.SOUL_STAINED_STEEL_INGOT), - MALIGNANT_ALLOY(2500, 8f, 4f, 3, 24, ItemRegistry.MALIGNANT_PEWTER_INGOT), - TYRVING(1500, 8f, 1f, 3, 16, ItemRegistry.TWISTED_ROCK), - HEX_STAFF(1250, 8f, 2.5f, 3, 16, ItemRegistry.MNEMONIC_FRAGMENT), - AURIC_STAFF(2500, 8f, 2.5f, 3, 16, ItemRegistry.AURIC_EMBERS); - private final int maxUses; - private final float efficiency; - private final float attackDamage; - private final int harvestLevel; - private final int enchantability; - private final Supplier repairItem; - - ItemTierEnum(int maxUses, float efficiency, float attackDamage, int harvestLevel, int enchantability, Supplier repairItem) { - this.maxUses = maxUses; - this.efficiency = efficiency; - this.attackDamage = attackDamage; - this.harvestLevel = harvestLevel; - this.enchantability = enchantability; - this.repairItem = repairItem; - } +public enum ItemTiers implements Tier{ + SOUL_STAINED_STEEL(BlockTags.INCORRECT_FOR_DIAMOND_TOOL, 1250, 7.5f, 2.5f, 16, ItemRegistry.SOUL_STAINED_STEEL_INGOT), + MALIGNANT_ALLOY(BlockTags.INCORRECT_FOR_NETHERITE_TOOL, 2500, 8f, 4f, 24, ItemRegistry.MALIGNANT_PEWTER_INGOT), + TYRVING(BlockTags.INCORRECT_FOR_DIAMOND_TOOL, 1500, 8f, 1f, 16, ItemRegistry.TWISTED_ROCK), + HEX_STAFF(BlockTags.INCORRECT_FOR_DIAMOND_TOOL, 1250, 8f, 2.5f, 16, ItemRegistry.MNEMONIC_FRAGMENT), + AURIC_STAFF(BlockTags.INCORRECT_FOR_DIAMOND_TOOL, 2500, 8f, 2.5f, 16, ItemRegistry.AURIC_EMBERS); + + private final TagKey incorrectBlocksForDrops; + private final int uses; + private final float speed; + private final float damage; + private final int enchantmentValue; + private final Supplier repairIngredient; + + ItemTiers(TagKey incorrectBlockForDrops, int uses, float speed, float damage, int enchantmentValue, Supplier repairItem) { + this.incorrectBlocksForDrops = incorrectBlockForDrops; + this.uses = uses; + this.speed = speed; + this.damage = damage; + this.enchantmentValue = enchantmentValue; + this.repairIngredient = Suppliers.memoize(()->Ingredient.of(repairItem.get())); + } - @Override - public int getUses() { - return maxUses; - } + @Override + public int getUses() { + return this.uses; + } - @Override - public float getSpeed() { - return efficiency; - } + @Override + public float getSpeed() { + return this.speed; + } - @Override - public float getAttackDamageBonus() { - return attackDamage; - } + @Override + public float getAttackDamageBonus() { + return this.damage; + } - @Override - public TagKey getIncorrectBlocksForDrops() { - return null; - } + @Override + public TagKey getIncorrectBlocksForDrops() { + return this.incorrectBlocksForDrops; + } - @Override - public int getEnchantmentValue() { - return enchantability; - } + @Override + public int getEnchantmentValue() { + return this.enchantmentValue; + } - @Override - public Ingredient getRepairIngredient() { - return Ingredient.of(repairItem.get()); - } + @Override + public Ingredient getRepairIngredient() { + return this.repairIngredient.get(); } }