mirror of
https://github.com/GTNewHorizons/EnderIO.git
synced 2026-11-21 12:42:36 +00:00
Fixed rendering of glowstone painted with grass.
This commit is contained in:
1 parent
a715523ded
commit
1f178188eb
6 files changed
+134
-42
No files matched your search
@@ -69,6 +69,8 @@ import crazypants.enderio.machine.light.BlockElectricLight;
|
||||
import crazypants.enderio.machine.light.ElectricLightRenderer;
|
||||
import crazypants.enderio.machine.painter.BlockPaintedFenceGate;
|
||||
import crazypants.enderio.machine.painter.BlockPaintedFenceGateRenderer;
|
||||
import crazypants.enderio.machine.painter.BlockPaintedGlowstone;
|
||||
import crazypants.enderio.machine.painter.BlockPaintedGlowstoneRenderer;
|
||||
import crazypants.enderio.machine.painter.PaintedItemRenderer;
|
||||
import crazypants.enderio.machine.power.BlockCapacitorBank;
|
||||
import crazypants.enderio.machine.power.CapBankRenderer2;
|
||||
@@ -255,6 +257,9 @@ public class ClientProxy extends CommonProxy {
|
||||
MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockPaintedGlowstone), pir);
|
||||
MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockPaintedCarpet), pir);
|
||||
|
||||
BlockPaintedGlowstone.renderId = RenderingRegistry.getNextAvailableRenderId();
|
||||
RenderingRegistry.registerBlockHandler(new BlockPaintedGlowstoneRenderer());
|
||||
|
||||
MinecraftForgeClient.registerItemRenderer(EnderIO.itemMachinePart, new MachinePartRenderer());
|
||||
MinecraftForgeClient.registerItemRenderer(EnderIO.itemConduitFacade, new FacadeRenderer());
|
||||
|
||||
|
||||
@@ -142,20 +142,8 @@ public class ConduitBundleRenderer extends TileEntitySpecialRenderer implements
|
||||
|
||||
IBlockAccess origBa = rb.blockAccess;
|
||||
rb.blockAccess = new FacadeAccessWrapper(origBa);
|
||||
|
||||
// BlockConduitFacade facb = EnderIO.blockConduitFacade;
|
||||
// facb.setBlockOverride(bundle);
|
||||
// facb.setBlockBounds(0, 0, 0, 1, 1, 1);
|
||||
// rb.setRenderBoundsFromBlock(facb);
|
||||
// rb.renderStandardBlock(facb, x, y, z);
|
||||
// facb.setBlockOverride(null);
|
||||
|
||||
//rb.renderStandardBlock(facadeId, x, y, z);
|
||||
rb.renderBlockByRenderType(facadeId, x, y, z);
|
||||
|
||||
|
||||
rb.blockAccess = origBa;
|
||||
|
||||
rb.renderBlockByRenderType(facadeId, x, y, z);
|
||||
rb.blockAccess = origBa;
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -36,8 +36,9 @@ import crazypants.enderio.machine.MachineRecipeInput;
|
||||
import crazypants.enderio.machine.MachineRecipeRegistry;
|
||||
|
||||
public class BlockPaintedGlowstone extends Block implements ITileEntityProvider {
|
||||
|
||||
|
||||
|
||||
public static int renderId = -1;
|
||||
|
||||
public static BlockPaintedGlowstone create() {
|
||||
BlockPaintedGlowstone result = new BlockPaintedGlowstone();
|
||||
result.init();
|
||||
@@ -207,7 +208,6 @@ public class BlockPaintedGlowstone extends Block implements ITileEntityProvider
|
||||
*/
|
||||
@Override
|
||||
public void breakBlock(World world, int x, int y, int z, Block par5, int par6) {
|
||||
|
||||
if(!world.isRemote && world.getGameRules().getGameRuleBooleanValue("doTileDrops")) {
|
||||
TileEntity te = world.getTileEntity(x, y, z);
|
||||
|
||||
@@ -223,11 +223,8 @@ public class BlockPaintedGlowstone extends Block implements ITileEntityProvider
|
||||
EntityItem entityitem = new EntityItem(world, x + d0, y + d1, z + d2, itemStack);
|
||||
entityitem.delayBeforeCanPickup = 10;
|
||||
world.spawnEntityInWorld(entityitem);
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
world.removeTileEntity(x, y, z);
|
||||
}
|
||||
|
||||
@@ -236,6 +233,11 @@ public class BlockPaintedGlowstone extends Block implements ITileEntityProvider
|
||||
return 0; // need to do custom dropping to maintain source metadata
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getRenderType() {
|
||||
return renderId;
|
||||
}
|
||||
|
||||
public static final class PainterTemplate extends BasicPainterTemplate {
|
||||
|
||||
public PainterTemplate(Block paintedGlowstone) {
|
||||
|
||||
@@ -0,0 +1,94 @@
|
||||
package crazypants.enderio.machine.painter;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.client.renderer.RenderBlocks;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.world.IBlockAccess;
|
||||
import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import crazypants.enderio.EnderIO;
|
||||
import crazypants.util.IBlockAccessWrapper;
|
||||
|
||||
public class BlockPaintedGlowstoneRenderer implements ISimpleBlockRenderingHandler {
|
||||
|
||||
@Override
|
||||
public int getRenderId() {
|
||||
return BlockPaintedGlowstone.renderId;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void renderInventoryBlock(Block arg0, int arg1, int arg2, RenderBlocks arg3) {
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean renderWorldBlock(IBlockAccess ba, int x, int y, int z, Block block, int arg5, RenderBlocks rb) {
|
||||
|
||||
BlockPaintedGlowstone paintedGlowstone = (BlockPaintedGlowstone) block;
|
||||
TileEntity tile = ba.getTileEntity(x, y, z);
|
||||
if(!(tile instanceof TileEntityPaintedBlock)) {
|
||||
return false;
|
||||
}
|
||||
TileEntityPaintedBlock te = (TileEntityPaintedBlock) tile;
|
||||
Block srcBlk = te.getSourceBlock();
|
||||
|
||||
IBlockAccess origBa = rb.blockAccess;
|
||||
rb.blockAccess = new PaintedAccessWrapper(origBa);
|
||||
rb.renderBlockByRenderType(srcBlk, x, y, z);
|
||||
rb.blockAccess = origBa;
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean shouldRender3DInInventory(int arg0) {
|
||||
return true;
|
||||
}
|
||||
|
||||
private class PaintedAccessWrapper extends IBlockAccessWrapper {
|
||||
|
||||
public PaintedAccessWrapper(IBlockAccess ba) {
|
||||
super(ba);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Block getBlock(int x, int y, int z) {
|
||||
Block res = super.getBlock(x, y, z);
|
||||
if(res == EnderIO.blockPaintedGlowstone) {
|
||||
TileEntity te = getTileEntity(x, y, z);
|
||||
if(te instanceof TileEntityPaintedBlock) {
|
||||
TileEntityPaintedBlock tcb = (TileEntityPaintedBlock) te;
|
||||
Block fac = tcb.getSourceBlock();
|
||||
if(fac != null) {
|
||||
res = fac;
|
||||
}
|
||||
}
|
||||
}
|
||||
return res;
|
||||
}
|
||||
|
||||
@Override
|
||||
@SideOnly(Side.CLIENT)
|
||||
public int getLightBrightnessForSkyBlocks(int var1, int var2, int var3, int var4) {
|
||||
return wrapped.getLightBrightnessForSkyBlocks(var1, var2, var3, var4);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getBlockMetadata(int x, int y, int z) {
|
||||
Block block = super.getBlock(x, y, z);
|
||||
if(block == EnderIO.blockPaintedGlowstone) {
|
||||
TileEntity te = getTileEntity(x, y, z);
|
||||
if(te instanceof TileEntityPaintedBlock) {
|
||||
TileEntityPaintedBlock tcb = (TileEntityPaintedBlock) te;
|
||||
Block fac = tcb.getSourceBlock();
|
||||
if(fac != null) {
|
||||
return tcb.getSourceBlockMetadata();
|
||||
}
|
||||
}
|
||||
}
|
||||
return super.getBlockMetadata(x, y, z);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
@@ -9,6 +9,9 @@ import net.minecraftforge.client.IItemRenderer;
|
||||
|
||||
import org.lwjgl.opengl.GL11;
|
||||
|
||||
import crazypants.enderio.EnderIO;
|
||||
import crazypants.render.RenderUtil;
|
||||
|
||||
public class PaintedItemRenderer implements IItemRenderer {
|
||||
|
||||
@Override
|
||||
@@ -35,37 +38,35 @@ public class PaintedItemRenderer implements IItemRenderer {
|
||||
}
|
||||
|
||||
public void renderEquipped(ItemStack item, RenderBlocks renderBlocks) {
|
||||
Block block = PainterUtil.getSourceBlock(item);
|
||||
|
||||
if(block != null) {
|
||||
int meta = PainterUtil.getSourceBlockMetadata(item);
|
||||
renderBlocks.setOverrideBlockTexture(renderBlocks.getBlockIconFromSideAndMetadata(block, 2, meta));
|
||||
}
|
||||
|
||||
GL11.glPushMatrix();
|
||||
GL11.glTranslatef(0.5F, 0.5F, 0.5F);
|
||||
|
||||
Item i = item.getItem();
|
||||
if(i instanceof ItemBlock) {
|
||||
renderBlocks.renderBlockAsItem(((ItemBlock) i).field_150939_a, item.getItemDamage(), 1.0f);
|
||||
}
|
||||
|
||||
renderToInventory(item, renderBlocks);
|
||||
GL11.glPopMatrix();
|
||||
renderBlocks.clearOverrideBlockTexture();
|
||||
|
||||
}
|
||||
|
||||
public void renderToInventory(ItemStack item, RenderBlocks renderBlocks) {
|
||||
Block block = PainterUtil.getSourceBlock(item);
|
||||
if(block != null) {
|
||||
int meta = PainterUtil.getSourceBlockMetadata(item);
|
||||
renderBlocks.setOverrideBlockTexture(renderBlocks.getBlockIconFromSideAndMetadata(block, 2, meta));
|
||||
}
|
||||
Item i = item.getItem();
|
||||
if(i instanceof ItemBlock) {
|
||||
renderBlocks.renderBlockAsItem(((ItemBlock) i).field_150939_a, item.getItemDamage(), 1.0f);
|
||||
if(item.getItem() == Item.getItemFromBlock(EnderIO.blockPaintedGlowstone)) {
|
||||
Block block = PainterUtil.getSourceBlock(item);
|
||||
if(block != null) {
|
||||
RenderUtil.bindBlockTexture();
|
||||
renderBlocks.renderBlockAsItem(block, PainterUtil.getSourceBlockMetadata(item), 1.0F);
|
||||
}
|
||||
} else {
|
||||
Block block = PainterUtil.getSourceBlock(item);
|
||||
if(block != null) {
|
||||
int meta = PainterUtil.getSourceBlockMetadata(item);
|
||||
renderBlocks.setOverrideBlockTexture(renderBlocks.getBlockIconFromSideAndMetadata(block, 2, meta));
|
||||
}
|
||||
Item i = item.getItem();
|
||||
if(i instanceof ItemBlock) {
|
||||
renderBlocks.renderBlockAsItem(((ItemBlock) i).field_150939_a, item.getItemDamage(), 1.0f);
|
||||
}
|
||||
|
||||
renderBlocks.clearOverrideBlockTexture();
|
||||
}
|
||||
|
||||
renderBlocks.clearOverrideBlockTexture();
|
||||
}
|
||||
|
||||
}
|
||||
Reference in new issue
Block a user