diff options
| author | Alkalus <3060479+draknyte1@users.noreply.github.com> | 2021-12-07 16:46:26 +0000 |
|---|---|---|
| committer | Alkalus <3060479+draknyte1@users.noreply.github.com> | 2021-12-07 16:46:26 +0000 |
| commit | fa37b0aa6eea11f788fe35a8e4b1d12a7d5b0118 (patch) | |
| tree | f2dcbec84756cc8ae7b285ebd2f5285383cae823 /src/Java/gtPlusPlus/core/util | |
| parent | 43e67b5f97543c2a1ea51b89ed745d0773f94751 (diff) | |
| download | GT5-Unofficial-fa37b0aa6eea11f788fe35a8e4b1d12a7d5b0118.tar.gz GT5-Unofficial-fa37b0aa6eea11f788fe35a8e4b1d12a7d5b0118.tar.bz2 GT5-Unofficial-fa37b0aa6eea11f788fe35a8e4b1d12a7d5b0118.zip | |
Stopped fluids from having their generation queued.
Possibly improved GT++ Fluid generation where GT counterparts exist.
Adding remapping event for when existing items are removed with a suitable replacement added.
Did some locale work.
Diffstat (limited to 'src/Java/gtPlusPlus/core/util')
| -rw-r--r-- | src/Java/gtPlusPlus/core/util/minecraft/FluidUtils.java | 10 | ||||
| -rw-r--r-- | src/Java/gtPlusPlus/core/util/minecraft/MaterialUtils.java | 7 |
2 files changed, 16 insertions, 1 deletions
diff --git a/src/Java/gtPlusPlus/core/util/minecraft/FluidUtils.java b/src/Java/gtPlusPlus/core/util/minecraft/FluidUtils.java index 6b07667b28..3988cdb0c4 100644 --- a/src/Java/gtPlusPlus/core/util/minecraft/FluidUtils.java +++ b/src/Java/gtPlusPlus/core/util/minecraft/FluidUtils.java @@ -287,6 +287,7 @@ public class FluidUtils { } + String aNameNonMolten = aLocalName.contains("Molten") ? aLocalName.replace("Molten", "") : aLocalName; if (aFullContainer == null) { ItemStack oreStack = ItemUtils.getItemStackOfAmountFromOreDictNoBroken("cell"+aLocalName, 1); @@ -294,7 +295,14 @@ public class FluidUtils { if (aFullContainer == null) { oreStack = ItemUtils.getItemStackOfAmountFromOreDictNoBroken("cell"+aNameOriginal, 1); aFullContainer = oreStack; - if (aFullContainer != null) { + if (aFullContainer == null) { + oreStack = ItemUtils.getItemStackOfAmountFromOreDictNoBroken("cell"+aNameNonMolten, 1); + aFullContainer = oreStack; + if (aFullContainer != null) { + Logger.INFO("Found cell for "+aNameNonMolten); + } + } + else { Logger.INFO("Found cell for "+aNameOriginal); } } diff --git a/src/Java/gtPlusPlus/core/util/minecraft/MaterialUtils.java b/src/Java/gtPlusPlus/core/util/minecraft/MaterialUtils.java index 7e9e34ae47..0323bf0161 100644 --- a/src/Java/gtPlusPlus/core/util/minecraft/MaterialUtils.java +++ b/src/Java/gtPlusPlus/core/util/minecraft/MaterialUtils.java @@ -512,5 +512,12 @@ public class MaterialUtils { return false; } + public static boolean isNullGregtechMaterial(Materials aGregtechMaterial) { + if (aGregtechMaterial == Materials._NULL || aGregtechMaterial.equals(Materials._NULL) || aGregtechMaterial.name().equals(Materials._NULL.name())) { + return true; + } + return false; + } + }
\ No newline at end of file |