Rename Yellow Limonite to Limonite (#3515)

Author: serenibyss

docs/content/Gameplay/Ore-Generation.md

@@ -68,7 +68,7 @@ Please note that these are the default settings and may be different in certain
 ### Iron Vein
 
 - Goethite
-- Yellow Limonite
+- Limonite
 - Hematite
 - Malachite
 
@@ -216,7 +216,7 @@ Please note that these are the default settings and may be different in certain
 ### Banded Iron Vein
 
 - Goethite
-- Yellow Limonite
+- Limonite
 - Hematite
 - Gold
 

docs/content/Modpacks/Ore-Generation/Bedrock-Ore-Veins.md

@@ -27,7 +27,7 @@ GTCEuServerEvents.bedrockOreVeins(event => {
             .size(3) // (1)
             .yield(10, 20)
             .material(GTMaterials.Goethite, 5) // (2)
-            .material(GTMaterials.YellowLimonite, 2)
+            .material(GTMaterials.Limonite, 2)
             .material(GTMaterials.Hematite, 2)
             .material(GTMaterials.Malachite, 1)
             .dimensions('minecraft:overworld')

src/generated/resources/assets/gtceu/lang/en_ud.json

@@ -5308,7 +5308,7 @@
   "material.gtceu.xenon": "uouǝX",
   "material.gtceu.yellow_dye": "ǝʎᗡ ʍoןןǝʎ",
   "material.gtceu.yellow_garnet": "ʇǝuɹɐ⅁ ʍoןןǝʎ",
-  "material.gtceu.yellow_limonite": "ǝʇıuoɯıꞀ ʍoןןǝʎ",
+  "material.gtceu.yellow_limonite": "ǝʇıuoɯıꞀ",
   "material.gtceu.ytterbium": "ɯnıqɹǝʇʇʎ",
   "material.gtceu.yttrium": "ɯnıɹʇʇʎ",
   "material.gtceu.yttrium_barium_cuprate": "ǝʇɐɹdnƆ ɯnıɹɐᗺ ɯnıɹʇʇʎ",

src/generated/resources/assets/gtceu/lang/en_us.json

@@ -5308,7 +5308,7 @@
   "material.gtceu.xenon": "Xenon",
   "material.gtceu.yellow_dye": "Yellow Dye",
   "material.gtceu.yellow_garnet": "Yellow Garnet",
-  "material.gtceu.yellow_limonite": "Yellow Limonite",
+  "material.gtceu.yellow_limonite": "Limonite",
   "material.gtceu.ytterbium": "Ytterbium",
   "material.gtceu.yttrium": "Yttrium",
   "material.gtceu.yttrium_barium_cuprate": "Yttrium Barium Cuprate",

src/main/java/com/gregtechceu/gtceu/common/data/GTMaterials.java

@@ -538,6 +538,8 @@ private static void excludeAllGemsButNormal(Material material) {
     public static Material VanadiumGallium;
     public static Material WroughtIron;
     public static Material Wulfenite;
+    public static Material Limonite;
+    @Deprecated
     public static Material YellowLimonite;
     public static Material YttriumBariumCuprate;
     public static Material NetherQuartz;

src/main/java/com/gregtechceu/gtceu/common/data/GTOres.java

@@ -155,7 +155,7 @@ public class GTOres {
             .biomes(BiomeTags.IS_NETHER)
             .veinedVeinGenerator(generator -> generator
                     .oreBlock(new VeinBlockDefinition(Goethite, 3))
-                    .oreBlock(new VeinBlockDefinition(YellowLimonite, 2))
+                    .oreBlock(new VeinBlockDefinition(Limonite, 2))
                     .oreBlock(new VeinBlockDefinition(Hematite, 2))
                     .rareBlock(new VeinBlockDefinition(Gold, 1))
                     .rareBlockChance(0.075f)
@@ -462,7 +462,7 @@ public class GTOres {
             .biomes(BiomeTags.IS_OVERWORLD)
             .veinedVeinGenerator(generator -> generator
                     .oreBlock(new VeinBlockDefinition(Goethite, 5))
-                    .oreBlock(new VeinBlockDefinition(YellowLimonite, 2))
+                    .oreBlock(new VeinBlockDefinition(Limonite, 2))
                     .oreBlock(new VeinBlockDefinition(Hematite, 2))
                     .oreBlock(new VeinBlockDefinition(Malachite, 1))
                     .veininessThreshold(0.01f)

src/main/java/com/gregtechceu/gtceu/common/data/materials/FirstDegreeMaterials.java

@@ -738,12 +738,13 @@ public static void register() {
                 .components(Lead, 1, Molybdenum, 1, Oxygen, 4)
                 .buildAndRegister();
 
-        YellowLimonite = new Material.Builder(GTCEu.id("yellow_limonite"))
+        Limonite = new Material.Builder(GTCEu.id("yellow_limonite"))
                 .dust().ore()
                 .color(0xf5e315).secondaryColor(0xc06f33).iconSet(METALLIC)
                 .flags(DECOMPOSITION_BY_CENTRIFUGING, BLAST_FURNACE_CALCITE_DOUBLE)
                 .components(Iron, 1, Hydrogen, 1, Oxygen, 2)
                 .buildAndRegister();
+        YellowLimonite = Limonite;
 
         YttriumBariumCuprate = new Material.Builder(GTCEu.id("yttrium_barium_cuprate"))
                 .ingot()

src/main/java/com/gregtechceu/gtceu/common/data/materials/MaterialFlagAddition.java

@@ -103,7 +103,7 @@ public static void register() {
         oreProp.setOreByProducts(Topaz);
 
         oreProp = Goethite.getProperty(PropertyKey.ORE);
-        oreProp.setOreByProducts(Malachite, YellowLimonite);
+        oreProp.setOreByProducts(Malachite, Limonite);
         oreProp.setSeparatedInto(Iron);
         oreProp.setDirectSmeltResult(Iron);
 
@@ -256,7 +256,7 @@ public static void register() {
         oreProp = Uraninite.getProperty(PropertyKey.ORE);
         oreProp.setOreByProducts(Uraninite, Thorium, Silver);
 
-        oreProp = YellowLimonite.getProperty(PropertyKey.ORE);
+        oreProp = Limonite.getProperty(PropertyKey.ORE);
         oreProp.setOreByProducts(Nickel, Goethite, CobaltOxide);
         oreProp.setSeparatedInto(Iron);
         oreProp.setWashedIn(SodiumPersulfate);

src/main/java/com/gregtechceu/gtceu/data/lang/LangHandler.java

@@ -529,6 +529,7 @@ public static void init(RegistrateLangProvider provider) {
         replace(provider, GTMaterials.FullersEarth.getUnlocalizedName(), "Fuller's Earth");
         replace(provider, GTMaterials.Cooperite.getUnlocalizedName(), "Sheldonite"); // greg's humor is now on
                                                                                      // 1.19...
+        replace(provider, GTMaterials.Limonite.getUnlocalizedName(), "Limonite");
         replace(provider, GTMaterials.HSSG.getUnlocalizedName(), "HSS-G");
         replace(provider, GTMaterials.HSSE.getUnlocalizedName(), "HSS-E");
         replace(provider, GTMaterials.HSSS.getUnlocalizedName(), "HSS-S");