Merge branch 'master' of https://github.com/TechReborn/TechReborn
This commit is contained in:
commit
9f99812490
2 changed files with 27 additions and 43 deletions
|
@ -10,6 +10,7 @@ import net.minecraft.network.NetworkManager;
|
||||||
import net.minecraft.network.Packet;
|
import net.minecraft.network.Packet;
|
||||||
import net.minecraft.network.play.server.S35PacketUpdateTileEntity;
|
import net.minecraft.network.play.server.S35PacketUpdateTileEntity;
|
||||||
import net.minecraft.tileentity.TileEntity;
|
import net.minecraft.tileentity.TileEntity;
|
||||||
|
import techreborn.init.ModBlocks;
|
||||||
import techreborn.util.FluidUtils;
|
import techreborn.util.FluidUtils;
|
||||||
import techreborn.util.Inventory;
|
import techreborn.util.Inventory;
|
||||||
|
|
||||||
|
@ -165,44 +166,32 @@ public class TileQuantumChest extends TileEntity implements IInventory ,IWrencha
|
||||||
return inventory.isItemValidForSlot(slot, stack);
|
return inventory.isItemValidForSlot(slot, stack);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean wrenchCanSetFacing(EntityPlayer entityPlayer, int side) {
|
public boolean wrenchCanSetFacing(EntityPlayer entityPlayer, int side) {
|
||||||
// TODO Auto-generated method stub
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public short getFacing() {
|
public short getFacing() {
|
||||||
// TODO Auto-generated method stub
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void setFacing(short facing) {
|
public void setFacing(short facing) {
|
||||||
// TODO Auto-generated method stub
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean wrenchCanRemove(EntityPlayer entityPlayer) {
|
public boolean wrenchCanRemove(EntityPlayer entityPlayer) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public float getWrenchDropRate() {
|
public float getWrenchDropRate() {
|
||||||
// TODO Auto-generated method stub
|
return 1F;
|
||||||
return 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public ItemStack getWrenchDrop(EntityPlayer entityPlayer) {
|
public ItemStack getWrenchDrop(EntityPlayer entityPlayer) {
|
||||||
// TODO Auto-generated method stub
|
return new ItemStack(ModBlocks.quantumChest);
|
||||||
return null;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -14,6 +14,7 @@ import net.minecraftforge.fluids.Fluid;
|
||||||
import net.minecraftforge.fluids.FluidStack;
|
import net.minecraftforge.fluids.FluidStack;
|
||||||
import net.minecraftforge.fluids.FluidTankInfo;
|
import net.minecraftforge.fluids.FluidTankInfo;
|
||||||
import net.minecraftforge.fluids.IFluidHandler;
|
import net.minecraftforge.fluids.IFluidHandler;
|
||||||
|
import techreborn.init.ModBlocks;
|
||||||
import techreborn.util.FluidUtils;
|
import techreborn.util.FluidUtils;
|
||||||
import techreborn.util.Inventory;
|
import techreborn.util.Inventory;
|
||||||
import techreborn.util.Tank;
|
import techreborn.util.Tank;
|
||||||
|
@ -153,38 +154,32 @@ public class TileQuantumTank extends TileEntity implements IFluidHandler, IInven
|
||||||
return inventory.isItemValidForSlot(slot, stack);
|
return inventory.isItemValidForSlot(slot, stack);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean wrenchCanSetFacing(EntityPlayer entityPlayer, int side) {
|
public boolean wrenchCanSetFacing(EntityPlayer entityPlayer, int side) {
|
||||||
// TODO Auto-generated method stub
|
return false;
|
||||||
return false;
|
}
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public short getFacing() {
|
public short getFacing() {
|
||||||
// TODO Auto-generated method stub
|
return 0;
|
||||||
return 0;
|
}
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void setFacing(short facing) {
|
public void setFacing(short facing) {
|
||||||
// TODO Auto-generated method stub
|
}
|
||||||
|
|
||||||
}
|
@Override
|
||||||
|
public boolean wrenchCanRemove(EntityPlayer entityPlayer) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean wrenchCanRemove(EntityPlayer entityPlayer) {
|
public float getWrenchDropRate() {
|
||||||
return true;
|
return 1F;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public float getWrenchDropRate() {
|
public ItemStack getWrenchDrop(EntityPlayer entityPlayer) {
|
||||||
// TODO Auto-generated method stub
|
return new ItemStack(ModBlocks.quantumTank);
|
||||||
return 0;
|
}
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public ItemStack getWrenchDrop(EntityPlayer entityPlayer) {
|
|
||||||
// TODO Auto-generated method stub
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue