Stone tags and LPG localisation (#2095)

GregTechCEu · Oct 6, 2024 · 6e4e1c3 · 6e4e1c3
1 parent f6ea016
commit 6e4e1c3
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 2 deletions.
diff --git a/src/generated/resources/assets/gtceu/lang/en_ud.json b/src/generated/resources/assets/gtceu/lang/en_ud.json
@@ -5405,7 +5405,7 @@
   "material.gtceu.lithium": "ɯnıɥʇıꞀ",
   "material.gtceu.lithium_chloride": "ǝpıɹoןɥƆ ɯnıɥʇıꞀ",
   "material.gtceu.livermorium": "ɯnıɹoɯɹǝʌıꞀ",
-  "material.gtceu.lpg": "bdꞀ",
+  "material.gtceu.lpg": "⅁ԀꞀ",
   "material.gtceu.lubricant": "ʇuɐɔıɹqnꞀ",
   "material.gtceu.lutetium": "ɯnıʇǝʇnꞀ",
   "material.gtceu.magenta_dye": "ǝʎᗡ ɐʇuǝbɐW",

diff --git a/src/generated/resources/assets/gtceu/lang/en_us.json b/src/generated/resources/assets/gtceu/lang/en_us.json
@@ -5405,7 +5405,7 @@
   "material.gtceu.lithium": "Lithium",
   "material.gtceu.lithium_chloride": "Lithium Chloride",
   "material.gtceu.livermorium": "Livermorium",
-  "material.gtceu.lpg": "Lpg",
+  "material.gtceu.lpg": "LPG",
   "material.gtceu.lubricant": "Lubricant",
   "material.gtceu.lutetium": "Lutetium",
   "material.gtceu.magenta_dye": "Magenta Dye",

diff --git a/src/generated/resources/data/forge/tags/blocks/cobblestone.json b/src/generated/resources/data/forge/tags/blocks/cobblestone.json
@@ -0,0 +1,8 @@
+{
+  "values": [
+    "gtceu:red_granite_cobblestone",
+    "gtceu:marble_cobblestone",
+    "gtceu:light_concrete_cobblestone",
+    "gtceu:dark_concrete_cobblestone"
+  ]
+}
diff --git a/src/generated/resources/data/forge/tags/blocks/stone.json b/src/generated/resources/data/forge/tags/blocks/stone.json
@@ -0,0 +1,8 @@
+{
+  "values": [
+    "gtceu:red_granite",
+    "gtceu:marble",
+    "gtceu:light_concrete",
+    "gtceu:dark_concrete"
+  ]
+}
diff --git a/src/main/java/com/gregtechceu/gtceu/common/data/GTBlocks.java b/src/main/java/com/gregtechceu/gtceu/common/data/GTBlocks.java
@@ -73,6 +73,7 @@
 import net.minecraftforge.api.distmarker.OnlyIn;
 import net.minecraftforge.client.model.generators.ModelFile;
 import net.minecraftforge.client.model.generators.ModelProvider;
+import net.minecraftforge.common.Tags;
 
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableTable;
@@ -1544,6 +1545,12 @@ public static void generateStoneBlocks() {
                                     prov.modLoc(ModelProvider.BLOCK_FOLDER + "/stones/" + strata.getSerializedName() +
                                             "/" + type.id))));
                 }
+                if (type == StoneBlockType.STONE) {
+                    entry.tag(Tags.Blocks.STONE);
+                }
+                if (type == StoneBlockType.COBBLE) {
+                    entry.tag(Tags.Blocks.COBBLESTONE);
+                }
                 builder.put(type, strata, entry.register());
             }
         }

diff --git a/src/main/java/com/gregtechceu/gtceu/data/lang/LangHandler.java b/src/main/java/com/gregtechceu/gtceu/data/lang/LangHandler.java
@@ -536,6 +536,7 @@ public static void init(RegistrateLangProvider provider) {
                 "Severely Steam-Cracked Light Fuel");
         replace(provider, GTMaterials.SeverelySteamCrackedNaphtha.getUnlocalizedName(),
                 "Severely Steam-Cracked Naphtha");
+        replace(provider, GTMaterials.LPG.getUnlocalizedName(), "LPG");
 
         replace(provider, GTMaterials.Zeron100.getUnlocalizedName(), "Zeron-100");
         replace(provider, GTMaterials.IncoloyMA956.getUnlocalizedName(), "Incoloy MA-956");