blocks

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

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

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

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

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

@@ -21,9 +21,11 @@
   "block.malum.block_of_blazing_quartz": "Block of Blazing Quartz",
   "block.malum.block_of_brilliance": "Block of Brilliance",
   "block.malum.block_of_cthonic_gold": "Block of Cthonic Gold",
+  "block.malum.block_of_foul_flesh": "Block of Foul Flesh",
   "block.malum.block_of_grim_talc": "Block of Grim Talc",
   "block.malum.block_of_hallowed_gold": "Block of Hallowed Gold",
   "block.malum.block_of_hex_ash": "Block of Hex Ash",
+  "block.malum.block_of_living_flesh": "Block of Living Flesh",
   "block.malum.block_of_malignant_lead": "Block of Malignant Lead",
   "block.malum.block_of_malignant_pewter": "Block of Malignant Pewter",
   "block.malum.block_of_mnemonic_fragment": "Block of Mnemonic Fragment",

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

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

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

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

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

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

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

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

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

@@ -6,11 +6,11 @@
     "malum:block_of_cthonic_gold",
     "malum:block_of_alchemical_calx",
     "malum:mass_of_blighted_gunk",
-    "malum:blazing_quartz_cluster",
     "malum:block_of_blazing_quartz",
     "malum:block_of_void_salts",
     "malum:cursed_sap_block",
     "malum:block_of_soulstone",
+    "malum:block_of_living_flesh",
     "malum:block_of_malignant_pewter",
     "malum:block_of_null_slate",
     "malum:block_of_arcane_charcoal",
@@ -21,6 +21,7 @@
     "malum:runic_sap_block",
     "malum:block_of_hex_ash",
     "malum:block_of_raw_soulstone",
+    "malum:block_of_foul_flesh",
     "malum:block_of_brilliance"
   ]
 }

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

@@ -10,6 +10,7 @@
     "malum:block_of_void_salts",
     "malum:cursed_sap_block",
     "malum:block_of_soulstone",
+    "malum:block_of_living_flesh",
     "malum:block_of_malignant_pewter",
     "malum:block_of_null_slate",
     "malum:block_of_arcane_charcoal",
@@ -20,6 +21,7 @@
     "malum:runic_sap_block",
     "malum:block_of_hex_ash",
     "malum:block_of_raw_soulstone",
+    "malum:block_of_foul_flesh",
     "malum:block_of_brilliance"
   ]
 }

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

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

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

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

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

@@ -87,6 +87,7 @@
     "malum:spirit_catalyzer_component",
     "malum:tainted_rock_bricks_slab",
     "malum:spirit_catalyzer",
+    "malum:block_of_living_flesh",
     "malum:block_of_malignant_pewter",
     "malum:weeping_well_side",
     "malum:runic_tainted_rock_tiles_wall",
@@ -133,6 +134,7 @@
     "malum:runic_tainted_rock_tiles_stairs",
     "malum:tainted_ether_brazier",
     "malum:block_of_raw_soulstone",
+    "malum:block_of_foul_flesh",
     "malum:small_twisted_rock_bricks_stairs",
     "malum:block_of_brilliance",
     "malum:twisted_rock_stairs",

src/main/java/com/sammy/malum/data/block/MalumBlockStates.java

@@ -183,7 +183,8 @@ protected void registerStatesAndModels() {
                 BLOCK_OF_ROTTING_ESSENCE, BLOCK_OF_ASTRAL_WEAVE, BLOCK_OF_HEX_ASH, BLOCK_OF_ALCHEMICAL_CALX,
                 MASS_OF_BLIGHTED_GUNK, BLOCK_OF_SOUL_STAINED_STEEL, BLOCK_OF_HALLOWED_GOLD, BLOCK_OF_MALIGNANT_PEWTER,
                 BLOCK_OF_NULL_SLATE, BLOCK_OF_VOID_SALTS, BLOCK_OF_MNEMONIC_FRAGMENT, BLOCK_OF_MALIGNANT_LEAD,
-                RUNIC_SAP_BLOCK, CURSED_SAP_BLOCK, BLOCK_OF_BLAZING_QUARTZ, BLOCK_OF_ARCANE_CHARCOAL);
+                RUNIC_SAP_BLOCK, CURSED_SAP_BLOCK, BLOCK_OF_BLAZING_QUARTZ, BLOCK_OF_ARCANE_CHARCOAL,
+                BLOCK_OF_LIVING_FLESH, BLOCK_OF_FOUL_FLESH);
         BlockStateSmithTypes.LOG_BLOCK.act(data, BLOCK_OF_GRIM_TALC);
 
         setTexturePath("blight/");

src/main/java/com/sammy/malum/registry/common/block/BlockRegistry.java

@@ -394,14 +394,16 @@ public class BlockRegistry {
 
     public static final RegistryObject<Block> BLOCK_OF_ROTTING_ESSENCE = BLOCKS.register("block_of_rotting_essence", () -> new Block(new LodestoneBlockProperties().needsPickaxe().addTags(STORAGE_BLOCKS).strength(1F, 6.0F).sound(SoundType.CORAL_BLOCK)));
     public static final RegistryObject<Block> BLOCK_OF_GRIM_TALC = BLOCKS.register("block_of_grim_talc", () -> new RotatedPillarBlock(LodestoneBlockProperties.copy(Blocks.BONE_BLOCK).needsPickaxe().addTags(STORAGE_BLOCKS)));
-    public static final RegistryObject<Block> BLOCK_OF_ALCHEMICAL_CALX = BLOCKS.register("block_of_alchemical_calx", () -> new Block(LodestoneBlockProperties.copy(Blocks.CALCITE).needsPickaxe().addTags(STORAGE_BLOCKS)));
     public static final RegistryObject<Block> BLOCK_OF_ASTRAL_WEAVE = BLOCKS.register("block_of_astral_weave", () -> new Block(LodestoneBlockProperties.copy(Blocks.LIGHT_BLUE_WOOL).needsPickaxe().needsHoe().addTags(STORAGE_BLOCKS)));
 //    public static final RegistryObject<Block> BLOCK_OF_WARP_FLUX = BLOCKS.register("block_of_warp_flux", () -> new Block(LodestoneBlockProperties.copy(Blocks.LIGHT_BLUE_WOOL).needsPickaxe().needsHoe().addTags(STORAGE_BLOCKS)));
     public static final RegistryObject<Block> BLOCK_OF_HEX_ASH = BLOCKS.register("block_of_hex_ash", () -> new Block(LodestoneBlockProperties.copy(Blocks.PURPLE_CONCRETE_POWDER).needsPickaxe().needsHoe().addTags(STORAGE_BLOCKS)));
+    public static final RegistryObject<Block> BLOCK_OF_LIVING_FLESH = BLOCKS.register("block_of_living_flesh", () -> new Block(new LodestoneBlockProperties().needsPickaxe().addTags(STORAGE_BLOCKS).strength(1F, 6.0F).sound(SoundType.CORAL_BLOCK)));
+    public static final RegistryObject<Block> BLOCK_OF_ALCHEMICAL_CALX = BLOCKS.register("block_of_alchemical_calx", () -> new Block(LodestoneBlockProperties.copy(Blocks.CALCITE).needsPickaxe().addTags(STORAGE_BLOCKS)));
     public static final RegistryObject<Block> MASS_OF_BLIGHTED_GUNK = BLOCKS.register("mass_of_blighted_gunk", () -> new Block(MalumBlockProperties.BLIGHT().needsPickaxe().addTags(STORAGE_BLOCKS)));
     public static final RegistryObject<Block> BLOCK_OF_NULL_SLATE = BLOCKS.register("block_of_null_slate", () -> new Block(MalumBlockProperties.SOULSTONE_BLOCK()));
     public static final RegistryObject<Block> BLOCK_OF_VOID_SALTS = BLOCKS.register("block_of_void_salts", () -> new Block(LodestoneBlockProperties.copy(Blocks.BLACK_CONCRETE_POWDER).needsPickaxe().needsShovel().addTags(STORAGE_BLOCKS)));
     public static final RegistryObject<Block> BLOCK_OF_MNEMONIC_FRAGMENT = BLOCKS.register("block_of_mnemonic_fragment", () -> new Block(MalumBlockProperties.BRILLIANCE_BLOCK()));
+    public static final RegistryObject<Block> BLOCK_OF_FOUL_FLESH = BLOCKS.register("block_of_foul_flesh", () -> new Block(new LodestoneBlockProperties().needsPickaxe().addTags(STORAGE_BLOCKS).strength(1F, 6.0F).sound(SoundType.CORAL_BLOCK)));
     public static final RegistryObject<Block> BLOCK_OF_MALIGNANT_LEAD = BLOCKS.register("block_of_malignant_lead", () -> new Block(MalumBlockProperties.MALIGNANT_LEAD_BLOCK()));
 
     public static final RegistryObject<Block> BLOCK_OF_SOUL_STAINED_STEEL = BLOCKS.register("block_of_soul_stained_steel", () -> new Block(MalumBlockProperties.SOUL_STAINED_STEEL_BLOCK()));

src/main/java/com/sammy/malum/registry/common/item/ItemRegistry.java

@@ -469,6 +469,9 @@ public static <T extends Item> RegistryObject<T> register(String name, Item.Prop
     public static final RegistryObject<Item> BLOCK_OF_HEX_ASH = register("block_of_hex_ash", DEFAULT_PROPERTIES(), (p) -> new BlockItem(BlockRegistry.BLOCK_OF_HEX_ASH.get(), p));
     public static final RegistryObject<Item> HEX_ASH = register("hex_ash", DEFAULT_PROPERTIES(), Item::new);
 
+    public static final RegistryObject<Item> BLOCK_OF_LIVING_FLESH = register("block_of_living_flesh", DEFAULT_PROPERTIES(), (p) -> new BlockItem(BlockRegistry.BLOCK_OF_LIVING_FLESH.get(), p));
+    public static final RegistryObject<Item> LIVING_FLESH = register("living_flesh", DEFAULT_PROPERTIES(), Item::new);
+
     public static final RegistryObject<Item> BLOCK_OF_ALCHEMICAL_CALX = register("block_of_alchemical_calx", DEFAULT_PROPERTIES(), (p) -> new BlockItem(BlockRegistry.BLOCK_OF_ALCHEMICAL_CALX.get(), p));
     public static final RegistryObject<Item> ALCHEMICAL_CALX = register("alchemical_calx", DEFAULT_PROPERTIES(), Item::new);
 
@@ -484,15 +487,16 @@ public static <T extends Item> RegistryObject<T> register(String name, Item.Prop
     public static final RegistryObject<Item> BLOCK_OF_MNEMONIC_FRAGMENT = register("block_of_mnemonic_fragment", DEFAULT_PROPERTIES(), (p) -> new BlockItem(BlockRegistry.BLOCK_OF_MNEMONIC_FRAGMENT.get(), p));
     public static final RegistryObject<Item> MNEMONIC_FRAGMENT = register("mnemonic_fragment", DEFAULT_PROPERTIES(), Item::new);
 
+    public static final RegistryObject<Item> BLOCK_OF_FOUL_FLESH = register("block_of_foul_flesh", DEFAULT_PROPERTIES(), (p) -> new BlockItem(BlockRegistry.BLOCK_OF_FOUL_FLESH.get(), p));
     public static final RegistryObject<Item> FOUL_FLESH = register("foul_flesh", DEFAULT_PROPERTIES(), Item::new);
+
     public static final RegistryObject<Item> AURIC_EMBERS = register("auric_embers", DEFAULT_PROPERTIES(), Item::new);
     public static final RegistryObject<Item> BLOCK_OF_MALIGNANT_LEAD = register("block_of_malignant_lead", DEFAULT_PROPERTIES(), (p) -> new BlockItem(BlockRegistry.BLOCK_OF_MALIGNANT_LEAD.get(), p));
     public static final RegistryObject<Item> MALIGNANT_LEAD = register("malignant_lead", DEFAULT_PROPERTIES().rarity(RARE), Item::new);
 
     public static final RegistryObject<Item> MASS_OF_BLIGHTED_GUNK = register("mass_of_blighted_gunk", DEFAULT_PROPERTIES(), (p) -> new BlockItem(BlockRegistry.MASS_OF_BLIGHTED_GUNK.get(), p));
     public static final RegistryObject<Item> BLIGHTED_GUNK = register("blighted_gunk", DEFAULT_PROPERTIES(), (p) -> new BlightedGunkItem(BlockRegistry.BLIGHTED_GROWTH.get(), BlockRegistry.CLINGING_BLIGHT.get(), p));
 
-    public static final RegistryObject<Item> LIVING_FLESH = register("living_flesh", DEFAULT_PROPERTIES(), Item::new);
     public static final RegistryObject<Item> SPIRIT_FABRIC = register("spirit_fabric", DEFAULT_PROPERTIES(), Item::new);
     public static final RegistryObject<Item> SPECTRAL_LENS = register("spectral_lens", DEFAULT_PROPERTIES(), Item::new);
     public static final RegistryObject<Item> SPECTRAL_OPTIC = register("spectral_optic", DEFAULT_PROPERTIES(), Item::new);