Square away most of the custom block/item rendering

This commit is contained in:
Justin Aquadro committed 2016-02-14 23:19:56 -05:00
1 parent 37db38bc99
commit 79cde438d5
5 files changed
+185 -68

No files matched your search

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

@@ -4,16 +4,19 @@ import com.jaquadro.minecraft.storagedrawers.StorageDrawers;
import com.jaquadro.minecraft.storagedrawers.block.BlockDrawers;
import com.jaquadro.minecraft.storagedrawers.block.BlockDrawersCustom;
import com.jaquadro.minecraft.storagedrawers.block.tile.TileEntityDrawers;
import com.jaquadro.minecraft.storagedrawers.client.renderer.common.CommonDrawerRenderer;
import com.jaquadro.minecraft.storagedrawers.core.ClientProxy;
import com.jaquadro.minecraft.storagedrawers.util.RenderHelper;
import net.minecraft.block.Block;
import net.minecraft.client.renderer.RenderBlocks;
import net.minecraft.init.Blocks;
import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
import net.minecraft.world.IBlockAccess;
public class DrawersCustomRenderer extends DrawersRenderer
{
private PanelBoxRenderer panelRenderer = new PanelBoxRenderer();
private CommonDrawerRenderer commonRender = new CommonDrawerRenderer();
@Override
protected void renderBaseBlock (IBlockAccess world, TileEntityDrawers tile, int x, int y, int z, BlockDrawers block, RenderBlocks renderer) {
@@ -31,39 +34,14 @@ public class DrawersCustomRenderer extends DrawersRenderer
if (materialTrim == null)
materialTrim = materialSide;
panelRenderer.setTrimWidth(block.getTrimWidth());
panelRenderer.setTrimDepth(0);
panelRenderer.setTrimColor(ModularBoxRenderer.COLOR_WHITE);
panelRenderer.setTrimIcon(Block.getBlockFromItem(materialTrim.getItem()).getIcon(0, materialTrim.getItemDamage()));
panelRenderer.setPanelColor(ModularBoxRenderer.COLOR_WHITE);
panelRenderer.setPanelIcon(Block.getBlockFromItem(materialSide.getItem()).getIcon(0, materialSide.getItemDamage()));
IIcon trimIcon = Block.getBlockFromItem(materialTrim.getItem()).getIcon(4, materialTrim.getItemDamage());
IIcon panelIcon = Block.getBlockFromItem(materialSide.getItem()).getIcon(4, materialSide.getItemDamage());
IIcon frontIcon = Block.getBlockFromItem(materialFront.getItem()).getIcon(4, materialFront.getItemDamage());
if (ClientProxy.renderPass == 0) {
for (int i = 0; i < 6; i++) {
if (i == 2)
continue;
panelRenderer.renderFaceTrim(i, world, block, x, y, z, 0, 0, 0, 1, 1, 1);
panelRenderer.renderInteriorTrim(i, world, block, x, y, z, 0, 0, 0, 1, 1, 1);
panelRenderer.renderFacePanel(i, world, block, x, y, z, 0, 0, 0, 1, 1, 1);
}
panelRenderer.setPanelIcon(Block.getBlockFromItem(materialFront.getItem()).getIcon(4, materialFront.getItemDamage()));
panelRenderer.setTrimDepth(block.getTrimDepth());
panelRenderer.renderFaceTrim(2, world, block, x, y, z, 0, 0, 0, 1, 1, 1);
panelRenderer.renderInteriorTrim(2, world, block, x, y, z, 0, 0, 0, 1, 1, 1);
panelRenderer.renderFacePanel(2, world, block, x, y, z, 0, 0, 0, 1, 1, 1);
}
else if (ClientProxy.renderPass == 1) {
panelRenderer.setTrimDepth(block.getTrimDepth());
panelRenderer.setTrimIcon(custom.getTrimShadowOverlay());
panelRenderer.renderFaceTrim(2, world, block, x, y, z, 0, 0, 0, 1, 1, 1);
panelRenderer.setPanelIcon(custom.getHandleOverlay());
panelRenderer.renderFacePanel(2, world, block, x, y, z, 0, 0, 0, 1, 1, 1);
panelRenderer.setPanelIcon(custom.getFaceShadowOverlay());
panelRenderer.renderFacePanel(2, world, block, x, y, z, 0, 0, 0, 1, 1, 1);
}
if (ClientProxy.renderPass == 0)
commonRender.renderBasePass(world, x, y, z, custom, tile.getDirection(), panelIcon, trimIcon, frontIcon);
else if (ClientProxy.renderPass == 1)
commonRender.renderOverlayPass(world, x, y, z, custom, tile.getDirection());
}
@Override
@@ -2,22 +2,25 @@ package com.jaquadro.minecraft.storagedrawers.client.renderer;
import com.jaquadro.minecraft.storagedrawers.block.BlockDrawers;
import com.jaquadro.minecraft.storagedrawers.block.BlockDrawersCustom;
import com.jaquadro.minecraft.storagedrawers.client.renderer.common.CommonDrawerRenderer;
import com.jaquadro.minecraft.storagedrawers.core.ClientProxy;
import com.jaquadro.minecraft.storagedrawers.util.RenderHelper;
import net.minecraft.block.Block;
import net.minecraft.client.renderer.RenderBlocks;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.IIcon;
import net.minecraftforge.client.IItemRenderer;
import net.minecraftforge.common.util.ForgeDirection;
import org.lwjgl.opengl.GL11;
public class DrawersItemRenderer implements IItemRenderer
{
private RenderHelper renderHelper = new RenderHelper();
//private RenderHelper renderHelper = new RenderHelper();
private CommonDrawerRenderer commonRender = new CommonDrawerRenderer();
private ModularBoxRenderer boxRenderer = new ModularBoxRenderer();
private PanelBoxRenderer panelRenderer = new PanelBoxRenderer();
private float[] colorScratch = new float[3];
//private PanelBoxRenderer panelRenderer = new PanelBoxRenderer();
//private float[] colorScratch = new float[3];
@Override
public boolean handleRenderType (ItemStack item, ItemRenderType type) {
@@ -123,39 +126,12 @@ public class DrawersItemRenderer implements IItemRenderer
if (materialFront == null)
materialFront = materialSide;
panelRenderer.setTrimWidth(block.getTrimWidth());
panelRenderer.setTrimDepth(0);
panelRenderer.setTrimColor(ModularBoxRenderer.COLOR_WHITE);
panelRenderer.setTrimIcon(Block.getBlockFromItem(materialTrim.getItem()).getIcon(0, materialTrim.getItemDamage()));
panelRenderer.setPanelColor(ModularBoxRenderer.COLOR_WHITE);
panelRenderer.setPanelIcon(Block.getBlockFromItem(materialSide.getItem()).getIcon(0, materialSide.getItemDamage()));
IIcon trimIcon = Block.getBlockFromItem(materialTrim.getItem()).getIcon(4, materialTrim.getItemDamage());
IIcon panelIcon = Block.getBlockFromItem(materialSide.getItem()).getIcon(4, materialSide.getItemDamage());
IIcon frontIcon = Block.getBlockFromItem(materialFront.getItem()).getIcon(4, materialFront.getItemDamage());
//if (ClientProxy.renderPass == 0) {
for (int i = 0; i < 6; i++) {
if (i == 2)
continue;
panelRenderer.renderFaceTrim(i, null, block, 0, 0, 0, 0, 0, 0, 1, 1, 1);
panelRenderer.renderInteriorTrim(i, null, block, 0, 0, 0, 0, 0, 0, 1, 1, 1);
panelRenderer.renderFacePanel(i, null, block, 0, 0, 0, 0, 0, 0, 1, 1, 1);
}
panelRenderer.setPanelIcon(Block.getBlockFromItem(materialFront.getItem()).getIcon(4, materialFront.getItemDamage()));
panelRenderer.setTrimDepth(block.getTrimDepth());
panelRenderer.renderFaceTrim(2, null, block, 0, 0, 0, 0, 0, 0, 1, 1, 1);
panelRenderer.renderInteriorTrim(2, null, block, 0, 0, 0, 0, 0, 0, 1, 1, 1);
panelRenderer.renderFacePanel(2, null, block, 0, 0, 0, 0, 0, 0, 1, 1, 1);
//}
//else if (ClientProxy.renderPass == 1) {
panelRenderer.setTrimDepth(block.getTrimDepth());
panelRenderer.setTrimIcon(custom.getTrimShadowOverlay());
panelRenderer.renderFaceTrim(2, null, block, 0, 0, 0, 0, 0, 0, 1, 1, 1);
panelRenderer.setPanelIcon(custom.getHandleOverlay());
panelRenderer.renderFacePanel(2, null, block, 0, 0, 0, 0, 0, 0, 1, 1, 1);
panelRenderer.setPanelIcon(custom.getFaceShadowOverlay());
panelRenderer.renderFacePanel(2, null, block, 0, 0, 0, 0, 0, 0, 1, 1, 1);
//}
commonRender.renderBasePass(null, 0, 0, 0, custom, RenderHelper.XNEG, panelIcon, trimIcon, frontIcon);
commonRender.renderOverlayPass(null, 0, 0, 0, custom, RenderHelper.XNEG);
}
private void renderExterior (BlockDrawers block, int x, int y, int z, int side, RenderBlocks renderer) {
@@ -0,0 +1,155 @@
package com.jaquadro.minecraft.storagedrawers.client.renderer.common;
import com.jaquadro.minecraft.storagedrawers.block.BlockDrawersCustom;
import com.jaquadro.minecraft.storagedrawers.client.renderer.ModularBoxRenderer;
import com.jaquadro.minecraft.storagedrawers.client.renderer.PanelBoxRenderer;
import com.jaquadro.minecraft.storagedrawers.util.RenderHelper;
import net.minecraft.util.IIcon;
import net.minecraft.world.IBlockAccess;
public class CommonDrawerRenderer
{
private PanelBoxRenderer panelRenderer = new PanelBoxRenderer();
private double depth;
private double trimWidth;
private double trimDepth;
private static double unit7 = 0.4375;
private static double unit9 = 0.5625;
private RenderHelper start (IBlockAccess world, int x, int y, int z, BlockDrawersCustom block, int direction) {
depth = block.halfDepth ? .5 : 0;
trimWidth = block.getTrimWidth();
trimDepth = block.getTrimDepth();
unit7 = 0.4375;
unit9 = 0.5625;
panelRenderer.setTrimWidth(trimWidth);
panelRenderer.setTrimDepth(0);
panelRenderer.setTrimColor(ModularBoxRenderer.COLOR_WHITE);
panelRenderer.setPanelColor(ModularBoxRenderer.COLOR_WHITE);
RenderHelper renderHelper = RenderHelper.instance;
if (world != null)
renderHelper.setColorAndBrightness(world, block, x, y, z);
renderHelper.state.setRotateTransform(RenderHelper.ZNEG, direction);
return renderHelper;
}
private void end () {
RenderHelper renderHelper = RenderHelper.instance;
renderHelper.state.clearRotateTransform();
}
public void renderBasePass (IBlockAccess world, int x, int y, int z, BlockDrawersCustom block, int direction, IIcon iconSide, IIcon iconTrim, IIcon iconFront) {
RenderHelper renderHelper = start(world, x, y, z, block, direction);
panelRenderer.setTrimIcon(iconTrim);
panelRenderer.setPanelIcon(iconSide);
for (int i = 0; i < 6; i++) {
if (i != RenderHelper.ZNEG)
panelRenderer.renderFacePanel(i, world, block, x, y, z, 0, 0, depth, 1, 1, 1);
panelRenderer.renderFaceTrim(i, world, block, x, y, z, 0, 0, depth, 1, 1, 1);
}
panelRenderer.setTrimDepth(trimDepth);
panelRenderer.renderInteriorTrim(RenderHelper.ZNEG, world, block, x, y, z, 0, 0, depth, 1, 1, 1);
if (block.drawerCount == 1) {
renderHelper.setRenderBounds(trimWidth, trimWidth, depth + trimDepth, 1 - trimWidth, 1 - trimWidth, 1);
renderHelper.renderFace(RenderHelper.ZNEG, world, block, x, y, z, iconFront);
}
else if (block.drawerCount == 2) {
renderHelper.setRenderBounds(trimWidth, trimWidth, depth + trimDepth, 1 - trimWidth, unit7, 1);
renderHelper.renderFace(RenderHelper.ZNEG, world, block, x, y, z, iconFront);
renderHelper.setRenderBounds(trimWidth, unit9, depth + trimDepth, 1 - trimWidth, 1 - trimWidth, 1);
renderHelper.renderFace(RenderHelper.ZNEG, world, block, x, y, z, iconFront);
renderHelper.setRenderBounds(trimWidth, unit7, depth + trimDepth, 1 - trimWidth, unit9, 1);
renderHelper.renderFace(RenderHelper.ZNEG, world, block, x, y, z, iconTrim);
}
else if (block.drawerCount == 4) {
renderHelper.setRenderBounds(trimWidth, trimWidth, depth + trimDepth, unit7, unit7, 1);
renderHelper.renderFace(RenderHelper.ZNEG, world, block, x, y, z, iconFront);
renderHelper.setRenderBounds(trimWidth, unit9, depth + trimDepth, unit7, 1 - trimWidth, 1);
renderHelper.renderFace(RenderHelper.ZNEG, world, block, x, y, z, iconFront);
renderHelper.setRenderBounds(unit9, trimWidth, depth + trimDepth, 1 - trimWidth, unit7, 1);
renderHelper.renderFace(RenderHelper.ZNEG, world, block, x, y, z, iconFront);
renderHelper.setRenderBounds(unit9, unit9, depth + trimDepth, 1 - trimWidth, 1 - trimWidth, 1);
renderHelper.renderFace(RenderHelper.ZNEG, world, block, x, y, z, iconFront);
renderHelper.setRenderBounds(trimWidth, unit7, depth + trimDepth, unit7, unit9, 1);
renderHelper.renderFace(RenderHelper.ZNEG, world, block, x, y, z, iconTrim);
renderHelper.setRenderBounds(unit9, unit7, depth + trimDepth, 1 - trimWidth, unit9, 1);
renderHelper.renderFace(RenderHelper.ZNEG, world, block, x, y, z, iconTrim);
renderHelper.setRenderBounds(unit7, trimWidth, depth + trimDepth, unit9, unit7, 1);
renderHelper.renderFace(RenderHelper.ZNEG, world, block, x, y, z, iconTrim);
renderHelper.setRenderBounds(unit7, unit9, depth + trimDepth, unit9, 1 - trimWidth, 1);
renderHelper.renderFace(RenderHelper.ZNEG, world, block, x, y, z, iconTrim);
renderHelper.setRenderBounds(unit7, unit7, depth + trimDepth, unit9, unit9, 1);
renderHelper.renderFace(RenderHelper.ZNEG, world, block, x, y, z, iconTrim);
}
end();
}
public void renderOverlayPass (IBlockAccess world, int x, int y, int z, BlockDrawersCustom block, int direction) {
RenderHelper renderHelper = start(world, x, y, z, block, direction);
panelRenderer.setTrimIcon(block.getTrimShadowOverlay());
panelRenderer.renderFaceTrim(RenderHelper.ZNEG, world, block, x, y, z, 0, 0, depth, 1, 1, 1);
if (block.drawerCount == 1) {
renderHelper.setRenderBounds(trimWidth, trimWidth, depth + trimDepth, 1 - trimWidth, 1 - trimWidth, 1);
renderHelper.renderFace(RenderHelper.ZNEG, world, block, x, y, z, block.getHandleOverlay());
renderHelper.renderFace(RenderHelper.ZNEG, world, block, x, y, z, block.getFaceShadowOverlay());
}
else if (block.drawerCount == 2) {
renderHelper.setRenderBounds(trimWidth, trimWidth, depth + trimDepth, 1 - trimWidth, unit7, 1);
renderHelper.renderFace(RenderHelper.ZNEG, world, block, x, y, z, block.getHandleOverlay());
renderHelper.renderFace(RenderHelper.ZNEG, world, block, x, y, z, block.getFaceShadowOverlay());
renderHelper.setRenderBounds(trimWidth, unit9, depth + trimDepth, 1 - trimWidth, 1 - trimWidth, 1);
renderHelper.renderFace(RenderHelper.ZNEG, world, block, x, y, z, block.getHandleOverlay());
renderHelper.renderFace(RenderHelper.ZNEG, world, block, x, y, z, block.getFaceShadowOverlay());
renderHelper.setRenderBounds(trimWidth, unit7, depth + trimDepth, 1 - trimWidth, unit9, 1);
renderHelper.renderFace(RenderHelper.ZNEG, world, block, x, y, z, block.getTrimShadowOverlay());
}
else if (block.drawerCount == 4) {
renderHelper.setRenderBounds(trimWidth, trimWidth, depth + trimDepth, unit7, unit7, 1);
renderHelper.renderFace(RenderHelper.ZNEG, world, block, x, y, z, block.getHandleOverlay());
renderHelper.renderFace(RenderHelper.ZNEG, world, block, x, y, z, block.getFaceShadowOverlay());
renderHelper.setRenderBounds(trimWidth, unit9, depth + trimDepth, unit7, 1 - trimWidth, 1);
renderHelper.renderFace(RenderHelper.ZNEG, world, block, x, y, z, block.getHandleOverlay());
renderHelper.renderFace(RenderHelper.ZNEG, world, block, x, y, z, block.getFaceShadowOverlay());
renderHelper.setRenderBounds(unit9, trimWidth, depth + trimDepth, 1 - trimWidth, unit7, 1);
renderHelper.renderFace(RenderHelper.ZNEG, world, block, x, y, z, block.getHandleOverlay());
renderHelper.renderFace(RenderHelper.ZNEG, world, block, x, y, z, block.getFaceShadowOverlay());
renderHelper.setRenderBounds(unit9, unit9, depth + trimDepth, 1 - trimWidth, 1 - trimWidth, 1);
renderHelper.renderFace(RenderHelper.ZNEG, world, block, x, y, z, block.getHandleOverlay());
renderHelper.renderFace(RenderHelper.ZNEG, world, block, x, y, z, block.getFaceShadowOverlay());
renderHelper.setRenderBounds(trimWidth, unit7, depth + trimDepth, unit7, unit9, 1);
renderHelper.renderFace(RenderHelper.ZNEG, world, block, x, y, z, block.getTrimShadowOverlay());
renderHelper.setRenderBounds(unit9, unit7, depth + trimDepth, 1 - trimWidth, unit9, 1);
renderHelper.renderFace(RenderHelper.ZNEG, world, block, x, y, z, block.getTrimShadowOverlay());
renderHelper.setRenderBounds(unit7, trimWidth, depth + trimDepth, unit9, unit7, 1);
renderHelper.renderFace(RenderHelper.ZNEG, world, block, x, y, z, block.getTrimShadowOverlay());
renderHelper.setRenderBounds(unit7, unit9, depth + trimDepth, unit9, 1 - trimWidth, 1);
renderHelper.renderFace(RenderHelper.ZNEG, world, block, x, y, z, block.getTrimShadowOverlay());
renderHelper.setRenderBounds(unit7, unit7, depth + trimDepth, unit9, unit9, 1);
renderHelper.renderFace(RenderHelper.ZNEG, world, block, x, y, z, block.getTrimShadowOverlay());
}
else
RenderHelper.instance.renderEmptyPlane(x, y, z);
end();
}
}
@@ -29,6 +29,8 @@ public class ModBlocks
public static BlockDrawersCustom fullCustom1;
public static BlockDrawersCustom fullCustom2;
public static BlockDrawersCustom fullCustom4;
public static BlockDrawersCustom halfCustom2;
public static BlockDrawersCustom halfCustom4;
public void init () {
resolver = new DataResolver(StorageDrawers.MOD_ID);
@@ -47,6 +49,8 @@ public class ModBlocks
fullCustom1 = new BlockDrawersCustom("fullCustom1", 1, false);
fullCustom2 = new BlockDrawersCustom("fullCustom2", 2, false);
fullCustom4 = new BlockDrawersCustom("fullCustom4", 4, false);
halfCustom2 = new BlockDrawersCustom("halfCustom2", 2, true);
halfCustom4 = new BlockDrawersCustom("halfCustom4", 4, true);
ConfigManager config = StorageDrawers.config;
@@ -74,6 +78,8 @@ public class ModBlocks
GameRegistry.registerBlock(fullCustom1, ItemCustomDrawers.class, "fullCustom1");
GameRegistry.registerBlock(fullCustom2, ItemCustomDrawers.class, "fullCustom2");
GameRegistry.registerBlock(fullCustom4, ItemCustomDrawers.class, "fullCustom4");
GameRegistry.registerBlock(halfCustom2, ItemCustomDrawers.class, "halfCustom2");
GameRegistry.registerBlock(halfCustom4, ItemCustomDrawers.class, "halfCustom4");
GameRegistry.registerTileEntityWithAlternatives(TileEntityDrawersStandard.class, getQualifiedName("tileDrawersStandard"),
getQualifiedName(fullDrawers1), getQualifiedName(fullDrawers2), getQualifiedName(fullDrawers4),
@@ -100,6 +106,8 @@ public class ModBlocks
StorageDrawers.proxy.registerDrawer(fullCustom1);
StorageDrawers.proxy.registerDrawer(fullCustom2);
StorageDrawers.proxy.registerDrawer(fullCustom4);
StorageDrawers.proxy.registerDrawer(halfCustom2);
StorageDrawers.proxy.registerDrawer(halfCustom4);
for (String key : new String[] { "drawerBasic" })
OreDictionary.registerOre(key, new ItemStack(fullDrawers1, 1, OreDictionary.WILDCARD_VALUE));