diff --git a/src/main/java/net/rayanfox/fenrisevo/block/ModBlocks.java b/src/main/java/net/rayanfox/fenrisevo/block/ModBlocks.java index 56fb5ce..757d57e 100644 --- a/src/main/java/net/rayanfox/fenrisevo/block/ModBlocks.java +++ b/src/main/java/net/rayanfox/fenrisevo/block/ModBlocks.java @@ -17,6 +17,8 @@ public class ModBlocks { new Block(FabricBlockSettings.copyOf(Blocks.IRON_BLOCK).sounds(BlockSoundGroup.AMETHYST_BLOCK))); public static final Block RAW_RUBY_BLOCK = registerBlock("raw_ruby_block", new Block(FabricBlockSettings.copyOf(Blocks.IRON_BLOCK).sounds(BlockSoundGroup.TUFF))); +public static final Block FENITE_ORE = registerBlock("fenite_ore", + new Block(FabricBlockSettings.copyOf(Blocks.IRON_BLOCK).sounds(BlockSoundGroup.TUFF))); private static Block registerBlock(String name, Block block){ registerBlockItem(name , block); diff --git a/src/main/java/net/rayanfox/fenrisevo/item/ModItemGroups.java b/src/main/java/net/rayanfox/fenrisevo/item/ModItemGroups.java index e442ba7..44b9740 100644 --- a/src/main/java/net/rayanfox/fenrisevo/item/ModItemGroups.java +++ b/src/main/java/net/rayanfox/fenrisevo/item/ModItemGroups.java @@ -15,12 +15,22 @@ public class ModItemGroups { new Identifier(Fenrisevolution.MOD_ID, "ruby" ), FabricItemGroup.builder().displayName(Text.translatable("itemgroup.ruby")) .icon(() -> new ItemStack(ModItems.RUBY)).entries((displayContext, entries) -> { + + //items + entries.add(ModItems.DEBUG); entries.add(ModItems.RUBY); entries.add(ModItems.RAW_RUBY); + entries.add(ModItems.FENITE); + entries.add(ModItems.PINK_POW); + + //blocks + entries.add(ModBlocks.RUBY_BLOCK); + entries.add(ModBlocks.FENITE_ORE); entries.add(ModBlocks.RAW_RUBY_BLOCK); + }).build()); public static void registerItemGroups(){ diff --git a/src/main/java/net/rayanfox/fenrisevo/item/ModItems.java b/src/main/java/net/rayanfox/fenrisevo/item/ModItems.java index eb4e468..6800435 100644 --- a/src/main/java/net/rayanfox/fenrisevo/item/ModItems.java +++ b/src/main/java/net/rayanfox/fenrisevo/item/ModItems.java @@ -17,10 +17,16 @@ public class ModItems { public static final Item RUBY = registerItem("ruby", new Item(new FabricItemSettings())); public static final Item RAW_RUBY = registerItem("raw_ruby", new Item(new FabricItemSettings())); + public static final Item FENITE = registerItem("fenite", new Item(new FabricItemSettings())); + public static final Item PINK_POW = registerItem("pink_pow", new Item(new FabricItemSettings())); + public static final Item DEBUG = registerItem("debug", new Item(new FabricItemSettings())); + private static void addItemsToIngrendientTabItemGroup(FabricItemGroupEntries entries){ entries.add(RUBY); entries.add(RAW_RUBY); + entries.add(FENITE); entries.add(ModBlocks.RUBY_BLOCK); + entries.add(ModBlocks.RAW_RUBY_BLOCK); } private static Item registerItem(String name, Item item){ diff --git a/src/main/resources/assets/fenrisevolution/blockstates/fenite_ore.json b/src/main/resources/assets/fenrisevolution/blockstates/fenite_ore.json new file mode 100644 index 0000000..a554349 --- /dev/null +++ b/src/main/resources/assets/fenrisevolution/blockstates/fenite_ore.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "fenrisevolution:block/fenite_ore" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/fenrisevolution/models/block/fenite_ore.json b/src/main/resources/assets/fenrisevolution/models/block/fenite_ore.json new file mode 100644 index 0000000..8f4c8fc --- /dev/null +++ b/src/main/resources/assets/fenrisevolution/models/block/fenite_ore.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "fenrisevolution:block/fenite_ore" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/fenrisevolution/models/item/debug.json b/src/main/resources/assets/fenrisevolution/models/item/debug.json new file mode 100644 index 0000000..8d04769 --- /dev/null +++ b/src/main/resources/assets/fenrisevolution/models/item/debug.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "fenrisevolution:item/debug" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/fenrisevolution/models/item/fenite.json b/src/main/resources/assets/fenrisevolution/models/item/fenite.json new file mode 100644 index 0000000..47e11d0 --- /dev/null +++ b/src/main/resources/assets/fenrisevolution/models/item/fenite.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "fenrisevolution:item/fenite" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/fenrisevolution/models/item/fenite_ore.json b/src/main/resources/assets/fenrisevolution/models/item/fenite_ore.json new file mode 100644 index 0000000..ec01db6 --- /dev/null +++ b/src/main/resources/assets/fenrisevolution/models/item/fenite_ore.json @@ -0,0 +1,3 @@ +{ + "parent": "fenrisevolution:block/fenite_ore" +} \ No newline at end of file diff --git a/src/main/resources/assets/fenrisevolution/models/item/pink_pow.json b/src/main/resources/assets/fenrisevolution/models/item/pink_pow.json new file mode 100644 index 0000000..792a2da --- /dev/null +++ b/src/main/resources/assets/fenrisevolution/models/item/pink_pow.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "fenrisevolution:item/pink_pow" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/fenrisevolution/textures/block/fenite_ore.png b/src/main/resources/assets/fenrisevolution/textures/block/fenite_ore.png new file mode 100644 index 0000000..a368c32 Binary files /dev/null and b/src/main/resources/assets/fenrisevolution/textures/block/fenite_ore.png differ diff --git a/src/main/resources/assets/fenrisevolution/textures/item/debug.png b/src/main/resources/assets/fenrisevolution/textures/item/debug.png new file mode 100644 index 0000000..b970ffc Binary files /dev/null and b/src/main/resources/assets/fenrisevolution/textures/item/debug.png differ diff --git a/src/main/resources/assets/fenrisevolution/textures/item/fenite.png b/src/main/resources/assets/fenrisevolution/textures/item/fenite.png new file mode 100644 index 0000000..fd9a084 Binary files /dev/null and b/src/main/resources/assets/fenrisevolution/textures/item/fenite.png differ diff --git a/src/main/resources/assets/fenrisevolution/textures/item/pink_pow.png b/src/main/resources/assets/fenrisevolution/textures/item/pink_pow.png new file mode 100644 index 0000000..0046e05 Binary files /dev/null and b/src/main/resources/assets/fenrisevolution/textures/item/pink_pow.png differ