From 31e6940e83ff0ed28503de0a6914ced4f1f42b93 Mon Sep 17 00:00:00 2001
From: Antifluxfield <lyj_299792458@163.com>
Date: Tue, 26 Dec 2017 12:54:00 +0800
Subject: bugfix

---
 .../java/gregtech/api/metatileentity/MetaPipeEntity.java   | 14 +++++++++++---
 .../implementations/GT_MetaPipeEntity_Fluid.java           |  3 ++-
 .../implementations/GT_MetaPipeEntity_Item.java            | 10 +++-------
 3 files changed, 16 insertions(+), 11 deletions(-)

(limited to 'src/main/java/gregtech/api/metatileentity')

diff --git a/src/main/java/gregtech/api/metatileentity/MetaPipeEntity.java b/src/main/java/gregtech/api/metatileentity/MetaPipeEntity.java
index e5724bb653..090c71abe7 100644
--- a/src/main/java/gregtech/api/metatileentity/MetaPipeEntity.java
+++ b/src/main/java/gregtech/api/metatileentity/MetaPipeEntity.java
@@ -78,6 +78,10 @@ public abstract class MetaPipeEntity implements IMetaTileEntity, IConnectable {
      * }
      */
     public MetaPipeEntity(int aID, String aBasicName, String aRegionalName, int aInvSlotCount) {
+    	this(aID, aBasicName, aRegionalName, aInvSlotCount, true);
+    }
+
+    public MetaPipeEntity(int aID, String aBasicName, String aRegionalName, int aInvSlotCount, boolean aAddInfo) {
         if (GregTech_API.sPostloadStarted || !GregTech_API.sPreloadStarted)
             throw new IllegalAccessError("This Constructor has to be called in the load Phase");
         if (GregTech_API.METATILEENTITIES[aID] == null) {
@@ -91,12 +95,16 @@ public abstract class MetaPipeEntity implements IMetaTileEntity, IConnectable {
         GT_LanguageManager.addStringLocalization("gt.blockmachines." + mName + ".name", aRegionalName);
         mInventory = new ItemStack[aInvSlotCount];
 
-        if (GT.isClientSide()) {
-            ItemStack tStack = new ItemStack(GregTech_API.sBlockMachines, 1, aID);
-            tStack.getItem().addInformation(tStack, null, new ArrayList<String>(), true);
+        if (aAddInfo && GT.isClientSide()) {
+        	addInfo(aID);
         }
     }
 
+    protected final void addInfo(int aID) {
+        ItemStack tStack = new ItemStack(GregTech_API.sBlockMachines, 1, aID);
+        tStack.getItem().addInformation(tStack, null, new ArrayList<String>(), true);
+    }
+
     /**
      * This is the normal Constructor.
      */
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Fluid.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Fluid.java
index e3e9531d97..eb403aa5f0 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Fluid.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Fluid.java
@@ -52,7 +52,7 @@ public class GT_MetaPipeEntity_Fluid extends MetaPipeEntity {
     }
 
     public GT_MetaPipeEntity_Fluid(int aID, String aName, String aNameRegional, float aThickNess, Materials aMaterial, int aCapacity, int aHeatResistance, boolean aGasProof, int aFluidTypes) {
-    	super(aID, aName, aNameRegional, 0);
+    	super(aID, aName, aNameRegional, 0, false);
         mThickNess = aThickNess;
         mMaterial = aMaterial;
         mCapacity = aCapacity;
@@ -60,6 +60,7 @@ public class GT_MetaPipeEntity_Fluid extends MetaPipeEntity {
         mHeatResistance = aHeatResistance;
         mPipeAmount = aFluidTypes;
         mFluids = new FluidStack[mPipeAmount];
+        addInfo(aID);
     }
 
     @Deprecated
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 fa62894d07..7d266c1067 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
@@ -39,21 +39,17 @@ public class GT_MetaPipeEntity_Item extends MetaPipeEntity implements IMetaTileE
     private boolean mCheckConnections = !GT_Mod.gregtechproxy.gt6Pipe;
 
     public GT_MetaPipeEntity_Item(int aID, String aName, String aNameRegional, float aThickNess, Materials aMaterial, int aInvSlotCount, int aStepSize, boolean aIsRestrictive, int aTickTime) {
-        super(aID, aName, aNameRegional, aInvSlotCount);
+        super(aID, aName, aNameRegional, aInvSlotCount, false);
         mIsRestrictive = aIsRestrictive;
         mThickNess = aThickNess;
         mMaterial = aMaterial;
         mStepSize = aStepSize;
         mTickTime = aTickTime;
+        addInfo(aID);
     }
 
     public GT_MetaPipeEntity_Item(int aID, String aName, String aNameRegional, float aThickNess, Materials aMaterial, int aInvSlotCount, int aStepSize, boolean aIsRestrictive) {
-        super(aID, aName, aNameRegional, aInvSlotCount);
-        mIsRestrictive = aIsRestrictive;
-        mThickNess = aThickNess;
-        mMaterial = aMaterial;
-        mStepSize = aStepSize;
-        mTickTime = 20;
+        this(aID, aName, aNameRegional, aThickNess, aMaterial, aInvSlotCount, aStepSize, aIsRestrictive, 20);
     }
 
     public GT_MetaPipeEntity_Item(String aName, float aThickNess, Materials aMaterial, int aInvSlotCount, int aStepSize, boolean aIsRestrictive, int aTickTime) {
-- 
cgit