diff options
| author | Johann Bernhardt <johann.bernhardt@tum.de> | 2021-12-15 16:04:02 +0100 |
|---|---|---|
| committer | Johann Bernhardt <johann.bernhardt@tum.de> | 2021-12-15 16:04:02 +0100 |
| commit | ff4b8c7068c2ea7d654e9beda00646d23e62b314 (patch) | |
| tree | 2c84162154ba681232f86dffd4106db530236814 /src/main/java/gtPlusPlus/xmod/gregtech/common/blocks | |
| parent | 10182ddb54b6df57118cfe0715a037edf0fee14b (diff) | |
| parent | 47ce336f288a45aa3244c8ae1177499fa5080942 (diff) | |
| download | GT5-Unofficial-ff4b8c7068c2ea7d654e9beda00646d23e62b314.tar.gz GT5-Unofficial-ff4b8c7068c2ea7d654e9beda00646d23e62b314.tar.bz2 GT5-Unofficial-ff4b8c7068c2ea7d654e9beda00646d23e62b314.zip | |
Merge tag '1.7.21' into unified-build-script2
# Conflicts:
# build.properties
Diffstat (limited to 'src/main/java/gtPlusPlus/xmod/gregtech/common/blocks')
| -rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks5.java | 4 | ||||
| -rw-r--r-- | src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGrinderMultiblock.java | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks5.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks5.java index c594ee0e5d..61c71ba552 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks5.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks5.java @@ -60,9 +60,9 @@ extends GregtechMetaCasingBlocksAbstract { if ((aMeta >= 0) && (aMeta < 16)) { switch (aMeta) { case 0: - return TexturesGtBlock.TEXTURE_CASING_GRINDING_MILL.getIcon(); - case 1: return TexturesGtBlock.TEXTURE_PIPE_GRINDING_MILL.getIcon(); + case 1: + return TexturesGtBlock.TEXTURE_CASING_GRINDING_MILL.getIcon(); case 2: return TexturesGtBlock.TEXTURE_GEARBOX_GRINDING_MILL.getIcon(); case 3: diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGrinderMultiblock.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGrinderMultiblock.java index 962f981d3b..b254fdbc1e 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGrinderMultiblock.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGrinderMultiblock.java @@ -85,7 +85,7 @@ public class TexturesGrinderMultiblock { public IIcon handleCasingsGT(final IBlockAccess aWorld, final int xCoord, final int yCoord, final int zCoord, final int aSide, final GregtechMetaCasingBlocks5 ii) { final int tMeta = aWorld.getBlockMetadata(xCoord, yCoord, zCoord); - if (tMeta != 0) { + if (tMeta != 1) { return GregtechMetaCasingBlocks5.getStaticIcon(aSide, tMeta); } int tInvertLeftRightMod = aSide % 2 * 2 - 1; |