diff --git a/src/tconstruct/common/TContent.java b/src/tconstruct/common/TContent.java index 929414dd..9d9cae60 100644 --- a/src/tconstruct/common/TContent.java +++ b/src/tconstruct/common/TContent.java @@ -2423,17 +2423,17 @@ public class TContent implements IFuelHandler { 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()); + achievements.put("tconstruct.beginner", new Achievement(2741, "tconstruct.beginner", 0, 0, manualBook, null).setIndependent().registerAchievement()); + achievements.put("tconstruct.pattern", new Achievement(2742, "tconstruct.pattern", 2, 1, blankPattern, achievements.get("tconstruct.beginner")).registerAchievement()); + achievements.put("tconstruct.tinkerer", new Achievement(2743, "tconstruct.tinkerer", 2, 2, new ItemStack(titleIcon, 1, 4096), achievements.get("tconstruct.pattern")).registerAchievement()); achievements.put("tconstruct.preparedFight", - new Achievement(2004, "tconstruct.preparedFight", 1, 3, new ItemStack(titleIcon, 1, 4097), achievements.get("tconstruct.tinkerer")).registerAchievement()); - achievements.put("tconstruct.proTinkerer", new Achievement(2005, "tconstruct.proTinkerer", 4, 4, new ItemStack(titleIcon, 1, 4098), achievements.get("tconstruct.tinkerer")).setSpecial() + new Achievement(2744, "tconstruct.preparedFight", 1, 3, new ItemStack(titleIcon, 1, 4097), achievements.get("tconstruct.tinkerer")).registerAchievement()); + achievements.put("tconstruct.proTinkerer", new Achievement(2745, "tconstruct.proTinkerer", 4, 4, new ItemStack(titleIcon, 1, 4098), achievements.get("tconstruct.tinkerer")).setSpecial() .registerAchievement()); - achievements.put("tconstruct.smelteryMaker", new Achievement(2006, "tconstruct.smelteryMaker", -2, -1, smeltery, achievements.get("tconstruct.beginner")).registerAchievement()); + achievements.put("tconstruct.smelteryMaker", new Achievement(2746, "tconstruct.smelteryMaker", -2, -1, smeltery, achievements.get("tconstruct.beginner")).registerAchievement()); achievements.put("tconstruct.enemySlayer", - new Achievement(2007, "tconstruct.enemySlayer", 0, 5, new ItemStack(titleIcon, 1, 4099), achievements.get("tconstruct.preparedFight")).registerAchievement()); - achievements.put("tconstruct.dualConvenience", new Achievement(2008, "tconstruct.dualConvenience", 0, 7, new ItemStack(titleIcon, 1, 4100), achievements.get("tconstruct.enemySlayer")) + new Achievement(2747, "tconstruct.enemySlayer", 0, 5, new ItemStack(titleIcon, 1, 4099), achievements.get("tconstruct.preparedFight")).registerAchievement()); + achievements.put("tconstruct.dualConvenience", new Achievement(2748, "tconstruct.dualConvenience", 0, 7, new ItemStack(titleIcon, 1, 4100), achievements.get("tconstruct.enemySlayer")) .setSpecial().registerAchievement()); } } diff --git a/src/tconstruct/items/ArmorPattern.java b/src/tconstruct/items/ArmorPattern.java index 9ccaa385..a20ee08f 100644 --- a/src/tconstruct/items/ArmorPattern.java +++ b/src/tconstruct/items/ArmorPattern.java @@ -50,10 +50,10 @@ public class ArmorPattern extends CraftingItem implements ItemBlocklike public void getSubItems (int id, CreativeTabs tab, List list) { - for (int i = 0; i < patternName.length; i++) + /*for (int i = 0; i < patternName.length; i++) { list.add(new ItemStack(id, 1, i)); - } + }*/ } } \ No newline at end of file diff --git a/src/tconstruct/items/TitleIcon.java b/src/tconstruct/items/TitleIcon.java index af8dcb97..95b12dfd 100644 --- a/src/tconstruct/items/TitleIcon.java +++ b/src/tconstruct/items/TitleIcon.java @@ -18,6 +18,7 @@ import net.minecraft.world.World; import tconstruct.client.TProxyClient; import tconstruct.entity.BlueSlime; import tconstruct.library.tools.ToolCore; +import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -26,10 +27,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", "preparedFight", "proTinkerer", "enemySlayer", "dualConvenience"}; + + String[] achievementIconNames = new String[] { "tinkerer", "preparedFight", "proTinkerer", "enemySlayer", "dualConvenience" }; Icon[] achievementIcons = new Icon[achievementIconNames.length]; - + public TitleIcon(int par1) { super(par1); @@ -42,8 +43,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] : "")); + for (int i = 0; i < achievementIcons.length; i++) + { + achievementIcons[i] = iconRegister.registerIcon("tinker:achievementIcons/" + (i < achievementIconNames.length ? achievementIconNames[i] : "")); } } @@ -58,23 +60,26 @@ public class TitleIcon extends Item { if (par1 == 255) return itemIcon; - if (par1 >= 4096){ - return getIconFromDamage(par1); + 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; + if (par1 >= 4096) + { + int index = par1 - 4096; + if (index < achievementIcons.length) + { + return achievementIcons[index]; + } + } + //Not returning null to prevent crashes + return itemIcon; } @Override @@ -105,7 +110,7 @@ public class TitleIcon extends Item if (damage == 255) return 0xffffff; if (damage >= 4096) - return 0xffffff; + return 0xffffff; return pass == 0 ? primaryColor[damage] : secondaryColor[damage]; } @@ -186,7 +191,8 @@ public class TitleIcon extends Item if (!world.isRemote) { entity.setPosition(x, y, z); - entity.setAngles(player.cameraYaw, player.cameraYaw); + if (FMLCommonHandler.instance().getEffectiveSide() == Side.CLIENT) + entity.setAngles(player.cameraYaw, player.cameraYaw); ((EntityLiving) entity).onSpawnWithEgg((EntityLivingData) null); world.spawnEntityInWorld(entity); }