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 00000000..30dc0366 Binary files /dev/null and b/resources/assets/tinker/textures/items/achievementIcons/proTinkerer.png differ diff --git a/resources/assets/tinker/textures/items/achievementIcons/tinkerer.png b/resources/assets/tinker/textures/items/achievementIcons/tinkerer.png index 0a183251..6e762572 100644 Binary files a/resources/assets/tinker/textures/items/achievementIcons/tinkerer.png and b/resources/assets/tinker/textures/items/achievementIcons/tinkerer.png differ 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); + } } }