From f9bc47b143297bdffc50dd739e194ff66cc85502 Mon Sep 17 00:00:00 2001 From: Steven Date: Mon, 2 Oct 2023 20:17:31 -0400 Subject: [PATCH] fixed no texture load on pine log added tin ore --- .../java/com/skdevstudios/util_rings/init/BlockInit.java | 2 ++ .../com/skdevstudios/util_rings/init/CreativeTabInit.java | 3 +++ .../java/com/skdevstudios/util_rings/init/ItemsInit.java | 2 ++ .../resources/assets/util_rings/blockstates/pine_log.json | 7 +++++++ .../resources/assets/util_rings/blockstates/tin_ore.json | 7 +++++++ src/main/resources/assets/util_rings/lang/en_us.json | 2 ++ .../resources/assets/util_rings/models/block/pine_log.json | 6 ++++++ .../resources/assets/util_rings/models/block/tin_ore.json | 6 ++++++ .../resources/assets/util_rings/models/item/pine_log.json | 3 +++ .../resources/assets/util_rings/models/item/tin_ore.json | 3 +++ 10 files changed, 41 insertions(+) create mode 100644 src/main/resources/assets/util_rings/blockstates/pine_log.json create mode 100644 src/main/resources/assets/util_rings/blockstates/tin_ore.json create mode 100644 src/main/resources/assets/util_rings/models/block/pine_log.json create mode 100644 src/main/resources/assets/util_rings/models/block/tin_ore.json create mode 100644 src/main/resources/assets/util_rings/models/item/pine_log.json create mode 100644 src/main/resources/assets/util_rings/models/item/tin_ore.json diff --git a/src/main/java/com/skdevstudios/util_rings/init/BlockInit.java b/src/main/java/com/skdevstudios/util_rings/init/BlockInit.java index 5007fcd..ccb73ea 100644 --- a/src/main/java/com/skdevstudios/util_rings/init/BlockInit.java +++ b/src/main/java/com/skdevstudios/util_rings/init/BlockInit.java @@ -13,4 +13,6 @@ 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))); + public static final RegistryObject TIN_ORE = BLOCKS.register("tin_ore", () -> new Block(BlockBehaviour.Properties.copy(Blocks.IRON_ORE))); + public static final RegistryObject PINE_LOG = BLOCKS.register("pine_log", () -> new Block(BlockBehaviour.Properties.copy(Blocks.STONE))); } 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 2e74159..344d338 100644 --- a/src/main/java/com/skdevstudios/util_rings/init/CreativeTabInit.java +++ b/src/main/java/com/skdevstudios/util_rings/init/CreativeTabInit.java @@ -43,6 +43,9 @@ public class CreativeTabInit { output.accept(ItemsInit.MAGNET_RING.get()); output.accept(ItemsInit.GROWTH_RING.get()); output.accept(BlockInit.LEAD_ORE.get()); + output.accept(BlockInit.TIN_ORE.get()); + output.accept(BlockInit.PINE_LOG.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 aa46716..173dc20 100644 --- a/src/main/java/com/skdevstudios/util_rings/init/ItemsInit.java +++ b/src/main/java/com/skdevstudios/util_rings/init/ItemsInit.java @@ -39,5 +39,7 @@ public class ItemsInit { 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())); + public static final RegistryObject TIN_ORE_ITEM = ITEMS.register("tin_ore", () -> new BlockItem(BlockInit.TIN_ORE.get(), new Item.Properties())); + public static final RegistryObject PINE_LOG_ITEM = ITEMS.register("pine_log", () -> new BlockItem(BlockInit.PINE_LOG.get(), new Item.Properties())); } diff --git a/src/main/resources/assets/util_rings/blockstates/pine_log.json b/src/main/resources/assets/util_rings/blockstates/pine_log.json new file mode 100644 index 0000000..df3d9bb --- /dev/null +++ b/src/main/resources/assets/util_rings/blockstates/pine_log.json @@ -0,0 +1,7 @@ +{ + "variants": { + "":{ + "model": "util_rings:block/pine_log" + } + } +} diff --git a/src/main/resources/assets/util_rings/blockstates/tin_ore.json b/src/main/resources/assets/util_rings/blockstates/tin_ore.json new file mode 100644 index 0000000..744de43 --- /dev/null +++ b/src/main/resources/assets/util_rings/blockstates/tin_ore.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "util_rings:block/tin_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 5617a50..bbe5da1 100644 --- a/src/main/resources/assets/util_rings/lang/en_us.json +++ b/src/main/resources/assets/util_rings/lang/en_us.json @@ -23,5 +23,7 @@ "item.util_rings.tin_nugget": "Tin Nugget", "item.util_rings.tin_ingot": "Tin Ingot", "block.util_rings.lead_ore": "Lead Ore", + "block.util_rings.tin_ore": "Tin Ore", + "block.util_rings.pine_log": "Pine Log", "itemGroup.rings_tab": "Utility Rings" } \ No newline at end of file diff --git a/src/main/resources/assets/util_rings/models/block/pine_log.json b/src/main/resources/assets/util_rings/models/block/pine_log.json new file mode 100644 index 0000000..20a2a1b --- /dev/null +++ b/src/main/resources/assets/util_rings/models/block/pine_log.json @@ -0,0 +1,6 @@ +{ + "parent":"minecraft:block/cube_all", + "textures":{ + "all":"util_rings:block/pine/log" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/util_rings/models/block/tin_ore.json b/src/main/resources/assets/util_rings/models/block/tin_ore.json new file mode 100644 index 0000000..8763155 --- /dev/null +++ b/src/main/resources/assets/util_rings/models/block/tin_ore.json @@ -0,0 +1,6 @@ +{ + "parent":"minecraft:block/cube_all", + "textures":{ + "all":"util_rings:block/tin_ore" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/util_rings/models/item/pine_log.json b/src/main/resources/assets/util_rings/models/item/pine_log.json new file mode 100644 index 0000000..bbf16e3 --- /dev/null +++ b/src/main/resources/assets/util_rings/models/item/pine_log.json @@ -0,0 +1,3 @@ +{ + "parent": "util_rings:block/pine_log" +} \ No newline at end of file diff --git a/src/main/resources/assets/util_rings/models/item/tin_ore.json b/src/main/resources/assets/util_rings/models/item/tin_ore.json new file mode 100644 index 0000000..64e302d --- /dev/null +++ b/src/main/resources/assets/util_rings/models/item/tin_ore.json @@ -0,0 +1,3 @@ +{ + "parent": "util_rings:block/tin_ore" +} \ No newline at end of file