I lvoe boyfriend :3

gradle.properties

@@ -35,6 +35,6 @@ modAuthors=Sammy Semicolon
 # The description of the mod. This is a simple multiline text string that is used for display purposes in the mod list.
 modDescription=A dark magic mod focused on soul and spirit magic.
 # Mod Dependency Versions
-lodestoneVersion=1.4.2.58
+lodestoneVersion=1.4.2.61
 jeiVersion=15.2.0.22
 curiosVersion=5.4.0+1.20.1

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

@@ -0,0 +1,56 @@
+{
+  "variants": {
+    "facing=down,waterlogged=false": {
+      "model": "malum:block/cthonic_gold_cluster",
+      "x": 180
+    },
+    "facing=down,waterlogged=true": {
+      "model": "malum:block/cthonic_gold_cluster",
+      "x": 180
+    },
+    "facing=east,waterlogged=false": {
+      "model": "malum:block/cthonic_gold_cluster",
+      "x": 90,
+      "y": 90
+    },
+    "facing=east,waterlogged=true": {
+      "model": "malum:block/cthonic_gold_cluster",
+      "x": 90,
+      "y": 90
+    },
+    "facing=north,waterlogged=false": {
+      "model": "malum:block/cthonic_gold_cluster",
+      "x": 90
+    },
+    "facing=north,waterlogged=true": {
+      "model": "malum:block/cthonic_gold_cluster",
+      "x": 90
+    },
+    "facing=south,waterlogged=false": {
+      "model": "malum:block/cthonic_gold_cluster",
+      "x": 90,
+      "y": 180
+    },
+    "facing=south,waterlogged=true": {
+      "model": "malum:block/cthonic_gold_cluster",
+      "x": 90,
+      "y": 180
+    },
+    "facing=up,waterlogged=false": {
+      "model": "malum:block/cthonic_gold_cluster"
+    },
+    "facing=up,waterlogged=true": {
+      "model": "malum:block/cthonic_gold_cluster"
+    },
+    "facing=west,waterlogged=false": {
+      "model": "malum:block/cthonic_gold_cluster",
+      "x": 90,
+      "y": 270
+    },
+    "facing=west,waterlogged=true": {
+      "model": "malum:block/cthonic_gold_cluster",
+      "x": 90,
+      "y": 270
+    }
+  }
+}

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

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "malum:block/cthonic_gold_ore"
+    }
+  }
+}

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

@@ -35,6 +35,8 @@
   "block.malum.chiseled_tainted_rock": "Chiseled Tainted Rock",
   "block.malum.chiseled_twisted_rock": "Chiseled Twisted Rock",
   "block.malum.clinging_blight": "Clinging Blight",
+  "block.malum.cthonic_gold_cluster": "Cthonic Gold Cluster",
+  "block.malum.cthonic_gold_ore": "Cthonic Gold Ore",
   "block.malum.cursed_sap_block": "Cursed Sap Block",
   "block.malum.cut_runewood_planks": "Cut Runewood Planks",
   "block.malum.cut_soulwood_planks": "Cut Soulwood Planks",
@@ -297,7 +299,6 @@
   "item.malum.blazing_quartz": "Blazing Quartz",
   "item.malum.blazing_quartz_fragment": "Blazing Quartz Fragment",
   "item.malum.blighted_gunk": "Blighted Gunk",
-  "item.malum.block_of_cthonic_gold": "Block of Cthonic Gold",
   "item.malum.charcoal_fragment": "Charcoal Fragment",
   "item.malum.chunk_of_brilliance": "Chunk of Brilliance",
   "item.malum.cluster_of_brilliance": "Cluster of Brilliance",
@@ -640,6 +641,20 @@
   "malum.gui.book.entry.page.headline.transmutation.smooth_basalt": "Transmutation: Exothermic",
   "malum.gui.book.entry.page.headline.transmutation.stone": "Transmutation: Basic",
   "malum.gui.book.entry.page.headline.tyrving": "Tyrving",
+  "malum.gui.book.entry.page.headline.void.anomalous_design": "Anomalous Design",
+  "malum.gui.book.entry.page.headline.void.auric_embers": "Auric Embers",
+  "malum.gui.book.entry.page.headline.void.belt_of_the_limitless": "Belt of the Limitless",
+  "malum.gui.book.entry.page.headline.void.fused_consciousness": "Fused Consciousness",
+  "malum.gui.book.entry.page.headline.void.introduction": "Introduction",
+  "malum.gui.book.entry.page.headline.void.mnemonic_fragment": "Mnemonic Fragment",
+  "malum.gui.book.entry.page.headline.void.null_slate": "Null Slate",
+  "malum.gui.book.entry.page.headline.void.ring_of_growing_flesh": "Ring of Growing Flesh",
+  "malum.gui.book.entry.page.headline.void.ring_of_the_plentiful": "Ring of the Plentiful",
+  "malum.gui.book.entry.page.headline.void.soul_stained_steel_staff": "Soulstained Staff",
+  "malum.gui.book.entry.page.headline.void.staff_of_the_auric_flame": "Staff of the Auric Flame",
+  "malum.gui.book.entry.page.headline.void.stellar_mechanism": "Stellar Mechanism",
+  "malum.gui.book.entry.page.headline.void.void_salts": "Void Salts",
+  "malum.gui.book.entry.page.headline.void.weeping_well": "Weeping Well",
   "malum.gui.book.entry.page.headline.voodoo_magic": "Voodoo magic",
   "malum.gui.book.entry.page.headline.warping_engine": "Warping Engine",
   "malum.gui.book.entry.page.text.accelerating_inlay.1": "A simple but effective implement, the Accelerating Inlay provides a substantial bonus to the focusing speed of the crucible without any drawbacks.",
@@ -837,6 +852,23 @@
   "malum.gui.book.entry.page.text.transmutation.intro.2": "An Unchained Transmutation revolves around using the chaotic ritual to change matter, depending on which material we start with, the Rite will shift any given block forward in the tree, turning it into blight at the very end of it. There doesn't appear to be any reason for these patterns.",
   "malum.gui.book.entry.page.text.tyrving.1": "The Tyrving is a rather esoteric blade. It's strange design makes it appear as a weak weapon not suited for combat. However, it's hex ash lining and twisted rock form cause it to deal extra magic damage to the soul, the greater the soul the more benefit.",
   "malum.gui.book.entry.page.text.tyrving.2": "The weapon can also be repaired using arcane restoration quite efficiently.",
+  "malum.gui.book.entry.page.text.void.anomalous_design.1": "Weird cult like symbol made by throwing an iron block into the weeping well. Lore wise the idea is that like, the entity behind the weeping well instructs you to actually create this thing and just, feed it the spirits and stuff. ",
+  "malum.gui.book.entry.page.text.void.auric_embers.1": "Blaze Powder when thrown into the weeping well nets you Auric Embers, a demonic essence of fire. Pretend that this description is a lot more cryptic and imagine there being some cool page on the right.",
+  "malum.gui.book.entry.page.text.void.belt_of_the_limitless.1": "powerful belt item thing. Doubles ur soulward and also makes it absorb physical damage as well as magical damage.",
+  "malum.gui.book.entry.page.text.void.fused_consciousness.1": "Cool arguably expensive material obtained by throwing the complete design into the weeping well. ",
+  "malum.gui.book.entry.page.text.void.introduction.1": "Hey Hey, this is the B-Side progression screen known as Chronicles of the Void. It's currently lacking proper translation entries but I've tried my best to explain everything in one way or another. Very, out of character, for the malum book.",
+  "malum.gui.book.entry.page.text.void.introduction.2": "When the mod actually releases, the button you used to get to this screen will have a cool animation, and also will only be available after the player throws the encyclopedia arcana into the weeping well; netting them an advancement that's required for the button to be present.",
+  "malum.gui.book.entry.page.text.void.mnemonic_fragment.1": "Brilliance Clusters or Chunks when thrown into the weeping well nets you Mnemonic Fragments, a material full of memories turned into matter. Pretend that this description is a lot more cryptic and imagine there being some cool page on the right.",
+  "malum.gui.book.entry.page.text.void.null_slate.1": "Soulstone when thrown into the weeping well nets you null slate, a material suspected to be the true form of soulstone. Pretend that this description is a lot more cryptic and imagine there being some cool page on the right.",
+  "malum.gui.book.entry.page.text.void.ring_of_growing_flesh.1": "The ring will give you a stacking max health buff every time you collect spirits, at full potency doubling your max health. The buff lasts quite a long time.",
+  "malum.gui.book.entry.page.text.void.ring_of_the_plentiful.1": "This ring will stockpile up to 3 reserve staff charges, which when present are consumed to avoid placing a cooldown on the staff's ranged functionality. Each staff charge takes 15 seconds to recover, and currently there's no indication for it.",
+  "malum.gui.book.entry.page.text.void.soul_stained_steel_staff.1": "Staves are hybrid melee and ranged weapons. They swing faster than scythes but deal less physical damage. The simplest one is the Soulstained Steel Staff.",
+  "malum.gui.book.entry.page.text.void.soul_stained_steel_staff.2": "What makes staves special is the right click functionality, the right click function lets you shoot long range projectiles. This ranged attack has a relatively short cooldown, and requires a one second charge-up window before being fired.",
+  "malum.gui.book.entry.page.text.void.soul_stained_steel_staff.3": "The Soulstained Steel Staff in particular allows the user to lob a burst of 3 gravity affected hex bolts, each dealing 100% of the staff's magical damage output.",
+  "malum.gui.book.entry.page.text.void.staff_of_the_auric_flame.1": "staff upgrade! Longer cooldown, shoots 5 homing fire bolts, deals more magic damage. Also sets things on fire but not with the melee attack which will be changed I'm just lazy.",
+  "malum.gui.book.entry.page.text.void.stellar_mechanism.1": "powerful crucible augment. Doubles the strength of the bonus applied by the tuning fork, without affecting the negative side of things. It's a core augment, which means it can only be slotted in the crucible itself, and is stored in a separate inventory than the one used for regular augments.",
+  "malum.gui.book.entry.page.text.void.void_salts.1": "Hex ash when thrown into the weeping well nets you void salts, a weird and seemingly alive powder. Pretend that this description is a lot more cryptic and imagine there being some cool page on the right.",
+  "malum.gui.book.entry.page.text.void.weeping_well.1": "The infamous hole. You can locate it by using /locate structure malum:weeping_well. It's the starting point for ur progression in chronicles of the void.",
   "malum.gui.book.entry.page.text.voodoo_magic.1": "The future holds many secrets..",
   "malum.gui.book.entry.page.text.warping_engine.1": "I have created something cursed. This machine named the Warping Engine is a rather hard to explain piece of engineering, but in short, each time the crucible finishes a focusing cycle the engine has a chance to nearly instantly bring about the completion of the next cycle.",
   "malum.gui.book.entry.page.text.warping_engine.2": "Furthermore, chained activations of the warping engine provide a stacking benefit to $iall/$ other attributes. Unfortunately, this complex behavior takes quite a toll on the stability and fuel requirements of the focusing process.",
@@ -892,6 +924,32 @@
   "malum.gui.book.entry.transmutation.description": "Volatile Reactions",
   "malum.gui.book.entry.tyrving": "Tyrving",
   "malum.gui.book.entry.tyrving.description": "Ancient Relic",
+  "malum.gui.book.entry.void.anomalous_design": "Anomalous Design",
+  "malum.gui.book.entry.void.anomalous_design.description": "Unknown origins",
+  "malum.gui.book.entry.void.auric_embers": "Auric Embers",
+  "malum.gui.book.entry.void.auric_embers.description": "Potent flames",
+  "malum.gui.book.entry.void.belt_of_the_limitless": "Belt of the Limitless",
+  "malum.gui.book.entry.void.belt_of_the_limitless.description": "Imaginary strength",
+  "malum.gui.book.entry.void.fused_consciousness": "Fused Consciousness",
+  "malum.gui.book.entry.void.fused_consciousness.description": "Magic and mind",
+  "malum.gui.book.entry.void.introduction": "Introduction",
+  "malum.gui.book.entry.void.introduction.description": "Secrets uncovered",
+  "malum.gui.book.entry.void.mnemonic_fragment": "Mnemonic Fragment",
+  "malum.gui.book.entry.void.mnemonic_fragment.description": "Memories solidified",
+  "malum.gui.book.entry.void.null_slate": "Null Slate",
+  "malum.gui.book.entry.void.null_slate.description": "Original form",
+  "malum.gui.book.entry.void.ring_of_growing_flesh": "Ring of Growing Flesh",
+  "malum.gui.book.entry.void.ring_of_growing_flesh.description": "Cancerous growths",
+  "malum.gui.book.entry.void.soul_stained_steel_staff": "Soulstained Staff",
+  "malum.gui.book.entry.void.soul_stained_steel_staff.description": "Spell-casting",
+  "malum.gui.book.entry.void.staff_of_the_auric_flame": "Staff of the Auric Flame",
+  "malum.gui.book.entry.void.staff_of_the_auric_flame.description": "Seeking flames",
+  "malum.gui.book.entry.void.stellar_mechanism": "Stellar Mechanism",
+  "malum.gui.book.entry.void.stellar_mechanism.description": "Finer tuning",
+  "malum.gui.book.entry.void.void_salts": "Void Salts",
+  "malum.gui.book.entry.void.void_salts.description": "Necrotic powder",
+  "malum.gui.book.entry.void.weeping_well": "Weeping Well",
+  "malum.gui.book.entry.void.weeping_well.description": "Ominous presence",
   "malum.gui.book.entry.voodoo_magic": "Voodoo magic",
   "malum.gui.book.entry.voodoo_magic.description": "Forbidden arts",
   "malum.gui.book.entry.warping_engine": "Warping Engine",
@@ -996,6 +1054,10 @@
   "malum.subtitle.arcane_charcoal_block_place": "Block placed",
   "malum.subtitle.arcane_charcoal_block_step": "Footsteps",
   "malum.subtitle.arcane_rock_break": "Block broken",
+  "malum.subtitle.arcane_rock_bricks_break": "Block broken",
+  "malum.subtitle.arcane_rock_bricks_hit": "Block breaking",
+  "malum.subtitle.arcane_rock_bricks_place": "Block placed",
+  "malum.subtitle.arcane_rock_bricks_step": "Footsteps",
   "malum.subtitle.arcane_rock_hit": "Block breaking",
   "malum.subtitle.arcane_rock_place": "Block placed",
   "malum.subtitle.arcane_rock_step": "Footsteps",

src/generated/resources/assets/malum/models/block/block_of_cthonic_gold.json

@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:block/cube_all",
   "textures": {
-    "all": "malum:block/ores/block_of_cthonic_gold"
+    "all": "malum:block/storage_blocks/block_of_cthonic_gold"
   }
 }

src/generated/resources/assets/malum/models/block/cthonic_gold_cluster.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/cross",
+  "textures": {
+    "cross": "malum:block/ores/cthonic_gold_cluster"
+  }
+}

src/generated/resources/assets/malum/models/block/cthonic_gold_ore.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/cube_all",
+  "textures": {
+    "all": "malum:block/ores/cthonic_gold_ore"
+  }
+}

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

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

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

@@ -0,0 +1,3 @@
+{
+  "parent": "malum:block/cthonic_gold_ore"
+}

src/generated/resources/data/forge/tags/blocks/ores.json

@@ -5,8 +5,10 @@
     "malum:block_of_cthonic_gold",
     "malum:brilliant_stone",
     "malum:natural_quartz_ore",
+    "malum:cthonic_gold_ore",
     "malum:brilliant_deepslate",
     "malum:deepslate_quartz_ore",
+    "malum:cthonic_gold_cluster",
     "malum:deepslate_soulstone_ore"
   ]
 }

src/generated/resources/data/forge/tags/items/ores.json

@@ -5,8 +5,10 @@
     "malum:block_of_cthonic_gold",
     "malum:brilliant_stone",
     "malum:natural_quartz_ore",
+    "malum:cthonic_gold_ore",
     "malum:brilliant_deepslate",
     "malum:deepslate_quartz_ore",
+    "malum:cthonic_gold_cluster",
     "malum:deepslate_soulstone_ore"
   ]
 }

src/generated/resources/data/minecraft/advancements/recipes/misc/torch.json → src/generated/resources/data/malum/advancements/recipes/misc/torch_from_blazing_quartz.json

@@ -15,7 +15,7 @@
     },
     "has_the_recipe": {
       "conditions": {
-        "recipe": "minecraft:torch"
+        "recipe": "malum:torch_from_blazing_quartz"
       },
       "trigger": "minecraft:recipe_unlocked"
     }
@@ -28,7 +28,7 @@
   ],
   "rewards": {
     "recipes": [
-      "minecraft:torch"
+      "malum:torch_from_blazing_quartz"
     ]
   },
   "sends_telemetry_event": false

src/generated/resources/data/malum/forge/biome_modifier/cthonic_gold_ore.json

@@ -0,0 +1,6 @@
+{
+  "type": "forge:add_features",
+  "biomes": "#malum:has_rare_earths",
+  "features": "malum:cthonic_gold_ore",
+  "step": "underground_ores"
+}

src/generated/resources/data/malum/loot_tables/blocks/block_of_cthonic_gold.json

@@ -3,39 +3,15 @@
   "pools": [
     {
       "bonus_rolls": 0.0,
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ],
       "entries": [
         {
-          "type": "minecraft:alternatives",
-          "children": [
-            {
-              "type": "minecraft:item",
-              "conditions": [
-                {
-                  "condition": "minecraft:match_tool",
-                  "predicate": {
-                    "enchantments": [
-                      {
-                        "enchantment": "minecraft:silk_touch",
-                        "levels": {
-                          "min": 1
-                        }
-                      }
-                    ]
-                  }
-                }
-              ],
-              "name": "malum:block_of_cthonic_gold"
-            },
-            {
-              "type": "minecraft:item",
-              "conditions": [
-                {
-                  "condition": "minecraft:survives_explosion"
-                }
-              ],
-              "name": "malum:cthonic_gold"
-            }
-          ]
+          "type": "minecraft:item",
+          "name": "malum:block_of_cthonic_gold"
         }
       ],
       "rolls": 1.0

src/generated/resources/data/malum/loot_tables/blocks/cthonic_gold_cluster.json

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

src/generated/resources/data/malum/loot_tables/blocks/cthonic_gold_ore.json

@@ -0,0 +1,45 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "entries": [
+        {
+          "type": "minecraft:alternatives",
+          "children": [
+            {
+              "type": "minecraft:item",
+              "conditions": [
+                {
+                  "condition": "minecraft:match_tool",
+                  "predicate": {
+                    "enchantments": [
+                      {
+                        "enchantment": "minecraft:silk_touch",
+                        "levels": {
+                          "min": 1
+                        }
+                      }
+                    ]
+                  }
+                }
+              ],
+              "name": "malum:cthonic_gold_ore"
+            },
+            {
+              "type": "minecraft:item",
+              "conditions": [
+                {
+                  "condition": "minecraft:survives_explosion"
+                }
+              ],
+              "name": "malum:cthonic_gold"
+            }
+          ]
+        }
+      ],
+      "rolls": 1.0
+    }
+  ],
+  "random_sequence": "malum:blocks/cthonic_gold_ore"
+}