diff options
| author | Alkalus <3060479+draknyte1@users.noreply.github.com> | 2021-12-12 16:09:21 +0000 |
|---|---|---|
| committer | Alkalus <3060479+draknyte1@users.noreply.github.com> | 2021-12-12 16:09:21 +0000 |
| commit | 35005d1e8124f7a078bb65fb0b11e2e64f1287b9 (patch) | |
| tree | f78d5a7fd491d3514a2d88eeaab340ba31ea23b8 /src/Java/gtPlusPlus/core/fluids | |
| parent | f5f7c53610a342c644bebf7d77f9cf8f4d2aba4c (diff) | |
| download | GT5-Unofficial-35005d1e8124f7a078bb65fb0b11e2e64f1287b9.tar.gz GT5-Unofficial-35005d1e8124f7a078bb65fb0b11e2e64f1287b9.tar.bz2 GT5-Unofficial-35005d1e8124f7a078bb65fb0b11e2e64f1287b9.zip | |
Added recipes for the Cold Trap and Reactor Processing Unit.
Fixed NEI handler for sparging.
Changed ABS NEI handler.
Replace non-verbose FMLCommonHandler.instance().exitJava() calls with CORE.Crash(string).
Diffstat (limited to 'src/Java/gtPlusPlus/core/fluids')
| -rw-r--r-- | src/Java/gtPlusPlus/core/fluids/FluidFactory.java | 6 | ||||
| -rw-r--r-- | src/Java/gtPlusPlus/core/fluids/ItemGenericFluidBucket.java | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/Java/gtPlusPlus/core/fluids/FluidFactory.java b/src/Java/gtPlusPlus/core/fluids/FluidFactory.java index da23824c78..d94fa35af7 100644 --- a/src/Java/gtPlusPlus/core/fluids/FluidFactory.java +++ b/src/Java/gtPlusPlus/core/fluids/FluidFactory.java @@ -3,7 +3,6 @@ package gtPlusPlus.core.fluids; import java.util.LinkedHashMap; import java.util.Map; -import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.eventhandler.Event.Result; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.registry.GameRegistry; @@ -12,11 +11,11 @@ import gtPlusPlus.GTplusplus.INIT_PHASE; import gtPlusPlus.api.objects.GregtechException; import gtPlusPlus.api.objects.data.AutoMap; import gtPlusPlus.core.item.base.itemblock.FluidItemBlock; +import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.minecraft.FluidUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; import net.minecraft.block.Block; -import net.minecraft.block.material.Material; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.Item; @@ -123,7 +122,8 @@ public class FluidFactory { try { throw new GregtechException("Cannot generate Fluid Packages outside of Pre-Init!"); } catch (GregtechException e) { - FMLCommonHandler.instance().exitJava(0, true); + e.printStackTrace(); + CORE.crash("Cannot generate Fluid Packages outside of Pre-Init!"); } } diff --git a/src/Java/gtPlusPlus/core/fluids/ItemGenericFluidBucket.java b/src/Java/gtPlusPlus/core/fluids/ItemGenericFluidBucket.java index 680068402b..6354be632d 100644 --- a/src/Java/gtPlusPlus/core/fluids/ItemGenericFluidBucket.java +++ b/src/Java/gtPlusPlus/core/fluids/ItemGenericFluidBucket.java @@ -5,7 +5,6 @@ import java.util.List; import java.util.Map; import cpw.mods.fml.common.eventhandler.Event; -import cpw.mods.fml.common.FMLCommonHandler; import gtPlusPlus.api.objects.GregtechException; import gtPlusPlus.api.objects.data.AutoMap; import gtPlusPlus.core.lib.CORE; @@ -45,7 +44,8 @@ public class ItemGenericFluidBucket extends ItemBucket { try { throw new GregtechException(""+aID+" is already registered! Unable to register fluid: "+FluidFactory.mMetaToFluidMap.get(aID).getLocalizedName()); } catch (GregtechException e) { - FMLCommonHandler.instance().exitJava(0, true); + e.printStackTrace(); + CORE.crash(""+aID+" is already registered! Unable to register fluid: "+FluidFactory.mMetaToFluidMap.get(aID).getLocalizedName()); } } mInternalFluidCache.put(FluidFactory.mMetaToBlockMap.get(aID)); |
