diff --git a/config/BloodMagic/meteors/AsteroidLateGameOres.json b/config/BloodMagic/meteors/AsteroidLateGameOres.json index f080cb212..dac213619 100644 --- a/config/BloodMagic/meteors/AsteroidLateGameOres.json +++ b/config/BloodMagic/meteors/AsteroidLateGameOres.json @@ -1,41 +1,23 @@ { "ores": [ - "oreEndstoneBlackPlutonium", - "100", - "oreEndstoneCosmicNeutronium", - "5", - "oreEndstoneYttrium", - "75", - "oreEndstoneGallium", - "75", - "oreEndstoneMysteriousCrystal", - "25", - "oreEndstoneDeepIron", - "150", - "oreEndstoneNaquadah", - "125", - "oreEndstoneNaquadahEnriched", - "75", - "oreEndstoneNaquadria", - "50", - "oreEndstoneUranium235", - "25", - "oreEndstonePlutonium241", - "25", - "oreEndstoneUranium", - "50", - "oreEndstonePlutonium", - "50", - "oreEndstoneSamarium", - "25", - "oreEndstoneNetherStar", - "10", - "oreEndstoneNeutronium", - "10", - "oreEndstoneNiobium", - "75", - "oreEndstoneBorax", - "75" + "OREDICT:oreEndstoneBlackPlutonium:100", + "OREDICT:oreEndstoneCosmicNeutronium:5", + "OREDICT:oreEndstoneYttrium:75", + "OREDICT:oreEndstoneGallium:75", + "OREDICT:oreEndstoneMysteriousCrystal:25", + "OREDICT:oreEndstoneDeepIron:150", + "OREDICT:oreEndstoneNaquadah:125", + "OREDICT:oreEndstoneNaquadahEnriched:75", + "OREDICT:oreEndstoneNaquadria:50", + "OREDICT:oreEndstoneUranium235:25", + "OREDICT:oreEndstonePlutonium241:25", + "OREDICT:oreEndstoneUranium:50", + "OREDICT:oreEndstonePlutonium:50", + "OREDICT:oreEndstoneSamarium:25", + "OREDICT:oreEndstoneNetherStar:10", + "OREDICT:oreEndstoneNeutronium:10", + "OREDICT:oreEndstoneNiobium:75", + "OREDICT:oreEndstoneBorax:75" ], "radius": 22, "cost": 100000000, @@ -43,4 +25,3 @@ "focusName": "gt.blockmachines", "focusMeta": 10951 } - diff --git a/config/BloodMagic/meteors/CallistoMeteor.json b/config/BloodMagic/meteors/CallistoMeteor.json index 2fb4c4e18..443201a13 100644 --- a/config/BloodMagic/meteors/CallistoMeteor.json +++ b/config/BloodMagic/meteors/CallistoMeteor.json @@ -1,46 +1,30 @@ { "ores": [ - "oreMarbleTopaz", - "50", - "oreMarbleBlueTopaz", - "50", - "oreMarbleChromite", - "75", - "oreMarbleUvarovite", - "125", - "oreMarbleTungstate", - "45", - "oreMarbleScheelite", - "45", - "oreMarbleLithium", - "30", - "oreMarbleAlduorite", - "10", - "oreMarblePalladium", - "35", - "oreMarbleChrome", - "50", - "oreMarblePlatinum", - "65", - "oreMarbleNickel", - "100", - "oreMarbleIridium", - "50", - "oreMarbleLedox", - "50", - "oreMarbleUranium", - "10", - "oreMarblePlutonium", - "1", - "oreMarbleCallistoIce", - "125", - "rockCallisto", - "350" + "OREDICT:oreMarbleTopaz:50", + "OREDICT:oreMarbleBlueTopaz:50", + "OREDICT:oreMarbleChromite:75", + "OREDICT:oreMarbleUvarovite:125", + "OREDICT:oreMarbleTungstate:45", + "OREDICT:oreMarbleScheelite:45", + "OREDICT:oreMarbleLithium:30", + "OREDICT:oreMarbleAlduorite:10", + "OREDICT:oreMarblePalladium:35", + "OREDICT:oreMarbleChrome:50", + "OREDICT:oreMarblePlatinum:65", + "OREDICT:oreMarbleNickel:100", + "OREDICT:oreMarbleIridium:50", + "OREDICT:oreMarbleLedox:50", + "OREDICT:oreMarbleUranium:10", + "OREDICT:oreMarblePlutonium:1", + "OREDICT:oreMarbleCallistoIce:125" + ], + "filler": [ + "OREDICT:rockCallisto:350" ], "radius": 20, "cost": 1000000, "focusModId": "gregtech", "focusName": "gt.metaitem.01", - "focusMeta": 32464 + "focusMeta": 32464, + "fillerChance": 27 } - diff --git a/config/BloodMagic/meteors/CheatyVeryLowQuantityRawTengam.json b/config/BloodMagic/meteors/CheatyVeryLowQuantityRawTengam.json index 45bb2dbd1..75e9140d4 100644 --- a/config/BloodMagic/meteors/CheatyVeryLowQuantityRawTengam.json +++ b/config/BloodMagic/meteors/CheatyVeryLowQuantityRawTengam.json @@ -1,14 +1,14 @@ { "ores": [ - "oreMarbleSalt", - "3000", - "oreTengamRaw", - "4" + "OREDICT:oreTengamRaw:4" + ], + "filler": [ + "OREDICT:oreMarbleSalt:3000" ], "radius": 16, "cost": 1000000001, "focusModId": "GalacticraftAmunRa", "focusName": "tile.machines2", - "focusMeta": 1 + "focusMeta": 1, + "fillerChance": 99 } - diff --git a/config/BloodMagic/meteors/Chinfinity.json b/config/BloodMagic/meteors/Chinfinity.json index 99978e9c6..0b2f2f81d 100644 --- a/config/BloodMagic/meteors/Chinfinity.json +++ b/config/BloodMagic/meteors/Chinfinity.json @@ -1,73 +1,39 @@ { "ores": [ - "oreEndstoneElectrum", - "100", - "oreEndstoneAluminium", - "100", - "oreEndstoneTitanium", - "100", - "oreEndstoneTungsten", - "100", - "oreEndstoneNeodymium", - "100", - "oreEndstoneChrome", - "100", - "oreEndstoneBeryllium", - "100", - "oreEndstoneManganese", - "100", - "oreEndstoneGallium", - "100", - "oreEndstoneYttrium", - "100", - "oreEndstoneNiobium", - "100", - "oreEndstoneStrontium", - "100", - "oreEndstoneCadmium", - "100", - "oreEndstoneTellurium", - "100", - "oreEndstoneBarium", - "100", - "oreEndstoneLanthanum", - "10", - "oreEndstoneIndium", - "5", - "oreEndstoneCerium", - "100", - "oreEndstonePraseodymium", - "100", - "oreEndstonePromethium", - "100", - "oreEndstoneSamarium", - "25", - "oreEndstoneEuropium", - "5", - "oreEndstoneTerbium", - "100", - "oreEndstoneDysprosium", - "100", - "oreEndstoneErbium", - "100", - "oreEndstoneThulium", - "100", - "oreEndstoneLutetium", - "75", - "oreEndstoneTantalum", - "100", - "oreEndstoneYtterbium", - "100", - "oreEndstoneGadolinium", - "100", - "oreEndstoneHolmium", - "100", - "oreEndstoneCaesium", - "100", - "oreEndstoneScandium", - "100", - "oreTiberium", - "100" + "OREDICT:oreEndstoneElectrum:100", + "OREDICT:oreEndstoneAluminium:100", + "OREDICT:oreEndstoneTitanium:100", + "OREDICT:oreEndstoneTungsten:100", + "OREDICT:oreEndstoneNeodymium:100", + "OREDICT:oreEndstoneChrome:100", + "OREDICT:oreEndstoneBeryllium:100", + "OREDICT:oreEndstoneManganese:100", + "OREDICT:oreEndstoneGallium:100", + "OREDICT:oreEndstoneYttrium:100", + "OREDICT:oreEndstoneNiobium:100", + "OREDICT:oreEndstoneStrontium:100", + "OREDICT:oreEndstoneCadmium:100", + "OREDICT:oreEndstoneTellurium:100", + "OREDICT:oreEndstoneBarium:100", + "OREDICT:oreEndstoneLanthanum:10", + "OREDICT:oreEndstoneIndium:5", + "OREDICT:oreEndstoneCerium:100", + "OREDICT:oreEndstonePraseodymium:100", + "OREDICT:oreEndstonePromethium:100", + "OREDICT:oreEndstoneSamarium:25", + "OREDICT:oreEndstoneEuropium:5", + "OREDICT:oreEndstoneTerbium:100", + "OREDICT:oreEndstoneDysprosium:100", + "OREDICT:oreEndstoneErbium:100", + "OREDICT:oreEndstoneThulium:100", + "OREDICT:oreEndstoneLutetium:75", + "OREDICT:oreEndstoneTantalum:100", + "OREDICT:oreEndstoneYtterbium:100", + "OREDICT:oreEndstoneGadolinium:100", + "OREDICT:oreEndstoneHolmium:100", + "OREDICT:oreEndstoneCaesium:100", + "OREDICT:oreEndstoneScandium:100", + "OREDICT:oreTiberium:100" ], "radius": 16, "cost": 80000000, @@ -75,4 +41,3 @@ "focusName": "gt.blockmachines", "focusMeta": 1186 } - diff --git a/config/BloodMagic/meteors/ConcentratedLeadEV.json b/config/BloodMagic/meteors/ConcentratedLeadEV.json index 30e86119a..7e9456bea 100644 --- a/config/BloodMagic/meteors/ConcentratedLeadEV.json +++ b/config/BloodMagic/meteors/ConcentratedLeadEV.json @@ -1,13 +1,9 @@ { "ores": [ - "oreEndstoneLead", - "100", - "oreEndstoneGalena", - "200", - "oreEndstoneSilver", - "100", - "oreEndstoneCryolite", - "100" + "OREDICT:oreEndstoneLead:100", + "OREDICT:oreEndstoneGalena:200", + "OREDICT:oreEndstoneSilver:100", + "OREDICT:oreEndstoneCryolite:100" ], "radius": 9, "cost": 2000000, @@ -15,4 +11,3 @@ "focusName": "gt.blockmachines", "focusMeta": 214 } - diff --git a/config/BloodMagic/meteors/EndstoneHEE.json b/config/BloodMagic/meteors/EndstoneHEE.json index 0f7525ed2..f3217c298 100644 --- a/config/BloodMagic/meteors/EndstoneHEE.json +++ b/config/BloodMagic/meteors/EndstoneHEE.json @@ -1,22 +1,18 @@ { "ores": [ - "endstone", - "799", - "oreHeeEndPowder", - "100", - "oreHeeStardust", - "50", - "oreHeeIgneousRock", - "50", - "oreHeeEndium", - "50", - "oreHeeInstabilityOrb", - "1" + "OREDICT:oreHeeEndPowder:100", + "OREDICT:oreHeeStardust:50", + "OREDICT:oreHeeIgneousRock:50", + "OREDICT:oreHeeEndium:50", + "OREDICT:oreHeeInstabilityOrb:1" + ], + "filler": [ + "OREDICT:endstone:799" ], "radius": 12, "cost": 500000, "focusModId": "minecraft", "focusName": "end_stone", - "focusMeta": 0 + "focusMeta": 0, + "fillerChance": 76 } - diff --git a/config/BloodMagic/meteors/GraphiteMeteor.json b/config/BloodMagic/meteors/GraphiteMeteor.json index 337e97610..512c91b98 100644 --- a/config/BloodMagic/meteors/GraphiteMeteor.json +++ b/config/BloodMagic/meteors/GraphiteMeteor.json @@ -1,18 +1,16 @@ { "ores": [ - "oreBlackgraniteGraphite", - "500", - "oreBlackgraniteDiamond", - "50", - "oreBlackgraniteCoal", - "200", - "stoneGraniteBlack", - "250" + "OREDICT:oreBlackgraniteGraphite:500", + "OREDICT:oreBlackgraniteDiamond:50", + "OREDICT:oreBlackgraniteCoal:200" + ], + "filler": [ + "OREDICT:stoneGraniteBlack:250" ], "radius": 13, "cost": 420000, "focusModId": "gregtech", "focusName": "gt.metaitem.02", - "focusMeta": 30500 + "focusMeta": 30500, + "fillerChance": 25 } - diff --git a/config/BloodMagic/meteors/GreaterEndstoneVariant.json b/config/BloodMagic/meteors/GreaterEndstoneVariant.json index 43c58ce1b..83802f4ac 100644 --- a/config/BloodMagic/meteors/GreaterEndstoneVariant.json +++ b/config/BloodMagic/meteors/GreaterEndstoneVariant.json @@ -1,84 +1,49 @@ { "ores": [ - "endstone", - "150", - "oreEndstoneMagnetite", - "115", - "oreEndstoneVanadiumMagnetite", - "75", - "oreEndstoneGold", - "75", - "oreEndstoneChalcopyrite", - "85", - "oreEndstoneIron", - "60", - "oreEndstonePyrite", - "75", - "oreEndstoneCopper", - "95", - "oreEndstoneTetrahedrite", - "115", - "oreEndstoneStibnite", - "75", - "oreEndstoneGrossular", - "55", - "oreEndstoneSpessartine", - "55", - "oreEndstonePyrolusite", - "45", - "oreEndstoneTantalite", - "45", - "oreEndstoneBeryllium", - "65", - "oreEndstoneEmerald", - "40", - "oreEndstoneThorium", - "50", - "oreEndstoneWulfenite", - "25", - "oreEndstoneMolybdenite", - "25", - "oreEndstoneMolybdenum", - "25", - "oreEndstonePowellite", - "25", - "oreEndstoneBentonite", - "55", - "oreEndstoneMagnesite", - "55", - "oreEndstoneOlivine", - "55", - "oreEndstoneGlauconite", - "45", - "oreEndstoneGarnierite", - "65", - "oreEndstoneNickel", - "65", - "oreEndstoneCobaltite", - "65", - "oreEndstonePentlandite", - "125", - "oreEndstoneScheelite", - "20", - "oreEndstoneTungstate", - "20", - "oreEndstoneLithium", - "25", - "oreEndstoneIridium", - "25", - "oreEndstonePlatinum", - "25", - "oreEndstonePalladium", - "25", - "oreEndstoneNaquadah", - "15", - "oreEndstoneNaquadahEnriched", - "5" + "OREDICT:oreEndstoneMagnetite:115", + "OREDICT:oreEndstoneVanadiumMagnetite:75", + "OREDICT:oreEndstoneGold:75", + "OREDICT:oreEndstoneChalcopyrite:85", + "OREDICT:oreEndstoneIron:60", + "OREDICT:oreEndstonePyrite:75", + "OREDICT:oreEndstoneCopper:95", + "OREDICT:oreEndstoneTetrahedrite:115", + "OREDICT:oreEndstoneStibnite:75", + "OREDICT:oreEndstoneGrossular:55", + "OREDICT:oreEndstoneSpessartine:55", + "OREDICT:oreEndstonePyrolusite:45", + "OREDICT:oreEndstoneTantalite:45", + "OREDICT:oreEndstoneBeryllium:65", + "OREDICT:oreEndstoneEmerald:40", + "OREDICT:oreEndstoneThorium:50", + "OREDICT:oreEndstoneWulfenite:25", + "OREDICT:oreEndstoneMolybdenite:25", + "OREDICT:oreEndstoneMolybdenum:25", + "OREDICT:oreEndstonePowellite:25", + "OREDICT:oreEndstoneBentonite:55", + "OREDICT:oreEndstoneMagnesite:55", + "OREDICT:oreEndstoneOlivine:55", + "OREDICT:oreEndstoneGlauconite:45", + "OREDICT:oreEndstoneGarnierite:65", + "OREDICT:oreEndstoneNickel:65", + "OREDICT:oreEndstoneCobaltite:65", + "OREDICT:oreEndstonePentlandite:125", + "OREDICT:oreEndstoneScheelite:20", + "OREDICT:oreEndstoneTungstate:20", + "OREDICT:oreEndstoneLithium:25", + "OREDICT:oreEndstoneIridium:25", + "OREDICT:oreEndstonePlatinum:25", + "OREDICT:oreEndstonePalladium:25", + "OREDICT:oreEndstoneNaquadah:15", + "OREDICT:oreEndstoneNaquadahEnriched:5" + ], + "filler": [ + "OREDICT:endstone:150" ], "radius": 18, "cost": 3250000, "focusModId": "gregtech", "focusName": "gt.blockmachines", - "focusMeta": 1182 + "focusMeta": 1182, + "fillerChance": 7 } - diff --git a/config/BloodMagic/meteors/ImpureSuperNiobiumSpaceMix.json b/config/BloodMagic/meteors/ImpureSuperNiobiumSpaceMix.json index f34a6210c..e84cdac7c 100644 --- a/config/BloodMagic/meteors/ImpureSuperNiobiumSpaceMix.json +++ b/config/BloodMagic/meteors/ImpureSuperNiobiumSpaceMix.json @@ -1,26 +1,20 @@ { "ores": [ - "oreRedgraniteApatite", - "150", - "oreRedgraniteTricalciumPhosphate", - "150", - "oreRedgranitePyrochlore", - "100", - "oreRedgraniteTantalite", - "100", - "rockMars", - "125", - "rockPhobos", - "125", - "rockDeimos", - "125", - "rockAsteroids", - "125" + "OREDICT:oreRedgraniteApatite:150", + "OREDICT:oreRedgraniteTricalciumPhosphate:150", + "OREDICT:oreRedgranitePyrochlore:100", + "OREDICT:oreRedgraniteTantalite:100" + ], + "filler": [ + "OREDICT:rockMars:125", + "OREDICT:rockPhobos:125", + "OREDICT:rockDeimos:125", + "OREDICT:rockAsteroids:125" ], "radius": 18, "cost": 1000000, "focusModId": "gregtech", "focusName": "gt.metaitem.01", - "focusMeta": 32672 + "focusMeta": 32672, + "fillerChance": 50 } - diff --git a/config/BloodMagic/meteors/IndiumGreaterVariant.json b/config/BloodMagic/meteors/IndiumGreaterVariant.json index e893d31a4..7b94cc996 100644 --- a/config/BloodMagic/meteors/IndiumGreaterVariant.json +++ b/config/BloodMagic/meteors/IndiumGreaterVariant.json @@ -1,15 +1,10 @@ { "ores": [ - "oreEndstoneLead", - "1000", - "oreEndstoneGalena", - "1600", - "oreEndstoneSilver", - "800", - "oreEndstoneSphalerite", - "800", - "oreEndstoneIndium", - "1" + "OREDICT:oreEndstoneLead:1000", + "OREDICT:oreEndstoneGalena:1600", + "OREDICT:oreEndstoneSilver:800", + "OREDICT:oreEndstoneSphalerite:800", + "OREDICT:oreEndstoneIndium:1" ], "radius": 14, "cost": 50000000, @@ -17,4 +12,3 @@ "focusName": "gt.metaitem.03", "focusMeta": 32094 } - diff --git a/config/BloodMagic/meteors/LegacyGemBunch.json b/config/BloodMagic/meteors/LegacyGemBunch.json index 197abf8c8..404031b9c 100644 --- a/config/BloodMagic/meteors/LegacyGemBunch.json +++ b/config/BloodMagic/meteors/LegacyGemBunch.json @@ -1,49 +1,32 @@ { "ores": [ - "stoneGraniteBlack", - "499", - "oreBlackgraniteDiamond", - "100", - "oreBlackgraniteEmerald", - "50", - "oreBlackgraniteRuby", - "50", - "oreBlackgraniteSapphire", - "25", - "oreBlackgraniteGreenSapphire", - "25", - "oreBlackgraniteOlivine", - "25", - "oreBlackgraniteTopaz", - "25", - "oreBlackgraniteTanzanite", - "25", - "oreBlackgraniteAmethyst", - "25", - "oreBlackgraniteOpal", - "25", - "oreBlackgraniteJasper", - "25", - "oreBlackgraniteBlueTopaz", - "25", - "oreBlackgraniteGarnetRed", - "25", - "oreBlackgraniteGarnetYellow", - "25", - "oreBlackgraniteJade", - "25", - "oreBlackgraniteVinteum", - "25", - "oreBlackgraniteLapis", - "50", - "oreBlackgraniteLazurite", - "50", - "oreBlackgraniteNetherStar", - "1" + "OREDICT:oreBlackgraniteDiamond:100", + "OREDICT:oreBlackgraniteEmerald:50", + "OREDICT:oreBlackgraniteRuby:50", + "OREDICT:oreBlackgraniteSapphire:25", + "OREDICT:oreBlackgraniteGreenSapphire:25", + "OREDICT:oreBlackgraniteOlivine:25", + "OREDICT:oreBlackgraniteTopaz:25", + "OREDICT:oreBlackgraniteTanzanite:25", + "OREDICT:oreBlackgraniteAmethyst:25", + "OREDICT:oreBlackgraniteOpal:25", + "OREDICT:oreBlackgraniteJasper:25", + "OREDICT:oreBlackgraniteBlueTopaz:25", + "OREDICT:oreBlackgraniteGarnetRed:25", + "OREDICT:oreBlackgraniteGarnetYellow:25", + "OREDICT:oreBlackgraniteJade:25", + "OREDICT:oreBlackgraniteVinteum:25", + "OREDICT:oreBlackgraniteLapis:50", + "OREDICT:oreBlackgraniteLazurite:50", + "OREDICT:oreBlackgraniteNetherStar:1" + ], + "filler": [ + "OREDICT:stoneGraniteBlack:499" ], "radius": 12, "cost": 500000, "focusModId": "gregtech", "focusName": "gt.metaitem.01", - "focusMeta": 24347 + "focusMeta": 24347, + "fillerChance": 44 } diff --git a/config/BloodMagic/meteors/LegacyMarsMeteor.json b/config/BloodMagic/meteors/LegacyMarsMeteor.json index 679f9201c..25d0f4f23 100644 --- a/config/BloodMagic/meteors/LegacyMarsMeteor.json +++ b/config/BloodMagic/meteors/LegacyMarsMeteor.json @@ -1,45 +1,25 @@ { "ores": [ - "oreBlackgraniteMeteoricIron", - "10", - "oreBlackgraniteChromite", - "50", - "oreBlackgraniteBastnasite", - "100", - "oreBlackgraniteMonazite", - "30", - "oreBlackgraniteMolybdenum", - "70", - "oreBlackgranitePyrochlore", - "50", - "oreBlackgraniteNeodymium", - "50", - "oreBlackgraniteBarite", - "50", - "oreBlackgraniteCertusQuartz", - "25", - "oreBlackgraniteDesh", - "60", - "oreBlackgraniteThorium", - "50", - "oreBlackgraniteUraninite", - "50", - "oreBlackgraniteUranium", - "30", - "oreBlackgranitePitchblende", - "50", - "oreBlackgraniteDraconium", - "50", - "oreBlackgraniteElectrotine", - "50", - "oreBlackgraniteOriharukon", - "50", - "oreBlackgraniteArsenic", - "50", - "oreBlackgraniteBismuth", - "50", - "oreBlackgraniteAntimony", - "50" + "OREDICT:oreBlackgraniteMeteoricIron:10", + "OREDICT:oreBlackgraniteChromite:50", + "OREDICT:oreBlackgraniteBastnasite:100", + "OREDICT:oreBlackgraniteMonazite:30", + "OREDICT:oreBlackgraniteMolybdenum:70", + "OREDICT:oreBlackgranitePyrochlore:50", + "OREDICT:oreBlackgraniteNeodymium:50", + "OREDICT:oreBlackgraniteBarite:50", + "OREDICT:oreBlackgraniteCertusQuartz:25", + "OREDICT:oreBlackgraniteDesh:60", + "OREDICT:oreBlackgraniteThorium:50", + "OREDICT:oreBlackgraniteUraninite:50", + "OREDICT:oreBlackgraniteUranium:30", + "OREDICT:oreBlackgranitePitchblende:50", + "OREDICT:oreBlackgraniteDraconium:50", + "OREDICT:oreBlackgraniteElectrotine:50", + "OREDICT:oreBlackgraniteOriharukon:50", + "OREDICT:oreBlackgraniteArsenic:50", + "OREDICT:oreBlackgraniteBismuth:50", + "OREDICT:oreBlackgraniteAntimony:50" ], "radius": 13, "cost": 500000, @@ -47,4 +27,3 @@ "focusName": "gt.metaitem.01", "focusMeta": 32692 } - diff --git a/config/BloodMagic/meteors/LegacyOWMeteor.json b/config/BloodMagic/meteors/LegacyOWMeteor.json index 7fb987777..f04347faa 100644 --- a/config/BloodMagic/meteors/LegacyOWMeteor.json +++ b/config/BloodMagic/meteors/LegacyOWMeteor.json @@ -1,46 +1,30 @@ { "ores": [ - "oreBlackgraniteTantalite", - "60", - "oreBlackgraniteMica", - "60", - "oreBlackgraniteAsbestos", - "20", - "oreBlackgraniteCalcite", - "60", - "oreBlackgraniteSoapstone", - "20", - "oreBlackgraniteVanadiumMagnetite", - "60", - "oreBlackgraniteSalt", - "50", - "oreBlackgraniteRockSalt", - "50", - "oreBlackgraniteSphalerite", - "50", - "oreBlackgraniteIron", - "5", - "oreBlackgraniteNickel", - "15", - "oreBlackgraniteCopper", - "200", - "oreBlackgraniteTin", - "20", - "oreBlackgraniteLead", - "40", - "oreBlackgraniteSilver", - "50", - "oreBlackgraniteGold", - "50", - "oreBlackgraniteCassiterite", - "70", - "stoneGraniteBlack", - "200" + "OREDICT:oreBlackgraniteTantalite:60", + "OREDICT:oreBlackgraniteMica:60", + "OREDICT:oreBlackgraniteAsbestos:20", + "OREDICT:oreBlackgraniteCalcite:60", + "OREDICT:oreBlackgraniteSoapstone:20", + "OREDICT:oreBlackgraniteVanadiumMagnetite:60", + "OREDICT:oreBlackgraniteSalt:50", + "OREDICT:oreBlackgraniteRockSalt:50", + "OREDICT:oreBlackgraniteSphalerite:50", + "OREDICT:oreBlackgraniteIron:5", + "OREDICT:oreBlackgraniteNickel:15", + "OREDICT:oreBlackgraniteCopper:200", + "OREDICT:oreBlackgraniteTin:20", + "OREDICT:oreBlackgraniteLead:40", + "OREDICT:oreBlackgraniteSilver:50", + "OREDICT:oreBlackgraniteGold:50", + "OREDICT:oreBlackgraniteCassiterite:70" + ], + "filler": [ + "OREDICT:stoneGraniteBlack:200" ], "radius": 16, "cost": 300000, "focusModId": "gregtech", "focusName": "gt.metaitem.01", - "focusMeta": 32680 + "focusMeta": 32680, + "fillerChance": 18 } - diff --git a/config/BloodMagic/meteors/LegacyVariousOreBunch.json b/config/BloodMagic/meteors/LegacyVariousOreBunch.json index 0077dccee..d7e78604e 100644 --- a/config/BloodMagic/meteors/LegacyVariousOreBunch.json +++ b/config/BloodMagic/meteors/LegacyVariousOreBunch.json @@ -1,21 +1,13 @@ { "ores": [ - "oreBlackgraniteRutile", - "100", - "oreBlackgraniteTungstate", - "100", - "oreBlackgraniteCopper", - "300", - "oreBlackgraniteSalt", - "200", - "oreBlackgraniteRockSalt", - "200", - "oreBlackgraniteMica", - "60", - "oreBlackgraniteAsbestos", - "20", - "oreBlackgraniteSoapstone", - "20" + "OREDICT:oreBlackgraniteRutile:100", + "OREDICT:oreBlackgraniteTungstate:100", + "OREDICT:oreBlackgraniteCopper:300", + "OREDICT:oreBlackgraniteSalt:200", + "OREDICT:oreBlackgraniteRockSalt:200", + "OREDICT:oreBlackgraniteMica:60", + "OREDICT:oreBlackgraniteAsbestos:20", + "OREDICT:oreBlackgraniteSoapstone:20" ], "radius": 9, "cost": 750000, @@ -23,4 +15,3 @@ "focusName": "nether_star", "focusMeta": 0 } - diff --git a/config/BloodMagic/meteors/MASTER1_GemMaster.json b/config/BloodMagic/meteors/MASTER1_GemMaster.json index a5e58d005..60a0f47d2 100644 --- a/config/BloodMagic/meteors/MASTER1_GemMaster.json +++ b/config/BloodMagic/meteors/MASTER1_GemMaster.json @@ -1,57 +1,31 @@ { "ores": [ - "oreEndstoneDiamond", - "5", - "oreEndstoneEmerald", - "5", - "oreEndstoneRuby", - "5", - "oreEndstoneSapphire", - "5", - "oreEndstoneGreenSapphire", - "5", - "oreEndstoneOlivine", - "5", - "oreEndstoneTopaz", - "5", - "oreEndstoneTanzanite", - "5", - "oreEndstoneAmethyst", - "5", - "oreEndstoneOpal", - "5", - "oreEndstoneJasper", - "5", - "oreEndstoneBlueTopaz", - "5", - "oreEndstoneGarnetRed", - "5", - "oreEndstoneGarnetYellow", - "5", - "oreEndstoneJade", - "5", - "oreEndstoneVinteum", - "5", - "oreEndstoneLapis", - "5", - "oreEndstoneLazurite", - "5", - "oreEndstoneMysteriousCrystal", - "5", - "oreEndstoneInfusedFire", - "5", - "oreEndstoneInfusedAir", - "5", - "oreEndstoneInfusedWater", - "5", - "oreEndstoneInfusedEarth", - "5", - "oreEndstoneInfusedOrder", - "5", - "oreEndstoneInfusedEntropy", - "5", - "oreEndstoneNetherStar", - "5" + "OREDICT:oreEndstoneDiamond:5", + "OREDICT:oreEndstoneEmerald:5", + "OREDICT:oreEndstoneRuby:5", + "OREDICT:oreEndstoneSapphire:5", + "OREDICT:oreEndstoneGreenSapphire:5", + "OREDICT:oreEndstoneOlivine:5", + "OREDICT:oreEndstoneTopaz:5", + "OREDICT:oreEndstoneTanzanite:5", + "OREDICT:oreEndstoneAmethyst:5", + "OREDICT:oreEndstoneOpal:5", + "OREDICT:oreEndstoneJasper:5", + "OREDICT:oreEndstoneBlueTopaz:5", + "OREDICT:oreEndstoneGarnetRed:5", + "OREDICT:oreEndstoneGarnetYellow:5", + "OREDICT:oreEndstoneJade:5", + "OREDICT:oreEndstoneVinteum:5", + "OREDICT:oreEndstoneLapis:5", + "OREDICT:oreEndstoneLazurite:5", + "OREDICT:oreEndstoneMysteriousCrystal:5", + "OREDICT:oreEndstoneInfusedFire:5", + "OREDICT:oreEndstoneInfusedAir:5", + "OREDICT:oreEndstoneInfusedWater:5", + "OREDICT:oreEndstoneInfusedEarth:5", + "OREDICT:oreEndstoneInfusedOrder:5", + "OREDICT:oreEndstoneInfusedEntropy:5", + "OREDICT:oreEndstoneNetherStar:5" ], "radius": 32, "cost": 90000000, diff --git a/config/BloodMagic/meteors/MagicalOres.json b/config/BloodMagic/meteors/MagicalOres.json index 8b11f19bd..fa0eda463 100644 --- a/config/BloodMagic/meteors/MagicalOres.json +++ b/config/BloodMagic/meteors/MagicalOres.json @@ -1,36 +1,25 @@ { "ores": [ - "oreMarbleInfusedAir", - "75", - "oreMarbleInfusedFire", - "75", - "oreMarbleInfusedWater", - "75", - "oreMarbleInfusedEarth", - "75", - "oreMarbleInfusedOrder", - "75", - "oreMarbleInfusedEntropy", - "75", - "oreMarbleAmber", - "150", - "oreMarbleCinnabar", - "250", - "oreMarbleVinteum", - "10", - "oreMarbleShadowIron", - "10", - "oreMarbleInfusedGold", - "10", - "oreMarbleShadow", - "10", - "stoneMarble", - "110" + "OREDICT:oreMarbleInfusedAir:75", + "OREDICT:oreMarbleInfusedFire:75", + "OREDICT:oreMarbleInfusedWater:75", + "OREDICT:oreMarbleInfusedEarth:75", + "OREDICT:oreMarbleInfusedOrder:75", + "OREDICT:oreMarbleInfusedEntropy:75", + "OREDICT:oreMarbleAmber:150", + "OREDICT:oreMarbleCinnabar:250", + "OREDICT:oreMarbleVinteum:10", + "OREDICT:oreMarbleShadowIron:10", + "OREDICT:oreMarbleInfusedGold:10", + "OREDICT:oreMarbleShadow:10" + ], + "filler": [ + "OREDICT:stoneMarble:110" ], "radius": 15, "cost": 800000, "focusModId": "Thaumcraft", "focusName": "ItemSanitySoap", - "focusMeta": 0 + "focusMeta": 0, + "fillerChance": 11 } - diff --git a/config/BloodMagic/meteors/MysteriousMeteor.json b/config/BloodMagic/meteors/MysteriousMeteor.json index bea8896fb..653927fa7 100644 --- a/config/BloodMagic/meteors/MysteriousMeteor.json +++ b/config/BloodMagic/meteors/MysteriousMeteor.json @@ -1,14 +1,14 @@ { "ores": [ - "rockEnceladus", - "600", - "oreEndstoneMysteriousCrystal", - "400" + "OREDICT:oreEndstoneMysteriousCrystal:400" + ], + "filler": [ + "OREDICT:rockEnceladus:600" ], "radius": 16, "cost": 44000000, "focusModId": "gregtech", "focusName": "gt.blockmachines", - "focusMeta": 10990 + "focusMeta": 10990, + "fillerChance": 60 } - diff --git a/config/BloodMagic/meteors/NaquadahPure.json b/config/BloodMagic/meteors/NaquadahPure.json index 67dd54a05..bf4f3d5c4 100644 --- a/config/BloodMagic/meteors/NaquadahPure.json +++ b/config/BloodMagic/meteors/NaquadahPure.json @@ -1,13 +1,9 @@ { "ores": [ - "oreEndstoneNaquadah", - "75", - "oreEndstoneNaquadahEnriched", - "50", - "oreEndstoneNaquadria", - "15", - "oreTiberium", - "100" + "OREDICT:oreEndstoneNaquadah:75", + "OREDICT:oreEndstoneNaquadahEnriched:50", + "OREDICT:oreEndstoneNaquadria:15", + "OREDICT:oreTiberium:100" ], "radius": 16, "cost": 25000000, @@ -15,4 +11,3 @@ "focusName": "gt.metaitem.03", "focusMeta": 32091 } - diff --git a/config/BloodMagic/meteors/OWMeteorVersionTwo.json b/config/BloodMagic/meteors/OWMeteorVersionTwo.json index f129f1e40..b72e95785 100644 --- a/config/BloodMagic/meteors/OWMeteorVersionTwo.json +++ b/config/BloodMagic/meteors/OWMeteorVersionTwo.json @@ -1,42 +1,28 @@ { "ores": [ - "oreBlackgraniteOilsands", - "120", - "oreBlackgraniteMica", - "50", - "oreBlackgraniteAsbestos", - "50", - "oreBlackgraniteCalcite", - "80", - "oreBlackgraniteLepidolite", - "70", - "oreBlackgraniteVanadiumMagnetite", - "80", - "oreBlackgraniteSalt", - "20", - "oreBlackgraniteRockSalt", - "20", - "oreBlackgraniteSphalerite", - "70", - "oreBlackgranitePollucite", - "25", - "oreBlackgraniteNickel", - "55", - "oreBlackgraniteCopper", - "75", - "oreBlackgraniteRedstone", - "80", - "oreBlackgraniteCinnabar", - "120", - "oreBlackgraniteSilver", - "90", - "stoneGraniteBlack", - "200" + "OREDICT:oreBlackgraniteOilsands:120", + "OREDICT:oreBlackgraniteMica:50", + "OREDICT:oreBlackgraniteAsbestos:50", + "OREDICT:oreBlackgraniteCalcite:80", + "OREDICT:oreBlackgraniteLepidolite:70", + "OREDICT:oreBlackgraniteVanadiumMagnetite:80", + "OREDICT:oreBlackgraniteSalt:20", + "OREDICT:oreBlackgraniteRockSalt:20", + "OREDICT:oreBlackgraniteSphalerite:70", + "OREDICT:oreBlackgranitePollucite:25", + "OREDICT:oreBlackgraniteNickel:55", + "OREDICT:oreBlackgraniteCopper:75", + "OREDICT:oreBlackgraniteRedstone:80", + "OREDICT:oreBlackgraniteCinnabar:120", + "OREDICT:oreBlackgraniteSilver:90" + ], + "filler": [ + "OREDICT:stoneGraniteBlack:200" ], "radius": 18, "cost": 300000, "focusModId": "gregtech", "focusName": "gt.metaitem.01", - "focusMeta": 32690 + "focusMeta": 32690, + "fillerChance": 17 } - diff --git a/config/BloodMagic/meteors/OWMoonrockMix.json b/config/BloodMagic/meteors/OWMoonrockMix.json index 25f30597a..91ac3b1a6 100644 --- a/config/BloodMagic/meteors/OWMoonrockMix.json +++ b/config/BloodMagic/meteors/OWMoonrockMix.json @@ -1,38 +1,26 @@ { "ores": [ - "oreMarbleCassiteriteSand", - "50", - "oreMarbleCassiterite", - "50", - "oreMarbleTin", - "25", - "oreMarbleGarnetSand", - "50", - "oreMarbleAsbestos", - "25", - "oreMarbleDiatomite", - "25", - "stoneMarble", - "250", - "oreMarbleBasalticMineralSand", - "50", - "oreMarbleGraniticMineralSand", - "50", - "oreMarbleFullersEarth", - "50", - "oreMarbleGypsum", - "50", - "oreMarbleCheese", - "25", - "oreMarbleMica", - "25", - "rockMoon", - "250" + "OREDICT:oreMarbleCassiteriteSand:50", + "OREDICT:oreMarbleCassiterite:50", + "OREDICT:oreMarbleTin:25", + "OREDICT:oreMarbleGarnetSand:50", + "OREDICT:oreMarbleAsbestos:25", + "OREDICT:oreMarbleDiatomite:25", + "OREDICT:oreMarbleBasalticMineralSand:50", + "OREDICT:oreMarbleGraniticMineralSand:50", + "OREDICT:oreMarbleFullersEarth:50", + "OREDICT:oreMarbleGypsum:50", + "OREDICT:oreMarbleCheese:25", + "OREDICT:oreMarbleMica:25" + ], + "filler": [ + "OREDICT:rockMoon:250", + "OREDICT:stoneMarble:250" ], "radius": 15, "cost": 650000, "focusModId": "harvestcraft", "focusName": "cheeseItem", - "focusMeta": 0 + "focusMeta": 0, + "fillerChance": 50 } - diff --git a/config/BloodMagic/meteors/Pufferfish.json b/config/BloodMagic/meteors/Pufferfish.json index 4734d522b..5c76fc21a 100644 --- a/config/BloodMagic/meteors/Pufferfish.json +++ b/config/BloodMagic/meteors/Pufferfish.json @@ -1,22 +1,18 @@ { "ores": [ - "oreBasaltSalt", - "75", - "oreBasaltRockSalt", - "75", - "oreBasaltSaltpeter", - "200", - "oreBasaltBasalticMineralSand", - "25", - "oreBasaltGraniticMineralSand", - "25", - "stoneBasalt", - "100" + "OREDICT:oreBasaltSalt:75", + "OREDICT:oreBasaltRockSalt:75", + "OREDICT:oreBasaltSaltpeter:200", + "OREDICT:oreBasaltBasalticMineralSand:25", + "OREDICT:oreBasaltGraniticMineralSand:25" + ], + "filler": [ + "OREDICT:stoneBasalt:100" ], "radius": 16, "cost": 6666666, "focusModId": "minecraft", "focusName": "fish", - "focusMeta": 3 + "focusMeta": 3, + "fillerChance": 20 } - diff --git a/config/BloodMagic/meteors/PureMarsRelatedOres.json b/config/BloodMagic/meteors/PureMarsRelatedOres.json index 565f2603f..668140fdb 100644 --- a/config/BloodMagic/meteors/PureMarsRelatedOres.json +++ b/config/BloodMagic/meteors/PureMarsRelatedOres.json @@ -1,55 +1,30 @@ { "ores": [ - "oreMarbleBauxite", - "135", - "oreMarbleIlmenite", - "105", - "oreMarbleAluminium", - "55", - "oreMarbleChromite", - "35", - "oreMarbleUvarovite", - "55", - "oreMarblePerlite", - "35", - "oreMarbleBastnasite", - "85", - "oreMarbleNeodymium", - "75", - "oreMarbleMonazite", - "65", - "oreBasaltGalena", - "85", - "oreBasaltSphalerite", - "45", - "oreBasaltSilver", - "35", - "oreBasaltCinnabar", - "45", - "oreBasaltLead", - "35", - "oreBasaltCobaltite", - "35", - "oreBasaltNickel", - "45", - "oreBasaltArsenic", - "35", - "oreBasaltDesh", - "50", - "oreBasaltTungstate", - "75", - "oreBasaltScheelite", - "75", - "oreBasaltUraninite", - "75", - "oreBasaltPitchblende", - "75", - "oreBasaltUranium", - "65", - "oreBasaltOriharukon", - "35", - "oreEndstoneMeteoricIron", - "75" + "OREDICT:oreMarbleBauxite:135", + "OREDICT:oreMarbleIlmenite:105", + "OREDICT:oreMarbleAluminium:55", + "OREDICT:oreMarbleChromite:35", + "OREDICT:oreMarbleUvarovite:55", + "OREDICT:oreMarblePerlite:35", + "OREDICT:oreMarbleBastnasite:85", + "OREDICT:oreMarbleNeodymium:75", + "OREDICT:oreMarbleMonazite:65", + "OREDICT:oreBasaltGalena:85", + "OREDICT:oreBasaltSphalerite:45", + "OREDICT:oreBasaltSilver:35", + "OREDICT:oreBasaltCinnabar:45", + "OREDICT:oreBasaltLead:35", + "OREDICT:oreBasaltCobaltite:35", + "OREDICT:oreBasaltNickel:45", + "OREDICT:oreBasaltArsenic:35", + "OREDICT:oreBasaltDesh:50", + "OREDICT:oreBasaltTungstate:75", + "OREDICT:oreBasaltScheelite:75", + "OREDICT:oreBasaltUraninite:75", + "OREDICT:oreBasaltPitchblende:75", + "OREDICT:oreBasaltUranium:65", + "OREDICT:oreBasaltOriharukon:35", + "OREDICT:oreEndstoneMeteoricIron:75" ], "radius": 24, "cost": 6000000, @@ -57,4 +32,3 @@ "focusName": "gt.blockmachines", "focusMeta": 463 } - diff --git a/config/BloodMagic/meteors/PureMoonOreMeteor.json b/config/BloodMagic/meteors/PureMoonOreMeteor.json index 308d4b1e1..ab3147d13 100644 --- a/config/BloodMagic/meteors/PureMoonOreMeteor.json +++ b/config/BloodMagic/meteors/PureMoonOreMeteor.json @@ -1,25 +1,15 @@ { "ores": [ - "oreMarbleBauxite", - "175", - "oreMarbleIlmenite", - "125", - "oreMarbleAluminium", - "75", - "oreMarbleChromite", - "50", - "oreMarbleUvarovite", - "75", - "oreMarblePerlite", - "50", - "oreMarbleBastnasite", - "100", - "oreMarbleNeodymium", - "75", - "oreMarbleMonazite", - "75", - "oreMarbleMeteoricIron", - "75" + "OREDICT:oreMarbleBauxite:175", + "OREDICT:oreMarbleIlmenite:125", + "OREDICT:oreMarbleAluminium:75", + "OREDICT:oreMarbleChromite:50", + "OREDICT:oreMarbleUvarovite:75", + "OREDICT:oreMarblePerlite:50", + "OREDICT:oreMarbleBastnasite:100", + "OREDICT:oreMarbleNeodymium:75", + "OREDICT:oreMarbleMonazite:75", + "OREDICT:oreMarbleMeteoricIron:75" ], "radius": 16, "cost": 2000000, @@ -27,4 +17,3 @@ "focusName": "gt.metaitem.01", "focusMeta": 32682 } - diff --git a/config/BloodMagic/meteors/PureNetherOreVariant.json b/config/BloodMagic/meteors/PureNetherOreVariant.json index 469cb1bf9..bd2aef720 100644 --- a/config/BloodMagic/meteors/PureNetherOreVariant.json +++ b/config/BloodMagic/meteors/PureNetherOreVariant.json @@ -1,51 +1,28 @@ { "ores": [ - "oreNetherrackNetherQuartz", - "150", - "oreNetherrackSulfur", - "100", - "oreNetherrackSphalerite", - "100", - "oreNetherrackThorium", - "100", - "oreNetherrackEmerald", - "50", - "oreNetherrackBeryllium", - "100", - "oreNetherrackIron", - "75", - "oreNetherrackChalcopyrite", - "75", - "oreNetherrackPyrite", - "75", - "oreNetherrackCopper", - "100", - "oreNetherrackTetrahedrite", - "125", - "oreNetherrackStibnite", - "75", - "oreNetherrackTantalite", - "75", - "oreNetherrackPyrolusite", - "75", - "oreNetherrackGrossular", - "50", - "oreNetherrackSpessartine", - "50", - "oreNetherrackQuartzite", - "75", - "oreNetherrackBarite", - "75", - "oreNetherrackRedstone", - "100", - "oreNetherrackRuby", - "75", - "oreNetherrackCinnabar", - "70", - "oreNetherrackCertusQuartz", - "100", - "oreNetherrackFirestone", - "20" + "OREDICT:oreNetherrackNetherQuartz:150", + "OREDICT:oreNetherrackSulfur:100", + "OREDICT:oreNetherrackSphalerite:100", + "OREDICT:oreNetherrackThorium:100", + "OREDICT:oreNetherrackEmerald:50", + "OREDICT:oreNetherrackBeryllium:100", + "OREDICT:oreNetherrackIron:75", + "OREDICT:oreNetherrackChalcopyrite:75", + "OREDICT:oreNetherrackPyrite:75", + "OREDICT:oreNetherrackCopper:100", + "OREDICT:oreNetherrackTetrahedrite:125", + "OREDICT:oreNetherrackStibnite:75", + "OREDICT:oreNetherrackTantalite:75", + "OREDICT:oreNetherrackPyrolusite:75", + "OREDICT:oreNetherrackGrossular:50", + "OREDICT:oreNetherrackSpessartine:50", + "OREDICT:oreNetherrackQuartzite:75", + "OREDICT:oreNetherrackBarite:75", + "OREDICT:oreNetherrackRedstone:100", + "OREDICT:oreNetherrackRuby:75", + "OREDICT:oreNetherrackCinnabar:70", + "OREDICT:oreNetherrackCertusQuartz:100", + "OREDICT:oreNetherrackFirestone:20" ], "radius": 18, "cost": 1200000, @@ -53,4 +30,3 @@ "focusName": "gt.blockmachines", "focusMeta": 482 } - diff --git a/config/BloodMagic/meteors/PureOWOreMeteor.json b/config/BloodMagic/meteors/PureOWOreMeteor.json index 92a55a71b..ce68821b3 100644 --- a/config/BloodMagic/meteors/PureOWOreMeteor.json +++ b/config/BloodMagic/meteors/PureOWOreMeteor.json @@ -1,51 +1,28 @@ { "ores": [ - "oreBlackgraniteOilsands", - "100", - "oreBlackgraniteMica", - "80", - "oreBlackgraniteAsbestos", - "60", - "oreBlackgraniteCalcite", - "80", - "oreBlackgraniteLepidolite", - "80", - "oreBlackgraniteVanadiumMagnetite", - "60", - "oreBlackgraniteSalt", - "80", - "oreBlackgraniteRockSalt", - "80", - "oreBlackgraniteSphalerite", - "80", - "oreBlackgranitePollucite", - "40", - "oreBlackgraniteNickel", - "80", - "oreBlackgraniteCopper", - "100", - "oreBlackgraniteRedstone", - "100", - "oreBlackgraniteCinnabar", - "80", - "oreBlackgraniteGarnetSand", - "40", - "oreBlackgraniteGypsum", - "40", - "oreBlackgraniteLapis", - "100", - "oreBlackgraniteLazurite", - "60", - "oreBlackgraniteSodalite", - "60", - "oreBlackgraniteCassiterite", - "80", - "oreBlackgraniteApatite", - "80", - "oreBlackgraniteRuby", - "80", - "oreBlackgraniteSilver", - "80" + "OREDICT:oreBlackgraniteOilsands:100", + "OREDICT:oreBlackgraniteMica:80", + "OREDICT:oreBlackgraniteAsbestos:60", + "OREDICT:oreBlackgraniteCalcite:80", + "OREDICT:oreBlackgraniteLepidolite:80", + "OREDICT:oreBlackgraniteVanadiumMagnetite:60", + "OREDICT:oreBlackgraniteSalt:80", + "OREDICT:oreBlackgraniteRockSalt:80", + "OREDICT:oreBlackgraniteSphalerite:80", + "OREDICT:oreBlackgranitePollucite:40", + "OREDICT:oreBlackgraniteNickel:80", + "OREDICT:oreBlackgraniteCopper:100", + "OREDICT:oreBlackgraniteRedstone:100", + "OREDICT:oreBlackgraniteCinnabar:80", + "OREDICT:oreBlackgraniteGarnetSand:40", + "OREDICT:oreBlackgraniteGypsum:40", + "OREDICT:oreBlackgraniteLapis:100", + "OREDICT:oreBlackgraniteLazurite:60", + "OREDICT:oreBlackgraniteSodalite:60", + "OREDICT:oreBlackgraniteCassiterite:80", + "OREDICT:oreBlackgraniteApatite:80", + "OREDICT:oreBlackgraniteRuby:80", + "OREDICT:oreBlackgraniteSilver:80" ], "radius": 20, "cost": 600000, @@ -53,4 +30,3 @@ "focusName": "gt.metaitem.01", "focusMeta": 32670 } - diff --git a/config/BloodMagic/meteors/RadioactivePure.json b/config/BloodMagic/meteors/RadioactivePure.json index 2b8068383..e9dad01c4 100644 --- a/config/BloodMagic/meteors/RadioactivePure.json +++ b/config/BloodMagic/meteors/RadioactivePure.json @@ -1,19 +1,12 @@ { "ores": [ - "oreEndstoneUranium", - "60", - "oreEndstoneUranium235", - "25", - "oreEndstoneUraninite", - "60", - "oreEndstonePitchblende", - "60", - "oreEndstoneThorium", - "150", - "oreEndstonePlutonium", - "25", - "oreEndstonePlutonium241", - "1" + "OREDICT:oreEndstoneUranium:60", + "OREDICT:oreEndstoneUranium235:25", + "OREDICT:oreEndstoneUraninite:60", + "OREDICT:oreEndstonePitchblende:60", + "OREDICT:oreEndstoneThorium:150", + "OREDICT:oreEndstonePlutonium:25", + "OREDICT:oreEndstonePlutonium241:1" ], "radius": 12, "cost": 2500000, @@ -21,4 +14,3 @@ "focusName": "gt.blockmachines", "focusMeta": 465 } - diff --git a/config/BloodMagic/meteors/RainbowGlassMeteor.json b/config/BloodMagic/meteors/RainbowGlassMeteor.json index d2eed3565..b9682da92 100644 --- a/config/BloodMagic/meteors/RainbowGlassMeteor.json +++ b/config/BloodMagic/meteors/RainbowGlassMeteor.json @@ -1,37 +1,21 @@ { "ores": [ - "stainedGlassWhite", - "1", - "stainedGlassOrange", - "1", - "stainedGlassMagenta", - "1", - "stainedGlassLightBlue", - "1", - "stainedGlassYellow", - "1", - "stainedGlassLime", - "1", - "stainedGlassPink", - "1", - "stainedGlassGray", - "1", - "stainedGlassLightGray", - "1", - "stainedGlassCyan", - "1", - "stainedGlassPurple", - "1", - "stainedGlassBlue", - "1", - "stainedGlassBrown", - "1", - "stainedGlassGreen", - "1", - "stainedGlassRed", - "1", - "stainedGlassBlack", - "1" + "OREDICT:stainedGlassWhite:1", + "OREDICT:stainedGlassOrange:1", + "OREDICT:stainedGlassMagenta:1", + "OREDICT:stainedGlassLightBlue:1", + "OREDICT:stainedGlassYellow:1", + "OREDICT:stainedGlassLime:1", + "OREDICT:stainedGlassPink:1", + "OREDICT:stainedGlassGray:1", + "OREDICT:stainedGlassLightGray:1", + "OREDICT:stainedGlassCyan:1", + "OREDICT:stainedGlassPurple:1", + "OREDICT:stainedGlassBlue:1", + "OREDICT:stainedGlassBrown:1", + "OREDICT:stainedGlassGreen:1", + "OREDICT:stainedGlassRed:1", + "OREDICT:stainedGlassBlack:1" ], "radius": 8, "cost": 123456, @@ -39,4 +23,3 @@ "focusName": "melon_block", "focusMeta": 0 } - diff --git a/config/BloodMagic/meteors/SomeBartOres.json b/config/BloodMagic/meteors/SomeBartOres.json index eedfaf076..c78db06bd 100644 --- a/config/BloodMagic/meteors/SomeBartOres.json +++ b/config/BloodMagic/meteors/SomeBartOres.json @@ -1,41 +1,23 @@ { "ores": [ - "oreBismutite", - "1", - "oreFluor-Buergerite", - "1", - "oreOrangeDescloizite", - "1", - "oreRedDescloizite", - "1", - "oreFluor-Buergerite", - "1", - "oreFayalite", - "1", - "oreForsterite", - "1", - "oreRedFuchsite", - "1", - "oreGreenFuchsite", - "1", - "oreDjurleite", - "1", - "oreBornite", - "1", - "oreWittichenite", - "1", - "oreChromo-Alumino-Povondraite", - "1", - "oreVanadio-Oxy-Dravite", - "1", - "oreOlenite", - "1", - "oreRedZircon", - "1", - "oreHedenbergite", - "1", - "orePrasiolite", - "1" + "OREDICT:oreBismutite:1", + "OREDICT:oreFluor-Buergerite:1", + "OREDICT:oreOrangeDescloizite:1", + "OREDICT:oreRedDescloizite:1", + "OREDICT:oreFluor-Buergerite:1", + "OREDICT:oreFayalite:1", + "OREDICT:oreForsterite:1", + "OREDICT:oreRedFuchsite:1", + "OREDICT:oreGreenFuchsite:1", + "OREDICT:oreDjurleite:1", + "OREDICT:oreBornite:1", + "OREDICT:oreWittichenite:1", + "OREDICT:oreChromo-Alumino-Povondraite:1", + "OREDICT:oreVanadio-Oxy-Dravite:1", + "OREDICT:oreOlenite:1", + "OREDICT:oreRedZircon:1", + "OREDICT:oreHedenbergite:1", + "OREDICT:orePrasiolite:1" ], "radius": 18, "cost": 10000000, @@ -43,4 +25,3 @@ "focusName": "gt.blockmachines", "focusMeta": 406 } - diff --git a/config/BloodMagic/meteors/SoulInducedMeteor.json b/config/BloodMagic/meteors/SoulInducedMeteor.json index 29c5eb9a1..ff81298ce 100644 --- a/config/BloodMagic/meteors/SoulInducedMeteor.json +++ b/config/BloodMagic/meteors/SoulInducedMeteor.json @@ -1,7 +1,6 @@ { "ores": [ - "soulSand", - "1000" + "OREDICT:soulSand:1000" ], "radius": 16, "cost": 5000000, @@ -9,4 +8,3 @@ "focusName": "soul_sand", "focusMeta": 0 } - diff --git a/config/BloodMagic/meteors/SpaceyOres.json b/config/BloodMagic/meteors/SpaceyOres.json index b14c0c283..fb538a472 100644 --- a/config/BloodMagic/meteors/SpaceyOres.json +++ b/config/BloodMagic/meteors/SpaceyOres.json @@ -1,32 +1,23 @@ { "ores": [ - "oreBlackgraniteNaquadah", - "100", - "oreBlackgraniteNaquadahEnriched", - "25", - "oreBlackgraniteDeepIron", - "50", - "oreBlackgraniteQuantium", - "50", - "oreBlackgraniteArdite", - "50", - "oreBlackgraniteDraconium", - "50", - "oreBlackgraniteAdamantium", - "25", - "oreBlackgraniteNeodymium", - "75", - "oreBlackgraniteMonazite", - "75", - "oreBlackgraniteMeteoricIron", - "125", - "stoneGraniteBlack", - "250" + "OREDICT:oreBlackgraniteNaquadah:100", + "OREDICT:oreBlackgraniteNaquadahEnriched:25", + "OREDICT:oreBlackgraniteDeepIron:50", + "OREDICT:oreBlackgraniteQuantium:50", + "OREDICT:oreBlackgraniteArdite:50", + "OREDICT:oreBlackgraniteDraconium:50", + "OREDICT:oreBlackgraniteAdamantium:25", + "OREDICT:oreBlackgraniteNeodymium:75", + "OREDICT:oreBlackgraniteMonazite:75", + "OREDICT:oreBlackgraniteMeteoricIron:125" + ], + "filler": [ + "OREDICT:stoneGraniteBlack:250" ], "radius": 16, "cost": 1500000, "focusModId": "gregtech", "focusName": "gt.metaitem.01", - "focusMeta": 32674 + "focusMeta": 32674, + "fillerChance": 28 } - diff --git a/config/BloodMagic/meteors/SuperGTStones.json b/config/BloodMagic/meteors/SuperGTStones.json index db1f81055..2169fc3f2 100644 --- a/config/BloodMagic/meteors/SuperGTStones.json +++ b/config/BloodMagic/meteors/SuperGTStones.json @@ -11,4 +11,3 @@ "focusName": "tnt", "focusMeta": 0 } - diff --git a/config/BloodMagic/meteors/SuperPlatinumGroupMetals.json b/config/BloodMagic/meteors/SuperPlatinumGroupMetals.json index 5b95d6298..35853b96c 100644 --- a/config/BloodMagic/meteors/SuperPlatinumGroupMetals.json +++ b/config/BloodMagic/meteors/SuperPlatinumGroupMetals.json @@ -1,19 +1,12 @@ { "ores": [ - "oreEndstonePlatinum", - "150", - "oreEndstoneIridium", - "75", - "oreEndstonePalladium", - "75", - "oreEndstoneOsmium", - "50", - "oreCrudeRhodiumMetal", - "200", - "oreLeachResidue", - "200", - "oreRarestMetalResidue", - "100" + "OREDICT:oreEndstonePlatinum:150", + "OREDICT:oreEndstoneIridium:75", + "OREDICT:oreEndstonePalladium:75", + "OREDICT:oreEndstoneOsmium:50", + "OREDICT:oreCrudeRhodiumMetal:200", + "OREDICT:oreLeachResidue:200", + "OREDICT:oreRarestMetalResidue:100" ], "radius": 14, "cost": 12500000, @@ -21,4 +14,3 @@ "focusName": "gt.blockmachines", "focusMeta": 345 } - diff --git a/config/BloodMagic/meteors/T1RocketStones.json b/config/BloodMagic/meteors/T1RocketStones.json index 84a878d80..19a7e6977 100644 --- a/config/BloodMagic/meteors/T1RocketStones.json +++ b/config/BloodMagic/meteors/T1RocketStones.json @@ -10,4 +10,3 @@ "focusName": "gt.metaitem.01", "focusMeta": 32462 } - diff --git a/config/BloodMagic/meteors/T2RocketStones.json b/config/BloodMagic/meteors/T2RocketStones.json index e5fffeb42..b2d17d5fd 100644 --- a/config/BloodMagic/meteors/T2RocketStones.json +++ b/config/BloodMagic/meteors/T2RocketStones.json @@ -3,11 +3,9 @@ "GalacticraftMars:tile.mars:9:850", "GalacticraftMars:tile.mars:6:100", "GalacticraftMars:tile.mars:5:50", - "GalaxySpace:phobosblocks:2:850", "GalaxySpace:phobosblocks:1:100", "GalaxySpace:phobosblocks:0:50", - "GalaxySpace:deimosblocks:1:950", "GalaxySpace:deimosblocks:0:50" ], @@ -17,4 +15,3 @@ "focusName": "gt.metaitem.01", "focusMeta": 32463 } - diff --git a/config/BloodMagic/meteors/T3RocketStones.json b/config/BloodMagic/meteors/T3RocketStones.json index c107a227b..5cd61e1f5 100644 --- a/config/BloodMagic/meteors/T3RocketStones.json +++ b/config/BloodMagic/meteors/T3RocketStones.json @@ -2,16 +2,12 @@ "ores": [ "GalaxySpace:ceresblocks:1:950", "GalaxySpace:ceresblocks:0:50", - "GalaxySpace:callistoblocks:1:950", "GalaxySpace:callistoblocks:0:50", - "GalaxySpace:europagrunt:1:950", "GalaxySpace:europagrunt:0:50", - "GalaxySpace:ganymedeblocks:1:950", "GalaxySpace:ganymedeblocks:0:50", - "GalacticraftMars:tile.asteroidsBlock:0:320", "GalacticraftMars:tile.asteroidsBlock:1:320", "GalacticraftMars:tile.asteroidsBlock:2:320", @@ -23,4 +19,3 @@ "focusName": "item.itemBasicAsteroids", "focusMeta": 0 } - diff --git a/config/BloodMagic/meteors/T4RocketStones.json b/config/BloodMagic/meteors/T4RocketStones.json index 80a3d907b..f99b3ceeb 100644 --- a/config/BloodMagic/meteors/T4RocketStones.json +++ b/config/BloodMagic/meteors/T4RocketStones.json @@ -3,11 +3,9 @@ "GalaxySpace:ioblocks:2:900", "GalaxySpace:ioblocks:0:50", "GalaxySpace:ioblocks:1:50", - "GalaxySpace:mercuryblocks:2:850", "GalaxySpace:mercuryblocks:1:100", "GalaxySpace:mercuryblocks:0:50", - "GalaxySpace:venusblocks:1:950", "GalaxySpace:venusblocks:0:50" ], @@ -17,4 +15,3 @@ "focusName": "item.HeavyDutyPlateTier4", "focusMeta": 0 } - diff --git a/config/BloodMagic/meteors/T5RocketStones.json b/config/BloodMagic/meteors/T5RocketStones.json index a96840d01..a1e4d2eec 100644 --- a/config/BloodMagic/meteors/T5RocketStones.json +++ b/config/BloodMagic/meteors/T5RocketStones.json @@ -4,15 +4,12 @@ "GalaxySpace:titanblocks:1:100", "GalaxySpace:titanblocks:0:50", "minecraft:packed_ice:0:100", - "GalaxySpace:enceladusblocks:1:850", "GalaxySpace:enceladusblocks:3:100", "GalaxySpace:enceladusblocks:0:50", - "GalaxySpace:oberonblocks:2:850", "GalaxySpace:oberonblocks:1:100", "GalaxySpace:oberonblocks:0:50", - "GalaxySpace:mirandablocks:2:850", "GalaxySpace:mirandablocks:1:100", "GalaxySpace:mirandablocks:0:50" @@ -23,4 +20,3 @@ "focusName": "item.HeavyDutyPlateTier5", "focusMeta": 0 } - diff --git a/config/BloodMagic/meteors/T6RocketStones.json b/config/BloodMagic/meteors/T6RocketStones.json index 4c2c1c79c..74b11deeb 100644 --- a/config/BloodMagic/meteors/T6RocketStones.json +++ b/config/BloodMagic/meteors/T6RocketStones.json @@ -3,7 +3,6 @@ "GalaxySpace:tritonblocks:2:850", "GalaxySpace:tritonblocks:1:100", "GalaxySpace:tritonblocks:0:50", - "GalaxySpace:proteusblocks:2:850", "GalaxySpace:proteusblocks:1:100", "GalaxySpace:proteusblocks:0:50" @@ -14,4 +13,3 @@ "focusName": "item.HeavyDutyPlateTier6", "focusMeta": 0 } - diff --git a/config/BloodMagic/meteors/T7RocketStones.json b/config/BloodMagic/meteors/T7RocketStones.json index 4cab91fd9..89b10248b 100644 --- a/config/BloodMagic/meteors/T7RocketStones.json +++ b/config/BloodMagic/meteors/T7RocketStones.json @@ -6,10 +6,8 @@ "GalaxySpace:plutoblocks:1:15", "GalaxySpace:plutoblocks:2:15", "GalaxySpace:plutoblocks:3:15", - "GalaxySpace:makemakegrunt:1:950", "GalaxySpace:makemakegrunt:0:50", - "GalaxySpace:haumeablocks:0:1000" ], "radius": 20, @@ -18,4 +16,3 @@ "focusName": "item.HeavyDutyPlateTier7", "focusMeta": 0 } - diff --git a/config/BloodMagic/meteors/T8RocketStones.json b/config/BloodMagic/meteors/T8RocketStones.json index 764e52d43..cda0ff1ba 100644 --- a/config/BloodMagic/meteors/T8RocketStones.json +++ b/config/BloodMagic/meteors/T8RocketStones.json @@ -2,20 +2,15 @@ "ores": [ "GalaxySpace:barnardaEsubgrunt:0:950", "GalaxySpace:barnardaEgrunt:0:50", - "GalaxySpace:barnardaFsubgrunt:0:950", "GalaxySpace:barnardaFgrunt:0:50", - "GalaxySpace:barnardaCdirt:0:100", "GalaxySpace:barnardaCgrass:0:20", - "GalaxySpace:vegabsubgrunt:0:950", "GalaxySpace:vegabgrunt:0:50", - "GalaxySpace:tcetieblocks:2:850", "GalaxySpace:tcetieblocks:1:100", "GalaxySpace:tcetieblocks:0:50", - "GalaxySpace:acentauribbsubgrunt:0:950", "GalaxySpace:acentauribbgrunt:0:50" ], @@ -25,4 +20,3 @@ "focusName": "item.HeavyDutyPlateTier8", "focusMeta": 0 } - diff --git a/config/BloodMagic/meteors/T9Ores.json b/config/BloodMagic/meteors/T9Ores.json index 10717230f..a03b575c4 100644 --- a/config/BloodMagic/meteors/T9Ores.json +++ b/config/BloodMagic/meteors/T9Ores.json @@ -1,11 +1,11 @@ { "ores": [ - "oreAwakenedDraconium", "1000", - "oreNeodymium", "500", - "oreSamarium", "300", - "oreNetherStar", "250", - "oreTartarite", "60", - "oreTengamRaw", "1" + "OREDICT:oreDraconiumAwakened:1000", + "OREDICT:oreNeodymium:500", + "OREDICT:oreSamarium:300", + "OREDICT:oreNetherStar:250", + "OREDICT:oreTartarite:60", + "OREDICT:oreTengamRaw:1" ], "radius": 16, "cost": 1000000001, diff --git a/config/BloodMagic/meteors/YourResourcesHandItOver.json b/config/BloodMagic/meteors/YourResourcesHandItOver.json index db95484d8..04e7eabfb 100644 --- a/config/BloodMagic/meteors/YourResourcesHandItOver.json +++ b/config/BloodMagic/meteors/YourResourcesHandItOver.json @@ -1,29 +1,17 @@ { "ores": [ - "oreEndstoneBlackPlutonium", - "50", - "oreEndstoneCosmicNeutronium", - "10", - "oreEndstoneNaquadah", - "50", - "oreEndstoneNaquadahEnriched", - "55", - "oreEndstoneNaquadria", - "40", - "oreEndstoneNeutronium", - "25", - "oreEndstoneElectrumFlux", - "10", - "oreEndstoneIndium", - "5", - "oreEndstoneAmericium", - "10", - "oreEndstoneEuropium", - "25", - "oreEndstoneLutetium", - "50", - "oreEndstoneInfinityCatalyst", - "50" + "OREDICT:oreEndstoneBlackPlutonium:50", + "OREDICT:oreEndstoneCosmicNeutronium:10", + "OREDICT:oreEndstoneNaquadah:50", + "OREDICT:oreEndstoneNaquadahEnriched:55", + "OREDICT:oreEndstoneNaquadria:40", + "OREDICT:oreEndstoneNeutronium:25", + "OREDICT:oreEndstoneElectrumFlux:10", + "OREDICT:oreEndstoneIndium:5", + "OREDICT:oreEndstoneAmericium:10", + "OREDICT:oreEndstoneEuropium:25", + "OREDICT:oreEndstoneLutetium:50", + "OREDICT:oreEndstoneInfinityCatalyst:50" ], "radius": 18, "cost": 125000000, @@ -31,4 +19,3 @@ "focusName": "gt.blockmachines", "focusMeta": 12526 } -