mirror of
https://github.com/GTNewHorizons/EnderIO.git
synced 2026-11-20 20:22:12 +00:00
Added painted glowstone.
Fixed some item rendering alignment.
This commit is contained in:
1 parent
bb3e0b3026
commit
1f6bf46696
9 files changed
+372
-8
No files matched your search
@@ -132,7 +132,15 @@ public class ClientProxy extends CommonProxy {
|
||||
// Renderers
|
||||
|
||||
AbstractMachineBlock.renderId = RenderingRegistry.getNextAvailableRenderId();
|
||||
RenderingRegistry.registerBlockHandler(new AbstractMachineRenderer());
|
||||
AbstractMachineRenderer machRen = new AbstractMachineRenderer();
|
||||
RenderingRegistry.registerBlockHandler(machRen);
|
||||
MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockStirlingGenerator), machRen);
|
||||
MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockCrusher), machRen);
|
||||
MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockAlloySmelter), machRen);
|
||||
MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockPowerMonitor), machRen);
|
||||
MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockPainter), machRen);
|
||||
MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockCrafter), machRen);
|
||||
|
||||
|
||||
BlockFusedQuartz.renderId = RenderingRegistry.getNextAvailableRenderId();
|
||||
RenderingRegistry.registerBlockHandler(new FusedQuartzRenderer());
|
||||
@@ -160,6 +168,7 @@ public class ClientProxy extends CommonProxy {
|
||||
BlockVat.renderId = RenderingRegistry.getNextAvailableRenderId();
|
||||
VatRenderer vr = new VatRenderer();
|
||||
RenderingRegistry.registerBlockHandler(vr);
|
||||
MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockVat), vr);
|
||||
|
||||
FusedQuartzFrameRenderer fqfr = new FusedQuartzFrameRenderer();
|
||||
MinecraftForgeClient.registerItemRenderer(EnderIO.itemFusedQuartzFrame, fqfr);
|
||||
@@ -189,8 +198,9 @@ public class ClientProxy extends CommonProxy {
|
||||
MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockPaintedFenceGate), pir);
|
||||
MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockPaintedWall), pir);
|
||||
MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockPaintedStair), pir);
|
||||
|
||||
MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockPaintedSlab), pir);
|
||||
MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(EnderIO.blockPaintedGlowstone), pir);
|
||||
|
||||
MinecraftForgeClient.registerItemRenderer(EnderIO.itemMachinePart, new MachinePartRenderer());
|
||||
MinecraftForgeClient.registerItemRenderer(EnderIO.itemConduitFacade, new FacadeRenderer());
|
||||
|
||||
|
||||
@@ -68,6 +68,7 @@ import crazypants.enderio.machine.monitor.BlockPowerMonitor;
|
||||
import crazypants.enderio.machine.monitor.ItemConduitProbe;
|
||||
import crazypants.enderio.machine.painter.BlockPaintedFence;
|
||||
import crazypants.enderio.machine.painter.BlockPaintedFenceGate;
|
||||
import crazypants.enderio.machine.painter.BlockPaintedGlowstone;
|
||||
import crazypants.enderio.machine.painter.BlockPaintedSlab;
|
||||
import crazypants.enderio.machine.painter.BlockPaintedStair;
|
||||
import crazypants.enderio.machine.painter.BlockPaintedWall;
|
||||
@@ -133,6 +134,7 @@ public class EnderIO {
|
||||
public static BlockPaintedStair blockPaintedStair;
|
||||
public static BlockPaintedSlab blockPaintedSlab;
|
||||
public static BlockPaintedSlab blockPaintedDoubleSlab;
|
||||
public static BlockPaintedGlowstone blockPaintedGlowstone;
|
||||
|
||||
// Conduits
|
||||
public static BlockConduitBundle blockConduitBundle;
|
||||
@@ -236,6 +238,7 @@ public class EnderIO {
|
||||
blockPaintedSlab.init();
|
||||
blockPaintedDoubleSlab.init();
|
||||
blockCrafter = BlockCrafter.create();
|
||||
blockPaintedGlowstone = BlockPaintedGlowstone.create();
|
||||
|
||||
blockHyperCube = BlockHyperCube.create();
|
||||
blockElectricLight = BlockElectricLight.create();
|
||||
|
||||
@@ -60,6 +60,7 @@ public enum ModObject {
|
||||
blockPaintedStair,
|
||||
blockPaintedSlab,
|
||||
blockPaintedDoubleSlab,
|
||||
blockPaintedGlowstone,
|
||||
|
||||
itemConduitProbe,
|
||||
itemYetaWrench,
|
||||
|
||||
@@ -2,12 +2,19 @@ package crazypants.enderio.machine;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import org.lwjgl.opengl.GL11;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.RenderBlocks;
|
||||
import net.minecraft.client.renderer.Tessellator;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.util.IIcon;
|
||||
import net.minecraft.world.IBlockAccess;
|
||||
import net.minecraftforge.client.IItemRenderer;
|
||||
import net.minecraftforge.client.IItemRenderer.ItemRenderType;
|
||||
import net.minecraftforge.client.IItemRenderer.ItemRendererHelper;
|
||||
import net.minecraftforge.common.util.ForgeDirection;
|
||||
import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
|
||||
import crazypants.render.BoundingBox;
|
||||
@@ -18,7 +25,7 @@ import crazypants.render.IRenderFace;
|
||||
import crazypants.render.RenderUtil;
|
||||
import crazypants.vecmath.Vertex;
|
||||
|
||||
public class AbstractMachineRenderer implements ISimpleBlockRenderingHandler {
|
||||
public class AbstractMachineRenderer implements ISimpleBlockRenderingHandler, IItemRenderer {
|
||||
|
||||
private OverlayRenderer overlayRenderer = new OverlayRenderer();
|
||||
|
||||
@@ -26,6 +33,21 @@ public class AbstractMachineRenderer implements ISimpleBlockRenderingHandler {
|
||||
|
||||
private CustomCubeRenderer ccr = new CustomCubeRenderer();
|
||||
|
||||
@Override
|
||||
public boolean handleRenderType(ItemStack item, ItemRenderType type) {
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) {
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void renderItem(ItemRenderType type, ItemStack item, Object... data) {
|
||||
renderInventoryBlock(Block.getBlockFromItem(item.getItem()), item.getItemDamage(), 0, (RenderBlocks)data[0]);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void renderInventoryBlock(Block block, int metadata, int modelId, RenderBlocks renderer) {
|
||||
|
||||
@@ -42,7 +64,11 @@ public class AbstractMachineRenderer implements ISimpleBlockRenderingHandler {
|
||||
|
||||
CubeRenderer.render(bb, textures, null, brightnessPerSide);
|
||||
|
||||
// GL11.glPushMatrix();
|
||||
// GL11.glTranslatef(0, 0, 0);
|
||||
Tessellator.instance.draw();
|
||||
// GL11.glPopMatrix();
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -0,0 +1,38 @@
|
||||
package crazypants.enderio.machine.painter;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemBlock;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import crazypants.enderio.EnderIO;
|
||||
|
||||
public class BlockItemPaintedGlowstone extends ItemBlock {
|
||||
|
||||
public BlockItemPaintedGlowstone(Block p_i45328_1_) {
|
||||
super(p_i45328_1_);
|
||||
setHasSubtypes(true);
|
||||
}
|
||||
|
||||
public BlockItemPaintedGlowstone() {
|
||||
super(EnderIO.blockPaintedGlowstone);
|
||||
setHasSubtypes(true);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getMetadata(int par1) {
|
||||
return par1;
|
||||
}
|
||||
|
||||
@Override
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void addInformation(ItemStack item, EntityPlayer par2EntityPlayer, List list, boolean par4) {
|
||||
super.addInformation(item, par2EntityPlayer, list, par4);
|
||||
list.add(PainterUtil.getTooltTipText(item));
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@@ -0,0 +1,254 @@
|
||||
package crazypants.enderio.machine.painter;
|
||||
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
import java.util.Random;
|
||||
|
||||
import cpw.mods.fml.common.registry.GameRegistry;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import crazypants.enderio.EnderIO;
|
||||
import crazypants.enderio.ModObject;
|
||||
import crazypants.enderio.crafting.IEnderIoRecipe;
|
||||
import crazypants.enderio.crafting.IRecipeInput;
|
||||
import crazypants.enderio.crafting.IRecipeOutput;
|
||||
import crazypants.enderio.crafting.impl.EnderIoRecipe;
|
||||
import crazypants.enderio.crafting.impl.RecipeInputClass;
|
||||
import crazypants.enderio.crafting.impl.RecipeOutput;
|
||||
import crazypants.enderio.machine.MachineRecipeInput;
|
||||
import crazypants.enderio.machine.MachineRecipeRegistry;
|
||||
import crazypants.enderio.machine.IMachineRecipe.ResultStack;
|
||||
import crazypants.enderio.machine.painter.BlockPaintedStair.PainterTemplate;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.BlockGlowstone;
|
||||
import net.minecraft.block.BlockStairs;
|
||||
import net.minecraft.block.ITileEntityProvider;
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.client.particle.EffectRenderer;
|
||||
import net.minecraft.client.particle.EntityDiggingFX;
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.entity.EntityLivingBase;
|
||||
import net.minecraft.entity.item.EntityItem;
|
||||
import net.minecraft.init.Blocks;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.util.IIcon;
|
||||
import net.minecraft.util.MovingObjectPosition;
|
||||
import net.minecraft.world.IBlockAccess;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.common.util.ForgeDirection;
|
||||
|
||||
public class BlockPaintedGlowstone extends Block implements ITileEntityProvider {
|
||||
|
||||
|
||||
public static BlockPaintedGlowstone create() {
|
||||
BlockPaintedGlowstone result = new BlockPaintedGlowstone();
|
||||
result.init();
|
||||
return result;
|
||||
}
|
||||
|
||||
private IIcon lastRemovedComponetIcon = null;
|
||||
|
||||
private Random rand = new Random();
|
||||
|
||||
protected BlockPaintedGlowstone() {
|
||||
super(Material.glass);
|
||||
setCreativeTab(null);
|
||||
setBlockName(ModObject.blockPaintedGlowstone.unlocalisedName);
|
||||
}
|
||||
|
||||
private void init() {
|
||||
GameRegistry.registerBlock(this, BlockItemPaintedGlowstone.class, ModObject.blockPaintedGlowstone.unlocalisedName);
|
||||
GameRegistry.registerTileEntity(TileEntityPaintedBlock.class, ModObject.blockPaintedGlowstone.unlocalisedName + "TileEntity");
|
||||
MachineRecipeRegistry.instance.registerRecipe(ModObject.blockPainter.unlocalisedName, new PainterTemplate());
|
||||
}
|
||||
|
||||
public static ItemStack createItemStackForSourceBlock(Block block, int damage) {
|
||||
ItemStack result = new ItemStack(EnderIO.blockPaintedGlowstone, 1, damage);
|
||||
PainterUtil.setSourceBlock(result, block, damage);
|
||||
return result;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getLightValue() {
|
||||
return 15;
|
||||
}
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
@Override
|
||||
public boolean addHitEffects(World world, MovingObjectPosition target,
|
||||
EffectRenderer effectRenderer) {
|
||||
IIcon tex = null;
|
||||
|
||||
TileEntityPaintedBlock cb = (TileEntityPaintedBlock)
|
||||
world.getTileEntity(target.blockX, target.blockY, target.blockZ);
|
||||
Block b = cb.getSourceBlock();
|
||||
if(b != null) {
|
||||
tex = b.getIcon(ForgeDirection.NORTH.ordinal(), cb.getSourceBlockMetadata());
|
||||
}
|
||||
if(tex == null) {
|
||||
tex = blockIcon;
|
||||
}
|
||||
lastRemovedComponetIcon = tex;
|
||||
addBlockHitEffects(world, effectRenderer, target.blockX, target.blockY,
|
||||
target.blockZ, target.sideHit, tex);
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
@SideOnly(Side.CLIENT)
|
||||
public boolean addDestroyEffects(World world, int x, int y, int z, int
|
||||
meta, EffectRenderer effectRenderer) {
|
||||
IIcon tex = lastRemovedComponetIcon;
|
||||
byte b0 = 4;
|
||||
for (int j1 = 0; j1 < b0; ++j1) {
|
||||
for (int k1 = 0; k1 < b0; ++k1) {
|
||||
for (int l1 = 0; l1 < b0; ++l1) {
|
||||
double d0 = x + (j1 + 0.5D) / b0;
|
||||
double d1 = y + (k1 + 0.5D) / b0;
|
||||
double d2 = z + (l1 + 0.5D) / b0;
|
||||
int i2 = this.rand.nextInt(6);
|
||||
EntityDiggingFX fx = new EntityDiggingFX(world, d0, d1, d2, d0 - x - 0.5D,
|
||||
d1 - y - 0.5D, d2 - z - 0.5D, this, i2, 0).applyColourMultiplier(x, y, z);
|
||||
fx.setParticleIcon(tex);
|
||||
effectRenderer.addEffect(fx);
|
||||
}
|
||||
}
|
||||
}
|
||||
return true;
|
||||
|
||||
}
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
private void addBlockHitEffects(World world, EffectRenderer effectRenderer,
|
||||
int x, int y, int z, int side, IIcon tex) {
|
||||
float f = 0.1F;
|
||||
double d0 = x + rand.nextDouble() * (getBlockBoundsMaxX() -
|
||||
getBlockBoundsMinX() - f * 2.0F) + f + getBlockBoundsMinX();
|
||||
double d1 = y + rand.nextDouble() * (getBlockBoundsMaxY() -
|
||||
getBlockBoundsMinY() - f * 2.0F) + f + getBlockBoundsMinY();
|
||||
double d2 = z + rand.nextDouble() * (getBlockBoundsMaxZ() -
|
||||
getBlockBoundsMinZ() - f * 2.0F) + f + getBlockBoundsMinZ();
|
||||
if(side == 0) {
|
||||
d1 = y + getBlockBoundsMinY() - f;
|
||||
} else if(side == 1) {
|
||||
d1 = y + getBlockBoundsMaxY() + f;
|
||||
} else if(side == 2) {
|
||||
d2 = z + getBlockBoundsMinZ() - f;
|
||||
} else if(side == 3) {
|
||||
d2 = z + getBlockBoundsMaxZ() + f;
|
||||
} else if(side == 4) {
|
||||
d0 = x + getBlockBoundsMinX() - f;
|
||||
} else if(side == 5) {
|
||||
d0 = x + getBlockBoundsMaxX() + f;
|
||||
}
|
||||
EntityDiggingFX digFX = new EntityDiggingFX(world, d0, d1, d2, 0.0D, 0.0D,
|
||||
0.0D, this, side, 0);
|
||||
digFX.applyColourMultiplier(x, y,
|
||||
z).multiplyVelocity(0.2F).multipleParticleScaleBy(0.6F);
|
||||
digFX.setParticleIcon(tex);
|
||||
effectRenderer.addEffect(digFX);
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isSideSolid(IBlockAccess world, int x, int y, int z, ForgeDirection side) {
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public IIcon getIcon(IBlockAccess world, int x, int y, int z, int blockSide) {
|
||||
TileEntity te = world.getTileEntity(x, y, z);
|
||||
if(te instanceof TileEntityPaintedBlock) {
|
||||
TileEntityPaintedBlock tef = (TileEntityPaintedBlock) te;
|
||||
if(tef.getSourceBlock() != null) {
|
||||
return tef.getSourceBlock().getIcon(blockSide, tef.getSourceBlockMetadata());
|
||||
}
|
||||
}
|
||||
return Blocks.anvil.getIcon(world, x, y, z, blockSide);
|
||||
}
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
@Override
|
||||
public void registerBlockIcons(IIconRegister IIconRegister) {
|
||||
blockIcon = IIconRegister.registerIcon("enderio:conduitConnector");
|
||||
}
|
||||
|
||||
@Override
|
||||
public TileEntity createNewTileEntity(World world, int metadata) {
|
||||
return new TileEntityPaintedBlock();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase player, ItemStack stack) {
|
||||
Block b = PainterUtil.getSourceBlock(stack);
|
||||
TileEntity te = world.getTileEntity(x, y, z);
|
||||
if(te instanceof TileEntityPaintedBlock) {
|
||||
TileEntityPaintedBlock tef = (TileEntityPaintedBlock) te;
|
||||
tef.setSourceBlock(b);
|
||||
tef.setSourceBlockMetadata(PainterUtil.getSourceBlockMetadata(stack));
|
||||
}
|
||||
world.markBlockForUpdate(x, y, z);
|
||||
super.onBlockPlacedBy(world, x, y, z, player, stack);
|
||||
}
|
||||
|
||||
/**
|
||||
* Remove the tile entity too.
|
||||
*/
|
||||
@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);
|
||||
|
||||
if(te instanceof TileEntityPaintedBlock) {
|
||||
TileEntityPaintedBlock tef = (TileEntityPaintedBlock) te;
|
||||
|
||||
ItemStack itemStack = createItemStackForSourceBlock(tef.getSourceBlock(), tef.getSourceBlockMetadata());
|
||||
|
||||
float f = 0.7F;
|
||||
double d0 = world.rand.nextFloat() * f + (1.0F - f) * 0.5D;
|
||||
double d1 = world.rand.nextFloat() * f + (1.0F - f) * 0.5D;
|
||||
double d2 = world.rand.nextFloat() * f + (1.0F - f) * 0.5D;
|
||||
EntityItem entityitem = new EntityItem(world, x + d0, y + d1, z + d2, itemStack);
|
||||
entityitem.delayBeforeCanPickup = 10;
|
||||
world.spawnEntityInWorld(entityitem);
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
world.removeTileEntity(x, y, z);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int quantityDropped(Random par1Random) {
|
||||
return 0; // need to do custom dropping to maintain source metadata
|
||||
}
|
||||
|
||||
public static final class PainterTemplate extends BasicPainterTemplate {
|
||||
|
||||
public PainterTemplate() {
|
||||
super(Blocks.glowstone);
|
||||
}
|
||||
|
||||
@Override
|
||||
public ResultStack[] getCompletedResult(float chance, MachineRecipeInput... inputs) {
|
||||
ItemStack paintSource = MachineRecipeInput.getInputForSlot(1, inputs);
|
||||
if(paintSource == null) {
|
||||
return new ResultStack[0];
|
||||
}
|
||||
return new ResultStack[] { new ResultStack(createItemStackForSourceBlock(Block.getBlockFromItem(paintSource.getItem()), paintSource.getItemDamage())) };
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<IEnderIoRecipe> getAllRecipes() {
|
||||
IRecipeInput input = new RecipeInputClass<BlockGlowstone>(new ItemStack(Blocks.glowstone), BlockGlowstone.class);
|
||||
IRecipeOutput output = new RecipeOutput(new ItemStack(EnderIO.blockPaintedGlowstone, 1, 0));
|
||||
IEnderIoRecipe recipe = new EnderIoRecipe(getMachineName(), DEFAULT_ENERGY_PER_TASK, input, output);
|
||||
return Collections.singletonList(recipe);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@@ -3,11 +3,17 @@ package crazypants.enderio.machine.still;
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.client.renderer.OpenGlHelper;
|
||||
import net.minecraft.client.renderer.RenderBlocks;
|
||||
import net.minecraft.client.renderer.RenderHelper;
|
||||
import net.minecraft.client.renderer.Tessellator;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.util.IIcon;
|
||||
import net.minecraft.world.IBlockAccess;
|
||||
import net.minecraftforge.client.IItemRenderer;
|
||||
import net.minecraftforge.client.IItemRenderer.ItemRenderType;
|
||||
import net.minecraftforge.client.IItemRenderer.ItemRendererHelper;
|
||||
import net.minecraftforge.common.util.ForgeDirection;
|
||||
|
||||
import org.lwjgl.opengl.GL11;
|
||||
@@ -26,7 +32,7 @@ import crazypants.vecmath.Vector3d;
|
||||
import crazypants.vecmath.Vector3f;
|
||||
import crazypants.vecmath.Vertex;
|
||||
|
||||
public class VatRenderer implements ISimpleBlockRenderingHandler {
|
||||
public class VatRenderer implements ISimpleBlockRenderingHandler, IItemRenderer {
|
||||
|
||||
private VertXForm xform = new VertXForm();
|
||||
|
||||
@@ -35,6 +41,21 @@ public class VatRenderer implements ISimpleBlockRenderingHandler {
|
||||
private OverlayRenderer overlayRenderer = new OverlayRenderer();
|
||||
|
||||
private TileVat vat;
|
||||
|
||||
@Override
|
||||
public boolean handleRenderType(ItemStack item, ItemRenderType type) {
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) {
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void renderItem(ItemRenderType type, ItemStack item, Object... data) {
|
||||
renderInventoryBlock(Block.getBlockFromItem(item.getItem()), item.getItemDamage(), 0, (RenderBlocks)data[0]);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) {
|
||||
@@ -82,11 +103,21 @@ public class VatRenderer implements ISimpleBlockRenderingHandler {
|
||||
|
||||
@Override
|
||||
public void renderInventoryBlock(Block block, int metadata, int modelId, RenderBlocks renderer) {
|
||||
Tessellator tes = Tessellator.instance;
|
||||
GL11.glDisable(GL11.GL_LIGHTING);
|
||||
tes.startDrawingQuads();
|
||||
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();
|
||||
renderWorldBlock(null, 0, 0, 0, block, 0, renderer);
|
||||
tes.draw();
|
||||
|
||||
OpenGlHelper.setActiveTexture(OpenGlHelper.lightmapTexUnit);
|
||||
GL11.glEnable(GL11.GL_TEXTURE_2D);
|
||||
OpenGlHelper.setActiveTexture(OpenGlHelper.defaultTexUnit);
|
||||
|
||||
GL11.glEnable(GL11.GL_LIGHTING);
|
||||
}
|
||||
|
||||
|
||||
@@ -21,7 +21,7 @@ public class TankItemRenderer implements IItemRenderer {
|
||||
|
||||
@Override
|
||||
public boolean handleRenderType(ItemStack item, ItemRenderType type) {
|
||||
return type == ItemRenderType.INVENTORY;
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
Reference in new issue
Block a user