v1.3 - Update textures, minor adjustments + fixes

Common/src/main/resources/assets/hibernalherbs/lang/en_ca.json

@@ -259,24 +259,22 @@
 
   "item.hibernalherbs.lumbinetrik_petals": "Lumbinetrik Petals",
   "item.hibernalherbs.sin_petals": "Siliptium Petals",
+  "item.hibernalherbs.julisium_petals": "Julisium Petals",
   "item.hibernalherbs.ground_herbs": "Ground Herbs",
 
   "block.hibernalherbs.conjuration_altar": "Herbal Conjuration Altar",
 
-  // Legacy
-  "item.hibernalherbs.pouch": "Herb Pouch (Legacy)",
-  "item.hibernalherbs.canister": "Blend Canister (Legacy)",
-
-  // Forge Additions
-
-  "itemGroup.hibernal_herbs": "Hibernal Herbs Misc",
-  "itemGroup.pounded_herbs": "Pounded Herbs",
-  "itemGroup.herbs": "Herbs",
-  "itemGroup.reproduction": "Herb Reproduction",
+  "itemGroup.hibernalherbs.hibernal_herbs": "Hibernal Herbs Misc",
+  "itemGroup.hibernalherbs.pounded_herbs": "Pounded Herbs",
+  "itemGroup.hibernalherbs.herbs": "Herbs",
+  "itemGroup.hibernalherbs.reproduction": "Herb Reproduction",
 
   "entity.hibernalherbs.myqueste_chest_boat": "Myqueste Boat with Chest",
   "entity.hibernalherbs.myqueste_boat": "Myqueste Boat",
 
+  // Legacy
+  "item.hibernalherbs.pouch": "Herb Pouch (Legacy)",
+  "item.hibernalherbs.canister": "Blend Canister (Legacy)",
 
   // Basic Tooltips
   "text.hibernalherbs.controls.shift": "[§7Shift§8] For More Details",
@@ -290,11 +288,6 @@
   "text.hibernalherbs.controls.passive.inventory": "While In Inventory: ",
   "text.hibernalherbs.required_mod.patchouli": "Install Patchouli For Proper Integration",
 
-  "itemGroup.hibernalherbs.hibernal_herbs": "Herbs Misc",
-  "itemGroup.hibernalherbs.herbs": "Herbs",
-  "itemGroup.hibernalherbs.pounded_herbs": "Pounded Herbs",
-  "itemGroup.hibernalherbs.reproduction": "Herb Reproduction",
-
   // Herb Fertilizer/Humus Tooltips
   "text.hibernalherbs.association.none": "§6Association:§7 None",
   "text.hibernalherbs.association.oak": "§6Association:§7 Oak",
@@ -371,7 +364,7 @@
   "text.hibernalherbs.blend.ability": "§6Ability:§7 %s",
   "text.hibernalherbs.blend.ability.help.one": "§dHerbal Blends§5 will provide",
   "text.hibernalherbs.blend.ability.help.two": "the target with varying effects.",
-  "text.hibernalherbs.blend.effect.help.one": "These effects can either §dnegative§5",
+  "text.hibernalherbs.blend.effect.help.one": "These effects can either be §dnegative§5",
   "text.hibernalherbs.blend.effect.help.two": "or §dpositive§5, and can",
   "text.hibernalherbs.blend.effect.help.three": "even be both in some cases!",
   "text.hibernalherbs.blend.attacking.help.one": "Attacking a player will apply",
@@ -438,7 +431,7 @@
   "text.hibernalherbs.sigil.alignment.mastery": "Mastery",
   "text.hibernalherbs.sigil.alignment.advanced_mastery": "Advanced Mastery",
   "text.hibernalherbs.sigil.alignment.configuration": "Configuration",
-  "text.hibernalherbs.sigil.alignment.advanced_configuration": "Advanced Mastery",
+  "text.hibernalherbs.sigil.alignment.advanced_configuration": "Advanced Configuration",
 
   // Padlocks
   "text.hibernalherbs.padlock.unholy_blessing": "May The Prince of %s Guide You...",
@@ -514,6 +507,8 @@
   "advancements.hibernalherbs.obtain_gluttonous_ring.description": "Obtain a Gluttonous Ring",
   "advancements.hibernalherbs.obtain_gluttonous_ring_adv.title": "Nom Nom Nom",
   "advancements.hibernalherbs.obtain_gluttonous_ring_adv.description": "Obtain an Advanced Gluttonous Ring",
+  "advancements.hibernalherbs.obtain_singed_grimoire.title": "Hellfire! Hellfire in my skin!",
+  "advancements.hibernalherbs.obtain_singed_grimoire.description": "Obtain a Singed Grimoire to expand your knowledge",
 
   // REI & JEI Integration
   "text.hibernalherbs.herbal_conjuration": "Herbal Conjuration"

Common/src/main/resources/assets/hibernalherbs/lang/en_us.json

@@ -259,24 +259,22 @@
 
   "item.hibernalherbs.lumbinetrik_petals": "Lumbinetrik Petals",
   "item.hibernalherbs.sin_petals": "Siliptium Petals",
+  "item.hibernalherbs.julisium_petals": "Julisium Petals",
   "item.hibernalherbs.ground_herbs": "Ground Herbs",
 
   "block.hibernalherbs.conjuration_altar": "Herbal Conjuration Altar",
 
-  // Legacy
-  "item.hibernalherbs.pouch": "Herb Pouch (Legacy)",
-  "item.hibernalherbs.canister": "Blend Canister (Legacy)",
-
-  // Forge Additions
-
-  "itemGroup.hibernal_herbs": "Hibernal Herbs Misc",
-  "itemGroup.pounded_herbs": "Pounded Herbs",
-  "itemGroup.herbs": "Herbs",
-  "itemGroup.reproduction": "Herb Reproduction",
+  "itemGroup.hibernalherbs.hibernal_herbs": "Hibernal Herbs Misc",
+  "itemGroup.hibernalherbs.pounded_herbs": "Pounded Herbs",
+  "itemGroup.hibernalherbs.herbs": "Herbs",
+  "itemGroup.hibernalherbs.reproduction": "Herb Reproduction",
 
   "entity.hibernalherbs.myqueste_chest_boat": "Myqueste Boat with Chest",
   "entity.hibernalherbs.myqueste_boat": "Myqueste Boat",
 
+  // Legacy
+  "item.hibernalherbs.pouch": "Herb Pouch (Legacy)",
+  "item.hibernalherbs.canister": "Blend Canister (Legacy)",
 
   // Basic Tooltips
   "text.hibernalherbs.controls.shift": "[§7Shift§8] For More Details",
@@ -290,11 +288,6 @@
   "text.hibernalherbs.controls.passive.inventory": "While In Inventory: ",
   "text.hibernalherbs.required_mod.patchouli": "Install Patchouli For Proper Integration",
 
-  "itemGroup.hibernalherbs.hibernal_herbs": "Herbs Misc",
-  "itemGroup.hibernalherbs.herbs": "Herbs",
-  "itemGroup.hibernalherbs.pounded_herbs": "Pounded Herbs",
-  "itemGroup.hibernalherbs.reproduction": "Herb Reproduction",
-
   // Herb Fertilizer/Humus Tooltips
   "text.hibernalherbs.association.none": "§6Association:§7 None",
   "text.hibernalherbs.association.oak": "§6Association:§7 Oak",
@@ -371,7 +364,7 @@
   "text.hibernalherbs.blend.ability": "§6Ability:§7 %s",
   "text.hibernalherbs.blend.ability.help.one": "§dHerbal Blends§5 will provide",
   "text.hibernalherbs.blend.ability.help.two": "the target with varying effects.",
-  "text.hibernalherbs.blend.effect.help.one": "These effects can either §dnegative§5",
+  "text.hibernalherbs.blend.effect.help.one": "These effects can either be §dnegative§5",
   "text.hibernalherbs.blend.effect.help.two": "or §dpositive§5, and can",
   "text.hibernalherbs.blend.effect.help.three": "even be both in some cases!",
   "text.hibernalherbs.blend.attacking.help.one": "Attacking a player will apply",
@@ -438,7 +431,7 @@
   "text.hibernalherbs.sigil.alignment.mastery": "Mastery",
   "text.hibernalherbs.sigil.alignment.advanced_mastery": "Advanced Mastery",
   "text.hibernalherbs.sigil.alignment.configuration": "Configuration",
-  "text.hibernalherbs.sigil.alignment.advanced_configuration": "Advanced Mastery",
+  "text.hibernalherbs.sigil.alignment.advanced_configuration": "Advanced Configuration",
 
   // Padlocks
   "text.hibernalherbs.padlock.unholy_blessing": "May The Prince of %s Guide You...",
@@ -514,6 +507,8 @@
   "advancements.hibernalherbs.obtain_gluttonous_ring.description": "Obtain a Gluttonous Ring",
   "advancements.hibernalherbs.obtain_gluttonous_ring_adv.title": "Nom Nom Nom",
   "advancements.hibernalherbs.obtain_gluttonous_ring_adv.description": "Obtain an Advanced Gluttonous Ring",
+  "advancements.hibernalherbs.obtain_singed_grimoire.title": "Hellfire! Hellfire in my skin!",
+  "advancements.hibernalherbs.obtain_singed_grimoire.description": "Obtain a Singed Grimoire to expand your knowledge",
 
   // REI & JEI Integration
   "text.hibernalherbs.herbal_conjuration": "Herbal Conjuration"

Common/src/main/resources/assets/hibernalherbs/models/item/chervil_lantern.json

@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:item/generated",
   "textures": {
-    "layer0": "hibernalherbs:item/ceillis_lantern"
+    "layer0": "hibernalherbs:item/chervil_lantern"
   }
 }

Common/src/main/resources/assets/hibernalherbs/models/item/julisium_petals.json

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

Common/src/main/resources/assets/hibernalherbs/patchouli_books/grimoire/en_us/entries/herbal_conjuration/julisium_petals.json

@@ -0,0 +1,28 @@
+{
+  "name": "Julisium Petals",
+  "icon": "hibernalherbs:julisium_petals",
+  "category": "hibernalherbs:herbal_conjuration",
+  "advancement": "hibernalherbs:progression/obtain_singed_grimoire",
+  "pages": [
+    {
+      "type": "patchouli:text",
+      "text": "Julisium Petals, originally made by the prince of Lust to assist in other-worldly travel, can also be used against the princes in order to bound them to a padlock and utilize their powers for the user."
+    },
+    {
+      "type": "patchouli:spotlight",
+      "item": "hibernalherbs:julisium_petals",
+      "text": "Julisium Petals are used mainly for creating bound padlocks, which provide the user different enhancements and abilities. This ranges anywhere from additional health to increased movement speed or luck values."
+    },
+    {
+      "type": "patchouli:relations",
+      "entries": [
+        "hibernalherbs:herbal_conjuration/conjuration_altar",
+        "hibernalherbs:herbal_conjuration/singed_grimoire",
+        "hibernalherbs:herbal_conjuration/lumbinetrik_petals",
+        "hibernalherbs:herbal_conjuration/padlocks",
+        "hibernalherbs:herbs/dried"
+      ],
+      "text": "These entries may also be useful in your studies."
+    }
+  ]
+}

Common/src/main/resources/assets/hibernalherbs/patchouli_books/grimoire/en_us/entries/herbal_conjuration/lumbinetrik_petals.json

@@ -2,6 +2,7 @@
   "name": "Lumbinetrik Petals",
   "icon": "hibernalherbs:lumbinetrik_petals",
   "category": "hibernalherbs:herbal_conjuration",
+  "advancement": "hibernalherbs:progression/obtain_singed_grimoire",
   "pages": [
     {
       "type": "patchouli:text",
@@ -18,7 +19,7 @@
     },
     {
       "type": "patchouli:text",
-      "text": "A conjuration was developed to combine the two kinds of petals, in an attempt to create an even stronger variation. Ju- l- --i- m Petals would numb any pain, while also providing an agility boost. It also had an unexpected side effect, which w- ld- "
+      "text": "A conjuration was developed to combine the two kinds of petals, in an attempt to create an even stronger variation. A type of petal that would, unintentionally, help harness the power of the princes of Hell - Julisium Petals."
     },
     {
       "type": "patchouli:relations",

Common/src/main/resources/assets/hibernalherbs/patchouli_books/grimoire/en_us/entries/herbal_conjuration/padlocks.json

@@ -2,6 +2,7 @@
   "name": "Prince Of Sin Padlocks",
   "icon": "hibernalherbs:bound_padlock_lust",
   "category": "hibernalherbs:herbal_conjuration",
+  "advancement": "hibernalherbs:progression/obtain_singed_grimoire",
   "pages": [
     {
       "type": "patchouli:text",

Common/src/main/resources/assets/hibernalherbs/patchouli_books/grimoire/en_us/entries/herbal_conjuration/ring/adv_gluttonous_ring.json

@@ -2,6 +2,7 @@
   "name": "Advanced Gluttonous Ring",
   "icon": "hibernalherbs:gluttonous_ring_adv",
   "category": "hibernalherbs:herbal_conjuration",
+  "advancement": "hibernalherbs:progression/obtain_singed_grimoire",
   "pages": [
     {
       "type": "patchouli:text",

Common/src/main/resources/assets/hibernalherbs/patchouli_books/grimoire/en_us/entries/herbal_conjuration/ring/gluttonous_ring.json

@@ -2,6 +2,7 @@
   "name": "Gluttonous Ring",
   "icon": "hibernalherbs:gluttonous_ring",
   "category": "hibernalherbs:herbal_conjuration",
+  "advancement": "hibernalherbs:progression/obtain_singed_grimoire",
   "pages": [
     {
       "type": "patchouli:text",

Common/src/main/resources/assets/hibernalherbs/patchouli_books/grimoire/en_us/entries/herbal_conjuration/sigil/sigil.json

@@ -1,7 +1,8 @@
 {
   "name": "Herbal Sigils",
-  "icon": "hibernalherbs:cracked_sigil",
+  "icon": "hibernalherbs:sigil",
   "category": "hibernalherbs:herbal_conjuration",
+  "advancement": "hibernalherbs:progression/obtain_singed_grimoire",
   "pages": [
     {
       "type": "patchouli:text",
@@ -10,13 +11,13 @@
     {
       "type": "patchouli:spotlight",
       "item": "hibernalherbs:sigil",
-      "text": "Sigils are made by using a combination of herbs and a non-cracked Sigil. To create a Sigil, you will need certain herbs and a Smoothened Stone or a Cracked Sigil.",
+      "text": "Herbal Sigils are made by using a combination of herbs and a non-cracked Herbal Sigil. To create an Herbal Sigil, you will need certain herbs and a Smoothened Stone or a Cracked Herbal Sigil.",
       "title": "First Sigil"
     },
     {
       "type": "hibernalherbs:conjuration",
       "recipe": "hibernalherbs:conjuration/sigil/base",
-      "text": "The conjuration to create a Sigil is shown above. These currently do not have many major uses, but that will change in future updates :)"
+      "text": "The conjuration to create a Herbal Sigil is shown above. A Blank Herbal Sigil allows the user to create more powerful Herbal Sigils."
     },
     {
       "type": "patchouli:text",
@@ -71,12 +72,22 @@
     {
       "type": "hibernalherbs:conjuration",
       "recipe": "hibernalherbs:conjuration/sigil/mastery",
-      "text": "Mastery Sigils are used to create Golden Rings, as well as Advanced Mastery Sigils.$(br2)Advanced Mastery Sigils are used to create Padlocks and the Advanced Gluttonous Ring."
+      "text": "Mastery Herbal Sigils are used to create Golden Rings, as well as Advanced Mastery Sigils.$(br2)Advanced Mastery Sigils are used to create Padlocks and the Advanced Gluttonous Ring."
     },
     {
       "type": "hibernalherbs:conjuration",
       "recipe": "hibernalherbs:conjuration/sigil/mastery_adv",
-      "text": "Advanced Mastery Sigils, as listed prior, are used for Advanced Gluttonous Rings and Padlocks."
+      "text": "Advanced Mastery Herbal Sigils, as listed prior, are used for Advanced Gluttonous Rings and Padlocks."
+    },
+    {
+      "type": "hibernalherbs:conjuration",
+      "recipe": "hibernalherbs:conjuration/sigil/configuration",
+      "text": "Configuration Herbal Sigils are currently only used to make Advanced Configuration Herbal Sigils."
+    },
+    {
+      "type": "hibernalherbs:conjuration",
+      "recipe": "hibernalherbs:conjuration/sigil/configuration_adv",
+      "text": "Advanced Configuration Herbal Sigils, alongside the Advanced Mastery Herbal Sigil, can be used to make Julisium Petals.$(br2)These petals can be used to make padlocks."
     },
     {
       "type": "patchouli:text",
@@ -121,7 +132,9 @@
       "type": "patchouli:relations",
       "entries": [
         "hibernalherbs:herbal_conjuration/padlocks",
-        "hibernalherbs:herbal_conjuration/petals"
+        "hibernalherbs:herbal_conjuration/siliptium_petals",
+        "hibernalherbs:herbal_conjuration/lumbinetrik_petals",
+        "hibernalherbs:herbal_conjuration/julisium_petals"
       ],
       "text": "These entries may also be useful in your studies."
     }

Common/src/main/resources/assets/hibernalherbs/patchouli_books/grimoire/en_us/entries/herbs/sin_herbs.json

@@ -2,6 +2,7 @@
   "name": "Herbs Of Sin",
   "icon": "hibernalherbs:lust_herb",
   "category": "hibernalherbs:herbs",
+  "advancement": "hibernalherbs:progression/obtain_singed_grimoire",
   "pages": [
     {
       "type": "spotlight",
@@ -13,7 +14,7 @@
       "entries": [
         "hibernalherbs:herbal_conjuration/siliptium_petals",
         "hibernalherbs:herbal_conjuration/lumbinetrik_petals",
-        "hibernalherbs:herbal_conjuration/petals",
+        "hibernalherbs:herbal_conjuration/julisium_petals",
         "hibernalherbs:herbal_conjuration/sigil/sigil"
       ],
       "text": "These entries may also be useful in your studies."

Common/src/main/resources/assets/hibernalherbs/patchouli_books/grimoire/en_us/entries/herbs/smoked_blends.json

@@ -2,6 +2,7 @@
   "name": "Smoked Herb Blends",
   "icon": "hibernalherbs:blend_regeneration_smoked",
   "category": "hibernalherbs:herbs",
+  "advancement": "hibernalherbs:progression/obtain_singed_grimoire",
   "pages": [
     {
       "type": "patchouli:text",
@@ -75,6 +76,7 @@
     {
       "type": "patchouli:relations",
       "entries": [
+        "hibernalherbs:herbal_conjuration/conjuration_altar",
         "hibernalherbs:herbs/blends",
         "hibernalherbs:herbs/non_pounded",
         "hibernalherbs:herbs/pounded",

Common/src/main/resources/data/hibernalherbs/advancements/husbandry/attack_with_herb_blend.json → Common/src/main/resources/data/hibernalherbs/advancements/progression/attack_with_herb_blend.json

@@ -14,7 +14,7 @@
     "announce_to_chat": true,
     "hidden": false
   },
-  "parent": "hibernalherbs:husbandry/pounded_herbs",
+  "parent": "hibernalherbs:progression/pounded_herbs",
   "criteria": {
     "attack_entity_with_blend": {
       "trigger": "minecraft:player_hurt_entity",

Common/src/main/resources/data/hibernalherbs/advancements/husbandry/consume_all_blends.json → Common/src/main/resources/data/hibernalherbs/advancements/progression/consume_all_blends.json

@@ -14,7 +14,7 @@
     "announce_to_chat": true,
     "hidden": false
   },
-  "parent": "minecraft:husbandry/balanced_diet",
+  "parent": "hibernalherbs:progression/herbs",
   "criteria": {
     "blindness": {
       "trigger": "minecraft:consume_item",

Common/src/main/resources/data/hibernalherbs/advancements/husbandry/consume_all_pounded_herbs.json → Common/src/main/resources/data/hibernalherbs/advancements/progression/consume_all_pounded_herbs.json

@@ -14,7 +14,7 @@
     "announce_to_chat": true,
     "hidden": false
   },
-  "parent": "hibernalherbs:husbandry/pounded_herbs",
+  "parent": "hibernalherbs:progression/pounded_herbs",
   "criteria": {
     "rosemary": {
       "trigger": "minecraft:consume_item",

Common/src/main/resources/data/hibernalherbs/advancements/husbandry/consume_fire_blend_at_world_height.json → Common/src/main/resources/data/hibernalherbs/advancements/progression/consume_fire_blend_at_world_height.json

@@ -14,7 +14,7 @@
     "announce_to_chat": true,
     "hidden": false
   },
-  "parent": "hibernalherbs:husbandry/attack_with_herb_blend",
+  "parent": "hibernalherbs:progression/attack_with_herb_blend",
   "criteria": {
     "blendFireOfAnyKind": {
       "trigger": "minecraft:consume_item",

Common/src/main/resources/data/hibernalherbs/advancements/husbandry/herbal_conjuration.json → Common/src/main/resources/data/hibernalherbs/advancements/progression/herbal_conjuration.json

@@ -14,7 +14,7 @@
     "announce_to_chat": true,
     "hidden": false
   },
-  "parent": "minecraft:husbandry/root",
+  "parent": "hibernalherbs:progression/herbs",
   "criteria": {
     "has_altar": {
       "trigger": "minecraft:inventory_changed",