diff --git a/src/main/java/com/skdevstudios/util_rings/UtilRings.java b/src/main/java/com/skdevstudios/util_rings/UtilRings.java index 48277fb..fb1000d 100644 --- a/src/main/java/com/skdevstudios/util_rings/UtilRings.java +++ b/src/main/java/com/skdevstudios/util_rings/UtilRings.java @@ -1,5 +1,6 @@ package com.skdevstudios.util_rings; +import com.skdevstudios.util_rings.init.BlockInit; import com.skdevstudios.util_rings.init.CreativeTabInit; import com.skdevstudios.util_rings.init.ItemsInit; @@ -22,6 +23,8 @@ public class UtilRings IEventBus modEventBus = FMLJavaModLoadingContext.get().getModEventBus(); //Register the Items ItemsInit.ITEMS.register(modEventBus); + //Register the Blocks + BlockInit.BLOCKS.register(modEventBus); //Register the Creative Tabs CreativeTabInit.CREATIVE_MODE_TABS.register(modEventBus); // Register the Event Bus diff --git a/src/main/java/com/skdevstudios/util_rings/init/BlockInit.java b/src/main/java/com/skdevstudios/util_rings/init/BlockInit.java new file mode 100644 index 0000000..5007fcd --- /dev/null +++ b/src/main/java/com/skdevstudios/util_rings/init/BlockInit.java @@ -0,0 +1,16 @@ +package com.skdevstudios.util_rings.init; + +import com.skdevstudios.util_rings.UtilRings; + +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.Blocks; +import net.minecraft.world.level.block.state.BlockBehaviour; +import net.minecraftforge.registries.DeferredRegister; +import net.minecraftforge.registries.ForgeRegistries; +import net.minecraftforge.registries.RegistryObject; + +public class BlockInit { + public static final DeferredRegister BLOCKS = DeferredRegister.create(ForgeRegistries.BLOCKS, UtilRings.MODID); + + public static final RegistryObject LEAD_ORE = BLOCKS.register("lead_ore", () -> new Block(BlockBehaviour.Properties.copy(Blocks.IRON_ORE))); +} diff --git a/src/main/java/com/skdevstudios/util_rings/init/CreativeTabInit.java b/src/main/java/com/skdevstudios/util_rings/init/CreativeTabInit.java index 6fb30cd..2e74159 100644 --- a/src/main/java/com/skdevstudios/util_rings/init/CreativeTabInit.java +++ b/src/main/java/com/skdevstudios/util_rings/init/CreativeTabInit.java @@ -17,12 +17,32 @@ public class CreativeTabInit { public static final RegistryObject UTIL_RINGS_TAB = CREATIVE_MODE_TABS.register("rings_tab", () -> CreativeModeTab.builder() .title(Component.translatable("itemGroup.rings_tab")) .withTabsBefore(CreativeModeTabs.COMBAT) - .icon(() -> ItemsInit.IRON_RING.get().getDefaultInstance()) + .icon(() -> ItemsInit.JEWELERS_HAMMER.get().getDefaultInstance()) .displayItems((parameters, output) -> { output.accept(ItemsInit.IRON_RING.get()); + output.accept(ItemsInit.IRON_RING_LEFT.get()); + output.accept(ItemsInit.IRON_RING_TOP.get()); + output.accept(ItemsInit.IRON_RING_BOTTOM.get()); + output.accept(ItemsInit.IRON_RING_RIGHT.get()); + output.accept(ItemsInit.JEWELERS_HAMMER.get()); + output.accept(ItemsInit.LEAD_DUST.get()); + output.accept(ItemsInit.LEAD_NUGGET.get()); + output.accept(ItemsInit.LEAD_INGOT.get()); + output.accept(ItemsInit.TIN_DUST.get()); + output.accept(ItemsInit.TIN_NUGGET.get()); + output.accept(ItemsInit.TIN_INGOT.get()); + output.accept(ItemsInit.PINE_TAR.get()); + output.accept(ItemsInit.PINE_CONE.get()); + output.accept(ItemsInit.ROSIN_SOLUTION.get()); + output.accept(ItemsInit.ROSIN.get()); + output.accept(ItemsInit.SOLDER_BLEND.get()); + output.accept(ItemsInit.SOLDER_SHOT.get()); + output.accept(ItemsInit.SOLDER_SPOOL.get()); + output.accept(ItemsInit.SOLDER_WIRE.get()); output.accept(ItemsInit.VOLCANIC_GLASS_RING.get()); output.accept(ItemsInit.MAGNET_RING.get()); output.accept(ItemsInit.GROWTH_RING.get()); + output.accept(BlockInit.LEAD_ORE.get()); }) .build() ); diff --git a/src/main/java/com/skdevstudios/util_rings/init/ItemsInit.java b/src/main/java/com/skdevstudios/util_rings/init/ItemsInit.java index 2125827..aa46716 100644 --- a/src/main/java/com/skdevstudios/util_rings/init/ItemsInit.java +++ b/src/main/java/com/skdevstudios/util_rings/init/ItemsInit.java @@ -5,6 +5,7 @@ import com.skdevstudios.util_rings.items.GrowthRing; import com.skdevstudios.util_rings.items.MagnetRing; import com.skdevstudios.util_rings.items.VolcanicGlassRing; +import net.minecraft.world.item.BlockItem; import net.minecraft.world.item.Item; import net.minecraftforge.registries.DeferredRegister; import net.minecraftforge.registries.ForgeRegistries; @@ -15,8 +16,28 @@ public class ItemsInit { public static final DeferredRegister ITEMS = DeferredRegister.create(ForgeRegistries.ITEMS, UtilRings.MODID); public static final RegistryObject IRON_RING = ITEMS.register("iron_ring", () -> new Item(new Item.Properties().stacksTo(1))); + public static final RegistryObject IRON_RING_LEFT = ITEMS.register("iron_ring_left", () -> new Item(new Item.Properties().stacksTo(1))); + public static final RegistryObject IRON_RING_TOP = ITEMS.register("iron_ring_top", () -> new Item(new Item.Properties().stacksTo(1))); + public static final RegistryObject IRON_RING_BOTTOM = ITEMS.register("iron_ring_bottom", () -> new Item(new Item.Properties().stacksTo(1))); + public static final RegistryObject IRON_RING_RIGHT = ITEMS.register("iron_ring_right", () -> new Item(new Item.Properties().stacksTo(1))); + public static final RegistryObject JEWELERS_HAMMER = ITEMS.register("jewelers_hammer", () -> new Item(new Item.Properties().stacksTo(1))); + public static final RegistryObject LEAD_DUST = ITEMS.register("lead_dust", () -> new Item(new Item.Properties().stacksTo(1))); + public static final RegistryObject LEAD_NUGGET = ITEMS.register("lead_nugget", () -> new Item(new Item.Properties().stacksTo(1))); + public static final RegistryObject LEAD_INGOT = ITEMS.register("lead_ingot", () -> new Item(new Item.Properties().stacksTo(1))); + public static final RegistryObject TIN_DUST = ITEMS.register("tin_dust", () -> new Item(new Item.Properties().stacksTo(1))); + public static final RegistryObject TIN_NUGGET = ITEMS.register("tin_nugget", () -> new Item(new Item.Properties().stacksTo(1))); + public static final RegistryObject TIN_INGOT = ITEMS.register("tin_ingot", () -> new Item(new Item.Properties().stacksTo(1))); + public static final RegistryObject PINE_TAR = ITEMS.register("pine_tar", () -> new Item(new Item.Properties().stacksTo(1))); + public static final RegistryObject PINE_CONE = ITEMS.register("pine_cone", () -> new Item(new Item.Properties().stacksTo(1))); + public static final RegistryObject ROSIN_SOLUTION = ITEMS.register("rosin_solution", () -> new Item(new Item.Properties().stacksTo(1))); + public static final RegistryObject ROSIN = ITEMS.register("rosin", () -> new Item(new Item.Properties().stacksTo(1))); + public static final RegistryObject SOLDER_BLEND = ITEMS.register("solder_blend", () -> new Item(new Item.Properties().stacksTo(1))); + public static final RegistryObject SOLDER_SHOT = ITEMS.register("solder_shot", () -> new Item(new Item.Properties().stacksTo(1))); + public static final RegistryObject SOLDER_SPOOL = ITEMS.register("solder_spool", () -> new Item(new Item.Properties().stacksTo(1))); + public static final RegistryObject SOLDER_WIRE = ITEMS.register("solder_wire", () -> new Item(new Item.Properties().stacksTo(1))); public static final RegistryObject VOLCANIC_GLASS_RING = ITEMS.register("volcanic_glass_ring", () -> new VolcanicGlassRing(new Item.Properties().stacksTo(1))); public static final RegistryObject MAGNET_RING = ITEMS.register("magnet_ring", () -> new MagnetRing(new Item.Properties().stacksTo(1))); public static final RegistryObject GROWTH_RING = ITEMS.register("growth_ring", () -> new GrowthRing(new Item.Properties().stacksTo(1))); + public static final RegistryObject LEAD_ORE_ITEM = ITEMS.register("lead_ore", () -> new BlockItem(BlockInit.LEAD_ORE.get(), new Item.Properties())); } diff --git a/src/main/resources/assets/util_rings/blockstates/lead_ore.json b/src/main/resources/assets/util_rings/blockstates/lead_ore.json new file mode 100644 index 0000000..1be7ff2 --- /dev/null +++ b/src/main/resources/assets/util_rings/blockstates/lead_ore.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "util_rings:block/lead_ore" + } + } +} diff --git a/src/main/resources/assets/util_rings/lang/en_us.json b/src/main/resources/assets/util_rings/lang/en_us.json index 0e34c79..5617a50 100644 --- a/src/main/resources/assets/util_rings/lang/en_us.json +++ b/src/main/resources/assets/util_rings/lang/en_us.json @@ -3,5 +3,25 @@ "item.util_rings.volcanic_glass_ring": "Ring of Volcanic Glass", "item.util_rings.magnet_ring": "Ring of Magnatism", "item.util_rings.growth_ring": "Ring of Accelerated Growth", + "item.util_rings.iron_ring_right": "Iron Ring Parts Right", + "item.util_rings.iron_ring_top": "Iron Ring Parts Top", + "item.util_rings.iron_ring_bottom": "Iron Ring Parts Bottom", + "item.util_rings.iron_ring_left": "Iron Ring Parts Left", + "item.util_rings.jewelers_hammer": "Jewelers Hammer", + "item.util_rings.lead_dust": "Lead Dust", + "item.util_rings.lead_nugget": "Lead Nugget", + "item.util_rings.lead_ingot": "Lead Ingot", + "item.util_rings.pine_tar": "Pine Tar", + "item.util_rings.pine_cone": "Pine Cone", + "item.util_rings.rosin_solution": "Rosin Solution", + "item.util_rings.rosin": "Rosin", + "item.util_rings.solder_blend": "Solder Blend", + "item.util_rings.solder_shot": "Solder Shot", + "item.util_rings.solder_spool": "Solder Spool", + "item.util_rings.solder_wire": "Solder Wire", + "item.util_rings.tin_dust": "Tin Dust", + "item.util_rings.tin_nugget": "Tin Nugget", + "item.util_rings.tin_ingot": "Tin Ingot", + "block.util_rings.lead_ore": "Lead Ore", "itemGroup.rings_tab": "Utility Rings" } \ No newline at end of file diff --git a/src/main/resources/assets/util_rings/models/block/lead_ore.json b/src/main/resources/assets/util_rings/models/block/lead_ore.json new file mode 100644 index 0000000..8215f4c --- /dev/null +++ b/src/main/resources/assets/util_rings/models/block/lead_ore.json @@ -0,0 +1,6 @@ +{ + "parent":"minecraft:block/cube_all", + "textures":{ + "all":"util_rings:block/lead_ore" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/util_rings/models/item/iron_ring_bottom.json b/src/main/resources/assets/util_rings/models/item/iron_ring_bottom.json new file mode 100644 index 0000000..51fed54 --- /dev/null +++ b/src/main/resources/assets/util_rings/models/item/iron_ring_bottom.json @@ -0,0 +1,6 @@ +{ + "parent":"minecraft:item/generated", + "textures":{ + "layer0":"util_rings:item/iron_ring_bottom" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/util_rings/models/item/iron_ring_left.json b/src/main/resources/assets/util_rings/models/item/iron_ring_left.json new file mode 100644 index 0000000..bc00e79 --- /dev/null +++ b/src/main/resources/assets/util_rings/models/item/iron_ring_left.json @@ -0,0 +1,6 @@ +{ + "parent":"minecraft:item/generated", + "textures":{ + "layer0":"util_rings:item/iron_ring_left" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/util_rings/models/item/iron_ring_right.json b/src/main/resources/assets/util_rings/models/item/iron_ring_right.json new file mode 100644 index 0000000..ec867c5 --- /dev/null +++ b/src/main/resources/assets/util_rings/models/item/iron_ring_right.json @@ -0,0 +1,6 @@ +{ + "parent":"minecraft:item/generated", + "textures":{ + "layer0":"util_rings:item/iron_ring_right" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/util_rings/models/item/iron_ring_top.json b/src/main/resources/assets/util_rings/models/item/iron_ring_top.json new file mode 100644 index 0000000..7af5b6e --- /dev/null +++ b/src/main/resources/assets/util_rings/models/item/iron_ring_top.json @@ -0,0 +1,6 @@ +{ + "parent":"minecraft:item/generated", + "textures":{ + "layer0":"util_rings:item/iron_ring_top" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/util_rings/models/item/jewelers_hammer.json b/src/main/resources/assets/util_rings/models/item/jewelers_hammer.json new file mode 100644 index 0000000..351fd9b --- /dev/null +++ b/src/main/resources/assets/util_rings/models/item/jewelers_hammer.json @@ -0,0 +1,6 @@ +{ + "parent":"minecraft:item/generated", + "textures":{ + "layer0":"util_rings:item/jewelers_hammer" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/util_rings/models/item/lead_dust.json b/src/main/resources/assets/util_rings/models/item/lead_dust.json new file mode 100644 index 0000000..b9aabbb --- /dev/null +++ b/src/main/resources/assets/util_rings/models/item/lead_dust.json @@ -0,0 +1,6 @@ +{ + "parent":"minecraft:item/generated", + "textures":{ + "layer0":"util_rings:item/lead_dust" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/util_rings/models/item/lead_ingot.json b/src/main/resources/assets/util_rings/models/item/lead_ingot.json new file mode 100644 index 0000000..1b742aa --- /dev/null +++ b/src/main/resources/assets/util_rings/models/item/lead_ingot.json @@ -0,0 +1,6 @@ +{ + "parent":"minecraft:item/generated", + "textures":{ + "layer0":"util_rings:item/lead_ingot" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/util_rings/models/item/lead_nugget.json b/src/main/resources/assets/util_rings/models/item/lead_nugget.json new file mode 100644 index 0000000..e5fc321 --- /dev/null +++ b/src/main/resources/assets/util_rings/models/item/lead_nugget.json @@ -0,0 +1,6 @@ +{ + "parent":"minecraft:item/generated", + "textures":{ + "layer0":"util_rings:item/lead_nugget" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/util_rings/models/item/lead_ore.json b/src/main/resources/assets/util_rings/models/item/lead_ore.json new file mode 100644 index 0000000..18f03ca --- /dev/null +++ b/src/main/resources/assets/util_rings/models/item/lead_ore.json @@ -0,0 +1,3 @@ +{ + "parent": "util_rings:block/lead_ore" +} \ No newline at end of file diff --git a/src/main/resources/assets/util_rings/models/item/pine_cone.json b/src/main/resources/assets/util_rings/models/item/pine_cone.json new file mode 100644 index 0000000..fcd230b --- /dev/null +++ b/src/main/resources/assets/util_rings/models/item/pine_cone.json @@ -0,0 +1,6 @@ +{ + "parent":"minecraft:item/generated", + "textures":{ + "layer0":"util_rings:item/pine_cone" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/util_rings/models/item/pine_tar.json b/src/main/resources/assets/util_rings/models/item/pine_tar.json new file mode 100644 index 0000000..2e553f4 --- /dev/null +++ b/src/main/resources/assets/util_rings/models/item/pine_tar.json @@ -0,0 +1,6 @@ +{ + "parent":"minecraft:item/generated", + "textures":{ + "layer0":"util_rings:item/pine_tar" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/util_rings/models/item/rosin.json b/src/main/resources/assets/util_rings/models/item/rosin.json new file mode 100644 index 0000000..883c1c6 --- /dev/null +++ b/src/main/resources/assets/util_rings/models/item/rosin.json @@ -0,0 +1,6 @@ +{ + "parent":"minecraft:item/generated", + "textures":{ + "layer0":"util_rings:item/rosin" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/util_rings/models/item/rosin_solution.json b/src/main/resources/assets/util_rings/models/item/rosin_solution.json new file mode 100644 index 0000000..cb07a4a --- /dev/null +++ b/src/main/resources/assets/util_rings/models/item/rosin_solution.json @@ -0,0 +1,6 @@ +{ + "parent":"minecraft:item/generated", + "textures":{ + "layer0":"util_rings:item/rosin_solution" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/util_rings/models/item/solder_blend.json b/src/main/resources/assets/util_rings/models/item/solder_blend.json new file mode 100644 index 0000000..a1304b3 --- /dev/null +++ b/src/main/resources/assets/util_rings/models/item/solder_blend.json @@ -0,0 +1,6 @@ +{ + "parent":"minecraft:item/generated", + "textures":{ + "layer0":"util_rings:item/solder_blend" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/util_rings/models/item/solder_shot.json b/src/main/resources/assets/util_rings/models/item/solder_shot.json new file mode 100644 index 0000000..c909ef2 --- /dev/null +++ b/src/main/resources/assets/util_rings/models/item/solder_shot.json @@ -0,0 +1,6 @@ +{ + "parent":"minecraft:item/generated", + "textures":{ + "layer0":"util_rings:item/solder_shot" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/util_rings/models/item/solder_spool.json b/src/main/resources/assets/util_rings/models/item/solder_spool.json new file mode 100644 index 0000000..0d71b2e --- /dev/null +++ b/src/main/resources/assets/util_rings/models/item/solder_spool.json @@ -0,0 +1,6 @@ +{ + "parent":"minecraft:item/generated", + "textures":{ + "layer0":"util_rings:item/solder_spool" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/util_rings/models/item/solder_wire.json b/src/main/resources/assets/util_rings/models/item/solder_wire.json new file mode 100644 index 0000000..5f74bde --- /dev/null +++ b/src/main/resources/assets/util_rings/models/item/solder_wire.json @@ -0,0 +1,6 @@ +{ + "parent":"minecraft:item/generated", + "textures":{ + "layer0":"util_rings:item/solder_wire" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/util_rings/models/item/tin_dust.json b/src/main/resources/assets/util_rings/models/item/tin_dust.json new file mode 100644 index 0000000..6f41f53 --- /dev/null +++ b/src/main/resources/assets/util_rings/models/item/tin_dust.json @@ -0,0 +1,6 @@ +{ + "parent":"minecraft:item/generated", + "textures":{ + "layer0":"util_rings:item/tin_dust" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/util_rings/models/item/tin_ingot.json b/src/main/resources/assets/util_rings/models/item/tin_ingot.json new file mode 100644 index 0000000..35f3470 --- /dev/null +++ b/src/main/resources/assets/util_rings/models/item/tin_ingot.json @@ -0,0 +1,6 @@ +{ + "parent":"minecraft:item/generated", + "textures":{ + "layer0":"util_rings:item/tin_ingot" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/util_rings/models/item/tin_nugget.json b/src/main/resources/assets/util_rings/models/item/tin_nugget.json new file mode 100644 index 0000000..ea4299a --- /dev/null +++ b/src/main/resources/assets/util_rings/models/item/tin_nugget.json @@ -0,0 +1,6 @@ +{ + "parent":"minecraft:item/generated", + "textures":{ + "layer0":"util_rings:item/tin_nugget" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/util_rings/textures/block/ore_lead.png b/src/main/resources/assets/util_rings/textures/block/lead_ore.png similarity index 100% rename from src/main/resources/assets/util_rings/textures/block/ore_lead.png rename to src/main/resources/assets/util_rings/textures/block/lead_ore.png diff --git a/src/main/resources/assets/util_rings/textures/block/ore_tin.png b/src/main/resources/assets/util_rings/textures/block/tin_ore.png similarity index 100% rename from src/main/resources/assets/util_rings/textures/block/ore_tin.png rename to src/main/resources/assets/util_rings/textures/block/tin_ore.png diff --git a/src/main/resources/assets/util_rings/textures/item/iron_ring right.png b/src/main/resources/assets/util_rings/textures/item/iron_ring_right.png similarity index 100% rename from src/main/resources/assets/util_rings/textures/item/iron_ring right.png rename to src/main/resources/assets/util_rings/textures/item/iron_ring_right.png diff --git a/src/main/resources/assets/util_rings/textures/item/pinecone.png b/src/main/resources/assets/util_rings/textures/item/pine_cone.png similarity index 100% rename from src/main/resources/assets/util_rings/textures/item/pinecone.png rename to src/main/resources/assets/util_rings/textures/item/pine_cone.png