From 7635af7fa243615381a443cc016ee4658e293023 Mon Sep 17 00:00:00 2001 From: CovertJaguar Date: Fri, 15 Aug 2014 17:15:49 -0700 Subject: [PATCH] We only need to load the textures for our type of bag, not all types. Closes #99 --- lang | 2 +- .../forestry/storage/items/ItemBackpack.java | 43 ++++++++----------- 2 files changed, 20 insertions(+), 25 deletions(-) diff --git a/lang b/lang index 8f015fb33..8289500e1 160000 --- a/lang +++ b/lang @@ -1 +1 @@ -Subproject commit 8f015fb3302147b1232b656020bf788b73567b4d +Subproject commit 8289500e1df663ef98b8a726edd5e744b0ce42c2 diff --git a/src/main/java/forestry/storage/items/ItemBackpack.java b/src/main/java/forestry/storage/items/ItemBackpack.java index de106b9ea..ef6b46e9f 100755 --- a/src/main/java/forestry/storage/items/ItemBackpack.java +++ b/src/main/java/forestry/storage/items/ItemBackpack.java @@ -47,8 +47,8 @@ import java.util.EnumSet; public class ItemBackpack extends ItemInventoried { - IBackpackDefinition info; - EnumBackpackType type; + private final IBackpackDefinition info; + private final EnumBackpackType type; public ItemBackpack(IBackpackDefinition info, EnumBackpackType type) { super(); @@ -260,24 +260,22 @@ public class ItemBackpack extends ItemInventoried { /* ICONS */ @SideOnly(Side.CLIENT) - private IIcon[][] icons; + private IIcon[] icons; @SideOnly(Side.CLIENT) @Override public void registerIcons(IIconRegister register) { - icons = new IIcon[2][6]; + icons = new IIcon[6]; - for (EnumBackpackType t : EnumSet.of(EnumBackpackType.T1, EnumBackpackType.T2)) { - int i = t.ordinal() - 1; - icons[i][0] = TextureManager.getInstance().registerTex( - register, "backpacks/" + t.toString().toLowerCase(Locale.ENGLISH) + ".cloth"); - icons[i][1] = TextureManager.getInstance().registerTex( - register, "backpacks/" + t.toString().toLowerCase(Locale.ENGLISH) + ".outline"); - icons[i][2] = TextureManager.getInstance().registerTex(register, "backpacks/neutral"); - icons[i][3] = TextureManager.getInstance().registerTex(register, "backpacks/locked"); - icons[i][4] = TextureManager.getInstance().registerTex(register, "backpacks/receive"); - icons[i][5] = TextureManager.getInstance().registerTex(register, "backpacks/resupply"); - } + EnumBackpackType t = type == EnumBackpackType.APIARIST ? EnumBackpackType.T1 : type; + String typeTag = "backpacks/" + t.toString().toLowerCase(Locale.ENGLISH); + + icons[0] = TextureManager.getInstance().registerTex(register, typeTag + ".cloth"); + icons[1] = TextureManager.getInstance().registerTex(register, typeTag + ".outline"); + icons[2] = TextureManager.getInstance().registerTex(register, "backpacks/neutral"); + icons[3] = TextureManager.getInstance().registerTex(register, "backpacks/locked"); + icons[4] = TextureManager.getInstance().registerTex(register, "backpacks/receive"); + icons[5] = TextureManager.getInstance().registerTex(register, "backpacks/resupply"); } // Return true to enable color overlay - client side only @@ -305,22 +303,19 @@ public class ItemBackpack extends ItemInventoried { @SideOnly(Side.CLIENT) @Override public IIcon getIconFromDamageForRenderPass(int i, int j) { - - int iconType = type.ordinal() - 1; - if (j == 0) - return icons[iconType][0]; + return icons[0]; if (j == 1) - return icons[iconType][1]; + return icons[1]; if (i > 2) - return icons[iconType][5]; + return icons[5]; else if (i > 1) - return icons[iconType][4]; + return icons[4]; else if (i > 0) - return icons[iconType][3]; + return icons[3]; else - return icons[iconType][2]; + return icons[2]; } public static int getSlotsForType(EnumBackpackType type) {