use Optifine CTM for round logs

octarine-noise · Mar 10, 2015 · 37f557e · 37f557e
1 parent 280c009
commit 37f557e
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 8 deletions.
diff --git a/src/main/java/mods/betterfoliage/client/render/impl/RenderBlockBetterLogs.java b/src/main/java/mods/betterfoliage/client/render/impl/RenderBlockBetterLogs.java
@@ -4,8 +4,8 @@
 import mods.betterfoliage.client.render.IRenderBlockDecorator;
 import mods.betterfoliage.common.config.Config;
 import mods.betterfoliage.common.util.Double3;
+import mods.betterfoliage.common.util.RenderUtils;
 import net.minecraft.block.Block;
-import net.minecraft.block.BlockRotatedPillar;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.RenderBlocks;
 import net.minecraft.util.IIcon;
@@ -71,13 +71,13 @@ public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block b
         boolean bottomBlocked = isBlocked(world, x, y, z, logVertDir.getOpposite());
 
 		// get icons
-		IIcon iconTop = topBlocked ? null : block.getIcon(world, x, y, z,  logVertDir.ordinal());
-		IIcon iconBottom = bottomBlocked ? null : block.getIcon(world, x, y, z, logVertDir.ordinal());
-		IIcon iconP1 = block.getIcon(world, x, y, z,  logHorzDir1.ordinal());
-		IIcon iconN1 = block.getIcon(world, x, y, z,  logHorzDir1.getOpposite().ordinal());
-        IIcon iconP2 = block.getIcon(world, x, y, z,  logHorzDir2.ordinal());
-        IIcon iconN2 = block.getIcon(world, x, y, z,  logHorzDir2.getOpposite().ordinal());
-		
+		IIcon iconTop = topBlocked ? null : RenderUtils.getIcon(world, block, x, y, z,  logVertDir);
+		IIcon iconBottom = bottomBlocked ? null : RenderUtils.getIcon(world, block, x, y, z, logVertDir);
+		IIcon iconP1 = RenderUtils.getIcon(world, block, x, y, z,  logHorzDir1);
+		IIcon iconN1 = RenderUtils.getIcon(world, block, x, y, z,  logHorzDir1.getOpposite());
+        IIcon iconP2 = RenderUtils.getIcon(world, block, x, y, z,  logHorzDir2);
+        IIcon iconN2 = RenderUtils.getIcon(world, block, x, y, z,  logHorzDir2.getOpposite());
+        
         // draw log
 		drawQuarterLog(blockPos,logHorzDir1, logHorzDir2, logVertDir,
 		               connectNN || connectNP || connectPN ? null : (connectPP ? Config.logsLargeRadius : Config.logsSmallRadius),

diff --git a/src/main/java/mods/betterfoliage/common/util/RenderUtils.java b/src/main/java/mods/betterfoliage/common/util/RenderUtils.java
@@ -5,7 +5,12 @@
 import java.util.List;
 import java.util.Map;
 
+import mods.betterfoliage.client.OptifineIntegration;
+import net.minecraft.block.Block;
 import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.util.IIcon;
+import net.minecraft.world.IBlockAccess;
+import net.minecraftforge.common.util.ForgeDirection;
 import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
 import cpw.mods.fml.client.registry.RenderingRegistry;
 
@@ -42,4 +47,8 @@ public static void stripTooltipDefaultText(List<String> tooltip) {
         }
     }
 
+    public static IIcon getIcon(IBlockAccess blockAccess, Block block, int x, int y, int z, ForgeDirection side) {
+    	IIcon base = block.getIcon(blockAccess, x, y, z, side.ordinal());
+    	return OptifineIntegration.isPresent ? OptifineIntegration.getConnectedTexture(blockAccess, block, x, y, z, side.ordinal(), base) : base; 
+    }
 }