mirror of
https://github.com/GTNewHorizons/Chisel.git
synced 2026-11-21 12:52:31 +00:00
Begin CarvableVariation nuke, have hit some roadblocks in CTM rendering
This commit is contained in:
1 parent
d50f2c9da5
commit
bc607a3104
29 files changed
+266
-198
No files matched your search
@@ -8,8 +8,8 @@ import org.lwjgl.opengl.GL11;
|
||||
|
||||
import com.cricketcraft.chisel.Chisel;
|
||||
import com.cricketcraft.chisel.api.ICarvable;
|
||||
import com.cricketcraft.chisel.api.carving.IVariationInfo;
|
||||
import com.cricketcraft.chisel.carving.CarvableHelper.TextureType;
|
||||
import com.cricketcraft.chisel.carving.CarvableVariation;
|
||||
import com.cricketcraft.chisel.utils.Drawing;
|
||||
|
||||
import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
|
||||
@@ -37,7 +37,7 @@ public class RendererCTM implements ISimpleBlockRenderingHandler {
|
||||
public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks rendererOld) {
|
||||
int meta = world.getBlockMetadata(x, y, z);
|
||||
|
||||
CarvableVariation var = ((ICarvable) block).getVariation(world, x, y, z, meta);
|
||||
IVariationInfo var = ((ICarvable) block).getVariation(world, x, y, z, meta);
|
||||
|
||||
if (rendererOld.hasOverrideBlockTexture()) {
|
||||
// breaking anim
|
||||
|
||||
@@ -49,10 +49,10 @@ public class RendererPillar implements ISimpleBlockRenderingHandler {
|
||||
int metadata = world.getBlockMetadata(x, y, z);
|
||||
|
||||
// Probably not the best way to handle this...
|
||||
if (metadata >= block.carverHelper.variations.size()) {
|
||||
if (metadata >= block.carverHelper.infoList.size()) {
|
||||
metadata = 0;
|
||||
} else {
|
||||
if (block.carverHelper.variations.get(metadata).type != TextureType.CTMV) {
|
||||
if (block.carverHelper.infoList.get(metadata).type != TextureType.CTMV) {
|
||||
block.sides[0] = block.carverHelper.getIcon(0, metadata);
|
||||
block.sides[1] = block.carverHelper.getIcon(1, metadata);
|
||||
block.sides[2] = block.carverHelper.getIcon(2, metadata);
|
||||
|
||||
Reference in new issue
Block a user