tilera/electrodynamics
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Wiki Activity

Fixed some mapping issues for tiles

Browse source
This commit is contained in:
Robert 2013-11-29 16:04:28 -05:00
parent b5002d4f52
commit 0f3408ec5d
4 changed files with 23 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/dark/assembly/client/render/RenderCrate.java
View file

@ -31,8 +31,7 @@ public class RenderCrate extends TileEntitySpecialRenderer
public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float var8)
{
Vector3 vec = new Vector3(x, y, z);
double distance = vec.distance(new Vector3(0, 0, 0));
System.out.println("Rendering Crate");
double distance = vec.distance(new Vector3(0, 0, 0));
if (tileEntity instanceof TileEntityCrate)
{

3
src/dark/assembly/machine/BlockCrate.java
View file

@ -405,14 +405,13 @@ public class BlockCrate extends BlockAssembly
@Override
public void getTileEntities(int blockID, Set<Pair<String, Class<? extends TileEntity>>> list)
{
list.add(new Pair<String, Class<? extends TileEntity>>("ALConveyorBelt", TileEntityConveyorBelt.class));
list.add(new Pair<String, Class<? extends TileEntity>>("ALCrate", TileEntityCrate.class));
}
@Override
@SideOnly(Side.CLIENT)
public void getClientTileEntityRenderers(List<Pair<Class<? extends TileEntity>, TileEntitySpecialRenderer>> list)
{
System.out.println("Registering crate render");
list.add(new Pair<Class<? extends TileEntity>, TileEntitySpecialRenderer>(TileEntityCrate.class, new RenderCrate()));
}

13
src/dark/assembly/machine/belt/BlockConveyor.java
View file

@ -2,6 +2,9 @@ package dark.assembly.machine.belt;
import java.util.List;
import com.builtbroken.common.Pair;
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
@ -15,7 +18,10 @@ import net.minecraftforge.common.ForgeDirection;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import dark.assembly.client.render.BlockRenderingHandler;
import dark.assembly.client.render.RenderConveyorBelt;
import dark.assembly.client.render.RenderCrate;
import dark.assembly.machine.BlockAssembly;
import dark.assembly.machine.TileEntityCrate;
import dark.assembly.machine.belt.TileEntityConveyorBelt.SlantType;
import dark.core.common.DarkMain;
import dark.core.prefab.tilenetwork.NetworkItemSupply;
@ -252,6 +258,13 @@ public class BlockConveyor extends BlockAssembly
return true;
}
@Override
@SideOnly(Side.CLIENT)
public void getClientTileEntityRenderers(List<Pair<Class<? extends TileEntity>, TileEntitySpecialRenderer>> list)
{
list.add(new Pair<Class<? extends TileEntity>, TileEntitySpecialRenderer>(TileEntityConveyorBelt.class, new RenderConveyorBelt()));
}
/** Returns the TileEntity used by this block. */
@Override

8
src/dark/assembly/machine/belt/BlockConveyorBelt.java
View file

@ -1,6 +1,7 @@
package dark.assembly.machine.belt;
import java.util.List;
import java.util.Set;
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
import net.minecraft.entity.Entity;
@ -24,6 +25,7 @@ import cpw.mods.fml.relauncher.SideOnly;
import dark.assembly.client.render.BlockRenderingHandler;
import dark.assembly.client.render.RenderConveyorBelt;
import dark.assembly.machine.BlockAssembly;
import dark.assembly.machine.TileEntityCrate;
import dark.assembly.machine.belt.TileEntityConveyorBelt.SlantType;
import dark.core.common.DarkMain;
import dark.core.registration.ModObjectRegistry.BlockBuildData;
@ -336,6 +338,12 @@ public class BlockConveyorBelt extends BlockAssembly
{
list.add(new Pair<Class<? extends TileEntity>, TileEntitySpecialRenderer>(TileEntityConveyorBelt.class, new RenderConveyorBelt()));
}
@Override
public void getTileEntities(int blockID, Set<Pair<String, Class<? extends TileEntity>>> list)
{
list.add(new Pair<String, Class<? extends TileEntity>>("ALConveyorBelt", TileEntityConveyorBelt.class));
}
/** Returns the TileEntity used by this block. */
@Override