renamed rock salt to sylvite

GregTech6 · Jun 12, 2024 · 61c5255 · 61c5255
1 parent 5b10860
commit 61c5255
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -15,6 +15,7 @@ Nothing (I tend to only add finished Stuff to the Changelog).
 [CHANGED] Platinum Group Metals, their Sludge and Rare Earth now have better Thaumcraft Aspects.
 [CHANGED] Roasters of higher Tiers no longer have overclocking penalty.
 [CHANGED] Zirconium now has durability and speed identical to Diamonds.
+[CHANGED] Rock Salt is mostly named Sylvite now, except in its Dust form.
 
 
 6.17.01:

diff --git a/src/main/java/gregapi/data/MT.java b/src/main/java/gregapi/data/MT.java
@@ -1144,7 +1144,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),
+	KCl                     = oredustdcmp   ( 8203, "Sylvite"               , SET_CUBE              , 240, 200, 200, 255, BRITTLE, MORTAR, "RockSalt")                                                                                                              .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).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)                                                  ,

diff --git a/src/main/java/gregapi/lang/LanguageHandler.java b/src/main/java/gregapi/lang/LanguageHandler.java
@@ -513,6 +513,9 @@ public static String getLocalName(OreDictPrefix aPrefix, OreDictMaterial aMateri
 		if (aMaterial == MT.Sugar) {
 			if (aPrefix == OP.gemChipped)                                           return "Sugar Cubes";
 		} else
+		if (aMaterial == MT.KCl) {
+			if (aPrefix.mNameInternal.startsWith("dust"))                           return aPrefix.mMaterialPre + "Rock Salt";
+		} else
 		if (aMaterial == MT.Ceramic) {
 			if (aPrefix == OP.scrapGt)                                              return "Brittle Ceramic Scraps";
 			if (aPrefix.mNameInternal.startsWith("dust"))                           return aPrefix.mMaterialPre + "Dry Clay Powder";

diff --git a/src/main/java/gregtech/blocks/stone/BlockRockOres.java b/src/main/java/gregtech/blocks/stone/BlockRockOres.java
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2023 GregTech-6 Team
+ * Copyright (c) 2024 GregTech-6 Team
  *
  * This file is part of GregTech.
  *
@@ -20,7 +20,6 @@
 package gregtech.blocks.stone;
 
 import gregapi.block.BlockBaseMeta;
-import gregapi.data.CS.*;
 import gregapi.data.LH;
 import gregapi.data.MD;
 import gregapi.data.MT;
@@ -54,7 +53,7 @@ public BlockRockOres(String aUnlocalised) {
 		LH.add(getUnlocalizedName()+ ".0", "Anthracite Coal");
 		LH.add(getUnlocalizedName()+ ".1", "Lignite Coal");
 		LH.add(getUnlocalizedName()+ ".2", "Salt");
-		LH.add(getUnlocalizedName()+ ".3", "Rock Salt");
+		LH.add(getUnlocalizedName()+ ".3", "Sylvite");
 		LH.add(getUnlocalizedName()+ ".4", "Bauxite");
 		LH.add(getUnlocalizedName()+ ".5", "Oil Shale");
 		LH.add(getUnlocalizedName()+ ".6", "Gypsum");