From 515c98ccc43ac17ff832e480cecac9032dcff093 Mon Sep 17 00:00:00 2001
From: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
Date: Fri, 10 Apr 2020 23:09:56 +0200
Subject: replaced magic numbers with string identifiers

Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
---
 src/main/java/gregtech/api/util/GT_BartWorks_Compat.java | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'src/main/java/gregtech/api')

diff --git a/src/main/java/gregtech/api/util/GT_BartWorks_Compat.java b/src/main/java/gregtech/api/util/GT_BartWorks_Compat.java
index f090a9f8d3..eedae52716 100644
--- a/src/main/java/gregtech/api/util/GT_BartWorks_Compat.java
+++ b/src/main/java/gregtech/api/util/GT_BartWorks_Compat.java
@@ -14,21 +14,25 @@ public class GT_BartWorks_Compat {
     public static Materials getBartWorksMaterialByVarName(String name) {
         Materials materials = Materials._NULL;
         try {
-            materials = new WerkstoffAPI().getWerkstoff(name).getBridgeMaterial();
+            materials = WerkstoffAPI.getWerkstoff(name).getBridgeMaterial();
         } catch (NoSuchFieldException | IllegalAccessException exception) {
             exception.printStackTrace();
         }
         return materials;
     }
 
-    public static Materials getBartWorksMaterialByIGNName(String name) {
-        Optional<Werkstoff> material = Werkstoff.werkstoffHashSet.stream().filter(e -> e.getDefaultName().equals(name)).findFirst();
+    public static Materials getBartWorksMaterialByODName(String name) {
+        Optional<Werkstoff> material = Werkstoff.werkstoffHashSet.stream().filter(e -> e.getVarName().equals(name)).findFirst();
         if (material.isPresent()) {
             return material.get().getBridgeMaterial();
         }
         return Materials._NULL;
     }
 
+    public static Materials getBartWorksMaterialByIGNName(String name) {
+        return Optional.ofNullable(Optional.ofNullable(Werkstoff.werkstoffNameHashMap.get(name)).orElse(Werkstoff.default_null_Werkstoff).getBridgeMaterial()).orElse(Materials._NULL);
+    }
+
     public static Materials getBartWorksMaterialByID(int id) {
         return Optional.ofNullable(Optional.ofNullable(Werkstoff.werkstoffHashMap.get((short) id)).orElse(Werkstoff.default_null_Werkstoff).getBridgeMaterial()).orElse(Materials._NULL);
     }
-- 
cgit