Moved some armbot classes into the armbot package (yay organization! :D)

Also fixed typo in RenderArmbot
This commit is contained in:
Brian Ricketts 2013-01-08 12:05:27 -06:00
parent 47fba5551d
commit 52abadc662
15 changed files with 14 additions and 20 deletions

View file

@ -20,8 +20,8 @@ import assemblyline.common.CommonProxy;
import assemblyline.common.block.TileEntityCrate; import assemblyline.common.block.TileEntityCrate;
import assemblyline.common.machine.TileEntityManipulator; import assemblyline.common.machine.TileEntityManipulator;
import assemblyline.common.machine.TileEntityRejector; import assemblyline.common.machine.TileEntityRejector;
import assemblyline.common.machine.armbot.TileEntityArmbot;
import assemblyline.common.machine.belt.TileEntityConveyorBelt; import assemblyline.common.machine.belt.TileEntityConveyorBelt;
import assemblyline.common.machine.crafter.TileEntityArmbot;
import assemblyline.common.machine.detector.TileEntityDetector; import assemblyline.common.machine.detector.TileEntityDetector;
import assemblyline.common.machine.encoder.TileEntityEncoder; import assemblyline.common.machine.encoder.TileEntityEncoder;
import cpw.mods.fml.client.registry.ClientRegistry; import cpw.mods.fml.client.registry.ClientRegistry;

View file

@ -71,7 +71,7 @@ public class BlockRenderingHandler implements ISimpleBlockRenderingHandler
GL11.glScalef(0.7f, 0.7f, 0.7f); GL11.glScalef(0.7f, 0.7f, 0.7f);
GL11.glRotatef(180f, 0f, 0f, 1f); GL11.glRotatef(180f, 0f, 0f, 1f);
GL11.glRotatef(-90f, 0f, 1f, 0f); GL11.glRotatef(-90f, 0f, 1f, 0f);
RenderArmbot.MOEDL.render(0.0625F); RenderArmbot.MODEL.render(0.0625F);
GL11.glPopMatrix(); GL11.glPopMatrix();
} }
} }

View file

@ -10,7 +10,7 @@ import assemblyline.common.AssemblyLine;
public class RenderArmbot extends TileEntitySpecialRenderer public class RenderArmbot extends TileEntitySpecialRenderer
{ {
public static final ModelArmbot MOEDL = new ModelArmbot(); public static final ModelArmbot MODEL = new ModelArmbot();
public static final String TEXTURE = "armbot.png"; public static final String TEXTURE = "armbot.png";
@Override @Override
@ -20,7 +20,7 @@ public class RenderArmbot extends TileEntitySpecialRenderer
GL11.glPushMatrix(); GL11.glPushMatrix();
GL11.glTranslatef((float) x + 0.5F, (float) y + 1.5F, (float) z + 0.5F); GL11.glTranslatef((float) x + 0.5F, (float) y + 1.5F, (float) z + 0.5F);
GL11.glScalef(1.0F, -1F, -1F); GL11.glScalef(1.0F, -1F, -1F);
MOEDL.render(0.0625f); MODEL.render(0.0625f);
GL11.glPopMatrix(); GL11.glPopMatrix();
} }

View file

@ -18,8 +18,8 @@ import assemblyline.common.block.BlockCrate;
import assemblyline.common.block.ItemBlockCrate; import assemblyline.common.block.ItemBlockCrate;
import assemblyline.common.machine.BlockManipulator; import assemblyline.common.machine.BlockManipulator;
import assemblyline.common.machine.BlockRejector; import assemblyline.common.machine.BlockRejector;
import assemblyline.common.machine.armbot.BlockArmbot;
import assemblyline.common.machine.belt.BlockConveyorBelt; import assemblyline.common.machine.belt.BlockConveyorBelt;
import assemblyline.common.machine.crafter.BlockArmbot;
import assemblyline.common.machine.detector.BlockDetector; import assemblyline.common.machine.detector.BlockDetector;
import assemblyline.common.machine.encoder.BlockEncoder; import assemblyline.common.machine.encoder.BlockEncoder;
import assemblyline.common.machine.encoder.ItemDisk; import assemblyline.common.machine.encoder.ItemDisk;

View file

@ -8,8 +8,8 @@ import universalelectricity.prefab.multiblock.TileEntityMulti;
import assemblyline.common.block.TileEntityCrate; import assemblyline.common.block.TileEntityCrate;
import assemblyline.common.machine.TileEntityManipulator; import assemblyline.common.machine.TileEntityManipulator;
import assemblyline.common.machine.TileEntityRejector; import assemblyline.common.machine.TileEntityRejector;
import assemblyline.common.machine.armbot.TileEntityArmbot;
import assemblyline.common.machine.belt.TileEntityConveyorBelt; import assemblyline.common.machine.belt.TileEntityConveyorBelt;
import assemblyline.common.machine.crafter.TileEntityArmbot;
import assemblyline.common.machine.detector.TileEntityDetector; import assemblyline.common.machine.detector.TileEntityDetector;
import assemblyline.common.machine.encoder.ContainerEncoder; import assemblyline.common.machine.encoder.ContainerEncoder;
import assemblyline.common.machine.encoder.TileEntityEncoder; import assemblyline.common.machine.encoder.TileEntityEncoder;

View file

@ -1,4 +1,4 @@
package assemblyline.common.machine.crafter; package assemblyline.common.machine.armbot;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;

View file

@ -3,7 +3,6 @@ package assemblyline.common.machine.armbot;
import java.util.HashMap; import java.util.HashMap;
import net.minecraft.world.World; import net.minecraft.world.World;
import assemblyline.common.machine.crafter.TileEntityArmbot;
/** /**
* An AI Commands that is used by TileEntities with AI. * An AI Commands that is used by TileEntities with AI.

View file

@ -1,6 +1,5 @@
package assemblyline.common.machine.armbot; package assemblyline.common.machine.armbot;
import assemblyline.common.machine.crafter.TileEntityArmbot;
public class CommandIdle extends Command public class CommandIdle extends Command
{ {

View file

@ -1,4 +1,4 @@
package assemblyline.common.machine.crafter; package assemblyline.common.machine.armbot;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.entity.player.InventoryPlayer;

View file

@ -1,4 +1,4 @@
package assemblyline.common.machine.crafter; package assemblyline.common.machine.armbot;
import net.minecraft.entity.Entity; import net.minecraft.entity.Entity;
import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.item.EntityItem;

View file

@ -1,4 +1,4 @@
package assemblyline.common.machine.crafter; package assemblyline.common.machine.armbot;
import net.minecraft.item.Item; import net.minecraft.item.Item;

View file

@ -1,7 +1,6 @@
package assemblyline.common.machine.crafter; package assemblyline.common.machine.armbot;
import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.item.EntityItem;
import assemblyline.common.machine.armbot.Command;
/** /**
* Used by arms to collect items in a specific region. * Used by arms to collect items in a specific region.

View file

@ -1,10 +1,9 @@
package assemblyline.common.machine.crafter; package assemblyline.common.machine.armbot;
import java.util.List; import java.util.List;
import net.minecraft.entity.Entity; import net.minecraft.entity.Entity;
import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.AxisAlignedBB;
import assemblyline.common.machine.armbot.Command;
/** /**
* Used by arms to search for entities in a region * Used by arms to search for entities in a region

View file

@ -1,4 +1,4 @@
package assemblyline.common.machine.crafter; package assemblyline.common.machine.armbot;
import java.util.EnumSet; import java.util.EnumSet;
@ -20,8 +20,6 @@ import universalelectricity.prefab.multiblock.IMultiBlock;
import universalelectricity.prefab.network.IPacketReceiver; import universalelectricity.prefab.network.IPacketReceiver;
import assemblyline.common.AssemblyLine; import assemblyline.common.AssemblyLine;
import assemblyline.common.machine.TileEntityAssemblyNetwork; import assemblyline.common.machine.TileEntityAssemblyNetwork;
import assemblyline.common.machine.armbot.CommandIdle;
import assemblyline.common.machine.armbot.CommandManager;
import assemblyline.common.machine.encoder.ItemDisk; import assemblyline.common.machine.encoder.ItemDisk;
import com.google.common.io.ByteArrayDataInput; import com.google.common.io.ByteArrayDataInput;

View file

@ -1,4 +1,4 @@
package assemblyline.common.machine.crafter; package assemblyline.common.machine.armbot;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.network.INetworkManager; import net.minecraft.network.INetworkManager;