diff --git a/src/main/java/com/pahimar/ee3/client/gui/inventory/GuiAlchemicalBag.java b/src/main/java/com/pahimar/ee3/client/gui/inventory/GuiAlchemicalBag.java index 64d05e11..d37a86bc 100644 --- a/src/main/java/com/pahimar/ee3/client/gui/inventory/GuiAlchemicalBag.java +++ b/src/main/java/com/pahimar/ee3/client/gui/inventory/GuiAlchemicalBag.java @@ -2,6 +2,7 @@ package com.pahimar.ee3.client.gui.inventory; import com.pahimar.ee3.inventory.ContainerAlchemicalBag; import com.pahimar.ee3.inventory.InventoryAlchemicalBag; +import com.pahimar.ee3.reference.Colors; import com.pahimar.ee3.reference.Names; import com.pahimar.ee3.reference.Textures; import com.pahimar.ee3.util.NBTHelper; @@ -48,8 +49,8 @@ public class GuiAlchemicalBag extends GuiContainer { if (this.parentItemStack.getItemDamage() == 0 || this.parentItemStack.getItemDamage() == 1) { - fontRendererObj.drawString(StatCollector.translateToLocal(inventoryAlchemicalBag.getInventoryName()), 8, 6, 4210752); - fontRendererObj.drawString(StatCollector.translateToLocal(Names.Containers.VANILLA_INVENTORY), 35, ySize - 95 + 2, 4210752); + fontRendererObj.drawString(StatCollector.translateToLocal(inventoryAlchemicalBag.getInventoryName()), 8, 6, Integer.parseInt(Colors.PURE_WHITE, 16)); + fontRendererObj.drawString(StatCollector.translateToLocal(Names.Containers.VANILLA_INVENTORY), 35, ySize - 95 + 2, Integer.parseInt(Colors.PURE_WHITE, 16)); } } diff --git a/src/main/java/com/pahimar/ee3/client/gui/inventory/GuiAlchemicalChest.java b/src/main/java/com/pahimar/ee3/client/gui/inventory/GuiAlchemicalChest.java index 5e05da3e..251c2b7a 100644 --- a/src/main/java/com/pahimar/ee3/client/gui/inventory/GuiAlchemicalChest.java +++ b/src/main/java/com/pahimar/ee3/client/gui/inventory/GuiAlchemicalChest.java @@ -1,6 +1,7 @@ package com.pahimar.ee3.client.gui.inventory; import com.pahimar.ee3.inventory.ContainerAlchemicalChest; +import com.pahimar.ee3.reference.Colors; import com.pahimar.ee3.reference.Names; import com.pahimar.ee3.reference.Textures; import com.pahimar.ee3.tileentity.TileEntityAlchemicalChest; @@ -40,8 +41,8 @@ public class GuiAlchemicalChest extends GuiContainer { if (tileEntityAlchemicalChest.getState() == 0 || tileEntityAlchemicalChest.getState() == 1) { - fontRendererObj.drawString(StatCollector.translateToLocal(tileEntityAlchemicalChest.getInventoryName()), 8, 6, 4210752); - fontRendererObj.drawString(StatCollector.translateToLocal(Names.Containers.VANILLA_INVENTORY), 35, ySize - 95 + 2, 4210752); + fontRendererObj.drawString(StatCollector.translateToLocal(tileEntityAlchemicalChest.getInventoryName()), 8, 6, Integer.parseInt(Colors.PURE_WHITE, 16)); + fontRendererObj.drawString(StatCollector.translateToLocal(Names.Containers.VANILLA_INVENTORY), 35, ySize - 95 + 2, Integer.parseInt(Colors.PURE_WHITE, 16)); } } diff --git a/src/main/java/com/pahimar/ee3/client/gui/inventory/GuiAludel.java b/src/main/java/com/pahimar/ee3/client/gui/inventory/GuiAludel.java index 56fef9d6..bbab2023 100644 --- a/src/main/java/com/pahimar/ee3/client/gui/inventory/GuiAludel.java +++ b/src/main/java/com/pahimar/ee3/client/gui/inventory/GuiAludel.java @@ -1,14 +1,12 @@ package com.pahimar.ee3.client.gui.inventory; import com.pahimar.ee3.inventory.ContainerAludel; -import com.pahimar.ee3.reference.Names; import com.pahimar.ee3.reference.Textures; import com.pahimar.ee3.tileentity.TileEntityAludel; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.util.StatCollector; import org.lwjgl.opengl.GL11; @SideOnly(Side.CLIENT) @@ -27,9 +25,7 @@ public class GuiAludel extends GuiContainer @Override protected void drawGuiContainerForegroundLayer(int x, int y) { - String containerName = StatCollector.translateToLocal(tileEntityAludel.getInventoryName()); - fontRendererObj.drawString(containerName, xSize / 2 - fontRendererObj.getStringWidth(containerName) / 2, 6, 4210752); - fontRendererObj.drawString(StatCollector.translateToLocal(Names.Containers.VANILLA_INVENTORY), 8, ySize - 96 + 2, 4210752); + // NOOP } @Override @@ -51,6 +47,6 @@ public class GuiAludel extends GuiContainer } scaleAdjustment = this.tileEntityAludel.getCookProgressScaled(24); - this.drawTexturedModalRect(xStart + 76, yStart + 39, 176, 14, scaleAdjustment + 1, 16); + this.drawTexturedModalRect(xStart + 80, yStart + 40, 176, 14, scaleAdjustment + 1, 16); } } diff --git a/src/main/java/com/pahimar/ee3/client/gui/inventory/GuiAugmentationTable.java b/src/main/java/com/pahimar/ee3/client/gui/inventory/GuiAugmentationTable.java index 7ca157f5..fbfb44a5 100644 --- a/src/main/java/com/pahimar/ee3/client/gui/inventory/GuiAugmentationTable.java +++ b/src/main/java/com/pahimar/ee3/client/gui/inventory/GuiAugmentationTable.java @@ -1,14 +1,12 @@ package com.pahimar.ee3.client.gui.inventory; import com.pahimar.ee3.inventory.ContainerAugmentationTable; -import com.pahimar.ee3.reference.Names; import com.pahimar.ee3.reference.Textures; import com.pahimar.ee3.tileentity.TileEntityAugmentationTable; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.util.StatCollector; import org.lwjgl.opengl.GL11; @SideOnly(Side.CLIENT) @@ -20,16 +18,14 @@ public class GuiAugmentationTable extends GuiContainer { super(new ContainerAugmentationTable(inventoryPlayer, tileEntityAugmentationTable)); this.tileEntityAugmentationTable = tileEntityAugmentationTable; - xSize = 176; - ySize = 187; + xSize = 188; + ySize = 199; } @Override protected void drawGuiContainerForegroundLayer(int x, int y) { - String containerName = StatCollector.translateToLocal(tileEntityAugmentationTable.getInventoryName()); - fontRendererObj.drawString(containerName, xSize / 2 - fontRendererObj.getStringWidth(containerName) / 2, 6, 4210752); - fontRendererObj.drawString(StatCollector.translateToLocal(Names.Containers.VANILLA_INVENTORY), 8, ySize - 104, 4210752); + // NOOP } @Override diff --git a/src/main/java/com/pahimar/ee3/client/gui/inventory/GuiCalcinator.java b/src/main/java/com/pahimar/ee3/client/gui/inventory/GuiCalcinator.java index b929829f..cc1a62f1 100644 --- a/src/main/java/com/pahimar/ee3/client/gui/inventory/GuiCalcinator.java +++ b/src/main/java/com/pahimar/ee3/client/gui/inventory/GuiCalcinator.java @@ -1,14 +1,12 @@ package com.pahimar.ee3.client.gui.inventory; import com.pahimar.ee3.inventory.ContainerCalcinator; -import com.pahimar.ee3.reference.Names; import com.pahimar.ee3.reference.Textures; import com.pahimar.ee3.tileentity.TileEntityCalcinator; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.util.StatCollector; import org.lwjgl.opengl.GL11; @SideOnly(Side.CLIENT) @@ -26,9 +24,7 @@ public class GuiCalcinator extends GuiContainer @Override protected void drawGuiContainerForegroundLayer(int x, int y) { - String containerName = StatCollector.translateToLocal(tileEntityCalcinator.getInventoryName()); - fontRendererObj.drawString(containerName, xSize / 2 - fontRendererObj.getStringWidth(containerName) / 2, 6, 4210752); - fontRendererObj.drawString(StatCollector.translateToLocal(Names.Containers.VANILLA_INVENTORY), 8, ySize - 96 + 2, 4210752); + // NOOP } @Override @@ -46,10 +42,10 @@ public class GuiCalcinator extends GuiContainer if (this.tileEntityCalcinator.getState() == 1) { scaleAdjustment = this.tileEntityCalcinator.getBurnTimeRemainingScaled(12); - this.drawTexturedModalRect(xStart + 57, yStart + 36 + 23 - scaleAdjustment, 176, 12 - scaleAdjustment, 14, scaleAdjustment + 2); + this.drawTexturedModalRect(xStart + 46, yStart + 22 + 23 - scaleAdjustment, 176, 12 - scaleAdjustment, 14, scaleAdjustment + 2); } scaleAdjustment = this.tileEntityCalcinator.getCookProgressScaled(24); - this.drawTexturedModalRect(xStart + 83, yStart + 34, 176, 14, scaleAdjustment + 1, 16); + this.drawTexturedModalRect(xStart + 75, yStart + 30, 176, 14, scaleAdjustment + 1, 16); } } diff --git a/src/main/java/com/pahimar/ee3/client/gui/inventory/GuiGlassBell.java b/src/main/java/com/pahimar/ee3/client/gui/inventory/GuiGlassBell.java index 1c45dbe9..8c1bb79b 100644 --- a/src/main/java/com/pahimar/ee3/client/gui/inventory/GuiGlassBell.java +++ b/src/main/java/com/pahimar/ee3/client/gui/inventory/GuiGlassBell.java @@ -1,14 +1,12 @@ package com.pahimar.ee3.client.gui.inventory; import com.pahimar.ee3.inventory.ContainerGlassBell; -import com.pahimar.ee3.reference.Names; import com.pahimar.ee3.reference.Textures; import com.pahimar.ee3.tileentity.TileEntityGlassBell; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.util.StatCollector; import org.lwjgl.opengl.GL11; @SideOnly(Side.CLIENT) @@ -21,24 +19,25 @@ public class GuiGlassBell extends GuiContainer super(new ContainerGlassBell(inventoryPlayer, tileEntityGlassBell)); this.tileEntityGlassBell = tileEntityGlassBell; xSize = 176; - ySize = 140; + ySize = 161; } @Override protected void drawGuiContainerForegroundLayer(int x, int y) { - String containerName = StatCollector.translateToLocal(tileEntityGlassBell.getInventoryName()); - fontRendererObj.drawString(containerName, xSize / 2 - fontRendererObj.getStringWidth(containerName) / 2, 6, 4210752); - fontRendererObj.drawString(StatCollector.translateToLocal(Names.Containers.VANILLA_INVENTORY), 8, ySize - 93, 4210752); + // NOOP } @Override protected void drawGuiContainerBackgroundLayer(float var1, int var2, int var3) { + GL11.glEnable(GL11.GL_BLEND); + GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); this.mc.getTextureManager().bindTexture(Textures.Gui.GLASS_BELL); int xStart = (width - xSize) / 2; int yStart = (height - ySize) / 2; this.drawTexturedModalRect(xStart, yStart, 0, 0, xSize, ySize); + GL11.glDisable(GL11.GL_BLEND); } } diff --git a/src/main/java/com/pahimar/ee3/inventory/ContainerAugmentationTable.java b/src/main/java/com/pahimar/ee3/inventory/ContainerAugmentationTable.java index 16546e93..2cd230ff 100644 --- a/src/main/java/com/pahimar/ee3/inventory/ContainerAugmentationTable.java +++ b/src/main/java/com/pahimar/ee3/inventory/ContainerAugmentationTable.java @@ -14,23 +14,23 @@ public class ContainerAugmentationTable extends ContainerEE { this.tileEntityAugmentationTable = tileEntityAugmentationTable; - this.addSlotToContainer(new Slot(tileEntityAugmentationTable, TileEntityAugmentationTable.INPUT_SLOT_INVENTORY_INDEX, 30, 38)); - this.addSlotToContainer(new Slot(tileEntityAugmentationTable, TileEntityAugmentationTable.AUGMENT_SLOT_INVENTORY_INDEX, 66, 38)); - this.addSlotToContainer(new Slot(tileEntityAugmentationTable, TileEntityAugmentationTable.OUTPUT_SLOT_INVENTORY_INDEX, 130, 38)); + this.addSlotToContainer(new Slot(tileEntityAugmentationTable, TileEntityAugmentationTable.INPUT_SLOT_INVENTORY_INDEX, 36, 50)); + this.addSlotToContainer(new Slot(tileEntityAugmentationTable, TileEntityAugmentationTable.AUGMENT_SLOT_INVENTORY_INDEX, 72, 50)); + this.addSlotToContainer(new Slot(tileEntityAugmentationTable, TileEntityAugmentationTable.OUTPUT_SLOT_INVENTORY_INDEX, 136, 50)); // Add the player's inventory slots to the container for (int inventoryRowIndex = 0; inventoryRowIndex < PLAYER_INVENTORY_ROWS; ++inventoryRowIndex) { for (int inventoryColumnIndex = 0; inventoryColumnIndex < PLAYER_INVENTORY_COLUMNS; ++inventoryColumnIndex) { - this.addSlotToContainer(new Slot(inventoryPlayer, inventoryColumnIndex + inventoryRowIndex * 9 + 9, 8 + inventoryColumnIndex * 18, 94 + inventoryRowIndex * 18)); + this.addSlotToContainer(new Slot(inventoryPlayer, inventoryColumnIndex + inventoryRowIndex * 9 + 9, 14 + inventoryColumnIndex * 18, 106 + inventoryRowIndex * 18)); } } // Add the player's action bar slots to the container for (int actionBarSlotIndex = 0; actionBarSlotIndex < PLAYER_INVENTORY_COLUMNS; ++actionBarSlotIndex) { - this.addSlotToContainer(new Slot(inventoryPlayer, actionBarSlotIndex, 8 + actionBarSlotIndex * 18, 152)); + this.addSlotToContainer(new Slot(inventoryPlayer, actionBarSlotIndex, 14 + actionBarSlotIndex * 18, 164)); } } diff --git a/src/main/java/com/pahimar/ee3/inventory/ContainerCalcinator.java b/src/main/java/com/pahimar/ee3/inventory/ContainerCalcinator.java index fba4f954..8b305b38 100644 --- a/src/main/java/com/pahimar/ee3/inventory/ContainerCalcinator.java +++ b/src/main/java/com/pahimar/ee3/inventory/ContainerCalcinator.java @@ -22,14 +22,14 @@ public class ContainerCalcinator extends ContainerEE this.tileEntityCalcinator = tileEntityCalcinator; // Add the fuel slot to the container - this.addSlotToContainer(new Slot(tileEntityCalcinator, TileEntityCalcinator.FUEL_INVENTORY_INDEX, 56, 62)); + this.addSlotToContainer(new Slot(tileEntityCalcinator, TileEntityCalcinator.FUEL_INVENTORY_INDEX, 45, 55)); // Add the input slot to the container - this.addSlotToContainer(new Slot(tileEntityCalcinator, TileEntityCalcinator.INPUT_INVENTORY_INDEX, 56, 17)); + this.addSlotToContainer(new Slot(tileEntityCalcinator, TileEntityCalcinator.INPUT_INVENTORY_INDEX, 45, 10)); // Add the output results slot to the container - this.addSlotToContainer(new SlotCalcinator(tileEntityCalcinator, TileEntityCalcinator.OUTPUT_LEFT_INVENTORY_INDEX, 116, 35)); - this.addSlotToContainer(new SlotCalcinator(tileEntityCalcinator, TileEntityCalcinator.OUTPUT_RIGHT_INVENTORY_INDEX, 136, 35)); + this.addSlotToContainer(new SlotCalcinator(tileEntityCalcinator, TileEntityCalcinator.OUTPUT_LEFT_INVENTORY_INDEX, 105, 29)); + this.addSlotToContainer(new SlotCalcinator(tileEntityCalcinator, TileEntityCalcinator.OUTPUT_RIGHT_INVENTORY_INDEX, 125, 29)); // Add the player's inventory slots to the container for (int inventoryRowIndex = 0; inventoryRowIndex < PLAYER_INVENTORY_ROWS; ++inventoryRowIndex) diff --git a/src/main/java/com/pahimar/ee3/inventory/ContainerGlassBell.java b/src/main/java/com/pahimar/ee3/inventory/ContainerGlassBell.java index 158ad28d..25627165 100644 --- a/src/main/java/com/pahimar/ee3/inventory/ContainerGlassBell.java +++ b/src/main/java/com/pahimar/ee3/inventory/ContainerGlassBell.java @@ -10,21 +10,21 @@ public class ContainerGlassBell extends ContainerEE { public ContainerGlassBell(InventoryPlayer inventoryPlayer, TileEntityGlassBell tileGlassBell) { - this.addSlotToContainer(new Slot(tileGlassBell, TileEntityGlassBell.DISPLAY_SLOT_INVENTORY_INDEX, 80, 22)); + this.addSlotToContainer(new Slot(tileGlassBell, TileEntityGlassBell.DISPLAY_SLOT_INVENTORY_INDEX, 80, 26)); // Add the player's inventory slots to the container for (int inventoryRowIndex = 0; inventoryRowIndex < PLAYER_INVENTORY_ROWS; ++inventoryRowIndex) { for (int inventoryColumnIndex = 0; inventoryColumnIndex < PLAYER_INVENTORY_COLUMNS; ++inventoryColumnIndex) { - this.addSlotToContainer(new Slot(inventoryPlayer, inventoryColumnIndex + inventoryRowIndex * 9 + 9, 8 + inventoryColumnIndex * 18, 58 + inventoryRowIndex * 18)); + this.addSlotToContainer(new Slot(inventoryPlayer, inventoryColumnIndex + inventoryRowIndex * 9 + 9, 8 + inventoryColumnIndex * 18, 79 + inventoryRowIndex * 18)); } } // Add the player's action bar slots to the container for (int actionBarSlotIndex = 0; actionBarSlotIndex < PLAYER_INVENTORY_COLUMNS; ++actionBarSlotIndex) { - this.addSlotToContainer(new Slot(inventoryPlayer, actionBarSlotIndex, 8 + actionBarSlotIndex * 18, 116)); + this.addSlotToContainer(new Slot(inventoryPlayer, actionBarSlotIndex, 8 + actionBarSlotIndex * 18, 137)); } } diff --git a/src/main/resources/assets/ee3/textures/gui/alchemicalBag_large.png b/src/main/resources/assets/ee3/textures/gui/alchemicalBag_large.png index 91afcd8c..0e68d9d7 100644 Binary files a/src/main/resources/assets/ee3/textures/gui/alchemicalBag_large.png and b/src/main/resources/assets/ee3/textures/gui/alchemicalBag_large.png differ diff --git a/src/main/resources/assets/ee3/textures/gui/alchemicalBag_medium.png b/src/main/resources/assets/ee3/textures/gui/alchemicalBag_medium.png index 68a3b2f1..50ccdaeb 100644 Binary files a/src/main/resources/assets/ee3/textures/gui/alchemicalBag_medium.png and b/src/main/resources/assets/ee3/textures/gui/alchemicalBag_medium.png differ diff --git a/src/main/resources/assets/ee3/textures/gui/alchemicalBag_small.png b/src/main/resources/assets/ee3/textures/gui/alchemicalBag_small.png index 01e99eaf..1293523c 100644 Binary files a/src/main/resources/assets/ee3/textures/gui/alchemicalBag_small.png and b/src/main/resources/assets/ee3/textures/gui/alchemicalBag_small.png differ diff --git a/src/main/resources/assets/ee3/textures/gui/alchemicalChest_large.png b/src/main/resources/assets/ee3/textures/gui/alchemicalChest_large.png index 91afcd8c..689925f2 100644 Binary files a/src/main/resources/assets/ee3/textures/gui/alchemicalChest_large.png and b/src/main/resources/assets/ee3/textures/gui/alchemicalChest_large.png differ diff --git a/src/main/resources/assets/ee3/textures/gui/alchemicalChest_medium.png b/src/main/resources/assets/ee3/textures/gui/alchemicalChest_medium.png index 68a3b2f1..79ee5dc1 100644 Binary files a/src/main/resources/assets/ee3/textures/gui/alchemicalChest_medium.png and b/src/main/resources/assets/ee3/textures/gui/alchemicalChest_medium.png differ diff --git a/src/main/resources/assets/ee3/textures/gui/alchemicalChest_small.png b/src/main/resources/assets/ee3/textures/gui/alchemicalChest_small.png index 01e99eaf..671b6c4e 100644 Binary files a/src/main/resources/assets/ee3/textures/gui/alchemicalChest_small.png and b/src/main/resources/assets/ee3/textures/gui/alchemicalChest_small.png differ diff --git a/src/main/resources/assets/ee3/textures/gui/aludel.png b/src/main/resources/assets/ee3/textures/gui/aludel.png index 076e4348..8bf2aba6 100644 Binary files a/src/main/resources/assets/ee3/textures/gui/aludel.png and b/src/main/resources/assets/ee3/textures/gui/aludel.png differ diff --git a/src/main/resources/assets/ee3/textures/gui/augmentationTable.png b/src/main/resources/assets/ee3/textures/gui/augmentationTable.png index 5f39217d..305999f6 100644 Binary files a/src/main/resources/assets/ee3/textures/gui/augmentationTable.png and b/src/main/resources/assets/ee3/textures/gui/augmentationTable.png differ diff --git a/src/main/resources/assets/ee3/textures/gui/calcinator.png b/src/main/resources/assets/ee3/textures/gui/calcinator.png index 8924f192..4765aeea 100644 Binary files a/src/main/resources/assets/ee3/textures/gui/calcinator.png and b/src/main/resources/assets/ee3/textures/gui/calcinator.png differ diff --git a/src/main/resources/assets/ee3/textures/gui/glassBell.png b/src/main/resources/assets/ee3/textures/gui/glassBell.png index fc0673b7..b2b256c9 100644 Binary files a/src/main/resources/assets/ee3/textures/gui/glassBell.png and b/src/main/resources/assets/ee3/textures/gui/glassBell.png differ diff --git a/src/main/resources/assets/ee3/textures/gui/ocarina.png b/src/main/resources/assets/ee3/textures/gui/ocarina.png index ee6bb8e6..f61847d0 100644 Binary files a/src/main/resources/assets/ee3/textures/gui/ocarina.png and b/src/main/resources/assets/ee3/textures/gui/ocarina.png differ