Fixes #194
This commit is contained in:
parent
e34436a94d
commit
50fa2e8a1d
12 changed files with 134 additions and 50 deletions
|
@ -8,6 +8,7 @@ import net.minecraft.inventory.ISidedInventory;
|
|||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraftforge.common.util.ForgeDirection;
|
||||
import techreborn.api.IListInfoProvider;
|
||||
import techreborn.api.recipe.RecipeCrafter;
|
||||
import techreborn.config.ConfigTechReborn;
|
||||
import techreborn.init.ModBlocks;
|
||||
|
@ -17,7 +18,7 @@ import techreborn.util.Inventory;
|
|||
|
||||
import java.util.List;
|
||||
|
||||
public class TileCentrifuge extends TilePowerAcceptor implements IWrenchable, IEnergyTile, IInventory, ISidedInventory {
|
||||
public class TileCentrifuge extends TilePowerAcceptor implements IWrenchable, IEnergyTile, IInventory, ISidedInventory, IListInfoProvider {
|
||||
|
||||
public int tickTime;
|
||||
public Inventory inventory = new Inventory(11, "TileCentrifuge", 64);
|
||||
|
@ -97,8 +98,7 @@ public class TileCentrifuge extends TilePowerAcceptor implements IWrenchable, IE
|
|||
}
|
||||
|
||||
@Override
|
||||
public void addWailaInfo(List<String> info) {
|
||||
super.addWailaInfo(info);
|
||||
public void addInfo(List<String> info, boolean isRealTile) {
|
||||
// info.add("Power Stored " + energy.getEnergyStored() +" EU");
|
||||
// if(crafter.currentRecipe !=null){
|
||||
// info.add("Power Usage " + crafter.currentRecipe.euPerTick() + " EU/t");
|
||||
|
|
|
@ -8,6 +8,7 @@ import net.minecraft.nbt.NBTTagCompound;
|
|||
import net.minecraft.network.NetworkManager;
|
||||
import net.minecraft.network.Packet;
|
||||
import net.minecraft.network.play.server.S35PacketUpdateTileEntity;
|
||||
import techreborn.api.IListInfoProvider;
|
||||
import techreborn.init.ModBlocks;
|
||||
import techreborn.util.Inventory;
|
||||
import techreborn.util.ItemUtils;
|
||||
|
@ -15,7 +16,7 @@ import techreborn.util.ItemUtils;
|
|||
import java.util.List;
|
||||
|
||||
public class TileDigitalChest extends TileMachineBase implements IInventory,
|
||||
IWrenchable {
|
||||
IWrenchable, IListInfoProvider {
|
||||
|
||||
// Slot 0 = Input
|
||||
// Slot 1 = Output
|
||||
|
@ -230,8 +231,7 @@ public class TileDigitalChest extends TileMachineBase implements IInventory,
|
|||
}
|
||||
|
||||
@Override
|
||||
public void addWailaInfo(List<String> info) {
|
||||
super.addWailaInfo(info);
|
||||
public void addInfo(List<String> info, boolean isRealTile) {
|
||||
int size = 0;
|
||||
String name = "of nothing";
|
||||
if (storedItem != null) {
|
||||
|
@ -245,4 +245,5 @@ public class TileDigitalChest extends TileMachineBase implements IInventory,
|
|||
info.add(size + " " + name);
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -10,6 +10,7 @@ import net.minecraft.nbt.NBTTagCompound;
|
|||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraftforge.common.util.ForgeDirection;
|
||||
import net.minecraftforge.fluids.*;
|
||||
import techreborn.api.IListInfoProvider;
|
||||
import techreborn.api.recipe.RecipeCrafter;
|
||||
import techreborn.blocks.BlockMachineCasing;
|
||||
import techreborn.init.ModBlocks;
|
||||
|
@ -22,7 +23,7 @@ import techreborn.util.Tank;
|
|||
|
||||
import java.util.List;
|
||||
|
||||
public class TileIndustrialSawmill extends TilePowerAcceptor implements IWrenchable, IEnergyTile, IFluidHandler, IInventory, ISidedInventory {
|
||||
public class TileIndustrialSawmill extends TilePowerAcceptor implements IWrenchable, IEnergyTile, IFluidHandler, IInventory, ISidedInventory, IListInfoProvider {
|
||||
|
||||
public int tickTime;
|
||||
public Inventory inventory = new Inventory(5, "TileIndustrialSawmill", 64);
|
||||
|
@ -124,11 +125,13 @@ public class TileIndustrialSawmill extends TilePowerAcceptor implements IWrencha
|
|||
}
|
||||
|
||||
@Override
|
||||
public void addWailaInfo(List<String> info) {
|
||||
super.addWailaInfo(info);
|
||||
info.add("Power Stored " + getEnergy() + " EU");
|
||||
if (crafter.currentRecipe != null) {
|
||||
info.add("Power Usage " + crafter.currentRecipe.euPerTick() + " EU/t");
|
||||
public void addInfo(List<String> info, boolean isRealTile) {
|
||||
super.addInfo(info, isRealTile);
|
||||
if(isRealTile){
|
||||
info.add("Power Stored " + getEnergy() + " EU");
|
||||
if (crafter.currentRecipe != null) {
|
||||
info.add("Power Usage " + crafter.currentRecipe.euPerTick() + " EU/t");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -1,7 +1,5 @@
|
|||
package techreborn.tiles;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.network.NetworkManager;
|
||||
import net.minecraft.network.Packet;
|
||||
|
@ -9,8 +7,6 @@ import net.minecraft.network.play.server.S35PacketUpdateTileEntity;
|
|||
import net.minecraft.tileentity.TileEntity;
|
||||
import techreborn.packets.PacketHandler;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public abstract class TileMachineBase extends TileEntity {
|
||||
|
||||
int rotation;
|
||||
|
@ -22,11 +18,6 @@ public abstract class TileMachineBase extends TileEntity {
|
|||
}
|
||||
}
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void addWailaInfo(List<String> info) {
|
||||
|
||||
}
|
||||
|
||||
public Packet getDescriptionPacket() {
|
||||
NBTTagCompound nbtTag = new NBTTagCompound();
|
||||
writeToNBT(nbtTag);
|
||||
|
|
|
@ -9,6 +9,7 @@ import net.minecraft.network.NetworkManager;
|
|||
import net.minecraft.network.Packet;
|
||||
import net.minecraft.network.play.server.S35PacketUpdateTileEntity;
|
||||
import powercrystals.minefactoryreloaded.api.IDeepStorageUnit;
|
||||
import techreborn.api.IListInfoProvider;
|
||||
import techreborn.init.ModBlocks;
|
||||
import techreborn.util.Inventory;
|
||||
import techreborn.util.ItemUtils;
|
||||
|
@ -16,7 +17,7 @@ import techreborn.util.ItemUtils;
|
|||
import java.util.List;
|
||||
|
||||
public class TileQuantumChest extends TileMachineBase implements IInventory,
|
||||
IWrenchable, IDeepStorageUnit {
|
||||
IWrenchable, IDeepStorageUnit, IListInfoProvider {
|
||||
|
||||
// Slot 0 = Input
|
||||
// Slot 1 = Output
|
||||
|
@ -230,22 +231,7 @@ public class TileQuantumChest extends TileMachineBase implements IInventory,
|
|||
return dropStack;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void addWailaInfo(List<String> info) {
|
||||
super.addWailaInfo(info);
|
||||
int size = 0;
|
||||
String name = "of nothing";
|
||||
if (storedItem != null) {
|
||||
name = storedItem.getDisplayName();
|
||||
size += storedItem.stackSize;
|
||||
}
|
||||
if (getStackInSlot(1) != null) {
|
||||
name = getStackInSlot(1).getDisplayName();
|
||||
size += getStackInSlot(1).stackSize;
|
||||
}
|
||||
info.add(size + " " + name);
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public ItemStack getStoredItemType() {
|
||||
|
@ -270,4 +256,21 @@ public class TileQuantumChest extends TileMachineBase implements IInventory,
|
|||
public int getMaxStoredCount() {
|
||||
return this.storage;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void addInfo(List<String> info, boolean isRealTile) {
|
||||
if(isRealTile){
|
||||
int size = 0;
|
||||
String name = "of nothing";
|
||||
if (storedItem != null) {
|
||||
name = storedItem.getDisplayName();
|
||||
size += storedItem.stackSize;
|
||||
}
|
||||
if (getStackInSlot(1) != null) {
|
||||
name = getStackInSlot(1).getDisplayName();
|
||||
size += getStackInSlot(1).stackSize;
|
||||
}
|
||||
info.add(size + " " + name);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -13,6 +13,7 @@ import net.minecraftforge.fluids.Fluid;
|
|||
import net.minecraftforge.fluids.FluidStack;
|
||||
import net.minecraftforge.fluids.FluidTankInfo;
|
||||
import net.minecraftforge.fluids.IFluidHandler;
|
||||
import techreborn.api.IListInfoProvider;
|
||||
import techreborn.init.ModBlocks;
|
||||
import techreborn.util.FluidUtils;
|
||||
import techreborn.util.Inventory;
|
||||
|
@ -21,7 +22,7 @@ import techreborn.util.Tank;
|
|||
import java.util.List;
|
||||
|
||||
public class TileQuantumTank extends TileMachineBase implements IFluidHandler,
|
||||
IInventory, IWrenchable {
|
||||
IInventory, IWrenchable, IListInfoProvider {
|
||||
|
||||
public Tank tank = new Tank("TileQuantumTank", Integer.MAX_VALUE, this);
|
||||
public Inventory inventory = new Inventory(3, "TileQuantumTank", 64);
|
||||
|
@ -217,13 +218,16 @@ public class TileQuantumTank extends TileMachineBase implements IFluidHandler,
|
|||
}
|
||||
|
||||
@Override
|
||||
public void addWailaInfo(List<String> info) {
|
||||
super.addWailaInfo(info);
|
||||
if (tank.getFluid() != null) {
|
||||
info.add(tank.getFluidAmount() + " of "
|
||||
+ tank.getFluidType().getName());
|
||||
} else {
|
||||
info.add("Empty");
|
||||
public void addInfo(List<String> info, boolean isRealTile) {
|
||||
if(isRealTile){
|
||||
if (tank.getFluid() != null) {
|
||||
info.add(tank.getFluidAmount() + " of "
|
||||
+ tank.getFluidType().getName());
|
||||
} else {
|
||||
info.add("Empty");
|
||||
}
|
||||
}
|
||||
info.add("Capacity " + tank.getCapacity() + " mb");
|
||||
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue