aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/api/util
diff options
context:
space:
mode:
authorMartin Robertz <dream-master@gmx.net>2021-08-04 18:01:42 +0200
committerGitHub <noreply@github.com>2021-08-04 18:01:42 +0200
commitc9ba4f1715652caf2b8829131be582ed187c5660 (patch)
tree0fd457571abfd66a1cba39d4612e588ea94f1301 /src/main/java/gregtech/api/util
parent68b447103638ddc2bfaba0b5a93bf10b670c0322 (diff)
parenta54f4e65bafc16af5227d2e48ff7a59c6552e031 (diff)
downloadGT5-Unofficial-c9ba4f1715652caf2b8829131be582ed187c5660.tar.gz
GT5-Unofficial-c9ba4f1715652caf2b8829131be582ed187c5660.tar.bz2
GT5-Unofficial-c9ba4f1715652caf2b8829131be582ed187c5660.zip
Merge pull request #627 from D-Cysteine/add-cracked-cells
Add cracked fluid cells
Diffstat (limited to 'src/main/java/gregtech/api/util')
-rw-r--r--src/main/java/gregtech/api/util/GT_ModHandler.java17
1 files changed, 16 insertions, 1 deletions
diff --git a/src/main/java/gregtech/api/util/GT_ModHandler.java b/src/main/java/gregtech/api/util/GT_ModHandler.java
index ac9f7bd3d4..a910723069 100644
--- a/src/main/java/gregtech/api/util/GT_ModHandler.java
+++ b/src/main/java/gregtech/api/util/GT_ModHandler.java
@@ -2008,7 +2008,22 @@ public class GT_ModHandler {
public static int getCapsuleCellContainerCount(ItemStack aStack) {
if (aStack == null) return 0;
- return GT_Utility.areStacksEqual(GT_Utility.getContainerForFilledItem(aStack, true), ItemList.Cell_Empty.get(1)) || OrePrefixes.cell.contains(aStack) || OrePrefixes.cellMolten.contains(aStack) || OrePrefixes.cellPlasma.contains(aStack) || GT_Utility.areStacksEqual(aStack, getIC2Item("waterCell", 1, W)) ? 1 : 0;
+
+ if (GT_Utility.areStacksEqual(GT_Utility.getContainerForFilledItem(aStack, true), ItemList.Cell_Empty.get(1))) {
+ return 1;
+ }
+
+ if (GT_Utility.areStacksEqual(aStack, getIC2Item("waterCell", 1, W))) {
+ return 1;
+ }
+
+ for (OrePrefixes cellType : OrePrefixes.CELL_TYPES) {
+ if (cellType.contains(aStack)) {
+ return 1;
+ }
+ }
+
+ return 0;
}
public static class RecipeBits {