Anvilcraft/GregTech4
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "Auto-pushing of liquid by output hatch"

Browse source 
I told you it should not be there.
This reverts commit 65c51904e0.
This commit is contained in:
TheDarkDnKTv 2020-08-19 13:33:55 +03:00
parent 65c51904e0
commit 5b7a871cfb
1 changed files with 2 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/main/java/gregtechmod/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Output.java
View file

@ -7,11 +7,8 @@ import gregtechmod.api.util.GT_Utility;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraftforge.common.util.ForgeDirection;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.IFluidHandler;
public class GT_MetaTileEntity_Hatch_Output extends GT_MetaTileEntity_BasicTank implements IFluidHandler{
public class GT_MetaTileEntity_Hatch_Output extends GT_MetaTileEntity_BasicTank {
public byte mMode = 0;
@ -61,26 +58,7 @@ public class GT_MetaTileEntity_Hatch_Output extends GT_MetaTileEntity_BasicTank
if (aSide==1) return 29;
return 40;
}
//New code: auto-liquid pushing
@Override
public void onPostTick() {
super.onPostTick();
if (getBaseMetaTileEntity().isServerSide()) {
if (this.mMode == 8 && this.mFluid != null && getBaseMetaTileEntity().getTileEntityAtSide(getBaseMetaTileEntity().getFrontFacing()) != null && getBaseMetaTileEntity().getITankContainerAtSide(getBaseMetaTileEntity().getFrontFacing()).canFill(ForgeDirection.UNKNOWN, this.mFluid.getFluid())) {
int filled = this.mFluid.amount == 0 ? 0 : getBaseMetaTileEntity().getITankContainerAtSide(getBaseMetaTileEntity().getFrontFacing()).fill(ForgeDirection.UNKNOWN, this.mFluid, false);
if (filled > 0) {
getBaseMetaTileEntity().getITankContainerAtSide(getBaseMetaTileEntity().getFrontFacing()).fill(ForgeDirection.UNKNOWN, this.mFluid, true);
this.mFluid.amount-=filled;
}
}
}
}
@Override
public boolean canFill(ForgeDirection aSide, Fluid aFluid) {
return aSide == ForgeDirection.getOrientation(getBaseMetaTileEntity().getFrontFacing()) ? false : true;
}
//End of new code
@Override
public String getDescription() {
return "Use Screwdriver to specify Output Type";
@ -109,7 +87,7 @@ public class GT_MetaTileEntity_Hatch_Output extends GT_MetaTileEntity_BasicTank
@Override
public void onScrewdriverRightClick(byte aSide, EntityPlayer aPlayer, float aX, float aY, float aZ) {
if (!getBaseMetaTileEntity().getCoverBehaviorAtSide(aSide).isGUIClickable(aSide, getBaseMetaTileEntity().getCoverIDAtSide(aSide), getBaseMetaTileEntity().getCoverDataAtSide(aSide), getBaseMetaTileEntity())) return;
mMode = (byte)((mMode + 1) % 9);
mMode = (byte)((mMode + 1) % 8);
switch (mMode) {
case 0: GT_Utility.sendChatToPlayer(aPlayer, "Outputs Liquids, Steam and Items"); break;
case 1: GT_Utility.sendChatToPlayer(aPlayer, "Outputs Steam and Items"); break;
@ -119,7 +97,6 @@ public class GT_MetaTileEntity_Hatch_Output extends GT_MetaTileEntity_BasicTank
case 5: GT_Utility.sendChatToPlayer(aPlayer, "Outputs only Items"); break;
case 6: GT_Utility.sendChatToPlayer(aPlayer, "Outputs only Liquids"); break;
case 7: GT_Utility.sendChatToPlayer(aPlayer, "Outputs nothing"); break;
case 8: GT_Utility.sendChatToPlayer(aPlayer, "Auto-output Liquids"); break;
}
}