Added sapling to item 'natural' vanilla item group, fixed loot table …

…for wall sign and wall hanging sign Signed-off-by: Jingy <[email protected]>
Jiingy · Nov 9, 2023 · 2386c70 · 2386c70
1 parent 2decc00
commit 2386c70
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/main/java/jingy/jineric/block/JinericBlocks.java b/src/main/java/jingy/jineric/block/JinericBlocks.java
@@ -359,9 +359,9 @@ public class JinericBlocks {
 	public static final Block PETRIFIED_OAK_LADDER = register("petrified_oak_ladder", new LadderBlock(FabricBlockSettings.copy(LADDER)));
 	public static final Block PETRIFIED_OAK_BOOKSHELF = register("petrified_oak_bookshelf", new Block(FabricBlockSettings.copy(BOOKSHELF)));
 	public static final Block PETRIFIED_OAK_SIGN = register("petrified_oak_sign", new JinericSignBlock(FabricBlockSettings.copy(OAK_SIGN), JinericWoodType.PETRIFIED_OAK));
-	public static final Block PETRIFIED_OAK_WALL_SIGN = register("petrified_oak_wall_sign", new JinericWallSignBlock(FabricBlockSettings.copy(OAK_WALL_SIGN), JinericWoodType.PETRIFIED_OAK));
+	public static final Block PETRIFIED_OAK_WALL_SIGN = register("petrified_oak_wall_sign", new JinericWallSignBlock(FabricBlockSettings.copy(OAK_WALL_SIGN).dropsLike(PETRIFIED_OAK_SIGN), JinericWoodType.PETRIFIED_OAK));
 	public static final Block PETRIFIED_OAK_HANGING_SIGN = register("petrified_oak_hanging_sign", new JinericHangingSignBlock(FabricBlockSettings.copy(OAK_HANGING_SIGN), JinericWoodType.PETRIFIED_OAK));
-	public static final Block PETRIFIED_OAK_WALL_HANGING_SIGN = register("petrified_oak_wall_hanging_sign", new JinericWallHangingSignBlock(FabricBlockSettings.copy(OAK_WALL_HANGING_SIGN), JinericWoodType.PETRIFIED_OAK));
+	public static final Block PETRIFIED_OAK_WALL_HANGING_SIGN = register("petrified_oak_wall_hanging_sign", new JinericWallHangingSignBlock(FabricBlockSettings.copy(OAK_WALL_HANGING_SIGN).dropsLike(PETRIFIED_OAK_HANGING_SIGN), JinericWoodType.PETRIFIED_OAK));
 
 	// LADDERS
 	public static final Block ACACIA_LADDER = register("acacia_ladder", new LadderBlock(FabricBlockSettings.copy(LADDER).sounds(BlockSoundGroup.CHERRY_WOOD)));

diff --git a/src/main/java/jingy/jineric/item/JinericItemGroups.java b/src/main/java/jingy/jineric/item/JinericItemGroups.java
@@ -1,8 +1,10 @@
 package jingy.jineric.item;
 
 import jingy.jineric.base.JinericMain;
+import jingy.jineric.block.JinericBlocks;
 import net.fabricmc.fabric.api.itemgroup.v1.FabricItemGroup;
 import net.fabricmc.fabric.api.itemgroup.v1.ItemGroupEvents;
+import net.minecraft.block.Blocks;
 import net.minecraft.item.ItemGroup;
 import net.minecraft.item.ItemGroups;
 import net.minecraft.item.ItemStack;
@@ -42,7 +44,7 @@ public static void registerJinericItemGroups() {
 							entries.add(JinericItems.PETRIFIED_OAK_PRESSURE_PLATE);
 							entries.add(JinericItems.PETRIFIED_OAK_BUTTON);
 							entries.add(JinericItems.PETRIFIED_OAK_LEAVES);
-//							entries.add(JinericItems.PETRIFIED_OAK_SAPLING);
+							entries.add(JinericItems.PETRIFIED_OAK_SAPLING);
 							entries.add(JinericItems.PETRIFIED_OAK_LADDER);
 							entries.add(JinericItems.PETRIFIED_OAK_BOOKSHELF);
 							entries.add(JinericItems.PETRIFIED_OAK_SIGN);
@@ -504,6 +506,7 @@ public static void registerItemGroups() {
 			entries.addBefore(Items.GRASS_BLOCK, JinericItems.FULL_GRASS_BLOCK);
 			entries.addAfter(Items.CHERRY_LOG, JinericItems.PETRIFIED_OAK_LOG);
 			entries.addAfter(Items.CHERRY_LEAVES, JinericItems.PETRIFIED_OAK_LEAVES);
+			entries.addAfter(Blocks.CHERRY_SAPLING, JinericBlocks.PETRIFIED_OAK_SAPLING);
 			//TODO: WORK OUT BLOCK SETS
 //			entries.addAfter(Items.PACKED_ICE, JinericItems.PACKED_ICE_STAIRS);
 //			entries.addAfter(JinericItems.PACKED_ICE_STAIRS, JinericItems.PACKED_ICE_SLAB);