feat: use codec merging to switch back to old ritual format while kee…

…ping new condition field
klikli-dev · Sep 29, 2024 · eca3dd9 · eca3dd9
1 parent 3607ed6
commit eca3dd9
Show file tree

Hide file tree

Showing 82 changed files with 2,177 additions and 2,661 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -33,7 +33,7 @@ group=com.klikli_dev
 mod_id=occultism
 mod_name=Occultism
 mod_license=MIT
-mod_version=1.160.0
+mod_version=1.161.0
 mod_authors=Kli Kli
 mod_description=A magic mod inspired by the world of Jonathan Stroud's Bartimaeus. With the help of occult rituals players can summon entities from the "Other Side" to perform magic.
 

diff --git a/src/generated/resources/data/occultism/recipe/ritual/craft_dimensional_matrix.json b/src/generated/resources/data/occultism/recipe/ritual/craft_dimensional_matrix.json
@@ -1,6 +1,24 @@
 {
   "type": "occultism:ritual",
-  "entity_to_summon_settings": {},
+  "activation_item": {
+    "item": "occultism:book_of_binding_bound_djinni"
+  },
+  "duration": 240,
+  "ingredients": [
+    {
+      "item": "minecraft:quartz_block"
+    },
+    {
+      "item": "minecraft:quartz_block"
+    },
+    {
+      "item": "minecraft:quartz_block"
+    },
+    {
+      "tag": "c:ender_pearls"
+    }
+  ],
+  "pentacle_id": "occultism:craft_djinni",
   "result": {
     "count": 1,
     "id": "occultism:dimensional_matrix"
@@ -9,27 +27,5 @@
     "count": 1,
     "id": "occultism:ritual_dummy/craft_dimensional_matrix"
   },
-  "ritual_requirement_settings": {
-    "activation_item": {
-      "item": "occultism:book_of_binding_bound_djinni"
-    },
-    "duration": 240,
-    "ingredients": [
-      {
-        "item": "minecraft:quartz_block"
-      },
-      {
-        "item": "minecraft:quartz_block"
-      },
-      {
-        "item": "minecraft:quartz_block"
-      },
-      {
-        "tag": "c:ender_pearls"
-      }
-    ],
-    "pentacle_id": "occultism:craft_djinni"
-  },
-  "ritual_start_settings": {},
   "ritual_type": "occultism:craft_with_spirit_name"
 }
diff --git a/src/generated/resources/data/occultism/recipe/ritual/craft_dimensional_mineshaft.json b/src/generated/resources/data/occultism/recipe/ritual/craft_dimensional_mineshaft.json
@@ -1,6 +1,33 @@
 {
   "type": "occultism:ritual",
-  "entity_to_summon_settings": {},
+  "activation_item": {
+    "item": "occultism:book_of_binding_bound_djinni"
+  },
+  "duration": 240,
+  "ingredients": [
+    {
+      "item": "occultism:otherstone"
+    },
+    {
+      "item": "occultism:otherstone"
+    },
+    {
+      "item": "occultism:otherstone"
+    },
+    {
+      "item": "occultism:otherstone"
+    },
+    {
+      "tag": "c:ingots/gold"
+    },
+    {
+      "tag": "c:storage_blocks/iesnium"
+    },
+    {
+      "item": "occultism:spirit_attuned_crystal"
+    }
+  ],
+  "pentacle_id": "occultism:craft_djinni",
   "result": {
     "count": 1,
     "id": "occultism:dimensional_mineshaft"
@@ -9,36 +36,5 @@
     "count": 1,
     "id": "occultism:ritual_dummy/craft_dimensional_mineshaft"
   },
-  "ritual_requirement_settings": {
-    "activation_item": {
-      "item": "occultism:book_of_binding_bound_djinni"
-    },
-    "duration": 240,
-    "ingredients": [
-      {
-        "item": "occultism:otherstone"
-      },
-      {
-        "item": "occultism:otherstone"
-      },
-      {
-        "item": "occultism:otherstone"
-      },
-      {
-        "item": "occultism:otherstone"
-      },
-      {
-        "tag": "c:ingots/gold"
-      },
-      {
-        "tag": "c:storage_blocks/iesnium"
-      },
-      {
-        "item": "occultism:spirit_attuned_crystal"
-      }
-    ],
-    "pentacle_id": "occultism:craft_djinni"
-  },
-  "ritual_start_settings": {},
   "ritual_type": "occultism:craft"
 }
diff --git a/src/generated/resources/data/occultism/recipe/ritual/craft_familiar_ring.json b/src/generated/resources/data/occultism/recipe/ritual/craft_familiar_ring.json
@@ -1,6 +1,27 @@
 {
   "type": "occultism:ritual",
-  "entity_to_summon_settings": {},
+  "activation_item": {
+    "item": "occultism:book_of_binding_bound_djinni"
+  },
+  "duration": 90,
+  "ingredients": [
+    {
+      "item": "occultism:soul_gem"
+    },
+    {
+      "tag": "c:ingots/gold"
+    },
+    {
+      "tag": "c:ingots/gold"
+    },
+    {
+      "tag": "c:ingots/silver"
+    },
+    {
+      "tag": "c:ingots/silver"
+    }
+  ],
+  "pentacle_id": "occultism:craft_djinni",
   "result": {
     "count": 1,
     "id": "occultism:familiar_ring"
@@ -9,30 +30,5 @@
     "count": 1,
     "id": "occultism:ritual_dummy/craft_familiar_ring"
   },
-  "ritual_requirement_settings": {
-    "activation_item": {
-      "item": "occultism:book_of_binding_bound_djinni"
-    },
-    "duration": 90,
-    "ingredients": [
-      {
-        "item": "occultism:soul_gem"
-      },
-      {
-        "tag": "c:ingots/gold"
-      },
-      {
-        "tag": "c:ingots/gold"
-      },
-      {
-        "tag": "c:ingots/silver"
-      },
-      {
-        "tag": "c:ingots/silver"
-      }
-    ],
-    "pentacle_id": "occultism:craft_djinni"
-  },
-  "ritual_start_settings": {},
   "ritual_type": "occultism:craft"
 }
diff --git a/src/generated/resources/data/occultism/recipe/ritual/craft_infused_lenses.json b/src/generated/resources/data/occultism/recipe/ritual/craft_infused_lenses.json
@@ -1,6 +1,24 @@
 {
   "type": "occultism:ritual",
-  "entity_to_summon_settings": {},
+  "activation_item": {
+    "item": "occultism:book_of_binding_bound_foliot"
+  },
+  "duration": 60,
+  "ingredients": [
+    {
+      "item": "occultism:lenses"
+    },
+    {
+      "tag": "c:ingots/silver"
+    },
+    {
+      "tag": "c:ingots/silver"
+    },
+    {
+      "tag": "c:ingots/gold"
+    }
+  ],
+  "pentacle_id": "occultism:craft_foliot",
   "result": {
     "count": 1,
     "id": "occultism:infused_lenses"
@@ -9,27 +27,5 @@
     "count": 1,
     "id": "occultism:ritual_dummy/craft_infused_lenses"
   },
-  "ritual_requirement_settings": {
-    "activation_item": {
-      "item": "occultism:book_of_binding_bound_foliot"
-    },
-    "duration": 60,
-    "ingredients": [
-      {
-        "item": "occultism:lenses"
-      },
-      {
-        "tag": "c:ingots/silver"
-      },
-      {
-        "tag": "c:ingots/silver"
-      },
-      {
-        "tag": "c:ingots/gold"
-      }
-    ],
-    "pentacle_id": "occultism:craft_foliot"
-  },
-  "ritual_start_settings": {},
   "ritual_type": "occultism:craft"
 }
diff --git a/src/generated/resources/data/occultism/recipe/ritual/craft_infused_pickaxe.json b/src/generated/resources/data/occultism/recipe/ritual/craft_infused_pickaxe.json
@@ -1,6 +1,27 @@
 {
   "type": "occultism:ritual",
-  "entity_to_summon_settings": {},
+  "activation_item": {
+    "item": "occultism:book_of_binding_bound_djinni"
+  },
+  "duration": 60,
+  "ingredients": [
+    {
+      "tag": "c:rods/wooden"
+    },
+    {
+      "tag": "c:rods/wooden"
+    },
+    {
+      "item": "occultism:spirit_attuned_pickaxe_head"
+    },
+    {
+      "tag": "c:ingots/silver"
+    },
+    {
+      "tag": "c:ingots/silver"
+    }
+  ],
+  "pentacle_id": "occultism:craft_djinni",
   "result": {
     "count": 1,
     "id": "occultism:infused_pickaxe"
@@ -9,30 +30,5 @@
     "count": 1,
     "id": "occultism:ritual_dummy/craft_infused_pickaxe"
   },
-  "ritual_requirement_settings": {
-    "activation_item": {
-      "item": "occultism:book_of_binding_bound_djinni"
-    },
-    "duration": 60,
-    "ingredients": [
-      {
-        "tag": "c:rods/wooden"
-      },
-      {
-        "tag": "c:rods/wooden"
-      },
-      {
-        "item": "occultism:spirit_attuned_pickaxe_head"
-      },
-      {
-        "tag": "c:ingots/silver"
-      },
-      {
-        "tag": "c:ingots/silver"
-      }
-    ],
-    "pentacle_id": "occultism:craft_djinni"
-  },
-  "ritual_start_settings": {},
   "ritual_type": "occultism:craft_with_spirit_name"
 }
diff --git a/src/generated/resources/data/occultism/recipe/ritual/craft_miner_afrit_deeps.json b/src/generated/resources/data/occultism/recipe/ritual/craft_miner_afrit_deeps.json
@@ -1,6 +1,30 @@
 {
   "type": "occultism:ritual",
-  "entity_to_summon_settings": {},
+  "activation_item": {
+    "item": "occultism:book_of_binding_bound_afrit"
+  },
+  "duration": 120,
+  "ingredients": [
+    {
+      "item": "occultism:miner_djinni_ores"
+    },
+    {
+      "item": "occultism:iesnium_pickaxe"
+    },
+    {
+      "item": "occultism:spirit_attuned_crystal"
+    },
+    {
+      "item": "occultism:afrit_essence"
+    },
+    {
+      "item": "minecraft:echo_shard"
+    },
+    {
+      "item": "minecraft:crying_obsidian"
+    }
+  ],
+  "pentacle_id": "occultism:craft_afrit",
   "result": {
     "count": 1,
     "id": "occultism:miner_afrit_deeps"
@@ -9,33 +33,5 @@
     "count": 1,
     "id": "occultism:ritual_dummy/craft_miner_afrit_deeps"
   },
-  "ritual_requirement_settings": {
-    "activation_item": {
-      "item": "occultism:book_of_binding_bound_afrit"
-    },
-    "duration": 120,
-    "ingredients": [
-      {
-        "item": "occultism:miner_djinni_ores"
-      },
-      {
-        "item": "occultism:iesnium_pickaxe"
-      },
-      {
-        "item": "occultism:spirit_attuned_crystal"
-      },
-      {
-        "item": "occultism:afrit_essence"
-      },
-      {
-        "item": "minecraft:echo_shard"
-      },
-      {
-        "item": "minecraft:crying_obsidian"
-      }
-    ],
-    "pentacle_id": "occultism:craft_afrit"
-  },
-  "ritual_start_settings": {},
   "ritual_type": "occultism:craft_miner_spirit"
 }