aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common/tileentities/machines/long_distance
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/gregtech/common/tileentities/machines/long_distance')
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/long_distance/MTELongDistancePipelineBase.java (renamed from src/main/java/gregtech/common/tileentities/machines/long_distance/GT_MetaTileEntity_LongDistancePipelineBase.java)37
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/long_distance/MTELongDistancePipelineFluid.java (renamed from src/main/java/gregtech/common/tileentities/machines/long_distance/GT_MetaTileEntity_LongDistancePipelineFluid.java)13
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/long_distance/MTELongDistancePipelineItem.java (renamed from src/main/java/gregtech/common/tileentities/machines/long_distance/GT_MetaTileEntity_LongDistancePipelineItem.java)17
3 files changed, 31 insertions, 36 deletions
diff --git a/src/main/java/gregtech/common/tileentities/machines/long_distance/GT_MetaTileEntity_LongDistancePipelineBase.java b/src/main/java/gregtech/common/tileentities/machines/long_distance/MTELongDistancePipelineBase.java
index ff3048f4b2..6f6f01f3ba 100644
--- a/src/main/java/gregtech/common/tileentities/machines/long_distance/GT_MetaTileEntity_LongDistancePipelineBase.java
+++ b/src/main/java/gregtech/common/tileentities/machines/long_distance/MTELongDistancePipelineBase.java
@@ -45,18 +45,18 @@ import net.minecraft.util.ChunkCoordinates;
import net.minecraft.world.World;
import net.minecraftforge.common.util.ForgeDirection;
-import gregtech.api.GregTech_API;
+import gregtech.api.GregTechAPI;
import gregtech.api.interfaces.ITexture;
import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.items.GT_Block_LongDistancePipe;
+import gregtech.api.items.BlockLongDistancePipe;
import gregtech.api.metatileentity.BaseMetaTileEntity;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicHull_NonElectric;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.metatileentity.implementations.MTEBasicHullNonElectric;
+import gregtech.api.util.GTUtility;
import mcp.mobius.waila.api.IWailaConfigHandler;
import mcp.mobius.waila.api.IWailaDataAccessor;
-public abstract class GT_MetaTileEntity_LongDistancePipelineBase extends GT_MetaTileEntity_BasicHull_NonElectric {
+public abstract class MTELongDistancePipelineBase extends MTEBasicHullNonElectric {
protected static final int INPUT_INDEX = 0;
protected static final int OUTPUT_INDEX = 1;
@@ -65,19 +65,17 @@ public abstract class GT_MetaTileEntity_LongDistancePipelineBase extends GT_Meta
public static int minimalDistancePoints = 64;
- protected GT_MetaTileEntity_LongDistancePipelineBase mTarget = null;
+ protected MTELongDistancePipelineBase mTarget = null;
// these two are updated by machine block update thread, so must be volatile
- protected volatile GT_MetaTileEntity_LongDistancePipelineBase mSender = null;
+ protected volatile MTELongDistancePipelineBase mSender = null;
protected volatile ChunkCoordinates mTargetPos = null;
- protected GT_MetaTileEntity_LongDistancePipelineBase mTooCloseTarget = null, mTooCloseSender = null;
+ protected MTELongDistancePipelineBase mTooCloseTarget = null, mTooCloseSender = null;
- public GT_MetaTileEntity_LongDistancePipelineBase(int aID, String aName, String aNameRegional, int aTier,
- String aDescription) {
+ public MTELongDistancePipelineBase(int aID, String aName, String aNameRegional, int aTier, String aDescription) {
super(aID, aName, aNameRegional, aTier, aDescription);
}
- public GT_MetaTileEntity_LongDistancePipelineBase(String aName, int aTier, String aDescription,
- ITexture[][][] aTextures) {
+ public MTELongDistancePipelineBase(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
super(aName, aTier, aDescription, aTextures);
}
@@ -111,7 +109,7 @@ public abstract class GT_MetaTileEntity_LongDistancePipelineBase extends GT_Meta
}
}
- public boolean isSameClass(GT_MetaTileEntity_LongDistancePipelineBase other) {
+ public boolean isSameClass(MTELongDistancePipelineBase other) {
return false;
}
@@ -120,7 +118,7 @@ public abstract class GT_MetaTileEntity_LongDistancePipelineBase extends GT_Meta
if (aBaseMetaTileEntity.isClientSide()) return true;
ItemStack tCurrentItem = aPlayer.inventory.getCurrentItem();
if (tCurrentItem != null) {
- if (GT_Utility.isStackInList(tCurrentItem, GregTech_API.sSoftHammerList)) {
+ if (GTUtility.isStackInList(tCurrentItem, GregTechAPI.sSoftHammerList)) {
scanPipes();
return true;
}
@@ -149,11 +147,10 @@ public abstract class GT_MetaTileEntity_LongDistancePipelineBase extends GT_Meta
TileEntity te = world.getTileEntity(mTargetPos.posX, mTargetPos.posY, mTargetPos.posZ);
final IMetaTileEntity tMeta;
if (te instanceof BaseMetaTileEntity
- && ((tMeta = ((BaseMetaTileEntity) te)
- .getMetaTileEntity()) instanceof GT_MetaTileEntity_LongDistancePipelineBase)
- && isSameClass((GT_MetaTileEntity_LongDistancePipelineBase) tMeta)) {
+ && ((tMeta = ((BaseMetaTileEntity) te).getMetaTileEntity()) instanceof MTELongDistancePipelineBase)
+ && isSameClass((MTELongDistancePipelineBase) tMeta)) {
// It's the right type!
- mTarget = (GT_MetaTileEntity_LongDistancePipelineBase) tMeta;
+ mTarget = (MTELongDistancePipelineBase) tMeta;
} else if (te != null) {
// It isn't the right type, kill the target position
mTargetPos = null;
@@ -217,7 +214,7 @@ public abstract class GT_MetaTileEntity_LongDistancePipelineBase extends GT_Meta
// Start scanning from the output side
Block aBlock = gtTile.getBlockAtSide(gtTile.getBackFacing());
- if (aBlock instanceof GT_Block_LongDistancePipe) {
+ if (aBlock instanceof BlockLongDistancePipe) {
byte aMetaData = gtTile.getMetaIDAtSide(gtTile.getBackFacing());
if (aMetaData != getPipeMeta()) return;
@@ -255,7 +252,7 @@ public abstract class GT_MetaTileEntity_LongDistancePipelineBase extends GT_Meta
TileEntity tTileEntity = world.getTileEntity(aCoords.posX, aCoords.posY, aCoords.posZ);
if (tTileEntity != gtTile && tTileEntity instanceof BaseMetaTileEntity
&& ((BaseMetaTileEntity) tTileEntity)
- .getMetaTileEntity() instanceof GT_MetaTileEntity_LongDistancePipelineBase tGtTile) {
+ .getMetaTileEntity() instanceof MTELongDistancePipelineBase tGtTile) {
if (isSameClass(tGtTile) && tWires.contains(
tGtTile.getFacingOffset(
(BaseMetaTileEntity) tTileEntity,
diff --git a/src/main/java/gregtech/common/tileentities/machines/long_distance/GT_MetaTileEntity_LongDistancePipelineFluid.java b/src/main/java/gregtech/common/tileentities/machines/long_distance/MTELongDistancePipelineFluid.java
index 70e295f3ad..e3886360c6 100644
--- a/src/main/java/gregtech/common/tileentities/machines/long_distance/GT_MetaTileEntity_LongDistancePipelineFluid.java
+++ b/src/main/java/gregtech/common/tileentities/machines/long_distance/MTELongDistancePipelineFluid.java
@@ -37,22 +37,21 @@ import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
import gregtech.api.render.TextureFactory;
-public class GT_MetaTileEntity_LongDistancePipelineFluid extends GT_MetaTileEntity_LongDistancePipelineBase {
+public class MTELongDistancePipelineFluid extends MTELongDistancePipelineBase {
static final FluidTankInfo[] emptyTank = { new FluidTankInfo(null, Integer.MAX_VALUE) };
- public GT_MetaTileEntity_LongDistancePipelineFluid(int aID, String aName, String aNameRegional, int aTier) {
+ public MTELongDistancePipelineFluid(int aID, String aName, String aNameRegional, int aTier) {
super(aID, aName, aNameRegional, aTier, "Sends fluids over long distances");
}
- public GT_MetaTileEntity_LongDistancePipelineFluid(String aName, int aTier, String aDescription,
- ITexture[][][] aTextures) {
+ public MTELongDistancePipelineFluid(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
super(aName, aTier, aDescription, aTextures);
}
@Override
- public boolean isSameClass(GT_MetaTileEntity_LongDistancePipelineBase other) {
- return other instanceof GT_MetaTileEntity_LongDistancePipelineFluid;
+ public boolean isSameClass(MTELongDistancePipelineBase other) {
+ return other instanceof MTELongDistancePipelineFluid;
}
@Override
@@ -99,7 +98,7 @@ public class GT_MetaTileEntity_LongDistancePipelineFluid extends GT_MetaTileEnti
@Override
public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
- return new GT_MetaTileEntity_LongDistancePipelineFluid(mName, mTier, getDescription()[0], mTextures);
+ return new MTELongDistancePipelineFluid(mName, mTier, getDescription()[0], mTextures);
}
@Override
diff --git a/src/main/java/gregtech/common/tileentities/machines/long_distance/GT_MetaTileEntity_LongDistancePipelineItem.java b/src/main/java/gregtech/common/tileentities/machines/long_distance/MTELongDistancePipelineItem.java
index e1510f4d3d..f619d40329 100644
--- a/src/main/java/gregtech/common/tileentities/machines/long_distance/GT_MetaTileEntity_LongDistancePipelineItem.java
+++ b/src/main/java/gregtech/common/tileentities/machines/long_distance/MTELongDistancePipelineItem.java
@@ -31,26 +31,25 @@ import net.minecraft.inventory.ISidedInventory;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
-import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.GTValues;
import gregtech.api.interfaces.ITexture;
import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
import gregtech.api.render.TextureFactory;
-public class GT_MetaTileEntity_LongDistancePipelineItem extends GT_MetaTileEntity_LongDistancePipelineBase {
+public class MTELongDistancePipelineItem extends MTELongDistancePipelineBase {
- public GT_MetaTileEntity_LongDistancePipelineItem(int aID, String aName, String aNameRegional, int aTier) {
+ public MTELongDistancePipelineItem(int aID, String aName, String aNameRegional, int aTier) {
super(aID, aName, aNameRegional, aTier, "Sends Items over long distances");
}
- public GT_MetaTileEntity_LongDistancePipelineItem(String aName, int aTier, String aDescription,
- ITexture[][][] aTextures) {
+ public MTELongDistancePipelineItem(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
super(aName, aTier, aDescription, aTextures);
}
@Override
- public boolean isSameClass(GT_MetaTileEntity_LongDistancePipelineBase other) {
- return other instanceof GT_MetaTileEntity_LongDistancePipelineItem;
+ public boolean isSameClass(MTELongDistancePipelineBase other) {
+ return other instanceof MTELongDistancePipelineItem;
}
@Override
@@ -163,7 +162,7 @@ public class GT_MetaTileEntity_LongDistancePipelineItem extends GT_MetaTileEntit
}
}
- return GT_Values.emptyIntArray;
+ return GTValues.emptyIntArray;
}
@Override
@@ -188,7 +187,7 @@ public class GT_MetaTileEntity_LongDistancePipelineItem extends GT_MetaTileEntit
@Override
public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
- return new GT_MetaTileEntity_LongDistancePipelineItem(mName, mTier, getDescription()[0], mTextures);
+ return new MTELongDistancePipelineItem(mName, mTier, getDescription()[0], mTextures);
}
@Override