% More work on Advanced Mufflers.

2 files changed, 19 insertions, 28 deletions

diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_Hatch_Muffler_Advanced.java b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_Hatch_Muffler_Advanced.java
index 30d0c3dcd6..721fe053ae 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_Hatch_Muffler_Advanced.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_Hatch_Muffler_Advanced.java
@@ -1,13 +1,9 @@
 package gtPlusPlus.xmod.gregtech.api.gui;
 
-import java.util.List;
-
-import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.inventory.ICrafting;
-import net.minecraft.inventory.Slot;
 import gregtech.api.gui.GT_ContainerMetaTile_Machine;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Muffler_Adv;
+import gtPlusPlus.core.slots.SlotAirFilter;
+import net.minecraft.entity.player.InventoryPlayer;
 
 
 public class CONTAINER_Hatch_Muffler_Advanced extends GT_ContainerMetaTile_Machine {
@@ -25,7 +21,7 @@ public class CONTAINER_Hatch_Muffler_Advanced extends GT_ContainerMetaTile_Machi
 
 	@Override
 	public void addSlots(final InventoryPlayer aInventoryPlayer) {
-		this.addSlotToContainer(new Slot(this.mTileEntity, 1, 80, 17));
+		this.addSlotToContainer(new SlotAirFilter(this.mTileEntity, 1, 80, 35));
 	}
 
 	@Override
@@ -41,26 +37,15 @@ public class CONTAINER_Hatch_Muffler_Advanced extends GT_ContainerMetaTile_Machi
 	@Override
 	public void updateProgressBar(final int id, final int value) {
 		super.updateProgressBar(id, value);
-		switch (id) {
-		case 100:
-			this.maxEU = value;
-			return;
-		case 101:
-			this.storedEU = value;
-			break;
+		switch (id) {		
 		default:
 			break;
 		}
 	}
 
-	@SuppressWarnings("unchecked")
 	@Override
 	public void detectAndSendChanges() {
-		super.detectAndSendChanges();
-		for(final ICrafting crafting : (List<ICrafting>)this.crafters) {
-			crafting.sendProgressBarUpdate(this, 100, (int) ((GT_MetaTileEntity_Hatch_Muffler_Adv) this.mTileEntity.getMetaTileEntity()).maxEUStore());
-			crafting.sendProgressBarUpdate(this, 101, (int) ((GT_MetaTileEntity_Hatch_Muffler_Adv) this.mTileEntity.getMetaTileEntity()).getEUVar());			
-		}
+		super.detectAndSendChanges();		
 	}
 
 }
\ No newline at end of file
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_Hatch_Muffler_Advanced.java b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_Hatch_Muffler_Advanced.java
index 7aed0e60e1..4b998f6487 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_Hatch_Muffler_Advanced.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_Hatch_Muffler_Advanced.java
@@ -1,12 +1,10 @@
 package gtPlusPlus.xmod.gregtech.api.gui;
 
 
-import net.minecraft.entity.player.InventoryPlayer;
-
 import gregtech.api.gui.GT_GUIContainerMetaTile_Machine;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-
 import gtPlusPlus.core.lib.CORE;
+import net.minecraft.entity.player.InventoryPlayer;
 
 public class GUI_Hatch_Muffler_Advanced extends GT_GUIContainerMetaTile_Machine {
 
@@ -21,18 +19,26 @@ public class GUI_Hatch_Muffler_Advanced extends GT_GUIContainerMetaTile_Machine
 
 	@Override
 	protected void drawGuiContainerForegroundLayer(final int par1, final int par2) {
-		this.fontRendererObj.drawString(this.mName, 64, 6, 16448255);
+		this.fontRendererObj.drawString(this.mName, 8, 8, 16448255);
+		/*
+		 * ReflectionUtils.setField(this.fontRendererObj, "underlineStyle", true);
+		 * ReflectionUtils.setField(this.fontRendererObj, "italicStyle", true);
+		 * ReflectionUtils.setField(this.fontRendererObj, "boldStyle", true); boolean
+		 * isBold = ReflectionUtils.getField(this.fontRendererObj, "boldStyle");
+		 * this.fontRendererObj.drawString("Insert Air Filters - Bold: "+isBold, 8, 18,
+		 * 16448255);
+		 */
 		if (this.mContainer != null) {
-			this.maxPower = ((CONTAINER_TreeFarmer)this.mContainer).maxEU;
-			this.storedPower = ((CONTAINER_TreeFarmer)this.mContainer).storedEU;			
+			//this.maxPower = ((CONTAINER_TreeFarmer)this.mContainer).maxEU;
+			//this.storedPower = ((CONTAINER_TreeFarmer)this.mContainer).storedEU;			
 		}
 	}
 
 	@Override
 	protected void drawGuiContainerBackgroundLayer(final float par1, final int par2, final int par3) {
 		super.drawGuiContainerBackgroundLayer(par1, par2, par3);
-		this.maxPower = ((CONTAINER_TreeFarmer)this.mContainer).maxEU;
-		this.storedPower = ((CONTAINER_TreeFarmer)this.mContainer).storedEU;
+		//this.maxPower = ((CONTAINER_TreeFarmer)this.mContainer).maxEU;
+		//this.storedPower = ((CONTAINER_TreeFarmer)this.mContainer).storedEU;
 		final int x = (this.width - this.xSize) / 2;
 		final int y = (this.height - this.ySize) / 2;
 		this.drawTexturedModalRect(x, y, 0, 0, this.xSize, this.ySize);