Stuff and things

gradle.properties

@@ -4,7 +4,7 @@ org.gradle.daemon=false
 # Dependency Version
 minecraftVersion=1.18.2
 forgeVersion=40.2.0
-lodestoneVersion=1.4.2.442
+lodestoneVersion=1.4.2.448
 forgegradleVersion=5.1.53
 mixingradleVersion=0.7-SNAPSHOT
 librarianVersion=1.+

src/generated/resources/.cache/cache

@@ -219,7 +219,7 @@ cb6a17c4dca30d064eedc28529420373d25d1933 assets/malum/blockstates/wall_ether_tor
 55635004672302336ef4a04dbe0d38dff66c4cd9 assets/malum/blockstates/weeping_well_core.json
 55188decc0c9a982e5ba40f8df2adea65a032e32 assets/malum/blockstates/weeping_well_corner.json
 62e007ecef751f8b9b42eaa138f06d18cc008d05 assets/malum/blockstates/weeping_well_side.json
-7739808f81ca9f2464b432306827bcbd88259fc0 assets/malum/lang/en_us.json
+7d601371a4eca27353d05b4967a5b3c73817214b assets/malum/lang/en_us.json
 c2637401df2afc394d62b5c6bde312c604cdb21f assets/malum/models/block/blazing_quartz_ore.json
 782e64739e04f0b87aa0aeafb55893cc348df504 assets/malum/models/block/blighted_earth.json
 c0b5a7b1d337a7090eaf86d07fd8b47d35fbc1e1 assets/malum/models/block/blighted_soil.json
@@ -762,7 +762,6 @@ c747823083462f770b00092436a6c0efd913cc22 assets/malum/models/item/executioner_dr
 81dc6dc7859fa373769cf3ac2f03c15d441b16eb assets/malum/models/item/executioner_drip_visor.json
 5f7c497c6ebc3a265cb07e33b73b58e81aa72bd6 assets/malum/models/item/exposed_runewood_log.json
 42d876dd8d91c3b7af2383b569b140a776c36a9b assets/malum/models/item/exposed_soulwood_log.json
-a63683d865da7951be3de7b0a192959b92039996 assets/malum/models/item/focus_lens.json
 9de986f99ce972c931762308eb91bcff280762f4 assets/malum/models/item/fused_consciousness.json
 0203f98cc4d81338e31b6e019c8a9a28c746d89f assets/malum/models/item/gay_beanie.json
 8e94c4a82e3b5c34a5208e868c6588c2315500ec assets/malum/models/item/gay_hoodie.json
@@ -786,7 +785,6 @@ c5f3b633a77eb7a5909916329c86b5384242defd assets/malum/models/item/gold_impetus.j
 04fbe164988c77a497c2b85c50bccbc4b8b1a76d assets/malum/models/item/grim_talc.json
 6746005be1e8e0240e906fb391bb3c1a7a5fc26d assets/malum/models/item/hallowed_gold_ingot.json
 25bfc9072fda3a8fbb6851392c7387fe392c8e1f assets/malum/models/item/hallowed_gold_nugget.json
-3a7bbfbbcb47e1a39b99866a076be35855e8c250 assets/malum/models/item/hallowed_spirit_resonator.json
 7b0676f2b3fb9ab1e2cc21ed108ef474592c31a8 assets/malum/models/item/hex_ash.json
 afdf9a99558d5373847e6f463e1760e84dfd0130 assets/malum/models/item/holy_caramel.json
 53885fe2264472ad67340d1f6561439ee66809ed assets/malum/models/item/holy_sap.json
@@ -955,11 +953,11 @@ ee63cd22ce2883cd479f8c9a49b79cc9b696c5a1 assets/malum/models/item/soulwood_tiles
 80431e65c5dc9b92d058465fa1e1d757c3613139 assets/malum/models/item/soulwood_totem_base.json
 16fef2267d9c5c8753ee46dfef8ba420fb252481 assets/malum/models/item/soulwood_trapdoor.json
 3c6ef2844b8e18472df50fea9ca03c24fd60fe78 assets/malum/models/item/spectral_lens.json
+d398d5d6e69e2982a817fbaf1b559390a086fe3d assets/malum/models/item/spectral_optic.json
 6541382b4ee02585af32523ce0deee6d023c1d0e assets/malum/models/item/spirit_altar.json
 90437b4ec6c45a9f1288ba538ca4f27e93be3e4a assets/malum/models/item/spirit_fabric.json
 578b50f731090ec6a5cceeaf29a8fb3633e7bf72 assets/malum/models/item/spirit_jar.json
 17cad448788d1d1e238f6d36157055595615556b assets/malum/models/item/spirit_pouch.json
-4a40179928c66e696c6baf0b9c9997f221addf37 assets/malum/models/item/stained_spirit_resonator.json
 f965da88c47727d0cdcebe817dde6568578be7e6 assets/malum/models/item/strange_nucleus.json
 732118e1c394a9cb3bd06760957fecae9f65d43f assets/malum/models/item/stripped_runewood.json
 586f2dbd25d7a654a421b8d7d79501b98071f99f assets/malum/models/item/stripped_runewood_log.json
@@ -1288,7 +1286,6 @@ ac7c88558d36ca1f4b981d4330f59821f56a3dbb data/malum/advancements/recipes/malum_b
 4e8b1082706a0ab77abe5c7a71c21bb5f8c6ea7c data/malum/advancements/recipes/malum_basis_of_magic/hallowed_gold_from_block.json
 f96f82cdb39b1b860d74012eebd61fdee1da1b37 data/malum/advancements/recipes/malum_basis_of_magic/hallowed_gold_from_nuggets.json
 0445f0f9e8dee90b3d7206444d4aafed739bc4dd data/malum/advancements/recipes/malum_basis_of_magic/hallowed_gold_nugget.json
-6dc7a8aae4e23e5e6c8d19c86babee18a9f6a1ab data/malum/advancements/recipes/malum_basis_of_magic/hallowed_spirit_resonator.json
 80932705253c5851fc1c9c1296d4ac4cd2d7498a data/malum/advancements/recipes/malum_basis_of_magic/hex_ash_from_block.json
 ed30adb0988075e33c28a147a1f98061d30c8e35 data/malum/advancements/recipes/malum_basis_of_magic/natural_quartz_from_blasting.json
 e1287116b8a7e57831ef66fb1b120ec0c340f8aa data/malum/advancements/recipes/malum_basis_of_magic/natural_quartz_from_deepslate_blasting.json
@@ -1316,10 +1313,11 @@ fe352f12c49722b35889eeeffd5a3b429f1a6249 data/malum/advancements/recipes/malum_b
 04fac4e8cadf945bca77ba925915bbd3890a2911 data/malum/advancements/recipes/malum_basis_of_magic/soulstone_from_raw_blasting.json
 b07eb07a546e1158f09f8f3c569a00154fdaf1c4 data/malum/advancements/recipes/malum_basis_of_magic/soulstone_from_raw_smelting.json
 dfce8bc59be3e25b6f5fcaf739249e9a84fc89e2 data/malum/advancements/recipes/malum_basis_of_magic/soulstone_from_smelting.json
+d3c046e84b46234b81437319e928c81b56737faf data/malum/advancements/recipes/malum_basis_of_magic/spectral_lens.json
+3d7c52727a174e51aa6876263d89d1a9401f0afb data/malum/advancements/recipes/malum_basis_of_magic/spectral_optic.json
 3c4a3d498d982a9cb64515a5bc93918705c602de data/malum/advancements/recipes/malum_basis_of_magic/spirit_altar.json
 d44afe33bb141ffd33bf2871565389072330ee6b data/malum/advancements/recipes/malum_basis_of_magic/spirit_jar.json
 9ec366497564fd320ad3e1f4a821a6c1d4ac65a1 data/malum/advancements/recipes/malum_basis_of_magic/spirit_pouch.json
-fbe2b99728514cc3ee80110295588a3e3a103f5e data/malum/advancements/recipes/malum_basis_of_magic/stained_spirit_resonator.json
 e50c75a03cdb2d77fd0eb510fe6e8e7e40da0aea data/malum/advancements/recipes/malum_cosmetics/ace_prideweave.json
 1d13f9affa1f95d62ea28bc32da5ffbdea2ee4ca data/malum/advancements/recipes/malum_cosmetics/agender_prideweave.json
 30dcd46c8eb5e655921c6bcc1f9d5957c6beccee data/malum/advancements/recipes/malum_cosmetics/ancient_weave.json
@@ -1798,7 +1796,6 @@ a48fe1cfbcd1f988dcef40ed28fe4166f7a811ae data/malum/recipes/gold_from_node_smelt
 9a5d60a7958935567d19eda2da62d101841575ed data/malum/recipes/hallowed_gold_from_block.json
 19d234a9785e51f5aa6d0917541cc53eb40e0361 data/malum/recipes/hallowed_gold_from_nuggets.json
 6bd27327b28384d2e0724ac729e528c2d408398a data/malum/recipes/hallowed_gold_nugget.json
-11c539904eefaf031c8809b97150b988e203c7a4 data/malum/recipes/hallowed_spirit_resonator.json
 2ba192df72b386ed43116099bb54584857cb6063 data/malum/recipes/hex_ash_from_block.json
 fedc1ac991bb3b5004483735d26a5d731036fb0b data/malum/recipes/holy_sap_from_smelting.json
 a0c60325b894f20efab5609acfe0a93c89c24247 data/malum/recipes/holy_sap_from_smoking.json
@@ -1962,6 +1959,8 @@ f41dbe4d6f131a4cd82b9eb363ceb5dffbf908d4 data/malum/recipes/soulwood_tiles.json
 8e39a30c5906824721eeb3d29025a6d2b3c1acf0 data/malum/recipes/soulwood_tiles_stairs.json
 e8a4f5a3092d46add5831dfecbbc1701dcb008f0 data/malum/recipes/soulwood_trapdoor.json
 aef9eec8be9e3dc05f735c382192381b45b194ef data/malum/recipes/soulwood_trapdoor_from_solid.json
+a22ac702c4ce16ee60b0ef9e233447577a670903 data/malum/recipes/spectral_lens.json
+e1c88a3f03073853ba202b936f8a59b36fbe6a1b data/malum/recipes/spectral_optic.json
 980abd6b4b256d6359f715f6664147a108287910 data/malum/recipes/spirit_altar.json
 40772ec079fe23adfd4ffe574b0e0a8c6a6e021c data/malum/recipes/spirit_crucible/amethyst_shard.json
 bb8bc137eca4708a128684519b6368f78d6f0443 data/malum/recipes/spirit_crucible/blazing_quartz.json
@@ -2004,18 +2003,18 @@ e74f48b43782e71dbad70327c4ef154dde59d84a data/malum/recipes/spirit_infusion/gold
 c33d1d84d12bd83247afcd1d4b6989b0c44a0400 data/malum/recipes/spirit_infusion/iridescent_ether.json
 ed51254f0e08eeeee97478a8bbf2adc4760e4930 data/malum/recipes/spirit_infusion/iron_impetus.json
 202787237eca05dddb503b583a1318e601485d79 data/malum/recipes/spirit_infusion/necklace_of_blissful_harmony.json
-b5ca0bca93af0e42e72037fedf3385b6f604cd6a data/malum/recipes/spirit_infusion/necklace_of_the_mystic_mirror.json
-6af433caccd1545b7815d9154fcddccad1f46212 data/malum/recipes/spirit_infusion/necklace_of_the_narrow_edge.json
+7f89d3e450d691063008778ddcfcc92219ffa311 data/malum/recipes/spirit_infusion/necklace_of_the_mystic_mirror.json
+2d511c617fe47c195c383351ff56bd334c40c712 data/malum/recipes/spirit_infusion/necklace_of_the_narrow_edge.json
 caf36085f01011244578561b8b513ecfed5a92a6 data/malum/recipes/spirit_infusion/necklace_of_tidal_affinity.json
 14c60fe6535a9d4b40252b52510044feceee5f77 data/malum/recipes/spirit_infusion/poppet.json
 c4f740f4a9d95288a37596424a0f716eabfa8dfa data/malum/recipes/spirit_infusion/ring_of_alchemical_mastery.json
 89d7c5382eb1001ec80cce572a246d77d3003eec data/malum/recipes/spirit_infusion/ring_of_arcane_prowess.json
 35dfff4cfdf2880ab5af626097a7e5d823c09412 data/malum/recipes/spirit_infusion/ring_of_curative_talent.json
 dd6656fada0c7c1bea7b63770cfff6f0bb6ff78e data/malum/recipes/spirit_infusion/ring_of_desperate_voracity.json
-0f6f2fbc09161133a1232f986b5d9f53c9baa573 data/malum/recipes/spirit_infusion/ring_of_esoteric_spoils.json
+ac73d26f4e661e10b78a756d9b16605ea665c47a data/malum/recipes/spirit_infusion/ring_of_esoteric_spoils.json
 5d8715f0339c0d6b4027bba9426bc3773d565583 data/malum/recipes/spirit_infusion/ring_of_the_demolitionist.json
 4663b166fd26ad18a7df179b3ad7f29e0a6112db data/malum/recipes/spirit_infusion/ring_of_the_hoarder.json
-fdf09505ffd9ab49982a338d90bc0ee680671e35 data/malum/recipes/spirit_infusion/runewood_obelisk.json
+0074fa1f7540700abafee63063fb0face1bdaa91 data/malum/recipes/spirit_infusion/runewood_obelisk.json
 393801496f90a89ef4be0d035a66acede32e6eac data/malum/recipes/spirit_infusion/runewood_totem_base.json
 48c9f82ab40fedd55b40f4fc99ff1ce42d9efd78 data/malum/recipes/spirit_infusion/soul_hunter_boots.json
 6a119f9c6c3f304bdbc22aa468a98bc091f1f8fd data/malum/recipes/spirit_infusion/soul_hunter_cloak.json
@@ -2028,7 +2027,6 @@ fdf09505ffd9ab49982a338d90bc0ee680671e35 data/malum/recipes/spirit_infusion/rune
 24e0d4c4f79a88e7f2d78af05dcbb36347bb4005 data/malum/recipes/spirit_infusion/soul_stained_steel_leggings.json
 883fcfed076815048f7a520633fc964bda66d38d data/malum/recipes/spirit_infusion/soul_stained_steel_scythe.json
 c7bab88c0163744e63f2717e946159c603efd7fd data/malum/recipes/spirit_infusion/soulwood_totem_base.json
-162104624d0ec2cf539a1066c5bcccb9aa30b3c8 data/malum/recipes/spirit_infusion/spectral_lens.json
 50b4793425e8e531ad533e9e869da8e9828bd2c4 data/malum/recipes/spirit_infusion/spirit_catalyzer.json
 1a804be93573ac9f4db260b59e6dc436e78008ac data/malum/recipes/spirit_infusion/spirit_crucible.json
 16d53119f620a89f91f2da70021ffa4a559147c7 data/malum/recipes/spirit_infusion/spirit_fabric.json
@@ -2093,7 +2091,6 @@ d394c7012bb9f154dc88e073fe3e2fb379751050 data/malum/recipes/spirit_transmutation
 f871ed7c2b85d13888a846c503da57628134769f data/malum/recipes/spirit_transmutation/soulwood/vertical_planks_stairs.json
 082772f26da48645667b090f32f45a56478a405b data/malum/recipes/spirit_transmutation/tuff.json
 f2a205e1aaae4e4bf8ecc47ec5991f29c160f63c data/malum/recipes/spirit_transmutation/tuff_block_to_stone.json
-d8b692b0bad5edd547aad5a3c6a1b2294578c54b data/malum/recipes/stained_spirit_resonator.json
 a267117f683ed93708efe7f30f22634d4356cc86 data/malum/recipes/sticky_piston_from_sapballs.json
 35e2790efbb61e2ec3b7d4ac56a3a26611fc0da9 data/malum/recipes/stripped_runewood.json
 d356c97aebb6fb8f1b500f6e4974fafa0545fe23 data/malum/recipes/stripped_soulwood.json

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

@@ -321,7 +321,6 @@
   "item.malum.etheric_nitrate": "Etheric Nitrate",
   "item.malum.filled_soul_vial": "Filled Soul Vial",
   "item.malum.filled_spirit_jar": "Filled Spirit Jar",
-  "item.malum.focus_lens": "Focus Lens",
   "item.malum.fused_consciousness": "Fused Consciousness",
   "item.malum.gay_prideweave": "Gay Prideweave",
   "item.malum.genderfluid_prideweave": "Genderfluid Prideweave",
@@ -333,7 +332,6 @@
   "item.malum.grim_talc": "Grim Talc",
   "item.malum.hallowed_gold_ingot": "Hallowed Gold Ingot",
   "item.malum.hallowed_gold_nugget": "Hallowed Gold Nugget",
-  "item.malum.hallowed_spirit_resonator": "Hallowed Spirit Resonator",
   "item.malum.hex_ash": "Hex Ash",
   "item.malum.holy_caramel": "Holy Caramel",
   "item.malum.holy_sap": "Holy Sap",
@@ -402,9 +400,9 @@
   "item.malum.soulwood_boat": "Soulwood Boat",
   "item.malum.soulwood_stave": "Soulwood Stave",
   "item.malum.spectral_lens": "Spectral Lens",
+  "item.malum.spectral_optic": "Spectral Optic",
   "item.malum.spirit_fabric": "Spirit Fabric",
   "item.malum.spirit_pouch": "Spirit Pouch",
-  "item.malum.stained_spirit_resonator": "Stained Spirit Resonator",
   "item.malum.strange_nucleus": "Strange Nucleus",
   "item.malum.tin_impetus": "Tin Impetus",
   "item.malum.tin_node": "Tin Node",

src/generated/resources/assets/malum/models/item/focus_lens.json → src/generated/resources/assets/malum/models/item/spectral_optic.json

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

src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/stained_spirit_resonator.json → src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/spectral_lens.json

@@ -2,17 +2,17 @@
   "parent": "minecraft:recipes/root",
   "rewards": {
     "recipes": [
-      "malum:stained_spirit_resonator"
+      "malum:spectral_lens"
     ]
   },
   "criteria": {
-    "has_soul_stained_steel": {
+    "has_hex_ash": {
       "trigger": "minecraft:inventory_changed",
       "conditions": {
         "items": [
           {
             "items": [
-              "malum:soul_stained_steel_ingot"
+              "malum:hex_ash"
             ]
           }
         ]
@@ -21,13 +21,13 @@
     "has_the_recipe": {
       "trigger": "minecraft:recipe_unlocked",
       "conditions": {
-        "recipe": "malum:stained_spirit_resonator"
+        "recipe": "malum:spectral_lens"
       }
     }
   },
   "requirements": [
     [
-      "has_soul_stained_steel",
+      "has_hex_ash",
       "has_the_recipe"
     ]
   ]

src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/hallowed_spirit_resonator.json → src/generated/resources/data/malum/advancements/recipes/malum_basis_of_magic/spectral_optic.json

@@ -2,7 +2,7 @@
   "parent": "minecraft:recipes/root",
   "rewards": {
     "recipes": [
-      "malum:hallowed_spirit_resonator"
+      "malum:spectral_optic"
     ]
   },
   "criteria": {
@@ -21,7 +21,7 @@
     "has_the_recipe": {
       "trigger": "minecraft:recipe_unlocked",
       "conditions": {
-        "recipe": "malum:hallowed_spirit_resonator"
+        "recipe": "malum:spectral_optic"
       }
     }
   },

src/generated/resources/data/malum/recipes/spectral_lens.json

@@ -0,0 +1,19 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "pattern": [
+    " X ",
+    "XYX",
+    " X "
+  ],
+  "key": {
+    "X": {
+      "item": "malum:hex_ash"
+    },
+    "Y": {
+      "tag": "forge:glass_panes"
+    }
+  },
+  "result": {
+    "item": "malum:spectral_lens"
+  }
+}

src/generated/resources/data/malum/recipes/hallowed_spirit_resonator.json → src/generated/resources/data/malum/recipes/spectral_optic.json

@@ -13,10 +13,11 @@
       "item": "malum:runewood_planks"
     },
     "Y": {
-      "tag": "forge:gems/quartz"
+      "item": "malum:spectral_lens"
     }
   },
   "result": {
-    "item": "malum:hallowed_spirit_resonator"
+    "item": "malum:spectral_optic",
+    "count": 2
   }
 }

src/generated/resources/data/malum/recipes/spirit_infusion/necklace_of_the_mystic_mirror.json

@@ -8,16 +8,16 @@
     "item": "malum:necklace_of_the_mystic_mirror"
   },
   "extra_items": [
-    {
-      "item": "malum:hallowed_spirit_resonator",
-      "count": 1
-    },
     {
       "item": "malum:runewood_planks",
       "count": 8
     },
     {
-      "item": "malum:spectral_lens",
+      "item": "malum:spectral_optic",
+      "count": 4
+    },
+    {
+      "item": "minecraft:ender_eye",
       "count": 1
     }
   ],

src/generated/resources/data/malum/recipes/spirit_infusion/necklace_of_the_narrow_edge.json

@@ -8,10 +8,6 @@
     "item": "malum:necklace_of_the_narrow_edge"
   },
   "extra_items": [
-    {
-      "item": "malum:stained_spirit_resonator",
-      "count": 1
-    },
     {
       "tag": "forge:storage_blocks/iron",
       "count": 1

src/generated/resources/data/malum/recipes/spirit_infusion/ring_of_esoteric_spoils.json

@@ -8,10 +8,6 @@
     "item": "malum:ring_of_esoteric_spoils"
   },
   "extra_items": [
-    {
-      "item": "malum:stained_spirit_resonator",
-      "count": 1
-    },
     {
       "item": "malum:processed_soulstone",
       "count": 8

src/generated/resources/data/malum/recipes/spirit_infusion/runewood_obelisk.json

@@ -9,8 +9,8 @@
   },
   "extra_items": [
     {
-      "item": "malum:hallowed_spirit_resonator",
-      "count": 1
+      "item": "malum:hallowed_gold_ingot",
+      "count": 2
     },
     {
       "item": "malum:hex_ash",