Work on custom rendering drawer

This commit is contained in:
Justin Aquadro committed 2015-07-03 00:05:57 -04:00
1 parent d6baa4fb64
commit 316a039f06
19 files changed
+321 -36

No files matched your search

Binary file not shown.

After

Width:  |  Height:  |  Size: 203 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 205 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 197 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 218 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 219 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 214 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 200 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 206 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 209 B

@@ -673,7 +673,7 @@ public class BlockDrawers extends BlockContainer implements IExtendedBlockClickH
}
@SideOnly(Side.CLIENT)
private void loadBlockConfig () {
protected void loadBlockConfig () {
try {
IResource configResource = Minecraft.getMinecraft().getResourceManager().getResource(blockConfig);
BufferedReader reader = null;
@@ -0,0 +1,95 @@
package com.jaquadro.minecraft.storagedrawers.block;
import com.jaquadro.minecraft.storagedrawers.StorageDrawers;
import com.jaquadro.minecraft.storagedrawers.core.ClientProxy;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.init.Blocks;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
import net.minecraft.world.IBlockAccess;
import java.util.List;
public class BlockDrawersCustom extends BlockDrawers
{
@SideOnly(Side.CLIENT)
private IIcon overlayHandle;
@SideOnly(Side.CLIENT)
private IIcon overlayFaceShadow;
@SideOnly(Side.CLIENT)
private IIcon overlayTrimShadow;
public BlockDrawersCustom (String blockName, int drawerCount, boolean halfDepth) {
super(blockName, drawerCount, halfDepth);
}
@Override
public int getRenderType () {
return StorageDrawers.proxy.drawersCustomRenderID;
}
@Override
public int getRenderBlockPass () {
return 1;
}
@Override
public boolean canRenderInPass (int pass) {
ClientProxy.renderPass = pass;
return true;
}
@Override
public void getSubBlocks (Item item, CreativeTabs creativeTabs, List list) {
if (StorageDrawers.config.cache.addonShowVanilla)
list.add(new ItemStack(item));
}
@Override
@SideOnly(Side.CLIENT)
public IIcon getIconTrim (int meta) {
return Blocks.planks.getIcon(0, 0);
}
@Override
@SideOnly(Side.CLIENT)
public IIcon getIcon (int side, int meta) {
return Blocks.planks.getIcon(0, 0);
}
@Override
@SideOnly(Side.CLIENT)
public IIcon getIcon (IBlockAccess blockAccess, int x, int y, int z, int side) {
return Blocks.planks.getIcon(0, 0);
}
@SideOnly(Side.CLIENT)
public IIcon getHandleOverlay () {
return overlayHandle;
}
@SideOnly(Side.CLIENT)
public IIcon getFaceShadowOverlay () {
return overlayFaceShadow;
}
@SideOnly(Side.CLIENT)
public IIcon getTrimShadowOverlay () {
return overlayTrimShadow;
}
@Override
@SideOnly(Side.CLIENT)
public void registerBlockIcons (IIconRegister register) {
super.registerBlockIcons(register);
overlayHandle = register.registerIcon(StorageDrawers.MOD_ID + ":overlay/handle_" + drawerCount);
overlayFaceShadow = register.registerIcon(StorageDrawers.MOD_ID + ":overlay/shading_face_" + drawerCount);
overlayTrimShadow = register.registerIcon(StorageDrawers.MOD_ID + ":overlay/shading_trim_" + drawerCount);
}
}
@@ -0,0 +1,59 @@
package com.jaquadro.minecraft.storagedrawers.client.renderer;
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.core.ClientProxy;
import net.minecraft.client.renderer.RenderBlocks;
import net.minecraft.init.Blocks;
import net.minecraft.world.IBlockAccess;
public class DrawersCustomRenderer extends DrawersRenderer
{
private PanelBoxRenderer panelRenderer = new PanelBoxRenderer();
@Override
protected void renderBaseBlock (IBlockAccess world, TileEntityDrawers tile, int x, int y, int z, BlockDrawers block, RenderBlocks renderer) {
BlockDrawersCustom custom = (BlockDrawersCustom)block;
panelRenderer.setTrimWidth(block.trimWidth);
panelRenderer.setTrimDepth(0);
panelRenderer.setTrimColor(ModularBoxRenderer.COLOR_WHITE);
panelRenderer.setTrimIcon(Blocks.lapis_block.getIcon(0, 0));
panelRenderer.setPanelColor(ModularBoxRenderer.COLOR_WHITE);
panelRenderer.setPanelIcon(Blocks.planks.getIcon(0, 0));
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(Blocks.planks.getIcon(0, 2));
panelRenderer.setTrimDepth(block.trimDepth);
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.trimDepth);
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);
}
}
@Override
public int getRenderId () {
return StorageDrawers.proxy.drawersCustomRenderID;
}
}
@@ -82,6 +82,21 @@ public class DrawersRenderer implements ISimpleBlockRenderingHandler
if (tile == null)
return false;
renderBaseBlock(world, tile, x, y, z, block, renderer);
int side = tile.getDirection();
if (StorageDrawers.config.cache.enableIndicatorUpgrades)
renderIndicator(block, x, y, z, side, renderer, tile.getEffectiveStatusLevel());
if (StorageDrawers.config.cache.enableLockUpgrades)
renderLock(block, x, y, z, side, renderer, tile.isLocked(LockAttribute.LOCK_POPULATED));
if (StorageDrawers.config.cache.enableVoidUpgrades)
renderVoid(block, x, y, z, side, renderer, tile.isVoid());
renderShroud(block, x, y, z, side, renderer, tile.isShrouded());
return true;
}
protected void renderBaseBlock (IBlockAccess world, TileEntityDrawers tile, int x, int y, int z, BlockDrawers block, RenderBlocks renderer) {
int side = tile.getDirection();
int meta = world.getBlockMetadata(x, y, z);
@@ -127,16 +142,6 @@ public class DrawersRenderer implements ISimpleBlockRenderingHandler
boxRenderer.setInteriorIcon(block.getIcon(world, x, y, z, side), ForgeDirection.OPPOSITES[side]);
renderInterior(block, x, y, z, side, renderer);
if (StorageDrawers.config.cache.enableIndicatorUpgrades)
renderIndicator(block, x, y, z, side, renderer, tile.getEffectiveStatusLevel());
if (StorageDrawers.config.cache.enableLockUpgrades)
renderLock(block, x, y, z, side, renderer, tile.isLocked(LockAttribute.LOCK_POPULATED));
if (StorageDrawers.config.cache.enableVoidUpgrades)
renderVoid(block, x, y, z, side, renderer, tile.isVoid());
renderShroud(block, x, y, z, side, renderer, tile.isShrouded());
return true;
}
private void renderLock (BlockDrawers block, int x, int y, int z, int side, RenderBlocks renderer, boolean locked) {
@@ -411,6 +411,10 @@ public class ModularBoxRenderer
}
}
public void renderExteriorCut (RenderBlocks renderer, Block block, double x, double y, double z, double xNeg, double yNeg, double zNeg, double xPos, double yPos, double zPos, int connectedFlags, int cutFlags) {
}
public void renderInterior (RenderBlocks renderer, Block block, double x, double y, double z, double xNeg, double yNeg, double zNeg, double xPos, double yPos, double zPos, int connectedFlags, int cutFlags) {
if ((cutFlags & CUT_YNEG) != 0)
connectedFlags |= PLANE_YNEG;
@@ -3,6 +3,7 @@ package com.jaquadro.minecraft.storagedrawers.core;
import com.jaquadro.minecraft.storagedrawers.block.tile.TileEntityDrawersComp;
import com.jaquadro.minecraft.storagedrawers.block.tile.TileEntityDrawersStandard;
import com.jaquadro.minecraft.storagedrawers.client.renderer.ControllerRenderer;
import com.jaquadro.minecraft.storagedrawers.client.renderer.DrawersCustomRenderer;
import com.jaquadro.minecraft.storagedrawers.client.renderer.DrawersRenderer;
import com.jaquadro.minecraft.storagedrawers.client.renderer.TileEntityDrawersRenderer;
import cpw.mods.fml.client.registry.ClientRegistry;
@@ -10,13 +11,17 @@ import cpw.mods.fml.client.registry.RenderingRegistry;
public class ClientProxy extends CommonProxy
{
public static int renderPass = 0;
@Override
public void registerRenderers () {
drawersRenderID = RenderingRegistry.getNextAvailableRenderId();
controllerRenderID = RenderingRegistry.getNextAvailableRenderId();
drawersCustomRenderID = RenderingRegistry.getNextAvailableRenderId();
RenderingRegistry.registerBlockHandler(drawersRenderID, new DrawersRenderer());
RenderingRegistry.registerBlockHandler(controllerRenderID, new ControllerRenderer());
RenderingRegistry.registerBlockHandler(drawersCustomRenderID, new DrawersCustomRenderer());
ClientRegistry.bindTileEntitySpecialRenderer(TileEntityDrawersStandard.class, new TileEntityDrawersRenderer());
ClientRegistry.bindTileEntitySpecialRenderer(TileEntityDrawersComp.class, new TileEntityDrawersRenderer());
@@ -7,6 +7,7 @@ public class CommonProxy
{
public int drawersRenderID = -1;
public int controllerRenderID = -1;
public int drawersCustomRenderID = -1;
public void registerRenderers ()
{ }
@@ -29,6 +29,8 @@ public class ModBlocks
public static BlockTrim trim;
public static BlockSlave controllerSlave;
public static BlockDrawersCustom fullCustom1;
public void init () {
fullDrawers1 = new BlockDrawers("fullDrawers1", 1, false);
fullDrawers2 = new BlockDrawers("fullDrawers2", 2, false);
@@ -40,6 +42,8 @@ public class ModBlocks
trim = new BlockTrim("trim");
controllerSlave = new BlockSlave("controllerSlave");
fullCustom1 = new BlockDrawersCustom("fullCustom1", 1, false);
ConfigManager config = StorageDrawers.config;
if (config.isBlockEnabled("fulldrawers1"))
@@ -61,6 +65,8 @@ public class ModBlocks
if (config.isBlockEnabled("trim"))
GameRegistry.registerBlock(trim, ItemTrim.class, "trim");
GameRegistry.registerBlock(fullCustom1, ItemDrawers.class, "fullCustom1");
GameRegistry.registerTileEntityWithAlternatives(TileEntityDrawersStandard.class, getQualifiedName("tileDrawersStandard"),
getQualifiedName(fullDrawers1), getQualifiedName(fullDrawers2), getQualifiedName(fullDrawers4),
getQualifiedName(halfDrawers2), getQualifiedName(halfDrawers4));
@@ -84,6 +90,9 @@ public class ModBlocks
OreDictionary.registerOre(key, new ItemStack(halfDrawers2, 1, OreDictionary.WILDCARD_VALUE));
for (String key : new String[] { "drawerBasic" })
OreDictionary.registerOre(key, new ItemStack(halfDrawers4, 1, OreDictionary.WILDCARD_VALUE));
for (String key : new String[] { "drawerBasic" })
OreDictionary.registerOre(key, new ItemStack(fullCustom1, 1, OreDictionary.WILDCARD_VALUE));
}
public static String getQualifiedName (String name) {
@@ -141,9 +141,9 @@ public class RenderHelper
}
public void renderFaceColorMult (int face, IBlockAccess blockAccess, Block block, int x, int y, int z, IIcon icon, float r, float g, float b) {
face = state.getTransformedFace(face);
setupColorMult(face, blockAccess, block, x, y, z, r, g, b);
face = RenderHelperState.FACE_BY_FACE_ROTATION[face][state.rotateTransform];
llHelper.drawFace(face, x, y, z, icon);
if (blockAccess == null)
@@ -153,7 +153,7 @@ public class RenderHelper
public void renderFaceAOPartial (int face, IBlockAccess blockAccess, Block block, int x, int y, int z, IIcon icon, float r, float g, float b) {
state.enableAO = true;
face = RenderHelperState.FACE_BY_FACE_ROTATION[face][state.rotateTransform];
face = state.getTransformedFace(face);
switch (face) {
case YNEG:
@@ -211,7 +211,7 @@ public class RenderHelper
public void renderPartialFaceAOPartial (int face, IBlockAccess blockAccess, Block block, int x, int y, int z, IIcon icon, double uMin, double vMin, double uMax, double vMax, float r, float g, float b) {
state.enableAO = true;
switch (RenderHelperState.FACE_BY_FACE_ROTATION[face][state.rotateTransform]) {
switch (state.getTransformedFace(face)) {
case YNEG:
aoHelper.setupYNegAOPartial(blockAccess, block, x, y, z, r, g, b);
break;
@@ -238,12 +238,12 @@ public class RenderHelper
public void renderPartialFace (int face, IIcon icon, double uMin, double vMin, double uMax, double vMax) {
state.enableAO = false;
face = RenderHelperState.FACE_BY_FACE_ROTATION[face][state.rotateTransform];
face = state.getTransformedFace(face);
llHelper.drawPartialFace(face, 0, 0, 0, icon, uMin, vMin, uMax, vMax);
}
public void renderPartialFace (int face, double x, double y, double z, IIcon icon, double uMin, double vMin, double uMax, double vMax) {
face = RenderHelperState.FACE_BY_FACE_ROTATION[face][state.rotateTransform];
face = state.getTransformedFace(face);
llHelper.drawPartialFace(face, x, y, z, icon, uMin, vMin, uMax, vMax);
}
@@ -6,7 +6,7 @@ public class RenderHelperState
public static final int ROTATE180 = 2;
public static final int ROTATE270 = 3;
public static final int[][] ROTATION_BY_FACE_FACE = {
public static final int[][] ROTATION_BY_FACE_FACE_Y = {
{ 0, 0, 0, 0, 0, 0 },
{ 0, 0, 0, 0, 0, 0 },
{ 0, 0, 0, 2, 3, 1 },
@@ -15,7 +15,25 @@ public class RenderHelperState
{ 0, 0, 3, 1, 2, 0 },
};
public static final int[][] FACE_BY_FACE_ROTATION = {
public static final int[][] ROTATION_BY_FACE_FACE_Z = {
{ 0, 2, 0, 0, 1, 3 },
{ 2, 0, 0, 0, 3, 1 },
{ 0, 0, 0, 0, 0, 0 },
{ 0, 0, 0, 0, 0, 0 },
{ 3, 1, 0, 0, 0, 2 },
{ 1, 3, 0, 0, 2, 0 },
};
public static final int[][] ROTATION_BY_FACE_FACE_X = {
{ 0, 2, 1, 3, 0, 0 },
{ 2, 0, 3, 1, 0, 0 },
{ 3, 1, 0, 2, 0, 0 },
{ 1, 3, 2, 0, 0, 0 },
{ 0, 0, 0, 0, 0, 0 },
{ 0, 0, 0, 0, 0, 0 },
};
public static final int[][] FACE_BY_FACE_ROTATION_Y = {
{ 0, 0, 0, 0 },
{ 1, 1, 1, 1 },
{ 2, 5, 3, 4 },
@@ -24,6 +42,24 @@ public class RenderHelperState
{ 5, 3, 4, 2 },
};
public static final int[][] FACE_BY_FACE_ROTATION_Z = {
{ 0, 4, 1, 5 },
{ 1, 5, 0, 4 },
{ 2, 2, 2, 2 },
{ 3, 3, 3, 3 },
{ 4, 1, 5, 0 },
{ 5, 0, 4, 1 },
};
public static final int[][] FACE_BY_FACE_ROTATION_X = {
{ 0, 2, 1, 3 },
{ 1, 3, 0, 2 },
{ 2, 1, 3, 0 },
{ 3, 0, 2, 1 },
{ 4, 4, 4, 4 },
{ 5, 5, 5, 5 },
};
public double renderMinX;
public double renderMinY;
public double renderMinZ;
@@ -35,7 +71,9 @@ public class RenderHelperState
public boolean renderFromInside;
public boolean enableAO;
public int rotateTransform;
public int rotateTransformX;
public int rotateTransformY;
public int rotateTransformZ;
public float shiftU;
public float shiftV;
@@ -125,27 +163,40 @@ public class RenderHelperState
color[i] *= scale;
}
public void setRotateTransform (int faceFrom, int faceTo) {
rotateTransform = ROTATION_BY_FACE_FACE[faceFrom][faceTo];
if (rotateTransform != 0)
transformRenderBound(rotateTransform);
public int getTransformedFace (int face) {
face = FACE_BY_FACE_ROTATION_X[face][rotateTransformX];
face = FACE_BY_FACE_ROTATION_Y[face][rotateTransformY];
face = FACE_BY_FACE_ROTATION_Z[face][rotateTransformZ];
return face;
}
public void undoRotateTransform () {
if (rotateTransform != 0)
transformRenderBound(4 - rotateTransform);
clearRotateTransform();
public void setRotateTransform (int faceFrom, int faceTo) {
rotateTransformX = ROTATION_BY_FACE_FACE_X[faceFrom][faceTo];
faceFrom = FACE_BY_FACE_ROTATION_X[faceFrom][rotateTransformX];
rotateTransformY = ROTATION_BY_FACE_FACE_Y[faceFrom][faceTo];
faceFrom = FACE_BY_FACE_ROTATION_Y[faceFrom][rotateTransformY];
rotateTransformZ = ROTATION_BY_FACE_FACE_Z[faceFrom][faceTo];
transformRenderBound();
}
public void clearRotateTransform () {
rotateTransform = 0;
rotateTransformX = 0;
rotateTransformY = 0;
rotateTransformZ = 0;
}
private void transformRenderBound (int rotation) {
private void transformRenderBound () {
if (rotateTransformX == 0 && rotateTransformY == 0 && rotateTransformZ == 0)
return;
scratchIn[0] = renderMinX;
scratchIn[1] = renderMinY;
scratchIn[2] = renderMinZ;
transformCoord(scratchIn, scratchOut, rotateTransform);
transformCoordX(scratchIn, scratchOut, rotateTransformX);
transformCoordY(scratchOut, scratchIn, rotateTransformY);
transformCoordZ(scratchIn, scratchOut, rotateTransformZ);
renderMinX = scratchOut[0];
renderMinY = scratchOut[1];
renderMinZ = scratchOut[2];
@@ -153,7 +204,9 @@ public class RenderHelperState
scratchIn[0] = renderMaxX;
scratchIn[1] = renderMaxY;
scratchIn[2] = renderMaxZ;
transformCoord(scratchIn, scratchOut, rotateTransform);
transformCoordX(scratchIn, scratchOut, rotateTransformX);
transformCoordY(scratchOut, scratchIn, rotateTransformY);
transformCoordZ(scratchIn, scratchOut, rotateTransformZ);
renderMaxX = scratchOut[0];
renderMaxY = scratchOut[1];
renderMaxZ = scratchOut[2];
@@ -164,6 +217,12 @@ public class RenderHelperState
renderMaxX = temp;
}
if (renderMinY > renderMaxY) {
double temp = renderMinY;
renderMinY = renderMaxY;
renderMaxY = temp;
}
if (renderMinZ > renderMaxZ) {
double temp = renderMinZ;
renderMinZ = renderMaxZ;
@@ -171,27 +230,75 @@ public class RenderHelperState
}
}
public void transformCoord (double[] coordIn, double[] coordOut, int rotation) {
public void transformCoordY (double[] coordIn, double[] coordOut, int rotation) {
coordOut[1] = coordIn[1];
switch (rotation) {
case 1:
case 1: // 90
coordOut[0] = 1 - coordIn[2];
coordOut[2] = coordIn[0];
break;
case 2:
case 2: // 180
coordOut[0] = 1 - coordIn[0];
coordOut[2] = 1 - coordIn[2];
break;
case 3:
case 3: // 270
coordOut[0] = coordIn[2];
coordOut[2] = 1 - coordIn[0];
break;
case 0:
case 0: // 0
default:
coordOut[0] = coordIn[0];
coordOut[2] = coordIn[2];
break;
}
}
public void transformCoordZ (double[] coordIn, double[] coordOut, int rotation) {
coordOut[2] = coordIn[2];
switch (rotation) {
case 1: // 90
coordOut[0] = coordIn[1];
coordOut[1] = 1 - coordIn[0];
break;
case 2: // 180
coordOut[0] = 1 - coordIn[0];
coordOut[1] = 1 - coordIn[1];
break;
case 3: // 270
coordOut[0] = 1 - coordIn[1];
coordOut[1] = coordIn[0];
break;
case 0: // 0
default:
coordOut[0] = coordIn[0];
coordOut[1] = coordIn[1];
break;
}
}
public void transformCoordX (double[] coordIn, double[] coordOut, int rotation) {
coordOut[0] = coordIn[0];
switch (rotation) {
case 1: // 90
coordOut[2] = coordIn[1];
coordOut[1] = 1 - coordIn[2];
break;
case 2: // 180
coordOut[2] = 1 - coordIn[2];
coordOut[1] = 1 - coordIn[1];
break;
case 3: // 270
coordOut[2] = 1 - coordIn[1];
coordOut[1] = coordIn[2];
break;
case 0: // 0
default:
coordOut[2] = coordIn[2];
coordOut[1] = coordIn[1];
break;
}
}
}