diff options
author | bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> | 2020-04-10 15:41:32 +0200 |
---|---|---|
committer | bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> | 2020-04-10 15:41:32 +0200 |
commit | 5e3ca4304eaa66bc0250878d8d1bc71022afedf8 (patch) | |
tree | 0a023effdc777d9dc85a9cba5ec75731333c8912 /src/main/java/gregtech/api | |
parent | b5d158b9b2f05dc63e90bdb5d266276b62f94df4 (diff) | |
download | GT5-Unofficial-5e3ca4304eaa66bc0250878d8d1bc71022afedf8.tar.gz GT5-Unofficial-5e3ca4304eaa66bc0250878d8d1bc71022afedf8.tar.bz2 GT5-Unofficial-5e3ca4304eaa66bc0250878d8d1bc71022afedf8.zip |
Removed T5 & T6 Miners
+ Added BW Compat for easier use of BW Materials in code
+ Removed DD Veins
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
Diffstat (limited to 'src/main/java/gregtech/api')
-rw-r--r-- | src/main/java/gregtech/api/enums/ItemList.java | 2 | ||||
-rw-r--r-- | src/main/java/gregtech/api/util/GT_BartWorks_Compat.java | 33 |
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 |