diff options
| -rw-r--r-- | src/Java/gtPlusPlus/core/fluids/FluidFactory.java | 3 | ||||
| -rw-r--r-- | src/Java/gtPlusPlus/core/fluids/ItemGenericFluidBucket.java | 3 | ||||
| -rw-r--r-- | src/Java/gtPlusPlus/core/util/minecraft/RecipeUtils.java | 5 |
3 files changed, 7 insertions, 4 deletions
diff --git a/src/Java/gtPlusPlus/core/fluids/FluidFactory.java b/src/Java/gtPlusPlus/core/fluids/FluidFactory.java index dffd7f55e9..da23824c78 100644 --- a/src/Java/gtPlusPlus/core/fluids/FluidFactory.java +++ b/src/Java/gtPlusPlus/core/fluids/FluidFactory.java @@ -3,6 +3,7 @@ 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; @@ -122,7 +123,7 @@ public class FluidFactory { try { throw new GregtechException("Cannot generate Fluid Packages outside of Pre-Init!"); } catch (GregtechException e) { - System.exit(0); + FMLCommonHandler.instance().exitJava(0, true); } } diff --git a/src/Java/gtPlusPlus/core/fluids/ItemGenericFluidBucket.java b/src/Java/gtPlusPlus/core/fluids/ItemGenericFluidBucket.java index d41fccb3ed..680068402b 100644 --- a/src/Java/gtPlusPlus/core/fluids/ItemGenericFluidBucket.java +++ b/src/Java/gtPlusPlus/core/fluids/ItemGenericFluidBucket.java @@ -5,6 +5,7 @@ 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; @@ -44,7 +45,7 @@ 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) { - System.exit(0); + FMLCommonHandler.instance().exitJava(0, true); } } mInternalFluidCache.put(FluidFactory.mMetaToBlockMap.get(aID)); diff --git a/src/Java/gtPlusPlus/core/util/minecraft/RecipeUtils.java b/src/Java/gtPlusPlus/core/util/minecraft/RecipeUtils.java index a20678c354..df64017ac0 100644 --- a/src/Java/gtPlusPlus/core/util/minecraft/RecipeUtils.java +++ b/src/Java/gtPlusPlus/core/util/minecraft/RecipeUtils.java @@ -5,6 +5,7 @@ import java.util.Iterator; import java.util.List; import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.common.FMLCommonHandler; import gregtech.api.enums.Materials; import gregtech.api.objects.ItemData; import gregtech.api.util.*; @@ -46,7 +47,7 @@ public static int mInvalidID = 1; Logger.RECIPE(ReflectionUtils.getMethodName(7)); Logger.RECIPE(ReflectionUtils.getMethodName(8)); Logger.RECIPE(ReflectionUtils.getMethodName(9)); - System.exit(1); + FMLCommonHandler.instance().exitJava(1, true); }*/ if (resultItem == null){ @@ -356,7 +357,7 @@ public static int mInvalidID = 1; Logger.RECIPE(ReflectionUtils.getMethodName(7)); Logger.RECIPE(ReflectionUtils.getMethodName(8)); Logger.RECIPE(ReflectionUtils.getMethodName(9)); - System.exit(1); + FMLCommonHandler.instance().exitJava(1, true); } |