Skip to content

Commit ed7f323

Browse files
NoaaanNoaaan
committed
Fixed overworld nether ores being added twice. Made Osmium mountain-only instead of Manganese
Signed-off-by: Noaaan <[email protected]>
1 parent a0d4668 commit ed7f323

File tree

2 files changed

+52
-51
lines changed

2 files changed

+52
-51
lines changed

‎PATCHNOTES.md

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# 0.10.2
22
Another hotfix.
33
Fixes Palladium not generating, and an issue with the Starrite height range.
4+
Fixed various issues with the ore generation having the wrong spawn conditions.
45

56
# 0.10.1
67
Hotfix!

‎src/main/java/nourl/mythicmetals/world/MythicOreFeatures.java

+51-51
Original file line numberDiff line numberDiff line change
@@ -129,31 +129,31 @@ public static void init() {
129129
if (CONFIG.adamantite.enabled) { OreFeatureHelper.ore(oreAdamantite);}
130130
if (CONFIG.banglum.enabled) { OreFeatureHelper.ore(oreBanglum); }
131131
if (CONFIG.carmot.enabled) { OreFeatureHelper.ore(oreCarmot); }
132-
if (CONFIG.kyber.enabled) { OreFeatureHelper.ore(oreKyber); OreFeatureHelper.ore(oreCalciteKyber); }
132+
if (CONFIG.kyber.enabled) {
133+
OreFeatureHelper.ore(oreKyber);
134+
OreFeatureHelper.ore(oreCalciteKyber);
135+
}
133136
if (CONFIG.manganese.enabled) { OreFeatureHelper.ore(oreManganese); }
134137
if (CONFIG.mythril.enabled) { OreFeatureHelper.ore(oreMythril); }
135138
if (CONFIG.orichalcum.enabled) { OreFeatureHelper.ore(oreOrichalcum); }
136139
if (CONFIG.osmium.enabled) { OreFeatureHelper.ore(oreOsmium); }
137140
if (CONFIG.overworld_nether_ores.enabled) { OreFeatureHelper.ore(overworldNetherOres); }
138-
if (CONFIG.palladium.enabled) {OreFeatureHelper.netherOre(orePalladium);}
139141
if (CONFIG.platinum.enabled) { OreFeatureHelper.ore(orePlatinum); }
140142
if (CONFIG.quadrillum.enabled) { OreFeatureHelper.ore(oreQuadrillum); }
141143
if (CONFIG.runite.enabled) { OreFeatureHelper.ore(oreRunite); }
142144
if (CONFIG.silver.enabled) { OreFeatureHelper.ore(oreSilver); }
143145
if (CONFIG.starrite.enabled) {
144146
OreFeatureHelper.ore(oreStarrite);
145147
OreFeatureHelper.endOre(oreEndStarrite);
146-
}
148+
}
147149
if (CONFIG.tin.enabled) { OreFeatureHelper.ore(oreTin); }
148150
if (CONFIG.unobtainium.enabled) { OreFeatureHelper.ore(oreUnobtainium); }
149151
if (CONFIG.vermiculite.enabled) { OreFeatureHelper.ore(oreVermiculite); }
150152

151153
//Nether Ores
152154
if (CONFIG.midas_gold.enabled) { OreFeatureHelper.netherOre(oreMidasGold); }
153155
if (CONFIG.stormyx.enabled) { OreFeatureHelper.netherOre(oreStormyx); }
154-
if (CONFIG.prometheum.enabled) { OreFeatureHelper.netherOre(orePalladium); }
155-
if (CONFIG.midas_gold.enabled & CONFIG.stormyx.enabled) {
156-
OreFeatureHelper.netherOre(overworldNetherOres);}
156+
if (CONFIG.palladium.enabled) {OreFeatureHelper.netherOre(orePalladium);}
157157

158158
//Ocean only ores
159159
if (CONFIG.aquarium.enabled) {
@@ -234,7 +234,7 @@ public static void init() {
234234
OreFeatureHelper.modBiomeOres("terralith", "tropical_archipelago", orePrometheum);
235235
}
236236
//Mountain only ores
237-
if (CONFIG.manganese.enabled) {
237+
if (CONFIG.osmium.enabled) {
238238
BiomeModifications.addFeature(BiomeSelectors.includeByKey(
239239
BiomeKeys.GRAVELLY_MOUNTAINS,
240240
BiomeKeys.MODIFIED_GRAVELLY_MOUNTAINS,
@@ -245,55 +245,55 @@ public static void init() {
245245
BiomeKeys.SNOWY_MOUNTAINS,
246246
BiomeKeys.SNOWY_TAIGA_MOUNTAINS,
247247
BiomeKeys.TAIGA_MOUNTAINS
248-
), GenerationStep.Feature.UNDERGROUND_ORES, oreManganese);
248+
), GenerationStep.Feature.UNDERGROUND_ORES, oreOsmium);
249249

250-
OreFeatureHelper.modBiomeOres("byg", "alpine_foothills", oreManganese);
251-
OreFeatureHelper.modBiomeOres("byg", "alps", oreManganese);
252-
OreFeatureHelper.modBiomeOres("byg", "black_forest_hills", oreManganese);
253-
OreFeatureHelper.modBiomeOres("byg", "blue_taiga_hills", oreManganese);
254-
OreFeatureHelper.modBiomeOres("byg", "bluff_peaks", oreManganese);
255-
OreFeatureHelper.modBiomeOres("byg", "bluff_steeps", oreManganese);
256-
OreFeatureHelper.modBiomeOres("byg", "boreal_forest_hills", oreManganese);
257-
OreFeatureHelper.modBiomeOres("byg", "cika_mountains", oreManganese);
258-
OreFeatureHelper.modBiomeOres("byg", "coniferous_forest_hills", oreManganese);
259-
OreFeatureHelper.modBiomeOres("byg", "dover_mountains", oreManganese);
260-
OreFeatureHelper.modBiomeOres("byg", "ebony_hills", oreManganese);
261-
OreFeatureHelper.modBiomeOres("byg", "enchatned_forest_hills", oreManganese);
262-
OreFeatureHelper.modBiomeOres("byg", "evergreen_hills", oreManganese);
263-
OreFeatureHelper.modBiomeOres("byg", "grassland_plateau", oreManganese);
264-
OreFeatureHelper.modBiomeOres("byg", "guiana_clearing", oreManganese);
265-
OreFeatureHelper.modBiomeOres("byg", "guiana_shield", oreManganese);
266-
OreFeatureHelper.modBiomeOres("byg", "jacaranda_forest_hills", oreManganese);
267-
OreFeatureHelper.modBiomeOres("byg", "redwood_mountians", oreManganese);
268-
OreFeatureHelper.modBiomeOres("byg", "skyris_highlands", oreManganese);
269-
OreFeatureHelper.modBiomeOres("byg", "wooded_grassland_plateau", oreManganese);
250+
OreFeatureHelper.modBiomeOres("byg", "alpine_foothills", oreOsmium);
251+
OreFeatureHelper.modBiomeOres("byg", "alps", oreOsmium);
252+
OreFeatureHelper.modBiomeOres("byg", "black_forest_hills", oreOsmium);
253+
OreFeatureHelper.modBiomeOres("byg", "blue_taiga_hills", oreOsmium);
254+
OreFeatureHelper.modBiomeOres("byg", "bluff_peaks", oreOsmium);
255+
OreFeatureHelper.modBiomeOres("byg", "bluff_steeps", oreOsmium);
256+
OreFeatureHelper.modBiomeOres("byg", "boreal_forest_hills", oreOsmium);
257+
OreFeatureHelper.modBiomeOres("byg", "cika_mountains", oreOsmium);
258+
OreFeatureHelper.modBiomeOres("byg", "coniferous_forest_hills", oreOsmium);
259+
OreFeatureHelper.modBiomeOres("byg", "dover_mountains", oreOsmium);
260+
OreFeatureHelper.modBiomeOres("byg", "ebony_hills", oreOsmium);
261+
OreFeatureHelper.modBiomeOres("byg", "enchatned_forest_hills", oreOsmium);
262+
OreFeatureHelper.modBiomeOres("byg", "evergreen_hills", oreOsmium);
263+
OreFeatureHelper.modBiomeOres("byg", "grassland_plateau", oreOsmium);
264+
OreFeatureHelper.modBiomeOres("byg", "guiana_clearing", oreOsmium);
265+
OreFeatureHelper.modBiomeOres("byg", "guiana_shield", oreOsmium);
266+
OreFeatureHelper.modBiomeOres("byg", "jacaranda_forest_hills", oreOsmium);
267+
OreFeatureHelper.modBiomeOres("byg", "redwood_mountians", oreOsmium);
268+
OreFeatureHelper.modBiomeOres("byg", "skyris_highlands", oreOsmium);
269+
OreFeatureHelper.modBiomeOres("byg", "wooded_grassland_plateau", oreOsmium);
270270

271-
OreFeatureHelper.modBiomeOres("terrestria", "caldera_foothills", oreManganese);
272-
OreFeatureHelper.modBiomeOres("terrestria", "caldera_ridge", oreManganese);
273-
OreFeatureHelper.modBiomeOres("terrestria", "outback_uluru", oreManganese);
274-
OreFeatureHelper.modBiomeOres("terrestria", "rainbow_rainforest", oreManganese);
275-
OreFeatureHelper.modBiomeOres("terrestria", "rainbow_rainforest_mountains", oreManganese);
271+
OreFeatureHelper.modBiomeOres("terrestria", "caldera_foothills", oreOsmium);
272+
OreFeatureHelper.modBiomeOres("terrestria", "caldera_ridge", oreOsmium);
273+
OreFeatureHelper.modBiomeOres("terrestria", "outback_uluru", oreOsmium);
274+
OreFeatureHelper.modBiomeOres("terrestria", "rainbow_rainforest", oreOsmium);
275+
OreFeatureHelper.modBiomeOres("terrestria", "rainbow_rainforest_mountains", oreOsmium);
276276

277-
OreFeatureHelper.modBiomeOres("traverse", "arid_highlands", oreManganese);
278-
OreFeatureHelper.modBiomeOres("traverse", "cliffs", oreManganese);
279-
OreFeatureHelper.modBiomeOres("traverse", "rolling_hills", oreManganese);
277+
OreFeatureHelper.modBiomeOres("traverse", "arid_highlands", oreOsmium);
278+
OreFeatureHelper.modBiomeOres("traverse", "cliffs", oreOsmium);
279+
OreFeatureHelper.modBiomeOres("traverse", "rolling_hills", oreOsmium);
280280

281-
OreFeatureHelper.modBiomeOres("lakeside", "mountain_lake", oreManganese);
281+
OreFeatureHelper.modBiomeOres("lakeside", "mountain_lake", oreOsmium);
282282

283-
OreFeatureHelper.modBiomeOres("terralith", "emerald_peaks", oreManganese);
284-
OreFeatureHelper.modBiomeOres("terralith", "haze_mountain", oreManganese);
285-
OreFeatureHelper.modBiomeOres("terralith", "jungle_mountains", oreManganese);
286-
OreFeatureHelper.modBiomeOres("terralith", "red_mountains", oreManganese);
287-
OreFeatureHelper.modBiomeOres("terralith", "salt_mountains", oreManganese);
288-
OreFeatureHelper.modBiomeOres("terralith", "sandstone_valley", oreManganese);
289-
OreFeatureHelper.modBiomeOres("terralith", "sandstone_valley_r", oreManganese);
290-
OreFeatureHelper.modBiomeOres("terralith", "savanna_heights", oreManganese);
291-
OreFeatureHelper.modBiomeOres("terralith", "scarlet_mountains", oreManganese);
292-
OreFeatureHelper.modBiomeOres("terralith", "siberian_taiga", oreManganese);
293-
OreFeatureHelper.modBiomeOres("terralith", "stardust_valley", oreManganese);
294-
OreFeatureHelper.modBiomeOres("terralith", "tropical_volcano", oreManganese);
295-
OreFeatureHelper.modBiomeOres("terralith", "yellowstone", oreManganese);
296-
OreFeatureHelper.modBiomeOres("terralith", "yosemite_cliffs", oreManganese);
283+
OreFeatureHelper.modBiomeOres("terralith", "emerald_peaks", oreOsmium);
284+
OreFeatureHelper.modBiomeOres("terralith", "haze_mountain", oreOsmium);
285+
OreFeatureHelper.modBiomeOres("terralith", "jungle_mountains", oreOsmium);
286+
OreFeatureHelper.modBiomeOres("terralith", "red_mountains", oreOsmium);
287+
OreFeatureHelper.modBiomeOres("terralith", "salt_mountains", oreOsmium);
288+
OreFeatureHelper.modBiomeOres("terralith", "sandstone_valley", oreOsmium);
289+
OreFeatureHelper.modBiomeOres("terralith", "sandstone_valley_r", oreOsmium);
290+
OreFeatureHelper.modBiomeOres("terralith", "savanna_heights", oreOsmium);
291+
OreFeatureHelper.modBiomeOres("terralith", "scarlet_mountains", oreOsmium);
292+
OreFeatureHelper.modBiomeOres("terralith", "siberian_taiga", oreOsmium);
293+
OreFeatureHelper.modBiomeOres("terralith", "stardust_valley", oreOsmium);
294+
OreFeatureHelper.modBiomeOres("terralith", "tropical_volcano", oreOsmium);
295+
OreFeatureHelper.modBiomeOres("terralith", "yellowstone", oreOsmium);
296+
OreFeatureHelper.modBiomeOres("terralith", "yosemite_cliffs", oreOsmium);
297297
}
298298

299299
}

0 commit comments

Comments
 (0)