lids aren't done yet shut up

This commit is contained in:
Bob 2026-03-02 22:12:23 +01:00
parent f8b7e8528c
commit aaf94ba6e4
138 changed files with 1561 additions and 1462 deletions

View File

@ -131,14 +131,14 @@ public abstract class BlockDummyable extends BlockContainer implements ICustomBl
world.setBlockMetadataWithNotify(x, y, z, offset + world.getBlockMetadata(x, y, z), 3); world.setBlockMetadataWithNotify(x, y, z, offset + world.getBlockMetadata(x, y, z), 3);
} }
public int[] findCore(World world, int x, int y, int z) { public int[] findCore(IBlockAccess world, int x, int y, int z) {
positions.clear(); positions.clear();
return findCoreRec(world, x, y, z); return findCoreRec(world, x, y, z);
} }
List<ThreeInts> positions = new ArrayList<>(); List<ThreeInts> positions = new ArrayList<>();
public int[] findCoreRec(World world, int x, int y, int z) { public int[] findCoreRec(IBlockAccess world, int x, int y, int z) {
ThreeInts pos = new ThreeInts(x, y, z); ThreeInts pos = new ThreeInts(x, y, z);

View File

@ -10,6 +10,7 @@ import com.hbm.blocks.rail.IRenderBlock;
import com.hbm.lib.RefStrings; import com.hbm.lib.RefStrings;
import com.hbm.main.MainRegistry; import com.hbm.main.MainRegistry;
import com.hbm.main.ResourceManager; import com.hbm.main.ResourceManager;
import com.hbm.render.loader.HFRWavefrontObject;
import com.hbm.render.util.ObjUtil; import com.hbm.render.util.ObjUtil;
import com.hbm.tileentity.machine.TileEntityMachineFunnel; import com.hbm.tileentity.machine.TileEntityMachineFunnel;
@ -30,7 +31,6 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.IIcon; import net.minecraft.util.IIcon;
import net.minecraft.world.IBlockAccess; import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraftforge.client.model.obj.WavefrontObject;
public class MachineFunnel extends BlockContainer implements ITooltipProvider, IRenderBlock { public class MachineFunnel extends BlockContainer implements ITooltipProvider, IRenderBlock {
@ -120,9 +120,9 @@ public class MachineFunnel extends BlockContainer implements ITooltipProvider, I
public void renderInventory(Tessellator tessellator, Block block, int metadata) { public void renderInventory(Tessellator tessellator, Block block, int metadata) {
GL11.glTranslatef(0F, -0.5F, 0F); GL11.glTranslatef(0F, -0.5F, 0F);
tessellator.startDrawingQuads(); tessellator.startDrawingQuads();
ObjUtil.renderPartWithIcon((WavefrontObject) ResourceManager.funnel, "Top", block.getIcon(1, 0), tessellator, 0, false); ObjUtil.renderPartWithIcon((HFRWavefrontObject) ResourceManager.funnel, "Top", block.getIcon(1, 0), tessellator, 0, false);
ObjUtil.renderPartWithIcon((WavefrontObject) ResourceManager.funnel, "Bottom", block.getIcon(0, 0), tessellator, 0, false); ObjUtil.renderPartWithIcon((HFRWavefrontObject) ResourceManager.funnel, "Bottom", block.getIcon(0, 0), tessellator, 0, false);
ObjUtil.renderPartWithIcon((WavefrontObject) ResourceManager.funnel, "Side", block.getIcon(2, 0), tessellator, 0, false); ObjUtil.renderPartWithIcon((HFRWavefrontObject) ResourceManager.funnel, "Side", block.getIcon(2, 0), tessellator, 0, false);
tessellator.draw(); tessellator.draw();
} }
@ -130,9 +130,9 @@ public class MachineFunnel extends BlockContainer implements ITooltipProvider, I
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public void renderWorld(Tessellator tessellator, Block block, int meta, IBlockAccess world, int x, int y, int z) { public void renderWorld(Tessellator tessellator, Block block, int meta, IBlockAccess world, int x, int y, int z) {
tessellator.addTranslation(x + 0.5F, y, z + 0.5F); tessellator.addTranslation(x + 0.5F, y, z + 0.5F);
ObjUtil.renderPartWithIcon((WavefrontObject) ResourceManager.funnel, "Top", block.getIcon(1, 0), tessellator, 0, true); ObjUtil.renderPartWithIcon((HFRWavefrontObject) ResourceManager.funnel, "Top", block.getIcon(1, 0), tessellator, 0, true);
ObjUtil.renderPartWithIcon((WavefrontObject) ResourceManager.funnel, "Bottom", block.getIcon(0, 0), tessellator, 0, true); ObjUtil.renderPartWithIcon((HFRWavefrontObject) ResourceManager.funnel, "Bottom", block.getIcon(0, 0), tessellator, 0, true);
ObjUtil.renderPartWithIcon((WavefrontObject) ResourceManager.funnel, "Side", block.getIcon(2, 0), tessellator, 0, true); ObjUtil.renderPartWithIcon((HFRWavefrontObject) ResourceManager.funnel, "Side", block.getIcon(2, 0), tessellator, 0, true);
tessellator.addTranslation(-x - 0.5F, -y, -z - 0.5F); tessellator.addTranslation(-x - 0.5F, -y, -z - 0.5F);
} }
} }

View File

@ -13,6 +13,7 @@ import com.hbm.inventory.gui.GUIAnvil;
import com.hbm.lib.RefStrings; import com.hbm.lib.RefStrings;
import com.hbm.main.MainRegistry; import com.hbm.main.MainRegistry;
import com.hbm.main.ResourceManager; import com.hbm.main.ResourceManager;
import com.hbm.render.loader.HFRWavefrontObject;
import com.hbm.render.util.ObjUtil; import com.hbm.render.util.ObjUtil;
import com.hbm.tileentity.IGUIProvider; import com.hbm.tileentity.IGUIProvider;
@ -35,7 +36,6 @@ import net.minecraft.util.IIcon;
import net.minecraft.util.MathHelper; import net.minecraft.util.MathHelper;
import net.minecraft.world.IBlockAccess; import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraftforge.client.model.obj.WavefrontObject;
public class NTMAnvil extends BlockFallingNT implements ITooltipProvider, IGUIProvider { public class NTMAnvil extends BlockFallingNT implements ITooltipProvider, IGUIProvider {
@ -211,12 +211,12 @@ public class NTMAnvil extends BlockFallingNT implements ITooltipProvider, IGUIPr
if(falling.getMeta() == 4) rotation = 180F / 180F * (float)Math.PI; if(falling.getMeta() == 4) rotation = 180F / 180F * (float)Math.PI;
tessellator.addTranslation(0F, -0.5F, 0F); tessellator.addTranslation(0F, -0.5F, 0F);
ObjUtil.renderPartWithIcon((WavefrontObject) ResourceManager.anvil, "Top", getIcon(1, 0), tessellator, rotation, true); ObjUtil.renderPartWithIcon((HFRWavefrontObject) ResourceManager.anvil, "Top", getIcon(1, 0), tessellator, rotation, true);
ObjUtil.renderPartWithIcon((WavefrontObject) ResourceManager.anvil, "Bottom", getIcon(0, 0), tessellator, rotation, true); ObjUtil.renderPartWithIcon((HFRWavefrontObject) ResourceManager.anvil, "Bottom", getIcon(0, 0), tessellator, rotation, true);
ObjUtil.renderPartWithIcon((WavefrontObject) ResourceManager.anvil, "Front", getIcon(0, 0), tessellator, rotation, true); ObjUtil.renderPartWithIcon((HFRWavefrontObject) ResourceManager.anvil, "Front", getIcon(0, 0), tessellator, rotation, true);
ObjUtil.renderPartWithIcon((WavefrontObject) ResourceManager.anvil, "Back", getIcon(0, 0), tessellator, rotation, true); ObjUtil.renderPartWithIcon((HFRWavefrontObject) ResourceManager.anvil, "Back", getIcon(0, 0), tessellator, rotation, true);
ObjUtil.renderPartWithIcon((WavefrontObject) ResourceManager.anvil, "Left", getIcon(0, 0), tessellator, rotation, true); ObjUtil.renderPartWithIcon((HFRWavefrontObject) ResourceManager.anvil, "Left", getIcon(0, 0), tessellator, rotation, true);
ObjUtil.renderPartWithIcon((WavefrontObject) ResourceManager.anvil, "Right", getIcon(0, 0), tessellator, rotation, true); ObjUtil.renderPartWithIcon((HFRWavefrontObject) ResourceManager.anvil, "Right", getIcon(0, 0), tessellator, rotation, true);
tessellator.addTranslation(0F, 0.5F, 0F); tessellator.addTranslation(0F, 0.5F, 0F);
} }
} }

View File

@ -7,6 +7,7 @@ import java.util.Random;
import com.hbm.blocks.BlockEnums.LightType; import com.hbm.blocks.BlockEnums.LightType;
import com.hbm.blocks.ISpotlight; import com.hbm.blocks.ISpotlight;
import com.hbm.main.ResourceManager; import com.hbm.main.ResourceManager;
import com.hbm.render.loader.HFRWavefrontObject;
import com.hbm.world.gen.nbt.INBTBlockTransformable; import com.hbm.world.gen.nbt.INBTBlockTransformable;
import cpw.mods.fml.client.registry.RenderingRegistry; import cpw.mods.fml.client.registry.RenderingRegistry;
@ -23,7 +24,6 @@ import net.minecraft.item.ItemStack;
import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.AxisAlignedBB;
import net.minecraft.world.IBlockAccess; import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraftforge.client.model.obj.WavefrontObject;
import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.common.util.ForgeDirection;
public class Spotlight extends Block implements ISpotlight, INBTBlockTransformable { public class Spotlight extends Block implements ISpotlight, INBTBlockTransformable {
@ -61,11 +61,11 @@ public class Spotlight extends Block implements ISpotlight, INBTBlockTransformab
return renderID; return renderID;
} }
public WavefrontObject getModel() { public HFRWavefrontObject getModel() {
switch(type) { switch(type) {
case FLUORESCENT: return (WavefrontObject) ResourceManager.fluorescent_lamp; case FLUORESCENT: return (HFRWavefrontObject) ResourceManager.fluorescent_lamp;
case HALOGEN: return (WavefrontObject) ResourceManager.flood_lamp; case HALOGEN: return (HFRWavefrontObject) ResourceManager.flood_lamp;
default: return (WavefrontObject) ResourceManager.cage_lamp; default: return (HFRWavefrontObject) ResourceManager.cage_lamp;
} }
} }

View File

@ -7,7 +7,6 @@ import com.hbm.handler.neutron.NeutronNodeWorld;
import com.hbm.handler.neutron.RBMKNeutronHandler.RBMKNeutronNode; import com.hbm.handler.neutron.RBMKNeutronHandler.RBMKNeutronNode;
import com.hbm.items.ModItems; import com.hbm.items.ModItems;
import com.hbm.items.machine.ItemRBMKLid; import com.hbm.items.machine.ItemRBMKLid;
import com.hbm.lib.RefStrings;
import com.hbm.main.MainRegistry; import com.hbm.main.MainRegistry;
import com.hbm.tileentity.machine.rbmk.RBMKDials; import com.hbm.tileentity.machine.rbmk.RBMKDials;
import com.hbm.tileentity.machine.rbmk.TileEntityRBMKBase; import com.hbm.tileentity.machine.rbmk.TileEntityRBMKBase;
@ -20,12 +19,14 @@ import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly; import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.item.EntityItem;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.AxisAlignedBB;
import net.minecraft.util.ResourceLocation; import net.minecraft.util.IIcon;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraftforge.client.event.RenderGameOverlayEvent.Pre; import net.minecraftforge.client.event.RenderGameOverlayEvent.Pre;
import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.common.util.ForgeDirection;
@ -34,7 +35,13 @@ public abstract class RBMKBase extends BlockDummyable implements IToolable, ILoo
public static boolean dropLids = true; public static boolean dropLids = true;
public static boolean digamma = false; public static boolean digamma = false;
public ResourceLocation coverTexture;
public static boolean renderLid = false;
public static boolean overrideOnlyRenderSides = false;
public IIcon coverTextureTop;
public IIcon coverTextureSide;
public IIcon textureTop;
protected RBMKBase() { protected RBMKBase() {
super(Material.iron); super(Material.iron);
@ -42,11 +49,30 @@ public abstract class RBMKBase extends BlockDummyable implements IToolable, ILoo
this.setResistance(30F); this.setResistance(30F);
} }
@Override public boolean isOpaqueCube() { return true; }
@Override public boolean renderAsNormalBlock() { return true; }
@SideOnly(Side.CLIENT)
public boolean shouldSideBeRendered(IBlockAccess world, int x, int y, int z, int side) {
if(overrideOnlyRenderSides && side < 2) return false;
if(renderLid && side > 1) return true;
return super.shouldSideBeRendered(world, x, y, z, side);
}
@Override @Override
public Block setBlockTextureName(String texture) { @SideOnly(Side.CLIENT)
this.textureName = texture; public void registerBlockIcons(IIconRegister reg) {
this.coverTexture = new ResourceLocation(RefStrings.MODID + ":textures/blocks/" + (texture.split(":")[1]) + ".png"); this.blockIcon = reg.registerIcon(this.getTextureName() + "_side");
return this; this.textureTop = reg.registerIcon(this.getTextureName() + "_top");
this.coverTextureTop = reg.registerIcon(this.getTextureName() + "_cover_top");
this.coverTextureSide = reg.registerIcon(this.getTextureName() + "_cover_side");
}
@Override
@SideOnly(Side.CLIENT)
public IIcon getIcon(int side, int meta) {
if(renderLid) return side == 0 || side == 1 ? coverTextureTop : coverTextureSide;
return side == 0 || side == 1 ? textureTop : blockIcon;
} }
@Override @Override

View File

@ -7,7 +7,7 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World; import net.minecraft.world.World;
public class RBMKBoiler extends RBMKBase { public class RBMKBoiler extends RBMKPipedBase {
@Override @Override
public TileEntity createNewTileEntity(World world, int meta) { public TileEntity createNewTileEntity(World world, int meta) {
@ -25,9 +25,4 @@ public class RBMKBoiler extends RBMKBase {
public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ) { public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ) {
return openInv(world, x, y, z, player); return openInv(world, x, y, z, player);
} }
@Override
public int getRenderType(){
return this.renderIDControl;
}
} }

View File

@ -7,7 +7,7 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.AxisAlignedBB;
import net.minecraft.world.World; import net.minecraft.world.World;
public class RBMKControl extends RBMKBase { public class RBMKControl extends RBMKPipedBase {
public boolean moderated = false; public boolean moderated = false;
@ -18,9 +18,7 @@ public class RBMKControl extends RBMKBase {
@Override @Override
public TileEntity createNewTileEntity(World world, int meta) { public TileEntity createNewTileEntity(World world, int meta) {
if(meta >= this.offset) return new TileEntityRBMKControlManual();
if(meta >= this.offset)
return new TileEntityRBMKControlManual();
return null; return null;
} }
@ -33,9 +31,4 @@ public class RBMKControl extends RBMKBase {
public AxisAlignedBB getCollisionBoundingBoxFromPool(World world, int x, int y, int z) { public AxisAlignedBB getCollisionBoundingBoxFromPool(World world, int x, int y, int z) {
return super.getCollisionBoundingBoxFromPool(world, x, y, z); return super.getCollisionBoundingBoxFromPool(world, x, y, z);
} }
@Override
public int getRenderType(){
return this.renderIDControl;
}
} }

View File

@ -7,7 +7,7 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.AxisAlignedBB;
import net.minecraft.world.World; import net.minecraft.world.World;
public class RBMKControlAuto extends RBMKBase { public class RBMKControlAuto extends RBMKPipedBase {
@Override @Override
public TileEntity createNewTileEntity(World world, int meta) { public TileEntity createNewTileEntity(World world, int meta) {
@ -26,9 +26,4 @@ public class RBMKControlAuto extends RBMKBase {
public AxisAlignedBB getCollisionBoundingBoxFromPool(World world, int x, int y, int z) { public AxisAlignedBB getCollisionBoundingBoxFromPool(World world, int x, int y, int z) {
return super.getCollisionBoundingBoxFromPool(world, x, y, z); return super.getCollisionBoundingBoxFromPool(world, x, y, z);
} }
@Override
public int getRenderType(){
return this.renderIDControl;
}
} }

View File

@ -7,7 +7,7 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World; import net.minecraft.world.World;
public class RBMKHeater extends RBMKBase { public class RBMKHeater extends RBMKPipedBase {
@Override @Override
public TileEntity createNewTileEntity(World world, int meta) { public TileEntity createNewTileEntity(World world, int meta) {
@ -25,9 +25,4 @@ public class RBMKHeater extends RBMKBase {
public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ) { public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ) {
return openInv(world, x, y, z, player); return openInv(world, x, y, z, player);
} }
@Override
public int getRenderType(){
return this.renderIDControl;
}
} }

View File

@ -0,0 +1,34 @@
package com.hbm.blocks.machine.rbmk;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.util.IIcon;
public abstract class RBMKPipedBase extends RBMKBase {
public static boolean renderPipes = false;
public IIcon pipeTextureTop;
public IIcon pipeTextureSide;
@Override
@SideOnly(Side.CLIENT)
public void registerBlockIcons(IIconRegister reg) {
super.registerBlockIcons(reg);
this.pipeTextureTop = reg.registerIcon(this.getTextureName() + "_pipe_top");
this.pipeTextureSide = reg.registerIcon(this.getTextureName() + "_pipe_side");
}
@Override
@SideOnly(Side.CLIENT)
public IIcon getIcon(int side, int meta) {
if(renderPipes) return side == 0 || side == 1 ? pipeTextureTop : pipeTextureSide;
return super.getIcon(side, meta);
}
@Override
public int getRenderType(){
return this.renderIDControl;
}
}

View File

@ -4,12 +4,16 @@ import com.hbm.handler.BossSpawnHandler;
import com.hbm.items.machine.ItemRBMKLid; import com.hbm.items.machine.ItemRBMKLid;
import com.hbm.items.machine.ItemRBMKRod; import com.hbm.items.machine.ItemRBMKRod;
import com.hbm.main.MainRegistry; import com.hbm.main.MainRegistry;
import com.hbm.tileentity.TileEntityProxyInventory; import com.hbm.tileentity.TileEntityProxyCombo;
import com.hbm.tileentity.machine.rbmk.TileEntityRBMKRod; import com.hbm.tileentity.machine.rbmk.TileEntityRBMKRod;
import cpw.mods.fml.common.network.internal.FMLNetworkHandler; import cpw.mods.fml.common.network.internal.FMLNetworkHandler;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.IIcon;
import net.minecraft.world.World; import net.minecraft.world.World;
public class RBMKRod extends RBMKBase { public class RBMKRod extends RBMKBase {
@ -21,18 +25,27 @@ public class RBMKRod extends RBMKBase {
this.moderated = moderated; this.moderated = moderated;
} }
public IIcon inner;
public IIcon fuel;
@Override public boolean isOpaqueCube() { return false; }
@Override public boolean renderAsNormalBlock() { return false; }
@Override @Override
public TileEntity createNewTileEntity(World world, int meta) { public TileEntity createNewTileEntity(World world, int meta) {
if(meta >= this.offset) return new TileEntityRBMKRod();
if(meta >= this.offset) if(hasExtra(meta)) return new TileEntityProxyCombo().inventory();
return new TileEntityRBMKRod();
if(hasExtra(meta))
return new TileEntityProxyInventory();
return null; return null;
} }
@Override
@SideOnly(Side.CLIENT)
public void registerBlockIcons(IIconRegister reg) {
super.registerBlockIcons(reg);
this.inner = reg.registerIcon(this.getTextureName() + "_inner");
this.fuel = reg.registerIcon(this.getTextureName() + "_fuel");
}
@Override @Override
public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ) { public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ) {
BossSpawnHandler.markFBI(player); BossSpawnHandler.markFBI(player);

View File

@ -5,6 +5,7 @@ import org.lwjgl.opengl.GL11;
import com.hbm.blocks.BlockDummyable; import com.hbm.blocks.BlockDummyable;
import com.hbm.lib.Library; import com.hbm.lib.Library;
import com.hbm.main.ResourceManager; import com.hbm.main.ResourceManager;
import com.hbm.render.loader.HFRWavefrontObject;
import com.hbm.render.util.ObjUtil; import com.hbm.render.util.ObjUtil;
import com.hbm.util.fauxpointtwelve.BlockPos; import com.hbm.util.fauxpointtwelve.BlockPos;
@ -19,7 +20,6 @@ import net.minecraft.util.MathHelper;
import net.minecraft.util.Vec3; import net.minecraft.util.Vec3;
import net.minecraft.world.IBlockAccess; import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraftforge.client.model.obj.WavefrontObject;
import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.common.util.ForgeDirection;
public class RailNarrowCurve extends BlockDummyable implements IRailNTM, IRenderBlock { public class RailNarrowCurve extends BlockDummyable implements IRailNTM, IRenderBlock {
@ -154,7 +154,7 @@ public class RailNarrowCurve extends BlockDummyable implements IRailNTM, IRender
GL11.glScaled(0.2, 0.2, 0.2); GL11.glScaled(0.2, 0.2, 0.2);
GL11.glTranslated(2.5, -0.0625, -1.5); GL11.glTranslated(2.5, -0.0625, -1.5);
tessellator.startDrawingQuads(); tessellator.startDrawingQuads();
ObjUtil.renderWithIcon((WavefrontObject) ResourceManager.rail_narrow_curve, block.getIcon(1, 0), tessellator, 0, false); ObjUtil.renderWithIcon((HFRWavefrontObject) ResourceManager.rail_narrow_curve, block.getIcon(1, 0), tessellator, 0, false);
tessellator.draw(); tessellator.draw();
} }
@ -167,7 +167,7 @@ public class RailNarrowCurve extends BlockDummyable implements IRailNTM, IRender
if(meta == 14) rotation = 180F / 180F * (float) Math.PI; if(meta == 14) rotation = 180F / 180F * (float) Math.PI;
if(meta == 13) rotation = 270F / 180F * (float) Math.PI; if(meta == 13) rotation = 270F / 180F * (float) Math.PI;
tessellator.addTranslation(x + 0.5F, y, z + 0.5F); tessellator.addTranslation(x + 0.5F, y, z + 0.5F);
ObjUtil.renderWithIcon((WavefrontObject) ResourceManager.rail_narrow_curve, block.getIcon(1, 0), tessellator, rotation, true); ObjUtil.renderWithIcon((HFRWavefrontObject) ResourceManager.rail_narrow_curve, block.getIcon(1, 0), tessellator, rotation, true);
tessellator.addTranslation(-x - 0.5F, -y, -z - 0.5F); tessellator.addTranslation(-x - 0.5F, -y, -z - 0.5F);
} }
} }

View File

@ -5,6 +5,7 @@ import org.lwjgl.opengl.GL11;
import com.hbm.blocks.BlockDummyable; import com.hbm.blocks.BlockDummyable;
import com.hbm.lib.Library; import com.hbm.lib.Library;
import com.hbm.main.ResourceManager; import com.hbm.main.ResourceManager;
import com.hbm.render.loader.HFRWavefrontObject;
import com.hbm.render.util.ObjUtil; import com.hbm.render.util.ObjUtil;
import com.hbm.util.fauxpointtwelve.BlockPos; import com.hbm.util.fauxpointtwelve.BlockPos;
@ -19,7 +20,6 @@ import net.minecraft.util.MathHelper;
import net.minecraft.util.Vec3; import net.minecraft.util.Vec3;
import net.minecraft.world.IBlockAccess; import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraftforge.client.model.obj.WavefrontObject;
import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.common.util.ForgeDirection;
public class RailNarrowStraight extends BlockDummyable implements IRailNTM, IRenderBlock { public class RailNarrowStraight extends BlockDummyable implements IRailNTM, IRenderBlock {
@ -124,7 +124,7 @@ public class RailNarrowStraight extends BlockDummyable implements IRailNTM, IRen
public void renderInventory(Tessellator tessellator, Block block, int metadata) { public void renderInventory(Tessellator tessellator, Block block, int metadata) {
GL11.glTranslated(0, -0.0625, 0); GL11.glTranslated(0, -0.0625, 0);
tessellator.startDrawingQuads(); tessellator.startDrawingQuads();
ObjUtil.renderWithIcon((WavefrontObject) ResourceManager.rail_narrow_straight, block.getIcon(1, 0), tessellator, 0, false); ObjUtil.renderWithIcon((HFRWavefrontObject) ResourceManager.rail_narrow_straight, block.getIcon(1, 0), tessellator, 0, false);
tessellator.draw(); tessellator.draw();
} }
@ -134,7 +134,7 @@ public class RailNarrowStraight extends BlockDummyable implements IRailNTM, IRen
float rotation = 0; float rotation = 0;
if(meta == 2 || meta == 3 || meta == 12 || meta == 13) rotation = 90F / 180F * (float) Math.PI; if(meta == 2 || meta == 3 || meta == 12 || meta == 13) rotation = 90F / 180F * (float) Math.PI;
tessellator.addTranslation(x + 0.5F, y, z + 0.5F); tessellator.addTranslation(x + 0.5F, y, z + 0.5F);
ObjUtil.renderWithIcon((WavefrontObject) ResourceManager.rail_narrow_straight, block.getIcon(1, 0), tessellator, rotation, true); ObjUtil.renderWithIcon((HFRWavefrontObject) ResourceManager.rail_narrow_straight, block.getIcon(1, 0), tessellator, rotation, true);
tessellator.addTranslation(-x - 0.5F, -y, -z - 0.5F); tessellator.addTranslation(-x - 0.5F, -y, -z - 0.5F);
} }
} }

View File

@ -5,6 +5,7 @@ import org.lwjgl.opengl.GL11;
import com.hbm.blocks.BlockDummyable; import com.hbm.blocks.BlockDummyable;
import com.hbm.lib.Library; import com.hbm.lib.Library;
import com.hbm.main.ResourceManager; import com.hbm.main.ResourceManager;
import com.hbm.render.loader.HFRWavefrontObject;
import com.hbm.render.util.ObjUtil; import com.hbm.render.util.ObjUtil;
import com.hbm.util.fauxpointtwelve.BlockPos; import com.hbm.util.fauxpointtwelve.BlockPos;
@ -18,7 +19,6 @@ import net.minecraft.util.MathHelper;
import net.minecraft.util.Vec3; import net.minecraft.util.Vec3;
import net.minecraft.world.IBlockAccess; import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraftforge.client.model.obj.WavefrontObject;
import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.common.util.ForgeDirection;
public class RailStandardBuffer extends BlockDummyable implements IRailNTM, IRenderBlock { public class RailStandardBuffer extends BlockDummyable implements IRailNTM, IRenderBlock {
@ -148,7 +148,7 @@ public class RailStandardBuffer extends BlockDummyable implements IRailNTM, IRen
GL11.glRotated(90, 0, 1, 0); GL11.glRotated(90, 0, 1, 0);
GL11.glScaled(0.3, 0.3, 0.3); GL11.glScaled(0.3, 0.3, 0.3);
tessellator.startDrawingQuads(); tessellator.startDrawingQuads();
ObjUtil.renderWithIcon((WavefrontObject) ResourceManager.rail_standard_buffer, block.getIcon(1, 0), tessellator, 0, false); ObjUtil.renderWithIcon((HFRWavefrontObject) ResourceManager.rail_standard_buffer, block.getIcon(1, 0), tessellator, 0, false);
tessellator.draw(); tessellator.draw();
} }
@ -165,7 +165,7 @@ public class RailStandardBuffer extends BlockDummyable implements IRailNTM, IRen
if(meta == 14) tessellator.addTranslation(0F, 0F, -0.5F); if(meta == 14) tessellator.addTranslation(0F, 0F, -0.5F);
if(meta == 15) tessellator.addTranslation(0F, 0F, 0.5F); if(meta == 15) tessellator.addTranslation(0F, 0F, 0.5F);
tessellator.addTranslation(x + 0.5F, y, z + 0.5F); tessellator.addTranslation(x + 0.5F, y, z + 0.5F);
ObjUtil.renderWithIcon((WavefrontObject) ResourceManager.rail_standard_buffer, block.getIcon(1, 0), tessellator, rotation, true); ObjUtil.renderWithIcon((HFRWavefrontObject) ResourceManager.rail_standard_buffer, block.getIcon(1, 0), tessellator, rotation, true);
tessellator.addTranslation(-x - 0.5F, -y, -z - 0.5F); tessellator.addTranslation(-x - 0.5F, -y, -z - 0.5F);
if(meta == 12) tessellator.addTranslation(-0.5F, 0F, 0F); if(meta == 12) tessellator.addTranslation(-0.5F, 0F, 0F);
if(meta == 13) tessellator.addTranslation(0.5F, 0F, 0F); if(meta == 13) tessellator.addTranslation(0.5F, 0F, 0F);

View File

@ -5,6 +5,7 @@ import org.lwjgl.opengl.GL11;
import com.hbm.blocks.BlockDummyable; import com.hbm.blocks.BlockDummyable;
import com.hbm.lib.Library; import com.hbm.lib.Library;
import com.hbm.main.ResourceManager; import com.hbm.main.ResourceManager;
import com.hbm.render.loader.HFRWavefrontObject;
import com.hbm.render.util.ObjUtil; import com.hbm.render.util.ObjUtil;
import com.hbm.util.fauxpointtwelve.BlockPos; import com.hbm.util.fauxpointtwelve.BlockPos;
@ -19,7 +20,6 @@ import net.minecraft.util.MathHelper;
import net.minecraft.util.Vec3; import net.minecraft.util.Vec3;
import net.minecraft.world.IBlockAccess; import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraftforge.client.model.obj.WavefrontObject;
import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.common.util.ForgeDirection;
public class RailStandardCurveBase extends BlockDummyable implements IRailNTM, IRenderBlock { public class RailStandardCurveBase extends BlockDummyable implements IRailNTM, IRenderBlock {
@ -215,7 +215,7 @@ public class RailStandardCurveBase extends BlockDummyable implements IRailNTM, I
GL11.glRotated(60, 1, 0, 0); GL11.glRotated(60, 1, 0, 0);
GL11.glTranslated(2, 0, 2); GL11.glTranslated(2, 0, 2);
tessellator.startDrawingQuads(); tessellator.startDrawingQuads();
ObjUtil.renderWithIcon((WavefrontObject) ResourceManager.rail_standard_curve, block.getIcon(1, 0), tessellator, 0, false); ObjUtil.renderWithIcon((HFRWavefrontObject) ResourceManager.rail_standard_curve, block.getIcon(1, 0), tessellator, 0, false);
tessellator.draw(); tessellator.draw();
} }
@ -228,7 +228,7 @@ public class RailStandardCurveBase extends BlockDummyable implements IRailNTM, I
if(meta == 12) rotation = 180F / 180F * (float) Math.PI; if(meta == 12) rotation = 180F / 180F * (float) Math.PI;
if(meta == 14) rotation = 270F / 180F * (float) Math.PI; if(meta == 14) rotation = 270F / 180F * (float) Math.PI;
tessellator.addTranslation(x + 0.5F, y, z + 0.5F); tessellator.addTranslation(x + 0.5F, y, z + 0.5F);
ObjUtil.renderWithIcon((WavefrontObject) ResourceManager.rail_standard_curve, block.getIcon(1, 0), tessellator, rotation, true); ObjUtil.renderWithIcon((HFRWavefrontObject) ResourceManager.rail_standard_curve, block.getIcon(1, 0), tessellator, rotation, true);
tessellator.addTranslation(-x - 0.5F, -y, -z - 0.5F); tessellator.addTranslation(-x - 0.5F, -y, -z - 0.5F);
} }
} }

View File

@ -4,6 +4,7 @@ import org.lwjgl.opengl.GL11;
import com.hbm.blocks.BlockDummyable; import com.hbm.blocks.BlockDummyable;
import com.hbm.main.ResourceManager; import com.hbm.main.ResourceManager;
import com.hbm.render.loader.HFRWavefrontObject;
import com.hbm.render.util.ObjUtil; import com.hbm.render.util.ObjUtil;
import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.Side;
@ -12,7 +13,6 @@ import net.minecraft.block.Block;
import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.Tessellator;
import net.minecraft.world.IBlockAccess; import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraftforge.client.model.obj.WavefrontObject;
import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.common.util.ForgeDirection;
public class RailStandardCurveWide7 extends RailStandardCurveBase { public class RailStandardCurveWide7 extends RailStandardCurveBase {
@ -94,7 +94,7 @@ public class RailStandardCurveWide7 extends RailStandardCurveBase {
GL11.glRotated(60, 1, 0, 0); GL11.glRotated(60, 1, 0, 0);
GL11.glTranslated(3, 0, 3); GL11.glTranslated(3, 0, 3);
tessellator.startDrawingQuads(); tessellator.startDrawingQuads();
ObjUtil.renderWithIcon((WavefrontObject) ResourceManager.rail_standard_curve_wide7, block.getIcon(1, 0), tessellator, 0, false); ObjUtil.renderWithIcon((HFRWavefrontObject) ResourceManager.rail_standard_curve_wide7, block.getIcon(1, 0), tessellator, 0, false);
tessellator.draw(); tessellator.draw();
} }
@ -107,7 +107,7 @@ public class RailStandardCurveWide7 extends RailStandardCurveBase {
if(meta == 12) rotation = 180F / 180F * (float) Math.PI; if(meta == 12) rotation = 180F / 180F * (float) Math.PI;
if(meta == 14) rotation = 270F / 180F * (float) Math.PI; if(meta == 14) rotation = 270F / 180F * (float) Math.PI;
tessellator.addTranslation(x + 0.5F, y, z + 0.5F); tessellator.addTranslation(x + 0.5F, y, z + 0.5F);
ObjUtil.renderWithIcon((WavefrontObject) ResourceManager.rail_standard_curve_wide7, block.getIcon(1, 0), tessellator, rotation, true); ObjUtil.renderWithIcon((HFRWavefrontObject) ResourceManager.rail_standard_curve_wide7, block.getIcon(1, 0), tessellator, rotation, true);
tessellator.addTranslation(-x - 0.5F, -y, -z - 0.5F); tessellator.addTranslation(-x - 0.5F, -y, -z - 0.5F);
} }
} }

View File

@ -4,6 +4,7 @@ import org.lwjgl.opengl.GL11;
import com.hbm.blocks.BlockDummyable; import com.hbm.blocks.BlockDummyable;
import com.hbm.main.ResourceManager; import com.hbm.main.ResourceManager;
import com.hbm.render.loader.HFRWavefrontObject;
import com.hbm.render.util.ObjUtil; import com.hbm.render.util.ObjUtil;
import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.Side;
@ -12,7 +13,6 @@ import net.minecraft.block.Block;
import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.Tessellator;
import net.minecraft.world.IBlockAccess; import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraftforge.client.model.obj.WavefrontObject;
import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.common.util.ForgeDirection;
public class RailStandardCurveWide9 extends RailStandardCurveBase { public class RailStandardCurveWide9 extends RailStandardCurveBase {
@ -129,7 +129,7 @@ public class RailStandardCurveWide9 extends RailStandardCurveBase {
GL11.glRotated(60, 1, 0, 0); GL11.glRotated(60, 1, 0, 0);
GL11.glTranslated(4, 0, 4); GL11.glTranslated(4, 0, 4);
tessellator.startDrawingQuads(); tessellator.startDrawingQuads();
ObjUtil.renderWithIcon((WavefrontObject) ResourceManager.rail_standard_curve_wide9, block.getIcon(1, 0), tessellator, 0, false); ObjUtil.renderWithIcon((HFRWavefrontObject) ResourceManager.rail_standard_curve_wide9, block.getIcon(1, 0), tessellator, 0, false);
tessellator.draw(); tessellator.draw();
} }
@ -142,7 +142,7 @@ public class RailStandardCurveWide9 extends RailStandardCurveBase {
if(meta == 12) rotation = 180F / 180F * (float) Math.PI; if(meta == 12) rotation = 180F / 180F * (float) Math.PI;
if(meta == 14) rotation = 270F / 180F * (float) Math.PI; if(meta == 14) rotation = 270F / 180F * (float) Math.PI;
tessellator.addTranslation(x + 0.5F, y, z + 0.5F); tessellator.addTranslation(x + 0.5F, y, z + 0.5F);
ObjUtil.renderWithIcon((WavefrontObject) ResourceManager.rail_standard_curve_wide9, block.getIcon(1, 0), tessellator, rotation, true); ObjUtil.renderWithIcon((HFRWavefrontObject) ResourceManager.rail_standard_curve_wide9, block.getIcon(1, 0), tessellator, rotation, true);
tessellator.addTranslation(-x - 0.5F, -y, -z - 0.5F); tessellator.addTranslation(-x - 0.5F, -y, -z - 0.5F);
} }
} }

View File

@ -6,6 +6,7 @@ import com.hbm.blocks.BlockDummyable;
import com.hbm.handler.MultiblockHandlerXR; import com.hbm.handler.MultiblockHandlerXR;
import com.hbm.lib.Library; import com.hbm.lib.Library;
import com.hbm.main.ResourceManager; import com.hbm.main.ResourceManager;
import com.hbm.render.loader.HFRWavefrontObject;
import com.hbm.render.util.ObjUtil; import com.hbm.render.util.ObjUtil;
import com.hbm.util.fauxpointtwelve.BlockPos; import com.hbm.util.fauxpointtwelve.BlockPos;
@ -20,7 +21,6 @@ import net.minecraft.util.MathHelper;
import net.minecraft.util.Vec3; import net.minecraft.util.Vec3;
import net.minecraft.world.IBlockAccess; import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraftforge.client.model.obj.WavefrontObject;
import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.common.util.ForgeDirection;
public class RailStandardRamp extends BlockDummyable implements IRailNTM, IRenderBlock { public class RailStandardRamp extends BlockDummyable implements IRailNTM, IRenderBlock {
@ -150,7 +150,7 @@ public class RailStandardRamp extends BlockDummyable implements IRailNTM, IRende
GL11.glRotated(90, 0, 1, 0); GL11.glRotated(90, 0, 1, 0);
GL11.glScaled(0.3, 0.3, 0.3); GL11.glScaled(0.3, 0.3, 0.3);
tessellator.startDrawingQuads(); tessellator.startDrawingQuads();
ObjUtil.renderWithIcon((WavefrontObject) ResourceManager.rail_standard_ramp, block.getIcon(1, 0), tessellator, 0, false); ObjUtil.renderWithIcon((HFRWavefrontObject) ResourceManager.rail_standard_ramp, block.getIcon(1, 0), tessellator, 0, false);
tessellator.draw(); tessellator.draw();
} }
@ -167,7 +167,7 @@ public class RailStandardRamp extends BlockDummyable implements IRailNTM, IRende
if(meta == 14) tessellator.addTranslation(0F, 0F, -0.5F); if(meta == 14) tessellator.addTranslation(0F, 0F, -0.5F);
if(meta == 15) tessellator.addTranslation(0F, 0F, 0.5F); if(meta == 15) tessellator.addTranslation(0F, 0F, 0.5F);
tessellator.addTranslation(x + 0.5F, y, z + 0.5F); tessellator.addTranslation(x + 0.5F, y, z + 0.5F);
ObjUtil.renderWithIcon((WavefrontObject) ResourceManager.rail_standard_ramp, block.getIcon(1, 0), tessellator, rotation, true); ObjUtil.renderWithIcon((HFRWavefrontObject) ResourceManager.rail_standard_ramp, block.getIcon(1, 0), tessellator, rotation, true);
tessellator.addTranslation(-x - 0.5F, -y, -z - 0.5F); tessellator.addTranslation(-x - 0.5F, -y, -z - 0.5F);
if(meta == 12) tessellator.addTranslation(-0.5F, 0F, 0F); if(meta == 12) tessellator.addTranslation(-0.5F, 0F, 0F);
if(meta == 13) tessellator.addTranslation(0.5F, 0F, 0F); if(meta == 13) tessellator.addTranslation(0.5F, 0F, 0F);

View File

@ -5,6 +5,7 @@ import org.lwjgl.opengl.GL11;
import com.hbm.blocks.BlockDummyable; import com.hbm.blocks.BlockDummyable;
import com.hbm.lib.Library; import com.hbm.lib.Library;
import com.hbm.main.ResourceManager; import com.hbm.main.ResourceManager;
import com.hbm.render.loader.HFRWavefrontObject;
import com.hbm.render.util.ObjUtil; import com.hbm.render.util.ObjUtil;
import com.hbm.util.fauxpointtwelve.BlockPos; import com.hbm.util.fauxpointtwelve.BlockPos;
@ -19,7 +20,6 @@ import net.minecraft.util.MathHelper;
import net.minecraft.util.Vec3; import net.minecraft.util.Vec3;
import net.minecraft.world.IBlockAccess; import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraftforge.client.model.obj.WavefrontObject;
import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.common.util.ForgeDirection;
public class RailStandardStraight extends BlockDummyable implements IRailNTM, IRenderBlock { public class RailStandardStraight extends BlockDummyable implements IRailNTM, IRenderBlock {
@ -131,7 +131,7 @@ public class RailStandardStraight extends BlockDummyable implements IRailNTM, IR
GL11.glRotated(90, 0, 1, 0); GL11.glRotated(90, 0, 1, 0);
GL11.glScaled(0.3, 0.3, 0.3); GL11.glScaled(0.3, 0.3, 0.3);
tessellator.startDrawingQuads(); tessellator.startDrawingQuads();
ObjUtil.renderWithIcon((WavefrontObject) ResourceManager.rail_standard_straight, block.getIcon(1, 0), tessellator, 0, false); ObjUtil.renderWithIcon((HFRWavefrontObject) ResourceManager.rail_standard_straight, block.getIcon(1, 0), tessellator, 0, false);
tessellator.draw(); tessellator.draw();
} }
@ -146,7 +146,7 @@ public class RailStandardStraight extends BlockDummyable implements IRailNTM, IR
if(meta == 14) tessellator.addTranslation(0F, 0F, -0.5F); if(meta == 14) tessellator.addTranslation(0F, 0F, -0.5F);
if(meta == 15) tessellator.addTranslation(0F, 0F, 0.5F); if(meta == 15) tessellator.addTranslation(0F, 0F, 0.5F);
tessellator.addTranslation(x + 0.5F, y, z + 0.5F); tessellator.addTranslation(x + 0.5F, y, z + 0.5F);
ObjUtil.renderWithIcon((WavefrontObject) ResourceManager.rail_standard_straight, block.getIcon(1, 0), tessellator, rotation, true); ObjUtil.renderWithIcon((HFRWavefrontObject) ResourceManager.rail_standard_straight, block.getIcon(1, 0), tessellator, rotation, true);
tessellator.addTranslation(-x - 0.5F, -y, -z - 0.5F); tessellator.addTranslation(-x - 0.5F, -y, -z - 0.5F);
if(meta == 12) tessellator.addTranslation(-0.5F, 0F, 0F); if(meta == 12) tessellator.addTranslation(-0.5F, 0F, 0F);
if(meta == 13) tessellator.addTranslation(0.5F, 0F, 0F); if(meta == 13) tessellator.addTranslation(0.5F, 0F, 0F);

View File

@ -5,6 +5,7 @@ import org.lwjgl.opengl.GL11;
import com.hbm.blocks.BlockDummyable; import com.hbm.blocks.BlockDummyable;
import com.hbm.lib.Library; import com.hbm.lib.Library;
import com.hbm.main.ResourceManager; import com.hbm.main.ResourceManager;
import com.hbm.render.loader.HFRWavefrontObject;
import com.hbm.render.util.ObjUtil; import com.hbm.render.util.ObjUtil;
import com.hbm.util.fauxpointtwelve.BlockPos; import com.hbm.util.fauxpointtwelve.BlockPos;
@ -19,7 +20,6 @@ import net.minecraft.util.MathHelper;
import net.minecraft.util.Vec3; import net.minecraft.util.Vec3;
import net.minecraft.world.IBlockAccess; import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraftforge.client.model.obj.WavefrontObject;
import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.common.util.ForgeDirection;
public class RailStandardStraightShort extends BlockDummyable implements IRailNTM, IRenderBlock { public class RailStandardStraightShort extends BlockDummyable implements IRailNTM, IRenderBlock {
@ -127,7 +127,7 @@ public class RailStandardStraightShort extends BlockDummyable implements IRailNT
GL11.glRotated(90, 0, 1, 0); GL11.glRotated(90, 0, 1, 0);
GL11.glScaled(0.7, 0.7, 0.7); GL11.glScaled(0.7, 0.7, 0.7);
tessellator.startDrawingQuads(); tessellator.startDrawingQuads();
ObjUtil.renderWithIcon((WavefrontObject) ResourceManager.rail_standard_straight_short, block.getIcon(1, 0), tessellator, 0, false); ObjUtil.renderWithIcon((HFRWavefrontObject) ResourceManager.rail_standard_straight_short, block.getIcon(1, 0), tessellator, 0, false);
tessellator.draw(); tessellator.draw();
} }
@ -142,7 +142,7 @@ public class RailStandardStraightShort extends BlockDummyable implements IRailNT
if(meta == 14) tessellator.addTranslation(0F, 0F, -0.5F); if(meta == 14) tessellator.addTranslation(0F, 0F, -0.5F);
if(meta == 15) tessellator.addTranslation(0F, 0F, 0.5F); if(meta == 15) tessellator.addTranslation(0F, 0F, 0.5F);
tessellator.addTranslation(x + 0.5F, y, z + 0.5F); tessellator.addTranslation(x + 0.5F, y, z + 0.5F);
ObjUtil.renderWithIcon((WavefrontObject) ResourceManager.rail_standard_straight_short, block.getIcon(1, 0), tessellator, rotation, true); ObjUtil.renderWithIcon((HFRWavefrontObject) ResourceManager.rail_standard_straight_short, block.getIcon(1, 0), tessellator, rotation, true);
tessellator.addTranslation(-x - 0.5F, -y, -z - 0.5F); tessellator.addTranslation(-x - 0.5F, -y, -z - 0.5F);
if(meta == 12) tessellator.addTranslation(-0.5F, 0F, 0F); if(meta == 12) tessellator.addTranslation(-0.5F, 0F, 0F);
if(meta == 13) tessellator.addTranslation(0.5F, 0F, 0F); if(meta == 13) tessellator.addTranslation(0.5F, 0F, 0F);

View File

@ -7,6 +7,7 @@ import com.hbm.items.ModItems;
import com.hbm.lib.Library; import com.hbm.lib.Library;
import com.hbm.lib.RefStrings; import com.hbm.lib.RefStrings;
import com.hbm.main.ResourceManager; import com.hbm.main.ResourceManager;
import com.hbm.render.loader.HFRWavefrontObject;
import com.hbm.render.util.ObjUtil; import com.hbm.render.util.ObjUtil;
import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.Side;
@ -25,7 +26,6 @@ import net.minecraft.util.IIcon;
import net.minecraft.util.Vec3; import net.minecraft.util.Vec3;
import net.minecraft.world.IBlockAccess; import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraftforge.client.model.obj.WavefrontObject;
import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.common.util.ForgeDirection;
public class RailStandardSwitch extends BlockRailWaypointSystem implements IRenderBlock { public class RailStandardSwitch extends BlockRailWaypointSystem implements IRenderBlock {
@ -205,7 +205,7 @@ public class RailStandardSwitch extends BlockRailWaypointSystem implements IRend
GL11.glRotated(90, 0, 1, 0); GL11.glRotated(90, 0, 1, 0);
GL11.glScaled(0.1, 0.1, 0.1); GL11.glScaled(0.1, 0.1, 0.1);
tessellator.startDrawingQuads(); tessellator.startDrawingQuads();
ObjUtil.renderPartWithIcon((WavefrontObject) ResourceManager.rail_standard_switch, "Rail", this.blockIcon, tessellator, 0, false); ObjUtil.renderPartWithIcon((HFRWavefrontObject) ResourceManager.rail_standard_switch, "Rail", this.blockIcon, tessellator, 0, false);
tessellator.draw(); tessellator.draw();
} }
@ -222,13 +222,13 @@ public class RailStandardSwitch extends BlockRailWaypointSystem implements IRend
if(meta == 14) tessellator.addTranslation(0F, 0F, -0.5F); if(meta == 14) tessellator.addTranslation(0F, 0F, -0.5F);
if(meta == 15) tessellator.addTranslation(0F, 0F, 0.5F); if(meta == 15) tessellator.addTranslation(0F, 0F, 0.5F);
tessellator.addTranslation(x + 0.5F, y, z + 0.5F); tessellator.addTranslation(x + 0.5F, y, z + 0.5F);
ObjUtil.renderPartWithIcon((WavefrontObject) ResourceManager.rail_standard_switch, "Rail", this.blockIcon, tessellator, rotation, true); ObjUtil.renderPartWithIcon((HFRWavefrontObject) ResourceManager.rail_standard_switch, "Rail", this.blockIcon, tessellator, rotation, true);
TileEntity tile = world.getTileEntity(x, y, z); TileEntity tile = world.getTileEntity(x, y, z);
if(tile instanceof TileEntityRailSwitch) { if(tile instanceof TileEntityRailSwitch) {
TileEntityRailSwitch sw = (TileEntityRailSwitch) tile; TileEntityRailSwitch sw = (TileEntityRailSwitch) tile;
ObjUtil.renderPartWithIcon((WavefrontObject) ResourceManager.rail_standard_switch, sw.isSwitched ? "SignTurn" : "SignStraight", this.iconSign, tessellator, rotation, true); ObjUtil.renderPartWithIcon((HFRWavefrontObject) ResourceManager.rail_standard_switch, sw.isSwitched ? "SignTurn" : "SignStraight", this.iconSign, tessellator, rotation, true);
} }
tessellator.addTranslation(-x - 0.5F, -y, -z - 0.5F); tessellator.addTranslation(-x - 0.5F, -y, -z - 0.5F);

View File

@ -8,6 +8,7 @@ import com.hbm.items.ModItems;
import com.hbm.lib.Library; import com.hbm.lib.Library;
import com.hbm.lib.RefStrings; import com.hbm.lib.RefStrings;
import com.hbm.main.ResourceManager; import com.hbm.main.ResourceManager;
import com.hbm.render.loader.HFRWavefrontObject;
import com.hbm.render.util.ObjUtil; import com.hbm.render.util.ObjUtil;
import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.Side;
@ -22,7 +23,6 @@ import net.minecraft.util.IIcon;
import net.minecraft.util.Vec3; import net.minecraft.util.Vec3;
import net.minecraft.world.IBlockAccess; import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraftforge.client.model.obj.WavefrontObject;
import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.common.util.ForgeDirection;
public class RailStandardSwitchFlipped extends BlockRailWaypointSystem implements IRenderBlock { public class RailStandardSwitchFlipped extends BlockRailWaypointSystem implements IRenderBlock {
@ -202,7 +202,7 @@ public class RailStandardSwitchFlipped extends BlockRailWaypointSystem implement
GL11.glRotated(90, 0, 1, 0); GL11.glRotated(90, 0, 1, 0);
GL11.glScaled(0.1, 0.1, 0.1); GL11.glScaled(0.1, 0.1, 0.1);
tessellator.startDrawingQuads(); tessellator.startDrawingQuads();
ObjUtil.renderPartWithIcon((WavefrontObject) ResourceManager.rail_standard_switch_flipped, "Rail", this.blockIcon, tessellator, 0, false); ObjUtil.renderPartWithIcon((HFRWavefrontObject) ResourceManager.rail_standard_switch_flipped, "Rail", this.blockIcon, tessellator, 0, false);
tessellator.draw(); tessellator.draw();
} }
@ -219,13 +219,13 @@ public class RailStandardSwitchFlipped extends BlockRailWaypointSystem implement
if(meta == 14) tessellator.addTranslation(0F, 0F, -0.5F); if(meta == 14) tessellator.addTranslation(0F, 0F, -0.5F);
if(meta == 15) tessellator.addTranslation(0F, 0F, 0.5F); if(meta == 15) tessellator.addTranslation(0F, 0F, 0.5F);
tessellator.addTranslation(x + 0.5F, y, z + 0.5F); tessellator.addTranslation(x + 0.5F, y, z + 0.5F);
ObjUtil.renderPartWithIcon((WavefrontObject) ResourceManager.rail_standard_switch_flipped, "Rail", this.blockIcon, tessellator, rotation, true); ObjUtil.renderPartWithIcon((HFRWavefrontObject) ResourceManager.rail_standard_switch_flipped, "Rail", this.blockIcon, tessellator, rotation, true);
TileEntity tile = world.getTileEntity(x, y, z); TileEntity tile = world.getTileEntity(x, y, z);
if(tile instanceof TileEntityRailSwitch) { if(tile instanceof TileEntityRailSwitch) {
TileEntityRailSwitch sw = (TileEntityRailSwitch) tile; TileEntityRailSwitch sw = (TileEntityRailSwitch) tile;
ObjUtil.renderPartWithIcon((WavefrontObject) ResourceManager.rail_standard_switch_flipped, sw.isSwitched ? "SignTurn" : "SignStraight", this.iconSign, tessellator, rotation, true); ObjUtil.renderPartWithIcon((HFRWavefrontObject) ResourceManager.rail_standard_switch_flipped, sw.isSwitched ? "SignTurn" : "SignStraight", this.iconSign, tessellator, rotation, true);
} }
tessellator.addTranslation(-x - 0.5F, -y, -z - 0.5F); tessellator.addTranslation(-x - 0.5F, -y, -z - 0.5F);

View File

@ -263,7 +263,6 @@ public abstract class SerializableRecipe {
int stacksize = array.size() > 2 ? array.get(2).getAsInt() : 1; int stacksize = array.size() > 2 ? array.get(2).getAsInt() : 1;
if("nbt".equals(type)) { if("nbt".equals(type)) {
Item item = (Item) Item.itemRegistry.getObject(array.get(1).getAsString()); Item item = (Item) Item.itemRegistry.getObject(array.get(1).getAsString());
int meta = array.size() > 3 ? array.get(3).getAsInt() : 0;
NBTBase nbt = array.size() > 4 ? JsonToNBT.func_150315_a(array.get(4).getAsString()) : null; NBTBase nbt = array.size() > 4 ? JsonToNBT.func_150315_a(array.get(4).getAsString()) : null;
return new NBTStack(item, stacksize, 0).withNBT(nbt instanceof NBTTagCompound ? (NBTTagCompound) nbt : null); return new NBTStack(item, stacksize, 0).withNBT(nbt instanceof NBTTagCompound ? (NBTTagCompound) nbt : null);
} }

View File

@ -7,6 +7,7 @@ import com.hbm.lib.RefStrings;
import com.hbm.render.anim.AnimationLoader; import com.hbm.render.anim.AnimationLoader;
import com.hbm.render.anim.BusAnimation; import com.hbm.render.anim.BusAnimation;
import com.hbm.render.loader.HFRWavefrontObject; import com.hbm.render.loader.HFRWavefrontObject;
import com.hbm.render.loader.HFRWavefrontObjectVBO;
import com.hbm.render.loader.IModelCustomNamed; import com.hbm.render.loader.IModelCustomNamed;
import net.minecraft.util.ResourceLocation; import net.minecraft.util.ResourceLocation;
import net.minecraftforge.client.model.AdvancedModelLoader; import net.minecraftforge.client.model.AdvancedModelLoader;
@ -34,10 +35,10 @@ public class ResourceManager {
public static final IModelCustom turret_howard_damaged = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/turrets/turret_howard_damaged.obj")).asVBO(); public static final IModelCustom turret_howard_damaged = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/turrets/turret_howard_damaged.obj")).asVBO();
//Heaters //Heaters
public static final IModelCustom heater_firebox = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/machines/firebox.obj"), false).asVBO(); public static final IModelCustom heater_firebox = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/machines/firebox.obj")).noSmooth().asVBO();
public static final IModelCustom heater_oven = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/machines/heating_oven.obj"), false).asVBO(); public static final IModelCustom heater_oven = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/machines/heating_oven.obj")).noSmooth().asVBO();
public static final IModelCustom heater_oilburner = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/machines/oilburner.obj")).asVBO(); public static final IModelCustom heater_oilburner = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/machines/oilburner.obj")).asVBO();
public static final IModelCustom heater_electric = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/machines/electric_heater.obj"), false).asVBO(); public static final IModelCustom heater_electric = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/machines/electric_heater.obj")).noSmooth().asVBO();
public static final IModelCustom heater_heatex = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/machines/heatex.obj")).asVBO(); public static final IModelCustom heater_heatex = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/machines/heatex.obj")).asVBO();
//Heat Engines //Heat Engines
@ -152,10 +153,10 @@ public class ResourceManager {
public static final IModelCustom mixer = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/machines/mixer.obj")).asVBO(); public static final IModelCustom mixer = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/machines/mixer.obj")).asVBO();
//Arc Welder //Arc Welder
public static final IModelCustom arc_welder = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/machines/arc_welder.obj"), false).asVBO(); public static final IModelCustom arc_welder = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/machines/arc_welder.obj")).noSmooth().asVBO();
//Solderer //Solderer
public static final IModelCustom soldering_station = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/machines/soldering_station.obj"), false).asVBO(); public static final IModelCustom soldering_station = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/machines/soldering_station.obj")).noSmooth().asVBO();
//Arc Furnace //Arc Furnace
public static final IModelCustom arc_furnace = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/machines/arc_furnace.obj")).asVBO(); public static final IModelCustom arc_furnace = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/machines/arc_furnace.obj")).asVBO();
@ -173,7 +174,7 @@ public class ResourceManager {
public static final IModelCustom microwave = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/machines/microwave.obj")); public static final IModelCustom microwave = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/machines/microwave.obj"));
//Big Man Johnson //Big Man Johnson
public static final IModelCustom autosaw = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/machines/autosaw.obj"), false).asVBO(); public static final IModelCustom autosaw = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/machines/autosaw.obj")).noSmooth().asVBO();
//Mining Drill //Mining Drill
public static final IModelCustom mining_drill = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/machines/mining_drill.obj")).asVBO(); public static final IModelCustom mining_drill = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/machines/mining_drill.obj")).asVBO();
@ -200,7 +201,7 @@ public class ResourceManager {
public static final IModelCustom exposure_chamber = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/machines/exposure_chamber.obj")).asVBO(); public static final IModelCustom exposure_chamber = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/machines/exposure_chamber.obj")).asVBO();
//RTG //RTG
public static final IModelCustom rtg = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/machines/rtg.obj")); public static final IModelCustom rtg = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/machines/rtg.obj")).noSmooth();
//Waste Drum //Waste Drum
public static final IModelCustom waste_drum = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/machines/drum.obj")); public static final IModelCustom waste_drum = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/machines/drum.obj"));
@ -265,10 +266,10 @@ public class ResourceManager {
public static final IModelCustom fensu = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/machines/fensu.obj")).asVBO(); public static final IModelCustom fensu = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/machines/fensu.obj")).asVBO();
//Radar //Radar
public static final IModelCustom radar_body = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/radar_base.obj"), false).asVBO(); public static final IModelCustom radar_body = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/radar_base.obj")).noSmooth().asVBO();
public static final IModelCustom radar = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/machines/radar.obj"), false).asVBO(); public static final IModelCustom radar = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/machines/radar.obj")).noSmooth().asVBO();
public static final IModelCustom radar_large = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/machines/radar_large.obj"), false).asVBO(); public static final IModelCustom radar_large = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/machines/radar_large.obj")).noSmooth().asVBO();
public static final IModelCustom radar_screen = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/machines/radar_screen.obj"), false).asVBO(); public static final IModelCustom radar_screen = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/machines/radar_screen.obj")).noSmooth().asVBO();
//Forcefield //Forcefield
public static final IModelCustom forcefield_top = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/forcefield_top.obj")); public static final IModelCustom forcefield_top = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/forcefield_top.obj"));
@ -299,7 +300,7 @@ public class ResourceManager {
//Solar Tower //Solar Tower
public static final IModelCustom solar_boiler = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/machines/solar_boiler.obj")).asVBO(); public static final IModelCustom solar_boiler = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/machines/solar_boiler.obj")).asVBO();
public static final IModelCustom solar_mirror = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/machines/solar_mirror.obj")); public static final IModelCustom solar_mirror = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/machines/solar_mirror.obj")).noSmooth();
//Drain //Drain
public static final IModelCustom drain = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/machines/drain.obj")); public static final IModelCustom drain = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/machines/drain.obj"));
@ -363,13 +364,13 @@ public class ResourceManager {
public static IModelCustomNamed silo_hatch_large = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/doors/silo_hatch_large.obj")).asVBO(); public static IModelCustomNamed silo_hatch_large = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/doors/silo_hatch_large.obj")).asVBO();
//Skeleton //Skeleton
public static final IModelCustom skeleton_holder = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/blocks/skeleton_holder.obj"),false).asVBO(); public static final IModelCustom skeleton_holder = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/blocks/skeleton_holder.obj")).noSmooth().asVBO();
//Lights //Lights
public static final IModelCustom lantern = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/trinkets/lantern.obj")); public static final IModelCustom lantern = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/trinkets/lantern.obj")).noSmooth();
public static final IModelCustom cage_lamp = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/lights/cage_lamp.obj")); public static final IModelCustom cage_lamp = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/lights/cage_lamp.obj")).noSmooth();
public static final IModelCustom fluorescent_lamp = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/lights/fluorescent_lamp.obj")); public static final IModelCustom fluorescent_lamp = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/lights/fluorescent_lamp.obj")).noSmooth();
public static final IModelCustom flood_lamp = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/lights/flood_lamp.obj")); public static final IModelCustom flood_lamp = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/lights/flood_lamp.obj")).noSmooth();
//Tesla Coil //Tesla Coil
public static final IModelCustom tesla = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/tesla.obj")); public static final IModelCustom tesla = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/tesla.obj"));
@ -882,7 +883,7 @@ public class ResourceManager {
public static final IModelCustom stopsign = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/weapons/stopsign.obj")); public static final IModelCustom stopsign = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/weapons/stopsign.obj"));
public static final IModelCustom gavel = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/weapons/gavel.obj")).asVBO(); public static final IModelCustom gavel = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/weapons/gavel.obj")).asVBO();
public static final IModelCustom crucible = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/weapons/crucible.obj")).asVBO(); public static final IModelCustom crucible = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/weapons/crucible.obj")).asVBO();
public static final IModelCustom chainsaw = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/weapons/chainsaw.obj"), false).asVBO(); public static final IModelCustom chainsaw = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/weapons/chainsaw.obj")).noSmooth().asVBO();
public static final IModelCustom boltgun = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/weapons/boltgun.obj")).asVBO(); public static final IModelCustom boltgun = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/weapons/boltgun.obj")).asVBO();
public static final IModelCustom bolter = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/weapons/bolter.obj")).asVBO(); public static final IModelCustom bolter = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/weapons/bolter.obj")).asVBO();
public static final IModelCustom detonator_laser = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/weapons/detonator_laser.obj")).asVBO(); public static final IModelCustom detonator_laser = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/weapons/detonator_laser.obj")).asVBO();
@ -965,7 +966,7 @@ public class ResourceManager {
public static final IModelCustom armor_wings = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/armor/murk.obj")).asVBO(); public static final IModelCustom armor_wings = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/armor/murk.obj")).asVBO();
public static final IModelCustom armor_axepack = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/armor/wings_pheo.obj")).asVBO(); public static final IModelCustom armor_axepack = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/armor/wings_pheo.obj")).asVBO();
public static final IModelCustom armor_tail = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/armor/tail_peep.obj")).asVBO(); public static final IModelCustom armor_tail = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/armor/tail_peep.obj")).asVBO();
public static final IModelCustom player_manly_af = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/armor/player_fem.obj"), false).asVBO(); public static final IModelCustom player_manly_af = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/armor/player_fem.obj")).noSmooth().asVBO();
public static final IModelCustom armor_envsuit = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/armor/envsuit.obj")).asVBO(); public static final IModelCustom armor_envsuit = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/armor/envsuit.obj")).asVBO();
public static final IModelCustom armor_taurun = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/armor/taurun.obj")).asVBO(); public static final IModelCustom armor_taurun = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/armor/taurun.obj")).asVBO();
public static final IModelCustom armor_trenchmaster = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/armor/trenchmaster.obj")).asVBO(); public static final IModelCustom armor_trenchmaster = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/armor/trenchmaster.obj")).asVBO();
@ -1203,7 +1204,7 @@ public class ResourceManager {
//Missiles //Missiles
public static final IModelCustom missileV2 = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/missile_v2.obj")).asVBO(); public static final IModelCustom missileV2 = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/missile_v2.obj")).asVBO();
public static final IModelCustom missileABM = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/missile_abm.obj")).asVBO(); public static final IModelCustom missileABM = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/missile_abm.obj")).asVBO();
public static final IModelCustom missileStealth = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/missile_stealth.obj"), false).asVBO(); public static final IModelCustom missileStealth = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/missile_stealth.obj")).noSmooth().asVBO();
public static final IModelCustom missileStrong = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/missile_strong.obj")).asVBO(); public static final IModelCustom missileStrong = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/missile_strong.obj")).asVBO();
public static final IModelCustom missileHuge = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/missile_huge.obj")).asVBO(); public static final IModelCustom missileHuge = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/missile_huge.obj")).asVBO();
public static final IModelCustom missileNuclear = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/missile_atlas.obj")).asVBO(); public static final IModelCustom missileNuclear = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/missile_atlas.obj")).asVBO();
@ -1213,12 +1214,12 @@ public class ResourceManager {
public static final IModelCustom soyuz = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/soyuz.obj")).asVBO(); public static final IModelCustom soyuz = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/soyuz.obj")).asVBO();
public static final IModelCustom soyuz_lander = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/soyuz_lander.obj")).asVBO(); public static final IModelCustom soyuz_lander = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/soyuz_lander.obj")).asVBO();
public static final IModelCustom soyuz_module = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/soyuz_module.obj")).asVBO(); public static final IModelCustom soyuz_module = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/soyuz_module.obj")).asVBO();
public static final IModelCustom soyuz_launcher_legs = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/launch_table/soyuz_launcher_legs.obj"), false).asVBO(); public static final IModelCustom soyuz_launcher_legs = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/launch_table/soyuz_launcher_legs.obj")).noSmooth().asVBO();
public static final IModelCustom soyuz_launcher_table = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/launch_table/soyuz_launcher_table.obj"), false).asVBO(); public static final IModelCustom soyuz_launcher_table = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/launch_table/soyuz_launcher_table.obj")).noSmooth().asVBO();
public static final IModelCustom soyuz_launcher_tower_base = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/launch_table/soyuz_launcher_tower_base.obj"), false).asVBO(); public static final IModelCustom soyuz_launcher_tower_base = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/launch_table/soyuz_launcher_tower_base.obj")).noSmooth().asVBO();
public static final IModelCustom soyuz_launcher_tower = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/launch_table/soyuz_launcher_tower.obj"), false).asVBO(); public static final IModelCustom soyuz_launcher_tower = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/launch_table/soyuz_launcher_tower.obj")).noSmooth().asVBO();
public static final IModelCustom soyuz_launcher_support_base = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/launch_table/soyuz_launcher_support_base.obj"), false).asVBO(); public static final IModelCustom soyuz_launcher_support_base = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/launch_table/soyuz_launcher_support_base.obj")).noSmooth().asVBO();
public static final IModelCustom soyuz_launcher_support = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/launch_table/soyuz_launcher_support.obj"), false).asVBO(); public static final IModelCustom soyuz_launcher_support = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/launch_table/soyuz_launcher_support.obj")).noSmooth().asVBO();
//Missile Parts //Missile Parts
public static final IModelCustom missile_pad = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/weapons/launch_pad_silo.obj")); public static final IModelCustom missile_pad = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/weapons/launch_pad_silo.obj"));
@ -1581,67 +1582,67 @@ public class ResourceManager {
public static final ResourceLocation delivery_drone_request_tex = new ResourceLocation(RefStrings.MODID, "textures/models/machines/drone_request.png"); public static final ResourceLocation delivery_drone_request_tex = new ResourceLocation(RefStrings.MODID, "textures/models/machines/drone_request.png");
//ISBRHs //ISBRHs
public static final IModelCustom scaffold = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/blocks/scaffold.obj")); public static final HFRWavefrontObject scaffold = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/blocks/scaffold.obj")).noSmooth();
public static final IModelCustom taperecorder = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/blocks/taperecorder.obj")); public static final HFRWavefrontObject taperecorder = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/blocks/taperecorder.obj")).noSmooth();
public static final IModelCustom beam = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/blocks/beam.obj")); public static final HFRWavefrontObject beam = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/blocks/beam.obj")).noSmooth();
public static final IModelCustom barrel = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/blocks/barrel.obj")); public static final HFRWavefrontObject barrel = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/blocks/barrel.obj")).noSmooth();
public static final IModelCustom pole = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/blocks/pole.obj")); public static final HFRWavefrontObject pole = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/blocks/pole.obj")).noSmooth();
public static final IModelCustom barbed_wire = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/blocks/barbed_wire.obj")); public static final HFRWavefrontObject barbed_wire = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/blocks/barbed_wire.obj")).noSmooth();
public static final IModelCustom spikes = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/blocks/spikes.obj")); public static final HFRWavefrontObject spikes = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/blocks/spikes.obj")).noSmooth();
public static final IModelCustom antenna_top = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/blocks/antenna_top.obj")); public static final HFRWavefrontObject antenna_top = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/blocks/antenna_top.obj")).noSmooth();
public static final IModelCustom conservecrate = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/blocks/conservecrate.obj")); public static final HFRWavefrontObject conservecrate = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/blocks/conservecrate.obj")).noSmooth();
public static final IModelCustom pipe = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/blocks/pipe.obj")); public static final HFRWavefrontObject pipe = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/blocks/pipe.obj")).noSmooth();
public static final IModelCustom pipe_rim = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/blocks/pipe_rim.obj")); public static final HFRWavefrontObject pipe_rim = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/blocks/pipe_rim.obj")).noSmooth();
public static final IModelCustom pipe_quad = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/blocks/pipe_quad.obj")); public static final HFRWavefrontObject pipe_quad = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/blocks/pipe_quad.obj")).noSmooth();
public static final IModelCustom pipe_frame = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/blocks/pipe_frame.obj")); public static final HFRWavefrontObject pipe_frame = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/blocks/pipe_frame.obj")).noSmooth();
public static final IModelCustom rtty = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/blocks/rtty.obj")); public static final HFRWavefrontObject rtty = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/blocks/rtty.obj")).noSmooth();
public static final IModelCustom crt = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/blocks/crt.obj")); public static final HFRWavefrontObject crt = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/blocks/crt.obj")).noSmooth();
public static final IModelCustom toaster = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/blocks/toaster.obj")); public static final HFRWavefrontObject toaster = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/blocks/toaster.obj")).noSmooth();
public static final IModelCustom deco_computer = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/blocks/puter.obj")); public static final IModelCustom deco_computer = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/blocks/puter.obj")).noSmooth();
// Some RBMK elements are loaded twice due to VBOs not supporting tessellation // Some RBMK elements are loaded twice due to VBOs not supporting tessellation
public static final IModelCustom rbmk_element = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/rbmk/rbmk_element.obj")); public static final HFRWavefrontObject rbmk_element = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/rbmk/rbmk_element.obj"), true).noSmooth();
public static final IModelCustom rbmk_element_vbo = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/rbmk/rbmk_element.obj")).asVBO(); public static final HFRWavefrontObject rbmk_element_rods = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/rbmk/rbmk_element_rods.obj")).noSmooth();
public static final IModelCustom rbmk_reflector = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/rbmk/rbmk_reflector.obj")); public static final HFRWavefrontObjectVBO rbmk_element_rods_vbo = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/rbmk/rbmk_element_rods.obj")).noSmooth().asVBO();
public static final IModelCustom rbmk_rods = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/rbmk/rbmk_rods.obj")); public static final HFRWavefrontObject rbmk_rods = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/rbmk/rbmk_rods.obj")).noSmooth();
public static final IModelCustom rbmk_rods_vbo = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/rbmk/rbmk_rods.obj")).asVBO(); public static final HFRWavefrontObjectVBO rbmk_rods_vbo = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/rbmk/rbmk_rods.obj")).noSmooth().asVBO();
public static final IModelCustom rbmk_crane_console = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/rbmk/crane_console.obj")).asVBO(); public static final HFRWavefrontObjectVBO rbmk_crane_console = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/rbmk/crane_console.obj")).asVBO();
public static final IModelCustom rbmk_crane = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/rbmk/crane.obj")).asVBO(); public static final HFRWavefrontObjectVBO rbmk_crane = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/rbmk/crane.obj")).asVBO();
public static final IModelCustom rbmk_autoloader = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/rbmk/autoloader.obj")).asVBO(); public static final HFRWavefrontObjectVBO rbmk_autoloader = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/rbmk/autoloader.obj")).asVBO();
public static final IModelCustom rbmk_console = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/rbmk/rbmk_console.obj")).asVBO(); public static final HFRWavefrontObjectVBO rbmk_console = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/rbmk/rbmk_console.obj")).asVBO();
public static final IModelCustom rbmk_debris = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/rbmk/debris.obj")); public static final HFRWavefrontObject rbmk_debris = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/rbmk/debris.obj")).noSmooth();
public static final ResourceLocation rbmk_crane_console_tex = new ResourceLocation(RefStrings.MODID, "textures/models/machines/crane_console.png"); public static final ResourceLocation rbmk_crane_console_tex = new ResourceLocation(RefStrings.MODID, "textures/models/machines/crane_console.png");
public static final ResourceLocation rbmk_crane_tex = new ResourceLocation(RefStrings.MODID, "textures/models/machines/rbmk_crane.png"); public static final ResourceLocation rbmk_crane_tex = new ResourceLocation(RefStrings.MODID, "textures/models/machines/rbmk_crane.png");
public static final ResourceLocation rbmk_autoloader_tex = new ResourceLocation(RefStrings.MODID, "textures/models/machines/rbmk_autoloader.png"); public static final ResourceLocation rbmk_autoloader_tex = new ResourceLocation(RefStrings.MODID, "textures/models/machines/rbmk_autoloader.png");
public static final ResourceLocation rbmk_console_tex = new ResourceLocation(RefStrings.MODID, "textures/models/machines/rbmk_control.png"); public static final ResourceLocation rbmk_console_tex = new ResourceLocation(RefStrings.MODID, "textures/models/machines/rbmk_control.png");
public static final IModelCustom hev_battery = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/blocks/battery.obj")); public static final HFRWavefrontObject hev_battery = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/blocks/battery.obj")).noSmooth();
public static final IModelCustom anvil = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/blocks/anvil.obj")); public static final HFRWavefrontObject anvil = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/blocks/anvil.obj")).noSmooth();
public static final IModelCustom crystal_power = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/blocks/crystals_power.obj")); public static final HFRWavefrontObject crystal_power = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/blocks/crystals_power.obj")).noSmooth();
public static final IModelCustom crystal_energy = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/blocks/crystals_energy.obj")); public static final HFRWavefrontObject crystal_energy = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/blocks/crystals_energy.obj")).noSmooth();
public static final IModelCustom crystal_robust = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/blocks/crystals_robust.obj")); public static final HFRWavefrontObject crystal_robust = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/blocks/crystals_robust.obj")).noSmooth();
public static final IModelCustom crystal_trixite = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/blocks/crystals_trixite.obj")); public static final HFRWavefrontObject crystal_trixite = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/blocks/crystals_trixite.obj")).noSmooth();
public static final IModelCustom cable_neo = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/blocks/cable_neo.obj")); public static final HFRWavefrontObject cable_neo = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/blocks/cable_neo.obj")).noSmooth();
public static final IModelCustom pipe_neo = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/blocks/pipe_neo.obj")); public static final HFRWavefrontObject pipe_neo = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/blocks/pipe_neo.obj"));
public static final IModelCustom difurnace_extension = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/blocks/difurnace_extension.obj")); public static final HFRWavefrontObject difurnace_extension = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/blocks/difurnace_extension.obj")).noSmooth();
public static final IModelCustom splitter = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/blocks/splitter.obj")); public static final HFRWavefrontObject splitter = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/blocks/splitter.obj")).noSmooth();
public static final IModelCustom crane_buffer = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/blocks/crane_buffer.obj")); public static final HFRWavefrontObject crane_buffer = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/blocks/crane_buffer.obj")).noSmooth();
public static final IModelCustom rail_narrow_straight = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/blocks/rail_narrow.obj")); public static final HFRWavefrontObject rail_narrow_straight = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/blocks/rail_narrow.obj")).noSmooth();
public static final IModelCustom rail_narrow_curve = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/blocks/rail_narrow_bend.obj")); public static final HFRWavefrontObject rail_narrow_curve = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/blocks/rail_narrow_bend.obj")).noSmooth();
public static final IModelCustom rail_standard_straight = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/blocks/rail_standard.obj")); public static final HFRWavefrontObject rail_standard_straight = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/blocks/rail_standard.obj")).noSmooth();
public static final IModelCustom rail_standard_straight_short = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/blocks/rail_standard_short.obj")); public static final HFRWavefrontObject rail_standard_straight_short = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/blocks/rail_standard_short.obj")).noSmooth();
public static final IModelCustom rail_standard_curve = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/blocks/rail_standard_bend.obj")); public static final HFRWavefrontObject rail_standard_curve = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/blocks/rail_standard_bend.obj")).noSmooth();
public static final IModelCustom rail_standard_curve_wide7 = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/blocks/rail_standard_bend_wide.obj")); public static final HFRWavefrontObject rail_standard_curve_wide7 = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/blocks/rail_standard_bend_wide.obj")).noSmooth();
public static final IModelCustom rail_standard_curve_wide9 = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/blocks/rail_standard_bend_wide9.obj")); public static final HFRWavefrontObject rail_standard_curve_wide9 = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/blocks/rail_standard_bend_wide9.obj")).noSmooth();
public static final IModelCustom rail_standard_ramp = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/blocks/rail_standard_ramp.obj")); public static final HFRWavefrontObject rail_standard_ramp = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/blocks/rail_standard_ramp.obj")).noSmooth();
public static final IModelCustom rail_standard_buffer = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/blocks/rail_standard_buffer.obj")); public static final HFRWavefrontObject rail_standard_buffer = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/blocks/rail_standard_buffer.obj")).noSmooth();
public static final IModelCustom rail_standard_switch = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/blocks/rail_standard_switch.obj")); public static final HFRWavefrontObject rail_standard_switch = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/blocks/rail_standard_switch.obj")).noSmooth();
public static final IModelCustom rail_standard_switch_flipped = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/blocks/rail_standard_switch_flipped.obj")); public static final HFRWavefrontObject rail_standard_switch_flipped = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/blocks/rail_standard_switch_flipped.obj")).noSmooth();
public static final IModelCustom capacitor = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/blocks/capacitor.obj")); public static final HFRWavefrontObject capacitor = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/blocks/capacitor.obj")).noSmooth();
public static final IModelCustom funnel = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/blocks/funnel.obj")); public static final HFRWavefrontObject funnel = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/blocks/funnel.obj")).noSmooth();
public static final IModelCustom charge_dynamite = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/blocks/charge_dynamite.obj")); public static final IModelCustom charge_dynamite = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/blocks/charge_dynamite.obj")).noSmooth();
public static final IModelCustom charge_c4 = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/blocks/charge_c4.obj")); public static final IModelCustom charge_c4 = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/blocks/charge_c4.obj")).noSmooth();
//RBMK DEBRIS //RBMK DEBRIS
public static final IModelCustom deb_blank = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/projectiles/deb_blank.obj")); public static final IModelCustom deb_blank = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/projectiles/deb_blank.obj"));

View File

@ -4,6 +4,7 @@ import org.lwjgl.opengl.GL11;
import com.hbm.blocks.generic.DecoPoleTop; import com.hbm.blocks.generic.DecoPoleTop;
import com.hbm.main.ResourceManager; import com.hbm.main.ResourceManager;
import com.hbm.render.loader.HFRWavefrontObject;
import com.hbm.render.util.ObjUtil; import com.hbm.render.util.ObjUtil;
import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
@ -12,7 +13,6 @@ import net.minecraft.client.renderer.RenderBlocks;
import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.Tessellator;
import net.minecraft.util.IIcon; import net.minecraft.util.IIcon;
import net.minecraft.world.IBlockAccess; import net.minecraft.world.IBlockAccess;
import net.minecraftforge.client.model.obj.WavefrontObject;
public class RenderAntennaTop implements ISimpleBlockRenderingHandler { public class RenderAntennaTop implements ISimpleBlockRenderingHandler {
@ -24,15 +24,14 @@ public class RenderAntennaTop implements ISimpleBlockRenderingHandler {
IIcon iicon = block.getIcon(0, 0); IIcon iicon = block.getIcon(0, 0);
tessellator.setColorOpaque_F(1, 1, 1); tessellator.setColorOpaque_F(1, 1, 1);
if (renderer.hasOverrideBlockTexture()) if(renderer.hasOverrideBlockTexture()) {
{
iicon = renderer.overrideBlockTexture; iicon = renderer.overrideBlockTexture;
} }
GL11.glTranslated(0, -0.5, 0); GL11.glTranslated(0, -0.5, 0);
GL11.glScalef(0.75F, 0.75F, 0.75F); GL11.glScalef(0.75F, 0.75F, 0.75F);
tessellator.startDrawingQuads(); tessellator.startDrawingQuads();
ObjUtil.renderWithIcon((WavefrontObject) ResourceManager.antenna_top, iicon, tessellator, 0, false); ObjUtil.renderWithIcon((HFRWavefrontObject) ResourceManager.antenna_top, iicon, tessellator, 0, false);
tessellator.draw(); tessellator.draw();
GL11.glPopMatrix(); GL11.glPopMatrix();
@ -47,13 +46,12 @@ public class RenderAntennaTop implements ISimpleBlockRenderingHandler {
tessellator.setBrightness(block.getMixedBrightnessForBlock(world, x, y, z)); tessellator.setBrightness(block.getMixedBrightnessForBlock(world, x, y, z));
tessellator.setColorOpaque_F(1, 1, 1); tessellator.setColorOpaque_F(1, 1, 1);
if (renderer.hasOverrideBlockTexture()) if(renderer.hasOverrideBlockTexture()) {
{
iicon = renderer.overrideBlockTexture; iicon = renderer.overrideBlockTexture;
} }
tessellator.addTranslation(x + 0.5F, y, z + 0.5F); tessellator.addTranslation(x + 0.5F, y, z + 0.5F);
ObjUtil.renderWithIcon((WavefrontObject) ResourceManager.antenna_top, iicon, tessellator, 0, true); ObjUtil.renderWithIcon((HFRWavefrontObject) ResourceManager.antenna_top, iicon, tessellator, 0, true);
tessellator.addTranslation(-x - 0.5F, -y, -z - 0.5F); tessellator.addTranslation(-x - 0.5F, -y, -z - 0.5F);
return true; return true;

View File

@ -4,6 +4,7 @@ import org.lwjgl.opengl.GL11;
import com.hbm.blocks.machine.NTMAnvil; import com.hbm.blocks.machine.NTMAnvil;
import com.hbm.main.ResourceManager; import com.hbm.main.ResourceManager;
import com.hbm.render.loader.HFRWavefrontObject;
import com.hbm.render.util.ObjUtil; import com.hbm.render.util.ObjUtil;
import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
@ -11,7 +12,6 @@ import net.minecraft.block.Block;
import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.RenderBlocks;
import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.Tessellator;
import net.minecraft.world.IBlockAccess; import net.minecraft.world.IBlockAccess;
import net.minecraftforge.client.model.obj.WavefrontObject;
public class RenderAnvil implements ISimpleBlockRenderingHandler { public class RenderAnvil implements ISimpleBlockRenderingHandler {
@ -24,12 +24,12 @@ public class RenderAnvil implements ISimpleBlockRenderingHandler {
GL11.glTranslated(0, -0.5, 0); GL11.glTranslated(0, -0.5, 0);
GL11.glRotated(180, 0, 1, 0); GL11.glRotated(180, 0, 1, 0);
tessellator.startDrawingQuads(); tessellator.startDrawingQuads();
ObjUtil.renderPartWithIcon((WavefrontObject) ResourceManager.anvil, "Top", block.getIcon(1, 0), tessellator, 0, false); ObjUtil.renderPartWithIcon((HFRWavefrontObject) ResourceManager.anvil, "Top", block.getIcon(1, 0), tessellator, 0, false);
ObjUtil.renderPartWithIcon((WavefrontObject) ResourceManager.anvil, "Bottom", block.getIcon(0, 0), tessellator, 0, false); ObjUtil.renderPartWithIcon((HFRWavefrontObject) ResourceManager.anvil, "Bottom", block.getIcon(0, 0), tessellator, 0, false);
ObjUtil.renderPartWithIcon((WavefrontObject) ResourceManager.anvil, "Front", block.getIcon(0, 0), tessellator, 0, false); ObjUtil.renderPartWithIcon((HFRWavefrontObject) ResourceManager.anvil, "Front", block.getIcon(0, 0), tessellator, 0, false);
ObjUtil.renderPartWithIcon((WavefrontObject) ResourceManager.anvil, "Back", block.getIcon(0, 0), tessellator, 0, false); ObjUtil.renderPartWithIcon((HFRWavefrontObject) ResourceManager.anvil, "Back", block.getIcon(0, 0), tessellator, 0, false);
ObjUtil.renderPartWithIcon((WavefrontObject) ResourceManager.anvil, "Left", block.getIcon(0, 0), tessellator, 0, false); ObjUtil.renderPartWithIcon((HFRWavefrontObject) ResourceManager.anvil, "Left", block.getIcon(0, 0), tessellator, 0, false);
ObjUtil.renderPartWithIcon((WavefrontObject) ResourceManager.anvil, "Right", block.getIcon(0, 0), tessellator, 0, false); ObjUtil.renderPartWithIcon((HFRWavefrontObject) ResourceManager.anvil, "Right", block.getIcon(0, 0), tessellator, 0, false);
tessellator.draw(); tessellator.draw();
GL11.glPopMatrix(); GL11.glPopMatrix();
@ -55,12 +55,12 @@ public class RenderAnvil implements ISimpleBlockRenderingHandler {
rotation = 180F / 180F * (float)Math.PI; rotation = 180F / 180F * (float)Math.PI;
tessellator.addTranslation(x + 0.5F, y, z + 0.5F); tessellator.addTranslation(x + 0.5F, y, z + 0.5F);
ObjUtil.renderPartWithIcon((WavefrontObject) ResourceManager.anvil, "Top", block.getIcon(1, 0), tessellator, rotation, true); ObjUtil.renderPartWithIcon((HFRWavefrontObject) ResourceManager.anvil, "Top", block.getIcon(1, 0), tessellator, rotation, true);
ObjUtil.renderPartWithIcon((WavefrontObject) ResourceManager.anvil, "Bottom", block.getIcon(0, 0), tessellator, rotation, true); ObjUtil.renderPartWithIcon((HFRWavefrontObject) ResourceManager.anvil, "Bottom", block.getIcon(0, 0), tessellator, rotation, true);
ObjUtil.renderPartWithIcon((WavefrontObject) ResourceManager.anvil, "Front", block.getIcon(0, 0), tessellator, rotation, true); ObjUtil.renderPartWithIcon((HFRWavefrontObject) ResourceManager.anvil, "Front", block.getIcon(0, 0), tessellator, rotation, true);
ObjUtil.renderPartWithIcon((WavefrontObject) ResourceManager.anvil, "Back", block.getIcon(0, 0), tessellator, rotation, true); ObjUtil.renderPartWithIcon((HFRWavefrontObject) ResourceManager.anvil, "Back", block.getIcon(0, 0), tessellator, rotation, true);
ObjUtil.renderPartWithIcon((WavefrontObject) ResourceManager.anvil, "Left", block.getIcon(0, 0), tessellator, rotation, true); ObjUtil.renderPartWithIcon((HFRWavefrontObject) ResourceManager.anvil, "Left", block.getIcon(0, 0), tessellator, rotation, true);
ObjUtil.renderPartWithIcon((WavefrontObject) ResourceManager.anvil, "Right", block.getIcon(0, 0), tessellator, rotation, true); ObjUtil.renderPartWithIcon((HFRWavefrontObject) ResourceManager.anvil, "Right", block.getIcon(0, 0), tessellator, rotation, true);
tessellator.addTranslation(-x - 0.5F, -y, -z - 0.5F); tessellator.addTranslation(-x - 0.5F, -y, -z - 0.5F);
return true; return true;

View File

@ -4,6 +4,7 @@ import org.lwjgl.opengl.GL11;
import com.hbm.blocks.generic.BarbedWire; import com.hbm.blocks.generic.BarbedWire;
import com.hbm.main.ResourceManager; import com.hbm.main.ResourceManager;
import com.hbm.render.loader.HFRWavefrontObject;
import com.hbm.render.util.ObjUtil; import com.hbm.render.util.ObjUtil;
import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
@ -12,7 +13,6 @@ import net.minecraft.client.renderer.RenderBlocks;
import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.Tessellator;
import net.minecraft.util.IIcon; import net.minecraft.util.IIcon;
import net.minecraft.world.IBlockAccess; import net.minecraft.world.IBlockAccess;
import net.minecraftforge.client.model.obj.WavefrontObject;
public class RenderBarbedWire implements ISimpleBlockRenderingHandler { public class RenderBarbedWire implements ISimpleBlockRenderingHandler {
@ -24,14 +24,13 @@ public class RenderBarbedWire implements ISimpleBlockRenderingHandler {
IIcon iicon = block.getIcon(0, 0); IIcon iicon = block.getIcon(0, 0);
tessellator.setColorOpaque_F(1, 1, 1); tessellator.setColorOpaque_F(1, 1, 1);
if (renderer.hasOverrideBlockTexture()) if(renderer.hasOverrideBlockTexture()) {
{
iicon = renderer.overrideBlockTexture; iicon = renderer.overrideBlockTexture;
} }
GL11.glTranslated(0, -0.5, 0); GL11.glTranslated(0, -0.5, 0);
tessellator.startDrawingQuads(); tessellator.startDrawingQuads();
ObjUtil.renderWithIcon((WavefrontObject) ResourceManager.barbed_wire, iicon, tessellator, 0, false); ObjUtil.renderWithIcon((HFRWavefrontObject) ResourceManager.barbed_wire, iicon, tessellator, 0, false);
tessellator.draw(); tessellator.draw();
GL11.glPopMatrix(); GL11.glPopMatrix();
@ -46,18 +45,17 @@ public class RenderBarbedWire implements ISimpleBlockRenderingHandler {
tessellator.setBrightness(block.getMixedBrightnessForBlock(world, x, y, z)); tessellator.setBrightness(block.getMixedBrightnessForBlock(world, x, y, z));
tessellator.setColorOpaque_F(1, 1, 1); tessellator.setColorOpaque_F(1, 1, 1);
if (renderer.hasOverrideBlockTexture()) if(renderer.hasOverrideBlockTexture()) {
{
iicon = renderer.overrideBlockTexture; iicon = renderer.overrideBlockTexture;
} }
float rotation = (float) -Math.PI; float rotation = (float) -Math.PI;
if(world.getBlockMetadata(x, y, z) < 4) if(world.getBlockMetadata(x, y, z) < 4)
rotation = -90F / 180F * (float)Math.PI; rotation = -90F / 180F * (float) Math.PI;
tessellator.addTranslation(x + 0.5F, y, z + 0.5F); tessellator.addTranslation(x + 0.5F, y, z + 0.5F);
ObjUtil.renderWithIcon((WavefrontObject) ResourceManager.barbed_wire, iicon, tessellator, rotation, true); ObjUtil.renderWithIcon((HFRWavefrontObject) ResourceManager.barbed_wire, iicon, tessellator, rotation, true);
tessellator.addTranslation(-x - 0.5F, -y, -z - 0.5F); tessellator.addTranslation(-x - 0.5F, -y, -z - 0.5F);
return true; return true;

View File

@ -4,6 +4,7 @@ import org.lwjgl.opengl.GL11;
import com.hbm.blocks.machine.BlockFluidBarrel; import com.hbm.blocks.machine.BlockFluidBarrel;
import com.hbm.main.ResourceManager; import com.hbm.main.ResourceManager;
import com.hbm.render.loader.HFRWavefrontObject;
import com.hbm.render.util.ObjUtil; import com.hbm.render.util.ObjUtil;
import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
@ -12,7 +13,6 @@ import net.minecraft.client.renderer.RenderBlocks;
import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.Tessellator;
import net.minecraft.util.IIcon; import net.minecraft.util.IIcon;
import net.minecraft.world.IBlockAccess; import net.minecraft.world.IBlockAccess;
import net.minecraftforge.client.model.obj.WavefrontObject;
public class RenderBarrel implements ISimpleBlockRenderingHandler { public class RenderBarrel implements ISimpleBlockRenderingHandler {
@ -30,7 +30,7 @@ public class RenderBarrel implements ISimpleBlockRenderingHandler {
GL11.glTranslated(0, -0.5, 0); GL11.glTranslated(0, -0.5, 0);
tessellator.startDrawingQuads(); tessellator.startDrawingQuads();
ObjUtil.renderWithIcon((WavefrontObject) ResourceManager.barrel, iicon, tessellator, 0, false); ObjUtil.renderWithIcon((HFRWavefrontObject) ResourceManager.barrel, iicon, tessellator, 0, false);
tessellator.draw(); tessellator.draw();
GL11.glPopMatrix(); GL11.glPopMatrix();
@ -50,7 +50,7 @@ public class RenderBarrel implements ISimpleBlockRenderingHandler {
} }
tessellator.addTranslation(x + 0.5F, y, z + 0.5F); tessellator.addTranslation(x + 0.5F, y, z + 0.5F);
ObjUtil.renderWithIcon((WavefrontObject) ResourceManager.barrel, iicon, tessellator, 0, true); ObjUtil.renderWithIcon((HFRWavefrontObject) ResourceManager.barrel, iicon, tessellator, 0, true);
tessellator.addTranslation(-x - 0.5F, -y, -z - 0.5F); tessellator.addTranslation(-x - 0.5F, -y, -z - 0.5F);
return true; return true;

View File

@ -4,6 +4,7 @@ import org.lwjgl.opengl.GL11;
import com.hbm.blocks.generic.HEVBattery; import com.hbm.blocks.generic.HEVBattery;
import com.hbm.main.ResourceManager; import com.hbm.main.ResourceManager;
import com.hbm.render.loader.HFRWavefrontObject;
import com.hbm.render.util.ObjUtil; import com.hbm.render.util.ObjUtil;
import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
@ -12,7 +13,6 @@ import net.minecraft.client.renderer.RenderBlocks;
import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.Tessellator;
import net.minecraft.util.IIcon; import net.minecraft.util.IIcon;
import net.minecraft.world.IBlockAccess; import net.minecraft.world.IBlockAccess;
import net.minecraftforge.client.model.obj.WavefrontObject;
public class RenderBattery implements ISimpleBlockRenderingHandler { public class RenderBattery implements ISimpleBlockRenderingHandler {
@ -31,7 +31,7 @@ public class RenderBattery implements ISimpleBlockRenderingHandler {
GL11.glTranslated(0, -0.625, 0); GL11.glTranslated(0, -0.625, 0);
GL11.glScaled(3.0D, 3.0D, 3.0D); GL11.glScaled(3.0D, 3.0D, 3.0D);
tessellator.startDrawingQuads(); tessellator.startDrawingQuads();
ObjUtil.renderWithIcon((WavefrontObject) ResourceManager.hev_battery, iicon, tessellator, 0, false); ObjUtil.renderWithIcon((HFRWavefrontObject) ResourceManager.hev_battery, iicon, tessellator, 0, false);
tessellator.draw(); tessellator.draw();
GL11.glPopMatrix(); GL11.glPopMatrix();
@ -51,7 +51,7 @@ public class RenderBattery implements ISimpleBlockRenderingHandler {
} }
tessellator.addTranslation(x + 0.5F, y, z + 0.5F); tessellator.addTranslation(x + 0.5F, y, z + 0.5F);
ObjUtil.renderWithIcon((WavefrontObject) ResourceManager.hev_battery, iicon, tessellator, 0, true); ObjUtil.renderWithIcon((HFRWavefrontObject) ResourceManager.hev_battery, iicon, tessellator, 0, true);
tessellator.addTranslation(-x - 0.5F, -y, -z - 0.5F); tessellator.addTranslation(-x - 0.5F, -y, -z - 0.5F);
return true; return true;

View File

@ -2,6 +2,7 @@ package com.hbm.render.block;
import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL11;
import com.hbm.render.loader.HFRWavefrontObject;
import com.hbm.render.util.ObjUtil; import com.hbm.render.util.ObjUtil;
import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
@ -11,7 +12,6 @@ import net.minecraft.client.renderer.Tessellator;
import net.minecraft.util.IIcon; import net.minecraft.util.IIcon;
import net.minecraft.world.IBlockAccess; import net.minecraft.world.IBlockAccess;
import net.minecraftforge.client.model.IModelCustom; import net.minecraftforge.client.model.IModelCustom;
import net.minecraftforge.client.model.obj.WavefrontObject;
public class RenderBlockDecoModel implements ISimpleBlockRenderingHandler { public class RenderBlockDecoModel implements ISimpleBlockRenderingHandler {
@ -38,7 +38,7 @@ public class RenderBlockDecoModel implements ISimpleBlockRenderingHandler {
GL11.glTranslated(0, 0.1D, 0); GL11.glTranslated(0, 0.1D, 0);
GL11.glScaled(1.2D, 1.2D, 1.2D); GL11.glScaled(1.2D, 1.2D, 1.2D);
tessellator.startDrawingQuads(); tessellator.startDrawingQuads();
ObjUtil.renderWithIcon((WavefrontObject) model, iicon, tessellator, 0, false); ObjUtil.renderWithIcon((HFRWavefrontObject) model, iicon, tessellator, 0, false);
tessellator.draw(); tessellator.draw();
@ -74,7 +74,7 @@ public class RenderBlockDecoModel implements ISimpleBlockRenderingHandler {
} }
tessellator.addTranslation(x + 0.5F, y + 0.5F, z + 0.5F); tessellator.addTranslation(x + 0.5F, y + 0.5F, z + 0.5F);
ObjUtil.renderWithIcon((WavefrontObject) model, iicon, tessellator, rotation, true); ObjUtil.renderWithIcon((HFRWavefrontObject) model, iicon, tessellator, rotation, true);
tessellator.addTranslation(-x - 0.5F, -y - 0.5F, -z - 0.5F); tessellator.addTranslation(-x - 0.5F, -y - 0.5F, -z - 0.5F);
return false; return false;

View File

@ -2,6 +2,7 @@ package com.hbm.render.block;
import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL11;
import com.hbm.render.loader.HFRWavefrontObject;
import com.hbm.render.util.ObjUtil; import com.hbm.render.util.ObjUtil;
import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
@ -11,7 +12,6 @@ import net.minecraft.client.renderer.Tessellator;
import net.minecraft.util.IIcon; import net.minecraft.util.IIcon;
import net.minecraft.world.IBlockAccess; import net.minecraft.world.IBlockAccess;
import net.minecraftforge.client.model.IModelCustom; import net.minecraftforge.client.model.IModelCustom;
import net.minecraftforge.client.model.obj.WavefrontObject;
public class RenderBlockRotated implements ISimpleBlockRenderingHandler { public class RenderBlockRotated implements ISimpleBlockRenderingHandler {
@ -39,7 +39,7 @@ public class RenderBlockRotated implements ISimpleBlockRenderingHandler {
GL11.glRotated(-90, 0, 0, 1); GL11.glRotated(-90, 0, 0, 1);
GL11.glTranslated(0, 0.375, 0); GL11.glTranslated(0, 0.375, 0);
tessellator.startDrawingQuads(); tessellator.startDrawingQuads();
ObjUtil.renderWithIcon((WavefrontObject) model, iicon, tessellator, 0, false); ObjUtil.renderWithIcon((HFRWavefrontObject) model, iicon, tessellator, 0, false);
tessellator.draw(); tessellator.draw();
GL11.glPopMatrix(); GL11.glPopMatrix();
@ -80,7 +80,7 @@ public class RenderBlockRotated implements ISimpleBlockRenderingHandler {
flip = (float)Math.PI * 0.5F; flip = (float)Math.PI * 0.5F;
tessellator.addTranslation(x + 0.5F, y + 0.5F, z + 0.5F); tessellator.addTranslation(x + 0.5F, y + 0.5F, z + 0.5F);
ObjUtil.renderWithIcon((WavefrontObject) model, iicon, tessellator, rotation, flip, true); ObjUtil.renderWithIcon((HFRWavefrontObject) model, iicon, tessellator, rotation, flip, true);
tessellator.addTranslation(-x - 0.5F, -y - 0.5F, -z - 0.5F); tessellator.addTranslation(-x - 0.5F, -y - 0.5F, -z - 0.5F);
return true; return true;

View File

@ -4,6 +4,7 @@ import org.lwjgl.opengl.GL11;
import com.hbm.blocks.generic.BlockDecoCRT; import com.hbm.blocks.generic.BlockDecoCRT;
import com.hbm.main.ResourceManager; import com.hbm.main.ResourceManager;
import com.hbm.render.loader.HFRWavefrontObject;
import com.hbm.render.util.ObjUtil; import com.hbm.render.util.ObjUtil;
import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
@ -12,7 +13,6 @@ import net.minecraft.client.renderer.RenderBlocks;
import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.Tessellator;
import net.minecraft.util.IIcon; import net.minecraft.util.IIcon;
import net.minecraft.world.IBlockAccess; import net.minecraft.world.IBlockAccess;
import net.minecraftforge.client.model.obj.WavefrontObject;
public class RenderCRT implements ISimpleBlockRenderingHandler { public class RenderCRT implements ISimpleBlockRenderingHandler {
@ -30,7 +30,7 @@ public class RenderCRT implements ISimpleBlockRenderingHandler {
GL11.glTranslated(0, -0.5, 0); GL11.glTranslated(0, -0.5, 0);
tessellator.startDrawingQuads(); tessellator.startDrawingQuads();
ObjUtil.renderWithIcon((WavefrontObject) ResourceManager.crt, iicon, tessellator, (float) Math.PI * -0.5F, false); ObjUtil.renderWithIcon((HFRWavefrontObject) ResourceManager.crt, iicon, tessellator, (float) Math.PI * -0.5F, false);
tessellator.draw(); tessellator.draw();
GL11.glPopMatrix(); GL11.glPopMatrix();
@ -62,9 +62,9 @@ public class RenderCRT implements ISimpleBlockRenderingHandler {
} }
tessellator.addTranslation(x + 0.5F, y, z + 0.5F); tessellator.addTranslation(x + 0.5F, y, z + 0.5F);
ObjUtil.renderPartWithIcon((WavefrontObject) ResourceManager.crt, "Monitor", iicon, tessellator, rotation, true); ObjUtil.renderPartWithIcon((HFRWavefrontObject) ResourceManager.crt, "Monitor", iicon, tessellator, rotation, true);
if(metaOrig >= 8) tessellator.setBrightness(240); if(metaOrig >= 8) tessellator.setBrightness(240);
ObjUtil.renderPartWithIcon((WavefrontObject) ResourceManager.crt, "Screen", iicon, tessellator, rotation, true); ObjUtil.renderPartWithIcon((HFRWavefrontObject) ResourceManager.crt, "Screen", iicon, tessellator, rotation, true);
tessellator.setBrightness(brightness); tessellator.setBrightness(brightness);
tessellator.addTranslation(-x - 0.5F, -y, -z - 0.5F); tessellator.addTranslation(-x - 0.5F, -y, -z - 0.5F);

View File

@ -5,6 +5,7 @@ import org.lwjgl.opengl.GL11;
import com.hbm.blocks.network.BlockCable; import com.hbm.blocks.network.BlockCable;
import com.hbm.lib.Library; import com.hbm.lib.Library;
import com.hbm.main.ResourceManager; import com.hbm.main.ResourceManager;
import com.hbm.render.loader.HFRWavefrontObject;
import com.hbm.render.util.ObjUtil; import com.hbm.render.util.ObjUtil;
import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
@ -13,7 +14,6 @@ import net.minecraft.client.renderer.RenderBlocks;
import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.Tessellator;
import net.minecraft.util.IIcon; import net.minecraft.util.IIcon;
import net.minecraft.world.IBlockAccess; import net.minecraft.world.IBlockAccess;
import net.minecraftforge.client.model.obj.WavefrontObject;
public class RenderCable implements ISimpleBlockRenderingHandler { public class RenderCable implements ISimpleBlockRenderingHandler {
@ -32,11 +32,11 @@ public class RenderCable implements ISimpleBlockRenderingHandler {
GL11.glRotated(180, 0, 1, 0); GL11.glRotated(180, 0, 1, 0);
GL11.glScaled(1.25D, 1.25D, 1.25D); GL11.glScaled(1.25D, 1.25D, 1.25D);
tessellator.startDrawingQuads(); tessellator.startDrawingQuads();
ObjUtil.renderPartWithIcon((WavefrontObject) ResourceManager.cable_neo, "Core", iicon, tessellator, 0, false); ObjUtil.renderPartWithIcon((HFRWavefrontObject) ResourceManager.cable_neo, "Core", iicon, tessellator, 0, false);
ObjUtil.renderPartWithIcon((WavefrontObject) ResourceManager.cable_neo, "posX", iicon, tessellator, 0, false); ObjUtil.renderPartWithIcon((HFRWavefrontObject) ResourceManager.cable_neo, "posX", iicon, tessellator, 0, false);
ObjUtil.renderPartWithIcon((WavefrontObject) ResourceManager.cable_neo, "negX", iicon, tessellator, 0, false); ObjUtil.renderPartWithIcon((HFRWavefrontObject) ResourceManager.cable_neo, "negX", iicon, tessellator, 0, false);
ObjUtil.renderPartWithIcon((WavefrontObject) ResourceManager.cable_neo, "posZ", iicon, tessellator, 0, false); ObjUtil.renderPartWithIcon((HFRWavefrontObject) ResourceManager.cable_neo, "posZ", iicon, tessellator, 0, false);
ObjUtil.renderPartWithIcon((WavefrontObject) ResourceManager.cable_neo, "negZ", iicon, tessellator, 0, false); ObjUtil.renderPartWithIcon((HFRWavefrontObject) ResourceManager.cable_neo, "negZ", iicon, tessellator, 0, false);
tessellator.draw(); tessellator.draw();
GL11.glPopMatrix(); GL11.glPopMatrix();
@ -66,20 +66,20 @@ public class RenderCable implements ISimpleBlockRenderingHandler {
tessellator.addTranslation(x + 0.5F, y + 0.5F, z + 0.5F); tessellator.addTranslation(x + 0.5F, y + 0.5F, z + 0.5F);
if(pX && nX && !pY && !nY && !pZ && !nZ) if(pX && nX && !pY && !nY && !pZ && !nZ)
ObjUtil.renderPartWithIcon((WavefrontObject) ResourceManager.cable_neo, "CX", iicon, tessellator, 0, true); ObjUtil.renderPartWithIcon((HFRWavefrontObject) ResourceManager.cable_neo, "CX", iicon, tessellator, 0, true);
else if(!pX && !nX && pY && nY && !pZ && !nZ) else if(!pX && !nX && pY && nY && !pZ && !nZ)
ObjUtil.renderPartWithIcon((WavefrontObject) ResourceManager.cable_neo, "CY", iicon, tessellator, 0, true); ObjUtil.renderPartWithIcon((HFRWavefrontObject) ResourceManager.cable_neo, "CY", iicon, tessellator, 0, true);
else if(!pX && !nX && !pY && !nY && pZ && nZ) else if(!pX && !nX && !pY && !nY && pZ && nZ)
ObjUtil.renderPartWithIcon((WavefrontObject) ResourceManager.cable_neo, "CZ", iicon, tessellator, 0, true); ObjUtil.renderPartWithIcon((HFRWavefrontObject) ResourceManager.cable_neo, "CZ", iicon, tessellator, 0, true);
else { else {
ObjUtil.renderPartWithIcon((WavefrontObject) ResourceManager.cable_neo, "Core", iicon, tessellator, 0, true); ObjUtil.renderPartWithIcon((HFRWavefrontObject) ResourceManager.cable_neo, "Core", iicon, tessellator, 0, true);
if(pX) ObjUtil.renderPartWithIcon((WavefrontObject) ResourceManager.cable_neo, "posX", iicon, tessellator, 0, true); if(pX) ObjUtil.renderPartWithIcon((HFRWavefrontObject) ResourceManager.cable_neo, "posX", iicon, tessellator, 0, true);
if(nX) ObjUtil.renderPartWithIcon((WavefrontObject) ResourceManager.cable_neo, "negX", iicon, tessellator, 0, true); if(nX) ObjUtil.renderPartWithIcon((HFRWavefrontObject) ResourceManager.cable_neo, "negX", iicon, tessellator, 0, true);
if(pY) ObjUtil.renderPartWithIcon((WavefrontObject) ResourceManager.cable_neo, "posY", iicon, tessellator, 0, true); if(pY) ObjUtil.renderPartWithIcon((HFRWavefrontObject) ResourceManager.cable_neo, "posY", iicon, tessellator, 0, true);
if(nY) ObjUtil.renderPartWithIcon((WavefrontObject) ResourceManager.cable_neo, "negY", iicon, tessellator, 0, true); if(nY) ObjUtil.renderPartWithIcon((HFRWavefrontObject) ResourceManager.cable_neo, "negY", iicon, tessellator, 0, true);
if(nZ) ObjUtil.renderPartWithIcon((WavefrontObject) ResourceManager.cable_neo, "posZ", iicon, tessellator, 0, true); if(nZ) ObjUtil.renderPartWithIcon((HFRWavefrontObject) ResourceManager.cable_neo, "posZ", iicon, tessellator, 0, true);
if(pZ) ObjUtil.renderPartWithIcon((WavefrontObject) ResourceManager.cable_neo, "negZ", iicon, tessellator, 0, true); if(pZ) ObjUtil.renderPartWithIcon((HFRWavefrontObject) ResourceManager.cable_neo, "negZ", iicon, tessellator, 0, true);
} }
tessellator.addTranslation(-x - 0.5F, -y - 0.5F, -z - 0.5F); tessellator.addTranslation(-x - 0.5F, -y - 0.5F, -z - 0.5F);

View File

@ -4,6 +4,7 @@ import org.lwjgl.opengl.GL11;
import com.hbm.blocks.machine.MachineCapacitor; import com.hbm.blocks.machine.MachineCapacitor;
import com.hbm.main.ResourceManager; import com.hbm.main.ResourceManager;
import com.hbm.render.loader.HFRWavefrontObject;
import com.hbm.render.util.ObjUtil; import com.hbm.render.util.ObjUtil;
import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
@ -11,7 +12,6 @@ import net.minecraft.block.Block;
import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.RenderBlocks;
import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.Tessellator;
import net.minecraft.world.IBlockAccess; import net.minecraft.world.IBlockAccess;
import net.minecraftforge.client.model.obj.WavefrontObject;
public class RenderCapacitor implements ISimpleBlockRenderingHandler { public class RenderCapacitor implements ISimpleBlockRenderingHandler {
@ -25,11 +25,11 @@ public class RenderCapacitor implements ISimpleBlockRenderingHandler {
MachineCapacitor capacitor = (MachineCapacitor) block; MachineCapacitor capacitor = (MachineCapacitor) block;
tessellator.startDrawingQuads(); tessellator.startDrawingQuads();
ObjUtil.renderPartWithIcon((WavefrontObject) ResourceManager.capacitor, "Top", capacitor.iconTop, tessellator, 0, false); ObjUtil.renderPartWithIcon((HFRWavefrontObject) ResourceManager.capacitor, "Top", capacitor.iconTop, tessellator, 0, false);
ObjUtil.renderPartWithIcon((WavefrontObject) ResourceManager.capacitor, "Side", capacitor.iconSide, tessellator, 0, false); ObjUtil.renderPartWithIcon((HFRWavefrontObject) ResourceManager.capacitor, "Side", capacitor.iconSide, tessellator, 0, false);
ObjUtil.renderPartWithIcon((WavefrontObject) ResourceManager.capacitor, "Bottom", capacitor.iconBottom, tessellator, 0, false); ObjUtil.renderPartWithIcon((HFRWavefrontObject) ResourceManager.capacitor, "Bottom", capacitor.iconBottom, tessellator, 0, false);
ObjUtil.renderPartWithIcon((WavefrontObject) ResourceManager.capacitor, "InnerTop", capacitor.iconInnerTop, tessellator, 0, false); ObjUtil.renderPartWithIcon((HFRWavefrontObject) ResourceManager.capacitor, "InnerTop", capacitor.iconInnerTop, tessellator, 0, false);
ObjUtil.renderPartWithIcon((WavefrontObject) ResourceManager.capacitor, "InnerSide", capacitor.iconInnerSide, tessellator, 0, false); ObjUtil.renderPartWithIcon((HFRWavefrontObject) ResourceManager.capacitor, "InnerSide", capacitor.iconInnerSide, tessellator, 0, false);
tessellator.draw(); tessellator.draw();
GL11.glPopMatrix(); GL11.glPopMatrix();
@ -66,11 +66,11 @@ public class RenderCapacitor implements ISimpleBlockRenderingHandler {
tessellator.addTranslation(x + 0.5F, y + 0.5F, z + 0.5F); tessellator.addTranslation(x + 0.5F, y + 0.5F, z + 0.5F);
ObjUtil.renderPartWithIcon((WavefrontObject) ResourceManager.capacitor, "Top", capacitor.iconTop, tessellator, rotation, flip, true); ObjUtil.renderPartWithIcon((HFRWavefrontObject) ResourceManager.capacitor, "Top", capacitor.iconTop, tessellator, rotation, flip, true);
ObjUtil.renderPartWithIcon((WavefrontObject) ResourceManager.capacitor, "Side", capacitor.iconSide, tessellator, rotation, flip, true); ObjUtil.renderPartWithIcon((HFRWavefrontObject) ResourceManager.capacitor, "Side", capacitor.iconSide, tessellator, rotation, flip, true);
ObjUtil.renderPartWithIcon((WavefrontObject) ResourceManager.capacitor, "Bottom", capacitor.iconBottom, tessellator, rotation, flip, true); ObjUtil.renderPartWithIcon((HFRWavefrontObject) ResourceManager.capacitor, "Bottom", capacitor.iconBottom, tessellator, rotation, flip, true);
ObjUtil.renderPartWithIcon((WavefrontObject) ResourceManager.capacitor, "InnerTop", capacitor.iconInnerTop, tessellator, rotation, flip, true); ObjUtil.renderPartWithIcon((HFRWavefrontObject) ResourceManager.capacitor, "InnerTop", capacitor.iconInnerTop, tessellator, rotation, flip, true);
ObjUtil.renderPartWithIcon((WavefrontObject) ResourceManager.capacitor, "InnerSide", capacitor.iconInnerSide, tessellator, rotation, flip, true); ObjUtil.renderPartWithIcon((HFRWavefrontObject) ResourceManager.capacitor, "InnerSide", capacitor.iconInnerSide, tessellator, rotation, flip, true);
tessellator.addTranslation(-x - 0.5F, -y - 0.5F, -z - 0.5F); tessellator.addTranslation(-x - 0.5F, -y - 0.5F, -z - 0.5F);

View File

@ -4,6 +4,7 @@ import org.lwjgl.opengl.GL11;
import com.hbm.blocks.generic.BlockCanCrate; import com.hbm.blocks.generic.BlockCanCrate;
import com.hbm.main.ResourceManager; import com.hbm.main.ResourceManager;
import com.hbm.render.loader.HFRWavefrontObject;
import com.hbm.render.util.ObjUtil; import com.hbm.render.util.ObjUtil;
import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
@ -12,7 +13,6 @@ import net.minecraft.client.renderer.RenderBlocks;
import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.Tessellator;
import net.minecraft.util.IIcon; import net.minecraft.util.IIcon;
import net.minecraft.world.IBlockAccess; import net.minecraft.world.IBlockAccess;
import net.minecraftforge.client.model.obj.WavefrontObject;
public class RenderConserve implements ISimpleBlockRenderingHandler { public class RenderConserve implements ISimpleBlockRenderingHandler {
@ -24,14 +24,13 @@ public class RenderConserve implements ISimpleBlockRenderingHandler {
IIcon iicon = block.getIcon(0, 0); IIcon iicon = block.getIcon(0, 0);
tessellator.setColorOpaque_F(1, 1, 1); tessellator.setColorOpaque_F(1, 1, 1);
if (renderer.hasOverrideBlockTexture()) if(renderer.hasOverrideBlockTexture()) {
{
iicon = renderer.overrideBlockTexture; iicon = renderer.overrideBlockTexture;
} }
GL11.glTranslated(0, -0.5, 0); GL11.glTranslated(0, -0.5, 0);
tessellator.startDrawingQuads(); tessellator.startDrawingQuads();
ObjUtil.renderWithIcon((WavefrontObject) ResourceManager.conservecrate, iicon, tessellator, 0, false); ObjUtil.renderWithIcon((HFRWavefrontObject) ResourceManager.conservecrate, iicon, tessellator, 0, false);
tessellator.draw(); tessellator.draw();
GL11.glPopMatrix(); GL11.glPopMatrix();
@ -46,13 +45,12 @@ public class RenderConserve implements ISimpleBlockRenderingHandler {
tessellator.setBrightness(block.getMixedBrightnessForBlock(world, x, y, z)); tessellator.setBrightness(block.getMixedBrightnessForBlock(world, x, y, z));
tessellator.setColorOpaque_F(1, 1, 1); tessellator.setColorOpaque_F(1, 1, 1);
if (renderer.hasOverrideBlockTexture()) if(renderer.hasOverrideBlockTexture()) {
{
iicon = renderer.overrideBlockTexture; iicon = renderer.overrideBlockTexture;
} }
tessellator.addTranslation(x + 0.5F, y, z + 0.5F); tessellator.addTranslation(x + 0.5F, y, z + 0.5F);
ObjUtil.renderWithIcon((WavefrontObject) ResourceManager.conservecrate, iicon, tessellator, 0, true); ObjUtil.renderWithIcon((HFRWavefrontObject) ResourceManager.conservecrate, iicon, tessellator, 0, true);
tessellator.addTranslation(-x - 0.5F, -y, -z - 0.5F); tessellator.addTranslation(-x - 0.5F, -y, -z - 0.5F);
return true; return true;

View File

@ -6,6 +6,7 @@ import com.hbm.blocks.bomb.DetCord;
import com.hbm.blocks.bomb.IDetConnectible; import com.hbm.blocks.bomb.IDetConnectible;
import com.hbm.lib.Library; import com.hbm.lib.Library;
import com.hbm.main.ResourceManager; import com.hbm.main.ResourceManager;
import com.hbm.render.loader.HFRWavefrontObject;
import com.hbm.render.util.ObjUtil; import com.hbm.render.util.ObjUtil;
import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
@ -14,7 +15,6 @@ import net.minecraft.client.renderer.RenderBlocks;
import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.Tessellator;
import net.minecraft.util.IIcon; import net.minecraft.util.IIcon;
import net.minecraft.world.IBlockAccess; import net.minecraft.world.IBlockAccess;
import net.minecraftforge.client.model.obj.WavefrontObject;
public class RenderDetCord implements ISimpleBlockRenderingHandler { public class RenderDetCord implements ISimpleBlockRenderingHandler {
@ -33,7 +33,7 @@ public class RenderDetCord implements ISimpleBlockRenderingHandler {
GL11.glRotated(180, 0, 1, 0); GL11.glRotated(180, 0, 1, 0);
GL11.glScaled(1.25D, 1.25D, 1.25D); GL11.glScaled(1.25D, 1.25D, 1.25D);
tessellator.startDrawingQuads(); tessellator.startDrawingQuads();
ObjUtil.renderPartWithIcon((WavefrontObject) ResourceManager.cable_neo, "CZ", iicon, tessellator, 0, false); ObjUtil.renderPartWithIcon((HFRWavefrontObject) ResourceManager.cable_neo, "CZ", iicon, tessellator, 0, false);
tessellator.draw(); tessellator.draw();
GL11.glPopMatrix(); GL11.glPopMatrix();
@ -65,20 +65,20 @@ public class RenderDetCord implements ISimpleBlockRenderingHandler {
tessellator.addTranslation(x + 0.5F, y + 0.5F, z + 0.5F); tessellator.addTranslation(x + 0.5F, y + 0.5F, z + 0.5F);
if(mask == 0b110000 || mask == 0b100000 || mask == 0b010000) if(mask == 0b110000 || mask == 0b100000 || mask == 0b010000)
ObjUtil.renderPartWithIcon((WavefrontObject) ResourceManager.cable_neo, "CX", iicon, tessellator, 0, true); ObjUtil.renderPartWithIcon((HFRWavefrontObject) ResourceManager.cable_neo, "CX", iicon, tessellator, 0, true);
else if(mask == 0b001100 || mask == 0b001000 || mask == 0b000100) else if(mask == 0b001100 || mask == 0b001000 || mask == 0b000100)
ObjUtil.renderPartWithIcon((WavefrontObject) ResourceManager.cable_neo, "CY", iicon, tessellator, 0, true); ObjUtil.renderPartWithIcon((HFRWavefrontObject) ResourceManager.cable_neo, "CY", iicon, tessellator, 0, true);
else if(mask == 0b000011 || mask == 0b000010 || mask == 0b000001) else if(mask == 0b000011 || mask == 0b000010 || mask == 0b000001)
ObjUtil.renderPartWithIcon((WavefrontObject) ResourceManager.cable_neo, "CZ", iicon, tessellator, 0, true); ObjUtil.renderPartWithIcon((HFRWavefrontObject) ResourceManager.cable_neo, "CZ", iicon, tessellator, 0, true);
else { else {
ObjUtil.renderPartWithIcon((WavefrontObject) ResourceManager.cable_neo, "Core", iicon, tessellator, 0, true); ObjUtil.renderPartWithIcon((HFRWavefrontObject) ResourceManager.cable_neo, "Core", iicon, tessellator, 0, true);
if(pX) ObjUtil.renderPartWithIcon((WavefrontObject) ResourceManager.cable_neo, "posX", iicon, tessellator, 0, true); if(pX) ObjUtil.renderPartWithIcon((HFRWavefrontObject) ResourceManager.cable_neo, "posX", iicon, tessellator, 0, true);
if(nX) ObjUtil.renderPartWithIcon((WavefrontObject) ResourceManager.cable_neo, "negX", iicon, tessellator, 0, true); if(nX) ObjUtil.renderPartWithIcon((HFRWavefrontObject) ResourceManager.cable_neo, "negX", iicon, tessellator, 0, true);
if(pY) ObjUtil.renderPartWithIcon((WavefrontObject) ResourceManager.cable_neo, "posY", iicon, tessellator, 0, true); if(pY) ObjUtil.renderPartWithIcon((HFRWavefrontObject) ResourceManager.cable_neo, "posY", iicon, tessellator, 0, true);
if(nY) ObjUtil.renderPartWithIcon((WavefrontObject) ResourceManager.cable_neo, "negY", iicon, tessellator, 0, true); if(nY) ObjUtil.renderPartWithIcon((HFRWavefrontObject) ResourceManager.cable_neo, "negY", iicon, tessellator, 0, true);
if(nZ) ObjUtil.renderPartWithIcon((WavefrontObject) ResourceManager.cable_neo, "posZ", iicon, tessellator, 0, true); if(nZ) ObjUtil.renderPartWithIcon((HFRWavefrontObject) ResourceManager.cable_neo, "posZ", iicon, tessellator, 0, true);
if(pZ) ObjUtil.renderPartWithIcon((WavefrontObject) ResourceManager.cable_neo, "negZ", iicon, tessellator, 0, true); if(pZ) ObjUtil.renderPartWithIcon((HFRWavefrontObject) ResourceManager.cable_neo, "negZ", iicon, tessellator, 0, true);
} }
tessellator.addTranslation(-x - 0.5F, -y - 0.5F, -z - 0.5F); tessellator.addTranslation(-x - 0.5F, -y - 0.5F, -z - 0.5F);

View File

@ -5,6 +5,7 @@ import org.lwjgl.opengl.GL11;
import com.hbm.blocks.ModBlocks; import com.hbm.blocks.ModBlocks;
import com.hbm.blocks.machine.MachineDiFurnaceExtension; import com.hbm.blocks.machine.MachineDiFurnaceExtension;
import com.hbm.main.ResourceManager; import com.hbm.main.ResourceManager;
import com.hbm.render.loader.HFRWavefrontObject;
import com.hbm.render.util.ObjUtil; import com.hbm.render.util.ObjUtil;
import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
@ -12,7 +13,6 @@ import net.minecraft.block.Block;
import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.RenderBlocks;
import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.Tessellator;
import net.minecraft.world.IBlockAccess; import net.minecraft.world.IBlockAccess;
import net.minecraftforge.client.model.obj.WavefrontObject;
public class RenderDiFurnaceExtension implements ISimpleBlockRenderingHandler { public class RenderDiFurnaceExtension implements ISimpleBlockRenderingHandler {
@ -25,9 +25,9 @@ public class RenderDiFurnaceExtension implements ISimpleBlockRenderingHandler {
GL11.glTranslatef(0F, -0.5F, 0F); GL11.glTranslatef(0F, -0.5F, 0F);
tessellator.startDrawingQuads(); tessellator.startDrawingQuads();
ObjUtil.renderPartWithIcon((WavefrontObject) ResourceManager.difurnace_extension, "Top", ModBlocks.machine_difurnace_extension.getIcon(1, 0), tessellator, 0, false); ObjUtil.renderPartWithIcon((HFRWavefrontObject) ResourceManager.difurnace_extension, "Top", ModBlocks.machine_difurnace_extension.getIcon(1, 0), tessellator, 0, false);
ObjUtil.renderPartWithIcon((WavefrontObject) ResourceManager.difurnace_extension, "Bottom", ModBlocks.machine_difurnace_extension.getIcon(0, 0), tessellator, 0, false); ObjUtil.renderPartWithIcon((HFRWavefrontObject) ResourceManager.difurnace_extension, "Bottom", ModBlocks.machine_difurnace_extension.getIcon(0, 0), tessellator, 0, false);
ObjUtil.renderPartWithIcon((WavefrontObject) ResourceManager.difurnace_extension, "Side", ModBlocks.machine_difurnace_extension.getIcon(3, 0), tessellator, 0, false); ObjUtil.renderPartWithIcon((HFRWavefrontObject) ResourceManager.difurnace_extension, "Side", ModBlocks.machine_difurnace_extension.getIcon(3, 0), tessellator, 0, false);
tessellator.draw(); tessellator.draw();
GL11.glPopMatrix(); GL11.glPopMatrix();
@ -43,9 +43,9 @@ public class RenderDiFurnaceExtension implements ISimpleBlockRenderingHandler {
tessellator.addTranslation(x + 0.5F, y, z + 0.5F); tessellator.addTranslation(x + 0.5F, y, z + 0.5F);
ObjUtil.renderPartWithIcon((WavefrontObject) ResourceManager.difurnace_extension, "Top", ModBlocks.machine_difurnace_extension.getIcon(1, 0), tessellator, 0, true); ObjUtil.renderPartWithIcon((HFRWavefrontObject) ResourceManager.difurnace_extension, "Top", ModBlocks.machine_difurnace_extension.getIcon(1, 0), tessellator, 0, true);
ObjUtil.renderPartWithIcon((WavefrontObject) ResourceManager.difurnace_extension, "Bottom", ModBlocks.machine_difurnace_extension.getIcon(0, 0), tessellator, 0, true); ObjUtil.renderPartWithIcon((HFRWavefrontObject) ResourceManager.difurnace_extension, "Bottom", ModBlocks.machine_difurnace_extension.getIcon(0, 0), tessellator, 0, true);
ObjUtil.renderPartWithIcon((WavefrontObject) ResourceManager.difurnace_extension, "Side", ModBlocks.machine_difurnace_extension.getIcon(3, 0), tessellator, 0, true); ObjUtil.renderPartWithIcon((HFRWavefrontObject) ResourceManager.difurnace_extension, "Side", ModBlocks.machine_difurnace_extension.getIcon(3, 0), tessellator, 0, true);
tessellator.addTranslation(-x - 0.5F, -y, -z - 0.5F); tessellator.addTranslation(-x - 0.5F, -y, -z - 0.5F);

View File

@ -6,6 +6,7 @@ import com.hbm.blocks.ModBlocks;
import com.hbm.blocks.network.CableDiode; import com.hbm.blocks.network.CableDiode;
import com.hbm.lib.Library; import com.hbm.lib.Library;
import com.hbm.main.ResourceManager; import com.hbm.main.ResourceManager;
import com.hbm.render.loader.HFRWavefrontObject;
import com.hbm.render.util.ObjUtil; import com.hbm.render.util.ObjUtil;
import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
@ -14,7 +15,6 @@ import net.minecraft.client.renderer.RenderBlocks;
import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.Tessellator;
import net.minecraft.util.IIcon; import net.minecraft.util.IIcon;
import net.minecraft.world.IBlockAccess; import net.minecraft.world.IBlockAccess;
import net.minecraftforge.client.model.obj.WavefrontObject;
public class RenderDiode implements ISimpleBlockRenderingHandler { public class RenderDiode implements ISimpleBlockRenderingHandler {
@ -73,11 +73,11 @@ public class RenderDiode implements ISimpleBlockRenderingHandler {
GL11.glRotated(180, 0, 1, 0); GL11.glRotated(180, 0, 1, 0);
tessellator.startDrawingQuads(); tessellator.startDrawingQuads();
ObjUtil.renderPartWithIcon((WavefrontObject) ResourceManager.cable_neo, "posX", iconCable, tessellator, 0, false); ObjUtil.renderPartWithIcon((HFRWavefrontObject) ResourceManager.cable_neo, "posX", iconCable, tessellator, 0, false);
ObjUtil.renderPartWithIcon((WavefrontObject) ResourceManager.cable_neo, "negX", iconCable, tessellator, 0, false); ObjUtil.renderPartWithIcon((HFRWavefrontObject) ResourceManager.cable_neo, "negX", iconCable, tessellator, 0, false);
ObjUtil.renderPartWithIcon((WavefrontObject) ResourceManager.cable_neo, "negY", iconCable, tessellator, 0, false); ObjUtil.renderPartWithIcon((HFRWavefrontObject) ResourceManager.cable_neo, "negY", iconCable, tessellator, 0, false);
ObjUtil.renderPartWithIcon((WavefrontObject) ResourceManager.cable_neo, "posZ", iconCable, tessellator, 0, false); ObjUtil.renderPartWithIcon((HFRWavefrontObject) ResourceManager.cable_neo, "posZ", iconCable, tessellator, 0, false);
ObjUtil.renderPartWithIcon((WavefrontObject) ResourceManager.cable_neo, "negZ", iconCable, tessellator, 0, false); ObjUtil.renderPartWithIcon((HFRWavefrontObject) ResourceManager.cable_neo, "negZ", iconCable, tessellator, 0, false);
tessellator.draw(); tessellator.draw();
renderer.clearOverrideBlockTexture(); renderer.clearOverrideBlockTexture();
@ -132,12 +132,12 @@ public class RenderDiode implements ISimpleBlockRenderingHandler {
tessellator.addTranslation(x + 0.5F, y + 0.5F, z + 0.5F); tessellator.addTranslation(x + 0.5F, y + 0.5F, z + 0.5F);
//ObjUtil.renderPartWithIcon((WavefrontObject) ResourceManager.cable_neo, "Core", iconCable, tessellator, 0, true); //ObjUtil.renderPartWithIcon((WavefrontObject) ResourceManager.cable_neo, "Core", iconCable, tessellator, 0, true);
if(pX) ObjUtil.renderPartWithIcon((WavefrontObject) ResourceManager.cable_neo, "posX", iconCable, tessellator, 0, true); if(pX) ObjUtil.renderPartWithIcon((HFRWavefrontObject) ResourceManager.cable_neo, "posX", iconCable, tessellator, 0, true);
if(nX) ObjUtil.renderPartWithIcon((WavefrontObject) ResourceManager.cable_neo, "negX", iconCable, tessellator, 0, true); if(nX) ObjUtil.renderPartWithIcon((HFRWavefrontObject) ResourceManager.cable_neo, "negX", iconCable, tessellator, 0, true);
if(pY) ObjUtil.renderPartWithIcon((WavefrontObject) ResourceManager.cable_neo, "posY", iconCable, tessellator, 0, true); if(pY) ObjUtil.renderPartWithIcon((HFRWavefrontObject) ResourceManager.cable_neo, "posY", iconCable, tessellator, 0, true);
if(nY) ObjUtil.renderPartWithIcon((WavefrontObject) ResourceManager.cable_neo, "negY", iconCable, tessellator, 0, true); if(nY) ObjUtil.renderPartWithIcon((HFRWavefrontObject) ResourceManager.cable_neo, "negY", iconCable, tessellator, 0, true);
if(nZ) ObjUtil.renderPartWithIcon((WavefrontObject) ResourceManager.cable_neo, "posZ", iconCable, tessellator, 0, true); if(nZ) ObjUtil.renderPartWithIcon((HFRWavefrontObject) ResourceManager.cable_neo, "posZ", iconCable, tessellator, 0, true);
if(pZ) ObjUtil.renderPartWithIcon((WavefrontObject) ResourceManager.cable_neo, "negZ", iconCable, tessellator, 0, true); if(pZ) ObjUtil.renderPartWithIcon((HFRWavefrontObject) ResourceManager.cable_neo, "negZ", iconCable, tessellator, 0, true);
tessellator.addTranslation(-x - 0.5F, -y - 0.5F, -z - 0.5F); tessellator.addTranslation(-x - 0.5F, -y - 0.5F, -z - 0.5F);

View File

@ -2,6 +2,9 @@ package com.hbm.render.block;
import com.hbm.blocks.machine.SolarMirror; import com.hbm.blocks.machine.SolarMirror;
import com.hbm.main.ResourceManager; import com.hbm.main.ResourceManager;
import com.hbm.render.loader.HFRWavefrontObject;
import com.hbm.render.loader.S_Face;
import com.hbm.render.loader.S_GroupObject;
import com.hbm.render.util.ObjUtil; import com.hbm.render.util.ObjUtil;
import com.hbm.tileentity.machine.TileEntitySolarMirror; import com.hbm.tileentity.machine.TileEntitySolarMirror;
@ -13,11 +16,8 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.IIcon; import net.minecraft.util.IIcon;
import net.minecraft.util.Vec3; import net.minecraft.util.Vec3;
import net.minecraft.world.IBlockAccess; import net.minecraft.world.IBlockAccess;
import net.minecraftforge.client.model.obj.Face;
import net.minecraftforge.client.model.obj.GroupObject;
import net.minecraftforge.client.model.obj.TextureCoordinate; import net.minecraftforge.client.model.obj.TextureCoordinate;
import net.minecraftforge.client.model.obj.Vertex; import net.minecraftforge.client.model.obj.Vertex;
import net.minecraftforge.client.model.obj.WavefrontObject;
public class RenderMirror implements ISimpleBlockRenderingHandler { public class RenderMirror implements ISimpleBlockRenderingHandler {
@ -49,10 +49,10 @@ public class RenderMirror implements ISimpleBlockRenderingHandler {
int dz = mirror.tZ - mirror.zCoord; int dz = mirror.tZ - mirror.zCoord;
tessellator.addTranslation(x + 0.5F, y, z + 0.5F); tessellator.addTranslation(x + 0.5F, y, z + 0.5F);
ObjUtil.renderPartWithIcon((WavefrontObject) ResourceManager.solar_mirror, "Base", iicon, tessellator, 0, true); ObjUtil.renderPartWithIcon((HFRWavefrontObject) ResourceManager.solar_mirror, "Base", iicon, tessellator, 0, true);
if(mirror.tY <= mirror.yCoord) if(mirror.tY <= mirror.yCoord)
ObjUtil.renderPartWithIcon((WavefrontObject) ResourceManager.solar_mirror, "Mirror", iicon, tessellator, 0, true); ObjUtil.renderPartWithIcon((HFRWavefrontObject) ResourceManager.solar_mirror, "Mirror", iicon, tessellator, 0, true);
else else
printMirror(iicon, dx, dy, dz); printMirror(iicon, dx, dy, dz);
@ -63,9 +63,9 @@ public class RenderMirror implements ISimpleBlockRenderingHandler {
private void printMirror(IIcon icon, int dx, int dy, int dz) { private void printMirror(IIcon icon, int dx, int dy, int dz) {
GroupObject go = null; S_GroupObject go = null;
for(GroupObject obj : ((WavefrontObject)ResourceManager.solar_mirror).groupObjects) { for(S_GroupObject obj : ((HFRWavefrontObject) ResourceManager.solar_mirror).groupObjects) {
if(obj.name.equals("Mirror")) go = obj; if(obj.name.equals("Mirror")) go = obj;
} }
@ -77,7 +77,7 @@ public class RenderMirror implements ISimpleBlockRenderingHandler {
double pitch = -Math.asin(dy / dist) + Math.PI / 2D; double pitch = -Math.asin(dy / dist) + Math.PI / 2D;
double yaw = -Math.atan2(dz, dx) - Math.PI / 2D; double yaw = -Math.atan2(dz, dx) - Math.PI / 2D;
for(Face f : go.faces) { for(S_Face f : go.faces) {
Vertex n = f.faceNormal; Vertex n = f.faceNormal;

View File

@ -4,6 +4,7 @@ import org.lwjgl.opengl.GL11;
import com.hbm.blocks.network.CranePartitioner; import com.hbm.blocks.network.CranePartitioner;
import com.hbm.main.ResourceManager; import com.hbm.main.ResourceManager;
import com.hbm.render.loader.HFRWavefrontObject;
import com.hbm.render.util.ObjUtil; import com.hbm.render.util.ObjUtil;
import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
@ -11,7 +12,6 @@ import net.minecraft.block.Block;
import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.RenderBlocks;
import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.Tessellator;
import net.minecraft.world.IBlockAccess; import net.minecraft.world.IBlockAccess;
import net.minecraftforge.client.model.obj.WavefrontObject;
public class RenderPartitioner implements ISimpleBlockRenderingHandler { public class RenderPartitioner implements ISimpleBlockRenderingHandler {
@ -60,12 +60,12 @@ public class RenderPartitioner implements ISimpleBlockRenderingHandler {
private static void drawPartitioner(Tessellator tessellator, Block block, float rotation, boolean shadeNormals) { private static void drawPartitioner(Tessellator tessellator, Block block, float rotation, boolean shadeNormals) {
CranePartitioner partitioner = (CranePartitioner) block; CranePartitioner partitioner = (CranePartitioner) block;
ObjUtil.renderPartWithIcon((WavefrontObject) ResourceManager.crane_buffer, "Side", partitioner.getIcon(0, 0), tessellator, rotation, shadeNormals); ObjUtil.renderPartWithIcon((HFRWavefrontObject) ResourceManager.crane_buffer, "Side", partitioner.getIcon(0, 0), tessellator, rotation, shadeNormals);
ObjUtil.renderPartWithIcon((WavefrontObject) ResourceManager.crane_buffer, "Back", partitioner.iconBack, tessellator, rotation, shadeNormals); ObjUtil.renderPartWithIcon((HFRWavefrontObject) ResourceManager.crane_buffer, "Back", partitioner.iconBack, tessellator, rotation, shadeNormals);
ObjUtil.renderPartWithIcon((WavefrontObject) ResourceManager.crane_buffer, "Top_Top.001", partitioner.iconTop, tessellator, rotation, shadeNormals); ObjUtil.renderPartWithIcon((HFRWavefrontObject) ResourceManager.crane_buffer, "Top_Top.001", partitioner.iconTop, tessellator, rotation, shadeNormals);
ObjUtil.renderPartWithIcon((WavefrontObject) ResourceManager.crane_buffer, "Inner", partitioner.iconInner, tessellator, rotation, shadeNormals); ObjUtil.renderPartWithIcon((HFRWavefrontObject) ResourceManager.crane_buffer, "Inner", partitioner.iconInner, tessellator, rotation, shadeNormals);
ObjUtil.renderPartWithIcon((WavefrontObject) ResourceManager.crane_buffer, "InnerSide", partitioner.iconInnerSide, tessellator, rotation, shadeNormals); ObjUtil.renderPartWithIcon((HFRWavefrontObject) ResourceManager.crane_buffer, "InnerSide", partitioner.iconInnerSide, tessellator, rotation, shadeNormals);
ObjUtil.renderPartWithIcon((WavefrontObject) ResourceManager.crane_buffer, "Belt", partitioner.iconBelt, tessellator, rotation, shadeNormals); ObjUtil.renderPartWithIcon((HFRWavefrontObject) ResourceManager.crane_buffer, "Belt", partitioner.iconBelt, tessellator, rotation, shadeNormals);
} }
@Override @Override

View File

@ -4,6 +4,7 @@ import org.lwjgl.opengl.GL11;
import com.hbm.blocks.generic.BlockPipe; import com.hbm.blocks.generic.BlockPipe;
import com.hbm.main.ResourceManager; import com.hbm.main.ResourceManager;
import com.hbm.render.loader.HFRWavefrontObject;
import com.hbm.render.util.ObjUtil; import com.hbm.render.util.ObjUtil;
import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
@ -12,7 +13,6 @@ import net.minecraft.client.renderer.RenderBlocks;
import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.Tessellator;
import net.minecraft.util.IIcon; import net.minecraft.util.IIcon;
import net.minecraft.world.IBlockAccess; import net.minecraft.world.IBlockAccess;
import net.minecraftforge.client.model.obj.WavefrontObject;
public class RenderPipe implements ISimpleBlockRenderingHandler { public class RenderPipe implements ISimpleBlockRenderingHandler {
@ -33,25 +33,25 @@ public class RenderPipe implements ISimpleBlockRenderingHandler {
tessellator.startDrawingQuads(); tessellator.startDrawingQuads();
if(pipe.rType == 0) { if(pipe.rType == 0) {
ObjUtil.renderPartWithIcon((WavefrontObject) ResourceManager.pipe, "Top", iiconTop, tessellator, 0, false); ObjUtil.renderPartWithIcon((HFRWavefrontObject) ResourceManager.pipe, "Top", iiconTop, tessellator, 0, false);
ObjUtil.renderPartWithIcon((WavefrontObject) ResourceManager.pipe, "Side", iiconSide, tessellator, 0, false); ObjUtil.renderPartWithIcon((HFRWavefrontObject) ResourceManager.pipe, "Side", iiconSide, tessellator, 0, false);
} }
if(pipe.rType == 1) { if(pipe.rType == 1) {
ObjUtil.renderPartWithIcon((WavefrontObject) ResourceManager.pipe_rim, "Top", iiconTop, tessellator, 0, false); ObjUtil.renderPartWithIcon((HFRWavefrontObject) ResourceManager.pipe_rim, "Top", iiconTop, tessellator, 0, false);
ObjUtil.renderPartWithIcon((WavefrontObject) ResourceManager.pipe_rim, "Side", iiconSide, tessellator, 0, false); ObjUtil.renderPartWithIcon((HFRWavefrontObject) ResourceManager.pipe_rim, "Side", iiconSide, tessellator, 0, false);
} }
if(pipe.rType == 2) { if(pipe.rType == 2) {
ObjUtil.renderPartWithIcon((WavefrontObject) ResourceManager.pipe_quad, "Top", iiconTop, tessellator, 0, false); ObjUtil.renderPartWithIcon((HFRWavefrontObject) ResourceManager.pipe_quad, "Top", iiconTop, tessellator, 0, false);
ObjUtil.renderPartWithIcon((WavefrontObject) ResourceManager.pipe_quad, "Side", iiconSide, tessellator, 0, false); ObjUtil.renderPartWithIcon((HFRWavefrontObject) ResourceManager.pipe_quad, "Side", iiconSide, tessellator, 0, false);
} }
if(pipe.rType == 3) { if(pipe.rType == 3) {
ObjUtil.renderPartWithIcon((WavefrontObject) ResourceManager.pipe_rim, "Top", iiconTop, tessellator, 0, false); ObjUtil.renderPartWithIcon((HFRWavefrontObject) ResourceManager.pipe_rim, "Top", iiconTop, tessellator, 0, false);
ObjUtil.renderPartWithIcon((WavefrontObject) ResourceManager.pipe_rim, "Side", iiconSide, tessellator, 0, false); ObjUtil.renderPartWithIcon((HFRWavefrontObject) ResourceManager.pipe_rim, "Side", iiconSide, tessellator, 0, false);
ObjUtil.renderPartWithIcon((WavefrontObject) ResourceManager.pipe_frame, "Frame", pipe.frameIcon, tessellator, 0, false); ObjUtil.renderPartWithIcon((HFRWavefrontObject) ResourceManager.pipe_frame, "Frame", pipe.frameIcon, tessellator, 0, false);
ObjUtil.renderPartWithIcon((WavefrontObject) ResourceManager.pipe_frame, "Mesh", pipe.meshIcon, tessellator, 0, false); ObjUtil.renderPartWithIcon((HFRWavefrontObject) ResourceManager.pipe_frame, "Mesh", pipe.meshIcon, tessellator, 0, false);
} }
tessellator.draw(); tessellator.draw();
@ -90,25 +90,25 @@ public class RenderPipe implements ISimpleBlockRenderingHandler {
} }
if(pipe.rType == 0) { if(pipe.rType == 0) {
ObjUtil.renderPartWithIcon((WavefrontObject) ResourceManager.pipe, "Top", iiconTop, tessellator, rot, pitch, true); ObjUtil.renderPartWithIcon((HFRWavefrontObject) ResourceManager.pipe, "Top", iiconTop, tessellator, rot, pitch, true);
ObjUtil.renderPartWithIcon((WavefrontObject) ResourceManager.pipe, "Side", iiconSide, tessellator, rot, pitch, true); ObjUtil.renderPartWithIcon((HFRWavefrontObject) ResourceManager.pipe, "Side", iiconSide, tessellator, rot, pitch, true);
} }
if(pipe.rType == 1) { if(pipe.rType == 1) {
ObjUtil.renderPartWithIcon((WavefrontObject) ResourceManager.pipe_rim, "Top", iiconTop, tessellator, rot, pitch, true); ObjUtil.renderPartWithIcon((HFRWavefrontObject) ResourceManager.pipe_rim, "Top", iiconTop, tessellator, rot, pitch, true);
ObjUtil.renderPartWithIcon((WavefrontObject) ResourceManager.pipe_rim, "Side", iiconSide, tessellator, rot, pitch, true); ObjUtil.renderPartWithIcon((HFRWavefrontObject) ResourceManager.pipe_rim, "Side", iiconSide, tessellator, rot, pitch, true);
} }
if(pipe.rType == 2) { if(pipe.rType == 2) {
ObjUtil.renderPartWithIcon((WavefrontObject) ResourceManager.pipe_quad, "Top", iiconTop, tessellator, rot, pitch, true); ObjUtil.renderPartWithIcon((HFRWavefrontObject) ResourceManager.pipe_quad, "Top", iiconTop, tessellator, rot, pitch, true);
ObjUtil.renderPartWithIcon((WavefrontObject) ResourceManager.pipe_quad, "Side", iiconSide, tessellator, rot, pitch, true); ObjUtil.renderPartWithIcon((HFRWavefrontObject) ResourceManager.pipe_quad, "Side", iiconSide, tessellator, rot, pitch, true);
} }
if(pipe.rType == 3) { if(pipe.rType == 3) {
ObjUtil.renderPartWithIcon((WavefrontObject) ResourceManager.pipe_rim, "Top", iiconTop, tessellator, rot, pitch, true); ObjUtil.renderPartWithIcon((HFRWavefrontObject) ResourceManager.pipe_rim, "Top", iiconTop, tessellator, rot, pitch, true);
ObjUtil.renderPartWithIcon((WavefrontObject) ResourceManager.pipe_rim, "Side", iiconSide, tessellator, rot, pitch, true); ObjUtil.renderPartWithIcon((HFRWavefrontObject) ResourceManager.pipe_rim, "Side", iiconSide, tessellator, rot, pitch, true);
ObjUtil.renderPartWithIcon((WavefrontObject) ResourceManager.pipe_frame, "Frame", pipe.frameIcon, tessellator, rot, pitch, true); ObjUtil.renderPartWithIcon((HFRWavefrontObject) ResourceManager.pipe_frame, "Frame", pipe.frameIcon, tessellator, rot, pitch, true);
ObjUtil.renderPartWithIcon((WavefrontObject) ResourceManager.pipe_frame, "Mesh", pipe.meshIcon, tessellator, rot, pitch, true); ObjUtil.renderPartWithIcon((HFRWavefrontObject) ResourceManager.pipe_frame, "Mesh", pipe.meshIcon, tessellator, rot, pitch, true);
} }
tessellator.addTranslation(-x - 0.5F, -y - 0.5F, -z - 0.5F); tessellator.addTranslation(-x - 0.5F, -y - 0.5F, -z - 0.5F);

View File

@ -4,6 +4,7 @@ import org.lwjgl.opengl.GL11;
import com.hbm.blocks.machine.rbmk.RBMKDebris; import com.hbm.blocks.machine.rbmk.RBMKDebris;
import com.hbm.main.ResourceManager; import com.hbm.main.ResourceManager;
import com.hbm.render.loader.HFRWavefrontObject;
import com.hbm.render.util.ObjUtil; import com.hbm.render.util.ObjUtil;
import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
@ -12,7 +13,6 @@ import net.minecraft.client.renderer.RenderBlocks;
import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.Tessellator;
import net.minecraft.util.IIcon; import net.minecraft.util.IIcon;
import net.minecraft.world.IBlockAccess; import net.minecraft.world.IBlockAccess;
import net.minecraftforge.client.model.obj.WavefrontObject;
public class RenderPribris implements ISimpleBlockRenderingHandler { public class RenderPribris implements ISimpleBlockRenderingHandler {
@ -30,7 +30,7 @@ public class RenderPribris implements ISimpleBlockRenderingHandler {
GL11.glTranslated(0, -0.5, 0); GL11.glTranslated(0, -0.5, 0);
tessellator.startDrawingQuads(); tessellator.startDrawingQuads();
ObjUtil.renderWithIcon((WavefrontObject) ResourceManager.rbmk_debris, iicon, tessellator, 0, false); ObjUtil.renderWithIcon((HFRWavefrontObject) ResourceManager.rbmk_debris, iicon, tessellator, 0, false);
tessellator.draw(); tessellator.draw();
GL11.glPopMatrix(); GL11.glPopMatrix();
@ -50,7 +50,7 @@ public class RenderPribris implements ISimpleBlockRenderingHandler {
} }
tessellator.addTranslation(x + 0.5F, y, z + 0.5F); tessellator.addTranslation(x + 0.5F, y, z + 0.5F);
ObjUtil.renderWithIcon((WavefrontObject) ResourceManager.rbmk_debris, iicon, tessellator, 0, true); ObjUtil.renderWithIcon((HFRWavefrontObject) ResourceManager.rbmk_debris, iicon, tessellator, 0, true);
tessellator.addTranslation(-x - 0.5F, -y, -z - 0.5F); tessellator.addTranslation(-x - 0.5F, -y, -z - 0.5F);
return true; return true;

View File

@ -2,6 +2,7 @@ package com.hbm.render.block;
import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL11;
import com.hbm.blocks.BlockDummyable;
import com.hbm.blocks.ModBlocks; import com.hbm.blocks.ModBlocks;
import com.hbm.blocks.machine.rbmk.RBMKBase; import com.hbm.blocks.machine.rbmk.RBMKBase;
import com.hbm.main.ResourceManager; import com.hbm.main.ResourceManager;
@ -13,7 +14,7 @@ import net.minecraft.client.renderer.RenderBlocks;
import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.Tessellator;
import net.minecraft.util.IIcon; import net.minecraft.util.IIcon;
import net.minecraft.world.IBlockAccess; import net.minecraft.world.IBlockAccess;
import net.minecraftforge.client.model.obj.WavefrontObject; import net.minecraftforge.common.util.ForgeDirection;
public class RenderRBMKControl implements ISimpleBlockRenderingHandler { public class RenderRBMKControl implements ISimpleBlockRenderingHandler {
@ -34,16 +35,46 @@ public class RenderRBMKControl implements ISimpleBlockRenderingHandler {
for(int i = 0; i < 4; i++) { for(int i = 0; i < 4; i++) {
tessellator.startDrawingQuads(); tessellator.startDrawingQuads();
ObjUtil.renderPartWithIcon((WavefrontObject) ResourceManager.rbmk_rods, "Column", iicon, tessellator, 0, false); tessellator.setNormal(0F, 1F, 0F); renderer.renderFaceYPos(block, -0.5, 0, -0.5, block.getIcon(ForgeDirection.UP.ordinal(), 0));
tessellator.setNormal(0F, -1F, 0F); renderer.renderFaceYNeg(block, -0.5, 0, -0.5, block.getIcon(ForgeDirection.DOWN.ordinal(), 0));
tessellator.setNormal(1F, 0F, 0F); renderer.renderFaceXPos(block, -0.5, 0, -0.5, block.getIcon(ForgeDirection.NORTH.ordinal(), 0));
tessellator.setNormal(-1F, 0F, 0F); renderer.renderFaceXNeg(block, -0.5, 0, -0.5, block.getIcon(ForgeDirection.SOUTH.ordinal(), 0));
tessellator.setNormal(0F, 0F, 1F); renderer.renderFaceZPos(block, -0.5, 0, -0.5, block.getIcon(ForgeDirection.EAST.ordinal(), 0));
tessellator.setNormal(0F, 0F, -1F); renderer.renderFaceZNeg(block, -0.5, 0, -0.5, block.getIcon(ForgeDirection.WEST.ordinal(), 0));
tessellator.draw(); tessellator.draw();
if(i < 3) GL11.glTranslated(0, 1, 0);
if(i < 3)
GL11.glTranslated(0, 1, 0);
} }
if(block != ModBlocks.rbmk_boiler) {
tessellator.startDrawingQuads(); tessellator.startDrawingQuads();
ObjUtil.renderPartWithIcon((WavefrontObject) ResourceManager.rbmk_rods, "Lid", iicon, tessellator, 0, true); renderer.setRenderBounds(0.0625, 0, 0.0625, 0.4375, 0.125, 0.4375);
tessellator.setNormal(0F, 1F, 0F); renderer.renderFaceYPos(block, -0.5, 1, -0.5, block.getIcon(ForgeDirection.UP.ordinal(), 0));
tessellator.setNormal(1F, 0F, 0F); renderer.renderFaceXPos(block, -0.5, 1, -0.5, block.getIcon(ForgeDirection.NORTH.ordinal(), 0));
tessellator.setNormal(-1F, 0F, 0F); renderer.renderFaceXNeg(block, -0.5, 1, -0.5, block.getIcon(ForgeDirection.SOUTH.ordinal(), 0));
tessellator.setNormal(0F, 0F, 1F); renderer.renderFaceZPos(block, -0.5, 1, -0.5, block.getIcon(ForgeDirection.EAST.ordinal(), 0));
tessellator.setNormal(0F, 0F, -1F); renderer.renderFaceZNeg(block, -0.5, 1, -0.5, block.getIcon(ForgeDirection.WEST.ordinal(), 0));
renderer.setRenderBounds(0.0625, 0, 0.5625, 0.4375, 0.125, 0.9375);
tessellator.setNormal(0F, 1F, 0F); renderer.renderFaceYPos(block, -0.5, 1, -0.5, block.getIcon(ForgeDirection.UP.ordinal(), 0));
tessellator.setNormal(1F, 0F, 0F); renderer.renderFaceXPos(block, -0.5, 1, -0.5, block.getIcon(ForgeDirection.NORTH.ordinal(), 0));
tessellator.setNormal(-1F, 0F, 0F); renderer.renderFaceXNeg(block, -0.5, 1, -0.5, block.getIcon(ForgeDirection.SOUTH.ordinal(), 0));
tessellator.setNormal(0F, 0F, 1F); renderer.renderFaceZPos(block, -0.5, 1, -0.5, block.getIcon(ForgeDirection.EAST.ordinal(), 0));
tessellator.setNormal(0F, 0F, -1F); renderer.renderFaceZNeg(block, -0.5, 1, -0.5, block.getIcon(ForgeDirection.WEST.ordinal(), 0));
renderer.setRenderBounds(0.5625, 0, 0.5625, 0.9375, 0.125, 0.9375);
tessellator.setNormal(0F, 1F, 0F); renderer.renderFaceYPos(block, -0.5, 1, -0.5, block.getIcon(ForgeDirection.UP.ordinal(), 0));
tessellator.setNormal(1F, 0F, 0F); renderer.renderFaceXPos(block, -0.5, 1, -0.5, block.getIcon(ForgeDirection.NORTH.ordinal(), 0));
tessellator.setNormal(-1F, 0F, 0F); renderer.renderFaceXNeg(block, -0.5, 1, -0.5, block.getIcon(ForgeDirection.SOUTH.ordinal(), 0));
tessellator.setNormal(0F, 0F, 1F); renderer.renderFaceZPos(block, -0.5, 1, -0.5, block.getIcon(ForgeDirection.EAST.ordinal(), 0));
tessellator.setNormal(0F, 0F, -1F); renderer.renderFaceZNeg(block, -0.5, 1, -0.5, block.getIcon(ForgeDirection.WEST.ordinal(), 0));
renderer.setRenderBounds(0.5625, 0, 0.0625, 0.9375, 0.125, 0.4375);
tessellator.setNormal(0F, 1F, 0F); renderer.renderFaceYPos(block, -0.5, 1, -0.5, block.getIcon(ForgeDirection.UP.ordinal(), 0));
tessellator.setNormal(1F, 0F, 0F); renderer.renderFaceXPos(block, -0.5, 1, -0.5, block.getIcon(ForgeDirection.NORTH.ordinal(), 0));
tessellator.setNormal(-1F, 0F, 0F); renderer.renderFaceXNeg(block, -0.5, 1, -0.5, block.getIcon(ForgeDirection.SOUTH.ordinal(), 0));
tessellator.setNormal(0F, 0F, 1F); renderer.renderFaceZPos(block, -0.5, 1, -0.5, block.getIcon(ForgeDirection.EAST.ordinal(), 0));
tessellator.setNormal(0F, 0F, -1F); renderer.renderFaceZNeg(block, -0.5, 1, -0.5, block.getIcon(ForgeDirection.WEST.ordinal(), 0));
tessellator.draw();
if(block != ModBlocks.rbmk_boiler && block != ModBlocks.rbmk_heater) {
tessellator.startDrawingQuads();
ObjUtil.renderPartWithIcon(ResourceManager.rbmk_rods, "Lid", iicon, tessellator, 0, true);
tessellator.draw(); tessellator.draw();
} }
@ -54,19 +85,47 @@ public class RenderRBMKControl implements ISimpleBlockRenderingHandler {
public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) {
Tessellator tessellator = Tessellator.instance; Tessellator tessellator = Tessellator.instance;
IIcon iicon = block.getIcon(0, world.getBlockMetadata(x, y, z)); int meta = world.getBlockMetadata(x, y, z);
tessellator.setBrightness(block.getMixedBrightnessForBlock(world, x, y, z)); tessellator.setBrightness(block.getMixedBrightnessForBlock(world, x, y, z));
tessellator.setColorOpaque_F(1, 1, 1); tessellator.setColorOpaque_F(1, 1, 1);
renderer.renderStandardBlock(block, x, y, z);
if(renderer.hasOverrideBlockTexture()) { if(meta >= 6 && meta < 12) {
iicon = renderer.overrideBlockTexture;
boolean hasLid = false;
if(block == ModBlocks.rbmk_boiler || block == ModBlocks.rbmk_heater) {
int[] pos = ((BlockDummyable) block).findCore(world, x, y, z);
if(pos != null) {
int coreMeta = world.getBlockMetadata(pos[0], pos[1], pos[2]);
if(coreMeta - 10 == RBMKBase.DIR_NORMAL_LID.ordinal()) {
tessellator.addTranslation(0, 1, 0);
renderer.setRenderBounds(0, 0, 0, 1, 0.25, 1);
RBMKBase.renderLid = true;
renderer.renderStandardBlock(block, x, y, z);
RBMKBase.renderLid = false;
tessellator.addTranslation(0, -1, 0);
hasLid = true;
}
}
} }
tessellator.addTranslation(x + 0.5F, y, z + 0.5F); if(!hasLid) {
ObjUtil.renderPartWithIcon((WavefrontObject) ResourceManager.rbmk_rods, "Column", iicon, tessellator, 0, true); tessellator.addTranslation(0, 1, 0);
renderer.setRenderBounds(0.0625, 0, 0.0625, 0.4375, 0.125, 0.4375);
tessellator.addTranslation(-x - 0.5F, -y, -z - 0.5F); renderer.renderStandardBlock(block, x, y, z);
renderer.setRenderBounds(0.0625, 0, 0.5625, 0.4375, 0.125, 0.9375);
renderer.renderStandardBlock(block, x, y, z);
renderer.setRenderBounds(0.5625, 0, 0.5625, 0.9375, 0.125, 0.9375);
renderer.renderStandardBlock(block, x, y, z);
renderer.setRenderBounds(0.5625, 0, 0.0625, 0.9375, 0.125, 0.4375);
renderer.renderStandardBlock(block, x, y, z);
tessellator.addTranslation(0, -1, 0);
}
} else {
}
return true; return true;
} }

View File

@ -2,17 +2,15 @@ package com.hbm.render.block;
import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL11;
import com.hbm.blocks.BlockDummyable;
import com.hbm.blocks.machine.rbmk.RBMKBase; import com.hbm.blocks.machine.rbmk.RBMKBase;
import com.hbm.main.ResourceManager;
import com.hbm.render.util.ObjUtil;
import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.RenderBlocks;
import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.Tessellator;
import net.minecraft.util.IIcon;
import net.minecraft.world.IBlockAccess; import net.minecraft.world.IBlockAccess;
import net.minecraftforge.client.model.obj.WavefrontObject; import net.minecraftforge.common.util.ForgeDirection;
public class RenderRBMKReflector implements ISimpleBlockRenderingHandler { public class RenderRBMKReflector implements ISimpleBlockRenderingHandler {
@ -21,19 +19,19 @@ public class RenderRBMKReflector implements ISimpleBlockRenderingHandler {
GL11.glPushMatrix(); GL11.glPushMatrix();
Tessellator tessellator = Tessellator.instance; Tessellator tessellator = Tessellator.instance;
IIcon iicon = block.getIcon(0, 0);
tessellator.setColorOpaque_F(1, 1, 1); tessellator.setColorOpaque_F(1, 1, 1);
if(renderer.hasOverrideBlockTexture()) {
iicon = renderer.overrideBlockTexture;
}
GL11.glTranslated(0, -0.675, 0); GL11.glTranslated(0, -0.675, 0);
GL11.glScalef(0.35F, 0.35F, 0.35F); GL11.glScalef(0.35F, 0.35F, 0.35F);
for(int i = 0; i < 4; i++) { for(int i = 0; i < 4; i++) {
tessellator.startDrawingQuads(); tessellator.startDrawingQuads();
ObjUtil.renderPartWithIcon((WavefrontObject) ResourceManager.rbmk_reflector, "Column", iicon, tessellator, 0, false); tessellator.setNormal(0F, 1F, 0F); renderer.renderFaceYPos(block, -0.5, 0, -0.5, block.getIcon(ForgeDirection.UP.ordinal(), 0));
tessellator.setNormal(0F, -1F, 0F); renderer.renderFaceYNeg(block, -0.5, 0, -0.5, block.getIcon(ForgeDirection.DOWN.ordinal(), 0));
tessellator.setNormal(1F, 0F, 0F); renderer.renderFaceXPos(block, -0.5, 0, -0.5, block.getIcon(ForgeDirection.NORTH.ordinal(), 0));
tessellator.setNormal(-1F, 0F, 0F); renderer.renderFaceXNeg(block, -0.5, 0, -0.5, block.getIcon(ForgeDirection.SOUTH.ordinal(), 0));
tessellator.setNormal(0F, 0F, 1F); renderer.renderFaceZPos(block, -0.5, 0, -0.5, block.getIcon(ForgeDirection.EAST.ordinal(), 0));
tessellator.setNormal(0F, 0F, -1F); renderer.renderFaceZNeg(block, -0.5, 0, -0.5, block.getIcon(ForgeDirection.WEST.ordinal(), 0));
tessellator.draw(); tessellator.draw();
GL11.glTranslated(0, 1, 0); GL11.glTranslated(0, 1, 0);
} }
@ -45,19 +43,29 @@ public class RenderRBMKReflector implements ISimpleBlockRenderingHandler {
public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) {
Tessellator tessellator = Tessellator.instance; Tessellator tessellator = Tessellator.instance;
IIcon iicon = block.getIcon(0, world.getBlockMetadata(x, y, z));
tessellator.setBrightness(block.getMixedBrightnessForBlock(world, x, y, z)); tessellator.setBrightness(block.getMixedBrightnessForBlock(world, x, y, z));
tessellator.setColorOpaque_F(1, 1, 1); tessellator.setColorOpaque_F(1, 1, 1);
int meta = world.getBlockMetadata(x, y, z);
if(renderer.hasOverrideBlockTexture()) { renderer.setRenderBounds(0, 0, 0, 1, 1, 1);
iicon = renderer.overrideBlockTexture; renderer.renderStandardBlock(block, x, y, z);
if(meta >= 6 && meta < 12) {
int[] pos = ((BlockDummyable) block).findCore(world, x, y, z);
if(pos != null) {
int coreMeta = world.getBlockMetadata(pos[0], pos[1], pos[2]);
if(coreMeta - 10 == RBMKBase.DIR_NORMAL_LID.ordinal()) {
tessellator.addTranslation(0, 1, 0);
renderer.setRenderBounds(0, 0, 0, 1, 0.25, 1);
RBMKBase.renderLid = true;
renderer.renderStandardBlock(block, x, y, z);
RBMKBase.renderLid = false;
tessellator.addTranslation(0, -1, 0);
}
}
} }
tessellator.addTranslation(x + 0.5F, y, z + 0.5F);
ObjUtil.renderPartWithIcon((WavefrontObject) ResourceManager.rbmk_reflector, "Column", iicon, tessellator, 0, true);
tessellator.addTranslation(-x - 0.5F, -y, -z - 0.5F);
return true; return true;
} }

View File

@ -2,8 +2,11 @@ package com.hbm.render.block;
import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL11;
import com.hbm.blocks.BlockDummyable;
import com.hbm.blocks.machine.rbmk.RBMKBase; import com.hbm.blocks.machine.rbmk.RBMKBase;
import com.hbm.blocks.machine.rbmk.RBMKRod;
import com.hbm.main.ResourceManager; import com.hbm.main.ResourceManager;
import com.hbm.render.loader.HFRWavefrontObject;
import com.hbm.render.util.ObjUtil; import com.hbm.render.util.ObjUtil;
import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
@ -12,7 +15,6 @@ import net.minecraft.client.renderer.RenderBlocks;
import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.Tessellator;
import net.minecraft.util.IIcon; import net.minecraft.util.IIcon;
import net.minecraft.world.IBlockAccess; import net.minecraft.world.IBlockAccess;
import net.minecraftforge.client.model.obj.WavefrontObject;
public class RenderRBMKRod implements ISimpleBlockRenderingHandler { public class RenderRBMKRod implements ISimpleBlockRenderingHandler {
@ -20,8 +22,10 @@ public class RenderRBMKRod implements ISimpleBlockRenderingHandler {
public void renderInventoryBlock(Block block, int metadata, int modelId, RenderBlocks renderer) { public void renderInventoryBlock(Block block, int metadata, int modelId, RenderBlocks renderer) {
GL11.glPushMatrix(); GL11.glPushMatrix();
RBMKRod rod = (RBMKRod) block;
Tessellator tessellator = Tessellator.instance; Tessellator tessellator = Tessellator.instance;
IIcon iicon = block.getIcon(0, 0); IIcon iicon = block.getIcon(0, 0);
IIcon sideIcon = block.getIcon(2, 0);
tessellator.setColorOpaque_F(1, 1, 1); tessellator.setColorOpaque_F(1, 1, 1);
if(renderer.hasOverrideBlockTexture()) { if(renderer.hasOverrideBlockTexture()) {
@ -33,8 +37,13 @@ public class RenderRBMKRod implements ISimpleBlockRenderingHandler {
for(int i = 0; i < 4; i++) { for(int i = 0; i < 4; i++) {
tessellator.startDrawingQuads(); tessellator.startDrawingQuads();
ObjUtil.renderPartWithIcon((WavefrontObject) ResourceManager.rbmk_element, "Column", iicon, tessellator, 0, false); ObjUtil.renderPartWithIcon((HFRWavefrontObject) ResourceManager.rbmk_element, "Inner", rod.inner, tessellator, 0, false);
ObjUtil.renderPartWithIcon((WavefrontObject) ResourceManager.rbmk_element, "Rods", iicon, tessellator, 0, false); ObjUtil.renderPartWithIcon((HFRWavefrontObject) ResourceManager.rbmk_element, "Cap", iicon, tessellator, 0, false);
ObjUtil.renderPartWithIcon((HFRWavefrontObject) ResourceManager.rbmk_element_rods, "Rods", rod.fuel, tessellator, 0, false);
tessellator.setNormal(-1F, 0F, 0F); renderer.renderFaceXNeg(block, -0.5, 0, -0.5, sideIcon);
tessellator.setNormal(1F, 0F, 0F); renderer.renderFaceXPos(block, -0.5, 0, -0.5, sideIcon);
tessellator.setNormal(0F, 0F, -1F); renderer.renderFaceZNeg(block, -0.5, 0, -0.5, sideIcon);
tessellator.setNormal(0F, 0F, 1F); renderer.renderFaceZPos(block, -0.5, 0, -0.5, sideIcon);
tessellator.draw(); tessellator.draw();
GL11.glTranslated(0, 1, 0); GL11.glTranslated(0, 1, 0);
} }
@ -45,8 +54,10 @@ public class RenderRBMKRod implements ISimpleBlockRenderingHandler {
@Override @Override
public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) {
RBMKRod rod = (RBMKRod) block;
Tessellator tessellator = Tessellator.instance; Tessellator tessellator = Tessellator.instance;
IIcon iicon = block.getIcon(0, world.getBlockMetadata(x, y, z)); int meta = world.getBlockMetadata(x, y, z);
IIcon iicon = block.getIcon(0, meta);
tessellator.setBrightness(block.getMixedBrightnessForBlock(world, x, y, z)); tessellator.setBrightness(block.getMixedBrightnessForBlock(world, x, y, z));
tessellator.setColorOpaque_F(1, 1, 1); tessellator.setColorOpaque_F(1, 1, 1);
@ -55,11 +66,33 @@ public class RenderRBMKRod implements ISimpleBlockRenderingHandler {
iicon = renderer.overrideBlockTexture; iicon = renderer.overrideBlockTexture;
} }
tessellator.addTranslation(x + 0.5F, y, z + 0.5F); renderer.setRenderBounds(0, 0, 0, 1, 1, 1);
ObjUtil.renderPartWithIcon((WavefrontObject) ResourceManager.rbmk_element, "Column", iicon, tessellator, 0, true); rod.overrideOnlyRenderSides = true;
renderer.renderStandardBlock(block, x, y, z);
rod.overrideOnlyRenderSides = false;
tessellator.setBrightness(block.getMixedBrightnessForBlock(world, x, y, z));
tessellator.addTranslation(x + 0.5F, y, z + 0.5F);
ObjUtil.renderPartWithIcon((HFRWavefrontObject) ResourceManager.rbmk_element, "Cap", iicon, tessellator, 0, true);
ObjUtil.renderPartWithIcon((HFRWavefrontObject) ResourceManager.rbmk_element, "Inner", rod.inner, tessellator, 0, true);
tessellator.addTranslation(-x - 0.5F, -y, -z - 0.5F); tessellator.addTranslation(-x - 0.5F, -y, -z - 0.5F);
if(meta >= 6 && meta < 12) {
int[] pos = ((BlockDummyable) block).findCore(world, x, y, z);
if(pos != null) {
int coreMeta = world.getBlockMetadata(pos[0], pos[1], pos[2]);
if(coreMeta - 10 == RBMKBase.DIR_NORMAL_LID.ordinal()) {
tessellator.addTranslation(0, 1, 0);
renderer.setRenderBounds(0, 0, 0, 1, 0.25, 1);
RBMKBase.renderLid = true;
renderer.renderStandardBlock(block, x, y, z);
RBMKBase.renderLid = false;
tessellator.addTranslation(0, -1, 0);
}
}
}
return true; return true;
} }

View File

@ -4,6 +4,7 @@ import org.lwjgl.opengl.GL11;
import com.hbm.blocks.machine.MachineRTG; import com.hbm.blocks.machine.MachineRTG;
import com.hbm.main.ResourceManager; import com.hbm.main.ResourceManager;
import com.hbm.render.loader.HFRWavefrontObject;
import com.hbm.render.util.ObjUtil; import com.hbm.render.util.ObjUtil;
import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
@ -12,7 +13,6 @@ import net.minecraft.client.renderer.RenderBlocks;
import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.Tessellator;
import net.minecraft.util.IIcon; import net.minecraft.util.IIcon;
import net.minecraft.world.IBlockAccess; import net.minecraft.world.IBlockAccess;
import net.minecraftforge.client.model.obj.WavefrontObject;
public class RenderRTGBlock implements ISimpleBlockRenderingHandler { public class RenderRTGBlock implements ISimpleBlockRenderingHandler {
@ -24,14 +24,13 @@ public class RenderRTGBlock implements ISimpleBlockRenderingHandler {
IIcon iicon = block.getIcon(0, 0); IIcon iicon = block.getIcon(0, 0);
tessellator.setColorOpaque_F(1, 1, 1); tessellator.setColorOpaque_F(1, 1, 1);
if (renderer.hasOverrideBlockTexture()) if(renderer.hasOverrideBlockTexture()) {
{
iicon = renderer.overrideBlockTexture; iicon = renderer.overrideBlockTexture;
} }
GL11.glTranslated(0, -0.5, 0); GL11.glTranslated(0, -0.5, 0);
tessellator.startDrawingQuads(); tessellator.startDrawingQuads();
ObjUtil.renderPartWithIcon((WavefrontObject) ResourceManager.rtg, "Gen", iicon, tessellator, 0, false); ObjUtil.renderPartWithIcon((HFRWavefrontObject) ResourceManager.rtg, "Gen", iicon, tessellator, 0, false);
tessellator.draw(); tessellator.draw();
GL11.glPopMatrix(); GL11.glPopMatrix();

View File

@ -3,6 +3,7 @@ package com.hbm.render.block;
import com.hbm.blocks.network.RadioTorchBase; import com.hbm.blocks.network.RadioTorchBase;
import com.hbm.interfaces.NotableComments; import com.hbm.interfaces.NotableComments;
import com.hbm.main.ResourceManager; import com.hbm.main.ResourceManager;
import com.hbm.render.loader.HFRWavefrontObject;
import com.hbm.render.util.ObjUtil; import com.hbm.render.util.ObjUtil;
import com.hbm.tileentity.network.TileEntityRadioTorchBase; import com.hbm.tileentity.network.TileEntityRadioTorchBase;
import com.hbm.tileentity.network.TileEntityRadioTorchLogic; import com.hbm.tileentity.network.TileEntityRadioTorchLogic;
@ -14,7 +15,6 @@ import net.minecraft.client.renderer.Tessellator;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.IIcon; import net.minecraft.util.IIcon;
import net.minecraft.world.IBlockAccess; import net.minecraft.world.IBlockAccess;
import net.minecraftforge.client.model.obj.WavefrontObject;
@NotableComments @NotableComments
public class RenderRTTY implements ISimpleBlockRenderingHandler { public class RenderRTTY implements ISimpleBlockRenderingHandler {
@ -72,7 +72,7 @@ public class RenderRTTY implements ISimpleBlockRenderingHandler {
//using OBJ here because vanilla's block renderer is so broken it's not even funny anymore //using OBJ here because vanilla's block renderer is so broken it's not even funny anymore
//mojang genuinely doesn't know how on earth UVs work //mojang genuinely doesn't know how on earth UVs work
tessellator.addTranslation(x + 0.5F, y + 0.5F, z + 0.5F); tessellator.addTranslation(x + 0.5F, y + 0.5F, z + 0.5F);
ObjUtil.renderWithIcon((WavefrontObject) ResourceManager.rtty, icon, tessellator, rotation, flip, false); ObjUtil.renderWithIcon((HFRWavefrontObject) ResourceManager.rtty, icon, tessellator, rotation, flip, false);
tessellator.addTranslation(-x - 0.5F, -y - 0.5F, -z - 0.5F); tessellator.addTranslation(-x - 0.5F, -y - 0.5F, -z - 0.5F);
return true; return true;

View File

@ -4,6 +4,7 @@ import org.lwjgl.opengl.GL11;
import com.hbm.blocks.generic.BlockScaffold; import com.hbm.blocks.generic.BlockScaffold;
import com.hbm.main.ResourceManager; import com.hbm.main.ResourceManager;
import com.hbm.render.loader.HFRWavefrontObject;
import com.hbm.render.util.ObjUtil; import com.hbm.render.util.ObjUtil;
import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
@ -12,7 +13,6 @@ import net.minecraft.client.renderer.RenderBlocks;
import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.Tessellator;
import net.minecraft.util.IIcon; import net.minecraft.util.IIcon;
import net.minecraft.world.IBlockAccess; import net.minecraft.world.IBlockAccess;
import net.minecraftforge.client.model.obj.WavefrontObject;
public class RenderScaffoldBlock implements ISimpleBlockRenderingHandler { public class RenderScaffoldBlock implements ISimpleBlockRenderingHandler {
@ -30,7 +30,7 @@ public class RenderScaffoldBlock implements ISimpleBlockRenderingHandler {
GL11.glTranslated(0, -0.5, 0); GL11.glTranslated(0, -0.5, 0);
tessellator.startDrawingQuads(); tessellator.startDrawingQuads();
ObjUtil.renderWithIcon((WavefrontObject) ResourceManager.scaffold, iicon, tessellator, 0, false); ObjUtil.renderWithIcon((HFRWavefrontObject) ResourceManager.scaffold, iicon, tessellator, 0, false);
tessellator.draw(); tessellator.draw();
GL11.glPopMatrix(); GL11.glPopMatrix();
@ -72,7 +72,7 @@ public class RenderScaffoldBlock implements ISimpleBlockRenderingHandler {
} }
tessellator.addTranslation(ox, oy, oz); tessellator.addTranslation(ox, oy, oz);
ObjUtil.renderWithIcon((WavefrontObject) ResourceManager.scaffold, iicon, tessellator, rotation, pitch, true); ObjUtil.renderWithIcon((HFRWavefrontObject) ResourceManager.scaffold, iicon, tessellator, rotation, pitch, true);
tessellator.addTranslation(-ox, -oy, -oz); tessellator.addTranslation(-ox, -oy, -oz);
return true; return true;

View File

@ -4,6 +4,7 @@ import org.lwjgl.opengl.GL11;
import com.hbm.blocks.generic.Spikes; import com.hbm.blocks.generic.Spikes;
import com.hbm.main.ResourceManager; import com.hbm.main.ResourceManager;
import com.hbm.render.loader.HFRWavefrontObject;
import com.hbm.render.util.ObjUtil; import com.hbm.render.util.ObjUtil;
import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
@ -12,7 +13,6 @@ import net.minecraft.client.renderer.RenderBlocks;
import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.Tessellator;
import net.minecraft.util.IIcon; import net.minecraft.util.IIcon;
import net.minecraft.world.IBlockAccess; import net.minecraft.world.IBlockAccess;
import net.minecraftforge.client.model.obj.WavefrontObject;
public class RenderSpikeBlock implements ISimpleBlockRenderingHandler { public class RenderSpikeBlock implements ISimpleBlockRenderingHandler {
@ -24,14 +24,13 @@ public class RenderSpikeBlock implements ISimpleBlockRenderingHandler {
IIcon iicon = block.getIcon(0, 0); IIcon iicon = block.getIcon(0, 0);
tessellator.setColorOpaque_F(1, 1, 1); tessellator.setColorOpaque_F(1, 1, 1);
if (renderer.hasOverrideBlockTexture()) if(renderer.hasOverrideBlockTexture()) {
{
iicon = renderer.overrideBlockTexture; iicon = renderer.overrideBlockTexture;
} }
GL11.glTranslated(0, -0.5, 0); GL11.glTranslated(0, -0.5, 0);
tessellator.startDrawingQuads(); tessellator.startDrawingQuads();
ObjUtil.renderWithIcon((WavefrontObject) ResourceManager.spikes, iicon, tessellator, 0, false); ObjUtil.renderWithIcon((HFRWavefrontObject) ResourceManager.spikes, iicon, tessellator, 0, false);
tessellator.draw(); tessellator.draw();
GL11.glPopMatrix(); GL11.glPopMatrix();
@ -46,13 +45,12 @@ public class RenderSpikeBlock implements ISimpleBlockRenderingHandler {
tessellator.setBrightness(block.getMixedBrightnessForBlock(world, x, y, z)); tessellator.setBrightness(block.getMixedBrightnessForBlock(world, x, y, z));
tessellator.setColorOpaque_F(1, 1, 1); tessellator.setColorOpaque_F(1, 1, 1);
if (renderer.hasOverrideBlockTexture()) if(renderer.hasOverrideBlockTexture()) {
{
iicon = renderer.overrideBlockTexture; iicon = renderer.overrideBlockTexture;
} }
tessellator.addTranslation(x + 0.5F, y, z + 0.5F); tessellator.addTranslation(x + 0.5F, y, z + 0.5F);
ObjUtil.renderWithIcon((WavefrontObject) ResourceManager.spikes, iicon, tessellator, 0, true); ObjUtil.renderWithIcon((HFRWavefrontObject) ResourceManager.spikes, iicon, tessellator, 0, true);
tessellator.addTranslation(-x - 0.5F, -y, -z - 0.5F); tessellator.addTranslation(-x - 0.5F, -y, -z - 0.5F);
return true; return true;

View File

@ -4,6 +4,7 @@ import org.lwjgl.opengl.GL11;
import com.hbm.blocks.network.CraneSplitter; import com.hbm.blocks.network.CraneSplitter;
import com.hbm.main.ResourceManager; import com.hbm.main.ResourceManager;
import com.hbm.render.loader.HFRWavefrontObject;
import com.hbm.render.util.ObjUtil; import com.hbm.render.util.ObjUtil;
import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
@ -11,7 +12,6 @@ import net.minecraft.block.Block;
import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.RenderBlocks;
import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.Tessellator;
import net.minecraft.world.IBlockAccess; import net.minecraft.world.IBlockAccess;
import net.minecraftforge.client.model.obj.WavefrontObject;
public class RenderSplitter implements ISimpleBlockRenderingHandler { public class RenderSplitter implements ISimpleBlockRenderingHandler {
@ -60,17 +60,17 @@ public class RenderSplitter implements ISimpleBlockRenderingHandler {
private static void drawSplitter(Tessellator tessellator, Block block, boolean isLeft, float rotation, boolean shadeNormals) { private static void drawSplitter(Tessellator tessellator, Block block, boolean isLeft, float rotation, boolean shadeNormals) {
CraneSplitter splitter = (CraneSplitter) block; CraneSplitter splitter = (CraneSplitter) block;
ObjUtil.renderPartWithIcon((WavefrontObject) ResourceManager.splitter, "Top", isLeft ? splitter.iconTopLeft : splitter.iconTopRight, tessellator, rotation, shadeNormals); ObjUtil.renderPartWithIcon((HFRWavefrontObject) ResourceManager.splitter, "Top", isLeft ? splitter.iconTopLeft : splitter.iconTopRight, tessellator, rotation, shadeNormals);
ObjUtil.renderPartWithIcon((WavefrontObject) ResourceManager.splitter, "Bottom", isLeft ? splitter.iconTopRight : splitter.iconTopLeft , tessellator, rotation, shadeNormals); ObjUtil.renderPartWithIcon((HFRWavefrontObject) ResourceManager.splitter, "Bottom", isLeft ? splitter.iconTopRight : splitter.iconTopLeft , tessellator, rotation, shadeNormals);
if(isLeft) ObjUtil.renderPartWithIcon((WavefrontObject) ResourceManager.splitter, "Left", splitter.iconLeft, tessellator, rotation, shadeNormals); if(isLeft) ObjUtil.renderPartWithIcon((HFRWavefrontObject) ResourceManager.splitter, "Left", splitter.iconLeft, tessellator, rotation, shadeNormals);
if(!isLeft) ObjUtil.renderPartWithIcon((WavefrontObject) ResourceManager.splitter, "Right", splitter.iconRight, tessellator, rotation, shadeNormals); if(!isLeft) ObjUtil.renderPartWithIcon((HFRWavefrontObject) ResourceManager.splitter, "Right", splitter.iconRight, tessellator, rotation, shadeNormals);
ObjUtil.renderPartWithIcon((WavefrontObject) ResourceManager.splitter, "Back", isLeft ? splitter.iconBackLeft : splitter.iconBackRight, tessellator, rotation, shadeNormals); ObjUtil.renderPartWithIcon((HFRWavefrontObject) ResourceManager.splitter, "Back", isLeft ? splitter.iconBackLeft : splitter.iconBackRight, tessellator, rotation, shadeNormals);
ObjUtil.renderPartWithIcon((WavefrontObject) ResourceManager.splitter, "Front", isLeft ? splitter.iconFrontLeft : splitter.iconFrontRight, tessellator, rotation, shadeNormals); ObjUtil.renderPartWithIcon((HFRWavefrontObject) ResourceManager.splitter, "Front", isLeft ? splitter.iconFrontLeft : splitter.iconFrontRight, tessellator, rotation, shadeNormals);
ObjUtil.renderPartWithIcon((WavefrontObject) ResourceManager.splitter, "Inner", splitter.iconInner, tessellator, rotation, shadeNormals); ObjUtil.renderPartWithIcon((HFRWavefrontObject) ResourceManager.splitter, "Inner", splitter.iconInner, tessellator, rotation, shadeNormals);
ObjUtil.renderPartWithIcon((WavefrontObject) ResourceManager.splitter, "InnerLeft", splitter.iconInnerSide, tessellator, rotation, shadeNormals); ObjUtil.renderPartWithIcon((HFRWavefrontObject) ResourceManager.splitter, "InnerLeft", splitter.iconInnerSide, tessellator, rotation, shadeNormals);
ObjUtil.renderPartWithIcon((WavefrontObject) ResourceManager.splitter, "InnerRight", splitter.iconInnerSide, tessellator, rotation, shadeNormals); ObjUtil.renderPartWithIcon((HFRWavefrontObject) ResourceManager.splitter, "InnerRight", splitter.iconInnerSide, tessellator, rotation, shadeNormals);
ObjUtil.renderPartWithIcon((WavefrontObject) ResourceManager.splitter, "InnerTop", splitter.iconInnerSide, tessellator, rotation, shadeNormals); ObjUtil.renderPartWithIcon((HFRWavefrontObject) ResourceManager.splitter, "InnerTop", splitter.iconInnerSide, tessellator, rotation, shadeNormals);
ObjUtil.renderPartWithIcon((WavefrontObject) ResourceManager.splitter, "InnerBottom", splitter.iconBelt, tessellator, rotation, shadeNormals); ObjUtil.renderPartWithIcon((HFRWavefrontObject) ResourceManager.splitter, "InnerBottom", splitter.iconBelt, tessellator, rotation, shadeNormals);
} }
@Override @Override

View File

@ -4,6 +4,7 @@ import org.lwjgl.opengl.GL11;
import com.hbm.blocks.generic.DecoBlock; import com.hbm.blocks.generic.DecoBlock;
import com.hbm.main.ResourceManager; import com.hbm.main.ResourceManager;
import com.hbm.render.loader.HFRWavefrontObject;
import com.hbm.render.util.ObjUtil; import com.hbm.render.util.ObjUtil;
import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
@ -12,7 +13,6 @@ import net.minecraft.client.renderer.RenderBlocks;
import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.Tessellator;
import net.minecraft.util.IIcon; import net.minecraft.util.IIcon;
import net.minecraft.world.IBlockAccess; import net.minecraft.world.IBlockAccess;
import net.minecraftforge.client.model.obj.WavefrontObject;
public class RenderSteelBeam implements ISimpleBlockRenderingHandler { public class RenderSteelBeam implements ISimpleBlockRenderingHandler {
@ -24,14 +24,13 @@ public class RenderSteelBeam implements ISimpleBlockRenderingHandler {
IIcon iicon = block.getIcon(0, 0); IIcon iicon = block.getIcon(0, 0);
tessellator.setColorOpaque_F(1, 1, 1); tessellator.setColorOpaque_F(1, 1, 1);
if (renderer.hasOverrideBlockTexture()) if(renderer.hasOverrideBlockTexture()) {
{
iicon = renderer.overrideBlockTexture; iicon = renderer.overrideBlockTexture;
} }
GL11.glTranslated(0, -0.5, 0); GL11.glTranslated(0, -0.5, 0);
tessellator.startDrawingQuads(); tessellator.startDrawingQuads();
ObjUtil.renderWithIcon((WavefrontObject) ResourceManager.beam, iicon, tessellator, 0, false); ObjUtil.renderWithIcon((HFRWavefrontObject) ResourceManager.beam, iicon, tessellator, 0, false);
tessellator.draw(); tessellator.draw();
GL11.glPopMatrix(); GL11.glPopMatrix();
@ -46,13 +45,12 @@ public class RenderSteelBeam implements ISimpleBlockRenderingHandler {
tessellator.setBrightness(block.getMixedBrightnessForBlock(world, x, y, z)); tessellator.setBrightness(block.getMixedBrightnessForBlock(world, x, y, z));
tessellator.setColorOpaque_F(1, 1, 1); tessellator.setColorOpaque_F(1, 1, 1);
if (renderer.hasOverrideBlockTexture()) if(renderer.hasOverrideBlockTexture()) {
{
iicon = renderer.overrideBlockTexture; iicon = renderer.overrideBlockTexture;
} }
tessellator.addTranslation(x + 0.5F, y, z + 0.5F); tessellator.addTranslation(x + 0.5F, y, z + 0.5F);
ObjUtil.renderWithIcon((WavefrontObject) ResourceManager.beam, iicon, tessellator, 0, true); ObjUtil.renderWithIcon((HFRWavefrontObject) ResourceManager.beam, iicon, tessellator, 0, true);
tessellator.addTranslation(-x - 0.5F, -y, -z - 0.5F); tessellator.addTranslation(-x - 0.5F, -y, -z - 0.5F);
return true; return true;

View File

@ -5,6 +5,7 @@ import org.lwjgl.opengl.GL11;
import com.hbm.blocks.ModBlocks; import com.hbm.blocks.ModBlocks;
import com.hbm.blocks.generic.DecoTapeRecorder; import com.hbm.blocks.generic.DecoTapeRecorder;
import com.hbm.main.ResourceManager; import com.hbm.main.ResourceManager;
import com.hbm.render.loader.HFRWavefrontObject;
import com.hbm.render.util.ObjUtil; import com.hbm.render.util.ObjUtil;
import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
@ -13,7 +14,6 @@ import net.minecraft.client.renderer.RenderBlocks;
import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.Tessellator;
import net.minecraft.util.IIcon; import net.minecraft.util.IIcon;
import net.minecraft.world.IBlockAccess; import net.minecraft.world.IBlockAccess;
import net.minecraftforge.client.model.obj.WavefrontObject;
public class RenderTapeBlock implements ISimpleBlockRenderingHandler { public class RenderTapeBlock implements ISimpleBlockRenderingHandler {
@ -25,17 +25,16 @@ public class RenderTapeBlock implements ISimpleBlockRenderingHandler {
IIcon iicon = block.getIcon(0, 0); IIcon iicon = block.getIcon(0, 0);
tessellator.setColorOpaque_F(1, 1, 1); tessellator.setColorOpaque_F(1, 1, 1);
if (renderer.hasOverrideBlockTexture()) if(renderer.hasOverrideBlockTexture()) {
{
iicon = renderer.overrideBlockTexture; iicon = renderer.overrideBlockTexture;
} }
GL11.glTranslated(0, -0.5, 0); GL11.glTranslated(0, -0.5, 0);
tessellator.startDrawingQuads(); tessellator.startDrawingQuads();
if(block == ModBlocks.tape_recorder) if(block == ModBlocks.tape_recorder)
ObjUtil.renderWithIcon((WavefrontObject) ResourceManager.taperecorder, iicon, tessellator, 0, false); ObjUtil.renderWithIcon((HFRWavefrontObject) ResourceManager.taperecorder, iicon, tessellator, 0, false);
if(block == ModBlocks.steel_poles) if(block == ModBlocks.steel_poles)
ObjUtil.renderWithIcon((WavefrontObject) ResourceManager.pole, iicon, tessellator, 0, false); ObjUtil.renderWithIcon((HFRWavefrontObject) ResourceManager.pole, iicon, tessellator, 0, false);
tessellator.draw(); tessellator.draw();
GL11.glPopMatrix(); GL11.glPopMatrix();
@ -50,27 +49,26 @@ public class RenderTapeBlock implements ISimpleBlockRenderingHandler {
tessellator.setBrightness(block.getMixedBrightnessForBlock(world, x, y, z)); tessellator.setBrightness(block.getMixedBrightnessForBlock(world, x, y, z));
tessellator.setColorOpaque_F(1, 1, 1); tessellator.setColorOpaque_F(1, 1, 1);
if (renderer.hasOverrideBlockTexture()) if(renderer.hasOverrideBlockTexture()) {
{
iicon = renderer.overrideBlockTexture; iicon = renderer.overrideBlockTexture;
} }
float rotation = 0; float rotation = 0;
if(world.getBlockMetadata(x, y, z) == 2) if(world.getBlockMetadata(x, y, z) == 2)
rotation = 90F / 180F * (float)Math.PI; rotation = 90F / 180F * (float) Math.PI;
if(world.getBlockMetadata(x, y, z) == 3) if(world.getBlockMetadata(x, y, z) == 3)
rotation = 270F / 180F * (float)Math.PI; rotation = 270F / 180F * (float) Math.PI;
if(world.getBlockMetadata(x, y, z) == 4) if(world.getBlockMetadata(x, y, z) == 4)
rotation = 180F / 180F * (float)Math.PI; rotation = 180F / 180F * (float) Math.PI;
tessellator.addTranslation(x + 0.5F, y, z + 0.5F); tessellator.addTranslation(x + 0.5F, y, z + 0.5F);
if(block == ModBlocks.tape_recorder) if(block == ModBlocks.tape_recorder)
ObjUtil.renderWithIcon((WavefrontObject) ResourceManager.taperecorder, iicon, tessellator, rotation, true); ObjUtil.renderWithIcon((HFRWavefrontObject) ResourceManager.taperecorder, iicon, tessellator, rotation, true);
if(block == ModBlocks.steel_poles) if(block == ModBlocks.steel_poles)
ObjUtil.renderWithIcon((WavefrontObject) ResourceManager.pole, iicon, tessellator, rotation - 90F / 180F * (float)Math.PI, true); ObjUtil.renderWithIcon((HFRWavefrontObject) ResourceManager.pole, iicon, tessellator, rotation - 90F / 180F * (float) Math.PI, true);
tessellator.addTranslation(-x - 0.5F, -y, -z - 0.5F); tessellator.addTranslation(-x - 0.5F, -y, -z - 0.5F);
return true; return true;

View File

@ -7,6 +7,7 @@ import com.hbm.inventory.fluid.FluidType;
import com.hbm.inventory.fluid.Fluids; import com.hbm.inventory.fluid.Fluids;
import com.hbm.lib.Library; import com.hbm.lib.Library;
import com.hbm.main.ResourceManager; import com.hbm.main.ResourceManager;
import com.hbm.render.loader.HFRWavefrontObject;
import com.hbm.render.util.ObjUtil; import com.hbm.render.util.ObjUtil;
import com.hbm.tileentity.network.TileEntityPipeBaseNT; import com.hbm.tileentity.network.TileEntityPipeBaseNT;
@ -17,7 +18,6 @@ import net.minecraft.client.renderer.Tessellator;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.IIcon; import net.minecraft.util.IIcon;
import net.minecraft.world.IBlockAccess; import net.minecraft.world.IBlockAccess;
import net.minecraftforge.client.model.obj.WavefrontObject;
public class RenderTestPipe implements ISimpleBlockRenderingHandler { public class RenderTestPipe implements ISimpleBlockRenderingHandler {
@ -37,17 +37,17 @@ public class RenderTestPipe implements ISimpleBlockRenderingHandler {
GL11.glRotated(180, 0, 1, 0); GL11.glRotated(180, 0, 1, 0);
GL11.glScaled(1.25D, 1.25D, 1.25D); GL11.glScaled(1.25D, 1.25D, 1.25D);
tessellator.startDrawingQuads(); tessellator.startDrawingQuads();
ObjUtil.renderPartWithIcon((WavefrontObject) ResourceManager.pipe_neo, "pX", iicon, tessellator, 0, false); ObjUtil.renderPartWithIcon((HFRWavefrontObject) ResourceManager.pipe_neo, "pX", iicon, tessellator, 0, false);
ObjUtil.renderPartWithIcon((WavefrontObject) ResourceManager.pipe_neo, "nX", iicon, tessellator, 0, false); ObjUtil.renderPartWithIcon((HFRWavefrontObject) ResourceManager.pipe_neo, "nX", iicon, tessellator, 0, false);
ObjUtil.renderPartWithIcon((WavefrontObject) ResourceManager.pipe_neo, "pZ", iicon, tessellator, 0, false); ObjUtil.renderPartWithIcon((HFRWavefrontObject) ResourceManager.pipe_neo, "pZ", iicon, tessellator, 0, false);
ObjUtil.renderPartWithIcon((WavefrontObject) ResourceManager.pipe_neo, "nZ", iicon, tessellator, 0, false); ObjUtil.renderPartWithIcon((HFRWavefrontObject) ResourceManager.pipe_neo, "nZ", iicon, tessellator, 0, false);
tessellator.draw(); tessellator.draw();
tessellator.startDrawingQuads(); tessellator.startDrawingQuads();
ObjUtil.setColor(Fluids.NONE.getColor()); ObjUtil.setColor(Fluids.NONE.getColor());
ObjUtil.renderPartWithIcon((WavefrontObject) ResourceManager.pipe_neo, "pX", overlay, tessellator, 0, false); ObjUtil.renderPartWithIcon((HFRWavefrontObject) ResourceManager.pipe_neo, "pX", overlay, tessellator, 0, false);
ObjUtil.renderPartWithIcon((WavefrontObject) ResourceManager.pipe_neo, "nX", overlay, tessellator, 0, false); ObjUtil.renderPartWithIcon((HFRWavefrontObject) ResourceManager.pipe_neo, "nX", overlay, tessellator, 0, false);
ObjUtil.renderPartWithIcon((WavefrontObject) ResourceManager.pipe_neo, "pZ", overlay, tessellator, 0, false); ObjUtil.renderPartWithIcon((HFRWavefrontObject) ResourceManager.pipe_neo, "pZ", overlay, tessellator, 0, false);
ObjUtil.renderPartWithIcon((WavefrontObject) ResourceManager.pipe_neo, "nZ", overlay, tessellator, 0, false); ObjUtil.renderPartWithIcon((HFRWavefrontObject) ResourceManager.pipe_neo, "nZ", overlay, tessellator, 0, false);
ObjUtil.clearColor(); ObjUtil.clearColor();
tessellator.draw(); tessellator.draw();
@ -133,9 +133,9 @@ public class RenderTestPipe implements ISimpleBlockRenderingHandler {
} }
private void renderDuct(IIcon iicon, IIcon overlay, int color, Tessellator tessellator, String part) { private void renderDuct(IIcon iicon, IIcon overlay, int color, Tessellator tessellator, String part) {
ObjUtil.renderPartWithIcon((WavefrontObject) ResourceManager.pipe_neo, part, iicon, tessellator, 0, true); ObjUtil.renderPartWithIcon((HFRWavefrontObject) ResourceManager.pipe_neo, part, iicon, tessellator, 0, true);
ObjUtil.setColor(color); ObjUtil.setColor(color);
ObjUtil.renderPartWithIcon((WavefrontObject) ResourceManager.pipe_neo, part, overlay, tessellator, 0, true); ObjUtil.renderPartWithIcon((HFRWavefrontObject) ResourceManager.pipe_neo, part, overlay, tessellator, 0, true);
ObjUtil.clearColor(); ObjUtil.clearColor();
} }

View File

@ -4,6 +4,7 @@ import org.lwjgl.opengl.GL11;
import com.hbm.blocks.generic.BlockDecoToaster; import com.hbm.blocks.generic.BlockDecoToaster;
import com.hbm.main.ResourceManager; import com.hbm.main.ResourceManager;
import com.hbm.render.loader.HFRWavefrontObject;
import com.hbm.render.util.ObjUtil; import com.hbm.render.util.ObjUtil;
import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
@ -12,7 +13,6 @@ import net.minecraft.client.renderer.RenderBlocks;
import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.Tessellator;
import net.minecraft.util.IIcon; import net.minecraft.util.IIcon;
import net.minecraft.world.IBlockAccess; import net.minecraft.world.IBlockAccess;
import net.minecraftforge.client.model.obj.WavefrontObject;
public class RenderToaster implements ISimpleBlockRenderingHandler { public class RenderToaster implements ISimpleBlockRenderingHandler {
@ -30,7 +30,7 @@ public class RenderToaster implements ISimpleBlockRenderingHandler {
GL11.glTranslated(0, -0.25, 0); GL11.glTranslated(0, -0.25, 0);
tessellator.startDrawingQuads(); tessellator.startDrawingQuads();
ObjUtil.renderWithIcon((WavefrontObject) ResourceManager.toaster, iicon, tessellator, (float) Math.PI * -0.5F, false); ObjUtil.renderWithIcon((HFRWavefrontObject) ResourceManager.toaster, iicon, tessellator, (float) Math.PI * -0.5F, false);
tessellator.draw(); tessellator.draw();
GL11.glPopMatrix(); GL11.glPopMatrix();
@ -62,7 +62,7 @@ public class RenderToaster implements ISimpleBlockRenderingHandler {
} }
tessellator.addTranslation(x + 0.5F, y, z + 0.5F); tessellator.addTranslation(x + 0.5F, y, z + 0.5F);
ObjUtil.renderWithIcon((WavefrontObject) ResourceManager.toaster, iicon, tessellator, rotation, true); ObjUtil.renderWithIcon((HFRWavefrontObject) ResourceManager.toaster, iicon, tessellator, rotation, true);
tessellator.addTranslation(-x - 0.5F, -y, -z - 0.5F); tessellator.addTranslation(-x - 0.5F, -y, -z - 0.5F);
return true; return true;

View File

@ -55,7 +55,11 @@ public class HFRWavefrontObject implements IModelCustomNamed {
private boolean allowMixedMode = false; private boolean allowMixedMode = false;
public HFRWavefrontObject(String name) throws ModelFormatException { public HFRWavefrontObject(String name) throws ModelFormatException {
this(new ResourceLocation(RefStrings.MODID, name)); this(new ResourceLocation(RefStrings.MODID, name), false);
}
public HFRWavefrontObject(String name, boolean mixedMode) throws ModelFormatException {
this(new ResourceLocation(RefStrings.MODID, name), mixedMode);
} }
public HFRWavefrontObject noSmooth() { public HFRWavefrontObject noSmooth() {
@ -65,12 +69,15 @@ public class HFRWavefrontObject implements IModelCustomNamed {
/** Provides a way for a model to have both tris and quads, however this means it can't be rendered directly. /** Provides a way for a model to have both tris and quads, however this means it can't be rendered directly.
* Useful for ISBRHs which access vertices manually, allowing the quad to tri trick without forcing the entire model to be redundant tris. */ * Useful for ISBRHs which access vertices manually, allowing the quad to tri trick without forcing the entire model to be redundant tris. */
public HFRWavefrontObject mixedMode() { public void mixedMode() { this.allowMixedMode = true; }
this.allowMixedMode = true;
return this;
}
public HFRWavefrontObject(ResourceLocation resource) throws ModelFormatException { public HFRWavefrontObject(ResourceLocation resource) throws ModelFormatException {
this(resource, false);
}
public HFRWavefrontObject(ResourceLocation resource, boolean mixedMode) throws ModelFormatException {
if(mixedMode) this.mixedMode();
this.resource = resource; this.resource = resource;
this.fileName = resource.toString(); this.fileName = resource.toString();
@ -84,11 +91,6 @@ public class HFRWavefrontObject implements IModelCustomNamed {
this.allModels.add(this); this.allModels.add(this);
} }
public HFRWavefrontObject(ResourceLocation resource, boolean smoothing) throws ModelFormatException {
this(resource);
this.smoothing = smoothing;
}
public void destroy() { public void destroy() {
vertices.clear(); vertices.clear();
vertexNormals.clear(); vertexNormals.clear();

View File

@ -2,11 +2,11 @@ package com.hbm.render.tileentity;
import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL11;
import com.hbm.blocks.machine.rbmk.RBMKBase;
import com.hbm.lib.RefStrings; import com.hbm.lib.RefStrings;
import com.hbm.main.ResourceManager; import com.hbm.main.ResourceManager;
import com.hbm.tileentity.machine.rbmk.TileEntityRBMKControl; import com.hbm.tileentity.machine.rbmk.TileEntityRBMKControl;
import net.minecraft.client.renderer.OpenGlHelper;
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.ResourceLocation; import net.minecraft.util.ResourceLocation;
@ -20,7 +20,7 @@ public class RenderRBMKControlRod extends TileEntitySpecialRenderer {
GL11.glPushMatrix(); GL11.glPushMatrix();
TileEntityRBMKControl control = (TileEntityRBMKControl)te; TileEntityRBMKControl control = (TileEntityRBMKControl) te;
int offset = 1; int offset = 1;
@ -38,12 +38,12 @@ public class RenderRBMKControlRod extends TileEntitySpecialRenderer {
GL11.glEnable(GL11.GL_LIGHTING); GL11.glEnable(GL11.GL_LIGHTING);
GL11.glEnable(GL11.GL_CULL_FACE); GL11.glEnable(GL11.GL_CULL_FACE);
int brightness = control.getWorldObj().getLightBrightnessForSkyBlocks(control.xCoord, control.yCoord + offset + 1, control.zCoord, 0);
int lX = brightness % 65536;
int lY = brightness / 65536;
OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, (float)lX / 1.0F, (float)lY / 1.0F);
if(control.getBlockType() instanceof RBMKBase) {
bindTexture(((RBMKBase)control.getBlockType()).coverTexture);
} else {
bindTexture(texture); bindTexture(texture);
}
double level = control.lastLevel + (control.level - control.lastLevel) * i; double level = control.lastLevel + (control.level - control.lastLevel) * i;

View File

@ -2,12 +2,8 @@ package com.hbm.render.tileentity;
import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL11;
import com.hbm.blocks.machine.rbmk.RBMKBase;
import com.hbm.lib.RefStrings; import com.hbm.lib.RefStrings;
import com.hbm.main.ResourceManager; import com.hbm.main.ResourceManager;
import com.hbm.tileentity.machine.rbmk.TileEntityRBMKBase;
import com.hbm.tileentity.machine.rbmk.TileEntityRBMKBoiler;
import com.hbm.tileentity.machine.rbmk.TileEntityRBMKHeater;
import com.hbm.tileentity.machine.rbmk.TileEntityRBMKRod; import com.hbm.tileentity.machine.rbmk.TileEntityRBMKRod;
import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.Tessellator;
@ -17,26 +13,18 @@ import net.minecraft.util.ResourceLocation;
public class RenderRBMKLid extends TileEntitySpecialRenderer { public class RenderRBMKLid extends TileEntitySpecialRenderer {
private ResourceLocation texture = new ResourceLocation(RefStrings.MODID + ":textures/blocks/rbmk/rbmk_blank.png"); private static final ResourceLocation texture_rods = new ResourceLocation(RefStrings.MODID + ":textures/blocks/rbmk/rbmk_element_fuel.png");
private ResourceLocation texture_glass = new ResourceLocation(RefStrings.MODID + ":textures/blocks/rbmk/rbmk_blank_glass.png");
private static final ResourceLocation texture_rods = new ResourceLocation(RefStrings.MODID + ":textures/blocks/rbmk/rbmk_element.png");
@Override @Override
public void renderTileEntityAt(TileEntity te, double x, double y, double z, float i) { public void renderTileEntityAt(TileEntity te, double x, double y, double z, float i) {
TileEntityRBMKBase control = (TileEntityRBMKBase)te;
boolean hasRod = false; boolean hasRod = false;
boolean cherenkov = false; boolean cherenkov = false;
if(te instanceof TileEntityRBMKRod) { if(te instanceof TileEntityRBMKRod) {
TileEntityRBMKRod rod = (TileEntityRBMKRod) te; TileEntityRBMKRod rod = (TileEntityRBMKRod) te;
if(rod.hasRod) hasRod = true;
if(rod.hasRod) if(rod.fluxQuantity > 5) cherenkov = true;
hasRod = true;
if(rod.fluxQuantity > 5)
cherenkov = true;
} }
GL11.glPushMatrix(); GL11.glPushMatrix();
@ -48,11 +36,8 @@ public class RenderRBMKLid extends TileEntitySpecialRenderer {
if(te.getWorldObj().getBlock(te.xCoord, te.yCoord + o, te.zCoord) == te.getBlockType()) { if(te.getWorldObj().getBlock(te.xCoord, te.yCoord + o, te.zCoord) == te.getBlockType()) {
offset = o; offset = o;
int meta = te.getWorldObj().getBlockMetadata(te.xCoord, te.yCoord + o, te.zCoord); int meta = te.getWorldObj().getBlockMetadata(te.xCoord, te.yCoord + o, te.zCoord);
if(meta > 5 && meta < 12) break;
if(meta > 5 && meta < 12)
break;
} else { } else {
break; break;
@ -62,39 +47,12 @@ public class RenderRBMKLid extends TileEntitySpecialRenderer {
GL11.glEnable(GL11.GL_LIGHTING); GL11.glEnable(GL11.GL_LIGHTING);
GL11.glEnable(GL11.GL_CULL_FACE); GL11.glEnable(GL11.GL_CULL_FACE);
if(control.hasLid()) {
GL11.glPushMatrix();
GL11.glTranslated(0, offset, 0);
int meta = control.getBlockMetadata() - RBMKBase.offset;
if(meta == RBMKBase.DIR_GLASS_LID.ordinal()) {
bindTexture(texture_glass);
} else {
if(control.getBlockType() instanceof RBMKBase) {
bindTexture(((RBMKBase)control.getBlockType()).coverTexture);
} else {
bindTexture(texture);
}
cherenkov = false;
}
if((control instanceof TileEntityRBMKBoiler || control instanceof TileEntityRBMKHeater) && meta != RBMKBase.DIR_GLASS_LID.ordinal()) {
ResourceManager.rbmk_rods_vbo.renderPart("Lid");
} else {
ResourceManager.rbmk_element_vbo.renderPart("Lid");
}
GL11.glPopMatrix();
}
if(hasRod) { if(hasRod) {
GL11.glPushMatrix(); GL11.glPushMatrix();
bindTexture(texture_rods); bindTexture(texture_rods);
for(int j = 0; j <= offset; j++) { for(int j = 0; j <= offset; j++) {
ResourceManager.rbmk_element_vbo.renderPart("Rods"); ResourceManager.rbmk_element_rods_vbo.renderPart("Rods");
GL11.glTranslated(0, 1, 0); GL11.glTranslated(0, 1, 0);
} }

View File

@ -1,29 +1,30 @@
package com.hbm.render.util; package com.hbm.render.util;
import com.hbm.render.loader.HFRWavefrontObject;
import com.hbm.render.loader.S_Face;
import com.hbm.render.loader.S_GroupObject;
import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.Tessellator;
import net.minecraft.util.IIcon; import net.minecraft.util.IIcon;
import net.minecraft.util.Vec3; import net.minecraft.util.Vec3;
import net.minecraftforge.client.model.obj.Face;
import net.minecraftforge.client.model.obj.GroupObject;
import net.minecraftforge.client.model.obj.TextureCoordinate; import net.minecraftforge.client.model.obj.TextureCoordinate;
import net.minecraftforge.client.model.obj.Vertex; import net.minecraftforge.client.model.obj.Vertex;
import net.minecraftforge.client.model.obj.WavefrontObject;
import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.common.util.ForgeDirection;
public class ObjUtil { public class ObjUtil {
public static void renderWithIcon(WavefrontObject model, IIcon icon, Tessellator tes, float rot, boolean shadow) { public static void renderWithIcon(HFRWavefrontObject model, IIcon icon, Tessellator tes, float rot, boolean shadow) {
renderWithIcon(model, icon, tes, rot, 0, 0, shadow); renderWithIcon(model, icon, tes, rot, 0, 0, shadow);
} }
public static void renderWithIcon(WavefrontObject model, IIcon icon, Tessellator tes, float rot, float pitch, boolean shadow) { public static void renderWithIcon(HFRWavefrontObject model, IIcon icon, Tessellator tes, float rot, float pitch, boolean shadow) {
renderWithIcon(model, icon, tes, rot, pitch, 0, shadow); renderWithIcon(model, icon, tes, rot, pitch, 0, shadow);
} }
public static void renderWithIcon(WavefrontObject model, IIcon icon, Tessellator tes, float rot, float pitch, float roll, boolean shadow) { public static void renderWithIcon(HFRWavefrontObject model, IIcon icon, Tessellator tes, float rot, float pitch, float roll, boolean shadow) {
for(GroupObject go : model.groupObjects) { for(S_GroupObject go : model.groupObjects) {
for(Face f : go.faces) { for(S_Face f : go.faces) {
Vertex n = f.faceNormal; Vertex n = f.faceNormal;
@ -66,19 +67,19 @@ public class ObjUtil {
} }
} }
public static void renderPartWithIcon(WavefrontObject model, String name, IIcon icon, Tessellator tes, float rot, boolean shadow) { public static void renderPartWithIcon(HFRWavefrontObject model, String name, IIcon icon, Tessellator tes, float rot, boolean shadow) {
renderPartWithIcon(model, name, icon, tes, rot, 0, 0, shadow); renderPartWithIcon(model, name, icon, tes, rot, 0, 0, shadow);
} }
public static void renderPartWithIcon(WavefrontObject model, String name, IIcon icon, Tessellator tes, float rot, float pitch, boolean shadow) { public static void renderPartWithIcon(HFRWavefrontObject model, String name, IIcon icon, Tessellator tes, float rot, float pitch, boolean shadow) {
renderPartWithIcon(model, name, icon, tes, rot, pitch, 0, shadow); renderPartWithIcon(model, name, icon, tes, rot, pitch, 0, shadow);
} }
public static void renderPartWithIcon(WavefrontObject model, String name, IIcon icon, Tessellator tes, float rot, float pitch, float roll, boolean shadow) { public static void renderPartWithIcon(HFRWavefrontObject model, String name, IIcon icon, Tessellator tes, float rot, float pitch, float roll, boolean shadow) {
GroupObject go = null; S_GroupObject go = null;
for(GroupObject obj : model.groupObjects) { for(S_GroupObject obj : model.groupObjects) {
if(obj.name.equals(name)) if(obj.name.equals(name))
go = obj; go = obj;
} }
@ -86,7 +87,7 @@ public class ObjUtil {
if(go == null) if(go == null)
return; return;
for(Face f : go.faces) { for(S_Face f : go.faces) {
Vertex n = f.faceNormal; Vertex n = f.faceNormal;

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,350 @@
# Blender v2.79 (sub 0) OBJ File: 'rbmk_element.blend'
# www.blender.org
o Rods
v -0.374900 0.000000 0.312500
v -0.374900 0.000000 0.187500
v -0.312400 0.000000 0.375000
v -0.312400 0.000000 0.125000
v -0.187400 0.000000 0.375000
v -0.187400 0.000000 0.125000
v -0.124900 0.000000 0.312500
v -0.124900 0.000000 0.187500
v -0.374900 1.000000 0.312500
v -0.312400 1.000000 0.375000
v -0.374900 1.000000 0.187500
v -0.312400 1.000000 0.125000
v -0.187400 1.000000 0.375000
v -0.187400 1.000000 0.125000
v -0.124900 1.000000 0.312500
v -0.124900 1.000000 0.187500
v -0.374900 0.000000 -0.187500
v -0.374900 0.000000 -0.312500
v -0.312400 0.000000 -0.125000
v -0.312400 0.000000 -0.375000
v -0.187400 0.000000 -0.125000
v -0.187400 0.000000 -0.375000
v -0.124900 0.000000 -0.187500
v -0.124900 0.000000 -0.312500
v -0.374900 1.000000 -0.187500
v -0.312400 1.000000 -0.125000
v -0.374900 1.000000 -0.312500
v -0.312400 1.000000 -0.375000
v -0.187400 1.000000 -0.125000
v -0.187400 1.000000 -0.375000
v -0.124900 1.000000 -0.187500
v -0.124900 1.000000 -0.312500
v 0.125100 0.000000 -0.187500
v 0.125100 0.000000 -0.312500
v 0.187600 0.000000 -0.125000
v 0.187600 0.000000 -0.375000
v 0.312600 0.000000 -0.125000
v 0.312600 0.000000 -0.375000
v 0.375100 0.000000 -0.187500
v 0.375100 0.000000 -0.312500
v 0.125100 1.000000 -0.187500
v 0.187600 1.000000 -0.125000
v 0.125100 1.000000 -0.312500
v 0.187600 1.000000 -0.375000
v 0.312600 1.000000 -0.125000
v 0.312600 1.000000 -0.375000
v 0.375100 1.000000 -0.187500
v 0.375100 1.000000 -0.312500
v 0.125100 0.000000 0.312500
v 0.125100 0.000000 0.187500
v 0.187600 0.000000 0.375000
v 0.187600 0.000000 0.125000
v 0.312600 0.000000 0.375000
v 0.312600 0.000000 0.125000
v 0.375100 0.000000 0.312500
v 0.375100 0.000000 0.187500
v 0.125100 1.000000 0.312500
v 0.187600 1.000000 0.375000
v 0.125100 1.000000 0.187500
v 0.187600 1.000000 0.125000
v 0.312600 1.000000 0.375000
v 0.312600 1.000000 0.125000
v 0.375100 1.000000 0.312500
v 0.375100 1.000000 0.187500
vt 0.656250 0.968750
vt 0.687500 0.875000
vt 0.781250 0.906250
vt 0.750000 0.875000
vt 0.781250 0.968750
vt 0.687500 1.000000
vt 0.593750 0.500000
vt 0.562500 1.000000
vt 0.562500 0.500000
vt 0.593750 0.500000
vt 0.562500 1.000000
vt 0.562500 0.500000
vt 0.656250 0.500000
vt 0.593750 1.000000
vt 0.593750 0.500000
vt 0.656250 0.500000
vt 0.593750 1.000000
vt 0.656250 0.500000
vt 0.593750 1.000000
vt 0.593750 0.500000
vt 0.562500 1.000000
vt 0.562500 0.500000
vt 0.656250 0.500000
vt 0.593750 1.000000
vt 0.562500 1.000000
vt 0.562500 0.500000
vt 0.656250 0.968750
vt 0.687500 0.875000
vt 0.781250 0.906250
vt 0.750000 0.875000
vt 0.781250 0.968750
vt 0.687500 1.000000
vt 0.593750 0.500000
vt 0.562500 1.000000
vt 0.562500 0.500000
vt 0.593750 0.500000
vt 0.562500 1.000000
vt 0.562500 0.500000
vt 0.656250 0.500000
vt 0.593750 1.000000
vt 0.593750 0.500000
vt 0.656250 0.500000
vt 0.593750 1.000000
vt 0.656250 0.500000
vt 0.593750 1.000000
vt 0.593750 0.500000
vt 0.562500 1.000000
vt 0.562500 0.500000
vt 0.656250 0.500000
vt 0.593750 1.000000
vt 0.562500 1.000000
vt 0.562500 0.500000
vt 0.656250 0.968750
vt 0.687500 0.875000
vt 0.781250 0.906250
vt 0.750000 0.875000
vt 0.781250 0.968750
vt 0.687500 1.000000
vt 0.593750 0.500000
vt 0.562500 1.000000
vt 0.562500 0.500000
vt 0.593750 0.500000
vt 0.562500 1.000000
vt 0.562500 0.500000
vt 0.656250 0.500000
vt 0.593750 1.000000
vt 0.593750 0.500000
vt 0.656250 0.500000
vt 0.593750 1.000000
vt 0.656250 0.500000
vt 0.593750 1.000000
vt 0.593750 0.500000
vt 0.562500 1.000000
vt 0.562500 0.500000
vt 0.656250 0.500000
vt 0.593750 1.000000
vt 0.562500 1.000000
vt 0.562500 0.500000
vt 0.656250 0.968750
vt 0.687500 0.875000
vt 0.781250 0.906250
vt 0.750000 0.875000
vt 0.781250 0.968750
vt 0.687500 1.000000
vt 0.593750 0.500000
vt 0.562500 1.000000
vt 0.562500 0.500000
vt 0.593750 0.500000
vt 0.562500 1.000000
vt 0.562500 0.500000
vt 0.656250 0.500000
vt 0.593750 1.000000
vt 0.593750 0.500000
vt 0.656250 0.500000
vt 0.593750 1.000000
vt 0.656250 0.500000
vt 0.593750 1.000000
vt 0.593750 0.500000
vt 0.562500 1.000000
vt 0.562500 0.500000
vt 0.656250 0.500000
vt 0.593750 1.000000
vt 0.562500 1.000000
vt 0.562500 0.500000
vt 0.781250 0.968750
vt 0.750000 1.000000
vt 0.687500 1.000000
vt 0.656250 0.906250
vt 0.750000 0.875000
vt 0.656250 0.968750
vt 0.656250 0.906250
vt 0.687500 0.875000
vt 0.781250 0.906250
vt 0.750000 1.000000
vt 0.656250 1.000000
vt 0.656250 1.000000
vt 0.656250 1.000000
vt 0.656250 1.000000
vt 0.781250 0.968750
vt 0.750000 1.000000
vt 0.687500 1.000000
vt 0.656250 0.906250
vt 0.750000 0.875000
vt 0.656250 0.968750
vt 0.656250 0.906250
vt 0.687500 0.875000
vt 0.781250 0.906250
vt 0.750000 1.000000
vt 0.656250 1.000000
vt 0.656250 1.000000
vt 0.656250 1.000000
vt 0.656250 1.000000
vt 0.781250 0.968750
vt 0.750000 1.000000
vt 0.687500 1.000000
vt 0.656250 0.906250
vt 0.750000 0.875000
vt 0.656250 0.968750
vt 0.656250 0.906250
vt 0.687500 0.875000
vt 0.781250 0.906250
vt 0.750000 1.000000
vt 0.656250 1.000000
vt 0.656250 1.000000
vt 0.656250 1.000000
vt 0.656250 1.000000
vt 0.781250 0.968750
vt 0.750000 1.000000
vt 0.687500 1.000000
vt 0.656250 0.906250
vt 0.750000 0.875000
vt 0.656250 0.968750
vt 0.656250 0.906250
vt 0.687500 0.875000
vt 0.781250 0.906250
vt 0.750000 1.000000
vt 0.656250 1.000000
vt 0.656250 1.000000
vt 0.656250 1.000000
vt 0.656250 1.000000
vn 0.0000 -1.0000 0.0000
vn 0.0000 1.0000 0.0000
vn -0.7071 0.0000 0.7071
vn 0.7071 0.0000 -0.7071
vn 1.0000 0.0000 0.0000
vn 0.0000 0.0000 1.0000
vn -1.0000 0.0000 0.0000
vn 0.7071 0.0000 0.7071
vn 0.0000 0.0000 -1.0000
vn -0.7071 0.0000 -0.7071
s off
f 4/1/1 8/2/1 5/3/1
f 16/4/2 12/5/2 9/6/2
f 3/7/3 9/8/3 1/9/3
f 6/10/4 16/11/4 8/12/4
f 8/13/5 15/14/5 7/15/5
f 5/16/6 10/17/6 3/7/6
f 1/18/7 11/19/7 2/20/7
f 7/15/8 13/21/8 5/22/8
f 4/23/9 14/24/9 6/10/9
f 2/20/10 12/25/10 4/26/10
f 20/27/1 24/28/1 21/29/1
f 32/30/2 28/31/2 25/32/2
f 19/33/3 25/34/3 17/35/3
f 22/36/4 32/37/4 24/38/4
f 24/39/5 31/40/5 23/41/5
f 21/42/6 26/43/6 19/33/6
f 17/44/7 27/45/7 18/46/7
f 23/41/8 29/47/8 21/48/8
f 20/49/9 30/50/9 22/36/9
f 18/46/10 28/51/10 20/52/10
f 36/53/1 40/54/1 37/55/1
f 48/56/2 44/57/2 41/58/2
f 35/59/3 41/60/3 33/61/3
f 38/62/4 48/63/4 40/64/4
f 40/65/5 47/66/5 39/67/5
f 37/68/6 42/69/6 35/59/6
f 33/70/7 43/71/7 34/72/7
f 39/67/8 45/73/8 37/74/8
f 36/75/9 46/76/9 38/62/9
f 34/72/10 44/77/10 36/78/10
f 52/79/1 56/80/1 53/81/1
f 64/82/2 60/83/2 57/84/2
f 51/85/3 57/86/3 49/87/3
f 54/88/4 64/89/4 56/90/4
f 56/91/5 63/92/5 55/93/5
f 53/94/6 58/95/6 51/85/6
f 49/96/7 59/97/7 50/98/7
f 55/93/8 61/99/8 53/100/8
f 52/101/9 62/102/9 54/88/9
f 50/98/10 60/103/10 52/104/10
f 5/3/1 3/105/1 1/106/1
f 1/106/1 2/107/1 4/1/1
f 4/1/1 6/108/1 8/2/1
f 8/2/1 7/109/1 5/3/1
f 5/3/1 1/106/1 4/1/1
f 9/6/2 10/110/2 13/111/2
f 13/111/2 15/112/2 16/4/2
f 16/4/2 14/113/2 12/5/2
f 12/5/2 11/114/2 9/6/2
f 9/6/2 13/111/2 16/4/2
f 3/7/3 10/17/3 9/8/3
f 6/10/4 14/24/4 16/11/4
f 8/13/5 16/115/5 15/14/5
f 5/16/6 13/116/6 10/17/6
f 1/18/7 9/117/7 11/19/7
f 7/15/8 15/14/8 13/21/8
f 4/23/9 12/118/9 14/24/9
f 2/20/10 11/19/10 12/25/10
f 21/29/1 19/119/1 17/120/1
f 17/120/1 18/121/1 20/27/1
f 20/27/1 22/122/1 24/28/1
f 24/28/1 23/123/1 21/29/1
f 21/29/1 17/120/1 20/27/1
f 25/32/2 26/124/2 29/125/2
f 29/125/2 31/126/2 32/30/2
f 32/30/2 30/127/2 28/31/2
f 28/31/2 27/128/2 25/32/2
f 25/32/2 29/125/2 32/30/2
f 19/33/3 26/43/3 25/34/3
f 22/36/4 30/50/4 32/37/4
f 24/39/5 32/129/5 31/40/5
f 21/42/6 29/130/6 26/43/6
f 17/44/7 25/131/7 27/45/7
f 23/41/8 31/40/8 29/47/8
f 20/49/9 28/132/9 30/50/9
f 18/46/10 27/45/10 28/51/10
f 37/55/1 35/133/1 33/134/1
f 33/134/1 34/135/1 36/53/1
f 36/53/1 38/136/1 40/54/1
f 40/54/1 39/137/1 37/55/1
f 37/55/1 33/134/1 36/53/1
f 41/58/2 42/138/2 45/139/2
f 45/139/2 47/140/2 48/56/2
f 48/56/2 46/141/2 44/57/2
f 44/57/2 43/142/2 41/58/2
f 41/58/2 45/139/2 48/56/2
f 35/59/3 42/69/3 41/60/3
f 38/62/4 46/76/4 48/63/4
f 40/65/5 48/143/5 47/66/5
f 37/68/6 45/144/6 42/69/6
f 33/70/7 41/145/7 43/71/7
f 39/67/8 47/66/8 45/73/8
f 36/75/9 44/146/9 46/76/9
f 34/72/10 43/71/10 44/77/10
f 53/81/1 51/147/1 49/148/1
f 49/148/1 50/149/1 52/79/1
f 52/79/1 54/150/1 56/80/1
f 56/80/1 55/151/1 53/81/1
f 53/81/1 49/148/1 52/79/1
f 57/84/2 58/152/2 61/153/2
f 61/153/2 63/154/2 64/82/2
f 64/82/2 62/155/2 60/83/2
f 60/83/2 59/156/2 57/84/2
f 57/84/2 61/153/2 64/82/2
f 51/85/3 58/95/3 57/86/3
f 54/88/4 62/102/4 64/89/4
f 56/91/5 64/157/5 63/92/5
f 53/94/6 61/158/6 58/95/6
f 49/96/7 57/159/7 59/97/7
f 55/93/8 63/92/8 61/99/8
f 52/101/9 60/160/9 62/102/9
f 50/98/10 59/97/10 60/103/10

View File

@ -1,234 +0,0 @@
# Blender v2.79 (sub 0) OBJ File: 'rbmk_reflector.blend'
# www.blender.org
o Column
v -0.500000 0.000000 0.500000
v -0.500000 1.000000 0.500000
v -0.500000 0.000000 -0.500000
v -0.500000 1.000000 -0.500000
v 0.500000 0.000000 0.500000
v 0.500000 1.000000 0.500000
v 0.500000 0.000000 -0.500000
v 0.500000 1.000000 -0.500000
v 0.312500 1.000000 -0.500000
v 0.312500 0.000000 -0.500000
v -0.312500 1.000000 -0.500000
v -0.312500 0.000000 -0.500000
v -0.500000 1.000000 -0.312500
v -0.500000 0.000000 -0.312500
v -0.500000 1.000000 0.312500
v -0.500000 0.000000 0.312500
v -0.312500 1.000000 0.500000
v -0.312500 0.000000 0.500000
v 0.312500 1.000000 0.500000
v 0.312500 0.000000 0.500000
v 0.500000 1.000000 0.312500
v 0.500000 0.000000 0.312500
v 0.500000 1.000000 -0.312500
v 0.500000 0.000000 -0.312500
v -0.437500 1.000000 0.312500
v -0.437500 1.000000 -0.312500
v 0.312500 1.000000 -0.437500
v -0.312500 1.000000 -0.437500
v -0.312500 1.000000 0.437500
v 0.312500 1.000000 0.437500
v 0.437500 1.000000 0.312500
v 0.437500 1.000000 -0.312500
v -0.437500 0.000000 0.312500
v -0.437500 0.000000 -0.312500
v -0.312500 0.000000 0.437500
v 0.312500 0.000000 0.437500
v 0.437500 0.000000 0.312500
v 0.437500 0.000000 -0.312500
v -0.312500 0.000000 -0.437500
v 0.312500 0.000000 -0.437500
vt 0.406250 0.500000
vt 0.500000 0.000000
vt 0.500000 0.500000
vt 0.406250 0.531250
vt 0.468750 0.593750
vt 0.093750 0.968750
vt 0.000000 1.000000
vt 0.031250 0.906250
vt 0.531250 1.000000
vt 0.500000 0.500000
vt 0.531250 0.500000
vt 0.000000 0.500000
vt 0.093750 0.000000
vt 0.093750 0.500000
vt 0.406250 0.500000
vt 0.500000 0.000000
vt 0.500000 0.500000
vt 0.843750 0.500000
vt 0.000000 0.500000
vt 0.093750 0.000000
vt 0.093750 0.500000
vt 0.406250 0.500000
vt 0.500000 0.000000
vt 0.500000 0.500000
vt 0.031250 0.593750
vt 0.000000 0.593750
vt 0.000000 0.500000
vt 0.531250 0.500000
vt 0.500000 1.000000
vt 0.500000 0.500000
vt 0.406250 0.531250
vt 0.406250 0.500000
vt 0.500000 0.500000
vt 0.500000 0.500000
vt 0.531250 1.000000
vt 0.500000 1.000000
vt 0.843750 0.500000
vt 0.531250 0.500000
vt 0.468750 0.906250
vt 0.500000 0.906250
vt 0.500000 1.000000
vt 0.093750 0.968750
vt 0.093750 1.000000
vt 0.000000 1.000000
vt 0.031250 0.593750
vt 0.000000 0.593750
vt 0.000000 0.500000
vt 0.531250 1.000000
vt 0.500000 0.500000
vt 0.531250 0.500000
vt 0.093750 0.000000
vt 0.093750 0.500000
vt 0.531250 1.000000
vt 0.500000 0.500000
vt 0.531250 0.500000
vt 0.000000 0.500000
vt 0.093750 0.000000
vt 0.093750 0.500000
vt 0.406250 0.500000
vt 0.500000 0.000000
vt 0.500000 0.500000
vt 0.468750 0.906250
vt 0.500000 0.906250
vt 0.500000 1.000000
vt 0.843750 1.000000
vt 0.531250 1.000000
vt 0.500000 0.500000
vt 0.531250 0.500000
vt 0.093750 0.531250
vt 0.531250 1.000000
vt 0.500000 0.500000
vt 0.531250 0.500000
vt 0.843750 0.500000
vt 0.531250 1.000000
vt 0.500000 0.500000
vt 0.531250 0.500000
vt 0.406250 0.000000
vt 0.500000 0.593750
vt 0.093750 1.000000
vt 0.000000 0.906250
vt 0.500000 1.000000
vt 0.000000 0.000000
vt 0.406250 0.000000
vt 0.843750 1.000000
vt 0.000000 0.000000
vt 0.406250 0.000000
vt 0.093750 0.500000
vt 0.093750 0.531250
vt 0.531250 1.000000
vt 0.500000 0.593750
vt 0.468750 0.593750
vt 0.843750 1.000000
vt 0.406250 1.000000
vt 0.406250 0.968750
vt 0.000000 0.906250
vt 0.031250 0.906250
vt 0.500000 1.000000
vt 0.000000 0.000000
vt 0.500000 1.000000
vt 0.000000 0.000000
vt 0.406250 0.000000
vt 0.406250 1.000000
vt 0.406250 0.968750
vt 0.843750 0.500000
vt 0.500000 1.000000
vt 0.500000 1.000000
vt 0.843750 1.000000
vt 0.500000 1.000000
vn 0.0000 0.0000 1.0000
vn 0.0000 1.0000 0.0000
vn 0.0000 -1.0000 0.0000
vn 0.0000 0.0000 -1.0000
vn -1.0000 0.0000 0.0000
vn 1.0000 0.0000 0.0000
s off
f 19/1/1 5/2/1 6/3/1
f 30/4/2 6/3/2 31/5/2
f 40/6/3 7/7/3 38/8/3
f 26/9/1 14/10/1 34/11/1
f 8/12/4 10/13/4 9/14/4
f 11/15/4 3/16/4 4/17/4
f 33/18/5 26/9/5 34/11/5
f 4/19/5 14/20/5 13/21/5
f 15/22/5 1/23/5 2/24/5
f 37/25/3 22/26/3 5/27/3
f 16/28/4 25/29/4 33/30/4
f 35/31/3 18/32/3 1/33/3
f 10/34/5 27/35/5 9/36/5
f 39/37/4 27/35/4 40/38/4
f 32/39/2 23/40/2 8/41/2
f 28/42/2 11/43/2 4/44/2
f 25/45/2 15/46/2 2/47/2
f 11/48/6 39/49/6 12/50/6
f 2/47/1 18/51/1 17/52/1
f 31/53/4 22/54/4 37/55/4
f 6/56/6 22/57/6 21/58/6
f 23/59/6 7/60/6 8/61/6
f 34/62/3 14/63/3 3/64/3
f 37/55/6 32/65/6 31/53/6
f 23/66/1 38/67/1 24/68/1
f 25/45/2 29/69/2 30/4/2
f 29/70/6 18/71/6 35/72/6
f 36/73/1 29/70/1 35/72/1
f 37/25/3 35/31/3 34/62/3
f 19/74/5 36/75/5 20/76/5
f 19/1/1 20/77/1 5/2/1
f 19/1/2 6/3/2 30/4/2
f 6/3/2 21/78/2 31/5/2
f 10/79/3 7/7/3 40/6/3
f 7/7/3 24/80/3 38/8/3
f 26/9/1 13/81/1 14/10/1
f 8/12/4 7/82/4 10/13/4
f 11/15/4 12/83/4 3/16/4
f 33/18/5 25/84/5 26/9/5
f 4/19/5 3/85/5 14/20/5
f 15/22/5 16/86/5 1/23/5
f 5/27/3 20/87/3 36/88/3
f 36/88/3 37/25/3 5/27/3
f 16/28/4 15/89/4 25/29/4
f 1/33/3 16/90/3 33/91/3
f 33/91/3 35/31/3 1/33/3
f 10/34/5 40/38/5 27/35/5
f 39/37/4 28/92/4 27/35/4
f 9/93/2 27/94/2 8/41/2
f 27/94/2 32/39/2 8/41/2
f 4/44/2 13/95/2 26/96/2
f 26/96/2 28/42/2 4/44/2
f 2/47/2 17/52/2 29/69/2
f 29/69/2 25/45/2 2/47/2
f 11/48/6 28/97/6 39/49/6
f 2/47/1 1/98/1 18/51/1
f 31/53/4 21/99/4 22/54/4
f 6/56/6 5/100/6 22/57/6
f 23/59/6 24/101/6 7/60/6
f 3/64/3 12/102/3 39/103/3
f 39/103/3 34/62/3 3/64/3
f 37/55/6 38/104/6 32/65/6
f 23/66/1 32/105/1 38/67/1
f 30/4/2 31/5/2 28/42/2
f 31/5/2 32/39/2 28/42/2
f 32/39/2 27/94/2 28/42/2
f 28/42/2 26/96/2 30/4/2
f 26/96/2 25/45/2 30/4/2
f 29/70/6 17/106/6 18/71/6
f 36/73/1 30/107/1 29/70/1
f 40/6/3 38/8/3 37/25/3
f 37/25/3 36/88/3 35/31/3
f 35/31/3 33/91/3 34/62/3
f 34/62/3 39/103/3 40/6/3
f 40/6/3 37/25/3 34/62/3
f 19/74/5 30/108/5 36/75/5

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 362 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 459 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 424 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 826 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 190 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 396 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 333 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 417 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 396 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 898 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 398 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 118 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 232 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 370 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 410 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 892 B

After

Width:  |  Height:  |  Size: 988 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 952 B

After

Width:  |  Height:  |  Size: 1000 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 121 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 167 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 417 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 417 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 930 B

After

Width:  |  Height:  |  Size: 1019 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 121 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 167 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 417 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 417 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 121 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 167 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 417 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 417 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 931 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 390 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 384 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 881 B

After

Width:  |  Height:  |  Size: 452 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 208 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 452 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 216 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 347 B

Some files were not shown because too many files have changed in this diff Show More