From 44eae579f46b0f6720cfe950290e80d832458c17 Mon Sep 17 00:00:00 2001
From: Glease <4586901+Glease@users.noreply.github.com>
Date: Thu, 9 Sep 2021 22:04:04 +0800
Subject: Make bridge materials properly load localizations

Former-commit-id: 27b2106504524392a07b0a2ae3085124e6968324
---
 .../werkstoff_loaders/registration/BridgeMaterialsLoader.java         | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/main')

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..a76aa7545b 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
@@ -100,7 +100,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;
-- 
cgit 


From 81560d793a582845bae891f54fde267e6040fed8 Mon Sep 17 00:00:00 2001
From: Glease <4586901+Glease@users.noreply.github.com>
Date: Thu, 9 Sep 2021 22:11:01 +0800
Subject: Fix import

Former-commit-id: 0be4a8f33bb63b498a92df124b980ce80d0b0028
---
 .../material/werkstoff_loaders/registration/BridgeMaterialsLoader.java   | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/main')

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 a76aa7545b..be6bdcc581 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;
-- 
cgit 


From 950e02389791875a9488b299abc55349e837ff10 Mon Sep 17 00:00:00 2001
From: Glease <4586901+Glease@users.noreply.github.com>
Date: Thu, 9 Sep 2021 22:12:56 +0800
Subject: Fix git derp

Former-commit-id: 2249373213d577cac51706fad0a54eda4600359f
---
 .../material/werkstoff_loaders/registration/BridgeMaterialsLoader.java   | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/main')

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 be6bdcc581..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
@@ -101,6 +101,7 @@ 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);
-- 
cgit