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

Fix scaling of ItemBlock GT machines in certain scenarios, repostion wire heating info.

Browse source
This commit is contained in:
Technus 2016-11-26 11:02:11 +01:00
parent 4885dbe0e2
commit 389267d733
3 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/main/java/gregtech/api/metatileentity/implementations/GT_MetaPipeEntity_Cable.java
View file

@ -322,6 +322,8 @@ public class GT_MetaPipeEntity_Cable extends MetaPipeEntity implements IMetaTile
public String[] getInfoData() {
return new String[]{
//EnumChatFormatting.BLUE + mName + EnumChatFormatting.RESET,
"Heat: "+
EnumChatFormatting.RED+ mOverheat +EnumChatFormatting.RESET+" / "+EnumChatFormatting.YELLOW+ mMaxOverheat + EnumChatFormatting.RESET,
"Max Load (1t):",
EnumChatFormatting.GREEN + Integer.toString(mTransferredAmperageOK) + EnumChatFormatting.RESET +" A / "+
EnumChatFormatting.YELLOW + Long.toString(mAmperage) + EnumChatFormatting.RESET +" A",
@ -331,9 +333,7 @@ public class GT_MetaPipeEntity_Cable extends MetaPipeEntity implements IMetaTile
"Max Load (20t): "+
EnumChatFormatting.GREEN + Integer.toString(mTransferredAmperageLast20OK) + EnumChatFormatting.RESET +" A",
"Max EU/p (20t): "+
EnumChatFormatting.GREEN + Long.toString(mTransferredVoltageLast20OK) + EnumChatFormatting.RESET +" EU",
"Heat: "+
EnumChatFormatting.RED+ mOverheat +EnumChatFormatting.RESET+" / "+EnumChatFormatting.YELLOW+ mMaxOverheat + EnumChatFormatting.RESET
EnumChatFormatting.GREEN + Long.toString(mTransferredVoltageLast20OK) + EnumChatFormatting.RESET +" EU"
};
}
}

7
src/main/java/gregtech/common/blocks/GT_Block_Machines.java
View file

@ -207,7 +207,7 @@ public class GT_Block_Machines
return super.getSelectedBoundingBoxFromPool(aWorld, aX, aY, aZ);
}
@Override
@Override //THIS
public void setBlockBoundsBasedOnState(IBlockAccess blockAccess, int aX, int aY, int aZ) {
TileEntity tTileEntity = blockAccess.getTileEntity(aX,aY,aZ);
if (((tTileEntity instanceof IGregTechTileEntity)) && (((IGregTechTileEntity) tTileEntity).getMetaTileEntity() != null)) {
@ -218,6 +218,11 @@ public class GT_Block_Machines
super.setBlockBoundsBasedOnState(blockAccess,aX,aY,aZ);
}
@Override
public void setBlockBoundsForItemRender() {
super.setBlockBounds(0,0,0,1,1,1);
}
public void onEntityCollidedWithBlock(World aWorld, int aX, int aY, int aZ, Entity collider) {
TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ);
if (((tTileEntity instanceof IGregTechTileEntity)) && (((IGregTechTileEntity) tTileEntity).getMetaTileEntity() != null)) {

3
src/main/java/gregtech/common/covers/GT_Cover_SolarPanel.java
View file

@ -71,10 +71,7 @@ public class GT_Cover_SolarPanel
return false;
}
public int getTickRate(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity) {
return 1;
}
}