Fix the stupid thing and also datagen

SammySemicolon · Dec 5, 2024 · e02e4f4 · e02e4f4
1 parent 6ce5b12
commit e02e4f4
Show file tree

Hide file tree

Showing 71 changed files with 748 additions and 748 deletions.
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
@@ -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"
   ]
 }
diff --git 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"
   ]
 }
diff --git 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"
   ]
 }
diff --git a/...damage_type/can_trigger_magic_damage.json → ...damage_type/can_trigger_magic_damage.json b/...damage_type/can_trigger_magic_damage.json → ...damage_type/can_trigger_magic_damage.json
diff --git a/...data/forge/tags/damage_type/is_magic.json → ...ces/data/c/tags/damage_type/is_magic.json b/...data/forge/tags/damage_type/is_magic.json → ...ces/data/c/tags/damage_type/is_magic.json
diff --git a/.../data/forge/tags/item/nuggets/copper.json → ...rces/data/c/tags/item/nuggets/copper.json b/.../data/forge/tags/item/nuggets/copper.json → ...rces/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
@@ -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"
   ]
 }
diff --git 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"
   ]
 }
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
@@ -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"
   ]
 }
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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,7 +1,7 @@
 {
   "values": [
-    "malum:mass_of_blighted_gunk",
+    "malum:blighted_earth",
     "malum:blighted_soil",
-    "malum:blighted_earth"
+    "malum:mass_of_blighted_gunk"
   ]
 }
diff --git 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"
   ]
 }
diff --git 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"
   ]
 }
diff --git 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"
   ]
 }
diff --git 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"
   ]
 }