diff --git a/ee3_common/com/pahimar/ee3/client/gui/inventory/GuiAlchemicalBag.java b/ee3_common/com/pahimar/ee3/client/gui/inventory/GuiAlchemicalBag.java index e3319260..d5405729 100644 --- a/ee3_common/com/pahimar/ee3/client/gui/inventory/GuiAlchemicalBag.java +++ b/ee3_common/com/pahimar/ee3/client/gui/inventory/GuiAlchemicalBag.java @@ -49,8 +49,8 @@ public class GuiAlchemicalBag extends GuiContainer { if (this.mc.thePlayer != null) { for (ItemStack itemStack : this.mc.thePlayer.inventory.mainInventory) { if (itemStack != null) { - if (NBTHelper.hasTag(itemStack, Strings.NBT_ITEM_ALCHEMY_BAG_GUI_OPEN)) { - NBTHelper.removeTag(itemStack, Strings.NBT_ITEM_ALCHEMY_BAG_GUI_OPEN); + if (NBTHelper.hasTag(itemStack, Strings.NBT_ITEM_ALCHEMICAL_BAG_GUI_OPEN)) { + NBTHelper.removeTag(itemStack, Strings.NBT_ITEM_ALCHEMICAL_BAG_GUI_OPEN); } } } diff --git a/ee3_common/com/pahimar/ee3/configuration/ConfigurationHandler.java b/ee3_common/com/pahimar/ee3/configuration/ConfigurationHandler.java index b6d91c7d..40ea8821 100644 --- a/ee3_common/com/pahimar/ee3/configuration/ConfigurationHandler.java +++ b/ee3_common/com/pahimar/ee3/configuration/ConfigurationHandler.java @@ -95,9 +95,9 @@ public class ConfigurationHandler { ItemIds.MINIUM_SHARD = configuration.getItem(Strings.MINIUM_SHARD_NAME, ItemIds.MINIUM_SHARD_DEFAULT).getInt(ItemIds.MINIUM_SHARD_DEFAULT); ItemIds.INERT_STONE = configuration.getItem(Strings.INERT_STONE_NAME, ItemIds.INERT_STONE_DEFAULT).getInt(ItemIds.INERT_STONE_DEFAULT); ItemIds.MINIUM_STONE = configuration.getItem(Strings.MINIUM_STONE_NAME, ItemIds.MINIUM_STONE_DEFAULT).getInt(ItemIds.MINIUM_STONE_DEFAULT); - ItemIds.PHILOSOPHER_STONE = configuration.getItem(Strings.PHILOSOPHERS_STONE_NAME, ItemIds.PHILOSOPHER_STONE_DEFAULT).getInt(ItemIds.PHILOSOPHER_STONE_DEFAULT); - ItemIds.ALCHEMY_DUST = configuration.getItem(Strings.ALCHEMY_DUST_NAME, ItemIds.ALCHEMY_DUST_DEFAULT).getInt(ItemIds.ALCHEMY_DUST_DEFAULT); - ItemIds.ALCHEMY_BAG = configuration.getItem(Strings.ALCHEMY_BAG_NAME, ItemIds.ALCHEMY_BAG_DEFAULT).getInt(ItemIds.ALCHEMY_BAG_DEFAULT); + ItemIds.PHILOSOPHERS_STONE = configuration.getItem(Strings.PHILOSOPHERS_STONE_NAME, ItemIds.PHILOSOPHERS_STONE_DEFAULT).getInt(ItemIds.PHILOSOPHERS_STONE_DEFAULT); + ItemIds.ALCHEMICAL_DUST = configuration.getItem(Strings.ALCHEMICAL_DUST_NAME, ItemIds.ALCHEMICAL_DUST_DEFAULT).getInt(ItemIds.ALCHEMICAL_DUST_DEFAULT); + ItemIds.ALCHEMICAL_BAG = configuration.getItem(Strings.ALCHEMICAL_BAG_NAME, ItemIds.ALCHEMICAL_BAG_DEFAULT).getInt(ItemIds.ALCHEMICAL_BAG_DEFAULT); /* Item durability configs */ ConfigurationSettings.MINIUM_STONE_MAX_DURABILITY = configuration.get(CATEGORY_DURABILITY, ConfigurationSettings.MINIUM_STONE_MAX_DURABILITY_CONFIGNAME, ConfigurationSettings.MINIUM_STONE_MAX_DURABILITY_DEFAULT).getInt(ConfigurationSettings.MINIUM_STONE_MAX_DURABILITY_DEFAULT); diff --git a/ee3_common/com/pahimar/ee3/core/handlers/ItemEventHandler.java b/ee3_common/com/pahimar/ee3/core/handlers/ItemEventHandler.java index b6fe5c14..a6f7bdac 100644 --- a/ee3_common/com/pahimar/ee3/core/handlers/ItemEventHandler.java +++ b/ee3_common/com/pahimar/ee3/core/handlers/ItemEventHandler.java @@ -30,8 +30,8 @@ public class ItemEventHandler { else if (NBTHelper.hasTag(event.item.getEntityItem(), Strings.NBT_ITEM_TRANSMUTATION_GUI_OPEN)) { NBTHelper.removeTag(event.item.getEntityItem(), Strings.NBT_ITEM_TRANSMUTATION_GUI_OPEN); } - else if (NBTHelper.hasTag(event.item.getEntityItem(), Strings.NBT_ITEM_ALCHEMY_BAG_GUI_OPEN)) { - NBTHelper.removeTag(event.item.getEntityItem(), Strings.NBT_ITEM_ALCHEMY_BAG_GUI_OPEN); + else if (NBTHelper.hasTag(event.item.getEntityItem(), Strings.NBT_ITEM_ALCHEMICAL_BAG_GUI_OPEN)) { + NBTHelper.removeTag(event.item.getEntityItem(), Strings.NBT_ITEM_ALCHEMICAL_BAG_GUI_OPEN); } } @@ -44,8 +44,8 @@ public class ItemEventHandler { else if (NBTHelper.hasTag(event.entityItem.getEntityItem(), Strings.NBT_ITEM_TRANSMUTATION_GUI_OPEN)) { NBTHelper.removeTag(event.entityItem.getEntityItem(), Strings.NBT_ITEM_TRANSMUTATION_GUI_OPEN); } - else if (NBTHelper.hasTag(event.entityItem.getEntityItem(), Strings.NBT_ITEM_ALCHEMY_BAG_GUI_OPEN)) { - NBTHelper.removeTag(event.entityItem.getEntityItem(), Strings.NBT_ITEM_ALCHEMY_BAG_GUI_OPEN); + else if (NBTHelper.hasTag(event.entityItem.getEntityItem(), Strings.NBT_ITEM_ALCHEMICAL_BAG_GUI_OPEN)) { + NBTHelper.removeTag(event.entityItem.getEntityItem(), Strings.NBT_ITEM_ALCHEMICAL_BAG_GUI_OPEN); } } @@ -59,8 +59,8 @@ public class ItemEventHandler { else if (NBTHelper.hasTag(entityItem.getEntityItem(), Strings.NBT_ITEM_TRANSMUTATION_GUI_OPEN)) { NBTHelper.removeTag(entityItem.getEntityItem(), Strings.NBT_ITEM_TRANSMUTATION_GUI_OPEN); } - else if (NBTHelper.hasTag(entityItem.getEntityItem(), Strings.NBT_ITEM_ALCHEMY_BAG_GUI_OPEN)) { - NBTHelper.removeTag(entityItem.getEntityItem(), Strings.NBT_ITEM_ALCHEMY_BAG_GUI_OPEN); + else if (NBTHelper.hasTag(entityItem.getEntityItem(), Strings.NBT_ITEM_ALCHEMICAL_BAG_GUI_OPEN)) { + NBTHelper.removeTag(entityItem.getEntityItem(), Strings.NBT_ITEM_ALCHEMICAL_BAG_GUI_OPEN); } } } diff --git a/ee3_common/com/pahimar/ee3/inventory/AlchemicalBagSavedData.java b/ee3_common/com/pahimar/ee3/inventory/AlchemicalBagSavedData.java index 4f777e87..98a8b33a 100644 --- a/ee3_common/com/pahimar/ee3/inventory/AlchemicalBagSavedData.java +++ b/ee3_common/com/pahimar/ee3/inventory/AlchemicalBagSavedData.java @@ -73,7 +73,7 @@ public class AlchemicalBagSavedData extends WorldSavedData implements IInventory @Override public String getInvName() { - return "worldsaveddata" + "." + Strings.ALCHEMY_BAG_NAME; + return "worldsaveddata" + "." + Strings.ALCHEMICAL_BAG_NAME; } @Override diff --git a/ee3_common/com/pahimar/ee3/inventory/ContainerAlchemicalBag.java b/ee3_common/com/pahimar/ee3/inventory/ContainerAlchemicalBag.java index 4da05feb..091b7980 100644 --- a/ee3_common/com/pahimar/ee3/inventory/ContainerAlchemicalBag.java +++ b/ee3_common/com/pahimar/ee3/inventory/ContainerAlchemicalBag.java @@ -41,8 +41,8 @@ public class ContainerAlchemicalBag extends Container { InventoryPlayer invPlayer = player.inventory; for (ItemStack itemStack : invPlayer.mainInventory) { if (itemStack != null) { - if (NBTHelper.hasTag(itemStack, Strings.NBT_ITEM_ALCHEMY_BAG_GUI_OPEN)) { - NBTHelper.removeTag(itemStack, Strings.NBT_ITEM_ALCHEMY_BAG_GUI_OPEN); + if (NBTHelper.hasTag(itemStack, Strings.NBT_ITEM_ALCHEMICAL_BAG_GUI_OPEN)) { + NBTHelper.removeTag(itemStack, Strings.NBT_ITEM_ALCHEMICAL_BAG_GUI_OPEN); } } } diff --git a/ee3_common/com/pahimar/ee3/item/ItemAlchemyBag.java b/ee3_common/com/pahimar/ee3/item/ItemAlchemicalBag.java similarity index 59% rename from ee3_common/com/pahimar/ee3/item/ItemAlchemyBag.java rename to ee3_common/com/pahimar/ee3/item/ItemAlchemicalBag.java index 9b875079..bb165b75 100644 --- a/ee3_common/com/pahimar/ee3/item/ItemAlchemyBag.java +++ b/ee3_common/com/pahimar/ee3/item/ItemAlchemicalBag.java @@ -1,5 +1,6 @@ package com.pahimar.ee3.item; +import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.Icon; @@ -8,25 +9,41 @@ import net.minecraft.world.World; import com.pahimar.ee3.EquivalentExchange3; import com.pahimar.ee3.core.helper.NBTHelper; import com.pahimar.ee3.lib.GuiIds; +import com.pahimar.ee3.lib.Reference; import com.pahimar.ee3.lib.Strings; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -public class ItemAlchemyBag extends ItemEE { +public class ItemAlchemicalBag extends ItemEE { - public ItemAlchemyBag(int id) { + private static final String[] ALCHEMICAL_BAG_SUBTYPES = new String[] { "Open", "OpenDrawString", "Closed", "ClosedDrawString" }; + + @SideOnly(Side.CLIENT) + private Icon[] icons; + + public ItemAlchemicalBag(int id) { super(id); - this.setUnlocalizedName(Strings.ALCHEMY_BAG_NAME); + this.setUnlocalizedName(Strings.ALCHEMICAL_BAG_NAME); this.setCreativeTab(EquivalentExchange3.tabsEE3); } + @SideOnly(Side.CLIENT) + public void func_94581_a(IconRegister iconRegister) { + + this.icons = new Icon[ALCHEMICAL_BAG_SUBTYPES.length]; + + for (int i = 0; i < ALCHEMICAL_BAG_SUBTYPES.length; ++i) { + this.icons[i] = iconRegister.func_94245_a(Reference.MOD_ID.toLowerCase() + ":" + Strings.ALCHEMICAL_BAG_NAME + ALCHEMICAL_BAG_SUBTYPES[i]); + } + } + @Override public ItemStack onItemRightClick(ItemStack itemStack, World world, EntityPlayer entityPlayer) { if (!world.isRemote) { - NBTHelper.setBoolean(itemStack, Strings.NBT_ITEM_ALCHEMY_BAG_GUI_OPEN, true); + NBTHelper.setBoolean(itemStack, Strings.NBT_ITEM_ALCHEMICAL_BAG_GUI_OPEN, true); entityPlayer.openGui(EquivalentExchange3.instance, GuiIds.ALCHEMICAL_BAG, entityPlayer.worldObj, (int) entityPlayer.posX, (int) entityPlayer.posY, (int) entityPlayer.posZ); } @@ -46,25 +63,24 @@ public class ItemAlchemyBag extends ItemEE { } @Override - @SideOnly(Side.CLIENT) public Icon getIcon(ItemStack itemStack, int renderPass) { // If the bag is open - if (NBTHelper.hasTag(itemStack, Strings.NBT_ITEM_ALCHEMY_BAG_GUI_OPEN)) { + if (NBTHelper.hasTag(itemStack, Strings.NBT_ITEM_ALCHEMICAL_BAG_GUI_OPEN)) { if (renderPass == 0) { - return this.iconIndex; + return icons[0]; } else { - return this.iconIndex; + return icons[1]; } } // Else, the bag is closed else { if (renderPass == 0) { - return this.iconIndex; + return icons[2]; } else { - return this.iconIndex; + return icons[3]; } } } diff --git a/ee3_common/com/pahimar/ee3/item/ItemAlchemyDust.java b/ee3_common/com/pahimar/ee3/item/ItemAlchemicalDust.java similarity index 63% rename from ee3_common/com/pahimar/ee3/item/ItemAlchemyDust.java rename to ee3_common/com/pahimar/ee3/item/ItemAlchemicalDust.java index f43da153..c8c71f65 100644 --- a/ee3_common/com/pahimar/ee3/item/ItemAlchemyDust.java +++ b/ee3_common/com/pahimar/ee3/item/ItemAlchemicalDust.java @@ -2,13 +2,16 @@ package com.pahimar.ee3.item; import java.util.List; +import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; +import net.minecraft.util.Icon; import net.minecraft.util.MathHelper; import com.pahimar.ee3.EquivalentExchange3; import com.pahimar.ee3.lib.CustomItemRarity; +import com.pahimar.ee3.lib.Reference; import com.pahimar.ee3.lib.Strings; import cpw.mods.fml.relauncher.Side; @@ -23,24 +26,47 @@ import cpw.mods.fml.relauncher.SideOnly; * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html) * */ -public class ItemAlchemyDust extends ItemEE { +public class ItemAlchemicalDust extends ItemEE { - public static final String[] alchemyDustNames = new String[] { "ash", "minium", "verdant", "azure", "amaranthine", "iridescent" }; + private static final String[] ALCHEMICAL_DUST_NAMES = new String[] { "Ash", "Minium", "Verdant", "Azure", "Amaranthine", "Iridescent" }; - public ItemAlchemyDust(int id) { + @SideOnly(Side.CLIENT) + private Icon[] icons; + + public ItemAlchemicalDust(int id) { super(id); this.setHasSubtypes(true); - this.setUnlocalizedName(Strings.ALCHEMY_DUST_NAME); + this.setUnlocalizedName(Strings.ALCHEMICAL_DUST_NAME); this.setCreativeTab(EquivalentExchange3.tabsEE3); maxStackSize = 64; } - @SideOnly(Side.CLIENT) - public String getItemNameIS(ItemStack stack) { + @Override + public String getUnlocalizedName(ItemStack itemStack) { - int meta = MathHelper.clamp_int(stack.getItemDamage(), 0, 5); - return super.getUnlocalizedName() + "." + alchemyDustNames[meta]; + int meta = MathHelper.clamp_int(itemStack.getItemDamage(), 0, 5); + return (super.getUnlocalizedName() + ALCHEMICAL_DUST_NAMES[meta]); + } + + @SideOnly(Side.CLIENT) + /** + * Gets an icon index based on an item's damage value + */ + public Icon getIconFromDamage(int meta) { + + int j = MathHelper.clamp_int(meta, 0, 5); + return this.icons[j]; + } + + @SideOnly(Side.CLIENT) + public void func_94581_a(IconRegister iconRegister) { + + this.icons = new Icon[ALCHEMICAL_DUST_NAMES.length]; + + for (int i = 0; i < ALCHEMICAL_DUST_NAMES.length; ++i) { + this.icons[i] = iconRegister.func_94245_a(Reference.MOD_ID.toLowerCase() + ":" + Strings.ALCHEMICAL_DUST_NAME + ALCHEMICAL_DUST_NAMES[i]); + } } @SideOnly(Side.CLIENT) @@ -87,5 +113,4 @@ public class ItemAlchemyDust extends ItemEE { list.add(new ItemStack(id, 1, meta)); } } - } diff --git a/ee3_common/com/pahimar/ee3/item/ItemPhilosopherStone.java b/ee3_common/com/pahimar/ee3/item/ItemPhilosophersStone.java similarity index 98% rename from ee3_common/com/pahimar/ee3/item/ItemPhilosopherStone.java rename to ee3_common/com/pahimar/ee3/item/ItemPhilosophersStone.java index 33279c09..9e3a507f 100644 --- a/ee3_common/com/pahimar/ee3/item/ItemPhilosopherStone.java +++ b/ee3_common/com/pahimar/ee3/item/ItemPhilosophersStone.java @@ -29,12 +29,12 @@ import cpw.mods.fml.relauncher.SideOnly; * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html) * */ -public class ItemPhilosopherStone extends ItemEE +public class ItemPhilosophersStone extends ItemEE implements ITransmutationStone, IChargeable, IKeyBound { private int maxChargeLevel; - public ItemPhilosopherStone(int id) { + public ItemPhilosophersStone(int id) { super(id); this.setUnlocalizedName(Strings.PHILOSOPHERS_STONE_NAME); diff --git a/ee3_common/com/pahimar/ee3/item/ModItems.java b/ee3_common/com/pahimar/ee3/item/ModItems.java index ef84b02d..7ac6cb97 100644 --- a/ee3_common/com/pahimar/ee3/item/ModItems.java +++ b/ee3_common/com/pahimar/ee3/item/ModItems.java @@ -24,8 +24,8 @@ public class ModItems { public static Item inertStone; public static Item miniumStone; public static Item philStone; - public static Item alchemyDust; - public static Item alchemyBag; + public static Item alchemicalDust; + public static Item alchemicalBag; public static void init() { @@ -33,9 +33,9 @@ public class ModItems { miniumShard = new ItemMiniumShard(ItemIds.MINIUM_SHARD); inertStone = new ItemInertStone(ItemIds.INERT_STONE); miniumStone = new ItemMiniumStone(ItemIds.MINIUM_STONE); - philStone = new ItemPhilosopherStone(ItemIds.PHILOSOPHER_STONE); - //alchemyDust = new ItemAlchemyDust(ItemIds.ALCHEMY_DUST); - //alchemyBag = new ItemAlchemyBag(ItemIds.ALCHEMY_BAG); + philStone = new ItemPhilosophersStone(ItemIds.PHILOSOPHERS_STONE); + alchemicalDust = new ItemAlchemicalDust(ItemIds.ALCHEMICAL_DUST); + alchemicalBag = new ItemAlchemicalBag(ItemIds.ALCHEMICAL_BAG); miniumStone.setContainerItem(miniumStone); philStone.setContainerItem(philStone); diff --git a/ee3_common/com/pahimar/ee3/lib/ItemIds.java b/ee3_common/com/pahimar/ee3/lib/ItemIds.java index 11d7899d..6dc8d644 100644 --- a/ee3_common/com/pahimar/ee3/lib/ItemIds.java +++ b/ee3_common/com/pahimar/ee3/lib/ItemIds.java @@ -15,16 +15,16 @@ public class ItemIds { public static int MINIUM_SHARD_DEFAULT = 27000; public static int INERT_STONE_DEFAULT = 27001; public static int MINIUM_STONE_DEFAULT = 27002; - public static int PHILOSOPHER_STONE_DEFAULT = 27003; - public static int ALCHEMY_DUST_DEFAULT = 27004; - public static int ALCHEMY_BAG_DEFAULT = 27005; + public static int PHILOSOPHERS_STONE_DEFAULT = 27003; + public static int ALCHEMICAL_DUST_DEFAULT = 27004; + public static int ALCHEMICAL_BAG_DEFAULT = 27005; /* Current item ids */ public static int MINIUM_SHARD; public static int INERT_STONE; public static int MINIUM_STONE; - public static int PHILOSOPHER_STONE; - public static int ALCHEMY_DUST; - public static int ALCHEMY_BAG; + public static int PHILOSOPHERS_STONE; + public static int ALCHEMICAL_DUST; + public static int ALCHEMICAL_BAG; } diff --git a/ee3_common/com/pahimar/ee3/lib/Strings.java b/ee3_common/com/pahimar/ee3/lib/Strings.java index e6d43b42..e69f6bed 100644 --- a/ee3_common/com/pahimar/ee3/lib/Strings.java +++ b/ee3_common/com/pahimar/ee3/lib/Strings.java @@ -26,7 +26,7 @@ public class Strings { public static final String NBT_ITEM_MODE_KEY = "itemMode"; public static final String NBT_ITEM_CRAFTING_GUI_OPEN = "itemCraftingGuiOpen"; public static final String NBT_ITEM_TRANSMUTATION_GUI_OPEN = "itemTransmutationGuiOpen"; - public static final String NBT_ITEM_ALCHEMY_BAG_GUI_OPEN = "itemAlchemyBagGuiOpen"; + public static final String NBT_ITEM_ALCHEMICAL_BAG_GUI_OPEN = "itemAlchemicalBagGuiOpen"; public static final String NBT_TE_OWNER_KEY = "teOwner"; public static final String NBT_TE_STATE_KEY = "teState"; public static final String NBT_TE_DIRECTION_KEY = "teDirection"; @@ -43,8 +43,8 @@ public class Strings { public static final String INERT_STONE_NAME = "stoneInert"; public static final String MINIUM_STONE_NAME = "stoneMinium"; public static final String PHILOSOPHERS_STONE_NAME = "stonePhilosophers"; - public static final String ALCHEMY_DUST_NAME = "dustAlchemy"; - public static final String ALCHEMY_BAG_NAME = "alchemyBag"; + public static final String ALCHEMICAL_DUST_NAME = "dustAlchemical"; + public static final String ALCHEMICAL_BAG_NAME = "alchemicalBag"; /* TileEntity name constants */ public static final String TE_CALCINATOR_NAME = "tileCalcinator"; diff --git a/resources/mods/ee3/lang/en_US.xml b/resources/mods/ee3/lang/en_US.xml index 110d860c..65c95eaf 100644 --- a/resources/mods/ee3/lang/en_US.xml +++ b/resources/mods/ee3/lang/en_US.xml @@ -10,13 +10,13 @@ Inert Stone Minium Stone Philosopher's Stone - Ash - Minium Dust - Verdant Dust - Azure Dust - Amaranthine Dust - Iridescent Dust - Alchemical Bag + Ash + Minium Dust + Verdant Dust + Azure Dust + Amaranthine Dust + Iridescent Dust + Alchemical Bag Red Water (Still) Red Water (Flowing) Calcinator diff --git a/resources/mods/ee3/textures/items/alchemyBagClosed.png b/resources/mods/ee3/textures/items/alchemicalBagClosed.png similarity index 100% rename from resources/mods/ee3/textures/items/alchemyBagClosed.png rename to resources/mods/ee3/textures/items/alchemicalBagClosed.png diff --git a/resources/mods/ee3/textures/items/alchemyBagClosedDrawString.png b/resources/mods/ee3/textures/items/alchemicalBagClosedDrawString.png similarity index 100% rename from resources/mods/ee3/textures/items/alchemyBagClosedDrawString.png rename to resources/mods/ee3/textures/items/alchemicalBagClosedDrawString.png diff --git a/resources/mods/ee3/textures/items/alchemyBagOpen.png b/resources/mods/ee3/textures/items/alchemicalBagOpen.png similarity index 100% rename from resources/mods/ee3/textures/items/alchemyBagOpen.png rename to resources/mods/ee3/textures/items/alchemicalBagOpen.png diff --git a/resources/mods/ee3/textures/items/alchemyBagOpenDrawString.png b/resources/mods/ee3/textures/items/alchemicalBagOpenDrawString.png similarity index 100% rename from resources/mods/ee3/textures/items/alchemyBagOpenDrawString.png rename to resources/mods/ee3/textures/items/alchemicalBagOpenDrawString.png diff --git a/resources/mods/ee3/textures/items/dustAmaranthine.png b/resources/mods/ee3/textures/items/dustAlchemicalAmaranthine.png similarity index 100% rename from resources/mods/ee3/textures/items/dustAmaranthine.png rename to resources/mods/ee3/textures/items/dustAlchemicalAmaranthine.png diff --git a/resources/mods/ee3/textures/items/dustAsh.png b/resources/mods/ee3/textures/items/dustAlchemicalAsh.png similarity index 100% rename from resources/mods/ee3/textures/items/dustAsh.png rename to resources/mods/ee3/textures/items/dustAlchemicalAsh.png diff --git a/resources/mods/ee3/textures/items/dustAzure.png b/resources/mods/ee3/textures/items/dustAlchemicalAzure.png similarity index 100% rename from resources/mods/ee3/textures/items/dustAzure.png rename to resources/mods/ee3/textures/items/dustAlchemicalAzure.png diff --git a/resources/mods/ee3/textures/items/dustIridescent.png b/resources/mods/ee3/textures/items/dustAlchemicalIridescent.png similarity index 100% rename from resources/mods/ee3/textures/items/dustIridescent.png rename to resources/mods/ee3/textures/items/dustAlchemicalIridescent.png diff --git a/resources/mods/ee3/textures/items/dustMinium.png b/resources/mods/ee3/textures/items/dustAlchemicalMinium.png similarity index 100% rename from resources/mods/ee3/textures/items/dustMinium.png rename to resources/mods/ee3/textures/items/dustAlchemicalMinium.png diff --git a/resources/mods/ee3/textures/items/dustVerdant.png b/resources/mods/ee3/textures/items/dustAlchemicalVerdant.png similarity index 100% rename from resources/mods/ee3/textures/items/dustVerdant.png rename to resources/mods/ee3/textures/items/dustAlchemicalVerdant.png diff --git a/resources/mods/ee3/textures/xcf/items/alchemyBagClosed.xcf b/resources/mods/ee3/textures/xcf/items/alchemicalBagClosed.xcf similarity index 100% rename from resources/mods/ee3/textures/xcf/items/alchemyBagClosed.xcf rename to resources/mods/ee3/textures/xcf/items/alchemicalBagClosed.xcf diff --git a/resources/mods/ee3/textures/xcf/items/alchemyBagClosedDrawString.xcf b/resources/mods/ee3/textures/xcf/items/alchemicalBagClosedDrawString.xcf similarity index 100% rename from resources/mods/ee3/textures/xcf/items/alchemyBagClosedDrawString.xcf rename to resources/mods/ee3/textures/xcf/items/alchemicalBagClosedDrawString.xcf diff --git a/resources/mods/ee3/textures/xcf/items/alchemyBagOpen.xcf b/resources/mods/ee3/textures/xcf/items/alchemicalBagOpen.xcf similarity index 100% rename from resources/mods/ee3/textures/xcf/items/alchemyBagOpen.xcf rename to resources/mods/ee3/textures/xcf/items/alchemicalBagOpen.xcf diff --git a/resources/mods/ee3/textures/xcf/items/alchemyBagOpenDrawString.xcf b/resources/mods/ee3/textures/xcf/items/alchemicalBagOpenDrawString.xcf similarity index 100% rename from resources/mods/ee3/textures/xcf/items/alchemyBagOpenDrawString.xcf rename to resources/mods/ee3/textures/xcf/items/alchemicalBagOpenDrawString.xcf diff --git a/resources/mods/ee3/textures/xcf/items/dustAmaranthine.xcf b/resources/mods/ee3/textures/xcf/items/dustAlchemicalAmaranthine.xcf similarity index 100% rename from resources/mods/ee3/textures/xcf/items/dustAmaranthine.xcf rename to resources/mods/ee3/textures/xcf/items/dustAlchemicalAmaranthine.xcf diff --git a/resources/mods/ee3/textures/xcf/items/dustAsh.xcf b/resources/mods/ee3/textures/xcf/items/dustAlchemicalAsh.xcf similarity index 100% rename from resources/mods/ee3/textures/xcf/items/dustAsh.xcf rename to resources/mods/ee3/textures/xcf/items/dustAlchemicalAsh.xcf diff --git a/resources/mods/ee3/textures/xcf/items/dustAzure.xcf b/resources/mods/ee3/textures/xcf/items/dustAlchemicalAzure.xcf similarity index 100% rename from resources/mods/ee3/textures/xcf/items/dustAzure.xcf rename to resources/mods/ee3/textures/xcf/items/dustAlchemicalAzure.xcf diff --git a/resources/mods/ee3/textures/xcf/items/dustIridescent.xcf b/resources/mods/ee3/textures/xcf/items/dustAlchemicalIridescent.xcf similarity index 100% rename from resources/mods/ee3/textures/xcf/items/dustIridescent.xcf rename to resources/mods/ee3/textures/xcf/items/dustAlchemicalIridescent.xcf diff --git a/resources/mods/ee3/textures/xcf/items/dustMinium.xcf b/resources/mods/ee3/textures/xcf/items/dustAlchemicalMinium.xcf similarity index 100% rename from resources/mods/ee3/textures/xcf/items/dustMinium.xcf rename to resources/mods/ee3/textures/xcf/items/dustAlchemicalMinium.xcf diff --git a/resources/mods/ee3/textures/xcf/items/dustVerdant.xcf b/resources/mods/ee3/textures/xcf/items/dustAlchemicalVerdant.xcf similarity index 100% rename from resources/mods/ee3/textures/xcf/items/dustVerdant.xcf rename to resources/mods/ee3/textures/xcf/items/dustAlchemicalVerdant.xcf