diff options
| -rw-r--r-- | src/Java/gtPlusPlus/GTplusplus.java | 12 | ||||
| -rw-r--r-- | src/Java/gtPlusPlus/xmod/eio/handler/HandlerTooltip_EIO.java | 29 | ||||
| -rw-r--r-- | src/resources/assets/miscutils/textures/items/itemBigEgg.png | bin | 2822 -> 5330 bytes |
3 files changed, 36 insertions, 5 deletions
diff --git a/src/Java/gtPlusPlus/GTplusplus.java b/src/Java/gtPlusPlus/GTplusplus.java index f80e316b9d..8a0553eb8f 100644 --- a/src/Java/gtPlusPlus/GTplusplus.java +++ b/src/Java/gtPlusPlus/GTplusplus.java @@ -13,6 +13,7 @@ import cpw.mods.fml.relauncher.IFMLLoadingPlugin.MCVersion; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.Minecraft; import net.minecraft.launchwrapper.Launch; import gregtech.api.enums.Materials; @@ -211,9 +212,16 @@ public class GTplusplus implements ActionListener { int len = x.mFluidInputs.length; FluidStack[] y = new FluidStack[len + 1]; int slot = y.length - 1; - y[slot] = FluidUtils.getFluidStack("cryotheum", mTime); + int mr3 = 0; + for (FluidStack f : x.mFluidInputs) { + if (f != null) { + y[mr3] = f; + } + mr3++; + } + y[slot] = FluidUtils.getFluidStack("cryotheum", mTime); if (ItemUtils.checkForInvalidItems(x.mInputs)) { - CORE.RA.addAdvancedFreezerRecipe(x.mInputs, x.mFluidInputs, x.mFluidOutputs, x.mOutputs, x.mChances, x.mDuration, x.mEUt, x.mSpecialValue); + CORE.RA.addAdvancedFreezerRecipe(x.mInputs, y, x.mFluidOutputs, x.mOutputs, x.mChances, x.mDuration, x.mEUt, x.mSpecialValue); } } } diff --git a/src/Java/gtPlusPlus/xmod/eio/handler/HandlerTooltip_EIO.java b/src/Java/gtPlusPlus/xmod/eio/handler/HandlerTooltip_EIO.java index 1066bea75a..c00eb5254a 100644 --- a/src/Java/gtPlusPlus/xmod/eio/handler/HandlerTooltip_EIO.java +++ b/src/Java/gtPlusPlus/xmod/eio/handler/HandlerTooltip_EIO.java @@ -6,11 +6,13 @@ import java.lang.reflect.Field; import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import gregtech.api.enums.Materials; +import gtPlusPlus.core.handler.events.BlockEventHandler; import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.xmod.eio.material.MaterialEIO; @@ -40,16 +42,16 @@ public class HandlerTooltip_EIO { Class<?> oMainClass = Class.forName("crazypants.enderio.EnderIO"); Class<?> oIngotClass = Class.forName("crazypants.enderio.material.ItemAlloy"); if (oMainClass != null && oIngotClass != null){ - + Field oAlloyField = oMainClass.getDeclaredField("itemAlloy"); oAlloyField.setAccessible(true); Object oAlloy = oAlloyField.get(oMainClass); - + if (oAlloy != null){ if (oIngotClass.isInstance(oAlloy) || Item.class.isInstance(oAlloy)){ mIngot = (Item) oAlloy; } - + } } } @@ -127,6 +129,27 @@ public class HandlerTooltip_EIO { catch (ClassNotFoundException e) { } } + + if (!BlockEventHandler.blockLimestone.isEmpty()) { + for (ItemStack h : BlockEventHandler.blockLimestone) { + if (h != null && Block.getBlockFromItem(h.getItem()) == Block.getBlockFromItem(event.itemStack.getItem())) { + if (!ItemUtils.getModId(h).toLowerCase().contains("biomesoplenty")) { + event.toolTip.add("May contain Fluorite Ore"); + } + } + } + } + if (!BlockEventHandler.oreLimestone.isEmpty()) { + for (ItemStack h : BlockEventHandler.oreLimestone) { + if (h != null && Block.getBlockFromItem(h.getItem()) == Block.getBlockFromItem(event.itemStack.getItem())) { + if (!ItemUtils.getModId(h).toLowerCase().contains("biomesoplenty")) { + event.toolTip.add("May contain Fluorite Ore"); + } + } + } + } + + } } diff --git a/src/resources/assets/miscutils/textures/items/itemBigEgg.png b/src/resources/assets/miscutils/textures/items/itemBigEgg.png Binary files differindex 8011cb2912..872e3c4b4c 100644 --- a/src/resources/assets/miscutils/textures/items/itemBigEgg.png +++ b/src/resources/assets/miscutils/textures/items/itemBigEgg.png |
