Merge pull request #36 from TPPI-Dev/Dev

Merge Dev into Master

Author: tterrag1098

mod.properties

@@ -1,5 +1,5 @@
 version.minecraft=1.6.X
-version.number=0.8.0
+version.number=0.8.1
 version.build=
 
 mod.id=TPPITweaks

src/tppitweaks/TPPITweaks.java

@@ -34,7 +34,7 @@
 @NetworkMod(serverSideRequired = true, clientSideRequired = true, channels = { Reference.CHANNEL }, packetHandler = PacketHandler.class)
 public class TPPITweaks {
 
-	public static final String VERSION = "0.8.0";
+	public static final String VERSION = "0.8.1";
 
 	@Instance("TPPITweaks")
 	public static TPPITweaks instance;

src/tppitweaks/client/gui/InstructionsGui.java

@@ -11,6 +11,7 @@
 import javax.swing.JFileChooser;
 import javax.swing.JFrame;
 import javax.swing.UIManager;
+import javax.swing.filechooser.FileFilter;
 
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.client.gui.GuiScreen;
@@ -28,7 +29,9 @@ public class InstructionsGui extends GuiScreen
 {
 
 	ModDownload mod;
-	boolean hasOpened = false;
+	int hasOpened = 0;
+	
+	private static File lastDir = FileUtils.getUserDirectory();
 
 	public InstructionsGui(ModDownload modDownload)
 	{
@@ -56,6 +59,8 @@ public void drawScreen(int par1, int par2, float par3)
 		this.drawCenteredString(this.fontRenderer, "Select the file from your computer and it will be added to the mods directory.", this.width / 2, this.height / 2 - 15, 0xFFFFFF);
 		this.drawCenteredString(this.fontRenderer, "3. Press the button below to continue.", this.width / 2, this.height / 2 + 55, 0xFFFFFF);
 
+		hasOpened = hasOpened <= 0 ? 0 : hasOpened - 1;
+		
 		super.drawScreen(par1, par2, par3);
 	}
 
@@ -77,7 +82,7 @@ public void actionPerformed(GuiButton button)
 			break;
 
 		case 12:
-			if (!hasOpened)
+			if (hasOpened == 0)
 			{
 				try
 				{
@@ -101,10 +106,26 @@ protected JDialog createDialog(Component parent) throws HeadlessException
 						return dialog;
 					}
 				};
-
-				fc.setCurrentDirectory(FileUtils.getUserDirectory());
+				
+				fc.setFileFilter(new FileFilter()
+				{	
+					@Override
+					public String getDescription()
+					{
+						return "*.jar, *.zip";
+					}
+					
+					@Override
+					public boolean accept(File arg0)
+					{
+						return (arg0.getName().endsWith(".zip") || arg0.getName().endsWith(".jar") || arg0.isDirectory());
+					}
+				});
+				
+				fc.setCurrentDirectory(lastDir);
 				fc.showOpenDialog(new JFrame());
 				File mod = fc.getSelectedFile();
+				lastDir = mod == null ? lastDir : mod.getParentFile();
 				try
 				{
 					if (mod != null)
@@ -114,12 +135,12 @@ protected JDialog createDialog(Component parent) throws HeadlessException
 				{
 					e.printStackTrace();
 				}
-				hasOpened = true;
+				hasOpened = 50;
 			}
 			break;
 
 		default:
-			hasOpened = false;
+			hasOpened = 0;
 			GuiHelper.updateGui.actionPerformed(button);
 		}
 

src/tppitweaks/client/gui/UpdateGui.java

@@ -5,8 +5,10 @@
 import java.util.List;
 import java.util.logging.Level;
 
+import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.client.gui.GuiScreen;
+import net.minecraft.util.ChatMessageComponent;
 
 import org.lwjgl.input.Keyboard;
 
@@ -45,7 +47,10 @@ public UpdateGui(GuiScreen parentScreen, boolean firstTime)
 		this.parentScreen = parentScreen;
 
 		initModInstallationMenus();
-
+		
+		if (modScreens.isEmpty())
+			Minecraft.getMinecraft().thePlayer.sendChatToPlayer(new ChatMessageComponent().addText("You have all optional mods installed!"));
+		
 		for (InstructionsGui g : modScreens)
 		{
 			if (!Loader.isModLoaded(g.mod.modid))

src/tppitweaks/item/TPPIBook.java

@@ -57,7 +57,7 @@ public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer pla
 		{
 			GuiHelper.doGuideGUI();
 		}
-		else if (stack.stackTagCompound == null || !stack.getTagCompound().getString("version").equals(TPPITweaks.VERSION))
+		else if (stack.stackTagCompound == null || !stack.getTagCompound().getString("version").equals(TPPITweaks.VERSION) || stack.getItemDamage() == 1)
 		{
 			if (FMLCommonHandler.instance().getEffectiveSide() == Side.CLIENT)
 			{

src/tppitweaks/lib/Reference.java

@@ -37,6 +37,6 @@ public class Reference
 			+ "after:Mekanism";
 
 
-	public static final String PACK_VERSION = "0.2.0";
+	public static final String PACK_VERSION = "0.2.1";
 
 }

src/tppitweaks/recipetweaks/RecipeTweaks.java

@@ -4,11 +4,13 @@
 import java.util.List;
 import java.util.ListIterator;
 
+import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.crafting.CraftingManager;
 import net.minecraft.item.crafting.FurnaceRecipes;
 import net.minecraft.item.crafting.IRecipe;
 import net.minecraftforge.oredict.OreDictionary;
+import net.minecraftforge.oredict.ShapelessOreRecipe;
 import tppitweaks.config.ConfigurationHandler;
 import tppitweaks.recipetweaks.modTweaks.AM2Tweaks;
 import tppitweaks.recipetweaks.modTweaks.BigReactorsTweaks;
@@ -26,6 +28,7 @@
 import tppitweaks.recipetweaks.modTweaks.SFMTweaks;
 import tppitweaks.recipetweaks.modTweaks.TweakerBase;
 import cpw.mods.fml.common.Loader;
+import cpw.mods.fml.common.registry.GameRegistry;
 
 public class RecipeTweaks
 {
@@ -199,7 +202,8 @@ private static void addRevisedRecipes()
 
 		if (okayToTweakMekanism && ConfigurationHandler.harderDisassemblerRecipe)
 			MekanismTweaks.addRecipes();
-
+		
+		GameRegistry.addRecipe(new ShapelessOreRecipe(Item.flintAndSteel, new Object[]{"nuggetSteel", Item.flint}));
 	}
 
 	/**

src/tppitweaks/recipetweaks/modTweaks/MekanismTweaks.java

@@ -25,13 +25,14 @@ public static void init()
 	public static void addRecipes()
 	{
 		GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(mekanism.common.Mekanism.AtomicDisassembler), new Object[]{
-			"DtD",
-			"DoD",
+			"AtA",
+			"ADA",
 			" o ",
 
 			'D', new ItemStack(ModItems.tppiMaterial, 1, 2),
 			't', mekanism.common.Mekanism.EnergyTablet,
-			'o', "ingotRefinedObsidian"
+			'o', "ingotRefinedObsidian",
+			'A', mekanism.common.Mekanism.AtomicCore
 		}));
 
 		GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(mekanism.common.Mekanism.AtomicCore), new Object[]{