From e7441725908b543aeb658477cbe430ea78908cb0 Mon Sep 17 00:00:00 2001 From: Gregorius Techneticies Date: Thu, 4 Jan 2024 23:20:06 +0100 Subject: [PATCH] someone saw saltpeter and did not make the connection to niter so i added a source of tooltip for that now --- src/main/java/gregapi/data/MT.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/main/java/gregapi/data/MT.java b/src/main/java/gregapi/data/MT.java index ff64c2c85..5b4a68a11 100644 --- a/src/main/java/gregapi/data/MT.java +++ b/src/main/java/gregapi/data/MT.java @@ -1127,7 +1127,7 @@ static OreDictMaterial unknown(int aID, long aNeutrons, Object... aRandomData) { NaCl = oredustdcmp ( 8204, "Salt" , SET_CUBE , 250, 250, 250, 255, BRITTLE, MORTAR, FOOD) .uumMcfg( 0, Na , 1*U, Cl , 1*U) .aspects(TC.FAMES, 1).addSourceOf(Na).setPriorityPrefix(2).heat(1074, 1686), - NaNO3 = oredustelec ( 8019, "Sodium Nitrate" , SET_FINE , 230, 230, 230, 255, FLAMMABLE, BRITTLE, MORTAR) .uumMcfg( 0, Na , 1*U, N , 1*U, O , 3*U) .aspects(TC.IGNIS, 2).addSourceOf(Na).setPriorityPrefix(2).heat(607), + NaNO3 = oredustelec ( 8019, "Sodium Nitrate" , SET_FINE , 230, 230, 230, 255, FLAMMABLE, BRITTLE, MORTAR) .uumMcfg( 0, Na , 1*U, N , 1*U, O , 3*U) .aspects(TC.IGNIS, 2).setPriorityPrefix(2).heat(607), NaOH = dustelec ( 8268, "Sodium Hydroxide" , SET_CUBE , 220, 250, 220, 255) .uumMcfg( 0, Na , 1*U, O , 1*U, H , 1*U) .heat( 596, 1661), NaHCO3 = oredustdcmp ( 8039, "Sodium Hydrogencarbonate", SET_FINE , 230, 235, 240, 255, "Soda").setLocal("Soda") .uumMcfg( 0, Na , 1*U, H , 1*U, C , 1*U, O , 3*U) , Soda = NaHCO3, NaHSO4 = dustdcmp ( 8230, "Sodium Bisulfate" , SET_FINE , 240, 240, 255, 255, "SodiumBisulphate", "SodiumHydrogenSulfate", "SodiumHydrogenSulphate") .uumMcfg( 0, Na , 1*U, H , 1*U, S , 1*U, O , 4*U) , @@ -1145,7 +1145,7 @@ static OreDictMaterial unknown(int aID, long aNeutrons, Object... aRandomData) { KIO3 = oredustelec ( 8242, "Iodine Salt" , SET_CUBE , 240, 200, 240, 255, BRITTLE, MORTAR) .uumMcfg( 0, K , 1*U, I , 1*U, O , 3*U) .aspects(TC.TEMPESTAS, 1).addSourceOf(K).heat(300, 370), IodineSalt = KIO3, KCl = oredustdcmp ( 8203, "Rock Salt" , SET_CUBE , 240, 200, 200, 255, BRITTLE, MORTAR) .uumMcfg( 0, K , 1*U, Cl , 1*U) .aspects(TC.FAMES, 1).addSourceOf(K).setPriorityPrefix(2).heat(1040, 1690), - KNO3 = oredustelec ( 8205, "Potassium Nitrate" , SET_FINE , 230, 230, 230, 255, FLAMMABLE, BRITTLE, MORTAR, "Saltpeter", "Nitrate", "Salpeter") .uumMcfg( 0, K , 1*U, N , 1*U, O , 3*U) .aspects(TC.IGNIS, 2).addSourceOf(K).setPriorityPrefix(2).heat(607), + KNO3 = oredustelec ( 8205, "Potassium Nitrate" , SET_FINE , 230, 230, 230, 255, FLAMMABLE, BRITTLE, MORTAR, "Saltpeter", "Nitrate", "Salpeter") .uumMcfg( 0, K , 1*U, N , 1*U, O , 3*U) .aspects(TC.IGNIS, 2).setPriorityPrefix(2).heat(607), KOH = dustelec ( 8015, "Potassium Hydroxide" , SET_CUBE , 250, 220, 220, 255) .uumMcfg( 0, K , 1*U, O , 1*U, H , 1*U) .heat( 633, 1600), KHSO4 = dustdcmp ( 8232, "Potassium Bisulfate" , SET_FINE , 255, 240, 240, 255, "PotassiumBisulphate") .uumMcfg( 0, K , 1*U, H , 1*U, S , 1*U, O , 4*U) , KSO4 = dustdcmp ( 8022, "Potassium Persulfate" , SET_CUBE , 250, 180, 130, 255, "PotassiumPersulphate") .uumMcfg( 0, K , 1*U, S , 1*U, O , 4*U) , @@ -1971,8 +1971,6 @@ static void init() { OreDictMaterial.MATERIAL_ARRAY[8510] = Stone; - - Ad .setOreMultiplier( 2).setCrushing(Adamantine, U); Fe .setOreMultiplier( 3).setCrushing(Fe2O3, U); Al .setOreMultiplier( 2).setCrushing(Al2O3, U); @@ -2974,6 +2972,11 @@ static void init() { Infinity .addEnchantmentForArmors(Enchantment.blastProtection,10); + NaNO3.addSourceOf(Niter, KNO3, K); + KNO3.addSourceOf(Niter, NaNO3, Na); + Niter.addSourceOf(KNO3, NaNO3, K, Na); + + OREMATS.Pitchblende .ores(Pb , Ra , RareEarth , Th ); OREMATS.Uraninite .ores(Pb , Ra , RareEarth , Th ); Yellorite .ores(Pb , Ra , RareEarth , Th );