From e6cfcfb70a55a8606320f0f99b715b7d295c44c7 Mon Sep 17 00:00:00 2001 From: Arthur Uzulin Date: Sun, 17 Nov 2013 21:21:45 +1100 Subject: [PATCH] More stuff on achievements - Added an IInventory argument to ToolCraftedEvent - Made Tool Forge also post the ToolCraftedEvent - Added the Pro Tinkerer achievement as an advanced form of the Tinkerer achievement --- resources/assets/tinker/lang/en_US.lang | 4 +++- .../items/achievementIcons/proTinkerer.png | Bin 0 -> 340 bytes .../items/achievementIcons/tinkerer.png | Bin 326 -> 274 bytes src/tconstruct/common/TContent.java | 1 + src/tconstruct/inventory/SlotTool.java | 2 +- src/tconstruct/inventory/SlotToolForge.java | 4 ++++ src/tconstruct/items/TitleIcon.java | 4 ++-- .../library/event/ToolCraftedEvent.java | 5 ++++- .../util/TEventHandlerAchievement.java | 10 +++++++--- 9 files changed, 22 insertions(+), 8 deletions(-) create mode 100644 resources/assets/tinker/textures/items/achievementIcons/proTinkerer.png diff --git a/resources/assets/tinker/lang/en_US.lang b/resources/assets/tinker/lang/en_US.lang index 2091649d..7a71ef61 100644 --- a/resources/assets/tinker/lang/en_US.lang +++ b/resources/assets/tinker/lang/en_US.lang @@ -564,10 +564,12 @@ fluid.ender=Liquid Ender fluid.slime.blue=Liquid Blueslime tconstruct.achievementPage.name=TConstruct -achievement.tconstruct.beginner=Learner Tinkerer +achievement.tconstruct.beginner=Learning to Tinker achievement.tconstruct.pattern=Stencil Worker achievement.tconstruct.tinkerer=Tinkerer +achievement.tconstruct.proTinkerer=Pro Tinkerer achievement.tconstruct.beginner.desc=Open the "Materials and You" manual achievement.tconstruct.pattern.desc=Craft your first blank pattern achievement.tconstruct.tinkerer.desc=Create your first tool +achievement.tconstruct.proTinkerer.desc=Craft your first tier 2 tool diff --git a/resources/assets/tinker/textures/items/achievementIcons/proTinkerer.png b/resources/assets/tinker/textures/items/achievementIcons/proTinkerer.png new file mode 100644 index 0000000000000000000000000000000000000000..30dc036665097898e35f2c8db22590a523fac96b GIT binary patch literal 340 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYmNj^kiEpy*OmP)w;&gjdittwtw5oNo-U3d7N?UF76=$D;{I@R_Fs2# zVT&IPjX>~F@UXU96Walvz*ys{4^Mym%yU2gPU?pI)MSCnR}vx$*SCUIyP|5J%0|BipU{*S+8-Ov3+|6cyTlr-yq=O_71;A3(@W640cbD$8f76o%e*15E_8$n!3k!ep7klc|>lU&d$Z5-LtMp#C`j7p# z8;7!uiw>;HpVfMwA;(NvI_b|ZlRV}PH+#+stYLewd1gYF>any*Og$Pgg&ebxsLQ0HX4fRsaA1 literal 0 HcmV?d00001 diff --git a/resources/assets/tinker/textures/items/achievementIcons/tinkerer.png b/resources/assets/tinker/textures/items/achievementIcons/tinkerer.png index 0a183251e43c83fd53c3bd6462e0b80efe4faa51..6e762572aa77caf929d570d7010f190bf6edba26 100644 GIT binary patch delta 198 zcmV;%06G800+IrdRDTKqDl#_N`v3p{pGibPR5;7ElCcfLAP_}ylr95Mc^haVmki+r zP)5j1mT0cd0=Laeg%w)_Od_9j1t8=5f$!5~y!RVB z*4lpM{dKAqK0Vj2)1`dqv$d3e@_atH8Oqu92Bu1soBuHHG5`Po07*qoM6N<$g4TXl ANdN!< delta 250 zcmV%Q6RDTFG8^T@B82|tP(@8`@R5;6HV4x5%ViS~O5c`i!{1L+|MxqRW z8B&t9mf_*KM+~p7-(V2a)L>X~uZ4kufq~)atLuye4M2B^J%2jG7nA=C5i$M@MdfjD zLl}wms~m&ae@l-7hF`zGF`T-*7R40=L3wHE|APk){+DAA`*R=5U;DqSxi%dbeoaGVp7&&{9b_h8C^57 zAvg`dWiwHUjgZY``I+{b85kHCTwGkp*Gwq@018ZgG3weA0000007*qoM6N<$f*ECT A%K!iX diff --git a/src/tconstruct/common/TContent.java b/src/tconstruct/common/TContent.java index 9f834a54..311bf597 100644 --- a/src/tconstruct/common/TContent.java +++ b/src/tconstruct/common/TContent.java @@ -2412,5 +2412,6 @@ public class TContent implements IFuelHandler achievements.put("tconstruct.beginner", new Achievement(2001, "tconstruct.beginner", 0, 0, manualBook, null).setIndependent().registerAchievement()); achievements.put("tconstruct.pattern", new Achievement(2002, "tconstruct.pattern", 2, 1, blankPattern, achievements.get("tconstruct.beginner")).registerAchievement()); achievements.put("tconstruct.tinkerer", new Achievement(2003, "tconstruct.tinkerer", 2, 2, new ItemStack(titleIcon, 1, 4096), achievements.get("tconstruct.pattern")).registerAchievement()); + achievements.put("tconstruct.proTinkerer", new Achievement(2004, "tconstruct.proTinkerer", 4, 3, new ItemStack(titleIcon, 1, 4097), achievements.get("tconstruct.tinkerer")).setSpecial().registerAchievement()); } } diff --git a/src/tconstruct/inventory/SlotTool.java b/src/tconstruct/inventory/SlotTool.java index d84c4cc0..e2b38e76 100644 --- a/src/tconstruct/inventory/SlotTool.java +++ b/src/tconstruct/inventory/SlotTool.java @@ -64,7 +64,7 @@ public class SlotTool extends Slot if (!player.worldObj.isRemote && full) player.worldObj.playSoundEffect(player.posX, player.posY, player.posZ, "tinker:little_saw", 1.0F, (random.nextFloat() - random.nextFloat()) * 0.2F + 1.0F); //player.worldObj.playAuxSFX(1021, (int)player.posX, (int)player.posY, (int)player.posZ, 0); - MinecraftForge.EVENT_BUS.post(new ToolCraftedEvent(player, stack)); + MinecraftForge.EVENT_BUS.post(new ToolCraftedEvent(this.inventory, player, stack)); } } } diff --git a/src/tconstruct/inventory/SlotToolForge.java b/src/tconstruct/inventory/SlotToolForge.java index d5c2d9bb..299b5c59 100644 --- a/src/tconstruct/inventory/SlotToolForge.java +++ b/src/tconstruct/inventory/SlotToolForge.java @@ -1,5 +1,8 @@ package tconstruct.inventory; +import net.minecraftforge.common.MinecraftForge; +import tconstruct.library.event.ToolCraftedEvent; + import java.util.Random; import tconstruct.library.tools.ToolCore; @@ -32,6 +35,7 @@ public class SlotToolForge extends SlotTool inventory.decrStackSize(1, amount); if (!player.worldObj.isRemote && full) player.worldObj.playAuxSFX(1021, (int) player.posX, (int) player.posY, (int) player.posZ, 0); + MinecraftForge.EVENT_BUS.post(new ToolCraftedEvent(this.inventory, player, stack)); } } } diff --git a/src/tconstruct/items/TitleIcon.java b/src/tconstruct/items/TitleIcon.java index aa7fa811..3962470b 100644 --- a/src/tconstruct/items/TitleIcon.java +++ b/src/tconstruct/items/TitleIcon.java @@ -27,8 +27,8 @@ public class TitleIcon extends Item int[] secondaryColor = { 0x1567BF, 0xFFEC6E }; String[] mobNames = { "TConstruct.EdibleSlime", "TConstruct.KingSlime" }; - String[] achievementIconNames = new String[] {"tinkerer"}; - Icon[] achievementIcons = new Icon[1]; + String[] achievementIconNames = new String[] {"tinkerer", "proTinkerer"}; + Icon[] achievementIcons = new Icon[achievementIconNames.length]; public TitleIcon(int par1) { diff --git a/src/tconstruct/library/event/ToolCraftedEvent.java b/src/tconstruct/library/event/ToolCraftedEvent.java index 463409fb..b34f4811 100644 --- a/src/tconstruct/library/event/ToolCraftedEvent.java +++ b/src/tconstruct/library/event/ToolCraftedEvent.java @@ -1,15 +1,18 @@ package tconstruct.library.event; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraftforge.event.Event; public class ToolCraftedEvent extends Event { + public IInventory inventory; public EntityPlayer player; public ItemStack tool; - public ToolCraftedEvent(EntityPlayer player, ItemStack tool){ + public ToolCraftedEvent(IInventory inventory, EntityPlayer player, ItemStack tool){ + this.inventory = inventory; this.player = player; this.tool = tool; } diff --git a/src/tconstruct/util/TEventHandlerAchievement.java b/src/tconstruct/util/TEventHandlerAchievement.java index 41f9c2a2..4deacfd9 100644 --- a/src/tconstruct/util/TEventHandlerAchievement.java +++ b/src/tconstruct/util/TEventHandlerAchievement.java @@ -1,11 +1,11 @@ package tconstruct.util; -import tconstruct.achievements.TAchievements; - import net.minecraftforge.common.FakePlayer; - import net.minecraftforge.event.ForgeSubscribe; +import tconstruct.achievements.TAchievements; +import tconstruct.blocks.logic.ToolForgeLogic; import tconstruct.library.event.ToolCraftedEvent; +import tconstruct.library.tools.ToolCore; public class TEventHandlerAchievement { @@ -13,6 +13,10 @@ public class TEventHandlerAchievement { public void onToolCrafted(ToolCraftedEvent event){ if(event.player != null && !(event.player instanceof FakePlayer)){ event.player.addStat(TAchievements.achievements.get("tconstruct.tinkerer"), 1); + + if(event.inventory != null && event.inventory instanceof ToolForgeLogic && event.tool.getItem() instanceof ToolCore && ((ToolCore)event.tool.getItem()).durabilityTypeExtra() != 0){ + event.player.addStat(TAchievements.achievements.get("tconstruct.proTinkerer"), 1); + } } }