diff --git a/resources/assets/tinker/lang/en_US.lang b/resources/assets/tinker/lang/en_US.lang index 3e69987b..2091649d 100644 --- a/resources/assets/tinker/lang/en_US.lang +++ b/resources/assets/tinker/lang/en_US.lang @@ -562,3 +562,12 @@ fluid.invar=Molten Invar fluid.electrum.molten=Molten Electrum fluid.ender=Liquid Ender fluid.slime.blue=Liquid Blueslime + +tconstruct.achievementPage.name=TConstruct +achievement.tconstruct.beginner=Learner Tinkerer +achievement.tconstruct.pattern=Stencil Worker +achievement.tconstruct.tinkerer=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 diff --git a/resources/assets/tinker/textures/items/achievementIcons/tinkerer.png b/resources/assets/tinker/textures/items/achievementIcons/tinkerer.png new file mode 100644 index 00000000..0a183251 Binary files /dev/null and b/resources/assets/tinker/textures/items/achievementIcons/tinkerer.png differ diff --git a/resources/assets/tinker/textures/items/pickaxe/manyullyn_pickaxe_head.png b/resources/assets/tinker/textures/items/pickaxe/manyullyn_pickaxe_head.png index 4d59731b..ecac0479 100644 Binary files a/resources/assets/tinker/textures/items/pickaxe/manyullyn_pickaxe_head.png and b/resources/assets/tinker/textures/items/pickaxe/manyullyn_pickaxe_head.png differ diff --git a/src/tconstruct/TConstruct.java b/src/tconstruct/TConstruct.java index 9ce5ddf1..65870319 100644 --- a/src/tconstruct/TConstruct.java +++ b/src/tconstruct/TConstruct.java @@ -1,5 +1,7 @@ package tconstruct; +import tconstruct.achievements.TAchievements; + import cpw.mods.fml.common.*; import cpw.mods.fml.common.Mod.EventHandler; import cpw.mods.fml.common.Mod.Instance; @@ -7,9 +9,7 @@ import cpw.mods.fml.common.event.*; import cpw.mods.fml.common.network.*; import cpw.mods.fml.common.registry.*; import cpw.mods.fml.relauncher.Side; - import java.util.logging.Logger; - import net.minecraft.crash.CallableMinecraftVersion; import net.minecraft.world.gen.structure.MapGenStructureIO; import net.minecraftforge.common.MinecraftForge; @@ -91,6 +91,7 @@ public class TConstruct events = new TEventHandler(); MinecraftForge.EVENT_BUS.register(events); + MinecraftForge.EVENT_BUS.register(new TEventHandlerAchievement()); content.oreRegistry(); proxy.registerRenderer(); @@ -149,6 +150,10 @@ public class TConstruct GameRegistry.registerWorldGenerator(new SlimeIslandGen(TContent.slimePool.blockID, 0)); PluginController.getController().init(); + + if(PHConstruct.achievementsEnabled){ + TAchievements.init(); + } } @EventHandler diff --git a/src/tconstruct/achievements/TAchievements.java b/src/tconstruct/achievements/TAchievements.java new file mode 100644 index 00000000..e3ff4276 --- /dev/null +++ b/src/tconstruct/achievements/TAchievements.java @@ -0,0 +1,28 @@ +package tconstruct.achievements; + +import java.util.HashMap; +import net.minecraft.stats.Achievement; +import net.minecraft.util.StatCollector; +import net.minecraftforge.common.AchievementPage; + +public class TAchievements { + + //Add achievements in here before the load executes(end of TC's init event) + public static HashMap achievements = new HashMap(); + + //Warning: Will be null until after the init stage + public static AchievementPage achievementPage = null; + + public static void init(){ + Achievement[] achs = new Achievement[achievements.values().size()]; + + for(int i = 0; i < achs.length; i++){ + achs[i] = (Achievement)achievements.values().toArray()[i]; + } + + achievementPage = new AchievementPage(StatCollector.translateToLocal("tconstruct.achievementPage.name"), achs); + + AchievementPage.registerAchievementPage(achievementPage); + } + +} diff --git a/src/tconstruct/common/TContent.java b/src/tconstruct/common/TContent.java index 2247c305..98f449e9 100644 --- a/src/tconstruct/common/TContent.java +++ b/src/tconstruct/common/TContent.java @@ -1,12 +1,13 @@ package tconstruct.common; +import net.minecraft.item.ItemStack; +import tconstruct.library.crafting.ToolBuilder; + import cpw.mods.fml.common.*; import cpw.mods.fml.common.event.FMLInterModComms; import cpw.mods.fml.common.registry.*; - import java.lang.reflect.Field; import java.util.*; - import net.minecraft.block.*; import net.minecraft.block.material.*; import net.minecraft.creativetab.CreativeTabs; @@ -14,12 +15,14 @@ import net.minecraft.item.*; import net.minecraft.item.crafting.*; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.potion.Potion; +import net.minecraft.stats.Achievement; import net.minecraft.util.WeightedRandomChestContent; import net.minecraftforge.common.*; import net.minecraftforge.fluids.*; import net.minecraftforge.fluids.FluidContainerRegistry.FluidContainerData; import net.minecraftforge.oredict.*; import tconstruct.TConstruct; +import tconstruct.achievements.TAchievements; import tconstruct.blocks.*; import tconstruct.blocks.logic.*; import tconstruct.blocks.slime.*; @@ -298,6 +301,9 @@ public class TContent implements IFuelHandler addCraftingRecipes(); setupToolTabs(); addLoot(); + if(PHConstruct.achievementsEnabled){ + addAchievements(); + } } public void createEntities () @@ -2394,4 +2400,12 @@ public class TContent implements IFuelHandler } } + + public void addAchievements(){ + HashMap achievements = TAchievements.achievements; + + 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()); + } } diff --git a/src/tconstruct/inventory/SlotTool.java b/src/tconstruct/inventory/SlotTool.java index b234eb32..d84c4cc0 100644 --- a/src/tconstruct/inventory/SlotTool.java +++ b/src/tconstruct/inventory/SlotTool.java @@ -1,14 +1,13 @@ package tconstruct.inventory; import java.util.Random; - -import tconstruct.library.tools.ToolCore; - import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; -import net.minecraft.inventory.Slot; +import net.minecraft.inventory.*; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraftforge.common.MinecraftForge; +import tconstruct.library.event.ToolCraftedEvent; +import tconstruct.library.tools.ToolCore; public class SlotTool extends Slot { @@ -65,6 +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)); } } } diff --git a/src/tconstruct/items/CraftingItem.java b/src/tconstruct/items/CraftingItem.java index 558800e7..52ca0ba8 100644 --- a/src/tconstruct/items/CraftingItem.java +++ b/src/tconstruct/items/CraftingItem.java @@ -1,5 +1,11 @@ package tconstruct.items; +import tconstruct.common.TContent; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.world.World; +import tconstruct.achievements.TAchievements; + import java.util.List; import tconstruct.library.TConstructRegistry; @@ -63,4 +69,13 @@ public class CraftingItem extends Item if (!(textureNames[i].equals(""))) list.add(new ItemStack(id, 1, i)); } + + + @Override + public void onCreated(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) + { + if(par1ItemStack.itemID == TContent.blankPattern.itemID){ + par3EntityPlayer.addStat(TAchievements.achievements.get("tconstruct.pattern"), 1); + } + } } diff --git a/src/tconstruct/items/Manual.java b/src/tconstruct/items/Manual.java index 8a492452..a9a2c630 100644 --- a/src/tconstruct/items/Manual.java +++ b/src/tconstruct/items/Manual.java @@ -1,5 +1,7 @@ package tconstruct.items; +import tconstruct.achievements.TAchievements; + import java.util.List; import tconstruct.TConstruct; @@ -24,6 +26,7 @@ public class Manual extends CraftingItem @Override public ItemStack onItemRightClick (ItemStack stack, World world, EntityPlayer player) { + player.addStat(TAchievements.achievements.get("tconstruct.beginner"), 1); player.openGui(TConstruct.instance, TConstruct.proxy.manualGuiID, world, 0, 0, 0); /*Side side = FMLCommonHandler.instance().getEffectiveSide(); if (side.isClient()) diff --git a/src/tconstruct/items/Pattern.java b/src/tconstruct/items/Pattern.java index e451b6ca..21bf795d 100644 --- a/src/tconstruct/items/Pattern.java +++ b/src/tconstruct/items/Pattern.java @@ -1,9 +1,7 @@ package tconstruct.items; import cpw.mods.fml.relauncher.*; - import java.util.List; - import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; diff --git a/src/tconstruct/items/TitleIcon.java b/src/tconstruct/items/TitleIcon.java index 585188f0..aa7fa811 100644 --- a/src/tconstruct/items/TitleIcon.java +++ b/src/tconstruct/items/TitleIcon.java @@ -26,7 +26,10 @@ public class TitleIcon extends Item int[] primaryColor = { 0x66BBE8, 0x66BBE8 }; int[] secondaryColor = { 0x1567BF, 0xFFEC6E }; String[] mobNames = { "TConstruct.EdibleSlime", "TConstruct.KingSlime" }; - + + String[] achievementIconNames = new String[] {"tinkerer"}; + Icon[] achievementIcons = new Icon[1]; + public TitleIcon(int par1) { super(par1); @@ -39,6 +42,9 @@ public class TitleIcon extends Item ToolCore.blankSprite = iconRegister.registerIcon("tinker:blanksprite"); TProxyClient.metalBall = iconRegister.registerIcon("tinker:metalball"); itemIcon = iconRegister.registerIcon("tinker:tparts"); + for(int i = 0; i < achievementIcons.length; i++){ + achievementIcons[i] = iconRegister.registerIcon("tinker:achievementIcons/" + (i < achievementIconNames.length ? achievementIconNames[i] : "")); + } } @SideOnly(Side.CLIENT) @@ -52,8 +58,24 @@ public class TitleIcon extends Item { if (par1 == 255) return itemIcon; + if (par1 >= 4096){ + return getIconFromDamage(par1); + } return Item.monsterPlacer.getIconFromDamageForRenderPass(par1, par2); } + + @SideOnly(Side.CLIENT) + public Icon getIconFromDamage (int par1) + { + if(par1 >= 4096){ + int index = par1 - 4096; + if(index < achievementIcons.length){ + return achievementIcons[index]; + } + } + //Not returning null to prevent crashes + return itemIcon; + } @Override public String getItemDisplayName (ItemStack par1ItemStack) @@ -82,6 +104,8 @@ public class TitleIcon extends Item int damage = stack.getItemDamage(); if (damage == 255) return 0xffffff; + if (damage >= 4096) + return 0xffffff; return pass == 0 ? primaryColor[damage] : secondaryColor[damage]; } diff --git a/src/tconstruct/library/event/ToolCraftedEvent.java b/src/tconstruct/library/event/ToolCraftedEvent.java new file mode 100644 index 00000000..463409fb --- /dev/null +++ b/src/tconstruct/library/event/ToolCraftedEvent.java @@ -0,0 +1,17 @@ +package tconstruct.library.event; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraftforge.event.Event; + +public class ToolCraftedEvent extends Event { + + public EntityPlayer player; + public ItemStack tool; + + public ToolCraftedEvent(EntityPlayer player, ItemStack tool){ + this.player = player; + this.tool = tool; + } + +} diff --git a/src/tconstruct/util/TCraftingHandler.java b/src/tconstruct/util/TCraftingHandler.java index 5c46ebb8..34b1a116 100644 --- a/src/tconstruct/util/TCraftingHandler.java +++ b/src/tconstruct/util/TCraftingHandler.java @@ -1,5 +1,7 @@ package tconstruct.util; +import tconstruct.achievements.TAchievements; + import tconstruct.TConstruct; import tconstruct.common.TContent; import tconstruct.library.tools.AbilityHelper; @@ -16,9 +18,9 @@ public class TCraftingHandler implements ICraftingHandler @Override public void onCrafting (EntityPlayer player, ItemStack item, IInventory craftMatrix) { + int itemID = item.getItem().itemID; if (!player.worldObj.isRemote) { - int itemID = item.getItem().itemID; if (itemID == TContent.toolStationWood.blockID) { TPlayerStats stats = TConstruct.playerTracker.getPlayerStats(player.username); diff --git a/src/tconstruct/util/TEventHandlerAchievement.java b/src/tconstruct/util/TEventHandlerAchievement.java new file mode 100644 index 00000000..41f9c2a2 --- /dev/null +++ b/src/tconstruct/util/TEventHandlerAchievement.java @@ -0,0 +1,19 @@ +package tconstruct.util; + +import tconstruct.achievements.TAchievements; + +import net.minecraftforge.common.FakePlayer; + +import net.minecraftforge.event.ForgeSubscribe; +import tconstruct.library.event.ToolCraftedEvent; + +public class TEventHandlerAchievement { + + @ForgeSubscribe + public void onToolCrafted(ToolCraftedEvent event){ + if(event.player != null && !(event.player instanceof FakePlayer)){ + event.player.addStat(TAchievements.achievements.get("tconstruct.tinkerer"), 1); + } + } + +} diff --git a/src/tconstruct/util/config/PHConstruct.java b/src/tconstruct/util/config/PHConstruct.java index 34b69993..8ef95b29 100644 --- a/src/tconstruct/util/config/PHConstruct.java +++ b/src/tconstruct/util/config/PHConstruct.java @@ -375,6 +375,9 @@ public class PHConstruct isCleaverTwoHanded = config.get("Battlegear", "Can Cleavers have shields", true).getBoolean(true); isHatchetWeapon = config.get("Battlegear", "Are Hatches also weapons", true).getBoolean(true); + //Achievement Properties + achievementsEnabled = config.get("Achievement Properties", "AchievementsEnabled", true).getBoolean(true); + /* Save the configuration file */ config.save(); @@ -714,4 +717,7 @@ public class PHConstruct //Addon stuff public static boolean isCleaverTwoHanded; public static boolean isHatchetWeapon; + + //Achievement options + public static boolean achievementsEnabled; }