Lots of changes, fixed a few crashes, and minor bugs. Also, doesnt need Asielib anymore

This commit is contained in:
Fenn committed 2014-04-21 19:13:15 +01:00
1 parent 333c1d6596
commit fd4351711a
146 files changed
+12167 -9527

No files matched your search

@@ -1,55 +1,63 @@
package info.jbcs.minecraft.chisel.block;
import info.jbcs.minecraft.chisel.render.BlockTexturedOreRenderer;
import info.jbcs.minecraft.chisel.client.render.BlockTexturedOreRenderer;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.util.IIcon;
public class BlockTexturedOre extends Block {
public int currentPass;
public Block base;
public IIcon icon;
String iconFile;
public class BlockTexturedOre extends Block
{
public int currentPass;
public Block base;
public IIcon icon;
String iconFile;
public BlockTexturedOre(Material mat, Block base) {
super(mat);
public BlockTexturedOre(Material mat, Block base)
{
super(mat);
this.base = base;
}
this.base = base;
}
public BlockTexturedOre(Material mat, String iconFile) {
super(mat);
public BlockTexturedOre(Material mat, String iconFile)
{
super(mat);
this.iconFile=iconFile;
}
this.iconFile = iconFile;
}
@Override
public boolean renderAsNormalBlock() {
return false;
}
@Override
public boolean renderAsNormalBlock()
{
return false;
}
@Override
public int getRenderType() {
return BlockTexturedOreRenderer.id;
}
@Override
public int getRenderType()
{
return BlockTexturedOreRenderer.id;
}
@Override
public int getRenderBlockPass() {
return 1;
}
@Override
public int getRenderBlockPass()
{
return 1;
}
@Override
public boolean canRenderInPass(int pass) {
currentPass = pass;
@Override
public boolean canRenderInPass(int pass)
{
currentPass = pass;
return pass == 1 || pass == 0;
}
@Override
public void registerBlockIcons(IIconRegister register) {
if(iconFile!=null)
icon=register.registerIcon(iconFile);
}
return pass == 1 || pass == 0;
}
@Override
public void registerBlockIcons(IIconRegister register)
{
if(iconFile != null)
icon = register.registerIcon(iconFile);
}
}