Finish work on the Elemental Duplicator.

3 files changed, 146 insertions, 11 deletions

diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_DataHatch.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_DataHatch.java
new file mode 100644
index 0000000000..fe100955e0
--- /dev/null
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_DataHatch.java
@@ -0,0 +1,82 @@
+package gtPlusPlus.xmod.gregtech.api.gui;
+
+import gregtech.api.enums.ItemList;
+import gregtech.api.gui.GT_ContainerMetaTile_Machine;
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.core.slots.SlotIntegratedCircuit;
+import gtPlusPlus.core.util.minecraft.ItemUtils;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.inventory.IInventory;
+import net.minecraft.inventory.Slot;
+import net.minecraft.item.ItemStack;
+
+public class CONTAINER_DataHatch extends GT_ContainerMetaTile_Machine {
+
+    public CONTAINER_DataHatch(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity) {
+        super(aInventoryPlayer, aTileEntity);
+    }
+
+    @Override
+    public void addSlots(InventoryPlayer aInventoryPlayer) {
+        addSlotToContainer(new GT_Slot_DataOrb(mTileEntity, 0, 53, 8));
+        addSlotToContainer(new GT_Slot_DataOrb(mTileEntity, 1, 71, 8));
+        addSlotToContainer(new GT_Slot_DataOrb(mTileEntity, 2, 89, 8));
+        addSlotToContainer(new GT_Slot_DataOrb(mTileEntity, 3, 107, 8));
+        addSlotToContainer(new GT_Slot_DataOrb(mTileEntity, 4, 53, 26));
+        addSlotToContainer(new GT_Slot_DataOrb(mTileEntity, 5, 71, 26));
+        addSlotToContainer(new GT_Slot_DataOrb(mTileEntity, 6, 89, 26));
+        addSlotToContainer(new GT_Slot_DataOrb(mTileEntity, 7, 107, 26));
+        addSlotToContainer(new GT_Slot_DataOrb(mTileEntity, 8, 53, 44));
+        addSlotToContainer(new GT_Slot_DataOrb(mTileEntity, 9, 71, 44));
+        addSlotToContainer(new GT_Slot_DataOrb(mTileEntity, 10, 89, 44));
+        addSlotToContainer(new GT_Slot_DataOrb(mTileEntity, 11, 107, 44));
+        addSlotToContainer(new GT_Slot_DataOrb(mTileEntity, 12, 53, 62));
+        addSlotToContainer(new GT_Slot_DataOrb(mTileEntity, 13, 71, 62));
+        addSlotToContainer(new GT_Slot_DataOrb(mTileEntity, 14, 89, 62));
+        addSlotToContainer(new GT_Slot_DataOrb(mTileEntity, 15, 107, 62));
+        addSlotToContainer(new SlotIntegratedCircuit(mTileEntity, 16, 19, 35));
+        
+    }
+
+    @Override
+    public int getSlotCount() {
+        return 17;
+    }
+
+    @Override
+    public int getShiftClickSlotCount() {
+        return 0;
+    }
+    
+	@Override
+	public void putStackInSlot(int par1, ItemStack par2ItemStack) {	
+		/*Logger.INFO("Slot: "+par1);
+		if (par1 < 16 && ItemList.Tool_DataOrb.isStackEqual(par2ItemStack)) {
+			super.putStackInSlot(par1, par2ItemStack);
+		}
+		if (par1 == 16 && ItemUtils.isControlCircuit(par2ItemStack)) {
+			super.putStackInSlot(par1, par2ItemStack);			
+		}*/		
+		super.putStackInSlot(par1, par2ItemStack);			
+	}
+
+	@Override
+	public boolean canDragIntoSlot(Slot par1Slot) {
+		return super.canDragIntoSlot(par1Slot);
+	}
+
+    public class GT_Slot_DataOrb extends Slot {
+        public GT_Slot_DataOrb(IInventory par1iInventory, int par2, int par3, int par4) {
+            super(par1iInventory, par2, par3, par4);
+        }
+
+        @Override
+        public boolean isItemValid(ItemStack aStack) {
+            return ItemList.Tool_DataOrb.isStackEqual(aStack, false, true);
+        }
+    }
+
+
+
+}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GUI_DataHatch.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GUI_DataHatch.java
new file mode 100644
index 0000000000..77cb0d71a2
--- /dev/null
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GUI_DataHatch.java
@@ -0,0 +1,41 @@
+package gtPlusPlus.xmod.gregtech.api.gui;
+
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import net.minecraft.entity.player.InventoryPlayer;
+
+import static gregtech.api.enums.GT_Values.RES_PATH_GUI;
+
+import gregtech.api.gui.GT_GUIContainerMetaTile_Machine;
+
+public class GUI_DataHatch extends GT_GUIContainerMetaTile_Machine {
+
+    private final String mName;
+
+    public GUI_DataHatch(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity, String aName) {
+        super(new CONTAINER_DataHatch(aInventoryPlayer, aTileEntity), RES_PATH_GUI + "HatchDataOrb.png");
+        mName = aName;
+    }
+
+    public GUI_DataHatch(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity, String aName, String aBackground) {
+        super(new CONTAINER_DataHatch(aInventoryPlayer, aTileEntity), RES_PATH_GUI + aBackground + "HatchDataOrb.png");
+        mName = aName;
+    }
+
+    @Override
+    protected void drawGuiContainerForegroundLayer(int par1, int par2) {
+        fontRendererObj.drawString(mName, 8, 4, 4210752);
+		/*String[] aName = mName.trim().split("\\s+");
+		int aY = 4;
+		for (String s : aName) {
+		    fontRendererObj.drawString(s, 120, (aY += 12), 4210752);    		
+		}*/
+    }
+
+    @Override
+    protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) {
+        super.drawGuiContainerBackgroundLayer(par1, par2, par3);
+        int x = (width - xSize) / 2;
+        int y = (height - ySize) / 2;
+        drawTexturedModalRect(x, y, 0, 0, xSize, ySize);
+    }
+}
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GUI_MultiMachine.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GUI_MultiMachine.java
index c78e7789b8..61cf59f6c9 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GUI_MultiMachine.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/GUI_MultiMachine.java
@@ -112,18 +112,32 @@ public class GUI_MultiMachine extends GT_GUIContainerMetaTile_Machine {
 				mInfo.add(StatCollector.translateToLocal("GTPP.machines.output")+" "+StatCollector.translateToLocal("GTPP.machines.tier")+": "+ EnumChatFormatting.GREEN +GT_Values.VOLTAGE_NAMES[aOutputTier]);
 			}			
 
+			
+			
+			
 			mInfo.add(StatCollector.translateToLocal("GTPP.multiblock.progress")+": "+
 					EnumChatFormatting.GREEN + Integer.toString(((CONTAINER_MultiMachine) this.mContainer).mProgressTime/20) + EnumChatFormatting.RESET +" s / "+
 					EnumChatFormatting.YELLOW + Integer.toString(((CONTAINER_MultiMachine) this.mContainer).mMaxProgressTime/20) + EnumChatFormatting.RESET +" s");
 
 
-			mInfo.add(StatCollector.translateToLocal("GTPP.multiblock.energy")+": "+
-					EnumChatFormatting.GREEN + Long.toString(aStoredEnergy) + EnumChatFormatting.RESET +" "+EU+" / "+
-					EnumChatFormatting.YELLOW + Long.toString(aMaxEnergy) + EnumChatFormatting.RESET +" "+EU+"");
+					
+
+				
+			
+			
+			mInfo.add(StatCollector.translateToLocal("GTPP.multiblock.energy")+":");
+			mInfo.add(StatCollector.translateToLocal(""+EnumChatFormatting.GREEN + Long.toString(aStoredEnergy) + EnumChatFormatting.RESET +" EU / "+
+					EnumChatFormatting.YELLOW + Long.toString(aMaxEnergy) + EnumChatFormatting.RESET +" EU"));
 
 			if (aRecipeEU != 0 && aRecipeDuration > 0) {
-				mInfo.add(StatCollector.translateToLocal("GTPP.multiblock.usage")+": "+
-						EnumChatFormatting.RED + Integer.toString(-aRecipeEU) + EnumChatFormatting.RESET + " "+EU+"/t");			
+				if (aRecipeEU > 0) {
+					mInfo.add(StatCollector.translateToLocal("GTPP.multiblock.usage")+":");
+					mInfo.add(StatCollector.translateToLocal(""+EnumChatFormatting.RED + Integer.toString(-aRecipeEU) + EnumChatFormatting.RESET + " EU/t/parallel"));
+				}
+				else {
+					mInfo.add(StatCollector.translateToLocal("GTPP.multiblock.generation")+":");
+					mInfo.add(StatCollector.translateToLocal(""+EnumChatFormatting.GREEN + Integer.toString(aRecipeEU) + EnumChatFormatting.RESET + " EU/t/parallel"));
+				}			
 				mInfo.add(StatCollector.translateToLocal("GTPP.multiblock.duration")+": "+
 						EnumChatFormatting.RED + Integer.toString(aRecipeDuration) + EnumChatFormatting.RESET + " ticks");
 				if (aRecipeSpecial > 0) {
@@ -132,18 +146,16 @@ public class GUI_MultiMachine extends GT_GUIContainerMetaTile_Machine {
 				}	
 			}		
 
-			mInfo.add(StatCollector.translateToLocal("GTPP.multiblock.mei")+": "+
-					EnumChatFormatting.YELLOW+Long.toString(aMaxInputVoltage)+EnumChatFormatting.RESET+ " "+EU+"/t"+EnumChatFormatting.RESET);
-
-			mInfo.add(StatCollector.translateToLocal(StatCollector.translateToLocal("GTPP.machines.tier")+": "+
-					EnumChatFormatting.YELLOW+GT_Values.VN[GT_Utility.getTier(aMaxInputVoltage)]+ EnumChatFormatting.RESET));
+			mInfo.add(StatCollector.translateToLocal("GTPP.multiblock.mei")+":");
+			mInfo.add(StatCollector.translateToLocal(""+EnumChatFormatting.YELLOW+Long.toString(aMaxInputVoltage)+EnumChatFormatting.RESET+ " EU/t(*2A) "+StatCollector.translateToLocal("GTPP.machines.tier")+": "+
+					EnumChatFormatting.YELLOW+GT_Values.VN[GT_Utility.getTier(aMaxInputVoltage)]+ EnumChatFormatting.RESET));			
 
 			mInfo.add(StatCollector.translateToLocal("GTPP.multiblock.efficiency")+": "+ EnumChatFormatting.YELLOW+Float.toString(aEfficiency / 100.0F)+EnumChatFormatting.RESET + " %");
 
 			mInfo.add(StatCollector.translateToLocal("GTPP.multiblock.pollution")+": "+ EnumChatFormatting.RED + (aPollutionTick*20)+ EnumChatFormatting.RESET+"/sec");
 			mInfo.add(StatCollector.translateToLocal("GTPP.multiblock.pollutionreduced")+": "+ EnumChatFormatting.GREEN + aPollutionReduction + EnumChatFormatting.RESET+" %");
 
-			mInfo.add(StatCollector.translateToLocal("GTPP.CC.parallel")+": "+EnumChatFormatting.GREEN+(aMaxParallel)+EnumChatFormatting.RESET);
+			//mInfo.add(StatCollector.translateToLocal("GTPP.CC.parallel")+": "+EnumChatFormatting.GREEN+(aMaxParallel)+EnumChatFormatting.RESET);
 
 			mInfo.add("Total Time Since Built: ");
 			mInfo.add("" + EnumChatFormatting.DARK_GREEN + Integer.toString(weeks)+EnumChatFormatting.RESET+" Weeks,");