diff --git a/src/main/generated/.cache/33f862717e26ec2d6360a91a8f02941f561a0223 b/src/main/generated/.cache/33f862717e26ec2d6360a91a8f02941f561a0223 index 76e2c9d..5a59354 100644 --- a/src/main/generated/.cache/33f862717e26ec2d6360a91a8f02941f561a0223 +++ b/src/main/generated/.cache/33f862717e26ec2d6360a91a8f02941f561a0223 @@ -1,4 +1,4 @@ -// 1.21 2024-07-14T17:43:11.1338435 Enriched/Tags for minecraft:block +// 1.21 2024-07-14T21:10:16.9369286 Enriched/Tags for minecraft:block 35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data\enriched\tags\block\incorrect_for_ruby_tool.json 5130353929cba072dacb3ab075642e95f0f7746f data\enriched\tags\block\redwood_logs.json cbffea030c16b76cef765b05e3c84e50fb62855a data\minecraft\tags\block\mineable\axe.json diff --git a/src/main/generated/.cache/3e0c651762a148941639324ba0d096b89d34fdb1 b/src/main/generated/.cache/3e0c651762a148941639324ba0d096b89d34fdb1 index f912357..bf3dba2 100644 --- a/src/main/generated/.cache/3e0c651762a148941639324ba0d096b89d34fdb1 +++ b/src/main/generated/.cache/3e0c651762a148941639324ba0d096b89d34fdb1 @@ -1,4 +1,4 @@ -// 1.21 2024-07-14T17:43:11.1328701 Enriched/Block Loot Tables +// 1.21 2024-07-14T21:10:16.9349215 Enriched/Block Loot Tables c2ea10b722d238b6880fb7a966b95763936ee841 data\enriched\loot_table\blocks\stripped_redwood_log.json 07071d860b4d954cf2062f585b7a7533b2b649e7 data\enriched\loot_table\blocks\ruby_block.json ef7d6cd573ec68595300d1b951d5709476960456 data\enriched\loot_table\blocks\polished_dark_granite_slab.json diff --git a/src/main/generated/.cache/437931636ae53790c576ca0719d52da14c131efd b/src/main/generated/.cache/437931636ae53790c576ca0719d52da14c131efd index 30f8946..e2c3e96 100644 --- a/src/main/generated/.cache/437931636ae53790c576ca0719d52da14c131efd +++ b/src/main/generated/.cache/437931636ae53790c576ca0719d52da14c131efd @@ -1,4 +1,4 @@ -// 1.21 2024-07-14T17:43:11.1338435 Enriched/Tags for minecraft:item +// 1.21 2024-07-14T21:10:16.9359286 Enriched/Tags for minecraft:item a94b97d224da0464fc2bd7209ff67b8238e3302d data\c\tags\item\tools\melee_weapon.json eb373d02e484b65c3e3cb5422b23771fbca65004 data\minecraft\tags\item\foot_armor.json 1c18a5b8f73fd8d4df1792cfa57fbae974afa729 data\minecraft\tags\item\head_armor.json diff --git a/src/main/generated/.cache/53358fbdef77ef1af7355d18669e01bbae7a80f8 b/src/main/generated/.cache/53358fbdef77ef1af7355d18669e01bbae7a80f8 index 59f30a4..d833872 100644 --- a/src/main/generated/.cache/53358fbdef77ef1af7355d18669e01bbae7a80f8 +++ b/src/main/generated/.cache/53358fbdef77ef1af7355d18669e01bbae7a80f8 @@ -1,4 +1,4 @@ -// 1.21 2024-07-14T17:43:11.1248699 Enriched/Recipes +// 1.21 2024-07-14T21:10:16.9256293 Enriched/Recipes c02c5090d20f8598a56fbf305abd242cacda741e data\enriched\recipe\steel_tag_leggings.json 7a639d64f6bebfe566ee0f3e3727d7f88357844c data\enriched\advancement\recipes\combat\steel_tag_boots.json bddaf0484c3f36e7a3db02a1538562976e33553a data\enriched\recipe\steel_blend.json diff --git a/src/main/generated/.cache/59192d6ffc5bfc8e2b71cafcacd1447414fb8b0d b/src/main/generated/.cache/59192d6ffc5bfc8e2b71cafcacd1447414fb8b0d index 6936ab6..a5cc739 100644 --- a/src/main/generated/.cache/59192d6ffc5bfc8e2b71cafcacd1447414fb8b0d +++ b/src/main/generated/.cache/59192d6ffc5bfc8e2b71cafcacd1447414fb8b0d @@ -1,2 +1,2 @@ -// 1.21 2024-07-14T17:43:11.1318703 Enriched/Language (en_us) -423b7ed0f2a94e77c4433122d2b9ba1a1181f1d9 assets\enriched\lang\en_us.json +// 1.21 2024-07-14T21:10:16.934405 Enriched/Language (en_us) +86b16199682e30045a88a9e1b47363039409c0bb assets\enriched\lang\en_us.json diff --git a/src/main/generated/.cache/6ffc7c45f7d836da3acace2d82bb174d99aa9f31 b/src/main/generated/.cache/6ffc7c45f7d836da3acace2d82bb174d99aa9f31 index 54254a9..0e6b857 100644 --- a/src/main/generated/.cache/6ffc7c45f7d836da3acace2d82bb174d99aa9f31 +++ b/src/main/generated/.cache/6ffc7c45f7d836da3acace2d82bb174d99aa9f31 @@ -1,4 +1,4 @@ -// 1.21 2024-07-14T17:43:11.1288689 Enriched/Model Definitions +// 1.21 2024-07-14T21:10:16.9303427 Enriched/Model Definitions edf46cfca1cc6e5d65214045edbf116e3e42645b assets\enriched\models\item\obsidian_sword.json b1f2d95256cfcb699a1dac06b306ed086db40f7c assets\enriched\models\block\redwood_log_horizontal.json 95d2f1008dc3460e4132fbfcc5f3e3aacf37236c assets\enriched\models\item\emerald_chestplate_netherite_trim.json @@ -362,9 +362,9 @@ fb8c690d5a624908e4bf76336ee0340844d9a91b assets\enriched\models\block\redwood_pl d106eef91df3f7e634738ee8bf26d1025140bbde assets\enriched\models\item\deepslate_amber_ore.json b849ac41c6e407651bd9888fcb55a842fcf865f5 assets\enriched\models\item\obsidian_pickaxe.json 5b62c74a0d34e8c10a94cee8ff18c73d54753164 assets\enriched\models\block\redwood_fence_post.json -b35a3f0493528fef4853ca54fee442da1b8acd04 assets\enriched\blockstates\tanzanite_ore.json 5542b3a72f3148bd77c7da8bcc4ca5fd07b9a0e2 assets\enriched\blockstates\redwood_pressure_plate.json 5bbac8740bd90acb701f8c5c6aa982c525bb505d assets\enriched\blockstates\raw_tin_block.json +b35a3f0493528fef4853ca54fee442da1b8acd04 assets\enriched\blockstates\tanzanite_ore.json eb218067ba4d35402c01022733b9f0481a6db98f assets\enriched\models\item\ruby_block.json df244732b43c315845ce8f390b6c0eaaaf1f1909 assets\enriched\models\item\tanzanite_boots_redstone_trim.json 6db3d995ff803db88709060ffa976da5200e60fd assets\enriched\models\item\steel_helmet_redstone_trim.json @@ -423,8 +423,8 @@ fffe559c4f1ddf08506ffe96d975f714d04bccd6 assets\enriched\models\block\redwood_fe c9b42568694f9d521b4a575c54203b3da8080450 assets\enriched\models\item\ruby_helmet_copper_trim.json 94d3b592ea548630bda8345126e2fd35f2a6ef70 assets\enriched\models\item\ruby_boots_gold_trim.json fc9095739c942b03fbf95fe818379643397f1152 assets\enriched\models\block\redwood_button_pressed.json -1f1f40fa0c633242516bfee33d08c4921ed2f9d4 assets\enriched\models\item\emerald_boots_lapis_trim.json c1019f4cf13f71eecf37d82f1f1a91dc9c074bfb assets\enriched\models\item\deepslate_sapphire_ore.json +1f1f40fa0c633242516bfee33d08c4921ed2f9d4 assets\enriched\models\item\emerald_boots_lapis_trim.json 86193dc1760bb83f409fe09d71df5cf189a61171 assets\enriched\models\item\tanzanite_chestplate_copper_trim.json 9c3f7d8e7b81aadeca989af316944a697ad916c3 assets\enriched\blockstates\dark_granite_wall.json 5ca07a07f28aca89c6809e05877ffc7a1e135814 assets\enriched\models\block\marble_wall_side_tall.json @@ -449,8 +449,8 @@ e411a0240a1968ea6f0f267ea3324e5924c39315 assets\enriched\models\item\steel_chest 2f49a7407ea84df7cc017fe6edaaf14fc6eba252 assets\enriched\blockstates\redwood_log.json 5b25c41aee2e0d72bb03f1fbd47dc521bf1838dd assets\enriched\blockstates\deepslate_amber_ore.json 9a7f3ed9346a6ffa29a070ee87656a939131240c assets\enriched\models\item\tanzanite_leggings_gold_trim.json -dfd364b49d45ddbf687f69c348c54e100ef880f5 assets\enriched\blockstates\deepslate_topaz_ore.json 9ccd9f0de518f72bf0670dd33a342c7b0608b236 assets\enriched\blockstates\polished_dark_granite.json +dfd364b49d45ddbf687f69c348c54e100ef880f5 assets\enriched\blockstates\deepslate_topaz_ore.json 7324db4c61053b15196b87f05ef0d90e88910d0b assets\enriched\models\item\emerald_boots_amethyst_trim.json a966f30ce929d7a1c3021fce272dc923ae66cbca assets\enriched\blockstates\deepslate_tanzanite_ore.json a4f647cb10f8c9daa6617a1aedfa34f7aab5fe0c assets\enriched\models\item\sapphire_helmet_amethyst_trim.json diff --git a/src/main/generated/.cache/e40d229de16c75d411f3b1e8e1d42d6101b221ad b/src/main/generated/.cache/e40d229de16c75d411f3b1e8e1d42d6101b221ad index 1d2bb87..d392c49 100644 --- a/src/main/generated/.cache/e40d229de16c75d411f3b1e8e1d42d6101b221ad +++ b/src/main/generated/.cache/e40d229de16c75d411f3b1e8e1d42d6101b221ad @@ -1,21 +1,21 @@ -// 1.21 2024-07-14T17:43:11.1318703 Enriched/World Gen +// 1.21 2024-07-14T21:10:16.9338557 Enriched/World Gen 7f3ba33122767010a50baac5de81e114e519f6ad data\enriched\worldgen\placed_feature\tanzanite_ore_placed.json 52b69dfe40954ec540e9ae5405b3242e9005c06c data\enriched\worldgen\configured_feature\topaz_ore.json -bf917c1184cf2a02e434ed262654531dd877225c data\enriched\worldgen\placed_feature\sapphire_ore_placed.json 74b8741399af43f74b822c4871969e5bca17f806 data\enriched\worldgen\placed_feature\redwood_placed.json +bf917c1184cf2a02e434ed262654531dd877225c data\enriched\worldgen\placed_feature\sapphire_ore_placed.json 52ef39e5af7f65c09ec63ebaffbbfa61ab8af3ba data\enriched\worldgen\configured_feature\tanzanite_ore.json dc709effa46006bf8f8d186cd3cb7fa52ed4c50a data\enriched\worldgen\placed_feature\dark_granite_lower_placed.json e936c87dadde4a3e09e8a66d81d864295a4a526d data\enriched\worldgen\configured_feature\amber_ore.json f871d327d8f1cc783a40b002ffa4824912b6dcd7 data\enriched\worldgen\configured_feature\redwood.json -1c85c12926afbd321c4ff08ae6657874a2fcd935 data\enriched\worldgen\placed_feature\tin_ore_placed.json +5025ad5d8fb78d6b6029375101809a2102670935 data\enriched\worldgen\placed_feature\tin_ore_placed.json 0f107c22b03c3f743fd204bdc5b87655df699d76 data\enriched\worldgen\configured_feature\dark_granite.json e14b485532e4520e024c038297232c9bbecd12cd data\enriched\worldgen\placed_feature\marble_lower_placed.json -bba5a5fd74125061b2670394805decd5dabc250e data\enriched\worldgen\configured_feature\tin_ore.json +b88b9ca6ee00c1d2bda619bf60302b9ec87d085c data\enriched\worldgen\configured_feature\tin_ore.json 13be4ed11bfb4c5ec91ea6d6afb434c25307a6de data\enriched\worldgen\placed_feature\topaz_ore_placed.json 6fb926dcfd2311fe45db4745ac2330d785d57cda data\enriched\worldgen\configured_feature\ruby_ore.json 5ae3c672f50e49f6121c1ef849f60ffca065eb86 data\enriched\worldgen\placed_feature\dark_granite_upper_placed.json 780bf5f5dca2f620ac3964ff550e66065ac2a2b5 data\enriched\worldgen\placed_feature\marble_upper_placed.json 907434c3f07db69fe016bfe09d10772d5dea43e9 data\enriched\worldgen\configured_feature\marble.json -30dd6b9471bab1ed1a1a1698b8d1c2662050496c data\enriched\worldgen\placed_feature\ruby_ore_placed.json +e810c47d222c60fabc8905fe559a396f415836c9 data\enriched\worldgen\placed_feature\ruby_ore_placed.json 5bdb4e4f64513ac6be21768487e08d26b8e98b53 data\enriched\worldgen\configured_feature\sapphire_ore.json 6f3b607c829afd12dc9a20ef0bef58ed1f1173bb data\enriched\worldgen\placed_feature\amber_ore_placed.json diff --git a/src/main/generated/assets/enriched/lang/en_us.json b/src/main/generated/assets/enriched/lang/en_us.json index 2c24f8d..4a7c8ab 100644 --- a/src/main/generated/assets/enriched/lang/en_us.json +++ b/src/main/generated/assets/enriched/lang/en_us.json @@ -1,6 +1,7 @@ { "block.enriched.amber_block": "Amber Block", "block.enriched.amber_ore": "Amber Ore", + "block.enriched.bronze_block": "Bronze Block", "block.enriched.dark_granite": "Dark Granite", "block.enriched.dark_granite_slab": "Dark Granite Slab", "block.enriched.dark_granite_stairs": "Dark Granite Stairs", @@ -9,6 +10,7 @@ "block.enriched.deepslate_ruby_ore": "Deepslate Ruby Ore", "block.enriched.deepslate_sapphire_ore": "Deepslate Sapphire Ore", "block.enriched.deepslate_tanzanite_ore": "Deepslate Tanzanite Ore", + "block.enriched.deepslate_tin_ore": "Deepslate Tin Ore", "block.enriched.deepslate_topaz_ore": "Deepslate Topaz Ore", "block.enriched.marble": "Marble", "block.enriched.marble_slab": "Marble Slab", @@ -21,6 +23,7 @@ "block.enriched.polished_marble": "Polished Marble", "block.enriched.polished_marble_slab": "Polished Marble Slab", "block.enriched.polished_marble_stairs": "Polished Marble Stairs", + "block.enriched.raw_tin_block": "Raw Tin Block", "block.enriched.redwood_button": "Redwood Button", "block.enriched.redwood_door": "Redwood Door", "block.enriched.redwood_fence": "Redwood Fence", @@ -43,6 +46,8 @@ "block.enriched.stripped_redwood_wood": "Stripped Redwood Wood", "block.enriched.tanzanite_block": "Tanzanite Block", "block.enriched.tanzanite_ore": "Tanzanite Ore", + "block.enriched.tin_block": "Tin Block", + "block.enriched.tin_ore": "Tin Ore", "block.enriched.topaz_block": "Topaz Block", "block.enriched.topaz_ore": "Topaz Ore", "enriched.options.category.mobs": "Mobs", @@ -62,6 +67,8 @@ "enriched.options.recipes.enableRawSmeltingRecipes.description": "Enable/disables the recipes for getting a block from smelting or blasting its raw version. (Example: Raw Gold Block -> Gold Block)", "enriched.options.recipes.enableUncraftingRecipes": "Enable Uncrafting Recipes", "enriched.options.recipes.enableUncraftingRecipes.description": "Enables/disables the recipes for getting items from certain blocks. (Example: Wool -> String)", + "enriched.options.toolsAndArmor.enableBronzeGear": "Enable Bronze Gear", + "enriched.options.toolsAndArmor.enableBronzeGear.description": "Enables/disables the recipes for Bronze gear and tools.", "enriched.options.toolsAndArmor.enableCopperTools": "Enable Copper Tools", "enriched.options.toolsAndArmor.enableCopperTools.description": "Enables/disables the recipes for Copper tools.", "enriched.options.toolsAndArmor.enableEmeraldGear": "Enable Emerald Gear", @@ -76,6 +83,8 @@ "enriched.options.toolsAndArmor.enableSteelGear.description": "Enables/disables the recipes for Steel gear and tools.", "enriched.options.toolsAndArmor.enableTanzaniteGear": "Enable Tanzanite Gear", "enriched.options.toolsAndArmor.enableTanzaniteGear.description": "Enables/disables the recipes for Tanzanite gear and tools.", + "enriched.options.worldGeneration.generateAmberOres": "Generate Amber Ores", + "enriched.options.worldGeneration.generateAmberOres.description": "Enables/disables the generation of Amber ores in a world.", "enriched.options.worldGeneration.generateDarkGranite": "Generate Dark Granite", "enriched.options.worldGeneration.generateDarkGranite.description": "Enables/disables the generation of Dark Granite in a world.", "enriched.options.worldGeneration.generateMarble": "Generate Marble", @@ -86,10 +95,16 @@ "enriched.options.worldGeneration.generateSapphireOres.description": "Enables/disables the generation of Sapphire ores in a world.", "enriched.options.worldGeneration.generateTanzaniteOres": "Generate Tanzanite Ores", "enriched.options.worldGeneration.generateTanzaniteOres.description": "Enables/disables the generation of Tanzanite ores in a world.", + "enriched.options.worldGeneration.generateTinOres": "Generate Tin Ores", + "enriched.options.worldGeneration.generateTinOres.description": "Enables/disables the generation of Tin ores in a world.", + "enriched.options.worldGeneration.generateTopazOres": "Generate Topaz Ores", + "enriched.options.worldGeneration.generateTopazOres.description": "Enables/disables the generation of Topaz ores in a world.", "entity.enriched.honey_slime": "Honey Slime", "item.enriched.amber": "Amber", "item.enriched.beef_stew": "Beef Stew", "item.enriched.berry_juice": "Berry Juice", + "item.enriched.bronze_blend": "Bronze Blend", + "item.enriched.bronze_ingot": "Bronze Ingot", "item.enriched.copper_axe": "Copper Axe", "item.enriched.copper_hoe": "Copper Hoe", "item.enriched.copper_pickaxe": "Copper Pickaxe", @@ -117,6 +132,7 @@ "item.enriched.obsidian_pickaxe": "Obsidian Pickaxe", "item.enriched.obsidian_shovel": "Obsidian Shovel", "item.enriched.obsidian_sword": "Obsidian Sword", + "item.enriched.raw_tin": "Raw Tin", "item.enriched.ruby": "Ruby", "item.enriched.ruby_axe": "Ruby Axe", "item.enriched.ruby_boots": "Ruby Boots", @@ -158,6 +174,7 @@ "item.enriched.tanzanite_pickaxe": "Tanzanite Pickaxe", "item.enriched.tanzanite_shovel": "Tanzanite Shovel", "item.enriched.tanzanite_sword": "Tanzanite Sword", + "item.enriched.tin_ingot": "Tin Ingot", "item.enriched.topaz": "Topaz", "tag.block.enriched.redwood_logs": "Redwood Logs", "tag.item.c.gems.amber": "Amber", @@ -165,6 +182,7 @@ "tag.item.c.gems.sapphire": "Sapphire", "tag.item.c.gems.tanzanite": "Tanzanite", "tag.item.c.gems.topaz": "Topaz", + "tag.item.c.ingots.bronze": "Bronze Ingot", "tag.item.c.ingots.obsidian_alloy": "Obsidian Alloy Ingot", "tag.item.c.ingots.steel": "Steel Ingot", "tag.item.enriched.redwood_logs": "Redwood Logs" diff --git a/src/main/generated/data/enriched/worldgen/configured_feature/tin_ore.json b/src/main/generated/data/enriched/worldgen/configured_feature/tin_ore.json index 425caec..980a7f3 100644 --- a/src/main/generated/data/enriched/worldgen/configured_feature/tin_ore.json +++ b/src/main/generated/data/enriched/worldgen/configured_feature/tin_ore.json @@ -2,7 +2,7 @@ "type": "minecraft:ore", "config": { "discard_chance_on_air_exposure": 0.0, - "size": 6, + "size": 8, "targets": [ { "state": { diff --git a/src/main/generated/data/enriched/worldgen/placed_feature/ruby_ore_placed.json b/src/main/generated/data/enriched/worldgen/placed_feature/ruby_ore_placed.json index dba9609..42ee831 100644 --- a/src/main/generated/data/enriched/worldgen/placed_feature/ruby_ore_placed.json +++ b/src/main/generated/data/enriched/worldgen/placed_feature/ruby_ore_placed.json @@ -3,7 +3,7 @@ "placement": [ { "type": "minecraft:count", - "count": 6 + "count": 7 }, { "type": "minecraft:in_square" diff --git a/src/main/generated/data/enriched/worldgen/placed_feature/tin_ore_placed.json b/src/main/generated/data/enriched/worldgen/placed_feature/tin_ore_placed.json index 7f532c9..3a9b504 100644 --- a/src/main/generated/data/enriched/worldgen/placed_feature/tin_ore_placed.json +++ b/src/main/generated/data/enriched/worldgen/placed_feature/tin_ore_placed.json @@ -3,7 +3,7 @@ "placement": [ { "type": "minecraft:count", - "count": 6 + "count": 8 }, { "type": "minecraft:in_square" diff --git a/src/main/java/com/enrichedmc/enriched/block/EnrichedBlocks.java b/src/main/java/com/enrichedmc/enriched/block/EnrichedBlocks.java index 9a03f5a..788c9a2 100644 --- a/src/main/java/com/enrichedmc/enriched/block/EnrichedBlocks.java +++ b/src/main/java/com/enrichedmc/enriched/block/EnrichedBlocks.java @@ -415,8 +415,6 @@ public class EnrichedBlocks { EnrichedRegisters.registerToItemGroup(RAW_TIN_BLOCK, ItemGroups.NATURAL); EnrichedRegisters.registerToItemGroup(BRONZE_BLOCK, ItemGroups.BUILDING_BLOCKS); - - EnrichedRegisters.registerToItemGroup(STEEL_BLOCK, ItemGroups.BUILDING_BLOCKS); EnrichedRegisters.registerToItemGroup(OBSIDIAN_ALLOY_BLOCK, ItemGroups.BUILDING_BLOCKS); diff --git a/src/main/java/com/enrichedmc/enriched/conditions/impl/BronzeResourceCondition.java b/src/main/java/com/enrichedmc/enriched/conditions/impl/BronzeResourceCondition.java index 8a2cbdf..8b417c3 100644 --- a/src/main/java/com/enrichedmc/enriched/conditions/impl/BronzeResourceCondition.java +++ b/src/main/java/com/enrichedmc/enriched/conditions/impl/BronzeResourceCondition.java @@ -12,7 +12,7 @@ public class BronzeResourceCondition implements ResourceCondition { @Override public ResourceConditionType getType() { return ResourceConditionType.create( - Identifier.of(EnrichedMod.MOD_ID, "steel_enabled"), + Identifier.of(EnrichedMod.MOD_ID, "bronze_enabled"), MapCodec.unit(BronzeResourceCondition::new)); } diff --git a/src/main/java/com/enrichedmc/enriched/config/EnrichedGameOptions.java b/src/main/java/com/enrichedmc/enriched/config/EnrichedGameOptions.java index 3f0661b..89a69fc 100644 --- a/src/main/java/com/enrichedmc/enriched/config/EnrichedGameOptions.java +++ b/src/main/java/com/enrichedmc/enriched/config/EnrichedGameOptions.java @@ -42,16 +42,16 @@ public static EnrichedGameOptions load() { exception.printStackTrace(); } - EnrichedGameOptions iridiumGameOptions = null; + EnrichedGameOptions enrichedGameOptions = null; try { - iridiumGameOptions = + enrichedGameOptions = GSON.fromJson(configFileContents.toString(), EnrichedGameOptions.class); } catch (JsonSyntaxException exception) { exception.printStackTrace(); } - return iridiumGameOptions; + return enrichedGameOptions; } else { EnrichedMod.LOGGER.warn("Failed to load Enriched's game options! Loading defaults..."); diff --git a/src/main/java/com/enrichedmc/enriched/config/EnrichedOptionCategories.java b/src/main/java/com/enrichedmc/enriched/config/EnrichedOptionCategories.java index 49e179d..8342824 100644 --- a/src/main/java/com/enrichedmc/enriched/config/EnrichedOptionCategories.java +++ b/src/main/java/com/enrichedmc/enriched/config/EnrichedOptionCategories.java @@ -117,6 +117,20 @@ public static ConfigCategory toolsAndArmor() { .customController(BooleanController::new) .flag(EnrichedOptionCategories.RELOAD_DATA_PACKS) .build()) + .option( + Option.createBuilder() + .name(Text.translatable("enriched.options.toolsAndArmor.enableBronzeGear")) + .description( + OptionDescription.of( + Text.translatable( + "enriched.options.toolsAndArmor.enableBronzeGear.description"))) + .binding( + EnrichedGameOptions.defaults().toolsAndArmorOptions.enableBronzeGear, + () -> TOOLS_AND_ARMOR_OPTIONS.enableBronzeGear, + newValue -> TOOLS_AND_ARMOR_OPTIONS.enableBronzeGear = newValue) + .customController(BooleanController::new) + .flag(EnrichedOptionCategories.RELOAD_DATA_PACKS) + .build()) .option( Option.createBuilder() .name(Text.translatable("enriched.options.toolsAndArmor.enableCopperTools")) @@ -275,6 +289,48 @@ public static ConfigCategory worldGeneration() { .customController(BooleanController::new) .flag(OptionFlag.GAME_RESTART) .build()) + .option( + Option.createBuilder() + .name(Text.translatable("enriched.options.worldGeneration.generateAmberOres")) + .description( + OptionDescription.of( + Text.translatable( + "enriched.options.worldGeneration.generateAmberOres.description"))) + .binding( + EnrichedGameOptions.defaults().worldGenerationOptions.generateAmberOres, + () -> WORLD_GENERATION.generateAmberOres, + newValue -> WORLD_GENERATION.generateAmberOres = newValue) + .customController(BooleanController::new) + .flag(OptionFlag.GAME_RESTART) + .build()) + .option( + Option.createBuilder() + .name(Text.translatable("enriched.options.worldGeneration.generateTopazOres")) + .description( + OptionDescription.of( + Text.translatable( + "enriched.options.worldGeneration.generateTopazOres.description"))) + .binding( + EnrichedGameOptions.defaults().worldGenerationOptions.generateTopazOres, + () -> WORLD_GENERATION.generateTopazOres, + newValue -> WORLD_GENERATION.generateTopazOres = newValue) + .customController(BooleanController::new) + .flag(OptionFlag.GAME_RESTART) + .build()) + .option( + Option.createBuilder() + .name(Text.translatable("enriched.options.worldGeneration.generateTinOres")) + .description( + OptionDescription.of( + Text.translatable( + "enriched.options.worldGeneration.generateTinOres.description"))) + .binding( + EnrichedGameOptions.defaults().worldGenerationOptions.generateTanzaniteOres, + () -> WORLD_GENERATION.generateTanzaniteOres, + newValue -> WORLD_GENERATION.generateTanzaniteOres = newValue) + .customController(BooleanController::new) + .flag(OptionFlag.GAME_RESTART) + .build()) .option( Option.createBuilder() .name(Text.translatable("enriched.options.worldGeneration.generateDarkGranite")) diff --git a/src/main/java/com/enrichedmc/enriched/datagen/EnrichedBlockLootTableProvider.java b/src/main/java/com/enrichedmc/enriched/datagen/EnrichedBlockLootTableProvider.java index c92a57f..627c63c 100644 --- a/src/main/java/com/enrichedmc/enriched/datagen/EnrichedBlockLootTableProvider.java +++ b/src/main/java/com/enrichedmc/enriched/datagen/EnrichedBlockLootTableProvider.java @@ -46,7 +46,8 @@ public void generate() { sapphireOre -> this.enrichedOreDrops(sapphireOre, EnrichedItems.SAPPHIRE)); this.addDrop( EnrichedBlocks.DEEPSLATE_SAPPHIRE_ORE, - deepslateSapphireOre -> this.enrichedOreDrops(deepslateSapphireOre, EnrichedItems.SAPPHIRE)); + deepslateSapphireOre -> + this.enrichedOreDrops(deepslateSapphireOre, EnrichedItems.SAPPHIRE)); this.addDrop( EnrichedBlocks.TANZANITE_ORE, @@ -57,28 +58,22 @@ public void generate() { this.enrichedOreDrops(deepslateTanzaniteOre, EnrichedItems.TANZANITE)); this.addDrop( - EnrichedBlocks.AMBER_ORE, - amberOre -> this.enrichedOreDrops(amberOre, EnrichedItems.AMBER)); + EnrichedBlocks.AMBER_ORE, amberOre -> this.enrichedOreDrops(amberOre, EnrichedItems.AMBER)); this.addDrop( - EnrichedBlocks.DEEPSLATE_AMBER_ORE, - deepslateAmberOre -> - this.enrichedOreDrops(deepslateAmberOre, EnrichedItems.AMBER)); + EnrichedBlocks.DEEPSLATE_AMBER_ORE, + deepslateAmberOre -> this.enrichedOreDrops(deepslateAmberOre, EnrichedItems.AMBER)); this.addDrop( - EnrichedBlocks.TOPAZ_ORE, - topazOre -> this.enrichedOreDrops(topazOre, EnrichedItems.TOPAZ)); + EnrichedBlocks.TOPAZ_ORE, topazOre -> this.enrichedOreDrops(topazOre, EnrichedItems.TOPAZ)); this.addDrop( - EnrichedBlocks.DEEPSLATE_TOPAZ_ORE, - deepslateTopazOre -> - this.enrichedOreDrops(deepslateTopazOre, EnrichedItems.TOPAZ)); + EnrichedBlocks.DEEPSLATE_TOPAZ_ORE, + deepslateTopazOre -> this.enrichedOreDrops(deepslateTopazOre, EnrichedItems.TOPAZ)); this.addDrop( - EnrichedBlocks.TIN_ORE, - tinOre -> this.enrichedOreDrops(tinOre, EnrichedItems.RAW_TIN)); + EnrichedBlocks.TIN_ORE, tinOre -> this.enrichedOreDrops(tinOre, EnrichedItems.RAW_TIN)); this.addDrop( - EnrichedBlocks.DEEPSLATE_TIN_ORE, - deepslateTinOre -> - this.enrichedOreDrops(deepslateTinOre, EnrichedItems.RAW_TIN)); + EnrichedBlocks.DEEPSLATE_TIN_ORE, + deepslateTinOre -> this.enrichedOreDrops(deepslateTinOre, EnrichedItems.RAW_TIN)); this.addDrop(EnrichedBlocks.STEEL_BLOCK); this.addDrop(EnrichedBlocks.OBSIDIAN_ALLOY_BLOCK); diff --git a/src/main/java/com/enrichedmc/enriched/datagen/EnrichedRecipeProvider.java b/src/main/java/com/enrichedmc/enriched/datagen/EnrichedRecipeProvider.java index ed5f8f3..0ee8b84 100644 --- a/src/main/java/com/enrichedmc/enriched/datagen/EnrichedRecipeProvider.java +++ b/src/main/java/com/enrichedmc/enriched/datagen/EnrichedRecipeProvider.java @@ -329,59 +329,59 @@ private void createSteelRecipes(RecipeExporter recipeExporter) { private void createBronzeAndTinRecipes(RecipeExporter recipeExporter) { ShapelessRecipeJsonBuilder.create(RecipeCategory.MISC, EnrichedItems.BRONZE_BLEND, 3) - .input(EnrichedItems.TIN_INGOT) - .input(Items.COPPER_INGOT) - .input(Items.COPPER_INGOT) - .criterion( - FabricRecipeProvider.hasItem(EnrichedItems.TIN_INGOT), - FabricRecipeProvider.conditionsFromItem(EnrichedItems.TIN_INGOT)) - .offerTo(recipeExporter); + .input(EnrichedItems.TIN_INGOT) + .input(Items.COPPER_INGOT) + .input(Items.COPPER_INGOT) + .criterion( + FabricRecipeProvider.hasItem(EnrichedItems.TIN_INGOT), + FabricRecipeProvider.conditionsFromItem(EnrichedItems.TIN_INGOT)) + .offerTo(recipeExporter); this.createSmeltingRecipe( - recipeExporter, - EnrichedItems.BRONZE_BLEND, - RecipeCategory.MISC, - EnrichedItems.BRONZE_INGOT, - 0.7f, - 200); + recipeExporter, + EnrichedItems.BRONZE_BLEND, + RecipeCategory.MISC, + EnrichedItems.BRONZE_INGOT, + 0.7f, + 200); this.createBlastingRecipe( - recipeExporter, - EnrichedItems.BRONZE_BLEND, - RecipeCategory.MISC, - EnrichedItems.BRONZE_INGOT, - 0.7f, - 100); + recipeExporter, + EnrichedItems.BRONZE_BLEND, + RecipeCategory.MISC, + EnrichedItems.BRONZE_INGOT, + 0.7f, + 100); this.createSmeltingRecipe( - recipeExporter, - EnrichedItems.RAW_TIN, - RecipeCategory.MISC, - EnrichedItems.TIN_INGOT, - 0.7f, - 200); + recipeExporter, + EnrichedItems.RAW_TIN, + RecipeCategory.MISC, + EnrichedItems.TIN_INGOT, + 0.7f, + 200); this.createBlastingRecipe( - recipeExporter, - EnrichedItems.RAW_TIN, - RecipeCategory.MISC, - EnrichedItems.TIN_INGOT, - 0.7f, - 100); + recipeExporter, + EnrichedItems.RAW_TIN, + RecipeCategory.MISC, + EnrichedItems.TIN_INGOT, + 0.7f, + 100); offerReversibleCompactingRecipes( - recipeExporter, - RecipeCategory.MISC, - EnrichedItems.BRONZE_INGOT, - RecipeCategory.MISC, - EnrichedBlocks.BRONZE_BLOCK); + recipeExporter, + RecipeCategory.MISC, + EnrichedItems.BRONZE_INGOT, + RecipeCategory.MISC, + EnrichedBlocks.BRONZE_BLOCK); offerReversibleCompactingRecipes( - recipeExporter, - RecipeCategory.MISC, - EnrichedItems.TIN_INGOT, - RecipeCategory.MISC, - EnrichedBlocks.TIN_BLOCK); + recipeExporter, + RecipeCategory.MISC, + EnrichedItems.TIN_INGOT, + RecipeCategory.MISC, + EnrichedBlocks.TIN_BLOCK); } private void createObsidianRecipes(RecipeExporter recipeExporter) { @@ -442,7 +442,7 @@ private void createObsidianRecipes(RecipeExporter recipeExporter) { ShapelessRecipeJsonBuilder.create(RecipeCategory.MISC, EnrichedItems.OBSIDIAN_ALLOY_BLEND, 3) .input(Items.OBSIDIAN) .input(EnrichedItems.STEEL_INGOT) - .input(EnrichedItems.STEEL_INGOT) + .input(EnrichedItems.STEEL_INGOT) .criterion( FabricRecipeProvider.hasItem(Items.OBSIDIAN), FabricRecipeProvider.conditionsFromItem(Items.OBSIDIAN)) diff --git a/src/main/java/com/enrichedmc/enriched/datagen/lang/EnrichedEnglishLanguageProvider.java b/src/main/java/com/enrichedmc/enriched/datagen/lang/EnrichedEnglishLanguageProvider.java index ee5f510..396c6d0 100644 --- a/src/main/java/com/enrichedmc/enriched/datagen/lang/EnrichedEnglishLanguageProvider.java +++ b/src/main/java/com/enrichedmc/enriched/datagen/lang/EnrichedEnglishLanguageProvider.java @@ -36,6 +36,10 @@ public void generateTranslations( translationBuilder.add(EnrichedItems.STEEL_INGOT, "Steel Ingot"); translationBuilder.add(EnrichedItems.OBSIDIAN_ALLOY_BLEND, "Obsidian Alloy Blend"); translationBuilder.add(EnrichedItems.OBSIDIAN_ALLOY_INGOT, "Obsidian Alloy Ingot"); + translationBuilder.add(EnrichedItems.BRONZE_BLEND, "Bronze Blend"); + translationBuilder.add(EnrichedItems.BRONZE_INGOT, "Bronze Ingot"); + translationBuilder.add(EnrichedItems.TIN_INGOT, "Tin Ingot"); + translationBuilder.add(EnrichedItems.RAW_TIN, "Raw Tin"); translationBuilder.add(EnrichedItems.HONEY_BALL, "Honey Ball"); translationBuilder.add(EnrichedItems.HONEY_SLIME_SPAWN_EGG, "Honey Slime Spawn Egg"); @@ -62,10 +66,17 @@ public void generateTranslations( translationBuilder.add(EnrichedBlocks.TOPAZ_BLOCK, "Topaz Block"); translationBuilder.add(EnrichedBlocks.TOPAZ_ORE, "Topaz Ore"); translationBuilder.add(EnrichedBlocks.DEEPSLATE_TOPAZ_ORE, "Deepslate Topaz Ore"); - + translationBuilder.add(EnrichedBlocks.STEEL_BLOCK, "Steel Block"); translationBuilder.add(EnrichedBlocks.OBSIDIAN_ALLOY_BLOCK, "Obsidian Alloy Block"); + translationBuilder.add(EnrichedBlocks.TIN_BLOCK, "Tin Block"); + translationBuilder.add(EnrichedBlocks.RAW_TIN_BLOCK, "Raw Tin Block"); + translationBuilder.add(EnrichedBlocks.TIN_ORE, "Tin Ore"); + translationBuilder.add(EnrichedBlocks.DEEPSLATE_TIN_ORE, "Deepslate Tin Ore"); + + translationBuilder.add(EnrichedBlocks.BRONZE_BLOCK, "Bronze Block"); + translationBuilder.add(EnrichedBlocks.REDWOOD_LOG, "Redwood Log"); translationBuilder.add(EnrichedTags.BlockTags.REDWOOD_LOGS, "Redwood Logs"); translationBuilder.add(EnrichedTags.ItemTags.REDWOOD_LOGS, "Redwood Logs"); @@ -283,6 +294,7 @@ public void generateTranslations( translationBuilder.add(TOPAZS, "Topaz"); translationBuilder.add(OBSIDIAN_ALLOY_INGOTS, "Obsidian Alloy Ingot"); translationBuilder.add(STEEL_INGOTS, "Steel Ingot"); + translationBuilder.add(BRONZE_INGOTS, "Bronze Ingot"); /*----------------*/ /* -- Entities -- */ @@ -323,6 +335,10 @@ public void generateTranslations( translationBuilder.add( "enriched.options.toolsAndArmor.enableEmeraldGear.description", "Enables/disables the recipes for Emerald gear and tools."); + translationBuilder.add("enriched.options.toolsAndArmor.enableBronzeGear", "Enable Bronze Gear"); + translationBuilder.add( + "enriched.options.toolsAndArmor.enableBronzeGear.description", + "Enables/disables the recipes for Bronze gear and tools."); translationBuilder.add( "enriched.options.toolsAndArmor.enableCopperTools", "Enable Copper Tools"); translationBuilder.add( @@ -381,6 +397,20 @@ public void generateTranslations( translationBuilder.add( "enriched.options.worldGeneration.generateTanzaniteOres.description", "Enables/disables the generation of Tanzanite ores in a world."); + translationBuilder.add( + "enriched.options.worldGeneration.generateAmberOres", "Generate Amber Ores"); + translationBuilder.add( + "enriched.options.worldGeneration.generateAmberOres.description", + "Enables/disables the generation of Amber ores in a world."); + translationBuilder.add( + "enriched.options.worldGeneration.generateTopazOres", "Generate Topaz Ores"); + translationBuilder.add( + "enriched.options.worldGeneration.generateTopazOres.description", + "Enables/disables the generation of Topaz ores in a world."); + translationBuilder.add("enriched.options.worldGeneration.generateTinOres", "Generate Tin Ores"); + translationBuilder.add( + "enriched.options.worldGeneration.generateTinOres.description", + "Enables/disables the generation of Tin ores in a world."); translationBuilder.add( "enriched.options.worldGeneration.generateDarkGranite", "Generate Dark Granite"); translationBuilder.add( diff --git a/src/main/java/com/enrichedmc/enriched/datagen/tag/EnrichedBlockTagProvider.java b/src/main/java/com/enrichedmc/enriched/datagen/tag/EnrichedBlockTagProvider.java index 69ee3f1..81e9da8 100644 --- a/src/main/java/com/enrichedmc/enriched/datagen/tag/EnrichedBlockTagProvider.java +++ b/src/main/java/com/enrichedmc/enriched/datagen/tag/EnrichedBlockTagProvider.java @@ -111,7 +111,7 @@ protected void configure(RegistryWrapper.WrapperLookup wrapperLookup) { this.getOrCreateTagBuilder( EnrichedRegisters.createTagKey(RegistryKeys.BLOCK, "incorrect_for_steel_tool")); this.getOrCreateTagBuilder( - EnrichedRegisters.createTagKey(RegistryKeys.BLOCK, "incorrect_for_bronze_tool")); + EnrichedRegisters.createTagKey(RegistryKeys.BLOCK, "incorrect_for_bronze_tool")); this.getOrCreateTagBuilder( EnrichedRegisters.createTagKey(RegistryKeys.BLOCK, "incorrect_for_obsidian_tool")); this.getOrCreateTagBuilder( diff --git a/src/main/java/com/enrichedmc/enriched/datagen/tag/EnrichedItemTagProvider.java b/src/main/java/com/enrichedmc/enriched/datagen/tag/EnrichedItemTagProvider.java index f926662..1282ee6 100644 --- a/src/main/java/com/enrichedmc/enriched/datagen/tag/EnrichedItemTagProvider.java +++ b/src/main/java/com/enrichedmc/enriched/datagen/tag/EnrichedItemTagProvider.java @@ -38,13 +38,13 @@ protected void configure(RegistryWrapper.WrapperLookup wrapperLookup) { this.getOrCreateTagBuilder(ConventionalItemTags.DUSTS) .add(EnrichedItems.OBSIDIAN_ALLOY_BLEND) .add(EnrichedItems.STEEL_BLEND) - .add(EnrichedItems.BRONZE_BLEND); + .add(EnrichedItems.BRONZE_BLEND); this.getOrCreateTagBuilder(ConventionalItemTags.INGOTS) .add(EnrichedItems.OBSIDIAN_ALLOY_INGOT) .add(EnrichedItems.STEEL_INGOT) - .add(EnrichedItems.BRONZE_INGOT) - .add(EnrichedItems.TIN_INGOT); + .add(EnrichedItems.BRONZE_INGOT) + .add(EnrichedItems.TIN_INGOT); this.getOrCreateTagBuilder(ConventionalItemTags.ORES) .add(EnrichedBlocks.RUBY_ORE.asItem()) @@ -57,9 +57,8 @@ protected void configure(RegistryWrapper.WrapperLookup wrapperLookup) { .add(EnrichedBlocks.DEEPSLATE_AMBER_ORE.asItem()) .add(EnrichedBlocks.TOPAZ_ORE.asItem()) .add(EnrichedBlocks.DEEPSLATE_TOPAZ_ORE.asItem()) - .add(EnrichedBlocks.TIN_ORE.asItem()) - .add(EnrichedBlocks.DEEPSLATE_TIN_ORE.asItem()); - + .add(EnrichedBlocks.TIN_ORE.asItem()) + .add(EnrichedBlocks.DEEPSLATE_TIN_ORE.asItem()); this.getOrCreateTagBuilder(ConventionalItemTags.TOOLS) .add(EnrichedItems.STEEL_AXE) diff --git a/src/main/java/com/enrichedmc/enriched/tag/EnrichedTags.java b/src/main/java/com/enrichedmc/enriched/tag/EnrichedTags.java index 13fb3d6..830e7cf 100644 --- a/src/main/java/com/enrichedmc/enriched/tag/EnrichedTags.java +++ b/src/main/java/com/enrichedmc/enriched/tag/EnrichedTags.java @@ -20,10 +20,10 @@ public static class ItemTags { EnrichedRegisters.createCommonTagKey(RegistryKeys.ITEM, "ingots/steel"); public static final TagKey BRONZE_INGOTS = - EnrichedRegisters.createCommonTagKey(RegistryKeys.ITEM, "ingots/bronze"); + EnrichedRegisters.createCommonTagKey(RegistryKeys.ITEM, "ingots/bronze"); public static final TagKey TIN_INGOTS = - EnrichedRegisters.createCommonTagKey(RegistryKeys.ITEM, "ingots/bronze"); + EnrichedRegisters.createCommonTagKey(RegistryKeys.ITEM, "ingots/bronze"); public static final TagKey OBSIDIAN_ALLOY_INGOTS = EnrichedRegisters.createCommonTagKey(RegistryKeys.ITEM, "ingots/obsidian_alloy"); @@ -37,10 +37,10 @@ public static class ItemTags { EnrichedRegisters.createCommonTagKey(RegistryKeys.ITEM, "gems/tanzanite"); public static final TagKey AMBERS = - EnrichedRegisters.createCommonTagKey(RegistryKeys.ITEM, "gems/amber"); + EnrichedRegisters.createCommonTagKey(RegistryKeys.ITEM, "gems/amber"); public static final TagKey TOPAZS = - EnrichedRegisters.createCommonTagKey(RegistryKeys.ITEM, "gems/topaz"); + EnrichedRegisters.createCommonTagKey(RegistryKeys.ITEM, "gems/topaz"); public static final TagKey FOODS = EnrichedRegisters.createCommonTagKey(RegistryKeys.ITEM, "foods"); } diff --git a/src/main/java/com/enrichedmc/enriched/world/EnrichedConfiguredFeatures.java b/src/main/java/com/enrichedmc/enriched/world/EnrichedConfiguredFeatures.java index 9b9f53d..bb595e2 100644 --- a/src/main/java/com/enrichedmc/enriched/world/EnrichedConfiguredFeatures.java +++ b/src/main/java/com/enrichedmc/enriched/world/EnrichedConfiguredFeatures.java @@ -28,12 +28,12 @@ public class EnrichedConfiguredFeatures { EnrichedRegisters.createRegistryKey(RegistryKeys.CONFIGURED_FEATURE, "tanzanite_ore"); public static final RegistryKey> AMBER_ORE_KEY = - EnrichedRegisters.createRegistryKey(RegistryKeys.CONFIGURED_FEATURE, "amber_ore"); + EnrichedRegisters.createRegistryKey(RegistryKeys.CONFIGURED_FEATURE, "amber_ore"); public static final RegistryKey> TOPAZ_ORE_KEY = - EnrichedRegisters.createRegistryKey(RegistryKeys.CONFIGURED_FEATURE, "topaz_ore"); + EnrichedRegisters.createRegistryKey(RegistryKeys.CONFIGURED_FEATURE, "topaz_ore"); public static final RegistryKey> TIN_ORE_KEY = - EnrichedRegisters.createRegistryKey(RegistryKeys.CONFIGURED_FEATURE, "tin_ore"); + EnrichedRegisters.createRegistryKey(RegistryKeys.CONFIGURED_FEATURE, "tin_ore"); public static final RegistryKey> REDWOOD_KEY = EnrichedRegisters.createRegistryKey(RegistryKeys.CONFIGURED_FEATURE, "redwood"); @@ -71,25 +71,25 @@ public static void bootstrap(Registerable> context) { deepslateReplaceables, EnrichedBlocks.DEEPSLATE_TANZANITE_ORE.getDefaultState())); List overworldAmberOres = - Lists.newArrayList( - OreFeatureConfig.createTarget( - stoneReplaceables, EnrichedBlocks.AMBER_ORE.getDefaultState()), - OreFeatureConfig.createTarget( - deepslateReplaceables, EnrichedBlocks.DEEPSLATE_AMBER_ORE.getDefaultState())); + Lists.newArrayList( + OreFeatureConfig.createTarget( + stoneReplaceables, EnrichedBlocks.AMBER_ORE.getDefaultState()), + OreFeatureConfig.createTarget( + deepslateReplaceables, EnrichedBlocks.DEEPSLATE_AMBER_ORE.getDefaultState())); List overworldTopazOres = - Lists.newArrayList( - OreFeatureConfig.createTarget( - stoneReplaceables, EnrichedBlocks.TOPAZ_ORE.getDefaultState()), - OreFeatureConfig.createTarget( - deepslateReplaceables, EnrichedBlocks.DEEPSLATE_TOPAZ_ORE.getDefaultState())); + Lists.newArrayList( + OreFeatureConfig.createTarget( + stoneReplaceables, EnrichedBlocks.TOPAZ_ORE.getDefaultState()), + OreFeatureConfig.createTarget( + deepslateReplaceables, EnrichedBlocks.DEEPSLATE_TOPAZ_ORE.getDefaultState())); List overworldTinOres = - Lists.newArrayList( - OreFeatureConfig.createTarget( - stoneReplaceables, EnrichedBlocks.TIN_ORE.getDefaultState()), - OreFeatureConfig.createTarget( - deepslateReplaceables, EnrichedBlocks.DEEPSLATE_TIN_ORE.getDefaultState())); + Lists.newArrayList( + OreFeatureConfig.createTarget( + stoneReplaceables, EnrichedBlocks.TIN_ORE.getDefaultState()), + OreFeatureConfig.createTarget( + deepslateReplaceables, EnrichedBlocks.DEEPSLATE_TIN_ORE.getDefaultState())); List overworldDarkGranite = Lists.newArrayList( @@ -109,14 +109,13 @@ public static void bootstrap(Registerable> context) { context, TANZANITE_ORE_KEY, Feature.ORE, new OreFeatureConfig(overworldTanzaniteOres, 6)); EnrichedConfiguredFeatures.register( - context, AMBER_ORE_KEY, Feature.ORE, new OreFeatureConfig(overworldAmberOres, 4)); + context, AMBER_ORE_KEY, Feature.ORE, new OreFeatureConfig(overworldAmberOres, 4)); EnrichedConfiguredFeatures.register( - context, TOPAZ_ORE_KEY, Feature.ORE, new OreFeatureConfig(overworldTopazOres, 6)); + context, TOPAZ_ORE_KEY, Feature.ORE, new OreFeatureConfig(overworldTopazOres, 6)); EnrichedConfiguredFeatures.register( - context, TIN_ORE_KEY, Feature.ORE, new OreFeatureConfig(overworldTinOres, 6)); - + context, TIN_ORE_KEY, Feature.ORE, new OreFeatureConfig(overworldTinOres, 8)); EnrichedConfiguredFeatures.register( context, DARK_GRANITE_KEY, Feature.ORE, new OreFeatureConfig(overworldDarkGranite, 64)); diff --git a/src/main/java/com/enrichedmc/enriched/world/EnrichedPlacedFeatures.java b/src/main/java/com/enrichedmc/enriched/world/EnrichedPlacedFeatures.java index f907267..874472e 100644 --- a/src/main/java/com/enrichedmc/enriched/world/EnrichedPlacedFeatures.java +++ b/src/main/java/com/enrichedmc/enriched/world/EnrichedPlacedFeatures.java @@ -21,23 +21,14 @@ public class EnrichedPlacedFeatures { public static final RegistryKey TANZANITE_ORE_PLACED_KEY = EnrichedRegisters.createRegistryKey(RegistryKeys.PLACED_FEATURE, "tanzanite_ore_placed"); - public static final RegistryKey RUBY_ORE_COMMON_PLACED_KEY = - EnrichedRegisters.createRegistryKey(RegistryKeys.PLACED_FEATURE, "ruby_ore_common_placed"); - public static final RegistryKey SAPPHIRE_ORE_COMMON_PLACED_KEY = - EnrichedRegisters.createRegistryKey( - RegistryKeys.PLACED_FEATURE, "sapphire_ore_common_placed"); - public static final RegistryKey TANZANITE_ORE_COMMON_PLACED_KEY = - EnrichedRegisters.createRegistryKey( - RegistryKeys.PLACED_FEATURE, "tanzanite_ore_common_placed"); - public static final RegistryKey AMBER_ORE_PLACED_KEY = - EnrichedRegisters.createRegistryKey(RegistryKeys.PLACED_FEATURE, "amber_ore_placed"); + EnrichedRegisters.createRegistryKey(RegistryKeys.PLACED_FEATURE, "amber_ore_placed"); public static final RegistryKey TOPAZ_ORE_PLACED_KEY = - EnrichedRegisters.createRegistryKey(RegistryKeys.PLACED_FEATURE, "topaz_ore_placed"); + EnrichedRegisters.createRegistryKey(RegistryKeys.PLACED_FEATURE, "topaz_ore_placed"); public static final RegistryKey TIN_ORE_PLACED_KEY = - EnrichedRegisters.createRegistryKey(RegistryKeys.PLACED_FEATURE, "tin_ore_placed"); + EnrichedRegisters.createRegistryKey(RegistryKeys.PLACED_FEATURE, "tin_ore_placed"); public static final RegistryKey REDWOOD_PLACED_KEY = EnrichedRegisters.createRegistryKey(RegistryKeys.PLACED_FEATURE, "redwood_placed"); @@ -63,7 +54,7 @@ public static void bootstrap(Registerable context) { RUBY_ORE_PLACED_KEY, registryEntryLookup.getOrThrow(EnrichedConfiguredFeatures.RUBY_ORE_KEY), OrePlacedFeatures.modifiersWithCount( - 6, HeightRangePlacementModifier.uniform(YOffset.fixed(-24), YOffset.fixed(60)))); + 7, HeightRangePlacementModifier.uniform(YOffset.fixed(-24), YOffset.fixed(60)))); register( context, @@ -80,25 +71,25 @@ public static void bootstrap(Registerable context) { 6, HeightRangePlacementModifier.uniform(YOffset.fixed(-24), YOffset.fixed(60)))); register( - context, - AMBER_ORE_PLACED_KEY, - registryEntryLookup.getOrThrow(EnrichedConfiguredFeatures.AMBER_ORE_KEY), - OrePlacedFeatures.modifiersWithCount( - 6, HeightRangePlacementModifier.uniform(YOffset.fixed(-24), YOffset.fixed(60)))); + context, + AMBER_ORE_PLACED_KEY, + registryEntryLookup.getOrThrow(EnrichedConfiguredFeatures.AMBER_ORE_KEY), + OrePlacedFeatures.modifiersWithCount( + 6, HeightRangePlacementModifier.uniform(YOffset.fixed(-24), YOffset.fixed(60)))); register( - context, - TOPAZ_ORE_PLACED_KEY, - registryEntryLookup.getOrThrow(EnrichedConfiguredFeatures.TOPAZ_ORE_KEY), - OrePlacedFeatures.modifiersWithCount( - 6, HeightRangePlacementModifier.uniform(YOffset.fixed(-24), YOffset.fixed(60)))); + context, + TOPAZ_ORE_PLACED_KEY, + registryEntryLookup.getOrThrow(EnrichedConfiguredFeatures.TOPAZ_ORE_KEY), + OrePlacedFeatures.modifiersWithCount( + 6, HeightRangePlacementModifier.uniform(YOffset.fixed(-24), YOffset.fixed(60)))); register( - context, - TIN_ORE_PLACED_KEY, - registryEntryLookup.getOrThrow(EnrichedConfiguredFeatures.TIN_ORE_KEY), - OrePlacedFeatures.modifiersWithCount( - 6, HeightRangePlacementModifier.uniform(YOffset.fixed(-10), YOffset.fixed(55)))); + context, + TIN_ORE_PLACED_KEY, + registryEntryLookup.getOrThrow(EnrichedConfiguredFeatures.TIN_ORE_KEY), + OrePlacedFeatures.modifiersWithCount( + 10, HeightRangePlacementModifier.uniform(YOffset.fixed(-10), YOffset.fixed(55)))); register( context,