Finish up banners :3

src/generated/resources/assets/malum/blockstates/soulwoven_banner.json

@@ -0,0 +1,27 @@
+{
+  "variants": {
+    "banner_type=hanging_x": {
+      "model": "malum:block/soulwoven_banner",
+      "y": 90
+    },
+    "banner_type=hanging_z": {
+      "model": "malum:block/soulwoven_banner",
+      "y": 180
+    },
+    "banner_type=mounted_east": {
+      "model": "malum:block/soulwoven_banner_directional",
+      "y": 270
+    },
+    "banner_type=mounted_north": {
+      "model": "malum:block/soulwoven_banner_directional",
+      "y": 180
+    },
+    "banner_type=mounted_south": {
+      "model": "malum:block/soulwoven_banner_directional"
+    },
+    "banner_type=mounted_west": {
+      "model": "malum:block/soulwoven_banner_directional",
+      "y": 90
+    }
+  }
+}

src/generated/resources/assets/malum/blockstates/soulwoven_banner_breeze.json

@@ -0,0 +1,27 @@
+{
+  "variants": {
+    "banner_type=hanging_x": {
+      "model": "malum:block/soulwoven_banner",
+      "y": 90
+    },
+    "banner_type=hanging_z": {
+      "model": "malum:block/soulwoven_banner",
+      "y": 180
+    },
+    "banner_type=mounted_east": {
+      "model": "malum:block/soulwoven_banner_directional",
+      "y": 270
+    },
+    "banner_type=mounted_north": {
+      "model": "malum:block/soulwoven_banner_directional",
+      "y": 180
+    },
+    "banner_type=mounted_south": {
+      "model": "malum:block/soulwoven_banner_directional"
+    },
+    "banner_type=mounted_west": {
+      "model": "malum:block/soulwoven_banner_directional",
+      "y": 90
+    }
+  }
+}

src/generated/resources/assets/malum/blockstates/soulwoven_banner_fractal.json

@@ -0,0 +1,27 @@
+{
+  "variants": {
+    "banner_type=hanging_x": {
+      "model": "malum:block/soulwoven_banner",
+      "y": 90
+    },
+    "banner_type=hanging_z": {
+      "model": "malum:block/soulwoven_banner",
+      "y": 180
+    },
+    "banner_type=mounted_east": {
+      "model": "malum:block/soulwoven_banner_directional",
+      "y": 270
+    },
+    "banner_type=mounted_north": {
+      "model": "malum:block/soulwoven_banner_directional",
+      "y": 180
+    },
+    "banner_type=mounted_south": {
+      "model": "malum:block/soulwoven_banner_directional"
+    },
+    "banner_type=mounted_west": {
+      "model": "malum:block/soulwoven_banner_directional",
+      "y": 90
+    }
+  }
+}

src/generated/resources/assets/malum/blockstates/soulwoven_banner_horns.json

@@ -9,18 +9,18 @@
       "y": 180
     },
     "banner_type=mounted_east": {
-      "model": "malum:block/soulwoven_banner_mounted",
+      "model": "malum:block/soulwoven_banner_directional",
       "y": 270
     },
     "banner_type=mounted_north": {
-      "model": "malum:block/soulwoven_banner_mounted",
+      "model": "malum:block/soulwoven_banner_directional",
       "y": 180
     },
     "banner_type=mounted_south": {
-      "model": "malum:block/soulwoven_banner_mounted"
+      "model": "malum:block/soulwoven_banner_directional"
     },
     "banner_type=mounted_west": {
-      "model": "malum:block/soulwoven_banner_mounted",
+      "model": "malum:block/soulwoven_banner_directional",
       "y": 90
     }
   }

src/generated/resources/assets/malum/blockstates/soulwoven_banner_sigil.json

@@ -9,18 +9,18 @@
       "y": 180
     },
     "banner_type=mounted_east": {
-      "model": "malum:block/soulwoven_banner_mounted",
+      "model": "malum:block/soulwoven_banner_directional",
       "y": 270
     },
     "banner_type=mounted_north": {
-      "model": "malum:block/soulwoven_banner_mounted",
+      "model": "malum:block/soulwoven_banner_directional",
       "y": 180
     },
     "banner_type=mounted_south": {
-      "model": "malum:block/soulwoven_banner_mounted"
+      "model": "malum:block/soulwoven_banner_directional"
     },
     "banner_type=mounted_west": {
-      "model": "malum:block/soulwoven_banner_mounted",
+      "model": "malum:block/soulwoven_banner_directional",
       "y": 90
     }
   }

src/generated/resources/assets/malum/lang/en_us.json

@@ -214,6 +214,9 @@
   "block.malum.soulwood_totem_base": "Soulwood Totem Base",
   "block.malum.soulwood_totem_pole": "Soulwood Totem Pole",
   "block.malum.soulwood_trapdoor": "Soulwood Trapdoor",
+  "block.malum.soulwoven_banner": "Soulwoven Banner",
+  "block.malum.soulwoven_banner_breeze": "Soulwoven Banner Breeze",
+  "block.malum.soulwoven_banner_fractal": "Soulwoven Banner Fractal",
   "block.malum.soulwoven_banner_horns": "Soulwoven Banner Horns",
   "block.malum.soulwoven_banner_sigil": "Soulwoven Banner Sigil",
   "block.malum.spirit_altar": "Spirit Altar",
@@ -889,7 +892,7 @@
   "malum.gui.book.entry.page.headline.scythes.enchanting.rebound": "Rebound",
   "malum.gui.book.entry.page.headline.scythes.enchanting.spirit_plunder": "Spirit Plunder",
   "malum.gui.book.entry.page.headline.shielding_apparatus": "Shielding Apparatus",
-  "malum.gui.book.entry.page.headline.soulhunter_gear": "Soulhunter Gear",
+  "malum.gui.book.entry.page.headline.soulhunter_armor": "Soulhunter Armor",
   "malum.gui.book.entry.page.headline.soulstained_armor": "Soulstained Armor",
   "malum.gui.book.entry.page.headline.soulstained_scythe": "Soulstained Scythe",
   "malum.gui.book.entry.page.headline.soulstone": "Soulstone",
@@ -898,8 +901,9 @@
   "malum.gui.book.entry.page.headline.soulwood.color": "Soulwood Study: Color",
   "malum.gui.book.entry.page.headline.soulwood.intro": "Soulwood Study: Preface",
   "malum.gui.book.entry.page.headline.soulwood.sap": "Soulwood Study: Sap",
+  "malum.gui.book.entry.page.headline.soulwoven_pouch": "Soulwoven Pouch",
+  "malum.gui.book.entry.page.headline.soulwoven_silk": "Soulwoven Silk",
   "malum.gui.book.entry.page.headline.spirit_crystals": "Spirit Crystals",
-  "malum.gui.book.entry.page.headline.spirit_fabric": "Spirit Fabric",
   "malum.gui.book.entry.page.headline.spirit_fabric.pouch": "Spirit Pouch",
   "malum.gui.book.entry.page.headline.spirit_focusing": "Spirit Focusing",
   "malum.gui.book.entry.page.headline.spirit_infusion": "Spirit Infusion",
@@ -1172,7 +1176,7 @@
   "malum.gui.book.entry.page.text.scythes.enchanting.rebound.1": "A scythe reaps. That is its purpose, and that can be harnessed. Should a reaper need my hand? By harnessing the purpose of the blade as a weapon, I can let it act on its own to some extent, as if it were a boomerang. The stronger the enchantment, the sooner it’s ready to throw again.",
   "malum.gui.book.entry.page.text.scythes.enchanting.spirit_plunder.1": "This is not a perfect method. Some of the soul is unavoidably lost in the moment between blade and stone. But by enchanting the blade, that loss can be mitigated, and more of the soul condensed. This unfortunately strains the stone, and can result in my scythe's durability decreasing.",
   "malum.gui.book.entry.page.text.shielding_apparatus.1": "By utilizing the multiphasic property of Soulstained Steel, the Shielding Apparatus provides a chance for the damage imposed upon the impetus to be $icompletely/$ absorbed, while also slightly stabilizing the focusing process. It does, however, reduce focusing speed.",
-  "malum.gui.book.entry.page.text.soulhunter_gear.1": "Spirit Fabric is an insulator, but that doesn't mean it has to dampen magic. This set of armor is designed to focus that magic, effectively amplifying the user's arcane abilities. Unfortunately, it's not exactly the strongest of materials, and it protects me just about as much as leather clothing.",
+  "malum.gui.book.entry.page.text.soulhunter_armor.1": "Spirit Fabric is an insulator, but that doesn't mean it has to dampen magic. This set of armor is designed to focus that magic, effectively amplifying the user's arcane abilities. Unfortunately, it's not exactly the strongest of materials, and it protects me just about as much as leather clothing.",
   "malum.gui.book.entry.page.text.soulstained_armor.1": "Much like the Soulstained Scythe, I have improved upon my mundane iron armor to create the Soulstained Armor. To avoid the metal touching me directly, and so jostling and rubbing against my very soul, I used thin plates of Twisted Rock beneath the metal of the armor.",
   "malum.gui.book.entry.page.text.soulstained_armor.2": "As it exists in both the arcane and physical realms, Soulstained Steel exhibits fascinating defensive properties. It can intercept attacks from both, creating an effect I call Soul Ward. It takes time to restore if the effect is disrupted, but it acts as additional armor which nearly absorbs magic damage completely, and dampens physical damage.",
   "malum.gui.book.entry.page.text.soulstained_armor.3": "This effect seems similar in nature to others I have studied, such as engraving runes into armor or invoking a black sun upon oneself. Though unlike those, it doesn't $iappear/$ to have a cost. Where is the energy for Soul Ward coming from?",
@@ -1184,11 +1188,12 @@
   "malum.gui.book.entry.page.text.soulwood.color.1": "The most obvious differences with the tree itself are shape and leaf color. Soulwood is more spindly than Runewood, and its leaves are a sickly purple-red hue instead of a rich orange-yellow. It can still be used for many of the same things, though.",
   "malum.gui.book.entry.page.text.soulwood.intro.1": "After further study, I have discovered that the Soulwood produced by the Unchained Rite has actually become an entirely different species from the Runewood it is made from. It grows differently, it acts differently... it appears the spiritual scars that created it go deeper than just its color and magic.",
   "malum.gui.book.entry.page.text.soulwood.sap.1": "The sticky lifeblood of the tree also seems to well up much more often in a tree than in Runewood. The sap's effects are corrupted as well; rather than restoring my vigor, Unholy Syrup enhances it, increasing my attack strength and providing damage resistance.",
+  "malum.gui.book.entry.page.text.soulwoven_pouch.1": "But this fabric works wonderfully for storing spirit crystals. It keeps the arcana condensed within, and will even store spirits I pick up before they so much as clutter my pockets. It can store as many spirits as a single chest, making it quite convenient to carry around.",
+  "malum.gui.book.entry.page.text.soulwoven_silk.1": "Soulwoven Silk is a light yet sturdy material that acts as an insulator for spirit energies. While other materials do exhibit matching interactions with the arcane, this bond between magic and cloth should make for a unique material.",
+  "malum.gui.book.entry.page.text.soulwoven_silk.soulwoven_banner.1": "To further study and confirm the insulating properties of the cloth, I've heft together a set of Soulwoven Banners with patterns based on each of the spirits I've been met with thus far. If further imbued with Spirit Arcana, the Banners will gain a dim, and them powerful glow with two shards infused.",
   "malum.gui.book.entry.page.text.spirit_crystals.1": "The soul is a notoriously fickle thing. Even confirming its existence is difficult, requiring the highest thaumaturgies to get a reading. That is what sets spirit arcana apart from other magic. We don't need grand assemblies and esoteric artifice to see a soul. Simply destroying it is proof enough.",
   "malum.gui.book.entry.page.text.spirit_crystals.2": "A material I have named Soulstone is the means by which we do so. It appears mundane until refined, but once it is rid of impurities, it seems... out of phase with the world. By creating a blade using it as a core, I should be able to strike not only the physical form, but also the soul, shattering it to energy before it can disperse.",
   "malum.gui.book.entry.page.text.spirit_crystals.3": "These energies, as previously noted, have different 'frequencies' of sorts. A being burning with light would have a soul that reflects that radiance, and a being prone to adaptation would have a soul as malleable as itself. Occasionally, the energy has no flavor to it at all, leaving only the raw impulse of creation behind. That type of crystal bears further study.",
-  "malum.gui.book.entry.page.text.spirit_fabric.1": "Spirit Fabric is a light yet sturdy material that acts as an insulator for spirit energies. While other materials have the same properties, it's not exactly practical to craft a pouch or clothing from stone. I'm not willing to go quite so far for my research as to try wearing something like $ithat/$.",
-  "malum.gui.book.entry.page.text.spirit_fabric.pouch.1": "But this fabric works wonderfully for storing spirit crystals. It keeps the arcana condensed within, and will even store spirits I pick up before they so much as clutter my pockets. It can store as many spirits as a single chest, making it quite convenient to carry around.",
   "malum.gui.book.entry.page.text.spirit_focusing.1": "Using the opposing polarities of Twisted and Tainted Rock, I have created a device that draws in and focuses arcane energy. If given a compatible substrate, I can use this process to create things.",
   "malum.gui.book.entry.page.text.spirit_focusing.2": "The basic substrate here is the Alchemical Impetus, an artifact similar to those I've seen in the past. By focusing arcana into it, I can cause bits of the calx to transmute into something new, though this damages the Impetus in the process.",
   "malum.gui.book.entry.page.text.spirit_infusion.1": "By using Runewood's natural magic as a base, I have designed the altar that will serve as the basis for my magecraft - the Spirit Altar. It is the other piece of the equation, the use for the arcana. By infusing them into items, and using the energies to effect other fusions, I can begin to explore this.",
@@ -1370,8 +1375,8 @@
   "malum.gui.book.entry.scythes.enchanting.description": "Two ways to skin a soul",
   "malum.gui.book.entry.shielding_apparatus": "Shielding Apparatus",
   "malum.gui.book.entry.shielding_apparatus.description": "A bulwark against the storm",
-  "malum.gui.book.entry.soulhunter_gear": "Soulhunter Gear",
-  "malum.gui.book.entry.soulhunter_gear.description": "Glass cannon",
+  "malum.gui.book.entry.soulhunter_armor": "Soulhunter Armor",
+  "malum.gui.book.entry.soulhunter_armor.description": "Shaped like glass",
   "malum.gui.book.entry.soulstained_armor": "Soulstained Armor",
   "malum.gui.book.entry.soulstained_armor.description": "Spiritual protection",
   "malum.gui.book.entry.soulstained_scythe": "Soulstained Scythe",
@@ -1380,10 +1385,12 @@
   "malum.gui.book.entry.soulstone.description": "Out of phase",
   "malum.gui.book.entry.soulwood": "A Study on Soulwood",
   "malum.gui.book.entry.soulwood.description": "Twisted trees",
+  "malum.gui.book.entry.soulwoven_pouch": "Soulwoven Pouch",
+  "malum.gui.book.entry.soulwoven_pouch.description": "[Soulwoven Pouch Tooltip]",
+  "malum.gui.book.entry.soulwoven_silk": "Soulwoven Silk",
+  "malum.gui.book.entry.soulwoven_silk.description": "Wicked weaves",
   "malum.gui.book.entry.spirit_crystals": "Spirit Crystals",
   "malum.gui.book.entry.spirit_crystals.description": "Matter and magic",
-  "malum.gui.book.entry.spirit_fabric": "Spirit Fabric",
-  "malum.gui.book.entry.spirit_fabric.description": "Wicked weaves",
   "malum.gui.book.entry.spirit_focusing": "Spirit Focusing",
   "malum.gui.book.entry.spirit_focusing.description": "Mystic replication",
   "malum.gui.book.entry.spirit_infusion": "Spirit Infusion",

src/generated/resources/assets/malum/models/item/soulwoven_banner.json

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

src/generated/resources/assets/malum/models/item/soulwoven_banner_breeze.json

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

src/generated/resources/assets/malum/models/item/soulwoven_banner_fractal.json

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

src/generated/resources/data/malum/advancement/recipes/misc/soulwoven_banner.json

@@ -0,0 +1,32 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_soulwoven_silk": {
+      "conditions": {
+        "items": [
+          {
+            "items": "malum:soulwoven_silk"
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "malum:soulwoven_banner"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_the_recipe",
+      "has_soulwoven_silk"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "malum:soulwoven_banner"
+    ]
+  }
+}

src/generated/resources/data/malum/loot_table/blocks/soulwoven_banner.json

@@ -0,0 +1,21 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ],
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "malum:soulwoven_banner"
+        }
+      ],
+      "rolls": 1.0
+    }
+  ],
+  "random_sequence": "malum:blocks/soulwoven_banner"
+}

src/generated/resources/data/malum/loot_table/blocks/soulwoven_banner_breeze.json

@@ -0,0 +1,21 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ],
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "malum:soulwoven_banner_breeze"
+        }
+      ],
+      "rolls": 1.0
+    }
+  ],
+  "random_sequence": "malum:blocks/soulwoven_banner_breeze"
+}

src/generated/resources/data/malum/loot_table/blocks/soulwoven_banner_fractal.json

@@ -0,0 +1,21 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ],
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "malum:soulwoven_banner_fractal"
+        }
+      ],
+      "rolls": 1.0
+    }
+  ],
+  "random_sequence": "malum:blocks/soulwoven_banner_fractal"
+}

src/generated/resources/data/malum/recipe/soulwoven_banner.json

@@ -0,0 +1,21 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "category": "misc",
+  "key": {
+    "X": {
+      "tag": "malum:runewood_planks"
+    },
+    "Y": {
+      "item": "malum:soulwoven_silk"
+    }
+  },
+  "pattern": [
+    "X",
+    "Y",
+    "Y"
+  ],
+  "result": {
+    "count": 1,
+    "id": "malum:soulwoven_banner"
+  }
+}

src/generated/resources/data/malum/recipe/soulwoven_silk.json

@@ -4,10 +4,6 @@
     {
       "count": 2,
       "tag": "c:strings"
-    },
-    {
-      "count": 1,
-      "item": "malum:hex_ash"
     }
   ],
   "ingredient": {
@@ -20,16 +16,12 @@
   },
   "spirits": [
     {
-      "type": "wicked",
-      "count": 2
+      "type": "aerial",
+      "count": 3
     },
     {
       "type": "earthen",
-      "count": 1
-    },
-    {
-      "type": "aerial",
-      "count": 1
+      "count": 3
     }
   ]
 }