hehr

src/main/java/dev/jaegerwald/voidlings/block/ModBlocks.java

@@ -48,6 +48,9 @@ public class ModBlocks {
     public static final Block CHISELED_BLACK_ACID_BRICKS = registerBlock("chiseled_black_acid_bricks",
             new Block(AbstractBlock.Settings.copy(BLACK_ACID_BRICKS))
     );
+    public static final Block CHISELED_BLACK_ACID_PILLAR = registerBlock("chiseled_black_acid_pillar",
+            new PillarBlock(AbstractBlock.Settings.copy(BLACK_ACID_BRICKS))
+    );
 
     public static final Block ACID_SPROUTS = registerBlock("acid_sprouts",
             new AcidFolliageBlock(
@@ -169,6 +172,15 @@ public class ModBlocks {
                     ConstantIntProvider.create(0)
             )
     );
+    public static final Block MURIA_BLOCK = registerBlock("muria_block",
+            new Block(
+                    AbstractBlock.Settings.create()
+                            .mapColor(MapColor.BLACK)
+                            .requiresTool()
+                            .strength(50.0F, 1500.0F)
+                            .sounds(BlockSoundGroup.NETHERITE)
+            )
+    );
 
     private static Block registerBlock(String name, Block block) {
         return registerBlock(name, block, true);

src/main/java/dev/jaegerwald/voidlings/item/ModItemGroups.java

@@ -27,6 +27,7 @@ public class ModItemGroups {
                         entries.add(ModBlocks.BLACK_ACID_BRICK_SLAB);
                         entries.add(ModBlocks.BLACK_ACID_BRICK_WALL);
                         entries.add(ModBlocks.CHISELED_BLACK_ACID_BRICKS);
+                        entries.add(ModBlocks.CHISELED_BLACK_ACID_PILLAR);
                         entries.add(ModItems.BLACK_ACID_CHUNK);
 
                         entries.add(ModBlocks.ACID_SPROUTS);
@@ -46,6 +47,8 @@ public class ModItemGroups {
                         entries.add(ModItems.MURIA_SHELL);
                         entries.add(ModItems.MURIA_ROD);
                         entries.add(ModItems.FRAMED_CLOTH);
+                        entries.add(ModItems.MURIA_INGOT);
+                        entries.add(ModBlocks.MURIA_BLOCK);
 
                         entries.add(ModItems.FENNEC_MASK);
                         entries.add(ModItems.REPLICA_WHISKERS);

src/main/java/dev/jaegerwald/voidlings/item/ModItems.java

@@ -41,6 +41,7 @@ public class ModItems {
     public static final Item MURIA_SHELL = registerItem("muria_shell", new Item(new Item.Settings()));
     public static final Item MURIA_ROD = registerItem("muria_rod", new Item(new Item.Settings()));
     public static final Item FRAMED_CLOTH = registerItem("framed_cloth", new Item(new Item.Settings()));
+    public static final Item MURIA_INGOT = registerItem("muria_ingot", new Item(new Item.Settings()));
 
     public static final Item FENNEC_MASK = registerItem("fennec_mask", new FennecMaskItem(new Item.Settings()));
     public static final Item REPLICA_WHISKERS = registerItem("replica_whiskers", new Item(new Item.Settings()));

src/main/resources/assets/voidlings/blockstates/chiseled_black_acid_pillar.json

@@ -0,0 +1,16 @@
+{
+  "variants": {
+    "axis=x": {
+      "model": "voidlings:block/chiseled_black_acid_pillar_horizontal",
+      "x": 90,
+      "y": 90
+    },
+    "axis=y": {
+      "model": "voidlings:block/chiseled_black_acid_pillar"
+    },
+    "axis=z": {
+      "model": "voidlings:block/chiseled_black_acid_pillar_horizontal",
+      "x": 90
+    }
+  }
+}

src/main/resources/assets/voidlings/blockstates/muria_block.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "voidlings:block/muria_block"
+    }
+  }
+}

src/main/resources/assets/voidlings/models/block/chiseled_black_acid_pillar.json

@@ -0,0 +1,7 @@
+{
+  "parent": "minecraft:block/cube_column",
+  "textures": {
+    "end": "voidlings:block/chiseled_black_acid_pillar_top",
+    "side": "voidlings:block/chiseled_black_acid_pillar"
+  }
+}

src/main/resources/assets/voidlings/models/block/chiseled_black_acid_pillar_horizontal.json

@@ -0,0 +1,7 @@
+{
+  "parent": "minecraft:block/cube_column_horizontal",
+  "textures": {
+    "end": "voidlings:block/chiseled_black_acid_pillar_top",
+    "side": "voidlings:block/chiseled_black_acid_pillar"
+  }
+}

src/main/resources/assets/voidlings/models/block/muria_block.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/cube_all",
+  "textures": {
+    "all": "voidlings:block/muria_block"
+  }
+}

src/main/resources/assets/voidlings/models/item/chiseled_black_acid_pillar.json

@@ -0,0 +1,3 @@
+{
+  "parent": "voidlings:block/chiseled_black_acid_pillar"
+}

src/main/resources/assets/voidlings/models/item/muria_block.json

@@ -0,0 +1,3 @@
+{
+  "parent": "voidlings:block/muria_block"
+}

src/main/resources/assets/voidlings/models/item/muria_ingot.json

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

src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json

@@ -8,6 +8,7 @@
     "voidlings:black_acid_brick_slab",
     "voidlings:black_acid_brick_wall",
     "voidlings:chiseled_black_acid_bricks",
+    "voidlings:chiseled_black_acid_pillar",
     "voidlings:acid_encased_muria"
   ]
 }

src/main/resources/data/voidlings/loot_tables/blocks/acid_encased_muria.json

@@ -3,46 +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": {
-                    "predicates": {
-                      "minecraft:enchantments": [
-                        {
-                          "enchantments": "minecraft:silk_touch",
-                          "levels": {
-                            "min": 1
-                          }
-                        }
-                      ]
-                    }
-                  }
-                }
-              ],
-              "name": "voidlings:acid_encased_muria"
-            },
-            {
-              "type": "minecraft:item",
-              "functions": [
-                {
-                  "enchantment": "minecraft:fortune",
-                  "formula": "minecraft:ore_drops",
-                  "function": "minecraft:apply_bonus"
-                },
-                {
-                  "function": "minecraft:explosion_decay"
-                }
-              ],
-              "name": "voidlings:raw_muria"
-            }
-          ]
+          "type": "minecraft:item",
+          "name": "voidlings:acid_encased_muria"
         }
       ],
       "rolls": 1.0

src/main/resources/data/voidlings/loot_tables/blocks/chiseled_black_acid_pillar.json

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

src/main/resources/data/voidlings/loot_tables/blocks/muria_block.json

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

src/main/resources/data/voidlings/powers/replacable_heart.json

@@ -1,33 +1,39 @@
 {
-    "type": "origins:action_on_item_use",
-    "trigger": "instant",
     "hidden": true,
+    "type": "origins:multiple",
 
-    "entity_action": {
-        "type": "origins:and",
-        "actions": [
-            {
-                "type": "origins:execute_command",
-                "command": "function voidlings:replaced_heart"
-            }
-        ]
-    },
-
-    "item_condition": {
-        "type": "origins:or",
-        "conditions": [
-            {
-                "type": "origins:ingredient",
-                "ingredient": {
-                    "item": "voidlings:replacement_heart"
+    "voidling_heart": {
+        "type": "origins:action_on_item_use",
+        "trigger": "instant",
+        "entity_action": {
+            "type": "origins:and",
+            "actions": [
+                {
+                    "type": "origins:execute_command",
+                    "command": "function voidlings:replaced_heart"
+                },
+                {
+                    "type": "origins:execute_command",
+                    "command": "origin set @s origins:origin voidlings:voidling"
                 }
-            },
-            {
-                "type": "origins:ingredient",
-                "ingredient": {
-                    "item": "voidlings:voidling_heart"
+            ]
+        },
+        "item_condition": {
+            "type": "origins:or",
+            "conditions": [
+                {
+                    "type": "origins:ingredient",
+                    "ingredient": {
+                        "item": "voidlings:replacement_heart"
+                    }
+                },
+                {
+                    "type": "origins:ingredient",
+                    "ingredient": {
+                        "item": "voidlings:voidling_heart"
+                    }
                 }
-            }
-        ]
+            ]
+        }
     }
 }

src/main/resources/data/voidlings/recipes/chiseled_black_acid_bricks_from_chiseled_black_acid_pillar.json

@@ -0,0 +1,16 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "category": "building",
+  "key": {
+    "#": {
+      "item": "voidlings:chiseled_black_acid_pillar"
+    }
+  },
+  "pattern": [
+    "#"
+  ],
+  "result": {
+    "item": "voidlings:chiseled_black_acid_bricks"
+  },
+  "show_notification": false
+}

src/main/resources/data/voidlings/recipes/chiseled_black_acid_pillar.json

@@ -0,0 +1,16 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "category": "building",
+  "key": {
+    "#": {
+      "item": "voidlings:black_acid_brick_slab"
+    }
+  },
+  "pattern": [
+    "##"
+  ],
+  "result": {
+    "item": "voidlings:chiseled_black_acid_pillar"
+  },
+  "show_notification": true
+}

src/main/resources/data/voidlings/recipes/chiseled_black_acid_pillar_from_black_acid_bricks_stonecutting.json

@@ -0,0 +1,8 @@
+{
+  "type": "minecraft:stonecutting",
+  "count": 1,
+  "ingredient": {
+    "item": "voidlings:black_acid_bricks"
+  },
+  "result": "voidlings:chiseled_black_acid_pillar"
+}

src/main/resources/data/voidlings/recipes/chiseled_black_acid_pillar_from_black_acid_stonecutting.json

@@ -0,0 +1,8 @@
+{
+  "type": "minecraft:stonecutting",
+  "count": 1,
+  "ingredient": {
+    "item": "voidlings:black_acid"
+  },
+  "result": "voidlings:chiseled_black_acid_pillar"
+}

src/main/resources/data/voidlings/recipes/chiseled_black_acid_pillar_from_chiseled_black_acid_bricks.json

@@ -0,0 +1,16 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "category": "building",
+  "key": {
+    "#": {
+      "item": "voidlings:chiseled_black_acid_bricks"
+    }
+  },
+  "pattern": [
+    "#"
+  ],
+  "result": {
+    "item": "voidlings:chiseled_black_acid_pillar"
+  },
+  "show_notification": false
+}

src/main/resources/data/voidlings/recipes/muria_block.json

@@ -0,0 +1,18 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "category": "building",
+  "key": {
+    "#": {
+      "item": "voidlings:muria_ingot"
+    }
+  },
+  "pattern": [
+    "###",
+    "###",
+    "###"
+  ],
+  "result": {
+    "item": "voidlings:muria_block"
+  },
+  "show_notification": true
+}