aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Robertz <dream-master@gmx.net>2021-09-09 16:50:58 +0200
committerGitHub <noreply@github.com>2021-09-09 16:50:58 +0200
commitc9694a1fc0ea284de1f2a5fe7ecc625bc672bf70 (patch)
tree0bb5e763e59eb511c2ce195cd98539f6d93c30dd
parent38bc165e09d9ea2d00e77aa870344072eb12dcfc (diff)
parent950e02389791875a9488b299abc55349e837ff10 (diff)
downloadGT5-Unofficial-c9694a1fc0ea284de1f2a5fe7ecc625bc672bf70.tar.gz
GT5-Unofficial-c9694a1fc0ea284de1f2a5fe7ecc625bc672bf70.tar.bz2
GT5-Unofficial-c9694a1fc0ea284de1f2a5fe7ecc625bc672bf70.zip
Merge pull request #35 from GTNewHorizons/patch-localizedname
Make bridge materials properly load localizations Former-commit-id: 73f9d377621964e346be6f7bc1a8d3efc4effa96
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/registration/BridgeMaterialsLoader.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/registration/BridgeMaterialsLoader.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/registration/BridgeMaterialsLoader.java
index d3a5d79729..afae6ab0b8 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/registration/BridgeMaterialsLoader.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/werkstoff_loaders/registration/BridgeMaterialsLoader.java
@@ -29,6 +29,7 @@ import com.github.bartimaeusnek.bartworks.system.material.werkstoff_loaders.IWer
import com.github.bartimaeusnek.bartworks.util.BWRecipes;
import gregtech.api.enchants.Enchantment_Radioactivity;
import gregtech.api.enums.*;
+import gregtech.api.util.GT_LanguageManager;
import gregtech.api.util.GT_OreDictUnificator;
import gregtech.api.util.GT_Recipe;
import gregtech.common.items.behaviors.Behaviour_DataOrb;
@@ -101,6 +102,9 @@ public class BridgeMaterialsLoader implements IWerkstoffRunnable {
werkstoffBridgeMaterial.mName = werkstoff.getVarName();
werkstoffBridgeMaterial.mDefaultLocalName = werkstoff.getDefaultName();
werkstoffBridgeMaterial.mChemicalFormula = werkstoff.getToolTip();
+ if ("null".equals(werkstoffBridgeMaterial.mLocalizedName))
+ // only reload from lang file if not localized already
+ werkstoffBridgeMaterial.mLocalizedName = GT_LanguageManager.addStringLocalization("Material." + werkstoffBridgeMaterial.mName.toLowerCase(), werkstoffBridgeMaterial.mDefaultLocalName);
if (LoaderReference.Thaumcraft)
werkstoffBridgeMaterial.mAspects = werkstoff.getGTWrappedTCAspects();
werkstoffBridgeMaterial.mMaterialInto = werkstoffBridgeMaterial;