Commit 1fa074988d9e99beecc09fa5ceda1c0da3a763cc

Authored by Mumfrey
1 parent 2ad82e1e

don't stip chat formatting, fix lagometer borking the overlay

ant/build_liteloader.xml
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
4 <taskdef resource="net/sf/antcontrib/antcontrib.properties" classpath="tasks/ant-contrib.jar" /> 4 <taskdef resource="net/sf/antcontrib/antcontrib.properties" classpath="tasks/ant-contrib.jar" />
5 5
6 <!-- Versions !!IMPORTANT --> 6 <!-- Versions !!IMPORTANT -->
7 - <property name="version" value="1.7.2_02" /> 7 + <property name="version" value="1.7.2_03" />
8 <property name="mcversion" value="1.7.2" /> 8 <property name="mcversion" value="1.7.2" />
9 <property name="author" value="Mumfrey" /> 9 <property name="author" value="Mumfrey" />
10 10
@@ -37,10 +37,12 @@ @@ -37,10 +37,12 @@
37 37
38 <target name="setup_development"> 38 <target name="setup_development">
39 <property name="skipremoval" value="DEV" /> 39 <property name="skipremoval" value="DEV" />
  40 + <property name="md5.outfile" value="${md5.dir}/client_${outmd5set}.md5" />
40 </target> 41 </target>
41 42
42 <target name="setup_production"> 43 <target name="setup_production">
43 <property name="skipremoval" value="" /> 44 <property name="skipremoval" value="" />
  45 + <property name="md5.outfile" value="${md5.dir}/client_${outmd5set}_production.md5" />
44 </target> 46 </target>
45 47
46 <!-- Main target --> 48 <!-- Main target -->
@@ -193,7 +195,7 @@ @@ -193,7 +195,7 @@
193 <target name="savemd5" description="Put post-obfuscation MD5 to stored md5 set" if="outmd5set"> 195 <target name="savemd5" description="Put post-obfuscation MD5 to stored md5 set" if="outmd5set">
194 <echo level="info" message="Storing obfuscated MD5s" /> 196 <echo level="info" message="Storing obfuscated MD5s" />
195 197
196 - <copy file="${temp}/client_reobf.md5" tofile="${md5.dir}/client_${outmd5set}.md5" overwrite="true" verbose="true" /> 198 + <copy file="${temp}/client_reobf.md5" tofile="${md5.outfile}" overwrite="true" verbose="true" />
197 </target> 199 </target>
198 200
199 <target name="stage" description="Stage resources into staging directory"> 201 <target name="stage" description="Stage resources into staging directory">
java/com/mumfrey/liteloader/core/Events.java
@@ -740,7 +740,7 @@ public class Events @@ -740,7 +740,7 @@ public class Events
740 return true; 740 return true;
741 741
742 IChatComponent chat = chatPacket.func_148915_c(); 742 IChatComponent chat = chatPacket.func_148915_c();
743 - String message = chat.getUnformattedText(); 743 + String message = chat.getFormattedText();
744 744
745 // Chat filters get a stab at the chat first, if any filter returns 745 // Chat filters get a stab at the chat first, if any filter returns
746 // false the chat is discarded 746 // false the chat is discarded
@@ -749,7 +749,7 @@ public class Events @@ -749,7 +749,7 @@ public class Events
749 if (chatFilter.onChat(chatPacket, chat, message)) 749 if (chatFilter.onChat(chatPacket, chat, message))
750 { 750 {
751 chat = chatPacket.func_148915_c(); 751 chat = chatPacket.func_148915_c();
752 - message = chat.getUnformattedText(); 752 + message = chat.getFormattedText();
753 } 753 }
754 else 754 else
755 { 755 {
java/com/mumfrey/liteloader/core/LiteLoader.java
@@ -1074,6 +1074,7 @@ public final class LiteLoader @@ -1074,6 +1074,7 @@ public final class LiteLoader
1074 this.modInfoScreen = new GuiScreenModInfo(this.minecraft, this.minecraft.currentScreen, this, this.enabledModsList, this.configManager, this.hideModInfoScreenTab); 1074 this.modInfoScreen = new GuiScreenModInfo(this.minecraft, this.minecraft.currentScreen, this, this.enabledModsList, this.configManager, this.hideModInfoScreenTab);
1075 } 1075 }
1076 1076
  1077 + this.minecraft.entityRenderer.setupOverlayRendering();
1077 this.modInfoScreen.drawScreen(mouseX, mouseY, partialTicks); 1078 this.modInfoScreen.drawScreen(mouseX, mouseY, partialTicks);
1078 } 1079 }
1079 else if (this.minecraft.currentScreen != this.modInfoScreen && this.modInfoScreen != null) 1080 else if (this.minecraft.currentScreen != this.modInfoScreen && this.modInfoScreen != null)