diff options
Diffstat (limited to 'src/main')
4 files changed, 22 insertions, 27 deletions
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/pipe/GT_MetaTileEntity_Pipe_Data.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/pipe/GT_MetaTileEntity_Pipe_Data.java index e888b32ef3..5c0b459081 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/pipe/GT_MetaTileEntity_Pipe_Data.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/pipe/GT_MetaTileEntity_Pipe_Data.java @@ -36,7 +36,7 @@ public class GT_MetaTileEntity_Pipe_Data extends MetaPipeEntity implements IConn private static Textures.BlockIcons.CustomIcon EMbar,EMbarActive; public byte connectionCount = 0; - private boolean activity,active; + private boolean active; public GT_MetaTileEntity_Pipe_Data(int aID, String aName, String aNameRegional) { super(aID, aName, aNameRegional, 0); @@ -113,7 +113,7 @@ public class GT_MetaTileEntity_Pipe_Data extends MetaPipeEntity implements IConn public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) { if (aBaseMetaTileEntity.isServerSide()) { if ((aTick & 31) == 31) { - if(activity){ + if(active){ if(TecTech.RANDOM.nextInt(15)==0) { PipeActivityPacketDispatcher.INSTANCE.sendToAllAround(new PipeActivityMessage.PipeActivityData(this), aBaseMetaTileEntity.getWorld().provider.dimensionId, @@ -122,7 +122,7 @@ public class GT_MetaTileEntity_Pipe_Data extends MetaPipeEntity implements IConn aBaseMetaTileEntity.getZCoord(), 256); } - activity=false; + active=false; }else if(getActive()){ if(TecTech.RANDOM.nextInt(15)==0) { PipeActivityPacketDispatcher.INSTANCE.sendToAllAround(new PipeActivityMessage.PipeActivityData(this), @@ -264,17 +264,15 @@ public class GT_MetaTileEntity_Pipe_Data extends MetaPipeEntity implements IConn return getBaseMetaTileEntity().getColorization(); } + @Override public void markUsed() { - this.activity = true; + this.active = true; } @Override public void setActive(boolean active) { this.active=active; - IGregTechTileEntity base=getBaseMetaTileEntity(); - if(getBaseMetaTileEntity().isClientSide()) { - base.issueTextureUpdate(); - } + getBaseMetaTileEntity().issueTextureUpdate(); } @Override diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/pipe/GT_MetaTileEntity_Pipe_EM.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/pipe/GT_MetaTileEntity_Pipe_EM.java index d7dae937ed..2c2374dbac 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/pipe/GT_MetaTileEntity_Pipe_EM.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/pipe/GT_MetaTileEntity_Pipe_EM.java @@ -37,7 +37,7 @@ public class GT_MetaTileEntity_Pipe_EM extends MetaPipeEntity implements IConnec static Textures.BlockIcons.CustomIcon EMcandy,EMCandyActive; public byte connectionCount = 0; - private boolean activity,active; + private boolean active; public GT_MetaTileEntity_Pipe_EM(int aID, String aName, String aNameRegional) { super(aID, aName, aNameRegional, 0); @@ -114,7 +114,7 @@ public class GT_MetaTileEntity_Pipe_EM extends MetaPipeEntity implements IConnec public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) { if (aBaseMetaTileEntity.isServerSide()) { if ((aTick & 31) == 31) { - if(activity){ + if(active){ if(TecTech.RANDOM.nextInt(15)==0) { PipeActivityPacketDispatcher.INSTANCE.sendToAllAround(new PipeActivityMessage.PipeActivityData(this), aBaseMetaTileEntity.getWorld().provider.dimensionId, @@ -123,7 +123,7 @@ public class GT_MetaTileEntity_Pipe_EM extends MetaPipeEntity implements IConnec aBaseMetaTileEntity.getZCoord(), 256); } - activity=false; + active=false; }else if(getActive()){ if(TecTech.RANDOM.nextInt(15)==0) { PipeActivityPacketDispatcher.INSTANCE.sendToAllAround(new PipeActivityMessage.PipeActivityData(this), @@ -229,17 +229,15 @@ public class GT_MetaTileEntity_Pipe_EM extends MetaPipeEntity implements IConnec return 0.5f; } + @Override public void markUsed() { - this.activity = true; + this.active = true; } @Override public void setActive(boolean active) { this.active=active; - IGregTechTileEntity base=getBaseMetaTileEntity(); - if(getBaseMetaTileEntity().isClientSide()) { - base.issueTextureUpdate(); - } + getBaseMetaTileEntity().issueTextureUpdate(); } @Override diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/pipe/GT_MetaTileEntity_Pipe_Energy.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/pipe/GT_MetaTileEntity_Pipe_Energy.java index 6d1a9529b4..7f419a6f50 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/pipe/GT_MetaTileEntity_Pipe_Energy.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/pipe/GT_MetaTileEntity_Pipe_Energy.java @@ -35,7 +35,7 @@ public class GT_MetaTileEntity_Pipe_Energy extends MetaPipeEntity implements ICo private static Textures.BlockIcons.CustomIcon EMpipe; public byte connectionCount = 0; - private boolean activity,active; + private boolean active; public GT_MetaTileEntity_Pipe_Energy(int aID, String aName, String aNameRegional) { super(aID, aName, aNameRegional, 0); @@ -110,7 +110,7 @@ public class GT_MetaTileEntity_Pipe_Energy extends MetaPipeEntity implements ICo public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) { if (aBaseMetaTileEntity.isServerSide()) { if ((aTick & 31) == 31) { - if(activity){ + if(active){ if(TecTech.RANDOM.nextInt(15)==0) { PipeActivityPacketDispatcher.INSTANCE.sendToAllAround(new PipeActivityMessage.PipeActivityData(this), aBaseMetaTileEntity.getWorld().provider.dimensionId, @@ -119,7 +119,7 @@ public class GT_MetaTileEntity_Pipe_Energy extends MetaPipeEntity implements ICo aBaseMetaTileEntity.getZCoord(), 256); } - activity=false; + active=false; }else if(getActive()){ if(TecTech.RANDOM.nextInt(15)==0) { PipeActivityPacketDispatcher.INSTANCE.sendToAllAround(new PipeActivityMessage.PipeActivityData(this), @@ -176,10 +176,7 @@ public class GT_MetaTileEntity_Pipe_Energy extends MetaPipeEntity implements ICo @Override public void setActive(boolean state){ this.active=state; - IGregTechTileEntity base=getBaseMetaTileEntity(); - if(getBaseMetaTileEntity().isClientSide()) { - base.issueTextureUpdate(); - } + getBaseMetaTileEntity().issueTextureUpdate(); } @Override @@ -188,6 +185,11 @@ public class GT_MetaTileEntity_Pipe_Energy extends MetaPipeEntity implements ICo } @Override + public void markUsed() { + this.active = true; + } + + @Override public boolean canConnect(byte side) { return true; } @@ -239,8 +241,4 @@ public class GT_MetaTileEntity_Pipe_Energy extends MetaPipeEntity implements ICo } return 0.5f; } - - public void markUsed() { - this.activity = true; - } }
\ No newline at end of file diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/pipe/IActivePipe.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/pipe/IActivePipe.java index d618826de7..5552992e56 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/pipe/IActivePipe.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/pipe/IActivePipe.java @@ -5,4 +5,5 @@ import gregtech.api.interfaces.metatileentity.IMetaTileEntity; public interface IActivePipe extends IMetaTileEntity { void setActive(boolean active); boolean getActive(); + void markUsed(); } |