Commit 119cc0d5326cd613f0b23e45ee8dd58e8b7afe2c
1 parent
49c887a6
bumping version for release
Showing
4 changed files
with
13 additions
and
9 deletions
ant/build_liteloader.xml
| ... | ... | @@ -4,7 +4,7 @@ |
| 4 | 4 | <taskdef resource="net/sf/antcontrib/antcontrib.properties" classpath="tasks/ant-contrib.jar" /> |
| 5 | 5 | |
| 6 | 6 | <!-- Versions !!IMPORTANT --> |
| 7 | - <property name="version" value="1.7.2_03" /> | |
| 7 | + <property name="version" value="1.7.2_04" /> | |
| 8 | 8 | <property name="mcversion" value="1.7.2" /> |
| 9 | 9 | <property name="author" value="Mumfrey" /> |
| 10 | 10 | ... | ... |
java/com/mumfrey/liteloader/core/LiteLoader.java
| ... | ... | @@ -7,6 +7,7 @@ import java.util.*; |
| 7 | 7 | import javax.activity.InvalidActivityException; |
| 8 | 8 | |
| 9 | 9 | import net.minecraft.client.Minecraft; |
| 10 | +import net.minecraft.client.gui.GuiMainMenu; | |
| 10 | 11 | import net.minecraft.client.gui.GuiScreen; |
| 11 | 12 | import net.minecraft.client.resources.IResourcePack; |
| 12 | 13 | import net.minecraft.client.resources.SimpleReloadableResourceManager; |
| ... | ... | @@ -38,7 +39,7 @@ import com.mumfrey.liteloader.util.log.LiteLoaderLogger; |
| 38 | 39 | * lightweight mods |
| 39 | 40 | * |
| 40 | 41 | * @author Adam Mummery-Smith |
| 41 | - * @version 1.7.2_02 | |
| 42 | + * @version 1.7.2_04 | |
| 42 | 43 | */ |
| 43 | 44 | public final class LiteLoader |
| 44 | 45 | { |
| ... | ... | @@ -244,7 +245,7 @@ public final class LiteLoader |
| 244 | 245 | return new File(this.configBaseFolder, String.format("config.%s", version.getMinecraftVersion())); |
| 245 | 246 | } |
| 246 | 247 | |
| 247 | - /** | |
| 248 | + /** | |
| 248 | 249 | * Set up reflection methods required by the loader |
| 249 | 250 | */ |
| 250 | 251 | void init() |
| ... | ... | @@ -1066,12 +1067,14 @@ public final class LiteLoader |
| 1066 | 1067 | */ |
| 1067 | 1068 | void postRender(int mouseX, int mouseY, float partialTicks) |
| 1068 | 1069 | { |
| 1069 | - if (GuiScreenModInfo.isSupportedOnScreen(this.minecraft.currentScreen) && ((this.displayModInfoScreenTab && !this.hideModInfoScreenTab) || (this.modInfoScreen != null && this.modInfoScreen.isTweeningOrOpen()))) | |
| 1070 | + boolean tabHidden = this.hideModInfoScreenTab && this.minecraft.currentScreen instanceof GuiMainMenu; | |
| 1071 | + | |
| 1072 | + if (GuiScreenModInfo.isSupportedOnScreen(this.minecraft.currentScreen) && ((this.displayModInfoScreenTab && !tabHidden) || (this.modInfoScreen != null && this.modInfoScreen.isTweeningOrOpen()))) | |
| 1070 | 1073 | { |
| 1071 | 1074 | // If we're at the main menu, prepare the overlay |
| 1072 | 1075 | if (this.modInfoScreen == null || this.modInfoScreen.getScreen() != this.minecraft.currentScreen) |
| 1073 | 1076 | { |
| 1074 | - this.modInfoScreen = new GuiScreenModInfo(this.minecraft, this.minecraft.currentScreen, this, this.enabledModsList, this.configManager, this.hideModInfoScreenTab); | |
| 1077 | + this.modInfoScreen = new GuiScreenModInfo(this.minecraft, this.minecraft.currentScreen, this, this.enabledModsList, this.configManager, tabHidden); | |
| 1075 | 1078 | } |
| 1076 | 1079 | |
| 1077 | 1080 | this.minecraft.entityRenderer.setupOverlayRendering(); | ... | ... |
java/com/mumfrey/liteloader/core/LiteLoaderVersion.java
| ... | ... | @@ -9,7 +9,7 @@ import com.mumfrey.liteloader.update.UpdateSite; |
| 9 | 9 | * LiteLoader version table |
| 10 | 10 | * |
| 11 | 11 | * @author Adam Mummery-Smith |
| 12 | - * @version 1.7.2_03 | |
| 12 | + * @version 1.7.2_04 | |
| 13 | 13 | */ |
| 14 | 14 | public enum LiteLoaderVersion |
| 15 | 15 | { |
| ... | ... | @@ -30,12 +30,13 @@ public enum LiteLoaderVersion |
| 30 | 30 | MC_1_7_2_R0(20, 1386027226, "1.7.2", "1.7.2", "1.7.2", "1.7.r1"), |
| 31 | 31 | MC_1_7_2_R1(21, 1388455995, "1.7.2", "1.7.2_01", "1.7.2_01"), |
| 32 | 32 | MC_1_7_2_R2(22, 1391815963, "1.7.2", "1.7.2_02", "1.7.2_02"), |
| 33 | - MC_1_7_2_R3(23, 1391890695, "1.7.2", "1.7.2_03", "1.7.2_02", "1.7.2_03"); | |
| 33 | + MC_1_7_2_R3(23, 1391890695, "1.7.2", "1.7.2_03", "1.7.2_02", "1.7.2_03"), | |
| 34 | + MC_1_7_2_R4(24, 1392487926, "1.7.2", "1.7.2_03", "1.7.2_02", "1.7.2_03", "1.7.2_04"); | |
| 34 | 35 | |
| 35 | 36 | /** |
| 36 | 37 | * Current loader version |
| 37 | 38 | */ |
| 38 | - public static final LiteLoaderVersion CURRENT = LiteLoaderVersion.MC_1_7_2_R3; | |
| 39 | + public static final LiteLoaderVersion CURRENT = LiteLoaderVersion.MC_1_7_2_R4; | |
| 39 | 40 | |
| 40 | 41 | private static final String UPDATE_SITE_URL = "http://dl.liteloader.com/versions/"; |
| 41 | 42 | private static final String UPDATE_SITE_VERSIONS_JSON = "versions.json"; | ... | ... |
resources/liteloader.properties