diff options
| author | Technus <daniel112092@gmail.com> | 2016-11-26 11:02:11 +0100 |
|---|---|---|
| committer | Technus <daniel112092@gmail.com> | 2016-11-26 11:02:11 +0100 |
| commit | 389267d73391abdea33c9eae09aa2d3aac51ac7b (patch) | |
| tree | a78ce8007d7f70749f492ff819881054d426c5bf /src/main/java/gregtech/common | |
| parent | 4885dbe0e248846c93cb97c69e381bc96fe8d99d (diff) | |
| download | GT5-Unofficial-389267d73391abdea33c9eae09aa2d3aac51ac7b.tar.gz GT5-Unofficial-389267d73391abdea33c9eae09aa2d3aac51ac7b.tar.bz2 GT5-Unofficial-389267d73391abdea33c9eae09aa2d3aac51ac7b.zip | |
Fix scaling of ItemBlock GT machines in certain scenarios, repostion wire heating info.
Diffstat (limited to 'src/main/java/gregtech/common')
| -rw-r--r-- | src/main/java/gregtech/common/blocks/GT_Block_Machines.java | 7 | ||||
| -rw-r--r-- | src/main/java/gregtech/common/covers/GT_Cover_SolarPanel.java | 3 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Machines.java b/src/main/java/gregtech/common/blocks/GT_Block_Machines.java index 00065aa389..0f5e3978a5 100644 --- a/src/main/java/gregtech/common/blocks/GT_Block_Machines.java +++ b/src/main/java/gregtech/common/blocks/GT_Block_Machines.java @@ -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)) { diff --git a/src/main/java/gregtech/common/covers/GT_Cover_SolarPanel.java b/src/main/java/gregtech/common/covers/GT_Cover_SolarPanel.java index 1b6a0e23d3..73cfd7dae9 100644 --- a/src/main/java/gregtech/common/covers/GT_Cover_SolarPanel.java +++ b/src/main/java/gregtech/common/covers/GT_Cover_SolarPanel.java @@ -71,10 +71,7 @@ public class GT_Cover_SolarPanel return false; } - - public int getTickRate(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity) { return 1; } - }
\ No newline at end of file |