Random Animals, Smelter Spirit, Familiars checkup, Achievements Optimizer compatibility and other things

src/generated/resources/assets/occultism/models/item/mysterious_egg_icon.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "occultism:item/mysterious_egg_icon"
+  }
+}

src/generated/resources/assets/occultism/models/item/ritual_dummy/misc_miner_ancient_eldritch.json

@@ -0,0 +1,3 @@
+{
+  "parent": "occultism:item/pentacle_misc"
+}

src/generated/resources/assets/occultism/models/item/ritual_dummy/possess_random_animal_rideable.json

@@ -0,0 +1,3 @@
+{
+  "parent": "occultism:item/pentacle_possess"
+}

src/generated/resources/assets/occultism/models/item/ritual_dummy/possess_random_animal_small.json

@@ -0,0 +1,3 @@
+{
+  "parent": "occultism:item/pentacle_possess"
+}

src/generated/resources/assets/occultism/models/item/ritual_dummy/possess_random_animal_special.json

@@ -0,0 +1,3 @@
+{
+  "parent": "occultism:item/pentacle_possess"
+}

src/generated/resources/assets/occultism/models/item/ritual_dummy/possess_random_animal_water.json

@@ -0,0 +1,3 @@
+{
+  "parent": "occultism:item/pentacle_possess"
+}

src/generated/resources/assets/occultism/models/item/ritual_dummy/possess_villager.json

@@ -0,0 +1,3 @@
+{
+  "parent": "occultism:item/pentacle_possess"
+}

src/generated/resources/data/c/tags/entity_type/goats.json

@@ -1,6 +1,7 @@
 {
   "values": [
     "minecraft:goat",
-    "occultism:mercy_goat"
+    "occultism:mercy_goat",
+    "occultism:goat_familiar"
   ]
 }

src/generated/resources/data/c/tags/entity_type/hoglins.json

@@ -1,5 +1,6 @@
 {
   "values": [
-    "minecraft:hoglin"
+    "minecraft:hoglin",
+    "occultism:possessed_hoglin"
   ]
 }

src/generated/resources/data/c/tags/entity_type/zombies.json

@@ -3,6 +3,10 @@
     "minecraft:zombie",
     "minecraft:zombie_villager",
     "minecraft:husk",
-    "minecraft:drowned"
+    "minecraft:drowned",
+    "occultism:wild_zombie",
+    "occultism:wild_husk",
+    "occultism:wild_horde_drowned",
+    "occultism:possessed_zombie_piglin"
   ]
 }

src/generated/resources/data/c/tags/item/dusts/certus_quartz.json

@@ -0,0 +1,8 @@
+{
+  "values": [
+    {
+      "id": "ae2:certus_quartz_dust",
+      "required": false
+    }
+  ]
+}

src/generated/resources/data/c/tags/item/dusts/fluix.json

@@ -0,0 +1,8 @@
+{
+  "values": [
+    {
+      "id": "ae2:fluix_dust",
+      "required": false
+    }
+  ]
+}

src/generated/resources/data/c/tags/item/gems/black_quartz.json

@@ -0,0 +1,8 @@
+{
+  "values": [
+    {
+      "id": "actuallyadditions:black_quartz",
+      "required": false
+    }
+  ]
+}

src/generated/resources/data/c/tags/item/gems/fluix.json

@@ -0,0 +1,8 @@
+{
+  "values": [
+    {
+      "id": "ae2:fluix_crystal",
+      "required": false
+    }
+  ]
+}

src/generated/resources/data/c/tags/item/ores/black_quartz.json

@@ -0,0 +1,8 @@
+{
+  "values": [
+    {
+      "id": "actuallyadditions:black_quartz_ore",
+      "required": false
+    }
+  ]
+}

src/generated/resources/data/occultism/advancement/recipes/crushing/crushing/charged_certus_quartz_dust_from_gem.json → src/generated/resources/data/occultism/advancement/recipes/crushing/crushing/black_quartz_dust.json

@@ -4,45 +4,45 @@
       "type": "neoforge:not",
       "value": {
         "type": "neoforge:tag_empty",
-        "tag": "c:gems/charged_certus_quartz"
+        "tag": "c:ores/black_quartz"
       }
     },
     {
       "type": "neoforge:not",
       "value": {
         "type": "neoforge:tag_empty",
-        "tag": "c:dusts/charged_certus_quartz"
+        "tag": "c:dusts/black_quartz"
       }
     }
   ],
   "parent": "minecraft:recipes/root",
   "criteria": {
-    "has_charged_certus_quartz_gem": {
+    "has_black_quartz": {
       "conditions": {
         "items": [
           {
-            "items": "#c:gems/charged_certus_quartz"
+            "items": "#c:ores/black_quartz"
           }
         ]
       },
       "trigger": "minecraft:inventory_changed"
     },
     "has_the_recipe": {
       "conditions": {
-        "recipe": "occultism:crushing/charged_certus_quartz_dust_from_gem"
+        "recipe": "occultism:crushing/black_quartz_dust"
       },
       "trigger": "minecraft:recipe_unlocked"
     }
   },
   "requirements": [
     [
       "has_the_recipe",
-      "has_charged_certus_quartz_gem"
+      "has_black_quartz"
     ]
   ],
   "rewards": {
     "recipes": [
-      "occultism:crushing/charged_certus_quartz_dust_from_gem"
+      "occultism:crushing/black_quartz_dust"
     ]
   }
 }

src/generated/resources/data/occultism/advancement/recipes/crushing/crushing/charged_certus_quartz_dust.json → src/generated/resources/data/occultism/advancement/recipes/crushing/crushing/black_quartz_dust_from_gem.json

@@ -4,45 +4,45 @@
       "type": "neoforge:not",
       "value": {
         "type": "neoforge:tag_empty",
-        "tag": "c:ores/charged_certus_quartz"
+        "tag": "c:gems/black_quartz"
       }
     },
     {
       "type": "neoforge:not",
       "value": {
         "type": "neoforge:tag_empty",
-        "tag": "c:dusts/charged_certus_quartz"
+        "tag": "c:dusts/black_quartz"
       }
     }
   ],
   "parent": "minecraft:recipes/root",
   "criteria": {
-    "has_charged_certus_quartz": {
+    "has_black_quartz_gem": {
       "conditions": {
         "items": [
           {
-            "items": "#c:ores/charged_certus_quartz"
+            "items": "#c:gems/black_quartz"
           }
         ]
       },
       "trigger": "minecraft:inventory_changed"
     },
     "has_the_recipe": {
       "conditions": {
-        "recipe": "occultism:crushing/charged_certus_quartz_dust"
+        "recipe": "occultism:crushing/black_quartz_dust_from_gem"
       },
       "trigger": "minecraft:recipe_unlocked"
     }
   },
   "requirements": [
     [
       "has_the_recipe",
-      "has_charged_certus_quartz"
+      "has_black_quartz_gem"
     ]
   ],
   "rewards": {
     "recipes": [
-      "occultism:crushing/charged_certus_quartz_dust"
+      "occultism:crushing/black_quartz_dust_from_gem"
     ]
   }
 }

src/generated/resources/data/occultism/advancement/recipes/crushing/crushing/fluix_dust.json

@@ -0,0 +1,48 @@
+{
+  "neoforge:conditions": [
+    {
+      "type": "neoforge:not",
+      "value": {
+        "type": "neoforge:tag_empty",
+        "tag": "c:ores/fluix"
+      }
+    },
+    {
+      "type": "neoforge:not",
+      "value": {
+        "type": "neoforge:tag_empty",
+        "tag": "c:dusts/fluix"
+      }
+    }
+  ],
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_fluix": {
+      "conditions": {
+        "items": [
+          {
+            "items": "#c:ores/fluix"
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "occultism:crushing/fluix_dust"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_the_recipe",
+      "has_fluix"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "occultism:crushing/fluix_dust"
+    ]
+  }
+}

src/generated/resources/data/occultism/advancement/recipes/crushing/crushing/fluix_dust_from_gem.json

@@ -0,0 +1,48 @@
+{
+  "neoforge:conditions": [
+    {
+      "type": "neoforge:not",
+      "value": {
+        "type": "neoforge:tag_empty",
+        "tag": "c:gems/fluix"
+      }
+    },
+    {
+      "type": "neoforge:not",
+      "value": {
+        "type": "neoforge:tag_empty",
+        "tag": "c:dusts/fluix"
+      }
+    }
+  ],
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_fluix_gem": {
+      "conditions": {
+        "items": [
+          {
+            "items": "#c:gems/fluix"
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "occultism:crushing/fluix_dust_from_gem"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_the_recipe",
+      "has_fluix_gem"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "occultism:crushing/fluix_dust_from_gem"
+    ]
+  }
+}

src/generated/resources/data/occultism/advancement/recipes/miner/miner/eldritch/black_quartz.json

@@ -0,0 +1,48 @@
+{
+  "neoforge:conditions": [
+    {
+      "type": "neoforge:not",
+      "value": {
+        "type": "neoforge:tag_empty",
+        "tag": "occultism:miners/eldritch"
+      }
+    },
+    {
+      "type": "neoforge:not",
+      "value": {
+        "type": "neoforge:tag_empty",
+        "tag": "c:gems/black_quartz"
+      }
+    }
+  ],
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_miner": {
+      "conditions": {
+        "items": [
+          {
+            "items": "occultism:magic_lamp_empty"
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "occultism:miner/eldritch/black_quartz"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_the_recipe",
+      "has_miner"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "occultism:miner/eldritch/black_quartz"
+    ]
+  }
+}