upstream/Chisel
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/Chisel.git synced 2026-11-11 15:57:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix column rendering crashing

Browse Source
This commit is contained in:
tterrag1098 committed 2015-05-28 14:19:43 -04:00
1 parent 74bb2b700d
commit e5efdb7d02
3 files changed
+13 -13
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/com/cricketcraft/chisel/api/rendering/RenderBlocksCTM.java
+1 -5
View File
@@ -163,7 +163,7 @@ public class RenderBlocksCTM extends RenderBlocks {
renderMaxX = renderMaxY = renderMaxZ = 1;
}
protected Tessellator tessellator;
protected Tessellator tessellator = Tessellator.instance;
protected double minU, maxU;
protected double minV, maxV;
protected int[] lightingCache = new int[4];
@@ -188,13 +188,9 @@ public class RenderBlocksCTM extends RenderBlocks {
by = y;
bz = z;
tessellator = Tessellator.instance;
tessellator.setColorOpaque_F(1.0F, 1.0F, 1.0F);
tessellator.addTranslation(x, y, z);
boolean res = super.renderStandardBlock(block, x, y, z);
tessellator.addTranslation(-x, -y, -z);
return res;
src/main/java/com/cricketcraft/chisel/api/rendering/RenderBlocksColumn.java
+10 -7
View File
@@ -124,32 +124,35 @@ public class RenderBlocksColumn extends RenderBlocks {
@Override
public void renderFaceXNeg(Block block, double x, double y, double z, IIcon icon) {
super.renderFaceXNeg(block, x, y, z, sides[4]);
super.renderFaceXNeg(block, x, y, z, getIcon(icon, 4));
}
@Override
public void renderFaceXPos(Block block, double x, double y, double z, IIcon icon) {
super.renderFaceXPos(block, x, y, z, sides[5]);
super.renderFaceXPos(block, x, y, z, getIcon(icon, 5));
}
@Override
public void renderFaceZNeg(Block block, double x, double y, double z, IIcon icon) {
super.renderFaceZNeg(block, x, y, z, sides[2]);
super.renderFaceZNeg(block, x, y, z, getIcon(icon, 2));
}
@Override
public void renderFaceZPos(Block block, double x, double y, double z, IIcon icon) {
super.renderFaceZPos(block, x, y, z, sides[3]);
super.renderFaceZPos(block, x, y, z, getIcon(icon, 3));
}
@Override
public void renderFaceYNeg(Block block, double x, double y, double z, IIcon icon) {
super.renderFaceYNeg(block, x, y, z, sides[0]);
super.renderFaceYNeg(block, x, y, z, getIcon(icon, 0));
}
@Override
public void renderFaceYPos(Block block, double x, double y, double z, IIcon icon) {
super.renderFaceYPos(block, x, y, z, sides[1]);
super.renderFaceYPos(block, x, y, z, getIcon(icon, 1));
}
}
private IIcon getIcon(IIcon defaultIcon, int side) {
return sides[side] == null ? defaultIcon : sides[side];
}
}
src/main/java/com/cricketcraft/chisel/api/rendering/TextureType.java
+2 -1
View File
@@ -60,6 +60,7 @@ public enum TextureType {
}
},
CTMV("ctmv", "top"){
@Override
protected Object registerIcons(ICarvingVariation variation, String modName, String texturePath, IIconRegister register) {
return Pair.of(new TextureSubmap(register.registerIcon(modName + ":" + texturePath + "-ctmv"), 2, 2), register.registerIcon(modName + ":" + texturePath + "-top"));
@@ -364,7 +365,7 @@ public enum TextureType {
protected RenderBlocks createRenderContext(RenderBlocks rendererOld, IBlockAccess world, Object cachedObject) {
return rendererOld;
}
public static TextureType getTypeFor(CarvableHelper inst, String modid, String path) {
if (path == null) {
return CUSTOM;