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 0000000..8eb9742 Binary files /dev/null and b/src/main/resources/assets/util_rings/textures/item/iron_plate.png differ diff --git a/src/main/resources/assets/util_rings/textures/item/raw_lead.png b/src/main/resources/assets/util_rings/textures/item/raw_lead.png new file mode 100644 index 0000000..3611514 Binary files /dev/null and b/src/main/resources/assets/util_rings/textures/item/raw_lead.png differ 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 0000000..68f909e Binary files /dev/null and b/src/main/resources/assets/util_rings/textures/item/raw_tin.png differ diff --git a/src/main/resources/data/util_rings/recipes/iron_plate.json b/src/main/resources/data/util_rings/recipes/iron_plate.json new file mode 100644 index 0000000..24cf0ae --- /dev/null +++ b/src/main/resources/data/util_rings/recipes/iron_plate.json @@ -0,0 +1,12 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "minecraft:iron_ingot" + } + ], + "result": { + "item": "util_rings:iron_plate", + "count": 2 + } +} diff --git a/src/main/resources/data/util_rings/recipes/iron_ring.json b/src/main/resources/data/util_rings/recipes/iron_ring.json index 8b088cd..fe46376 100644 --- a/src/main/resources/data/util_rings/recipes/iron_ring.json +++ b/src/main/resources/data/util_rings/recipes/iron_ring.json @@ -1,16 +1,28 @@ { "type": "minecraft:crafting_shaped", "pattern": [ - "@#@", - "# #", - "@#@" + "%!%", + "#^$", + "%@%" ], "key": { - "#": { - "item": "minecraft:iron_ingot" + "!": { + "item": "util_rings:iron_ring_top" }, "@": { - "item": "minecraft:iron_nugget" + "item": "util_rings:iron_ring_bottom" + }, + "#": { + "item": "util_rings:iron_ring_left" + }, + "$": { + "item": "util_rings:iron_ring_right" + }, + "%": { + "item": "util_rings:solder_wire" + }, + "^": { + "item": "util_rings:jewelers_hammer" } }, "result": { diff --git a/src/main/resources/data/util_rings/recipes/iron_ring_bottom.json b/src/main/resources/data/util_rings/recipes/iron_ring_bottom.json new file mode 100644 index 0000000..1b3203d --- /dev/null +++ b/src/main/resources/data/util_rings/recipes/iron_ring_bottom.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + " ", + " # ", + " @ " + ], + "key": { + "@": { + "item": "util_rings:iron_plates" + }, + "#": { + "item": "util_rings:jewelers_hammer" + } + }, + "result": { + "item": "util_rings:iron_ring_bottom", + "count": 1 + } +} diff --git a/src/main/resources/data/util_rings/recipes/iron_ring_left.json b/src/main/resources/data/util_rings/recipes/iron_ring_left.json new file mode 100644 index 0000000..e25bc62 --- /dev/null +++ b/src/main/resources/data/util_rings/recipes/iron_ring_left.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + " ", + "@# ", + " " + ], + "key": { + "@": { + "item": "util_rings:iron_plates" + }, + "#": { + "item": "util_rings:jewelers_hammer" + } + }, + "result": { + "item": "util_rings:iron_ring_left", + "count": 1 + } +} diff --git a/src/main/resources/data/util_rings/recipes/iron_ring_right.json b/src/main/resources/data/util_rings/recipes/iron_ring_right.json new file mode 100644 index 0000000..5cff0d6 --- /dev/null +++ b/src/main/resources/data/util_rings/recipes/iron_ring_right.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + " ", + " #@", + " " + ], + "key": { + "@": { + "item": "util_rings:iron_plates" + }, + "#": { + "item": "util_rings:jewelers_hammer" + } + }, + "result": { + "item": "util_rings:iron_ring_right", + "count": 1 + } +} diff --git a/src/main/resources/data/util_rings/recipes/iron_ring_top.json b/src/main/resources/data/util_rings/recipes/iron_ring_top.json new file mode 100644 index 0000000..f3fbf3c --- /dev/null +++ b/src/main/resources/data/util_rings/recipes/iron_ring_top.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + " @ ", + " # ", + " " + ], + "key": { + "@": { + "item": "util_rings:iron_plates" + }, + "#": { + "item": "util_rings:jewelers_hammer" + } + }, + "result": { + "item": "util_rings:iron_ring_top", + "count": 1 + } +} diff --git a/src/main/resources/data/util_rings/recipes/jewelers_hammer.json b/src/main/resources/data/util_rings/recipes/jewelers_hammer.json new file mode 100644 index 0000000..d71887d --- /dev/null +++ b/src/main/resources/data/util_rings/recipes/jewelers_hammer.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "##", + "#!#", + " !" + ], + "key": { + "#": { + "item": "minecraft:deepslate" + }, + "!": { + "item": "minecraft:stick" + } + }, + "result": { + "item": "minecraft:stone" + } + } + \ No newline at end of file diff --git a/src/main/resources/data/util_rings/recipes/lead_dust.json b/src/main/resources/data/util_rings/recipes/lead_dust.json new file mode 100644 index 0000000..144d80c --- /dev/null +++ b/src/main/resources/data/util_rings/recipes/lead_dust.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "util_rings:lead_ingot" + }, + { + "item": "util_rings:jewelers_hammer" + } + ], + "result": { + "item": "util_rings:lead_dust", + "count": 1 + } +} diff --git a/src/main/resources/data/util_rings/recipes/lead_nugget.json b/src/main/resources/data/util_rings/recipes/lead_nugget.json new file mode 100644 index 0000000..1bc01c2 --- /dev/null +++ b/src/main/resources/data/util_rings/recipes/lead_nugget.json @@ -0,0 +1,12 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "util_rings:lead_ingot" + } + ], + "result": { + "item": "util_rings:lead_nugget", + "count": 1 + } +} diff --git a/src/main/resources/data/util_rings/recipes/rosin.json b/src/main/resources/data/util_rings/recipes/rosin.json new file mode 100644 index 0000000..6ef8893 --- /dev/null +++ b/src/main/resources/data/util_rings/recipes/rosin.json @@ -0,0 +1,12 @@ +{ + "type": "forge:brewing", + "input": { + "item": "util_rings:rosin_solution" + }, + "reagent": { + "item": "minecraft:empty" + }, + "output": { + "item": "util_rings:rosin" + } +} diff --git a/src/main/resources/data/util_rings/recipes/rosin_solution.json b/src/main/resources/data/util_rings/recipes/rosin_solution.json new file mode 100644 index 0000000..fd47142 --- /dev/null +++ b/src/main/resources/data/util_rings/recipes/rosin_solution.json @@ -0,0 +1,13 @@ +{ + "type": "forge:brewing", + "input": { + "item": "minecraft:potion", + "nbt": "{Potion:\"minecraft:water\"}" + }, + "reagent": { + "item": "util_rings:pine_tar" + }, + "output": { + "item": "util_rings:rosin_solution" + } +} diff --git a/src/main/resources/data/util_rings/recipes/solder_blend.json b/src/main/resources/data/util_rings/recipes/solder_blend.json new file mode 100644 index 0000000..68bd50f --- /dev/null +++ b/src/main/resources/data/util_rings/recipes/solder_blend.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "###", + "##@", + "@@@" + ], + "key": { + "@": { + "item": "util_rings:lead_dust" + }, + "#": { + "item": "util_rings:tin_dust" + } + }, + "result": { + "item": "util_rings:solder_blend", + "count": 9 + } +} diff --git a/src/main/resources/data/util_rings/recipes/solder_from_blasting.json b/src/main/resources/data/util_rings/recipes/solder_from_blasting.json new file mode 100644 index 0000000..8a219fd --- /dev/null +++ b/src/main/resources/data/util_rings/recipes/solder_from_blasting.json @@ -0,0 +1,10 @@ +{ + "type": "minecraft:blasting", + "ingredient": { + "item": "util_rings:solder_blend" + }, + "result": "util_rings:solder_shot", + "experience": 0.7, + "cookingtime": 100 +} + \ No newline at end of file diff --git a/src/main/resources/data/util_rings/recipes/solder_spool.json b/src/main/resources/data/util_rings/recipes/solder_spool.json new file mode 100644 index 0000000..d809602 --- /dev/null +++ b/src/main/resources/data/util_rings/recipes/solder_spool.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "###", + "#!#", + "###" + ], + "key": { + "#": { + "item": "util_rings:solder_wire" + }, + "!": { + "item": "minecraft:lime_concrete" + } + }, + "result": { + "item": "minecraft:stone" + } + } + \ No newline at end of file diff --git a/src/main/resources/data/util_rings/recipes/solder_wire.json b/src/main/resources/data/util_rings/recipes/solder_wire.json new file mode 100644 index 0000000..59c0bd4 --- /dev/null +++ b/src/main/resources/data/util_rings/recipes/solder_wire.json @@ -0,0 +1,12 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "util_rings:solder_shot" + } + ], + "result": { + "item": "util_rings:solder_wire", + "count": 9 + } +} diff --git a/src/main/resources/data/util_rings/recipes/tin_dust.json b/src/main/resources/data/util_rings/recipes/tin_dust.json new file mode 100644 index 0000000..7c06537 --- /dev/null +++ b/src/main/resources/data/util_rings/recipes/tin_dust.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "util_rings:tin_ingot" + }, + { + "item": "util_rings:jewelers_hammer" + } + ], + "result": { + "item": "util_rings:tin_dust", + "count": 1 + } +} diff --git a/src/main/resources/data/util_rings/recipes/tin_nugget.json b/src/main/resources/data/util_rings/recipes/tin_nugget.json new file mode 100644 index 0000000..a03dd95 --- /dev/null +++ b/src/main/resources/data/util_rings/recipes/tin_nugget.json @@ -0,0 +1,12 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "util_rings:tin_ingot" + } + ], + "result": { + "item": "util_rings:tin_nugget", + "count": 1 + } +}