misc refactoring and tweaks

- increased spawn for tin ore
- updates language file
- added options for new ores

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

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

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

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

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

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

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

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,13 +174,15 @@
   "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",
   "tag.item.c.gems.ruby": "Ruby",
   "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"

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": {

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"

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"

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);
 

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));
   }
 

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...");
 

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.<Boolean>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.<Boolean>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.<Boolean>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.<Boolean>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.<Boolean>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.<Boolean>createBuilder()
                 .name(Text.translatable("enriched.options.worldGeneration.generateDarkGranite"))