From 43acadef2c58079e1deeee799a7231eb57b4affc Mon Sep 17 00:00:00 2001 From: MysteriousAges Date: Fri, 24 Apr 2015 23:24:44 -0700 Subject: [PATCH] Fixing fluid icon registration. Turns out I was trying to save processing but Minecraft is too stupid. Closes #31 --- src/main/java/magicbees/item/ItemCapsule.java | 12 +++++++----- src/main/java/magicbees/main/CommonProxy.java | 14 -------------- .../items/liquids/{Ethanol.png => bioethanol.png} | Bin 3 files changed, 7 insertions(+), 19 deletions(-) rename src/main/resources/assets/magicbees/textures/items/liquids/{Ethanol.png => bioethanol.png} (100%) diff --git a/src/main/java/magicbees/item/ItemCapsule.java b/src/main/java/magicbees/item/ItemCapsule.java index e3f52e3..92fab03 100644 --- a/src/main/java/magicbees/item/ItemCapsule.java +++ b/src/main/java/magicbees/item/ItemCapsule.java @@ -8,6 +8,8 @@ import cpw.mods.fml.relauncher.SideOnly; import magicbees.item.types.CapsuleType; import magicbees.item.types.FluidType; import magicbees.main.CommonProxy; +import magicbees.main.Config; +import magicbees.main.utils.LogHelper; import magicbees.main.utils.TabMagicBees; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; @@ -67,15 +69,15 @@ public class ItemCapsule extends Item } @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister par1IconRegister) + public void registerIcons(IIconRegister iconRegister) { - this.itemIcon = par1IconRegister.registerIcon(CommonProxy.DOMAIN + ":capsule" + this.capsuleType.getName().substring(0, 1).toUpperCase() + this.itemIcon = iconRegister.registerIcon(CommonProxy.DOMAIN + ":capsule" + this.capsuleType.getName().substring(0, 1).toUpperCase() + this.capsuleType.getName().substring(1)); for (FluidType t : FluidType.values()) { - if (t != FluidType.EMPTY && t.liquidIcon == null) + if (t != FluidType.EMPTY) { - t.liquidIcon = par1IconRegister.registerIcon(CommonProxy.DOMAIN + ":liquids/" + t.liquidID.toLowerCase()); + t.liquidIcon = iconRegister.registerIcon(CommonProxy.DOMAIN + ":liquids/" + t.liquidID); } } } @@ -87,7 +89,7 @@ public class ItemCapsule extends Item IIcon i = this.itemIcon; if (metadata != 0 && pass == 0) { - i = FluidType.values()[Math.max(0, Math.min(metadata, FluidType.values().length - 1))].liquidIcon; + i = FluidType.values()[metadata % FluidType.values().length].liquidIcon; } return i; } diff --git a/src/main/java/magicbees/main/CommonProxy.java b/src/main/java/magicbees/main/CommonProxy.java index ffb2c86..fe6c42f 100644 --- a/src/main/java/magicbees/main/CommonProxy.java +++ b/src/main/java/magicbees/main/CommonProxy.java @@ -9,23 +9,9 @@ public class CommonProxy public static final String MODEL = "model/"; public static final String LANGS = "lang/"; - @Deprecated - public static final String RESOURCE_PATH = "/assets/magicbees/"; - @Deprecated - public static final String TEXTURE_PATH = RESOURCE_PATH + "textures/"; - @Deprecated - public static final String MODEL_PATH = RESOURCE_PATH + "model/"; - @Deprecated - public static final String TCBEES_RESEARCH = RESOURCE_PATH + "research/"; - @Deprecated - public static final String TCBEES_LOCDIR = RESOURCE_PATH + "lang/"; - public static String FORESTRY_GFX_ITEMS; public static String FORESTRY_GFX_BEEEFFECTS; - @Deprecated - public static final String GUI_PATH = TEXTURE_PATH + "gui/"; - public static int RenderIdEffectJar; public static int RenderIdVisAuraProvider; diff --git a/src/main/resources/assets/magicbees/textures/items/liquids/Ethanol.png b/src/main/resources/assets/magicbees/textures/items/liquids/bioethanol.png similarity index 100% rename from src/main/resources/assets/magicbees/textures/items/liquids/Ethanol.png rename to src/main/resources/assets/magicbees/textures/items/liquids/bioethanol.png