From d194f35dc5dd59ba011837985588d93903405f39 Mon Sep 17 00:00:00 2001 From: Steven Date: Fri, 6 Oct 2023 01:01:18 -0400 Subject: [PATCH] added missing recipes and items --- .../skdevstudios/util_rings/UtilRings.java | 4 +++ .../util_rings/block/PineLog.java | 2 +- .../util_rings/init/CreativeTabInit.java | 3 ++ .../util_rings/init/ItemsInit.java | 27 ++++++++++-------- .../util_rings/init/PotionInit.java | 11 +++++++ .../util_rings/items/VolcanicGlassRing.java | 1 - .../util_rings/blockstates/pine_log.json | 6 ++-- .../util_rings/models/item/iron_plate.json | 6 ++++ .../util_rings/models/item/raw_lead.json | 6 ++++ .../util_rings/models/item/raw_tin.json | 6 ++++ .../util_rings/textures/item/iron_plate.png | Bin 0 -> 188 bytes .../util_rings/textures/item/raw_lead.png | Bin 0 -> 224 bytes .../util_rings/textures/item/raw_tin.png | Bin 0 -> 812 bytes .../data/util_rings/recipes/iron_plate.json | 12 ++++++++ .../data/util_rings/recipes/iron_ring.json | 24 ++++++++++++---- .../util_rings/recipes/iron_ring_bottom.json | 20 +++++++++++++ .../util_rings/recipes/iron_ring_left.json | 20 +++++++++++++ .../util_rings/recipes/iron_ring_right.json | 20 +++++++++++++ .../util_rings/recipes/iron_ring_top.json | 20 +++++++++++++ .../util_rings/recipes/jewelers_hammer.json | 20 +++++++++++++ .../data/util_rings/recipes/lead_dust.json | 15 ++++++++++ .../data/util_rings/recipes/lead_nugget.json | 12 ++++++++ .../data/util_rings/recipes/rosin.json | 12 ++++++++ .../util_rings/recipes/rosin_solution.json | 13 +++++++++ .../data/util_rings/recipes/solder_blend.json | 20 +++++++++++++ .../recipes/solder_from_blasting.json | 10 +++++++ .../data/util_rings/recipes/solder_spool.json | 20 +++++++++++++ .../data/util_rings/recipes/solder_wire.json | 12 ++++++++ .../data/util_rings/recipes/tin_dust.json | 15 ++++++++++ .../data/util_rings/recipes/tin_nugget.json | 12 ++++++++ 30 files changed, 326 insertions(+), 23 deletions(-) create mode 100644 src/main/java/com/skdevstudios/util_rings/init/PotionInit.java create mode 100644 src/main/resources/assets/util_rings/models/item/iron_plate.json create mode 100644 src/main/resources/assets/util_rings/models/item/raw_lead.json create mode 100644 src/main/resources/assets/util_rings/models/item/raw_tin.json create mode 100644 src/main/resources/assets/util_rings/textures/item/iron_plate.png create mode 100644 src/main/resources/assets/util_rings/textures/item/raw_lead.png create mode 100644 src/main/resources/assets/util_rings/textures/item/raw_tin.png create mode 100644 src/main/resources/data/util_rings/recipes/iron_plate.json create mode 100644 src/main/resources/data/util_rings/recipes/iron_ring_bottom.json create mode 100644 src/main/resources/data/util_rings/recipes/iron_ring_left.json create mode 100644 src/main/resources/data/util_rings/recipes/iron_ring_right.json create mode 100644 src/main/resources/data/util_rings/recipes/iron_ring_top.json create mode 100644 src/main/resources/data/util_rings/recipes/jewelers_hammer.json create mode 100644 src/main/resources/data/util_rings/recipes/lead_dust.json create mode 100644 src/main/resources/data/util_rings/recipes/lead_nugget.json create mode 100644 src/main/resources/data/util_rings/recipes/rosin.json create mode 100644 src/main/resources/data/util_rings/recipes/rosin_solution.json create mode 100644 src/main/resources/data/util_rings/recipes/solder_blend.json create mode 100644 src/main/resources/data/util_rings/recipes/solder_from_blasting.json create mode 100644 src/main/resources/data/util_rings/recipes/solder_spool.json create mode 100644 src/main/resources/data/util_rings/recipes/solder_wire.json create mode 100644 src/main/resources/data/util_rings/recipes/tin_dust.json create mode 100644 src/main/resources/data/util_rings/recipes/tin_nugget.json diff --git a/src/main/java/com/skdevstudios/util_rings/UtilRings.java b/src/main/java/com/skdevstudios/util_rings/UtilRings.java index fb1000d..13f793e 100644 --- a/src/main/java/com/skdevstudios/util_rings/UtilRings.java +++ b/src/main/java/com/skdevstudios/util_rings/UtilRings.java @@ -3,6 +3,7 @@ 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; +import com.skdevstudios.util_rings.init.PotionInit; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.eventbus.api.IEventBus; @@ -25,8 +26,11 @@ public class UtilRings ItemsInit.ITEMS.register(modEventBus); //Register the Blocks BlockInit.BLOCKS.register(modEventBus); + //Register the Potions + PotionInit.POTIONS.register(modEventBus); //Register the Creative Tabs CreativeTabInit.CREATIVE_MODE_TABS.register(modEventBus); + // Register the Event Bus MinecraftForge.EVENT_BUS.register(this); //Register the Config diff --git a/src/main/java/com/skdevstudios/util_rings/block/PineLog.java b/src/main/java/com/skdevstudios/util_rings/block/PineLog.java index 76a16bc..755477d 100644 --- a/src/main/java/com/skdevstudios/util_rings/block/PineLog.java +++ b/src/main/java/com/skdevstudios/util_rings/block/PineLog.java @@ -10,7 +10,7 @@ import net.minecraft.world.level.block.state.properties.EnumProperty; public class PineLog extends Block { public static final EnumProperty AXIS = BlockStateProperties.AXIS; - public static final DirectionProperty FACING = DirectionProperty.create("facing", Direction.Plane.HORIZONTAL); + public static final DirectionProperty FACING = DirectionProperty.create("facing", Direction.values()); public PineLog(Properties properties) { super(properties); 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 feec275..4a6a0cf 100644 --- a/src/main/java/com/skdevstudios/util_rings/init/CreativeTabInit.java +++ b/src/main/java/com/skdevstudios/util_rings/init/CreativeTabInit.java @@ -42,6 +42,9 @@ public class CreativeTabInit { output.accept(ItemsInit.VOLCANIC_GLASS_RING.get()); output.accept(ItemsInit.MAGNET_RING.get()); output.accept(ItemsInit.GROWTH_RING.get()); + output.accept(ItemsInit.IRON_PLATE.get()); + output.accept(ItemsInit.RAW_TIN.get()); + output.accept(ItemsInit.RAW_LEAD.get()); output.accept(BlockInit.LEAD_ORE.get()); output.accept(BlockInit.TIN_ORE.get()); output.accept(BlockInit.PINE_LOG.get()); 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 a7bce4b..803131a 100644 --- a/src/main/java/com/skdevstudios/util_rings/init/ItemsInit.java +++ b/src/main/java/com/skdevstudios/util_rings/init/ItemsInit.java @@ -21,20 +21,23 @@ public class ItemsInit { 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 RAW_LEAD = ITEMS.register("raw_lead", () -> new Item(new Item.Properties().stacksTo(64))); + public static final RegistryObject LEAD_DUST = ITEMS.register("lead_dust", () -> new Item(new Item.Properties().stacksTo(64))); + public static final RegistryObject LEAD_NUGGET = ITEMS.register("lead_nugget", () -> new Item(new Item.Properties().stacksTo(64))); + public static final RegistryObject LEAD_INGOT = ITEMS.register("lead_ingot", () -> new Item(new Item.Properties().stacksTo(64))); + public static final RegistryObject RAW_TIN = ITEMS.register("raw_lead", () -> new Item(new Item.Properties().stacksTo(64))); + public static final RegistryObject TIN_DUST = ITEMS.register("tin_dust", () -> new Item(new Item.Properties().stacksTo(64))); + public static final RegistryObject TIN_NUGGET = ITEMS.register("tin_nugget", () -> new Item(new Item.Properties().stacksTo(64))); + public static final RegistryObject TIN_INGOT = ITEMS.register("tin_ingot", () -> new Item(new Item.Properties().stacksTo(64))); + public static final RegistryObject PINE_TAR = ITEMS.register("pine_tar", () -> new Item(new Item.Properties().stacksTo(64))); + public static final RegistryObject PINE_CONE = ITEMS.register("pine_cone", () -> new Item(new Item.Properties().stacksTo(64))); 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 ROSIN = ITEMS.register("rosin", () -> new Item(new Item.Properties().stacksTo(64))); + public static final RegistryObject SOLDER_BLEND = ITEMS.register("solder_blend", () -> new Item(new Item.Properties().stacksTo(64))); + public static final RegistryObject SOLDER_SHOT = ITEMS.register("solder_shot", () -> new Item(new Item.Properties().stacksTo(64))); 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 SOLDER_WIRE = ITEMS.register("solder_wire", () -> new Item(new Item.Properties().stacksTo(64))); + public static final RegistryObject IRON_PLATE = ITEMS.register("iron_plate", () -> new Item(new Item.Properties().stacksTo(64))); 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))); diff --git a/src/main/java/com/skdevstudios/util_rings/init/PotionInit.java b/src/main/java/com/skdevstudios/util_rings/init/PotionInit.java new file mode 100644 index 0000000..70e1a3d --- /dev/null +++ b/src/main/java/com/skdevstudios/util_rings/init/PotionInit.java @@ -0,0 +1,11 @@ +package com.skdevstudios.util_rings.init; + +import com.skdevstudios.util_rings.UtilRings; + +import net.minecraft.world.item.alchemy.Potion; +import net.minecraftforge.registries.DeferredRegister; +import net.minecraftforge.registries.ForgeRegistries; + +public class PotionInit { + public static final DeferredRegister POTIONS = DeferredRegister.create(ForgeRegistries.POTIONS, UtilRings.MODID); +} diff --git a/src/main/java/com/skdevstudios/util_rings/items/VolcanicGlassRing.java b/src/main/java/com/skdevstudios/util_rings/items/VolcanicGlassRing.java index 3e1902c..10294a1 100644 --- a/src/main/java/com/skdevstudios/util_rings/items/VolcanicGlassRing.java +++ b/src/main/java/com/skdevstudios/util_rings/items/VolcanicGlassRing.java @@ -17,7 +17,6 @@ public class VolcanicGlassRing extends Item implements ICurioItem { public VolcanicGlassRing(Item.Properties properties) { super(properties); } - @Override public InteractionResult useOn(UseOnContext context) { Level world = context.getLevel(); diff --git a/src/main/resources/assets/util_rings/blockstates/pine_log.json b/src/main/resources/assets/util_rings/blockstates/pine_log.json index 2101620..e881b79 100644 --- a/src/main/resources/assets/util_rings/blockstates/pine_log.json +++ b/src/main/resources/assets/util_rings/blockstates/pine_log.json @@ -1,7 +1,7 @@ { "variants": { - "axis=x": { "model": "util_rings:block/pine_log", "x": 0, "y":90 }, - "axis=y": { "model": "util_rings:block/pine_log", "x": 0, "y":90}, - "axis=z": { "model": "util_rings:block/pine_log", "x": 0, "y": 0 } + "axis=x": { "model": "util_rings:block/pine_log", "x": 90, "y":90 }, + "axis=y": { "model": "util_rings:block/pine_log", "x":0,"y":0}, + "axis=z": { "model": "util_rings:block/pine_log", "x": 90, "y": 0 } } } \ No newline at end of file diff --git a/src/main/resources/assets/util_rings/models/item/iron_plate.json b/src/main/resources/assets/util_rings/models/item/iron_plate.json new file mode 100644 index 0000000..5eb0e57 --- /dev/null +++ b/src/main/resources/assets/util_rings/models/item/iron_plate.json @@ -0,0 +1,6 @@ +{ + "parent":"minecraft:item/generated", + "textures":{ + "layer0":"util_rings:item/iron_plate" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/util_rings/models/item/raw_lead.json b/src/main/resources/assets/util_rings/models/item/raw_lead.json new file mode 100644 index 0000000..5eb0e57 --- /dev/null +++ b/src/main/resources/assets/util_rings/models/item/raw_lead.json @@ -0,0 +1,6 @@ +{ + "parent":"minecraft:item/generated", + "textures":{ + "layer0":"util_rings:item/iron_plate" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/util_rings/models/item/raw_tin.json b/src/main/resources/assets/util_rings/models/item/raw_tin.json new file mode 100644 index 0000000..5eb0e57 --- /dev/null +++ b/src/main/resources/assets/util_rings/models/item/raw_tin.json @@ -0,0 +1,6 @@ +{ + "parent":"minecraft:item/generated", + "textures":{ + "layer0":"util_rings:item/iron_plate" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/util_rings/textures/item/iron_plate.png b/src/main/resources/assets/util_rings/textures/item/iron_plate.png new file mode 100644 index 0000000000000000000000000000000000000000..8eb9742d7951e9093c1e574fb71bdf420c747059 GIT binary patch literal 188 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd7G?$phPQVgfdp969eo`c7&i8E|4C$JU|^64 z@Ck8cU|{(F|No5}H&(1zQB+hE7Z(>15n*a-y0=Qfj)8%Ju_VYZn8D%MjWh-Z1}9G! z$B>F!$qHgiR2ww6nIszvy^1`mLznX$_;a_~PnT`en)7e$Hm|ms*;x5~-qq!|9DC*(Tc=H#&Sq>- zCKX*Wg^km|z${!>k3W>j@RWGFl_t|x?rGC!TX8W+_B>qLq%f<|&?JN*sd<4y*I9;o YFPXp>H~w@pFfcH9y85}Sb4q9e0P|r;W&i*H literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/util_rings/textures/item/raw_tin.png b/src/main/resources/assets/util_rings/textures/item/raw_tin.png new file mode 100644 index 0000000000000000000000000000000000000000..68f909ec53ae9689e36e78c2e3976fbe8f30ae0b GIT binary patch literal 812 zcmV+{1JnG8P)EX>4Tx04R}tkv&MmKpe$i(`uzu9PA+CkfC<6;1}X3RV;#q(pG5I!Q|2}Xws0R zxHt-~1qVMCs}3&Cx;nTDg5U>;tBaGOiAe zt%Z+(fopV2qvfWccJu;%vG+Q;bwkfE-YZ-9eC zAX234^)B!3>+J2{Gp+u90G!lvxR{C`ng9R*24YJ`L;wH)H2{T1G3%=U000SaNLh0L z01FcU01FcV0GgZ_00007bV*G`2j>a~1StgUY&FRM000?uMObu0Z*6U5Zgc=ca%Ew3 zWn>_CX>@2HM@dakSAh-}00034Nkl@=F6@661Z0RJ7yZ-+{$^K-9hn&c}1rPNv1wO^NI31bYj){#i^ zlu-!b_c`YP0AmaQKx^%*NkUi%;V+Nl7{TK>f{4&{9RPrcKtyyV}?s;cs4 zrD=MB!}z%yVOWJT%UbJUmpvMzl=1|Cq9`J