-
Notifications
You must be signed in to change notification settings - Fork 17
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #47 from TPPI-Dev/Dev
Merge Dev into Master
- Loading branch information
Showing
21 changed files
with
743 additions
and
493 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| version.minecraft=1.6.X | ||
| version.number=0.8.1 | ||
| version.number=0.8.3 | ||
| version.build= | ||
|
|
||
| mod.id=TPPITweaks | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,162 +1,157 @@ | ||
| package tppitweaks.client.gui; | ||
|
|
||
| import java.util.ArrayList; | ||
| import java.util.Iterator; | ||
| 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; | ||
|
|
||
| import tppitweaks.TPPITweaks; | ||
| import cpw.mods.fml.common.Loader; | ||
| import cpw.mods.fml.relauncher.Side; | ||
| import cpw.mods.fml.relauncher.SideOnly; | ||
|
|
||
| @SideOnly(Side.CLIENT) | ||
| public class UpdateGui extends GuiScreen | ||
| { | ||
| protected GuiScreen parentScreen; | ||
| private boolean noShow = true, firstTime; | ||
|
|
||
| List<InstructionsGui> modScreens = new ArrayList<InstructionsGui>(); | ||
| Iterator<InstructionsGui> iterator; | ||
| ConfigGui configGui = null; | ||
|
|
||
| public void initModInstallationMenus() | ||
| { | ||
|
|
||
| if (!Loader.isModLoaded("Thaumcraft")) | ||
| modScreens.add(new InstructionsGui(new ModDownload("Thaumcraft 4", "http://adf.ly/1311628/thaumcraft-4", "Thaumcraft"))); | ||
|
|
||
| if (!Loader.isModLoaded("TwilightForest")) | ||
| modScreens.add(new InstructionsGui(new ModDownload("Twilight Forest", "http://adf.ly/Zvi5J", "TwilightForest"))); | ||
|
|
||
| iterator = modScreens.iterator(); | ||
|
|
||
| configGui = new ConfigGui(); | ||
|
|
||
| } | ||
|
|
||
| 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)) | ||
| noShow = false; | ||
| } | ||
|
|
||
| this.firstTime = firstTime; | ||
| } | ||
|
|
||
| @SuppressWarnings("unchecked") | ||
| @Override | ||
| public void initGui() | ||
| { | ||
| if (noShow) | ||
| { | ||
| System.out.println("not opening GUI"); | ||
| this.mc.displayGuiScreen(this.parentScreen); | ||
| return; | ||
| } | ||
| else | ||
| { | ||
|
|
||
| } | ||
|
|
||
| // Unsure exactly what this does but...it seems necessary | ||
| Keyboard.enableRepeatEvents(true); | ||
|
|
||
| this.buttonList.clear(); | ||
|
|
||
| this.buttonList.add(new GuiButton(-1, this.width / 2 - 150, this.height / 2 + 30, 300, 20, "Continue")); | ||
| this.buttonList.add(new GuiButton(11, this.width / 2 - 150, this.height / 2 + 65, 300, 20, "Skip the downloads completely")); | ||
| } | ||
|
|
||
| @Override | ||
| public void onGuiClosed() | ||
| { | ||
| Keyboard.enableRepeatEvents(false); | ||
| } | ||
|
|
||
| @Override | ||
| protected void actionPerformed(GuiButton button) | ||
| { | ||
| if (button.enabled) | ||
| { | ||
| if (button.id == 11) | ||
| this.mc.displayGuiScreen(this.parentScreen); | ||
| else | ||
| { | ||
| try | ||
| { | ||
| if (GuiHelper.updateGui.iterator.hasNext()) | ||
| { | ||
| this.mc.displayGuiScreen(GuiHelper.updateGui.iterator.next()); | ||
| } | ||
| /* | ||
| else if (configGui != null) | ||
| { | ||
| File file=new File("config/TPPI/config/hardconfig.zip"); | ||
| if (file.exists()) this.mc.displayGuiScreen(configGui); | ||
| configGui = null; | ||
| } | ||
| */ | ||
| else if (GuiHelper.updateGui.modScreens.size() > 0) | ||
| { | ||
| this.mc.displayGuiScreen(new RestartGui()); | ||
| } | ||
| else | ||
| { | ||
| this.mc.displayGuiScreen(this.parentScreen); | ||
| } | ||
| } | ||
| catch (Exception e) | ||
| { | ||
| TPPITweaks.logger.log(Level.SEVERE, "Error opening webpage, please contact TPPI Team."); | ||
| e.printStackTrace(); | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public void drawScreen(int par1, int par2, float par3) | ||
| { | ||
| drawScreen(par1, par2, par3, true); | ||
| } | ||
|
|
||
| public void drawScreen(int par1, int par2, float par3, boolean draw) | ||
| { | ||
| if (draw) | ||
| { | ||
| this.drawDefaultBackground(); | ||
|
|
||
| if (firstTime) | ||
| { | ||
| this.drawCenteredString(this.fontRenderer, "Hey there! This seems like the first time you are starting TPPI. Welcome!", this.width / 2, this.height / 2 - 100, 0xFFFFFF); | ||
| this.drawCenteredString(this.fontRenderer, "This menu will not show again unless enabled in the TPPI Tweaks config.", this.width / 2, this.height / 2 - 10, 0xFFFFFF); | ||
| this.drawCenteredString(this.fontRenderer, "Alternatively, you may use the command \"/tppi download\" to show it in-game.", this.width / 2, this.height / 2, 0xFFFFFF); | ||
| } | ||
|
|
||
| this.drawCenteredString(this.fontRenderer, "As it turns out, there are some mods we really wanted to include,", this.width / 2, this.height / 2 - 80, 0xFFFFFF); | ||
| this.drawCenteredString(this.fontRenderer, "but couldn't ship directly with the rest of the pack.", this.width / 2, this.height / 2 - 70, 0xFFFFFF); | ||
| this.drawCenteredString(this.fontRenderer, "Though we had to leave them out, we built this little utility to", this.width / 2, this.height / 2 - 50, 0xFFFFFF); | ||
| this.drawCenteredString(this.fontRenderer, "help you all add them manually, to gain what we feel is the full TPPI experience.", this.width / 2, this.height / 2 - 40, 0xFFFFFF); | ||
|
|
||
| } | ||
|
|
||
| super.drawScreen(par1, par2, par3); | ||
| } | ||
| } | ||
| package tppitweaks.client.gui; | ||
|
|
||
| import java.util.ArrayList; | ||
| import java.util.Iterator; | ||
| 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; | ||
|
|
||
| import tppitweaks.TPPITweaks; | ||
| import cpw.mods.fml.common.Loader; | ||
| import cpw.mods.fml.relauncher.Side; | ||
| import cpw.mods.fml.relauncher.SideOnly; | ||
|
|
||
| @SideOnly(Side.CLIENT) | ||
| public class UpdateGui extends GuiScreen | ||
| { | ||
| protected GuiScreen parentScreen; | ||
| private boolean noShow = true, firstTime; | ||
|
|
||
| List<InstructionsGui> modScreens = new ArrayList<InstructionsGui>(); | ||
| Iterator<InstructionsGui> iterator; | ||
| ConfigGui configGui = null; | ||
|
|
||
| public void initModInstallationMenus() | ||
| { | ||
| if (!Loader.isModLoaded("TwilightForest")) | ||
| modScreens.add(new InstructionsGui(new ModDownload("Twilight Forest", "http://adf.ly/Zvi5J", "TwilightForest"))); | ||
|
|
||
| iterator = modScreens.iterator(); | ||
|
|
||
| configGui = new ConfigGui(); | ||
| } | ||
|
|
||
| public UpdateGui(GuiScreen parentScreen, boolean firstTime) | ||
| { | ||
| this.parentScreen = parentScreen; | ||
|
|
||
| initModInstallationMenus(); | ||
|
|
||
| if (modScreens.isEmpty() && !firstTime) | ||
| Minecraft.getMinecraft().thePlayer.sendChatToPlayer(new ChatMessageComponent().addText("You have all optional mods installed!")); | ||
|
|
||
| for (InstructionsGui g : modScreens) | ||
| { | ||
| if (!Loader.isModLoaded(g.mod.modid)) | ||
| noShow = false; | ||
| } | ||
|
|
||
| this.firstTime = firstTime; | ||
| } | ||
|
|
||
| @SuppressWarnings("unchecked") | ||
| @Override | ||
| public void initGui() | ||
| { | ||
| if (noShow) | ||
| { | ||
| System.out.println("not opening GUI"); | ||
| this.mc.displayGuiScreen(this.parentScreen); | ||
| return; | ||
| } | ||
| else | ||
| { | ||
|
|
||
| } | ||
|
|
||
| // Unsure exactly what this does but...it seems necessary | ||
| Keyboard.enableRepeatEvents(true); | ||
|
|
||
| this.buttonList.clear(); | ||
|
|
||
| this.buttonList.add(new GuiButton(-1, this.width / 2 - 150, this.height / 2 + 30, 300, 20, "Continue")); | ||
| this.buttonList.add(new GuiButton(11, this.width / 2 - 150, this.height / 2 + 65, 300, 20, "Skip the downloads completely")); | ||
| } | ||
|
|
||
| @Override | ||
| public void onGuiClosed() | ||
| { | ||
| Keyboard.enableRepeatEvents(false); | ||
| } | ||
|
|
||
| @Override | ||
| protected void actionPerformed(GuiButton button) | ||
| { | ||
| if (button.enabled) | ||
| { | ||
| if (button.id == 11) | ||
| this.mc.displayGuiScreen(this.parentScreen); | ||
| else | ||
| { | ||
| try | ||
| { | ||
| if (GuiHelper.updateGui.iterator.hasNext()) | ||
| { | ||
| this.mc.displayGuiScreen(GuiHelper.updateGui.iterator.next()); | ||
| } | ||
| /* | ||
| else if (configGui != null) | ||
| { | ||
| File file=new File("config/TPPI/config/hardconfig.zip"); | ||
| if (file.exists()) this.mc.displayGuiScreen(configGui); | ||
| configGui = null; | ||
| } | ||
| */ | ||
| else if (GuiHelper.updateGui.modScreens.size() > 0) | ||
| { | ||
| this.mc.displayGuiScreen(new RestartGui()); | ||
| } | ||
| else | ||
| { | ||
| this.mc.displayGuiScreen(this.parentScreen); | ||
| } | ||
| } | ||
| catch (Exception e) | ||
| { | ||
| TPPITweaks.logger.log(Level.SEVERE, "Error opening webpage, please contact TPPI Team."); | ||
| e.printStackTrace(); | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public void drawScreen(int par1, int par2, float par3) | ||
| { | ||
| drawScreen(par1, par2, par3, true); | ||
| } | ||
|
|
||
| public void drawScreen(int par1, int par2, float par3, boolean draw) | ||
| { | ||
| if (draw) | ||
| { | ||
| this.drawDefaultBackground(); | ||
|
|
||
| if (firstTime) | ||
| { | ||
| this.drawCenteredString(this.fontRenderer, "Hey there! This seems like the first time you are starting TPPI. Welcome!", this.width / 2, this.height / 2 - 100, 0xFFFFFF); | ||
| this.drawCenteredString(this.fontRenderer, "This menu will not show again unless enabled in the TPPI Tweaks config.", this.width / 2, this.height / 2 - 10, 0xFFFFFF); | ||
| this.drawCenteredString(this.fontRenderer, "Alternatively, you may use the command \"/tppi download\" to show it in-game.", this.width / 2, this.height / 2, 0xFFFFFF); | ||
| } | ||
|
|
||
| this.drawCenteredString(this.fontRenderer, "As it turns out, there are some mods we really wanted to include,", this.width / 2, this.height / 2 - 80, 0xFFFFFF); | ||
| this.drawCenteredString(this.fontRenderer, "but couldn't ship directly with the rest of the pack.", this.width / 2, this.height / 2 - 70, 0xFFFFFF); | ||
| this.drawCenteredString(this.fontRenderer, "Though we had to leave them out, we built this little utility to", this.width / 2, this.height / 2 - 50, 0xFFFFFF); | ||
| this.drawCenteredString(this.fontRenderer, "help you all add them manually, to gain what we feel is the full TPPI experience.", this.width / 2, this.height / 2 - 40, 0xFFFFFF); | ||
|
|
||
| } | ||
|
|
||
| super.drawScreen(par1, par2, par3); | ||
| } | ||
| } |
Oops, something went wrong.