From 54eb1d94054852cb8fb6f92f49c427460674ac39 Mon Sep 17 00:00:00 2001 From: bculkin2442 Date: Wed, 19 Feb 2014 10:04:09 -0500 Subject: [PATCH 1/2] Fixed Manuals All of the manuals now show up when clicked. --- src/main/java/tconstruct/items/Manual.java | 32 ++++++++++++++++------ 1 file changed, 23 insertions(+), 9 deletions(-) diff --git a/src/main/java/tconstruct/items/Manual.java b/src/main/java/tconstruct/items/Manual.java index ddee6711..dd7a71b6 100644 --- a/src/main/java/tconstruct/items/Manual.java +++ b/src/main/java/tconstruct/items/Manual.java @@ -2,6 +2,8 @@ package tconstruct.items; import java.util.List; +import mantle.books.BookData; +import mantle.client.gui.GuiManual; import mantle.items.abstracts.CraftingItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -9,7 +11,10 @@ import net.minecraft.util.StatCollector; import net.minecraft.world.World; import tconstruct.TConstruct; import tconstruct.achievements.TAchievements; +import tconstruct.client.TProxyClient; import tconstruct.library.TConstructRegistry; +import cpw.mods.fml.client.FMLClientHandler; +import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -30,17 +35,26 @@ public class Manual extends CraftingItem { player.addStat(TAchievements.achievements.get("tconstruct.beginner"), 1); player.openGui(TConstruct.instance, mantle.client.MProxyClient.manualGuiID, world, 0, 0, 0); - /* - * Side side = FMLCommonHandler.instance().getEffectiveSide(); if - * (side.isClient()) - * FMLClientHandler.instance().displayGuiScreen(player, new - * GuiManual(player.getCurrentEquippedItem(), - * getManualFromStack(stack))); - */ - return stack; + Side side = FMLCommonHandler.instance().getEffectiveSide(); + if (side.isClient()) + FMLClientHandler.instance().displayGuiScreen(player, new GuiManual(stack, getData(stack))); + return stack; } - @Override + private BookData getData(ItemStack stack) { + switch(stack.getItemDamage()) { + case 0: + return TProxyClient.manualData.beginner; + case 1: + return TProxyClient.manualData.toolStation; + case 2: + return TProxyClient.manualData.smeltery; + default: + return TProxyClient.manualData.diary; + } + } + + @Override @SideOnly(Side.CLIENT) public void addInformation (ItemStack stack, EntityPlayer player, List list, boolean par4) { From 4268f5afa01ce012d4101963d5d503e8ebc50803 Mon Sep 17 00:00:00 2001 From: bculkin2442 Date: Fri, 21 Feb 2014 07:29:34 -0500 Subject: [PATCH 2/2] Added some things to .gitignore Git ignore should now ignore minecraft related files --- .gitignore | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.gitignore b/.gitignore index 644aa019..475ae5f3 100644 --- a/.gitignore +++ b/.gitignore @@ -29,3 +29,9 @@ version.properties /.project /.settings/ /debug/ +*.lock +/.metadata/ +/config/ +/logs/ +options.txt +/saves/ \ No newline at end of file