diff --git a/src/minecraft/assemblyline/client/ClientProxy.java b/src/minecraft/assemblyline/client/ClientProxy.java index cab37d9e..e11a6d35 100644 --- a/src/minecraft/assemblyline/client/ClientProxy.java +++ b/src/minecraft/assemblyline/client/ClientProxy.java @@ -20,8 +20,8 @@ import assemblyline.common.CommonProxy; import assemblyline.common.block.TileEntityCrate; import assemblyline.common.machine.TileEntityManipulator; import assemblyline.common.machine.TileEntityRejector; +import assemblyline.common.machine.armbot.TileEntityArmbot; import assemblyline.common.machine.belt.TileEntityConveyorBelt; -import assemblyline.common.machine.crafter.TileEntityArmbot; import assemblyline.common.machine.detector.TileEntityDetector; import assemblyline.common.machine.encoder.TileEntityEncoder; import cpw.mods.fml.client.registry.ClientRegistry; diff --git a/src/minecraft/assemblyline/client/render/BlockRenderingHandler.java b/src/minecraft/assemblyline/client/render/BlockRenderingHandler.java index 99639af9..13ac0733 100644 --- a/src/minecraft/assemblyline/client/render/BlockRenderingHandler.java +++ b/src/minecraft/assemblyline/client/render/BlockRenderingHandler.java @@ -71,7 +71,7 @@ public class BlockRenderingHandler implements ISimpleBlockRenderingHandler GL11.glScalef(0.7f, 0.7f, 0.7f); GL11.glRotatef(180f, 0f, 0f, 1f); GL11.glRotatef(-90f, 0f, 1f, 0f); - RenderArmbot.MOEDL.render(0.0625F); + RenderArmbot.MODEL.render(0.0625F); GL11.glPopMatrix(); } } diff --git a/src/minecraft/assemblyline/client/render/RenderArmbot.java b/src/minecraft/assemblyline/client/render/RenderArmbot.java index f4abcf19..56613a4f 100644 --- a/src/minecraft/assemblyline/client/render/RenderArmbot.java +++ b/src/minecraft/assemblyline/client/render/RenderArmbot.java @@ -10,7 +10,7 @@ import assemblyline.common.AssemblyLine; 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"; @Override @@ -20,7 +20,7 @@ public class RenderArmbot extends TileEntitySpecialRenderer GL11.glPushMatrix(); GL11.glTranslatef((float) x + 0.5F, (float) y + 1.5F, (float) z + 0.5F); GL11.glScalef(1.0F, -1F, -1F); - MOEDL.render(0.0625f); + MODEL.render(0.0625f); GL11.glPopMatrix(); } diff --git a/src/minecraft/assemblyline/common/AssemblyLine.java b/src/minecraft/assemblyline/common/AssemblyLine.java index 4f110956..921ac2ed 100644 --- a/src/minecraft/assemblyline/common/AssemblyLine.java +++ b/src/minecraft/assemblyline/common/AssemblyLine.java @@ -18,8 +18,8 @@ import assemblyline.common.block.BlockCrate; import assemblyline.common.block.ItemBlockCrate; import assemblyline.common.machine.BlockManipulator; import assemblyline.common.machine.BlockRejector; +import assemblyline.common.machine.armbot.BlockArmbot; import assemblyline.common.machine.belt.BlockConveyorBelt; -import assemblyline.common.machine.crafter.BlockArmbot; import assemblyline.common.machine.detector.BlockDetector; import assemblyline.common.machine.encoder.BlockEncoder; import assemblyline.common.machine.encoder.ItemDisk; diff --git a/src/minecraft/assemblyline/common/CommonProxy.java b/src/minecraft/assemblyline/common/CommonProxy.java index c646378b..ff78a224 100644 --- a/src/minecraft/assemblyline/common/CommonProxy.java +++ b/src/minecraft/assemblyline/common/CommonProxy.java @@ -8,8 +8,8 @@ import universalelectricity.prefab.multiblock.TileEntityMulti; import assemblyline.common.block.TileEntityCrate; import assemblyline.common.machine.TileEntityManipulator; import assemblyline.common.machine.TileEntityRejector; +import assemblyline.common.machine.armbot.TileEntityArmbot; import assemblyline.common.machine.belt.TileEntityConveyorBelt; -import assemblyline.common.machine.crafter.TileEntityArmbot; import assemblyline.common.machine.detector.TileEntityDetector; import assemblyline.common.machine.encoder.ContainerEncoder; import assemblyline.common.machine.encoder.TileEntityEncoder; diff --git a/src/minecraft/assemblyline/common/machine/crafter/BlockArmbot.java b/src/minecraft/assemblyline/common/machine/armbot/BlockArmbot.java similarity index 97% rename from src/minecraft/assemblyline/common/machine/crafter/BlockArmbot.java rename to src/minecraft/assemblyline/common/machine/armbot/BlockArmbot.java index 318a8e46..97ded7a2 100644 --- a/src/minecraft/assemblyline/common/machine/crafter/BlockArmbot.java +++ b/src/minecraft/assemblyline/common/machine/armbot/BlockArmbot.java @@ -1,4 +1,4 @@ -package assemblyline.common.machine.crafter; +package assemblyline.common.machine.armbot; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; diff --git a/src/minecraft/assemblyline/common/machine/armbot/Command.java b/src/minecraft/assemblyline/common/machine/armbot/Command.java index ea89574a..951d847d 100644 --- a/src/minecraft/assemblyline/common/machine/armbot/Command.java +++ b/src/minecraft/assemblyline/common/machine/armbot/Command.java @@ -3,7 +3,6 @@ package assemblyline.common.machine.armbot; import java.util.HashMap; import net.minecraft.world.World; -import assemblyline.common.machine.crafter.TileEntityArmbot; /** * An AI Commands that is used by TileEntities with AI. diff --git a/src/minecraft/assemblyline/common/machine/armbot/CommandIdle.java b/src/minecraft/assemblyline/common/machine/armbot/CommandIdle.java index 81193fa4..72d85425 100644 --- a/src/minecraft/assemblyline/common/machine/armbot/CommandIdle.java +++ b/src/minecraft/assemblyline/common/machine/armbot/CommandIdle.java @@ -1,6 +1,5 @@ package assemblyline.common.machine.armbot; -import assemblyline.common.machine.crafter.TileEntityArmbot; public class CommandIdle extends Command { diff --git a/src/minecraft/assemblyline/common/machine/crafter/ContainerCrafter.java b/src/minecraft/assemblyline/common/machine/armbot/ContainerCrafter.java similarity index 98% rename from src/minecraft/assemblyline/common/machine/crafter/ContainerCrafter.java rename to src/minecraft/assemblyline/common/machine/armbot/ContainerCrafter.java index 1efe02cd..bf5ac6cf 100644 --- a/src/minecraft/assemblyline/common/machine/crafter/ContainerCrafter.java +++ b/src/minecraft/assemblyline/common/machine/armbot/ContainerCrafter.java @@ -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.InventoryPlayer; diff --git a/src/minecraft/assemblyline/common/machine/crafter/EntityCraftingArm.java b/src/minecraft/assemblyline/common/machine/armbot/EntityCraftingArm.java similarity index 99% rename from src/minecraft/assemblyline/common/machine/crafter/EntityCraftingArm.java rename to src/minecraft/assemblyline/common/machine/armbot/EntityCraftingArm.java index 6a1e431e..3831f560 100644 --- a/src/minecraft/assemblyline/common/machine/crafter/EntityCraftingArm.java +++ b/src/minecraft/assemblyline/common/machine/armbot/EntityCraftingArm.java @@ -1,4 +1,4 @@ -package assemblyline.common.machine.crafter; +package assemblyline.common.machine.armbot; import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityItem; diff --git a/src/minecraft/assemblyline/common/machine/crafter/ItemCrafterArm.java b/src/minecraft/assemblyline/common/machine/armbot/ItemCrafterArm.java similarity index 78% rename from src/minecraft/assemblyline/common/machine/crafter/ItemCrafterArm.java rename to src/minecraft/assemblyline/common/machine/armbot/ItemCrafterArm.java index f3071e80..4c573352 100644 --- a/src/minecraft/assemblyline/common/machine/crafter/ItemCrafterArm.java +++ b/src/minecraft/assemblyline/common/machine/armbot/ItemCrafterArm.java @@ -1,4 +1,4 @@ -package assemblyline.common.machine.crafter; +package assemblyline.common.machine.armbot; import net.minecraft.item.Item; diff --git a/src/minecraft/assemblyline/common/machine/crafter/TaskArmCollect.java b/src/minecraft/assemblyline/common/machine/armbot/TaskArmCollect.java similarity index 85% rename from src/minecraft/assemblyline/common/machine/crafter/TaskArmCollect.java rename to src/minecraft/assemblyline/common/machine/armbot/TaskArmCollect.java index a421dbdb..bf14fbc6 100644 --- a/src/minecraft/assemblyline/common/machine/crafter/TaskArmCollect.java +++ b/src/minecraft/assemblyline/common/machine/armbot/TaskArmCollect.java @@ -1,7 +1,6 @@ -package assemblyline.common.machine.crafter; +package assemblyline.common.machine.armbot; import net.minecraft.entity.item.EntityItem; -import assemblyline.common.machine.armbot.Command; /** * Used by arms to collect items in a specific region. diff --git a/src/minecraft/assemblyline/common/machine/crafter/TaskArmSearch.java b/src/minecraft/assemblyline/common/machine/armbot/TaskArmSearch.java similarity index 93% rename from src/minecraft/assemblyline/common/machine/crafter/TaskArmSearch.java rename to src/minecraft/assemblyline/common/machine/armbot/TaskArmSearch.java index 70e19923..4846be0c 100644 --- a/src/minecraft/assemblyline/common/machine/crafter/TaskArmSearch.java +++ b/src/minecraft/assemblyline/common/machine/armbot/TaskArmSearch.java @@ -1,10 +1,9 @@ -package assemblyline.common.machine.crafter; +package assemblyline.common.machine.armbot; import java.util.List; import net.minecraft.entity.Entity; import net.minecraft.util.AxisAlignedBB; -import assemblyline.common.machine.armbot.Command; /** * Used by arms to search for entities in a region diff --git a/src/minecraft/assemblyline/common/machine/crafter/TileEntityArmbot.java b/src/minecraft/assemblyline/common/machine/armbot/TileEntityArmbot.java similarity index 97% rename from src/minecraft/assemblyline/common/machine/crafter/TileEntityArmbot.java rename to src/minecraft/assemblyline/common/machine/armbot/TileEntityArmbot.java index d18a1493..1c2e8401 100644 --- a/src/minecraft/assemblyline/common/machine/crafter/TileEntityArmbot.java +++ b/src/minecraft/assemblyline/common/machine/armbot/TileEntityArmbot.java @@ -1,4 +1,4 @@ -package assemblyline.common.machine.crafter; +package assemblyline.common.machine.armbot; import java.util.EnumSet; @@ -20,8 +20,6 @@ import universalelectricity.prefab.multiblock.IMultiBlock; import universalelectricity.prefab.network.IPacketReceiver; import assemblyline.common.AssemblyLine; import assemblyline.common.machine.TileEntityAssemblyNetwork; -import assemblyline.common.machine.armbot.CommandIdle; -import assemblyline.common.machine.armbot.CommandManager; import assemblyline.common.machine.encoder.ItemDisk; import com.google.common.io.ByteArrayDataInput; diff --git a/src/minecraft/assemblyline/common/machine/crafter/TileEntityAutoCrafter.java b/src/minecraft/assemblyline/common/machine/armbot/TileEntityAutoCrafter.java similarity index 93% rename from src/minecraft/assemblyline/common/machine/crafter/TileEntityAutoCrafter.java rename to src/minecraft/assemblyline/common/machine/armbot/TileEntityAutoCrafter.java index f4419583..2420a680 100644 --- a/src/minecraft/assemblyline/common/machine/crafter/TileEntityAutoCrafter.java +++ b/src/minecraft/assemblyline/common/machine/armbot/TileEntityAutoCrafter.java @@ -1,4 +1,4 @@ -package assemblyline.common.machine.crafter; +package assemblyline.common.machine.armbot; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.network.INetworkManager;