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

More work on Encoder GUI

Browse source
This commit is contained in:
Brian Ricketts 2012-12-30 23:45:53 -06:00
parent f50698c57d
commit e7a0d11263
15 changed files with 396 additions and 85 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
resources/assemblyline/language/en_US.properties
View file

@ -8,7 +8,7 @@ assemblyline.gui.crafting=Crafting
tile.crate.name=Crate
tile.conveyorBelt.name=Conveyor Belt
tile.imprinter.name=Imprinter
tile.programmer.name=Programmer
tile.encoder.name=Encoder
tile.engineerTable.name=Engineer's Table
tile.detector.name=Detector
tile.armbot.name=Armbot

BIN
resources/assemblyline/textures/gui_programmer.png → resources/assemblyline/textures/gui_encoder.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 49 KiB

After

Width:  |  Height:  |  Size: 49 KiB

7
src/minecraft/assemblyline/client/ClientProxy.java
View file

@ -7,7 +7,7 @@ import net.minecraft.world.World;
import net.minecraftforge.client.MinecraftForgeClient;
import universalelectricity.core.vector.Vector3;
import assemblyline.client.gui.GuiImprinter;
import assemblyline.client.gui.GuiProgrammer;
import assemblyline.client.gui.GuiEncoder;
import assemblyline.client.render.BlockRenderingHandler;
import assemblyline.client.render.RenderConveyorBelt;
import assemblyline.client.render.RenderCrate;
@ -21,6 +21,7 @@ import assemblyline.common.machine.TileEntityManipulator;
import assemblyline.common.machine.TileEntityRejector;
import assemblyline.common.machine.belt.TileEntityConveyorBelt;
import assemblyline.common.machine.detector.TileEntityDetector;
import assemblyline.common.machine.encoder.ContainerEncoder;
import cpw.mods.fml.client.registry.ClientRegistry;
import cpw.mods.fml.client.registry.RenderingRegistry;
@ -55,8 +56,8 @@ public class ClientProxy extends CommonProxy
{
case GUI_STAMPER:
return new GuiImprinter(player.inventory, world, new Vector3(x, y, z));
case GUI_PROGRAMMER:
return new GuiProgrammer(player.inventory, world, new Vector3(x, y, z));
case GUI_ENCODER:
return new GuiEncoder(player.inventory, world, new Vector3(x, y, z), (ContainerEncoder) getServerGuiElement(ID, player, world, x, y, z));
}
return null;

114
src/minecraft/assemblyline/client/gui/GuiCommandList.java Normal file
View file

@ -0,0 +1,114 @@
package assemblyline.client.gui;
import java.util.ArrayList;
import org.lwjgl.opengl.GL11;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.Tessellator;
import cpw.mods.fml.client.GuiScrollingList;
public class GuiCommandList extends GuiScrollingList
{
private ArrayList<String> commands;
private int selIndex;
private Minecraft mc;
public GuiCommandList(Minecraft client, int width, int height, int top, int bottom, int left, int entryHeight)
{
super(client, width, height, top, bottom, left, entryHeight);
commands = new ArrayList<String>();
selIndex = -1;
this.mc = client;
}
public void setCommands(ArrayList<String> commands)
{
this.commands = (ArrayList<String>) commands.clone();
}
@Override
protected int getSize()
{
return commands.size();
}
@Override
protected void elementClicked(int index, boolean doubleClick)
{
selIndex = index;
}
@Override
protected boolean isSelected(int index)
{
return selIndex == index;
}
@Override
protected void drawBackground()
{
drawOutlineRect(this.left, this.left + this.listWidth, this.top, this.top + this.listHeight, 0, 0, 0, 0.5f, 0.5f, 0.5f);
}
public static void drawOutlineRect(int x1, int y1, int x2, int y2, float rR, float rG, float rB, float lR, float lG, float lB)
{
Tessellator tesselator = Tessellator.instance;
GL11.glEnable(GL11.GL_BLEND);
GL11.glDisable(GL11.GL_TEXTURE_2D);
GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
GL11.glColor4f(rR, rG, rB, 1f);
if (rR > 0 && rG > 0 && rB > 0)
{
// background
tesselator.startDrawingQuads();
tesselator.addVertex((double) x1, (double) y2, 0.0D);
tesselator.addVertex((double) x2, (double) y2, 0.0D);
tesselator.addVertex((double) x2, (double) y1, 0.0D);
tesselator.addVertex((double) x1, (double) y1, 0.0D);
tesselator.draw();
}
// outline
GL11.glColor4f(lR, lG, lB, 1f);
tesselator.startDrawingQuads();
tesselator.addVertex((double) x1, (double) y1, 0.0D);
tesselator.addVertex((double) x1, (double) y2, 0.0D);
tesselator.addVertex((double) x1 + 1, (double) y2, 0.0D);
tesselator.addVertex((double) x1 + 1, (double) y1, 0.0D);
tesselator.draw();
tesselator.startDrawingQuads();
tesselator.addVertex((double) x2 - 1, (double) y1, 0.0D);
tesselator.addVertex((double) x2 - 1, (double) y2, 0.0D);
tesselator.addVertex((double) x2, (double) y2, 0.0D);
tesselator.addVertex((double) x2, (double) y1, 0.0D);
tesselator.draw();
tesselator.startDrawingQuads();
tesselator.addVertex((double) x1, (double) y1, 0.0D);
tesselator.addVertex((double) x1, (double) y1 + 1, 0.0D);
tesselator.addVertex((double) x2, (double) y1 + 1, 0.0D);
tesselator.addVertex((double) x2, (double) y1, 0.0D);
tesselator.draw();
tesselator.startDrawingQuads();
tesselator.addVertex((double) x1, (double) y2 - 1, 0.0D);
tesselator.addVertex((double) x1, (double) y2, 0.0D);
tesselator.addVertex((double) x2, (double) y2, 0.0D);
tesselator.addVertex((double) x2, (double) y2 - 1, 0.0D);
tesselator.draw();
GL11.glEnable(GL11.GL_TEXTURE_2D);
GL11.glDisable(GL11.GL_BLEND);
}
@Override
protected void drawSlot(int slotID, int width, int slotY, int slotHeight, Tessellator tessellator)
{
if (slotID < commands.size())
{
String command = commands.get(slotID);
if (isSelected(slotID))
drawOutlineRect(this.left, this.left + width, this.top + slotY, this.top + slotY + slotHeight, -1, -1, -1, 0.5f, 0.5f, 0.5f);
this.mc.fontRenderer.drawString(command, this.left + 4, slotY + 4, 0xAAAAAA, false);
}
}
}

227
src/minecraft/assemblyline/client/gui/GuiEncoder.java Normal file
View file

@ -0,0 +1,227 @@
package assemblyline.client.gui;
import java.util.ArrayList;
import net.minecraft.client.gui.GuiButton;
import net.minecraft.client.gui.GuiTextField;
import net.minecraft.client.gui.inventory.GuiContainer;
import net.minecraft.client.renderer.Tessellator;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
import org.lwjgl.input.Keyboard;
import org.lwjgl.opengl.GL11;
import static org.lwjgl.opengl.GL11.*;
import cpw.mods.fml.client.GuiScrollingList;
import universalelectricity.core.vector.Vector3;
import universalelectricity.prefab.TranslationHelper;
import assemblyline.common.AssemblyLine;
import assemblyline.common.machine.encoder.ContainerEncoder;
import assemblyline.common.machine.encoder.IInventoryWatcher;
public class GuiEncoder extends GuiContainer implements IInventoryWatcher
{
private int containerWidth;
private int containerHeight;
private ContainerEncoder encoderContainer;
private ArrayList<String> commands;
private GuiButton addButton;
private GuiButton delButton;
private GuiButton pUpButton;
private GuiButton pDnButton;
private GuiTextField commandField;
public GuiEncoder(InventoryPlayer par1InventoryPlayer, World worldObj, Vector3 position, ContainerEncoder encoderContainer)
{
super(new ContainerEncoder(par1InventoryPlayer, worldObj, position));
this.ySize = 256;
this.encoderContainer = encoderContainer;
if (encoderContainer != null)
{
encoderContainer.setWatcher(this);
}
}
@Override
public void initGui()
{
super.initGui();
this.allowUserInput = true;
containerWidth = (this.width - this.xSize) / 2;
containerHeight = (this.height - this.ySize) / 2;
addButton = new GuiButton(0, containerWidth + (xSize - 25), containerHeight + 148, 18, 20, "+");
delButton = new GuiButton(1, containerWidth + (xSize - 43), containerHeight + 148, 18, 20, "-");
pUpButton = new GuiButton(2, containerWidth + (xSize - 25), containerHeight + 48 , 18, 20, "");
pDnButton = new GuiButton(3, containerWidth + (xSize - 25), containerHeight + 128, 18, 20, "");
commandField = new GuiTextField(fontRenderer, 8, 149, xSize - 52, 18);
//commandList = new GuiCommandList(mc, xSize - 7, 128, 7, 120, 170, 20);
controlList.add(addButton);
controlList.add(delButton);
controlList.add(pUpButton);
controlList.add(pDnButton);
}
@Override
protected void actionPerformed(GuiButton button)
{
switch (button.id)
{
case 0: //add
{
if (encoderContainer != null)
{
ItemStack disk = encoderContainer.getStackInSlot(0);
if (disk != null)
{
}
}
commandField.setText("");
break;
}
case 1: //subtract
{
break;
}
}
}
/**
* Draw the foreground layer for the GuiContainer (everything in front of the items)
*/
@Override
protected void drawGuiContainerForegroundLayer(int par1, int par2)
{
this.fontRenderer.drawString(TranslationHelper.getLocal("tile.encoder.name"), 68, 6, 4210752);
this.fontRenderer.drawString("Disk:", 56, 28, 4210752);
//render page up and page down buttons
glPushMatrix();
glTranslatef(pUpButton.xPosition - containerWidth + 6, pUpButton.yPosition - containerHeight + 7, 0);
this.fontRenderer.drawString("^", 1, 1, 0x444444);
this.fontRenderer.drawString("^", 0, 0, 0xFFFFFF);
glPopMatrix();
glPushMatrix();
glTranslatef(pDnButton.xPosition - containerWidth + 6, pDnButton.yPosition - containerHeight + 7, 0);
glRotatef(180, 0, 0, 1);
glTranslatef(-5, -4, 0);
this.fontRenderer.drawString("^", -1, -1, 0x444444);
this.fontRenderer.drawString("^", 0, 0, 0xFFFFFF);
glPopMatrix();
if (commands != null)
{
drawCommands();
}
commandField.drawTextBox();
}
private void drawCommands()
{
}
@Override
protected void mouseClicked(int x, int y, int button)
{
super.mouseClicked(x, y, button);
commandField.mouseClicked(x - containerWidth, y - containerHeight, button);
}
@Override
protected void keyTyped(char character, int keycode)
{
if (keycode == Keyboard.KEY_ESCAPE)
{
mc.thePlayer.closeScreen();
}
else
{
commandField.textboxKeyTyped(character, keycode);
}
}
/**
* Draw the background layer for the GuiContainer (everything behind the items)
*/
@Override
protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3)
{
int var4 = this.mc.renderEngine.getTexture(AssemblyLine.TEXTURE_PATH + "gui_encoder.png");
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
this.mc.renderEngine.bindTexture(var4);
this.drawTexturedModalRect(containerWidth, containerHeight, 0, 0, this.xSize, this.ySize);
drawOutlineRect(containerWidth + 7, containerHeight + 48, containerWidth + (xSize - 25), containerHeight + 48 + 100, 0, 0, 0, 0.5f, 0.5f, 0.5f);
}
public static void drawOutlineRect(int x1, int y1, int x2, int y2, float rR, float rG, float rB, float lR, float lG, float lB)
{
Tessellator tesselator = Tessellator.instance;
GL11.glEnable(GL11.GL_BLEND);
GL11.glDisable(GL11.GL_TEXTURE_2D);
GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
GL11.glColor4f(rR, rG, rB, 1f);
if (rR >= 0 && rG >= 0 && rB >= 0)
{
// background
tesselator.startDrawingQuads();
tesselator.addVertex((double) x1, (double) y2, 0.0D);
tesselator.addVertex((double) x2, (double) y2, 0.0D);
tesselator.addVertex((double) x2, (double) y1, 0.0D);
tesselator.addVertex((double) x1, (double) y1, 0.0D);
tesselator.draw();
}
// outline
GL11.glColor4f(lR, lG, lB, 1f);
tesselator.startDrawingQuads();
tesselator.addVertex((double) x1, (double) y1, 0.0D);
tesselator.addVertex((double) x1, (double) y2, 0.0D);
tesselator.addVertex((double) x1 + 1, (double) y2, 0.0D);
tesselator.addVertex((double) x1 + 1, (double) y1, 0.0D);
tesselator.draw();
tesselator.startDrawingQuads();
tesselator.addVertex((double) x2 - 1, (double) y1, 0.0D);
tesselator.addVertex((double) x2 - 1, (double) y2, 0.0D);
tesselator.addVertex((double) x2, (double) y2, 0.0D);
tesselator.addVertex((double) x2, (double) y1, 0.0D);
tesselator.draw();
tesselator.startDrawingQuads();
tesselator.addVertex((double) x1, (double) y1, 0.0D);
tesselator.addVertex((double) x1, (double) y1 + 1, 0.0D);
tesselator.addVertex((double) x2, (double) y1 + 1, 0.0D);
tesselator.addVertex((double) x2, (double) y1, 0.0D);
tesselator.draw();
tesselator.startDrawingQuads();
tesselator.addVertex((double) x1, (double) y2 - 1, 0.0D);
tesselator.addVertex((double) x1, (double) y2, 0.0D);
tesselator.addVertex((double) x2, (double) y2, 0.0D);
tesselator.addVertex((double) x2, (double) y2 - 1, 0.0D);
tesselator.draw();
GL11.glEnable(GL11.GL_TEXTURE_2D);
GL11.glDisable(GL11.GL_BLEND);
}
private void updateCommands()
{
}
@Override
public void inventoryChanged()
{
updateCommands();
}
}

46
src/minecraft/assemblyline/client/gui/GuiProgrammer.java
View file

@ -1,46 +0,0 @@
package assemblyline.client.gui;
import net.minecraft.client.gui.inventory.GuiContainer;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.world.World;
import org.lwjgl.opengl.GL11;
import universalelectricity.core.vector.Vector3;
import universalelectricity.prefab.TranslationHelper;
import assemblyline.common.AssemblyLine;
import assemblyline.common.machine.programmer.ContainerProgrammer;
public class GuiProgrammer extends GuiContainer
{
private int containerWidth;
private int containerHeight;
public GuiProgrammer(InventoryPlayer par1InventoryPlayer, World worldObj, Vector3 position)
{
super(new ContainerProgrammer(par1InventoryPlayer, worldObj, position));
}
/**
* Draw the foreground layer for the GuiContainer (everything in front of the items)
*/
@Override
protected void drawGuiContainerForegroundLayer(int par1, int par2)
{
this.fontRenderer.drawString(TranslationHelper.getLocal("tile.programmer.name"), 68, 6, 4210752);
}
/**
* Draw the background layer for the GuiContainer (everything behind the items)
*/
@Override
protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3)
{
int var4 = this.mc.renderEngine.getTexture(AssemblyLine.TEXTURE_PATH + "gui_programmer.png");
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
this.mc.renderEngine.bindTexture(var4);
containerWidth = (this.width - this.xSize) / 2;
containerHeight = (this.height - this.ySize) / 2;
this.drawTexturedModalRect(containerWidth, containerHeight, 0, 0, this.xSize, this.ySize);
}
}

12
src/minecraft/assemblyline/common/AssemblyLine.java
View file

@ -14,16 +14,16 @@ import universalelectricity.prefab.UETab;
import universalelectricity.prefab.UpdateNotifier;
import universalelectricity.prefab.network.PacketManager;
import assemblyline.common.block.BlockCrate;
import assemblyline.common.block.BlockEncoder;
import assemblyline.common.block.BlockEncoder2;
import assemblyline.common.block.ItemBlockCrate;
import assemblyline.common.machine.BlockManipulator;
import assemblyline.common.machine.belt.BlockConveyorBelt;
import assemblyline.common.machine.detector.BlockDetector;
import assemblyline.common.machine.encoder.BlockEncoder;
import assemblyline.common.machine.encoder.ItemDisk;
import assemblyline.common.machine.imprinter.BlockImprinter;
import assemblyline.common.machine.imprinter.ItemImprinter;
import assemblyline.common.machine.machine.BlockRejector;
import assemblyline.common.machine.programmer.BlockProgrammer;
import assemblyline.common.machine.programmer.ItemDisk;
import cpw.mods.fml.common.Loader;
import cpw.mods.fml.common.Mod;
import cpw.mods.fml.common.Mod.Init;
@ -66,7 +66,7 @@ public class AssemblyLine
public static Block blockConveyorBelt;
public static Block blockManipulator;
public static Block blockEncoder;
//public static Block blockEncoder;
public static Block blockCrate;
public static Block blockImprinter;
public static Block blockProgrammer;
@ -86,12 +86,12 @@ public class AssemblyLine
CONFIGURATION.load();
blockConveyorBelt = new BlockConveyorBelt(CONFIGURATION.getBlock("Conveyor Belt", BLOCK_ID_PREFIX).getInt());
blockManipulator = new BlockManipulator(CONFIGURATION.getBlock("Manipulator", BLOCK_ID_PREFIX + 1).getInt());
blockEncoder = new BlockEncoder(CONFIGURATION.getBlock("Encoder", BLOCK_ID_PREFIX + 2).getInt());
//blockEncoder = new BlockEncoder2(CONFIGURATION.getBlock("Encoder", BLOCK_ID_PREFIX + 2).getInt());
blockCrate = new BlockCrate(CONFIGURATION.getBlock("Crate", BLOCK_ID_PREFIX + 3).getInt(), 0);
blockImprinter = new BlockImprinter(CONFIGURATION.getBlock("Imprinter", BLOCK_ID_PREFIX + 4).getInt(), 0);
blockDetector = new BlockDetector(CONFIGURATION.getBlock("Detector", BLOCK_ID_PREFIX + 5).getInt(), 1);
blockRejector = new BlockRejector(CONFIGURATION.getBlock("Rejector", BLOCK_ID_PREFIX + 6).getInt());
blockProgrammer = new BlockProgrammer(CONFIGURATION.getBlock("Programmer", BLOCK_ID_PREFIX + 7).getInt(), 0);
blockProgrammer = new BlockEncoder(CONFIGURATION.getBlock("Programmer", BLOCK_ID_PREFIX + 7).getInt(), 0);
itemImprint = new ItemImprinter(CONFIGURATION.getBlock("Imprint", ITEM_ID_PREFIX).getInt());
itemDisk = new ItemDisk(CONFIGURATION.getBlock("Disk", ITEM_ID_PREFIX + 1).getInt());

8
src/minecraft/assemblyline/common/CommonProxy.java
View file

@ -9,8 +9,8 @@ import assemblyline.common.machine.TileEntityManipulator;
import assemblyline.common.machine.TileEntityRejector;
import assemblyline.common.machine.belt.TileEntityConveyorBelt;
import assemblyline.common.machine.detector.TileEntityDetector;
import assemblyline.common.machine.encoder.ContainerEncoder;
import assemblyline.common.machine.imprinter.ContainerImprinter;
import assemblyline.common.machine.programmer.ContainerProgrammer;
import cpw.mods.fml.common.network.IGuiHandler;
import cpw.mods.fml.common.registry.GameRegistry;
@ -18,7 +18,7 @@ public class CommonProxy implements IGuiHandler
{
public static final int GUI_STAMPER = 1;
public static final int GUI_ARCHITECHT_TABLE = 2;
public static final int GUI_PROGRAMMER = 3;
public static final int GUI_ENCODER = 3;
public void preInit()
{
@ -43,8 +43,8 @@ public class CommonProxy implements IGuiHandler
{
case GUI_STAMPER:
return new ContainerImprinter(player.inventory, world, new Vector3(x, y, z));
case GUI_PROGRAMMER:
return new ContainerProgrammer(player.inventory, world, new Vector3(x, y, z));
case GUI_ENCODER:
return new ContainerEncoder(player.inventory, world, new Vector3(x, y, z));
}
return null;

4
src/minecraft/assemblyline/common/block/BlockEncoder.java → src/minecraft/assemblyline/common/block/BlockEncoder2.java
View file

@ -6,9 +6,9 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.world.World;
import universalelectricity.prefab.UETab;
public class BlockEncoder extends Block
public class BlockEncoder2 extends Block
{
public BlockEncoder(int par1)
public BlockEncoder2(int par1)
{
super(par1, Material.wood);
this.blockIndexInTexture = 59;

10
src/minecraft/assemblyline/common/machine/programmer/BlockProgrammer.java → src/minecraft/assemblyline/common/machine/encoder/BlockEncoder.java
View file

@ -1,4 +1,4 @@
package assemblyline.common.machine.programmer;
package assemblyline.common.machine.encoder;
import net.minecraft.block.material.Material;
import net.minecraft.entity.player.EntityPlayer;
@ -8,13 +8,13 @@ import universalelectricity.prefab.UETab;
import assemblyline.common.AssemblyLine;
import assemblyline.common.CommonProxy;
public class BlockProgrammer extends BlockMachine
public class BlockEncoder extends BlockMachine
{
public BlockProgrammer(int id, int texture)
public BlockEncoder(int id, int texture)
{
super(id, Material.wood);
this.blockIndexInTexture = 4;
this.setBlockName("programmer");
this.setBlockName("encoder");
this.setCreativeTab(UETab.INSTANCE);
this.setTextureFile(AssemblyLine.BLOCK_TEXTURE_PATH);
}
@ -44,7 +44,7 @@ public class BlockProgrammer extends BlockMachine
{
if (!world.isRemote)
{
entityPlayer.openGui(AssemblyLine.instance, CommonProxy.GUI_PROGRAMMER, world, x, y, z);
entityPlayer.openGui(AssemblyLine.instance, CommonProxy.GUI_ENCODER, world, x, y, z);
}
return true;

37
src/minecraft/assemblyline/common/machine/programmer/ContainerProgrammer.java → src/minecraft/assemblyline/common/machine/encoder/ContainerEncoder.java
View file

@ -1,4 +1,4 @@
package assemblyline.common.machine.programmer;
package assemblyline.common.machine.encoder;
import java.util.ArrayList;
@ -18,25 +18,24 @@ import net.minecraftforge.oredict.ShapelessOreRecipe;
import universalelectricity.core.vector.Vector3;
import cpw.mods.fml.relauncher.ReflectionHelper;
public class ContainerProgrammer extends Container implements IInventory
public class ContainerEncoder extends Container implements IInventory
{
private ItemStack[] containingItems = new ItemStack[3];
private ItemStack[] containingItems = new ItemStack[1];
private World worldObj;
private Vector3 position;
private InventoryPlayer inventoryPlayer;
private IInventoryWatcher watcher;
public ContainerProgrammer(InventoryPlayer inventoryPlayer, World worldObj, Vector3 position)
public ContainerEncoder(InventoryPlayer inventoryPlayer, World worldObj, Vector3 position)
{
this.worldObj = worldObj;
this.position = position;
this.inventoryPlayer = inventoryPlayer;
// Paper Input
this.addSlotToContainer(new SlotDisk(this, 0, 42, 24));
// Item Stamp
this.addSlotToContainer(new Slot(this, 1, 78, 24));
// Output Filter
this.addSlotToContainer(new SlotDiskResult(this, 2, 136, 24));
// Disk
this.addSlotToContainer(new Slot(this, 0, 80, 24));
// Output Disk
//this.addSlotToContainer(new SlotDiskResult(this, 2, 136, 24));
int var3;
@ -44,15 +43,25 @@ public class ContainerProgrammer extends Container implements IInventory
{
for (int var4 = 0; var4 < 9; ++var4)
{
this.addSlotToContainer(new Slot(inventoryPlayer, var4 + var3 * 9 + 9, 8 + var4 * 18, 84 + var3 * 18));
this.addSlotToContainer(new Slot(inventoryPlayer, var4 + var3 * 9 + 9, 8 + var4 * 18, 170 + var3 * 18));
}
}
for (var3 = 0; var3 < 9; ++var3)
{
this.addSlotToContainer(new Slot(inventoryPlayer, var3, 8 + var3 * 18, 142));
this.addSlotToContainer(new Slot(inventoryPlayer, var3, 8 + var3 * 18, 228));
}
}
public void setWatcher(IInventoryWatcher watcher)
{
this.watcher = watcher;
}
public IInventoryWatcher getWatcher()
{
return this.watcher;
}
@Override
public void updateCraftingResults()
@ -177,7 +186,7 @@ public class ContainerProgrammer extends Container implements IInventory
@Override
public String getInvName()
{
return "Programmer";
return "Encoder";
}
@Override

6
src/minecraft/assemblyline/common/machine/encoder/IInventoryWatcher.java Normal file
View file

@ -0,0 +1,6 @@
package assemblyline.common.machine.encoder;
public interface IInventoryWatcher
{
public void inventoryChanged();
}

4
src/minecraft/assemblyline/common/machine/programmer/ItemDisk.java → src/minecraft/assemblyline/common/machine/encoder/ItemDisk.java
View file

@ -1,4 +1,4 @@
package assemblyline.common.machine.programmer;
package assemblyline.common.machine.encoder;
import java.util.ArrayList;
import java.util.List;
@ -17,7 +17,7 @@ public class ItemDisk extends Item
{
super(id);
this.setItemName("disk");
this.setIconIndex(1);
this.setIconIndex(0);
this.setCreativeTab(UETab.INSTANCE);
this.setHasSubtypes(true);
this.setTextureFile(AssemblyLine.ITEM_TEXTURE_PATH);

2
src/minecraft/assemblyline/common/machine/programmer/SlotDisk.java → src/minecraft/assemblyline/common/machine/encoder/SlotDisk.java
View file

@ -1,4 +1,4 @@
package assemblyline.common.machine.programmer;
package assemblyline.common.machine.encoder;
import net.minecraft.inventory.IInventory;
import net.minecraft.inventory.Slot;

2
src/minecraft/assemblyline/common/machine/programmer/SlotDiskResult.java → src/minecraft/assemblyline/common/machine/encoder/SlotDiskResult.java
View file

@ -1,4 +1,4 @@
package assemblyline.common.machine.programmer;
package assemblyline.common.machine.encoder;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.IInventory;