Sangui/GT5-Unofficial
2
1
Fork 0
Code Issues 6 Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #960 from codewarrior0/kill-excess-redraws

Browse source 
Kill excess redraws
This commit is contained in:
Archengius 2017-04-16 16:16:15 +07:00 committed by GitHub
commit 0f051b4c11
5 changed files with 96 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
src/main/java/gregtech/api/metatileentity/BaseMetaPipeEntity.java
View file

@ -327,18 +327,38 @@ public class BaseMetaPipeEntity extends BaseTileEntity implements IGregTechTileE
}
public final void receiveMetaTileEntityData(short aID, int aCover0, int aCover1, int aCover2, int aCover3, int aCover4, int aCover5, byte aTextureData, byte aUpdateData, byte aRedstoneData, byte aColorData) {
issueTextureUpdate();
boolean tNeedsRedraw = false;
if (aID > 0 && mID != aID) {
mID = aID;
createNewMetatileEntity(mID);
tNeedsRedraw = true;
}
mCoverSides[0] = aCover0;
mCoverSides[1] = aCover1;
mCoverSides[2] = aCover2;
mCoverSides[3] = aCover3;
mCoverSides[4] = aCover4;
mCoverSides[5] = aCover5;
if (mCoverSides[0] != aCover0) {
mCoverSides[0] = aCover0;
tNeedsRedraw = true;
}
if (mCoverSides[1] != aCover1) {
mCoverSides[1] = aCover1;
tNeedsRedraw = true;
}
if (mCoverSides[2] != aCover2) {
mCoverSides[2] = aCover2;
tNeedsRedraw = true;
}
if (mCoverSides[3] != aCover3) {
mCoverSides[3] = aCover3;
tNeedsRedraw = true;
}
if (mCoverSides[4] != aCover4) {
mCoverSides[4] = aCover4;
tNeedsRedraw = true;
}
if (mCoverSides[5] != aCover5) {
mCoverSides[5] = aCover5;
tNeedsRedraw = true;
}
for (byte i = 0; i < 6; i++) mCoverBehaviors[i] = GregTech_API.getCoverBehavior(mCoverSides[i]);
@ -346,10 +366,13 @@ public class BaseMetaPipeEntity extends BaseTileEntity implements IGregTechTileE
receiveClientEvent(1, aUpdateData);
receiveClientEvent(2, aColorData);
receiveClientEvent(3, aRedstoneData);
if (tNeedsRedraw) issueTextureUpdate();
}
@Override
public boolean receiveClientEvent(int aEventID, int aValue) {
boolean tNeedsRedraw = false;
super.receiveClientEvent(aEventID, aValue);
if (hasValidMetaTileEntity()) {
@ -362,10 +385,13 @@ public class BaseMetaPipeEntity extends BaseTileEntity implements IGregTechTileE
}
if (isClientSide()) {
issueTextureUpdate();
switch (aEventID) {
case 0:
mConnections = (byte) aValue;
if (mConnections != (byte) aValue) {
mConnections = (byte) aValue;
tNeedsRedraw = true;
}
break;
case 1:
if (hasValidMetaTileEntity()) mMetaTileEntity.onValueUpdate((byte) aValue);
@ -395,6 +421,7 @@ public class BaseMetaPipeEntity extends BaseTileEntity implements IGregTechTileE
mMetaTileEntity.stopSoundLoop((byte) aValue, getXCoord() + 0.5, getYCoord() + 0.5, getZCoord() + 0.5);
break;
}
if (tNeedsRedraw) issueTextureUpdate();
}
return true;
}

60
src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java
View file

@ -594,19 +594,38 @@ public class BaseMetaTileEntity extends BaseTileEntity implements IGregTechTileE
}
public final void receiveMetaTileEntityData(short aID, int aCover0, int aCover1, int aCover2, int aCover3, int aCover4, int aCover5, byte aTextureData, byte aUpdateData, byte aRedstoneData, byte aColorData) {
issueTextureUpdate();
boolean tNeedsRedraw = false;
if (mID != aID && aID > 0) {
mID = aID;
createNewMetatileEntity(mID);
tNeedsRedraw = true;
}
mCoverSides[0] = aCover0;
mCoverSides[1] = aCover1;
mCoverSides[2] = aCover2;
mCoverSides[3] = aCover3;
mCoverSides[4] = aCover4;
mCoverSides[5] = aCover5;
if (mCoverSides[0] != aCover0) {
mCoverSides[0] = aCover0;
tNeedsRedraw = true;
}
if (mCoverSides[1] != aCover1) {
mCoverSides[1] = aCover1;
tNeedsRedraw = true;
}
if (mCoverSides[2] != aCover2) {
mCoverSides[2] = aCover2;
tNeedsRedraw = true;
}
if (mCoverSides[3] != aCover3) {
mCoverSides[3] = aCover3;
tNeedsRedraw = true;
}
if (mCoverSides[4] != aCover4) {
mCoverSides[4] = aCover4;
tNeedsRedraw = true;
}
if (mCoverSides[5] != aCover5) {
mCoverSides[5] = aCover5;
tNeedsRedraw = true;
}
for (byte i = 0; i < 6; i++) mCoverBehaviors[i] = GregTech_API.getCoverBehavior(mCoverSides[i]);
@ -614,10 +633,14 @@ public class BaseMetaTileEntity extends BaseTileEntity implements IGregTechTileE
receiveClientEvent(1, aUpdateData);
receiveClientEvent(2, aColorData);
receiveClientEvent(3, aRedstoneData);
if (tNeedsRedraw) issueTextureUpdate();
}
@Override
public boolean receiveClientEvent(int aEventID, int aValue) {
boolean tNeedsRedraw = false;
super.receiveClientEvent(aEventID, aValue);
if (hasValidMetaTileEntity()) {
@ -630,13 +653,25 @@ public class BaseMetaTileEntity extends BaseTileEntity implements IGregTechTileE
}
if (isClientSide()) {
issueTextureUpdate();
switch (aEventID) {
case 0:
mFacing = (byte) (aValue & 7);
mActive = ((aValue & 8) != 0);
mRedstone = ((aValue & 16) != 0);
mLockUpgrade = ((aValue&32) != 0);
if (mFacing != (byte) (aValue & 0x07)) {
mFacing = (byte) (aValue & 0x07);
tNeedsRedraw = true;
}
if (mActive != ((aValue & 0x08) != 0)) {
mActive = ((aValue & 0x08) != 0);
tNeedsRedraw = true;
}
if (mRedstone != ((aValue & 0x10) != 0)) {
mRedstone = ((aValue & 0x10) != 0);
tNeedsRedraw = true;
}
if (mLockUpgrade != ((aValue & 0x20) != 0)) {
mLockUpgrade = ((aValue & 0x20) != 0);
tNeedsRedraw = true;
}
break;
case 1:
if (hasValidMetaTileEntity()) mMetaTileEntity.onValueUpdate((byte) aValue);
@ -669,6 +704,7 @@ public class BaseMetaTileEntity extends BaseTileEntity implements IGregTechTileE
mLightValue = (byte) aValue;
break;
}
if (tNeedsRedraw) issueTextureUpdate();
}
return true;
}

5
src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine.java
View file

@ -588,7 +588,10 @@ public abstract class GT_MetaTileEntity_BasicMachine extends GT_MetaTileEntity_B
@Override
public void onValueUpdate(byte aValue) {
mMainFacing = aValue;
if (mMainFacing != aValue) {
mMainFacing = aValue;
this.getBaseMetaTileEntity().issueTextureUpdate();
}
}
@Override

5
src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch.java
View file

@ -49,7 +49,10 @@ public abstract class GT_MetaTileEntity_Hatch extends GT_MetaTileEntity_BasicTan
@Override
public final void onValueUpdate(byte aValue) {
mMachineBlock = (byte) (aValue & 127);
if (mMachineBlock != (byte) (aValue & 127)) {
mMachineBlock = (byte) (aValue & 127);
this.getBaseMetaTileEntity().issueTextureUpdate();
}
}
@Override

5
src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_Locker.java
View file

@ -114,7 +114,10 @@ public class GT_MetaTileEntity_Locker
}
public void onValueUpdate(byte aValue) {
this.mType = aValue;
if (this.mType != aValue) {
this.mType = aValue;
this.getBaseMetaTileEntity().issueTextureUpdate();
}
}
public byte getUpdateData() {