diff options
| author | Blood-Asp <bloodasphendrik@gmail.com> | 2016-10-16 18:08:26 +0200 |
|---|---|---|
| committer | Blood-Asp <bloodasphendrik@gmail.com> | 2016-10-16 18:08:26 +0200 |
| commit | fa79dcd2635a317972ca0a8400cf8820c40e72de (patch) | |
| tree | 2e5bac28974b1d917dc1932a678324c8ea68737d /src/main/java/gregtech/api | |
| parent | f97698b054c1d3ef1544365a65ccd90ba8d3bb6c (diff) | |
| download | GT5-Unofficial-fa79dcd2635a317972ca0a8400cf8820c40e72de.tar.gz GT5-Unofficial-fa79dcd2635a317972ca0a8400cf8820c40e72de.tar.bz2 GT5-Unofficial-fa79dcd2635a317972ca0a8400cf8820c40e72de.zip | |
Base IC2 Classic compat. Reactor components disabled, some recipes likely missing/broken
Diffstat (limited to 'src/main/java/gregtech/api')
| -rw-r--r-- | src/main/java/gregtech/api/GregTech_API.java | 1 | ||||
| -rw-r--r-- | src/main/java/gregtech/api/items/GT_RadioactiveCellIC_Item.java | 4 | ||||
| -rw-r--r-- | src/main/java/gregtech/api/util/GT_ModHandler.java | 4 |
3 files changed, 7 insertions, 2 deletions
diff --git a/src/main/java/gregtech/api/GregTech_API.java b/src/main/java/gregtech/api/GregTech_API.java index f3bb7f6764..48d2de2503 100644 --- a/src/main/java/gregtech/api/GregTech_API.java +++ b/src/main/java/gregtech/api/GregTech_API.java @@ -192,6 +192,7 @@ public class GregTech_API { public static int mRFtoEU = 20; public static boolean mRFExplosions = true; public static boolean mServerStarted = false; + public static boolean mIC2Classic = false; private static final String aTextIC2Lower = MOD_ID_IC2.toLowerCase(Locale.ENGLISH); /** * Getting assigned by the Mod loading diff --git a/src/main/java/gregtech/api/items/GT_RadioactiveCellIC_Item.java b/src/main/java/gregtech/api/items/GT_RadioactiveCellIC_Item.java index 9304068159..fe136e0621 100644 --- a/src/main/java/gregtech/api/items/GT_RadioactiveCellIC_Item.java +++ b/src/main/java/gregtech/api/items/GT_RadioactiveCellIC_Item.java @@ -12,6 +12,8 @@ import net.minecraft.world.World; import java.util.ArrayList; +import gregtech.api.GregTech_API; + public class GT_RadioactiveCellIC_Item extends GT_RadioactiveCell_Item implements IReactorComponent { public final int numberOfCells; @@ -144,7 +146,7 @@ public class GT_RadioactiveCellIC_Item extends GT_RadioactiveCell_Item implement public void onUpdate(ItemStack stack, World world, Entity entity, int slotIndex, boolean isCurrentItem) { if (this.sRadiation > 0 && (entity instanceof EntityLivingBase)) { EntityLivingBase entityLiving = (EntityLivingBase) entity; - if (!ItemArmorHazmat.hasCompleteHazmat(entityLiving)) { + if (!GregTech_API.mIC2Classic&&!ItemArmorHazmat.hasCompleteHazmat(entityLiving)) { IC2Potion.radiation.applyTo(entityLiving, sRadiation * 20, sRadiation * 10); } } diff --git a/src/main/java/gregtech/api/util/GT_ModHandler.java b/src/main/java/gregtech/api/util/GT_ModHandler.java index b037b1f273..88e95245b8 100644 --- a/src/main/java/gregtech/api/util/GT_ModHandler.java +++ b/src/main/java/gregtech/api/util/GT_ModHandler.java @@ -186,7 +186,9 @@ public class GT_ModHandler { * Returns a Liquid Stack with given amount of distilled Water. */ public static FluidStack getDistilledWater(long aAmount) { - return FluidRegistry.getFluidStack("ic2distilledwater", (int) aAmount); + FluidStack tFluid = FluidRegistry.getFluidStack("ic2distilledwater", (int) aAmount); + if(tFluid==null)tFluid = getWater(aAmount); + return tFluid; } /** |