aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/api
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/gregtech/api')
-rw-r--r--src/main/java/gregtech/api/enums/ItemList.java2
-rw-r--r--src/main/java/gregtech/api/util/GT_BartWorks_Compat.java33
2 files changed, 33 insertions, 2 deletions
diff --git a/src/main/java/gregtech/api/enums/ItemList.java b/src/main/java/gregtech/api/enums/ItemList.java
index 1986ded3f5..9e415b17dc 100644
--- a/src/main/java/gregtech/api/enums/ItemList.java
+++ b/src/main/java/gregtech/api/enums/ItemList.java
@@ -1494,8 +1494,6 @@ public enum ItemList implements IItemContainer {
OreDrill2,
OreDrill3,
OreDrill4,
- OreDrill5,
- OreDrill6,
PyrolyseOven,
OilCracker,
Crop_Drop_UUMBerry,
diff --git a/src/main/java/gregtech/api/util/GT_BartWorks_Compat.java b/src/main/java/gregtech/api/util/GT_BartWorks_Compat.java
new file mode 100644
index 0000000000..742e4358ad
--- /dev/null
+++ b/src/main/java/gregtech/api/util/GT_BartWorks_Compat.java
@@ -0,0 +1,33 @@
+package gregtech.api.util;
+
+import com.github.bartimaeusnek.bartworks.API.WerkstoffAPI;
+import com.github.bartimaeusnek.bartworks.system.material.Werkstoff;
+import gregtech.api.enums.Materials;
+
+import java.util.Optional;
+
+public class GT_BartWorks_Compat {
+
+ public static Materials getBartWorksMaterialByVarName(String name) {
+ Materials materials = Materials._NULL;
+ try {
+ materials = new 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();
+ if (material.isPresent()) {
+ return material.get().getBridgeMaterial();
+ }
+ return 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);
+ }
+
+} \ No newline at end of file