remove remain blocks as items and adjust creative tab

TeamLapen · Oct 31, 2023 · a3eab45 · a3eab45
1 parent 7def14b
commit a3eab45
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/main/java/de/teamlapen/vampirism/core/ModBlocks.java b/src/main/java/de/teamlapen/vampirism/core/ModBlocks.java
@@ -159,16 +159,16 @@ public class ModBlocks {
     public static final RegistryObject<Block> CASTLE_BLOCK_DARK_BRICK_CRACKED = registerWithItem("castle_block_dark_brick_cracked", () -> new CastleBricksBlock(CastleBricksBlock.EnumVariant.CRACKED_DARK_BRICK));
     public static final RegistryObject<WallBlock> CASTLE_BLOCK_DARK_BRICK_WALL = registerWithItem("castle_block_dark_brick_wall", () -> new WallBlock(BlockBehaviour.Properties.copy(ModBlocks.CASTLE_BLOCK_DARK_BRICK.get()).forceSolidOn()));
     public static final RegistryObject<WallBlock> CASTLE_BLOCK_PURPLE_BRICK_WALL = registerWithItem("castle_block_purple_brick_wall", () -> new WallBlock(BlockBehaviour.Properties.copy(ModBlocks.CASTLE_BLOCK_PURPLE_BRICK.get()).forceSolidOn()));
-    public static final RegistryObject<RemainsBlock> REMAINS = registerWithItem("remains", () -> new RemainsBlock(BlockBehaviour.Properties.of().mapColor(MapColor.TERRACOTTA_BROWN).strength(-1, 3600000.0F).sound(SoundType.ROOTED_DIRT).randomTicks().noLootTable(), false, false));
-    public static final RegistryObject<RemainsBlock> VULNERABLE_REMAINS = registerWithItem("vulnerable_remains", () -> new RemainsBlock(BlockBehaviour.Properties.of().mapColor(MapColor.TERRACOTTA_BROWN).strength(-1, 3600000.0F).sound(SoundType.ROOTED_DIRT).randomTicks().noLootTable(), true, true));
-    public static final RegistryObject<RemainsBlock> INCAPACITATED_VULNERABLE_REMAINS = registerWithItem("incapacitated_vulnerable_remains", () -> new RemainsBlock(BlockBehaviour.Properties.of().mapColor(MapColor.TERRACOTTA_BROWN).strength(-1.0F, 3600000.0F).sound(SoundType.ROOTED_DIRT).randomTicks().noLootTable(), false, true));
+    public static final RegistryObject<RemainsBlock> REMAINS = BLOCKS.register("remains", () -> new RemainsBlock(BlockBehaviour.Properties.of().mapColor(MapColor.TERRACOTTA_BROWN).strength(-1, 3600000.0F).sound(SoundType.ROOTED_DIRT).randomTicks().noLootTable(), false, false));
+    public static final RegistryObject<RemainsBlock> VULNERABLE_REMAINS = BLOCKS.register("vulnerable_remains", () -> new RemainsBlock(BlockBehaviour.Properties.of().mapColor(MapColor.TERRACOTTA_BROWN).strength(-1, 3600000.0F).sound(SoundType.ROOTED_DIRT).randomTicks().noLootTable(), true, true));
+    public static final RegistryObject<RemainsBlock> INCAPACITATED_VULNERABLE_REMAINS = BLOCKS.register("incapacitated_vulnerable_remains", () -> new RemainsBlock(BlockBehaviour.Properties.of().mapColor(MapColor.TERRACOTTA_BROWN).strength(-1.0F, 3600000.0F).sound(SoundType.ROOTED_DIRT).randomTicks().noLootTable(), false, true));
     public static final RegistryObject<ActiveVulnerableRemainsBlock> ACTIVE_VULNERABLE_REMAINS = BLOCKS.register("active_vulnerable_remains", () -> new ActiveVulnerableRemainsBlock(BlockBehaviour.Properties.of().mapColor(MapColor.TERRACOTTA_BROWN).strength(-1, 3600000.0F).randomTicks().sound(SoundType.ROOTED_DIRT).noLootTable()));
     public static final RegistryObject<HangingRootsBlock> CURSED_HANGING_ROOTS = registerWithItem("cursed_hanging_roots", () -> {
         var block = new HangingRootsBlock(BlockBehaviour.Properties.of().mapColor(MapColor.TERRACOTTA_BROWN).noCollission().instabreak().sound(SoundType.GRASS).offsetType(BlockBehaviour.OffsetType.XZ).ignitedByLava().pushReaction(PushReaction.DESTROY));
         ((FireBlock) Blocks.FIRE).setFlammable(block, 30, 60);
         return block;
     });
-    public static final RegistryObject<MotherBlock> MOTHER = registerWithItem("mother", MotherBlock::new); //TODO remove item, add models/textures
+    public static final RegistryObject<MotherBlock> MOTHER = BLOCKS.register("mother", MotherBlock::new); //TODO remove item, add models/textures
 
 
     /**

diff --git a/src/main/java/de/teamlapen/vampirism/misc/VampirismCreativeTab.java b/src/main/java/de/teamlapen/vampirism/misc/VampirismCreativeTab.java
@@ -96,6 +96,7 @@ private void addItems() {
             addItem(PURE_SALT);
 
             addItem(SOUL_ORB_VAMPIRE);
+            addItem(MOTHER_CORE);
             addItem(VAMPIRE_BLOOD_BOTTLE);
             addGen(VAMPIRE_BOOK);
             addItem(VAMPIRE_FANG);
@@ -156,6 +157,7 @@ private void addPlantBlocks() {
             addBlock(DARK_SPRUCE_SAPLING);
             addBlock(CURSED_SPRUCE_SAPLING);
             addBlock(CURSED_ROOTS);
+            addBlock(CURSED_HANGING_ROOTS);
             addBlock(VAMPIRE_ORCHID);
             addBlock(DARK_SPRUCE_LEAVES);
             addBlock(DIRECT_CURSED_BARK);