diff --git a/src/main/java/us/minecraftchest2/hdm_mod/Hdm_mod.java b/src/main/java/us/minecraftchest2/hdm_mod/Hdm_mod.java index 6b1a7d5..69b2566 100644 --- a/src/main/java/us/minecraftchest2/hdm_mod/Hdm_mod.java +++ b/src/main/java/us/minecraftchest2/hdm_mod/Hdm_mod.java @@ -16,6 +16,7 @@ import net.minecraftforge.fml.event.server.FMLServerStartingEvent; import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import us.minecraftchest2.hdm_mod.block.ModBlocks; import us.minecraftchest2.hdm_mod.item.ModItems; //import us.minecraftchest2.hdm_mod.init.ItemInit; @@ -34,6 +35,7 @@ public class Hdm_mod { IEventBus modEventBus1 = FMLJavaModLoadingContext.get().getModEventBus(); ModItems.register(modEventBus1); + ModBlocks.register(modEventBus1); modEventBus1.addListener(this::setup); // Register the enqueueIMC method for modloading diff --git a/src/main/java/us/minecraftchest2/hdm_mod/block/ModBlocks.java b/src/main/java/us/minecraftchest2/hdm_mod/block/ModBlocks.java new file mode 100644 index 0000000..61f2017 --- /dev/null +++ b/src/main/java/us/minecraftchest2/hdm_mod/block/ModBlocks.java @@ -0,0 +1,42 @@ +package us.minecraftchest2.hdm_mod.block; + +import net.minecraft.block.AbstractBlock; +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; +import net.minecraft.item.BlockItem; +import net.minecraft.item.Item; +import net.minecraftforge.eventbus.api.IEventBus; +import net.minecraftforge.fml.RegistryObject; +import net.minecraftforge.registries.DeferredRegister; +import net.minecraftforge.registries.ForgeRegistries; +import us.minecraftchest2.hdm_mod.Hdm_mod; +import us.minecraftchest2.hdm_mod.item.ModItems; +import us.minecraftchest2.hdm_mod.item.ModItemGroup; + +import java.util.function.Supplier; + +public class ModBlocks { + public static final DeferredRegister BLOCKS = DeferredRegister.create(ForgeRegistries.BLOCKS, Hdm_mod.MOD_ID); + + + public static final RegistryObject DUST_BLOCK = registerBlock("block_of_dust", + () -> new Block(AbstractBlock.Properties.create(Material.ROCK).doesNotBlockMovement().harvestLevel(0) + .hardnessAndResistance(5f))); + + + private static RegistryObject registerBlock(String name, Supplier block) { + RegistryObject toReturn = BLOCKS.register(name, block); + registerBlockItem(name, toReturn); + return toReturn; + } + + private static void registerBlockItem(String name, RegistryObject block) { + ModItems.ITEMS.register(name, () -> new BlockItem(block.get(), + new Item.Properties().group(ModItemGroup.HDM_BLOCK_GROUP))); + } + + public static void register(IEventBus eventBus){ + BLOCKS.register(eventBus); + } + +} diff --git a/src/main/java/us/minecraftchest2/hdm_mod/item/ModItemGroup.java b/src/main/java/us/minecraftchest2/hdm_mod/item/ModItemGroup.java new file mode 100644 index 0000000..72a2f3e --- /dev/null +++ b/src/main/java/us/minecraftchest2/hdm_mod/item/ModItemGroup.java @@ -0,0 +1,21 @@ +package us.minecraftchest2.hdm_mod.item; + +import net.minecraft.item.ItemGroup; +import net.minecraft.item.ItemStack; +import us.minecraftchest2.hdm_mod.block.ModBlocks; + +public class ModItemGroup { + public static final ItemGroup HDM_ITEM_GROUP = new ItemGroup("hdmModItemTab") { + @Override + public ItemStack createIcon() + { + return new ItemStack(ModItems.DUST.get()); + } + }; + public static final ItemGroup HDM_BLOCK_GROUP = new ItemGroup("hdmModBlockTab") { + @Override + public ItemStack createIcon() { + return new ItemStack(ModBlocks.DUST_BLOCK.get()); + } + }; +} diff --git a/src/main/java/us/minecraftchest2/hdm_mod/item/ModItems.java b/src/main/java/us/minecraftchest2/hdm_mod/item/ModItems.java index 3ce4632..97d50de 100644 --- a/src/main/java/us/minecraftchest2/hdm_mod/item/ModItems.java +++ b/src/main/java/us/minecraftchest2/hdm_mod/item/ModItems.java @@ -1,7 +1,6 @@ package us.minecraftchest2.hdm_mod.item; import net.minecraft.item.Item; -import net.minecraft.item.ItemGroup; import net.minecraftforge.eventbus.api.IEventBus; import net.minecraftforge.fml.RegistryObject; import net.minecraftforge.registries.DeferredRegister; @@ -14,7 +13,10 @@ public class ModItems { DeferredRegister.create(ForgeRegistries.ITEMS, Hdm_mod.MOD_ID); public static final RegistryObject DUST = ITEMS.register("dust", - () -> new Item(new Item.Properties().isImmuneToFire().maxStackSize(65).group(ItemGroup.MATERIALS))); + () -> new Item(new Item.Properties().isImmuneToFire().maxStackSize(42).group(ModItemGroup.HDM_ITEM_GROUP))); + +// public static final RegistryObject OMELET = ITEMS.register("omelet", +// () -> new Item(new Item.Properties().food())) diff --git a/src/main/resources/assets/hdm_mod/blockstates/block_of_dust.json b/src/main/resources/assets/hdm_mod/blockstates/block_of_dust.json new file mode 100644 index 0000000..a48f3bb --- /dev/null +++ b/src/main/resources/assets/hdm_mod/blockstates/block_of_dust.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": {"model": "hdm_mod:blocks/block_of_dust" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/hdm_mod/lang/en_us.json b/src/main/resources/assets/hdm_mod/lang/en_us.json index 9488c57..b4f159b 100644 --- a/src/main/resources/assets/hdm_mod/lang/en_us.json +++ b/src/main/resources/assets/hdm_mod/lang/en_us.json @@ -1,7 +1,9 @@ { - "itemGroup.hdm_mod": "HDM Mod Items", + "itemGroup.hdmModItemTab": "HDM Mod Items", + "itemGroup.hdmModBlockTab": "HDM Mod Blocks", "item.hdm_mod.knife": "Subtle Knife", "item.hdm_mod.omelet": "Omelet", - "item.hdm_mod.dust": "Dust" + "item.hdm_mod.dust": "Dust", + "block.hdm_mod.block_of_dust": "Block of Dust" } \ No newline at end of file diff --git a/src/main/resources/assets/hdm_mod/models/block/block_of_dust.json b/src/main/resources/assets/hdm_mod/models/block/block_of_dust.json new file mode 100644 index 0000000..6a83c41 --- /dev/null +++ b/src/main/resources/assets/hdm_mod/models/block/block_of_dust.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures" : { + "all": "hdm_mod:block/block_of_dust" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/hdm_mod/models/item/block_of_dust.json b/src/main/resources/assets/hdm_mod/models/item/block_of_dust.json new file mode 100644 index 0000000..7b54c84 --- /dev/null +++ b/src/main/resources/assets/hdm_mod/models/item/block_of_dust.json @@ -0,0 +1,3 @@ +{ + "parent": "hdm_mod:block/block_of_dust" +} \ No newline at end of file diff --git a/src/main/resources/assets/hdm_mod/textures/block/block_of_dust.png b/src/main/resources/assets/hdm_mod/textures/block/block_of_dust.png new file mode 100644 index 0000000..61fdb12 Binary files /dev/null and b/src/main/resources/assets/hdm_mod/textures/block/block_of_dust.png differ diff --git a/src/main/resources/assets/hdm_mod/textures/item/block_of_dust.png b/src/main/resources/assets/hdm_mod/textures/item/block_of_dust.png new file mode 100644 index 0000000..61fdb12 Binary files /dev/null and b/src/main/resources/assets/hdm_mod/textures/item/block_of_dust.png differ diff --git a/src/main/resources/assets/hdm_mod/textures/items/dust.png b/src/main/resources/assets/hdm_mod/textures/item/dust.png similarity index 100% rename from src/main/resources/assets/hdm_mod/textures/items/dust.png rename to src/main/resources/assets/hdm_mod/textures/item/dust.png diff --git a/src/main/resources/assets/hdm_mod/textures/items/knife.png b/src/main/resources/assets/hdm_mod/textures/item/knife.png similarity index 100% rename from src/main/resources/assets/hdm_mod/textures/items/knife.png rename to src/main/resources/assets/hdm_mod/textures/item/knife.png diff --git a/src/main/resources/assets/hdm_mod/textures/items/omelet.png b/src/main/resources/assets/hdm_mod/textures/item/omelet.png similarity index 100% rename from src/main/resources/assets/hdm_mod/textures/items/omelet.png rename to src/main/resources/assets/hdm_mod/textures/item/omelet.png diff --git a/src/main/resources/data/hdm_mod/loot_tables/blocks/block_of_dust.json b/src/main/resources/data/hdm_mod/loot_tables/blocks/block_of_dust.json new file mode 100644 index 0000000..3424ef6 --- /dev/null +++ b/src/main/resources/data/hdm_mod/loot_tables/blocks/block_of_dust.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries":[ + { + "type": "minecraft:item", + "name": "hdm_mod:dust" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/hdm_mod/recipies/block_of_dust.json b/src/main/resources/data/hdm_mod/recipies/block_of_dust.json new file mode 100644 index 0000000..6851e38 --- /dev/null +++ b/src/main/resources/data/hdm_mod/recipies/block_of_dust.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "###", + "###", + "###" + ], + "key": { + "#": { + "item": "hdm_mod:dust" + } + }, + "result": { + "item": "hdm_mod:block_of_dust" + } +} \ No newline at end of file