From 0d6cb54b50c7bc9d7f3942d9a3cdf3917507874c Mon Sep 17 00:00:00 2001 From: Christian Date: Mon, 4 Mar 2013 11:18:53 -0500 Subject: [PATCH] Update for 1.5 texturing changes --- .../common/cpw/mods/ironchest/BlockIronChest.java | 4 ++-- .../cpw/mods/ironchest/ItemChestChanger.java | 12 +++++++++++- .../common/cpw/mods/ironchest/ItemIronChest.java | 2 +- .../cpw/mods/ironchest/TileEntityIronChest.java | 3 ++- .../cpw/mods/ironchest/client/GUIChest.java | 4 ++-- .../client/TileEntityIronChestRenderer.java | 2 +- .../textures/items/copperIronUpgrade.png | Bin 0 -> 480 bytes .../textures/items/copperSilverUpgrade.png | Bin 0 -> 480 bytes .../textures/items/diamondCrystalUpgrade.png | Bin 0 -> 418 bytes .../textures/items/diamondObsidianUpgrade.png | Bin 0 -> 466 bytes .../textures/items/goldDiamondUpgrade.png | Bin 0 -> 480 bytes .../ironchest/textures/items/ironGoldUpgrade.png | Bin 0 -> 526 bytes .../textures/items/silverGoldUpgrade.png | Bin 0 -> 526 bytes .../textures/items/woodCopperUpgrade.png | Bin 0 -> 480 bytes .../ironchest/textures/items/woodIronUpgrade.png | Bin 0 -> 480 bytes 15 files changed, 19 insertions(+), 8 deletions(-) create mode 100644 IronChests2/resources/mods/ironchest/textures/items/copperIronUpgrade.png create mode 100644 IronChests2/resources/mods/ironchest/textures/items/copperSilverUpgrade.png create mode 100644 IronChests2/resources/mods/ironchest/textures/items/diamondCrystalUpgrade.png create mode 100644 IronChests2/resources/mods/ironchest/textures/items/diamondObsidianUpgrade.png create mode 100644 IronChests2/resources/mods/ironchest/textures/items/goldDiamondUpgrade.png create mode 100644 IronChests2/resources/mods/ironchest/textures/items/ironGoldUpgrade.png create mode 100644 IronChests2/resources/mods/ironchest/textures/items/silverGoldUpgrade.png create mode 100644 IronChests2/resources/mods/ironchest/textures/items/woodCopperUpgrade.png create mode 100644 IronChests2/resources/mods/ironchest/textures/items/woodIronUpgrade.png diff --git a/IronChests2/common/cpw/mods/ironchest/BlockIronChest.java b/IronChests2/common/cpw/mods/ironchest/BlockIronChest.java index 6ce0218..1b3fad6 100644 --- a/IronChests2/common/cpw/mods/ironchest/BlockIronChest.java +++ b/IronChests2/common/cpw/mods/ironchest/BlockIronChest.java @@ -41,7 +41,7 @@ public class BlockIronChest extends BlockContainer { public BlockIronChest(int id) { super(id, Material.iron); - setBlockName("IronChest"); + setUnlocalizedName("IronChest"); setHardness(3.0F); setBlockBounds(0.0625F, 0F, 0.0625F, 0.9375F, 0.875F, 0.9375F); random = new Random(); @@ -79,7 +79,7 @@ public class BlockIronChest extends BlockContainer { } @Override - public TileEntity createNewTileEntity(World world, int metadata) + public TileEntity createTileEntity(World world, int metadata) { return IronChestType.makeEntity(metadata); } diff --git a/IronChests2/common/cpw/mods/ironchest/ItemChestChanger.java b/IronChests2/common/cpw/mods/ironchest/ItemChestChanger.java index e0401bb..0555563 100644 --- a/IronChests2/common/cpw/mods/ironchest/ItemChestChanger.java +++ b/IronChests2/common/cpw/mods/ironchest/ItemChestChanger.java @@ -10,6 +10,7 @@ ******************************************************************************/ package cpw.mods.ironchest; +import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -18,6 +19,8 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityChest; import net.minecraft.world.World; import cpw.mods.fml.common.ObfuscationReflectionHelper; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class ItemChestChanger extends Item { @@ -28,10 +31,17 @@ public class ItemChestChanger extends Item { super(id); setMaxStackSize(1); this.type = type; - setItemName(type.itemName); + setUnlocalizedName(type.itemName); setCreativeTab(CreativeTabs.tabMisc); } + @Override + @SideOnly(Side.CLIENT) + public void func_94581_a(IconRegister par1IconRegister) + { + this.iconIndex = par1IconRegister.func_94245_a("ironchest:"+type.itemName); + } + @Override public boolean onItemUseFirst(ItemStack stack, EntityPlayer player, World world, int X, int Y, int Z, int side, float hitX, float hitY, float hitZ) { diff --git a/IronChests2/common/cpw/mods/ironchest/ItemIronChest.java b/IronChests2/common/cpw/mods/ironchest/ItemIronChest.java index a93f795..0667f69 100644 --- a/IronChests2/common/cpw/mods/ironchest/ItemIronChest.java +++ b/IronChests2/common/cpw/mods/ironchest/ItemIronChest.java @@ -29,7 +29,7 @@ public class ItemIronChest extends ItemBlock { } @Override - public String getItemNameIS(ItemStack itemstack) + public String getUnlocalizedName(ItemStack itemstack) { return IronChestType.values()[itemstack.getItemDamage()].name(); } diff --git a/IronChests2/common/cpw/mods/ironchest/TileEntityIronChest.java b/IronChests2/common/cpw/mods/ironchest/TileEntityIronChest.java index 33e1dee..b0375f3 100644 --- a/IronChests2/common/cpw/mods/ironchest/TileEntityIronChest.java +++ b/IronChests2/common/cpw/mods/ironchest/TileEntityIronChest.java @@ -314,7 +314,7 @@ public class TileEntityIronChest extends TileEntity implements IInventory { } @Override - public void receiveClientEvent(int i, int j) + public boolean receiveClientEvent(int i, int j) { if (i == 1) { @@ -329,6 +329,7 @@ public class TileEntityIronChest extends TileEntity implements IInventory { facing = (byte) (j & 0x7); numUsingPlayers = (j & 0xF8) >> 3; } + return true; } @Override diff --git a/IronChests2/common/cpw/mods/ironchest/client/GUIChest.java b/IronChests2/common/cpw/mods/ironchest/client/GUIChest.java index 1282a8d..857859a 100644 --- a/IronChests2/common/cpw/mods/ironchest/client/GUIChest.java +++ b/IronChests2/common/cpw/mods/ironchest/client/GUIChest.java @@ -73,9 +73,9 @@ public class GUIChest extends GuiContainer { @Override protected void drawGuiContainerBackgroundLayer(float f, int i, int j) { - int tex = mc.renderEngine.getTexture(type.guiTexture); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - mc.renderEngine.bindTexture(tex); + // new "bind tex" + mc.renderEngine.func_98187_b(type.guiTexture); int x = (width - xSize) / 2; int y = (height - ySize) / 2; drawTexturedModalRect(x, y, 0, 0, xSize, ySize); diff --git a/IronChests2/common/cpw/mods/ironchest/client/TileEntityIronChestRenderer.java b/IronChests2/common/cpw/mods/ironchest/client/TileEntityIronChestRenderer.java index 3241a39..32ec053 100644 --- a/IronChests2/common/cpw/mods/ironchest/client/TileEntityIronChestRenderer.java +++ b/IronChests2/common/cpw/mods/ironchest/client/TileEntityIronChestRenderer.java @@ -168,7 +168,7 @@ public class TileEntityIronChestRenderer extends TileEntitySpecialRenderer { glTranslatef(shiftX, shiftY, shiftZ); glRotatef(timeD, 0.0F, 1.0F, 0.0F); glScalef(blockScale, blockScale, blockScale); - customitem.func_92058_a(item); + customitem.setEntityItemStack(item); itemRenderer.doRenderItem(customitem, 0, 0, 0, 0, 0); glPopMatrix(); } diff --git a/IronChests2/resources/mods/ironchest/textures/items/copperIronUpgrade.png b/IronChests2/resources/mods/ironchest/textures/items/copperIronUpgrade.png new file mode 100644 index 0000000000000000000000000000000000000000..7bb215937bcfe3c5e4820ec26540800a914e008f GIT binary patch literal 480 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstUx|vage(c z!@6@aFM%9|WRD45bDP46hOx7_4S6Fo+k-*%fF5ln4*- z32_C|eG3-edh_<`^B3nIKDzMe@rhfvPu{+B;L_!Tm#^$Cw_lfMwd2(3?I%xNTU35@ zYTo*Tht5n+?dxva(;mBg=dP{w!OKg1=5O3IW7X>ED_2cgvUK9&CIA2bkL5aM1vHwm zB*-tA!Qt7BG!Q4r+ucQG4vQl@ki%Kv5n0T@z%2~Ij105pNB{-1JY5_^Brb=ZeJ#`= zAmSDn|DvfY$m{+8c@u?xw45bDP46hOx7_4S6Fo+k-*%fF5ln4*- z32_C|Gv~~F`r_$>#}97Zy>hQ6{hmIb)wy6B* z)Vy7Lcb%D>+SlE-r#*Jl)=gXMgO`{3tXjKj@v_B>mM)sRVD6mxbN>JT|1-}lA80gV zNswPKgTu2MX&_FLx4VnX92Q4*AcwQSBeIx*fm;}a85w5HkpK#2dAc};NL&s*`&y_$ zK*TLD{zX$)kk|YF^Ck-YZcm(R+&n?XLv~h_gQhNPPw}xj$J<*s>M;CD z%0xUkr|sG==HxS*4n_SwBo@w|(7^COFXsXhC%9DbQNdrV?VdeplA#~#L#$!sfc zHwbG2ZB;FCjVMV;EJ?LWE=mPb3`Pcq#<~WEx<*DJhGtfV=2oVbx(23J1_n=ES4z)+>ez|hdb!0-zw)bN6Vq11qZ;Z*_ygVhWM2JwP9y8>;15(WW2 zA+A6=;qu#aAAbT#2vR=uOk(HVJ70hAdGme!%Wu(_-b{M|(eHvL>4nJa0`PlBg3pY5l7qL^=$uSCgK^l}D7K^}jSS4p3>8f>=Y^vAP6CZqEpd$~Nl7e8wMs5Z1yT$~ z28PDE28OyuMj?h~R)*$Qrk1(}rd9?9Pc2e^qG-s?PsvQH#I0dU>RnJ6F?hQAxvX45bDP46hOx7_4S6Fo+k-*%fF5l<*7i z32_C|78Vx4!NGxnf&Tvf0RaI%K0dy_zFuBl%7>mw?7Zvl?(XL1cIWHwJ#W6dxVWr; z`7Qd=n@JBpJ32ac-20e&{hghiowc>KrKRQn|Npo2e>Ve~$XF8O7tG-B>_!@hljQC0 zBKan7YX^|SS>O>_%)r1c48n{Iv*t(u1yem;977~7hn~7A)gU0ymRKK>u~GEy|EX@= z&#Y%0-_yKNN`jYJwBTHIqlCNStb|$1gG3pEPT72pw$0Re{psG-uv>{eKMzK|wsGQ+ zm$58YI(Fml202YtuIsE^46Sq0WT#wVU%Tm^=TbKHV<)@2fEKEjxJHzuB$lLFB^RXv zDF!10Lt|Y7LtP`I5JNL7Lvt%rOI-s~D+7b47O6i`H00)|WTsW()-WaYE+|YHJYD@< J);T3K0RW!Umcal3 literal 0 HcmV?d00001 diff --git a/IronChests2/resources/mods/ironchest/textures/items/goldDiamondUpgrade.png b/IronChests2/resources/mods/ironchest/textures/items/goldDiamondUpgrade.png new file mode 100644 index 0000000000000000000000000000000000000000..028e2d8b9153d7ee8ec3965fec826059501ff760 GIT binary patch literal 480 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstUx|vage(c z!@6@aFM%9|WRD45bDP46hOx7_4S6Fo+k-*%fF5ln4*- z32_C|Drau&{Plm;&;K)j{GapVf6Mp(?ce|BeEpyQ_5aE)hB@^Npm7DsjJqJVC}oc2<;wrY>tw@v%C`+gms4F#Jm7NZ-+|&S|>J zL_9dB?b$W%Y%6a! z2x|guRV{IiC`m~yNwrEYN(E93Mh1q)x(0^2Mn)lqW>$vgR;HG^2Bua922U+gf1+r} b%}>cptHiBgO6pxu2s3!P`njxgN@xNArGu{V literal 0 HcmV?d00001 diff --git a/IronChests2/resources/mods/ironchest/textures/items/ironGoldUpgrade.png b/IronChests2/resources/mods/ironchest/textures/items/ironGoldUpgrade.png new file mode 100644 index 0000000000000000000000000000000000000000..65cf6aee66a145641921297812d2a9320f0400ec GIT binary patch literal 526 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstUx|vage(c z!@6@aFM%9|WRD45bDP46hOx7_4S6Fo+k-*%fF5l&B8y z32_C|M;9^t|KaiHv&)~)&fnkI{djBl{jL4?H};>NSbThH@#%^A$0rtVZX3M0V^B4F zUP1q)rzv|Gfhd1_1+}tm5W1qyv(-#-- zK6rVXz@=@1XV-F_S<8859oLEFEGL(lsUe{DK)Ap4~_Tagw~< zT{QM?*t!YG;VkfoEM{Qf76xHPhFNnYfPy8SE{-7*mqX9K7HU!uXiK!??G3rmSJ8K6 z*MI9APv?qygAZ@c9hkwb!xN~{@wi$4foIi|-41h%CO$pH+2G`5^>SU^)D`EhT7`?> z7Tx~)F@MzSU5>ZEO7n!+KFaLbzEFD4GRu~ye>oXnFXvk^sWKs0`pwPf;^n_N^E(=+ z07H~PwZt`|BqgyV)hf9t6-Y4{85kPt8W`#t8HE^{Ss9vJnOf=^m|7VaJhe#uiJ~Dl aKP5A*61Rpasdqu~!QkoY=d#Wzp$PzYfzD|F literal 0 HcmV?d00001 diff --git a/IronChests2/resources/mods/ironchest/textures/items/silverGoldUpgrade.png b/IronChests2/resources/mods/ironchest/textures/items/silverGoldUpgrade.png new file mode 100644 index 0000000000000000000000000000000000000000..d3cad2e203a47884b9dbe28867f40bace8dc5e03 GIT binary patch literal 526 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstUx|vage(c z!@6@aFM%9|WRD45bDP46hOx7_4S6Fo+k-*%fF5l&B8y z32_C|M;9^t|KaiHv&)~)&fnkI{djBl{jL4?H};>NSbThH@#%^A$0rtVZX3M0V=!sX z#P$hoPcLaay{NH$-}aU3SKdFNaPNfty%P#6)-UhtZkxSu){XrVH}^~2*e5Y{_LR>4 zj?3EwE^QM$yO!(BTFx`;xK1o*Ik}wW#4?uu|Nk%fIq5FYdd89R^j5e zMYsQc%pdi7m*efP(mWxyk1~6P6{Eo&c zzz}6nEpd$~Nl7e8wMs5Z1yT$~28PDE28OyuMj?h~R)*$Qrk1(}rd9?9Pc2e^qG-s? aPsvQH#I0dU>RnKLFnGH9xvX45bDP46hOx7_4S6Fo+k-*%fF5ln4*- z32_C|muo{lUOn;t!lAb(cf38d>(znPuMVz#zJ0;-9gD7?5502QgUh}G@7v_ z$S;_|;n|He5GTpo-9=^&iz7Rb!&%@FS;35t-o?B5kww4Mp8Z)4zf7DxCNU*FYTf^14`az>ww1RV zgf)S-s+PD$l%ynSgc&?t{an^LB{Ts5d~2@5 literal 0 HcmV?d00001 diff --git a/IronChests2/resources/mods/ironchest/textures/items/woodIronUpgrade.png b/IronChests2/resources/mods/ironchest/textures/items/woodIronUpgrade.png new file mode 100644 index 0000000000000000000000000000000000000000..5100b04ba2ee90334de5bc593f8b039f3395d538 GIT binary patch literal 480 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJOS+@4BLl<6e(pbstUx|vage(c z!@6@aFM%9|WRD45bDP46hOx7_4S6Fo+k-*%fF5ln4*- z32_C|Gw05H_Tt&Y#}9AayLIQ@oh#R_T)lqv^!d|gE}Xf3KJ?0Ik0Zy996oyZ*@KQ7 zmz#F&+jakDWnXvO#nZ)`w{AXtEc?j5q*d!yEm^i?@zTX}7tWotV9x*l|Ap?yHvx@i zED7=pW^j0RBMrn!@^*KTnZx494&-nactjR6FmMZlFeAgPITAp@EKe855Q)p7XI~37 z2#B}^#=mIl3i5jYf8Io)-|dNWjhiRPc*xF*a?sRe?I}K1=XiVTMjeJ#hiR*)1j!}hs2`FES`7qZhmCZFSTcXmcuU-XOBrtNsn6h|JcJ=GMR1V z?FL~@pslJUt`Q|Ei6yC4$wjF^iowXh&{)^NP}j&P#L&#j(A>(@QrE!L%D~{MMe0u! c4Y~O#nQ4`{HB3pp3kqQdPgg&ebxsLQ0BMb}>i_@% literal 0 HcmV?d00001