From 518fce4076d8213e01de145ae3824f7728f6ac26 Mon Sep 17 00:00:00 2001
From: sferatime <sferaf001@mail.ru>
Date: Tue, 4 Aug 2020 19:40:33 +0300
Subject: [PATCH] Small fixes

---
 .../common/render/GT_Block_Renderer.java      | 29 ++++++++++---------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/src/main/java/gregtechmod/common/render/GT_Block_Renderer.java b/src/main/java/gregtechmod/common/render/GT_Block_Renderer.java
index de843c9..6b97815 100644
--- a/src/main/java/gregtechmod/common/render/GT_Block_Renderer.java
+++ b/src/main/java/gregtechmod/common/render/GT_Block_Renderer.java
@@ -7,7 +7,7 @@ import net.minecraft.block.Block;
 import net.minecraft.client.renderer.RenderBlocks;
 import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.Icon;
+import net.minecraft.util.IIcon;
 import net.minecraft.world.IBlockAccess;
 
 import org.lwjgl.opengl.GL11;
@@ -98,7 +98,7 @@ public class GT_Block_Renderer implements ISimpleBlockRenderingHandler {
      * I have changed quite a bit of this Code, just to make it compatible with my Stuff.
      */
     public boolean renderPipeBlock(IBlockAccess aWorld, int aX, int aY, int aZ, Block aBlock, int aModelID, RenderBlocks aRenderer) {
-    	TileEntity aTileEntity = aWorld.getBlockTileEntity(aX, aY, aZ);
+    	TileEntity aTileEntity = aWorld.getTileEntity(aX, aY, aZ);
 		if (aTileEntity instanceof BaseMetaPipeEntity) {
 			aRenderer.flipTexture = false;
 			
@@ -115,14 +115,14 @@ public class GT_Block_Renderer implements ISimpleBlockRenderingHandler {
 			byte tConnections = 0;
 			for (byte i = 0; i < 6; i++) if ((tTileEntity.mConnections & (1 << i)) != 0) tConnections |= (1 << ((i + 2) % 6));
 			
-			Icon tIcons[] = new Icon[6], tCovers[] = new Icon[6];
+			IIcon tIcons[] = new IIcon[6], tCovers[] = new IIcon[6];
 			boolean tIsCovered[] = new boolean[6];
 			for (byte i = 0; i < 6; i++) tIsCovered[i] = (tTileEntity.getCoverIDAtSide(i) != 0);
 			
 			if (tIsCovered[0] && tIsCovered[1] && tIsCovered[2] && tIsCovered[3] && tIsCovered[4] && tIsCovered[5]) return aRenderer.renderStandardBlock(aBlock, aX, aY, aZ);
 			
 			for (byte i = 0; i < 6; i++) {
-				tCovers[i] = aBlock.getBlockTexture(aWorld, aX, aY, aZ, i);
+				tCovers[i] = aBlock.getBlockTextureFromSide(i);
 				tIcons[i] = tTileEntity.getUncoveredIcon(i, (byte)1);
 				if (tIcons[i] == null) {
 					int tIndex = tTileEntity.getUncoveredIndex(i, (byte)1);
@@ -361,39 +361,40 @@ public class GT_Block_Renderer implements ISimpleBlockRenderingHandler {
 		return true;
     }
     
-    public static void renderPositiveXFacing(RenderBlocks aRenderer, Block aBlock, int aX, int aY, int aZ, Icon aIcon) {
+    public static void renderPositiveXFacing(RenderBlocks aRenderer, Block aBlock, int aX, int aY, int aZ, IIcon aIcon) {
     	aRenderer.flipTexture = true;
         aRenderer.renderFaceXPos(aBlock, aX, aY, aZ, aIcon);
 		aRenderer.flipTexture = false;
     }
     
-    public static void renderPositiveYFacing(RenderBlocks aRenderer, Block aBlock, int aX, int aY, int aZ, Icon aIcon) {
+    public static void renderPositiveYFacing(RenderBlocks aRenderer, Block aBlock, int aX, int aY, int aZ, IIcon aIcon) {
     	aRenderer.renderFaceYPos(aBlock, aX, aY, aZ, aIcon);
     }
     
-    public static void renderPositiveZFacing(RenderBlocks aRenderer, Block aBlock, int aX, int aY, int aZ, Icon aIcon) {
+    public static void renderPositiveZFacing(RenderBlocks aRenderer, Block aBlock, int aX, int aY, int aZ, IIcon aIcon) {
     	aRenderer.renderFaceZPos(aBlock, aX, aY, aZ, aIcon);
     }
     
-    public static void renderNegativeXFacing(RenderBlocks aRenderer, Block aBlock, int aX, int aY, int aZ, Icon aIcon) {
+    public static void renderNegativeXFacing(RenderBlocks aRenderer, Block aBlock, int aX, int aY, int aZ, IIcon aIcon) {
     	aRenderer.renderFaceXNeg(aBlock, aX, aY, aZ, aIcon);
     }
     
-    public static void renderNegativeYFacing(RenderBlocks aRenderer, Block aBlock, int aX, int aY, int aZ, Icon aIcon) {
+    public static void renderNegativeYFacing(RenderBlocks aRenderer, Block aBlock, int aX, int aY, int aZ, IIcon aIcon) {
     	aRenderer.renderFaceYNeg(aBlock, aX, aY, aZ, aIcon);
     }
     
-    public static void renderNegativeZFacing(RenderBlocks aRenderer, Block aBlock, int aX, int aY, int aZ, Icon aIcon) {
+    public static void renderNegativeZFacing(RenderBlocks aRenderer, Block aBlock, int aX, int aY, int aZ, IIcon aIcon) {
     	aRenderer.flipTexture = true;
         aRenderer.renderFaceZNeg(aBlock, aX, aY, aZ, aIcon);
 		aRenderer.flipTexture = false;
     }
     
-    public boolean shouldRender3DInInventory() {
-        return true;
-    }
-    
     public int getRenderId() {
         return mRenderID;
     }
+
+	@Override
+	public boolean shouldRender3DInInventory(int modelId) {
+		return true;
+	}
 }
\ No newline at end of file