From 81955929d0bcb1bf9e4d07d3a78fd014d88faa04 Mon Sep 17 00:00:00 2001 From: Steven Date: Mon, 9 Oct 2023 07:18:57 -0400 Subject: [PATCH] added oregen --- .../skdevstudios/util_rings/UtilRings.java | 4 --- .../util_rings/block/PineLog.java | 2 +- .../util_rings/init/ItemsInit.java | 2 +- .../util_rings/init/PotionInit.java | 11 -------- .../assets/util_rings/lang/en_us.json | 3 +++ .../util_rings/models/item/raw_lead.json | 2 +- .../util_rings/models/item/raw_tin.json | 2 +- .../forge/biome_modifier/lead_ore.json | 6 +++++ .../forge/biome_modifier/tin_ore.json | 6 +++++ .../loot_tables/blocks/lead_ore.json | 2 +- .../loot_tables/blocks/tin_ore.json | 2 +- .../worldgen/configured_feature/lead_ore.json | 18 +++++++++++++ .../worldgen/configured_feature/tin_ore.json | 18 +++++++++++++ .../worldgen/placed_feature/lead_ore.json | 27 +++++++++++++++++++ .../worldgen/placed_feature/tin_ore.json | 27 +++++++++++++++++++ 15 files changed, 111 insertions(+), 21 deletions(-) delete mode 100644 src/main/java/com/skdevstudios/util_rings/init/PotionInit.java create mode 100644 src/main/resources/data/util_rings/forge/biome_modifier/lead_ore.json create mode 100644 src/main/resources/data/util_rings/forge/biome_modifier/tin_ore.json create mode 100644 src/main/resources/data/util_rings/worldgen/configured_feature/lead_ore.json create mode 100644 src/main/resources/data/util_rings/worldgen/configured_feature/tin_ore.json create mode 100644 src/main/resources/data/util_rings/worldgen/placed_feature/lead_ore.json create mode 100644 src/main/resources/data/util_rings/worldgen/placed_feature/tin_ore.json diff --git a/src/main/java/com/skdevstudios/util_rings/UtilRings.java b/src/main/java/com/skdevstudios/util_rings/UtilRings.java index 13f793e..fb1000d 100644 --- a/src/main/java/com/skdevstudios/util_rings/UtilRings.java +++ b/src/main/java/com/skdevstudios/util_rings/UtilRings.java @@ -3,7 +3,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; -import com.skdevstudios.util_rings.init.PotionInit; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.eventbus.api.IEventBus; @@ -26,11 +25,8 @@ 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 755477d..9cadff3 100644 --- a/src/main/java/com/skdevstudios/util_rings/block/PineLog.java +++ b/src/main/java/com/skdevstudios/util_rings/block/PineLog.java @@ -25,6 +25,6 @@ public class PineLog extends Block { @Override public BlockState getStateForPlacement(BlockPlaceContext context) { Direction direction = context.getHorizontalDirection(); - return this.defaultBlockState().setValue(AXIS, direction.getAxis()).setValue(FACING, direction); + return this.defaultBlockState().setValue(AXIS, direction.getAxis()); } } 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 803131a..70eb773 100644 --- a/src/main/java/com/skdevstudios/util_rings/init/ItemsInit.java +++ b/src/main/java/com/skdevstudios/util_rings/init/ItemsInit.java @@ -25,7 +25,7 @@ public class ItemsInit { 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 RAW_TIN = ITEMS.register("raw_tin", () -> 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))); diff --git a/src/main/java/com/skdevstudios/util_rings/init/PotionInit.java b/src/main/java/com/skdevstudios/util_rings/init/PotionInit.java deleted file mode 100644 index 70e1a3d..0000000 --- a/src/main/java/com/skdevstudios/util_rings/init/PotionInit.java +++ /dev/null @@ -1,11 +0,0 @@ -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/resources/assets/util_rings/lang/en_us.json b/src/main/resources/assets/util_rings/lang/en_us.json index bfe70f4..5724002 100644 --- a/src/main/resources/assets/util_rings/lang/en_us.json +++ b/src/main/resources/assets/util_rings/lang/en_us.json @@ -7,6 +7,7 @@ "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.iron_plate": "Iron Plate", "item.util_rings.jewelers_hammer": "Jewelers Hammer", "item.util_rings.lead_dust": "Lead Dust", "item.util_rings.lead_nugget": "Lead Nugget", @@ -19,6 +20,8 @@ "item.util_rings.solder_shot": "Solder Shot", "item.util_rings.solder_spool": "Solder Spool", "item.util_rings.solder_wire": "Solder Wire", + "item.util_rings.raw_lead": "Raw Lead", + "item.util_rings.raw_tin": "Raw Tin", "item.util_rings.tin_dust": "Tin Dust", "item.util_rings.tin_nugget": "Tin Nugget", "item.util_rings.tin_ingot": "Tin Ingot", 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 index 5eb0e57..bb48865 100644 --- a/src/main/resources/assets/util_rings/models/item/raw_lead.json +++ b/src/main/resources/assets/util_rings/models/item/raw_lead.json @@ -1,6 +1,6 @@ { "parent":"minecraft:item/generated", "textures":{ - "layer0":"util_rings:item/iron_plate" + "layer0":"util_rings:item/raw_lead" } } \ 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 index 5eb0e57..8949805 100644 --- a/src/main/resources/assets/util_rings/models/item/raw_tin.json +++ b/src/main/resources/assets/util_rings/models/item/raw_tin.json @@ -1,6 +1,6 @@ { "parent":"minecraft:item/generated", "textures":{ - "layer0":"util_rings:item/iron_plate" + "layer0":"util_rings:item/raw_tin" } } \ No newline at end of file diff --git a/src/main/resources/data/util_rings/forge/biome_modifier/lead_ore.json b/src/main/resources/data/util_rings/forge/biome_modifier/lead_ore.json new file mode 100644 index 0000000..59d4413 --- /dev/null +++ b/src/main/resources/data/util_rings/forge/biome_modifier/lead_ore.json @@ -0,0 +1,6 @@ +{ + "type": "forge:add_features", + "features": "util_rings:lead_ore", + "biomes": "#minecraft:is_overworld", + "step": "underground_ores" +} \ No newline at end of file diff --git a/src/main/resources/data/util_rings/forge/biome_modifier/tin_ore.json b/src/main/resources/data/util_rings/forge/biome_modifier/tin_ore.json new file mode 100644 index 0000000..cd5a2bc --- /dev/null +++ b/src/main/resources/data/util_rings/forge/biome_modifier/tin_ore.json @@ -0,0 +1,6 @@ +{ + "type": "forge:add_features", + "features": "util_rings:tin_ore", + "biomes": "#minecraft:is_overworld", + "step": "underground_ores" +} \ No newline at end of file diff --git a/src/main/resources/data/util_rings/loot_tables/blocks/lead_ore.json b/src/main/resources/data/util_rings/loot_tables/blocks/lead_ore.json index 1134180..1c9fddc 100644 --- a/src/main/resources/data/util_rings/loot_tables/blocks/lead_ore.json +++ b/src/main/resources/data/util_rings/loot_tables/blocks/lead_ore.json @@ -7,7 +7,7 @@ "entries": [ { "type": "minecraft:item", - "name": "util_rings:lead_ore" + "name": "util_rings:raw_lead" } ], "conditions": [ diff --git a/src/main/resources/data/util_rings/loot_tables/blocks/tin_ore.json b/src/main/resources/data/util_rings/loot_tables/blocks/tin_ore.json index 15b1bcc..39acbdd 100644 --- a/src/main/resources/data/util_rings/loot_tables/blocks/tin_ore.json +++ b/src/main/resources/data/util_rings/loot_tables/blocks/tin_ore.json @@ -7,7 +7,7 @@ "entries": [ { "type": "minecraft:item", - "name": "util_rings:tin_ore" + "name": "util_rings:raw_tin" } ], "conditions": [ diff --git a/src/main/resources/data/util_rings/worldgen/configured_feature/lead_ore.json b/src/main/resources/data/util_rings/worldgen/configured_feature/lead_ore.json new file mode 100644 index 0000000..b943216 --- /dev/null +++ b/src/main/resources/data/util_rings/worldgen/configured_feature/lead_ore.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:ore", + "config": { + "size": 9, + "discard_chance_on_air_exposure": 0, + "targets": [ + { + "target": { + "predicate_type": "minecraft:tag_match", + "tag": "minecraft:stone_ore_replaceables" + }, + "state": { + "Name": "util_rings:lead_ore" + } + } + ] + } +} diff --git a/src/main/resources/data/util_rings/worldgen/configured_feature/tin_ore.json b/src/main/resources/data/util_rings/worldgen/configured_feature/tin_ore.json new file mode 100644 index 0000000..57ac713 --- /dev/null +++ b/src/main/resources/data/util_rings/worldgen/configured_feature/tin_ore.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:ore", + "config": { + "size": 9, + "discard_chance_on_air_exposure": 0, + "targets": [ + { + "target": { + "predicate_type": "minecraft:tag_match", + "tag": "minecraft:stone_ore_replaceables" + }, + "state": { + "Name": "util_rings:tin_ore" + } + } + ] + } +} diff --git a/src/main/resources/data/util_rings/worldgen/placed_feature/lead_ore.json b/src/main/resources/data/util_rings/worldgen/placed_feature/lead_ore.json new file mode 100644 index 0000000..bd9e05d --- /dev/null +++ b/src/main/resources/data/util_rings/worldgen/placed_feature/lead_ore.json @@ -0,0 +1,27 @@ +{ + "feature": "util_rings:lead_ore", + "placement": [ + { + "type": "minecraft:count", + "count": 10 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:height_range", + "height": { + "type": "minecraft:trapezoid", + "min_inclusive": { + "absolute": -24 + }, + "max_inclusive": { + "absolute": 56 + } + } + }, + { + "type": "minecraft:biome" + } + ] +} diff --git a/src/main/resources/data/util_rings/worldgen/placed_feature/tin_ore.json b/src/main/resources/data/util_rings/worldgen/placed_feature/tin_ore.json new file mode 100644 index 0000000..627c448 --- /dev/null +++ b/src/main/resources/data/util_rings/worldgen/placed_feature/tin_ore.json @@ -0,0 +1,27 @@ +{ + "feature": "util_rings:tin_ore", + "placement": [ + { + "type": "minecraft:count", + "count": 10 + }, + { + "type": "minecraft:in_square" + }, + { + "type": "minecraft:height_range", + "height": { + "type": "minecraft:trapezoid", + "min_inclusive": { + "absolute": -24 + }, + "max_inclusive": { + "absolute": 56 + } + } + }, + { + "type": "minecraft:biome" + } + ] +}