From dd0310adf64a0f769329e217879f59ca9647c76d Mon Sep 17 00:00:00 2001 From: Swedz Date: Mon, 1 Sep 2025 02:12:59 -0400 Subject: [PATCH] Fix #1166: Iridium ore says it can generate --- .../blockstates/deepslate_iridium_ore.json | 7 --- .../modern_industrialization/lang/en_us.json | 1 - .../models/block/deepslate_iridium_ore.json | 6 -- .../models/item/deepslate_iridium_ore.json | 3 - .../textures/block/deepslate_iridium_ore.png | Bin 702 -> 0 bytes .../data/c/tags/block/ores/iridium.json | 1 - .../tags/block/ores_in_ground/deepslate.json | 1 - .../data/c/tags/item/ores/iridium.json | 1 - .../c/tags/item/ores_in_ground/deepslate.json | 1 - .../tags/block/mineable/pickaxe.json | 1 - .../tags/block/needs_stone_tool.json | 1 - .../blocks/deepslate_iridium_ore.json | 52 ------------------ .../deepslate_ore_generator_iridium.json | 6 -- .../biome_modifier/ore_generator_iridium.json | 6 -- .../iridium/craft/deepslate_to_ore.json | 13 ----- .../ore_deepslate_to_ingot_blasting.json | 13 ----- .../ore_deepslate_to_ingot_smelting.json | 13 ----- .../deepslate_ore_generator_iridium.json | 18 ------ .../ore_generator_iridium.json | 18 ------ .../deepslate_ore_generator_iridium.json | 27 --------- .../placed_feature/ore_generator_iridium.json | 27 --------- .../materials/MIMaterials.java | 2 +- 22 files changed, 1 insertion(+), 217 deletions(-) delete mode 100644 src/generated/resources/assets/modern_industrialization/blockstates/deepslate_iridium_ore.json delete mode 100644 src/generated/resources/assets/modern_industrialization/models/block/deepslate_iridium_ore.json delete mode 100644 src/generated/resources/assets/modern_industrialization/models/item/deepslate_iridium_ore.json delete mode 100644 src/generated/resources/assets/modern_industrialization/textures/block/deepslate_iridium_ore.png delete mode 100644 src/generated/resources/data/modern_industrialization/loot_table/blocks/deepslate_iridium_ore.json delete mode 100644 src/generated/resources/data/modern_industrialization/neoforge/biome_modifier/deepslate_ore_generator_iridium.json delete mode 100644 src/generated/resources/data/modern_industrialization/neoforge/biome_modifier/ore_generator_iridium.json delete mode 100644 src/generated/resources/data/modern_industrialization/recipe/materials/iridium/craft/deepslate_to_ore.json delete mode 100644 src/generated/resources/data/modern_industrialization/recipe/materials/iridium/smelting/ore_deepslate_to_ingot_blasting.json delete mode 100644 src/generated/resources/data/modern_industrialization/recipe/materials/iridium/smelting/ore_deepslate_to_ingot_smelting.json delete mode 100644 src/generated/resources/data/modern_industrialization/worldgen/configured_feature/deepslate_ore_generator_iridium.json delete mode 100644 src/generated/resources/data/modern_industrialization/worldgen/configured_feature/ore_generator_iridium.json delete mode 100644 src/generated/resources/data/modern_industrialization/worldgen/placed_feature/deepslate_ore_generator_iridium.json delete mode 100644 src/generated/resources/data/modern_industrialization/worldgen/placed_feature/ore_generator_iridium.json diff --git a/src/generated/resources/assets/modern_industrialization/blockstates/deepslate_iridium_ore.json b/src/generated/resources/assets/modern_industrialization/blockstates/deepslate_iridium_ore.json deleted file mode 100644 index c137380dd..000000000 --- a/src/generated/resources/assets/modern_industrialization/blockstates/deepslate_iridium_ore.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "modern_industrialization:block/deepslate_iridium_ore" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/lang/en_us.json b/src/generated/resources/assets/modern_industrialization/lang/en_us.json index 0775f7731..8a8d0b736 100644 --- a/src/generated/resources/assets/modern_industrialization/lang/en_us.json +++ b/src/generated/resources/assets/modern_industrialization/lang/en_us.json @@ -206,7 +206,6 @@ "block.modern_industrialization.cupronickel_coil": "Cupronickel Coil", "block.modern_industrialization.deepslate_antimony_ore": "Deepslate Antimony Ore", "block.modern_industrialization.deepslate_bauxite_ore": "Deepslate Bauxite Ore", - "block.modern_industrialization.deepslate_iridium_ore": "Deepslate Iridium Ore", "block.modern_industrialization.deepslate_lead_ore": "Deepslate Lead Ore", "block.modern_industrialization.deepslate_lignite_coal_ore": "Deepslate Lignite Coal Ore", "block.modern_industrialization.deepslate_monazite_ore": "Deepslate Monazite Ore", diff --git a/src/generated/resources/assets/modern_industrialization/models/block/deepslate_iridium_ore.json b/src/generated/resources/assets/modern_industrialization/models/block/deepslate_iridium_ore.json deleted file mode 100644 index 5a608df81..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/block/deepslate_iridium_ore.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "modern_industrialization:block/deepslate_iridium_ore" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/models/item/deepslate_iridium_ore.json b/src/generated/resources/assets/modern_industrialization/models/item/deepslate_iridium_ore.json deleted file mode 100644 index fbdad1671..000000000 --- a/src/generated/resources/assets/modern_industrialization/models/item/deepslate_iridium_ore.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "modern_industrialization:block/deepslate_iridium_ore" -} \ No newline at end of file diff --git a/src/generated/resources/assets/modern_industrialization/textures/block/deepslate_iridium_ore.png b/src/generated/resources/assets/modern_industrialization/textures/block/deepslate_iridium_ore.png deleted file mode 100644 index 1546f26495e99f7972d1cfa3195c65d74320585f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 702 zcmV;v0zv(WP)WXk-m>Q6rhzK88oaM%i8w?$B!Qj$l(D}#H^vA(ExJJGI|H+*sB{C!){7S}Gt8N@kU?5ngaIT0Qq|Yj$ME69 z2Zqm|KQq|b*)g!QvooAOe+eA5KY#uL8^)NDlJXxpu}q&n9i9$Ap&S_*#_;RcFNXQ^ zm!LQu=ykA5zy=^k3n*kk(FF@>SV{#&DaflJ%L)q%89)Yr0-pt0GmMQK-ylug+}z+O z1Vt?e2L}Tvc0ef>q@K~%))^csAg9L0Mlrx_fTal#AEW`KaoxI&DBb}Xz+z)#26pYa zbEg>u1^F0Oty%@nT(ArVin5tAXENyN=`rlyy#uV))KnKtgIvnQfCNCAK{kW@3rpHC kdhg!749KnmX#<4;01C%UNnGQ1EdT%j07*qoM6N<$f<6f`Y5)KL diff --git a/src/generated/resources/data/c/tags/block/ores/iridium.json b/src/generated/resources/data/c/tags/block/ores/iridium.json index 57fdac61b..b5fb4884e 100644 --- a/src/generated/resources/data/c/tags/block/ores/iridium.json +++ b/src/generated/resources/data/c/tags/block/ores/iridium.json @@ -1,6 +1,5 @@ { "values": [ - "modern_industrialization:deepslate_iridium_ore", "modern_industrialization:iridium_ore" ] } \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/block/ores_in_ground/deepslate.json b/src/generated/resources/data/c/tags/block/ores_in_ground/deepslate.json index 3b610e9c4..8a7c02ba8 100644 --- a/src/generated/resources/data/c/tags/block/ores_in_ground/deepslate.json +++ b/src/generated/resources/data/c/tags/block/ores_in_ground/deepslate.json @@ -2,7 +2,6 @@ "values": [ "modern_industrialization:deepslate_antimony_ore", "modern_industrialization:deepslate_bauxite_ore", - "modern_industrialization:deepslate_iridium_ore", "modern_industrialization:deepslate_lead_ore", "modern_industrialization:deepslate_lignite_coal_ore", "modern_industrialization:deepslate_monazite_ore", diff --git a/src/generated/resources/data/c/tags/item/ores/iridium.json b/src/generated/resources/data/c/tags/item/ores/iridium.json index 57fdac61b..b5fb4884e 100644 --- a/src/generated/resources/data/c/tags/item/ores/iridium.json +++ b/src/generated/resources/data/c/tags/item/ores/iridium.json @@ -1,6 +1,5 @@ { "values": [ - "modern_industrialization:deepslate_iridium_ore", "modern_industrialization:iridium_ore" ] } \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/ores_in_ground/deepslate.json b/src/generated/resources/data/c/tags/item/ores_in_ground/deepslate.json index 3b610e9c4..8a7c02ba8 100644 --- a/src/generated/resources/data/c/tags/item/ores_in_ground/deepslate.json +++ b/src/generated/resources/data/c/tags/item/ores_in_ground/deepslate.json @@ -2,7 +2,6 @@ "values": [ "modern_industrialization:deepslate_antimony_ore", "modern_industrialization:deepslate_bauxite_ore", - "modern_industrialization:deepslate_iridium_ore", "modern_industrialization:deepslate_lead_ore", "modern_industrialization:deepslate_lignite_coal_ore", "modern_industrialization:deepslate_monazite_ore", diff --git a/src/generated/resources/data/minecraft/tags/block/mineable/pickaxe.json b/src/generated/resources/data/minecraft/tags/block/mineable/pickaxe.json index 206f8bf21..d9b01fab2 100644 --- a/src/generated/resources/data/minecraft/tags/block/mineable/pickaxe.json +++ b/src/generated/resources/data/minecraft/tags/block/mineable/pickaxe.json @@ -52,7 +52,6 @@ "modern_industrialization:cupronickel_coil", "modern_industrialization:deepslate_antimony_ore", "modern_industrialization:deepslate_bauxite_ore", - "modern_industrialization:deepslate_iridium_ore", "modern_industrialization:deepslate_lead_ore", "modern_industrialization:deepslate_lignite_coal_ore", "modern_industrialization:deepslate_monazite_ore", diff --git a/src/generated/resources/data/minecraft/tags/block/needs_stone_tool.json b/src/generated/resources/data/minecraft/tags/block/needs_stone_tool.json index ad0eae872..f12ac704a 100644 --- a/src/generated/resources/data/minecraft/tags/block/needs_stone_tool.json +++ b/src/generated/resources/data/minecraft/tags/block/needs_stone_tool.json @@ -52,7 +52,6 @@ "modern_industrialization:cupronickel_coil", "modern_industrialization:deepslate_antimony_ore", "modern_industrialization:deepslate_bauxite_ore", - "modern_industrialization:deepslate_iridium_ore", "modern_industrialization:deepslate_lead_ore", "modern_industrialization:deepslate_lignite_coal_ore", "modern_industrialization:deepslate_monazite_ore", diff --git a/src/generated/resources/data/modern_industrialization/loot_table/blocks/deepslate_iridium_ore.json b/src/generated/resources/data/modern_industrialization/loot_table/blocks/deepslate_iridium_ore.json deleted file mode 100644 index 39aa77ba9..000000000 --- a/src/generated/resources/data/modern_industrialization/loot_table/blocks/deepslate_iridium_ore.json +++ /dev/null @@ -1,52 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "predicates": { - "minecraft:enchantments": [ - { - "enchantments": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - } - ], - "name": "modern_industrialization:deepslate_iridium_ore" - }, - { - "type": "minecraft:item", - "functions": [ - { - "enchantment": "minecraft:fortune", - "formula": "minecraft:ore_drops", - "function": "minecraft:apply_bonus" - }, - { - "function": "minecraft:explosion_decay" - } - ], - "name": "modern_industrialization:raw_iridium" - } - ] - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "modern_industrialization:blocks/deepslate_iridium_ore" -} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/neoforge/biome_modifier/deepslate_ore_generator_iridium.json b/src/generated/resources/data/modern_industrialization/neoforge/biome_modifier/deepslate_ore_generator_iridium.json deleted file mode 100644 index bd8f5e26e..000000000 --- a/src/generated/resources/data/modern_industrialization/neoforge/biome_modifier/deepslate_ore_generator_iridium.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "type": "neoforge:add_features", - "biomes": "#minecraft:is_overworld", - "features": "modern_industrialization:deepslate_ore_generator_iridium", - "step": "underground_ores" -} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/neoforge/biome_modifier/ore_generator_iridium.json b/src/generated/resources/data/modern_industrialization/neoforge/biome_modifier/ore_generator_iridium.json deleted file mode 100644 index 199e1cfea..000000000 --- a/src/generated/resources/data/modern_industrialization/neoforge/biome_modifier/ore_generator_iridium.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "type": "neoforge:add_features", - "biomes": "#minecraft:is_overworld", - "features": "modern_industrialization:ore_generator_iridium", - "step": "underground_ores" -} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/iridium/craft/deepslate_to_ore.json b/src/generated/resources/data/modern_industrialization/recipe/materials/iridium/craft/deepslate_to_ore.json deleted file mode 100644 index 9f9fa4f0f..000000000 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/iridium/craft/deepslate_to_ore.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "item": "modern_industrialization:deepslate_iridium_ore" - } - ], - "result": { - "count": 1, - "id": "modern_industrialization:iridium_ore" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/iridium/smelting/ore_deepslate_to_ingot_blasting.json b/src/generated/resources/data/modern_industrialization/recipe/materials/iridium/smelting/ore_deepslate_to_ingot_blasting.json deleted file mode 100644 index 1a9ad4730..000000000 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/iridium/smelting/ore_deepslate_to_ingot_blasting.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "minecraft:blasting", - "category": "misc", - "cookingtime": 100, - "experience": 0.7, - "ingredient": { - "item": "modern_industrialization:deepslate_iridium_ore" - }, - "result": { - "count": 1, - "id": "modern_industrialization:iridium_ingot" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/recipe/materials/iridium/smelting/ore_deepslate_to_ingot_smelting.json b/src/generated/resources/data/modern_industrialization/recipe/materials/iridium/smelting/ore_deepslate_to_ingot_smelting.json deleted file mode 100644 index 36efe0c3c..000000000 --- a/src/generated/resources/data/modern_industrialization/recipe/materials/iridium/smelting/ore_deepslate_to_ingot_smelting.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "type": "minecraft:smelting", - "category": "misc", - "cookingtime": 200, - "experience": 0.7, - "ingredient": { - "item": "modern_industrialization:deepslate_iridium_ore" - }, - "result": { - "count": 1, - "id": "modern_industrialization:iridium_ingot" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/worldgen/configured_feature/deepslate_ore_generator_iridium.json b/src/generated/resources/data/modern_industrialization/worldgen/configured_feature/deepslate_ore_generator_iridium.json deleted file mode 100644 index 485cb7674..000000000 --- a/src/generated/resources/data/modern_industrialization/worldgen/configured_feature/deepslate_ore_generator_iridium.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "type": "minecraft:ore", - "config": { - "discard_chance_on_air_exposure": 0.0, - "size": 1, - "targets": [ - { - "state": { - "Name": "modern_industrialization:deepslate_iridium_ore" - }, - "target": { - "predicate_type": "minecraft:tag_match", - "tag": "minecraft:deepslate_ore_replaceables" - } - } - ] - } -} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/worldgen/configured_feature/ore_generator_iridium.json b/src/generated/resources/data/modern_industrialization/worldgen/configured_feature/ore_generator_iridium.json deleted file mode 100644 index 9b0039b09..000000000 --- a/src/generated/resources/data/modern_industrialization/worldgen/configured_feature/ore_generator_iridium.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "type": "minecraft:ore", - "config": { - "discard_chance_on_air_exposure": 0.0, - "size": 1, - "targets": [ - { - "state": { - "Name": "modern_industrialization:iridium_ore" - }, - "target": { - "predicate_type": "minecraft:tag_match", - "tag": "minecraft:stone_ore_replaceables" - } - } - ] - } -} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/worldgen/placed_feature/deepslate_ore_generator_iridium.json b/src/generated/resources/data/modern_industrialization/worldgen/placed_feature/deepslate_ore_generator_iridium.json deleted file mode 100644 index cb2677830..000000000 --- a/src/generated/resources/data/modern_industrialization/worldgen/placed_feature/deepslate_ore_generator_iridium.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "feature": "modern_industrialization:deepslate_ore_generator_iridium", - "placement": [ - { - "type": "minecraft:count", - "count": 10 - }, - { - "type": "minecraft:in_square" - }, - { - "type": "minecraft:height_range", - "height": { - "type": "minecraft:uniform", - "max_inclusive": { - "absolute": 16 - }, - "min_inclusive": { - "above_bottom": 0 - } - } - }, - { - "type": "minecraft:biome" - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/data/modern_industrialization/worldgen/placed_feature/ore_generator_iridium.json b/src/generated/resources/data/modern_industrialization/worldgen/placed_feature/ore_generator_iridium.json deleted file mode 100644 index 053e85269..000000000 --- a/src/generated/resources/data/modern_industrialization/worldgen/placed_feature/ore_generator_iridium.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "feature": "modern_industrialization:ore_generator_iridium", - "placement": [ - { - "type": "minecraft:count", - "count": 10 - }, - { - "type": "minecraft:in_square" - }, - { - "type": "minecraft:height_range", - "height": { - "type": "minecraft:uniform", - "max_inclusive": { - "absolute": 16 - }, - "min_inclusive": { - "above_bottom": 0 - } - } - }, - { - "type": "minecraft:biome" - } - ] -} \ No newline at end of file diff --git a/src/main/java/aztech/modern_industrialization/materials/MIMaterials.java b/src/main/java/aztech/modern_industrialization/materials/MIMaterials.java index 2533fedf8..725e62b7e 100644 --- a/src/main/java/aztech/modern_industrialization/materials/MIMaterials.java +++ b/src/main/java/aztech/modern_industrialization/materials/MIMaterials.java @@ -639,7 +639,7 @@ public static MaterialBuilder addVanillaGem(boolean compressor, String gemPath, .set(MaterialProperty.MEAN_RGB, 0xe1e6f5) .set(MaterialProperty.HARDNESS, VERY_HARD) .addParts(BLOCK.of(MaterialBlockSet.DIAMOND)).addParts(ITEM_PURE_METAL).addParts(CURVED_PLATE) - .addParts(ORE.ofAll(10, 1, 16, MaterialOreSet.DIAMOND)) + .addParts(ORE.of(MaterialOreSet.DIAMOND)) .addParts(MACHINE_CASING.of("Quantum Machine Casing", "quantum_machine_casing", 6000f)) .addParts(TANK.of("Quantum Tank","quantum_tank", Integer.MAX_VALUE))