mirror of
https://github.com/GTNewHorizons/EnderIO.git
synced 2026-11-20 20:22:12 +00:00
Fixed some rendering issues.
This commit is contained in:
1 parent
6a34f60a6b
commit
aefbe73168
8 files changed
+37
-50
No files matched your search
+4
@@ -25,6 +25,10 @@ public class TranslatedCubeRenderer {
|
||||
|
||||
private CustomCubeRenderer ccr = new CustomCubeRenderer();
|
||||
|
||||
public void renderBoundingBox(int x, int y, int z, Block block, BoundingBox bb, VertexTransform vt, boolean enableLighting) {
|
||||
renderBoundingBox(x, y, z, block, bb, vt, null, enableLighting);
|
||||
}
|
||||
|
||||
public void renderBoundingBox(int x, int y, int z, Block block, BoundingBox bb, VertexTransform vt) {
|
||||
renderBoundingBox(x, y, z, block, bb, vt, null);
|
||||
}
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
package crazypants.enderio.machine.spawner;
|
||||
|
||||
import org.lwjgl.opengl.GL11;
|
||||
|
||||
import net.minecraft.client.renderer.RenderBlocks;
|
||||
import net.minecraft.init.Blocks;
|
||||
import net.minecraft.item.ItemStack;
|
||||
@@ -20,10 +22,12 @@ public class BrokenSpawnerRenderer implements IItemRenderer {
|
||||
|
||||
@Override
|
||||
public void renderItem(ItemRenderType type, ItemStack item, Object... data) {
|
||||
GL11.glEnable(GL11.GL_ALPHA_TEST);
|
||||
RenderBlocks rb = (RenderBlocks)data[0];
|
||||
rb.setOverrideBlockTexture(EnderIO.itemBrokenSpawner.getIconFromDamage(0));
|
||||
rb.renderBlockAsItem(Blocks.stone, 0, 1);
|
||||
rb.setOverrideBlockTexture(null);
|
||||
rb.setOverrideBlockTexture(null);
|
||||
GL11.glDisable(GL11.GL_ALPHA_TEST);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -55,7 +55,7 @@ public class ItemBrokenSpawner extends Item {
|
||||
setUnlocalizedName(ModObject.itemBrokenSpawner.unlocalisedName);
|
||||
setHasSubtypes(true);
|
||||
setMaxDamage(0);
|
||||
setMaxStackSize(1);
|
||||
setMaxStackSize(1);
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -63,7 +63,6 @@ public class ItemBrokenSpawner extends Item {
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
protected void init() {
|
||||
GameRegistry.registerItem(this, ModObject.itemBrokenSpawner.unlocalisedName);
|
||||
}
|
||||
|
||||
@@ -75,14 +75,14 @@ public class VatRenderer implements ISimpleBlockRenderingHandler, IItemRenderer
|
||||
//-x side
|
||||
BoundingBox bb = BoundingBox.UNIT_CUBE.scale(0.334, fudge,fudge);
|
||||
bb = bb.translate(0.5f - (0.334f/2),0,0);
|
||||
TranslatedCubeRenderer.instance.renderBoundingBox(x, y, z, block, bb, xform);
|
||||
TranslatedCubeRenderer.instance.renderBoundingBox(x, y, z, block, bb, xform, world != null);
|
||||
|
||||
bb = BoundingBox.UNIT_CUBE.scale(0.334, fudge,fudge);
|
||||
TranslatedCubeRenderer.instance.renderBoundingBox(x, y, z, block, bb, xform);
|
||||
TranslatedCubeRenderer.instance.renderBoundingBox(x, y, z, block, bb, xform, world != null);
|
||||
|
||||
bb = BoundingBox.UNIT_CUBE.scale(0.334, fudge,fudge);
|
||||
bb = bb.translate(-0.5f + (0.334f/2),0,0);
|
||||
TranslatedCubeRenderer.instance.renderBoundingBox(x, y, z, block, bb, xform);
|
||||
TranslatedCubeRenderer.instance.renderBoundingBox(x, y, z, block, bb, xform, world != null);
|
||||
|
||||
if(vat != null) {
|
||||
ccr.renderBlock(world, block, x, y, z, overlayRenderer);
|
||||
@@ -100,21 +100,12 @@ public class VatRenderer implements ISimpleBlockRenderingHandler, IItemRenderer
|
||||
|
||||
@Override
|
||||
public void renderInventoryBlock(Block block, int metadata, int modelId, RenderBlocks renderer) {
|
||||
Tessellator tes = Tessellator.instance;
|
||||
|
||||
GL11.glDisable(GL11.GL_LIGHTING);
|
||||
|
||||
OpenGlHelper.setActiveTexture(OpenGlHelper.lightmapTexUnit);
|
||||
GL11.glDisable(GL11.GL_TEXTURE_2D);
|
||||
OpenGlHelper.setActiveTexture(OpenGlHelper.defaultTexUnit);
|
||||
|
||||
tes.startDrawingQuads();
|
||||
Tessellator tes = Tessellator.instance;
|
||||
tes.startDrawingQuads();
|
||||
renderWorldBlock(null, 0, 0, 0, block, 0, renderer);
|
||||
tes.draw();
|
||||
|
||||
// OpenGlHelper.setActiveTexture(OpenGlHelper.lightmapTexUnit);
|
||||
// GL11.glEnable(GL11.GL_TEXTURE_2D);
|
||||
// OpenGlHelper.setActiveTexture(OpenGlHelper.defaultTexUnit);
|
||||
|
||||
tes.draw();
|
||||
GL11.glEnable(GL11.GL_LIGHTING);
|
||||
}
|
||||
|
||||
|
||||
@@ -154,18 +154,6 @@ public class BlockTank extends AbstractMachineBlock<TileTank> implements IAdvanc
|
||||
return new GuiTank(player.inventory, (TileTank) te);
|
||||
}
|
||||
|
||||
//Causes crashes in 1.7 on some machines
|
||||
//@Override
|
||||
//@SideOnly(Side.CLIENT)
|
||||
//public int getRenderBlockPass() {
|
||||
// return 1;
|
||||
//}
|
||||
//
|
||||
//@Override
|
||||
//public boolean canRenderInPass(int pass) {
|
||||
// return pass == 1;
|
||||
//}
|
||||
|
||||
@Override
|
||||
public boolean isOpaqueCube() {
|
||||
return false;
|
||||
|
||||
@@ -99,18 +99,17 @@ public class BlockFusedQuartz extends BlockEio {
|
||||
return renderId;
|
||||
}
|
||||
|
||||
//TODO:1.7 this makes it go splat
|
||||
// @Override
|
||||
// @SideOnly(Side.CLIENT)
|
||||
// public int getRenderBlockPass() {
|
||||
// return 1;
|
||||
// }
|
||||
//
|
||||
// @Override
|
||||
// public boolean canRenderInPass(int pass) {
|
||||
// FusedQuartzRenderer.renderPass = pass;
|
||||
// return true;
|
||||
// }
|
||||
@Override
|
||||
@SideOnly(Side.CLIENT)
|
||||
public int getRenderBlockPass() {
|
||||
return 1;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean canRenderInPass(int pass) {
|
||||
FusedQuartzRenderer.renderPass = pass;
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getLightOpacity(IBlockAccess world, int x, int y, int z) {
|
||||
|
||||
@@ -45,14 +45,14 @@ public class FusedQuartzRenderer implements ISimpleBlockRenderingHandler {
|
||||
public boolean renderWorldBlock(IBlockAccess blockAccess, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) {
|
||||
int meta = blockAccess.getBlockMetadata(x, y, z);
|
||||
//TODO:1.7 this makes it go splat
|
||||
//if((meta == 0 && renderPass != 0) || (meta == 1 && renderPass == 0)) {
|
||||
TileEntityPaintedBlock tecb = null;
|
||||
TileEntity te = blockAccess.getTileEntity(x, y, z);
|
||||
if(te instanceof TileEntityPaintedBlock) {
|
||||
tecb = (TileEntityPaintedBlock) te;
|
||||
if((meta == 0 && renderPass != 0) || (meta == 1 && renderPass == 0)) {
|
||||
TileEntityPaintedBlock tecb = null;
|
||||
TileEntity te = blockAccess.getTileEntity(x, y, z);
|
||||
if(te instanceof TileEntityPaintedBlock) {
|
||||
tecb = (TileEntityPaintedBlock) te;
|
||||
}
|
||||
renderFrame(blockAccess, x, y, z, tecb, false, meta);
|
||||
}
|
||||
renderFrame(blockAccess, x, y, z, tecb, false, meta);
|
||||
// }
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
@@ -69,8 +69,10 @@ public class MachinePartRenderer implements IItemRenderer {
|
||||
}
|
||||
|
||||
private void renderToInventory(ItemStack item, RenderBlocks renderBlocks) {
|
||||
GL11.glEnable(GL11.GL_ALPHA_TEST);
|
||||
renderBlocks.setOverrideBlockTexture(EnderIO.itemMachinePart.getIconFromDamage(item.getItemDamage()));
|
||||
renderBlocks.renderBlockAsItem(Blocks.stone, 0, 1.0F);
|
||||
renderBlocks.clearOverrideBlockTexture();
|
||||
GL11.glDisable(GL11.GL_ALPHA_TEST);
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user