Sangui/GT5-Unofficial
2
1
Fork 0
Code Issues 6 Pull requests Projects Releases Packages Wiki Activity Actions

Added check to ensure that fluid is set trying to provide air to player during onArmorTick

Browse source 
Looking at how to fill helmet tank from air cell
This commit is contained in:
Doug Gabehart 2016-12-15 17:11:13 -06:00
parent b41c3370cc
commit 3d2dd065fa
2 changed files with 35 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/gregtech/common/items/armor/ModularArmor_Item.java
View file

@ -210,8 +210,8 @@ public class ModularArmor_Item extends ItemArmor implements ISpecialArmor, IGogg
}
// Breathing
if (data.type == 0 && aPlayer.getAir() < 100) {
int air = 0;
if (data.type == 0 && aPlayer.getAir() < 100 && data.fluid != null) {
int air = 0;
if (data.fluid.getUnlocalizedName().equals("fluid.oxygen") && data.fluid.amount >= 150) {
aPlayer.setAir(aPlayer.getAir() + 150);
air = 150;

43
src/main/java/gregtech/common/items/armor/gui/GuiElectricArmor1.java
View file

@ -1,7 +1,10 @@
package gregtech.common.items.armor.gui;
import gregtech.api.enums.GT_Values;
import gregtech.api.util.GT_LanguageManager;
import gregtech.api.util.GT_Utility;
import gregtech.common.GT_Network;
import gregtech.common.items.armor.ArmorData;
import gregtech.common.items.armor.components.StatType;
import java.text.DecimalFormat;
@ -168,27 +171,39 @@ public class GuiElectricArmor1 extends GuiContainer {
}
}
// Slot slot = getSlotAtPosition(mouseX, mouseY);
// if (slot != null && slot instanceof SlotFluid && player != null) {
// if (slot != null && slot instanceof SlotFluid && player != null && cont.mInvArmor.data.helmet!=null) {
// ItemStack tmp = player.inventory.getItemStack();
// //GT_Network gtn = new GT_Network();
// if (tmp == null) {
// GTExtras.NET.sendToServer(new FluidSync(player.getCommandSenderName(), 0, "null"));
// //GT_Values.NW.sendToServer(new FluidSync(player.getCommandSenderName(), 0, "null"));
// }
// //ArmorData armorData = new ArmorData(player,);
// if (tmp != null && tmp.getItem() instanceof IFluidContainerItem) {
// FluidStack tmp2 = ((IFluidContainerItem) tmp.getItem()).getFluid(tmp);
// if (!slot.getHasStack() && tmp2 != null) {
// slot.putStack(UT.Fluids.display(tmp2, true));
// GTExtras.NET.sendToServer(new FluidSync(player.getCommandSenderName(), tmp2.amount, UT.Fluids.name(tmp2, false)));
// ItemStack tmp4 = UT.Fluids.getContainerForFilledItem(tmp, true);
// slot.putStack(GT_Utility.getFluidDisplayStack(tmp2, true));
//
// if(cont.mInvArmor.data.helmet.fluid == null)
// {
// cont.mInvArmor.data.helmet.fluid = new FluidStack(tmp2.getFluid(), tmp2.amount);
// }
// else
// {
// cont.mInvArmor.data.helmet.fluid.amount += tmp2.amount;
// }
//
// //GT_Values.NW.sendToServer(new FluidSync(player.getCommandSenderName(), tmp2.amount, GT_Utility.getFluidName(tmp2, false)));
// ItemStack tmp4 = GT_Utility.getContainerForFilledItem(tmp, true);
// tmp4.stackSize = 1;
// if (tmp.stackSize > 1) {
// player.inventory.addItemStackToInventory(tmp4);
// tmp.stackSize--;
// player.inventory.setItemStack(tmp);
// GTExtras.NET.sendToServer(new FluidSync2(player.getCommandSenderName()));
// //GT_Values.NW.sendToServer(new FluidSync2(player.getCommandSenderName()));
// } else {
// player.inventory.setItemStack(null);
// player.inventory.addItemStackToInventory(tmp4);
// GTExtras.NET.sendToServer(new FluidSync2(player.getCommandSenderName()));
// //GT_Values.NW.sendToServer(new FluidSync2(player.getCommandSenderName()));
// }
//
// } else if (slot.getHasStack() && tmp2 != null) {
@ -204,9 +219,17 @@ public class GuiElectricArmor1 extends GuiContainer {
// tmp3.stackSize--;
// }
// player.inventory.setItemStack(tmp3);
// GTExtras.NET.sendToServer(new FluidSync2(player.getCommandSenderName()));
// slot.putStack(UT.Fluids.display(tmp2, true));
// GTExtras.NET.sendToServer(new FluidSync(player.getCommandSenderName(), tmp2.amount, UT.Fluids.name(tmp2, false)));
// //GT_Values.NW.sendToServer(new FluidSync2(player.getCommandSenderName()));
// slot.putStack(GT_Utility.getFluidDisplayStack(tmp2, true));
// if(cont.mInvArmor.data.helmet.fluid == null)
// {
// cont.mInvArmor.data.helmet.fluid = new FluidStack(tmp2.getFluid(), tmp2.amount);
// }
// else
// {
// cont.mInvArmor.data.helmet.fluid.amount += tmp2.amount;
// }
// //GT_Values.NW.sendToServer(new FluidSync(player.getCommandSenderName(), tmp2.amount, GT_Utility.getFluidName(tmp2, false)));
// }
// }
// }