From 731f8699f2df6fd41f6d503dba18e5c8baa58dae Mon Sep 17 00:00:00 2001 From: Justin Aquadro Date: Thu, 16 Apr 2015 23:54:42 -0400 Subject: [PATCH] Convert lock upgrade to reusable drawer key. --- .../assets/storagedrawers/lang/en_US.lang | 4 ++-- .../textures/items/drawer_key.png | Bin 0 -> 368 bytes .../storagedrawers/block/BlockDrawers.java | 19 ++---------------- .../storagedrawers/core/ModRecipes.java | 4 ++-- .../storagedrawers/item/ItemUpgradeLock.java | 19 +++++++++++++++++- 5 files changed, 24 insertions(+), 22 deletions(-) create mode 100644 resources/assets/storagedrawers/textures/items/drawer_key.png diff --git a/resources/assets/storagedrawers/lang/en_US.lang b/resources/assets/storagedrawers/lang/en_US.lang index fec79d7..823f4ee 100644 --- a/resources/assets/storagedrawers/lang/en_US.lang +++ b/resources/assets/storagedrawers/lang/en_US.lang @@ -11,8 +11,8 @@ item.upgradeStatus.level1.name=Status Upgrade (I) item.upgradeStatus.level1.description=Shows full storage item.upgradeStatus.level2.name=Status Upgrade (II) item.upgradeStatus.level2.description=Shows fill level -item.upgradeLock.name=Lock Upgrade -item.upgradeLock.description=Keep associated items when empty +item.upgradeLock.name=Drawer Key +item.upgradeLock.description=Locks and unlocks drawers # Blocks tile.fullDrawers1.oak.name=Oak Drawer diff --git a/resources/assets/storagedrawers/textures/items/drawer_key.png b/resources/assets/storagedrawers/textures/items/drawer_key.png new file mode 100644 index 0000000000000000000000000000000000000000..115fddd889f63632047da4be45b928532096032c GIT binary patch literal 368 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Iwh_VCC){ui6xo&c?uz!xv2~x z8Knw_W(tl4MG8g+hNcRJmR6<)R))q3x(22O20r?-3xWFBOFVsD+3&Lmh+B*6=xXr; zg*Xd5B8wRqxP?HN@zUM8KR`j2bVpxD28NCO+s#0)?;hu0b2ssAbOY|LShc$tSc zk!`|Rg=pQ98wFLxz!Q+3@h7EtYmpRttg|)R!-u}-lNrFL$#ZxKU z$&6+Cf6g{Wjt7@}1i1rT|2r<^=jN`N)#=Bc!q{apnTa8B>m-%gJSUC;y~N<@>gTe~ HDWM4fE)Rb} literal 0 HcmV?d00001 diff --git a/src/com/jaquadro/minecraft/storagedrawers/block/BlockDrawers.java b/src/com/jaquadro/minecraft/storagedrawers/block/BlockDrawers.java index 4f01e70..23310be 100644 --- a/src/com/jaquadro/minecraft/storagedrawers/block/BlockDrawers.java +++ b/src/com/jaquadro/minecraft/storagedrawers/block/BlockDrawers.java @@ -222,25 +222,10 @@ public class BlockDrawers extends BlockContainer implements IExtendedBlockClickH return true; } - else if (item.getItem() == ModItems.upgradeLock && !tileDrawers.isLocked()) { - tileDrawers.setIsLocked(true); + else if (item.getItem() == ModItems.upgradeLock) { + tileDrawers.setIsLocked(!tileDrawers.isLocked()); world.markBlockForUpdate(x, y, z); - if (player != null && !player.capabilities.isCreativeMode) { - if (--item.stackSize <= 0) - player.inventory.setInventorySlotContents(player.inventory.currentItem, null); - } - - return true; - } - } - else if (item == null && player.isSneaking()) { - if (tileDrawers.isLocked()) { - tileDrawers.setIsLocked(false); - if (player != null && !player.capabilities.isCreativeMode) - dropBlockAsItem(world, x, y, z, new ItemStack(ModItems.upgradeLock)); - - world.markBlockForUpdate(x, y, z); return true; } } diff --git a/src/com/jaquadro/minecraft/storagedrawers/core/ModRecipes.java b/src/com/jaquadro/minecraft/storagedrawers/core/ModRecipes.java index 64e0859..d64694e 100644 --- a/src/com/jaquadro/minecraft/storagedrawers/core/ModRecipes.java +++ b/src/com/jaquadro/minecraft/storagedrawers/core/ModRecipes.java @@ -78,8 +78,8 @@ public class ModRecipes } if (config.cache.enableLockUpgrades) { - GameRegistry.addRecipe(new ItemStack(ModItems.upgradeLock), " y ", "xzx", "yxy", - 'x', Items.stick, 'y', Items.gold_nugget, 'z', ModItems.upgradeTemplate); + GameRegistry.addRecipe(new ItemStack(ModItems.upgradeLock), "xy ", " y ", " z ", + 'x', Items.gold_nugget, 'y', Items.gold_ingot, 'z', ModItems.upgradeTemplate); } } } diff --git a/src/com/jaquadro/minecraft/storagedrawers/item/ItemUpgradeLock.java b/src/com/jaquadro/minecraft/storagedrawers/item/ItemUpgradeLock.java index d0bd81b..0f86b26 100644 --- a/src/com/jaquadro/minecraft/storagedrawers/item/ItemUpgradeLock.java +++ b/src/com/jaquadro/minecraft/storagedrawers/item/ItemUpgradeLock.java @@ -1,9 +1,13 @@ package com.jaquadro.minecraft.storagedrawers.item; +import com.google.common.collect.Multimap; import com.jaquadro.minecraft.storagedrawers.StorageDrawers; import com.jaquadro.minecraft.storagedrawers.core.ModCreativeTabs; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.SharedMonsterAttributes; +import net.minecraft.entity.ai.attributes.AttributeModifier; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -16,7 +20,7 @@ public class ItemUpgradeLock extends Item public ItemUpgradeLock (String name) { setUnlocalizedName(name); setCreativeTab(ModCreativeTabs.tabStorageDrawers); - setTextureName(StorageDrawers.MOD_ID + ":upgrade_lock"); + setTextureName(StorageDrawers.MOD_ID + ":drawer_key"); setMaxDamage(0); } @@ -26,4 +30,17 @@ public class ItemUpgradeLock extends Item String name = getUnlocalizedName(itemStack); list.add(StatCollector.translateToLocalFormatted(name + ".description")); } + + @SideOnly(Side.CLIENT) + public boolean isFull3D() + { + return true; + } + + @Override + public Multimap getAttributeModifiers (ItemStack item) { + Multimap multimap = super.getAttributeModifiers(item); + multimap.put(SharedMonsterAttributes.attackDamage.getAttributeUnlocalizedName(), new AttributeModifier(field_111210_e, "Weapon modifier", (double)1, 0)); + return multimap; + } }