diff --git a/src/main/java/com/pahimar/ee3/client/gui/inventory/GuiAlchemicalTome.java b/src/main/java/com/pahimar/ee3/client/gui/inventory/GuiAlchemicalTome.java index 830fc340..b7ef00f5 100644 --- a/src/main/java/com/pahimar/ee3/client/gui/inventory/GuiAlchemicalTome.java +++ b/src/main/java/com/pahimar/ee3/client/gui/inventory/GuiAlchemicalTome.java @@ -2,10 +2,10 @@ package com.pahimar.ee3.client.gui.inventory; import com.pahimar.ee3.inventory.ContainerAlchemicalTome; import com.pahimar.ee3.reference.Textures; +import com.pahimar.repackage.cofh.lib.gui.GuiBase; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.gui.GuiTextField; -import net.minecraft.client.renderer.InventoryEffectRenderer; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.InventoryBasic; @@ -16,7 +16,7 @@ import org.lwjgl.input.Mouse; import org.lwjgl.opengl.GL11; @SideOnly(Side.CLIENT) -public class GuiAlchemicalTome extends InventoryEffectRenderer +public class GuiAlchemicalTome extends GuiBase { // private InventoryAlchemicalTome inventoryAlchemicalTome; private InventoryPlayer inventoryPlayer; diff --git a/src/main/resources/assets/ee3/textures/gui/alchemicalBook.png b/src/main/resources/assets/ee3/textures/gui/alchemicalBook.png deleted file mode 100644 index 7b14c630..00000000 Binary files a/src/main/resources/assets/ee3/textures/gui/alchemicalBook.png and /dev/null differ diff --git a/src/main/resources/assets/ee3/textures/gui/alchemicalTome.png b/src/main/resources/assets/ee3/textures/gui/alchemicalTome.png index 7a5411e2..0852ed1a 100644 Binary files a/src/main/resources/assets/ee3/textures/gui/alchemicalTome.png and b/src/main/resources/assets/ee3/textures/gui/alchemicalTome.png differ diff --git a/src/main/resources/assets/ee3/textures/gui/elements/arrowLeft.png b/src/main/resources/assets/ee3/textures/gui/elements/arrowLeft.png new file mode 100644 index 00000000..8794561f Binary files /dev/null and b/src/main/resources/assets/ee3/textures/gui/elements/arrowLeft.png differ diff --git a/src/main/resources/assets/ee3/textures/gui/elements/arrowLeftHover.png b/src/main/resources/assets/ee3/textures/gui/elements/arrowLeftHover.png new file mode 100644 index 00000000..0f9b3719 Binary files /dev/null and b/src/main/resources/assets/ee3/textures/gui/elements/arrowLeftHover.png differ diff --git a/src/main/resources/assets/ee3/textures/gui/elements/arrowRight.png b/src/main/resources/assets/ee3/textures/gui/elements/arrowRight.png new file mode 100644 index 00000000..95aa9d02 Binary files /dev/null and b/src/main/resources/assets/ee3/textures/gui/elements/arrowRight.png differ diff --git a/src/main/resources/assets/ee3/textures/gui/elements/arrowRightHover.png b/src/main/resources/assets/ee3/textures/gui/elements/arrowRightHover.png new file mode 100644 index 00000000..cda8a99f Binary files /dev/null and b/src/main/resources/assets/ee3/textures/gui/elements/arrowRightHover.png differ diff --git a/src/main/resources/assets/ee3/textures/gui/elements/buttonDisabled.png b/src/main/resources/assets/ee3/textures/gui/elements/buttonDisabled.png new file mode 100644 index 00000000..c65c9a6a Binary files /dev/null and b/src/main/resources/assets/ee3/textures/gui/elements/buttonDisabled.png differ diff --git a/src/main/resources/assets/ee3/textures/gui/elements/buttonEnabled.png b/src/main/resources/assets/ee3/textures/gui/elements/buttonEnabled.png new file mode 100644 index 00000000..1a4b249c Binary files /dev/null and b/src/main/resources/assets/ee3/textures/gui/elements/buttonEnabled.png differ diff --git a/src/main/resources/assets/ee3/textures/gui/elements/buttonHover.png b/src/main/resources/assets/ee3/textures/gui/elements/buttonHover.png new file mode 100644 index 00000000..8494128e Binary files /dev/null and b/src/main/resources/assets/ee3/textures/gui/elements/buttonHover.png differ diff --git a/src/main/resources/assets/ee3/textures/gui/elements/ribbonBlue.png b/src/main/resources/assets/ee3/textures/gui/elements/ribbonBlue.png new file mode 100644 index 00000000..5dbfbfe2 Binary files /dev/null and b/src/main/resources/assets/ee3/textures/gui/elements/ribbonBlue.png differ diff --git a/src/main/resources/assets/ee3/textures/gui/elements/ribbonGreen.png b/src/main/resources/assets/ee3/textures/gui/elements/ribbonGreen.png new file mode 100644 index 00000000..1e015433 Binary files /dev/null and b/src/main/resources/assets/ee3/textures/gui/elements/ribbonGreen.png differ diff --git a/src/main/resources/assets/ee3/textures/gui/elements/ribbonPurple.png b/src/main/resources/assets/ee3/textures/gui/elements/ribbonPurple.png new file mode 100644 index 00000000..46b1c08e Binary files /dev/null and b/src/main/resources/assets/ee3/textures/gui/elements/ribbonPurple.png differ diff --git a/src/main/resources/assets/ee3/textures/gui/elements/ribbonRed.png b/src/main/resources/assets/ee3/textures/gui/elements/ribbonRed.png new file mode 100644 index 00000000..25a5a17a Binary files /dev/null and b/src/main/resources/assets/ee3/textures/gui/elements/ribbonRed.png differ diff --git a/src/main/resources/assets/ee3/textures/gui/starterBook.png b/src/main/resources/assets/ee3/textures/gui/starterBook.png index ce3e3fba..d786426b 100644 Binary files a/src/main/resources/assets/ee3/textures/gui/starterBook.png and b/src/main/resources/assets/ee3/textures/gui/starterBook.png differ diff --git a/src/main/resources/assets/ee3/textures/xcf/gui/alchemicalBook.xcf b/src/main/resources/assets/ee3/textures/xcf/gui/alchemicalBook.xcf deleted file mode 100644 index e0eee7e1..00000000 Binary files a/src/main/resources/assets/ee3/textures/xcf/gui/alchemicalBook.xcf and /dev/null differ diff --git a/src/main/resources/assets/ee3/textures/xcf/gui/alchemicalTome.xcf b/src/main/resources/assets/ee3/textures/xcf/gui/alchemicalTome.xcf index 309d48c9..0c1e343f 100644 Binary files a/src/main/resources/assets/ee3/textures/xcf/gui/alchemicalTome.xcf and b/src/main/resources/assets/ee3/textures/xcf/gui/alchemicalTome.xcf differ diff --git a/src/main/resources/assets/ee3/textures/xcf/gui/elements/arrowLeft.xcf b/src/main/resources/assets/ee3/textures/xcf/gui/elements/arrowLeft.xcf new file mode 100644 index 00000000..6b34db49 Binary files /dev/null and b/src/main/resources/assets/ee3/textures/xcf/gui/elements/arrowLeft.xcf differ diff --git a/src/main/resources/assets/ee3/textures/xcf/gui/elements/arrowLeftHover.xcf b/src/main/resources/assets/ee3/textures/xcf/gui/elements/arrowLeftHover.xcf new file mode 100644 index 00000000..ee500271 Binary files /dev/null and b/src/main/resources/assets/ee3/textures/xcf/gui/elements/arrowLeftHover.xcf differ diff --git a/src/main/resources/assets/ee3/textures/xcf/gui/elements/arrowRight.xcf b/src/main/resources/assets/ee3/textures/xcf/gui/elements/arrowRight.xcf new file mode 100644 index 00000000..b5bd3e86 Binary files /dev/null and b/src/main/resources/assets/ee3/textures/xcf/gui/elements/arrowRight.xcf differ diff --git a/src/main/resources/assets/ee3/textures/xcf/gui/elements/arrowRightHover.xcf b/src/main/resources/assets/ee3/textures/xcf/gui/elements/arrowRightHover.xcf new file mode 100644 index 00000000..078bce36 Binary files /dev/null and b/src/main/resources/assets/ee3/textures/xcf/gui/elements/arrowRightHover.xcf differ diff --git a/src/main/resources/assets/ee3/textures/xcf/gui/elements/ribbonBlue.xcf b/src/main/resources/assets/ee3/textures/xcf/gui/elements/ribbonBlue.xcf new file mode 100644 index 00000000..caf2eb8c Binary files /dev/null and b/src/main/resources/assets/ee3/textures/xcf/gui/elements/ribbonBlue.xcf differ diff --git a/src/main/resources/assets/ee3/textures/xcf/gui/elements/ribbonGreen.xcf b/src/main/resources/assets/ee3/textures/xcf/gui/elements/ribbonGreen.xcf new file mode 100644 index 00000000..59d6020d Binary files /dev/null and b/src/main/resources/assets/ee3/textures/xcf/gui/elements/ribbonGreen.xcf differ diff --git a/src/main/resources/assets/ee3/textures/xcf/gui/elements/ribbonPurple.xcf b/src/main/resources/assets/ee3/textures/xcf/gui/elements/ribbonPurple.xcf new file mode 100644 index 00000000..aa7f5123 Binary files /dev/null and b/src/main/resources/assets/ee3/textures/xcf/gui/elements/ribbonPurple.xcf differ diff --git a/src/main/resources/assets/ee3/textures/xcf/gui/elements/ribbonRed.xcf b/src/main/resources/assets/ee3/textures/xcf/gui/elements/ribbonRed.xcf new file mode 100644 index 00000000..c05eca21 Binary files /dev/null and b/src/main/resources/assets/ee3/textures/xcf/gui/elements/ribbonRed.xcf differ diff --git a/src/main/resources/assets/ee3/textures/xcf/gui/starterBook.xcf b/src/main/resources/assets/ee3/textures/xcf/gui/starterBook.xcf index 5e669009..60cbfdaa 100644 Binary files a/src/main/resources/assets/ee3/textures/xcf/gui/starterBook.xcf and b/src/main/resources/assets/ee3/textures/xcf/gui/starterBook.xcf differ