aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/api/metatileentity/implementations
diff options
context:
space:
mode:
authorDream-Master <dream-master@gmx.net>2017-10-20 20:41:51 +0200
committerDream-Master <dream-master@gmx.net>2017-10-20 20:41:51 +0200
commit73f745b5fed285e0ef6455c0a8b778ee7ea7f211 (patch)
tree957e0d8673a97afab0d69711d368cad4bac9bdf0 /src/main/java/gregtech/api/metatileentity/implementations
parentf57809063e697316584d9ef8b655e08127d0323c (diff)
downloadGT5-Unofficial-73f745b5fed285e0ef6455c0a8b778ee7ea7f211.tar.gz
GT5-Unofficial-73f745b5fed285e0ef6455c0a8b778ee7ea7f211.tar.bz2
GT5-Unofficial-73f745b5fed285e0ef6455c0a8b778ee7ea7f211.zip
fixed now
Diffstat (limited to 'src/main/java/gregtech/api/metatileentity/implementations')
-rw-r--r--src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Item.java13
1 files changed, 4 insertions, 9 deletions
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Item.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Item.java
index aefd669ffc..34254687be 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Item.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Item.java
@@ -53,13 +53,13 @@ public class GT_MetaPipeEntity_Item extends MetaPipeEntity implements IMetaTileE
mTickTime = 20;
}
- public GT_MetaPipeEntity_Item(String aName, float aThickNess, Materials aMaterial, int aInvSlotCount, int aStepSize, boolean aIsRestrictive) {
+ public GT_MetaPipeEntity_Item(String aName, float aThickNess, Materials aMaterial, int aInvSlotCount, int aStepSize, boolean aIsRestrictive, int aTickTime) {
super(aName, aInvSlotCount);
mIsRestrictive = aIsRestrictive;
mThickNess = aThickNess;
mMaterial = aMaterial;
mStepSize = aStepSize;
- mTickTime = 20;
+ mTickTime = aTickTime;
}
@Override
@@ -69,7 +69,7 @@ public class GT_MetaPipeEntity_Item extends MetaPipeEntity implements IMetaTileE
@Override
public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
- return new GT_MetaPipeEntity_Item(mName, mThickNess, mMaterial, mInventory.length, mStepSize, mIsRestrictive);
+ return new GT_MetaPipeEntity_Item(mName, mThickNess, mMaterial, mInventory.length, mStepSize, mIsRestrictive, mTickTime);
}
@Override
@@ -305,12 +305,7 @@ public class GT_MetaPipeEntity_Item extends MetaPipeEntity implements IMetaTileE
@Override
public String[] getDescription() {
- if (mTickTime == 20)
- return new String[]{"Item Capacity: %%%" + getMaxPipeCapacity() + "%%% Stacks/sec", "Routing Value: %%%" + mStepSize};
- else if (mTickTime % 20 == 0)
- return new String[]{"Item Capacity: %%%" + getMaxPipeCapacity() + "%%% Stacks/%%%" + (mTickTime / 20) + " %%%sec", "Routing Value: %%%" + mStepSize};
- else
- return new String[]{"Item Capacity: %%%" + getMaxPipeCapacity() + "%%% Stacks/%%%" + mTickTime + " %%%ticks", "Routing Value: %%%" + mStepSize};
+ return new String[]{"Item Capacity: %%%" + getMaxPipeCapacity() + "%%% Stacks/sec", "Routing Value: %%%" + mStepSize};
}
private boolean isInventoryEmpty() {