aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/api/util
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/gregtech/api/util')
-rw-r--r--src/main/java/gregtech/api/util/GT_BartWorks_Compat.java10
-rw-r--r--src/main/java/gregtech/api/util/GT_Recipe.java2
2 files changed, 8 insertions, 4 deletions
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);
}
diff --git a/src/main/java/gregtech/api/util/GT_Recipe.java b/src/main/java/gregtech/api/util/GT_Recipe.java
index 6a735c869d..4821702f25 100644
--- a/src/main/java/gregtech/api/util/GT_Recipe.java
+++ b/src/main/java/gregtech/api/util/GT_Recipe.java
@@ -841,7 +841,7 @@ public class GT_Recipe implements Comparable<GT_Recipe> {
}
// Unification happens here in case the Input isn't already unificated.
- if (aNotUnificated) aInputs = GT_OreDictUnificator.getStackArray(true, aInputs);
+ if (aNotUnificated) aInputs = GT_OreDictUnificator.getStackArray(true, (Object[]) aInputs);
// Check the Recipe which has been used last time in order to not have to search for it again, if possible.
if (aRecipe != null)