keith/ForgePatch
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Wiki Activity

Only log the warning once per texture

Browse source
This commit is contained in:
Christian Weeks 2012-05-14 13:20:50 -04:00
parent 5c48a3c146
commit 828ada8aa6
8 changed files with 38 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
fml/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs
View file

@ -1,7 +1,6 @@
LexicalSortingAction.isChecked=true
content_assist_favorite_static_members=
content_assist_lru_history=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><history maxLHS\="100" maxRHS\="10"><lhs name\="net.minecraft.src.IMinecraftRegistry"><rhs name\="net.minecraft.src.ServerRegistry"/></lhs><lhs name\="java.lang.ClassLoader"><rhs name\="java.net.URLClassLoader"/></lhs><lhs name\="java.util.logging.Level"><rhs name\="java.util.logging.Level"/></lhs><lhs name\="java.util.logging.Formatter"><rhs name\="cpw.mods.fml.common.FMLLogFormatter"/></lhs><lhs name\="java.lang.Enum"><rhs name\="cpw.mods.fml.common.ModContainer$TickType"/><rhs name\="cpw.mods.fml.common.ModContainer$ModState"/><rhs name\="cpw.mods.fml.common.ModContainer$SourceType"/></lhs><lhs name\="cpw.mods.fml.common.ModContainer$TickType"><rhs name\="cpw.mods.fml.common.ModContainer$TickType"/></lhs><lhs name\="cpw.mods.fml.common.ModContainer"><rhs name\="cpw.mods.fml.common.modloader.ModLoaderModContainer"/></lhs><lhs name\="cpw.mods.fml.common.modloader.ModLoaderModContainer"><rhs name\="cpw.mods.fml.common.modloader.ModLoaderModContainer"/></lhs><lhs name\="java.util.List"><rhs name\="java.util.ArrayList"/></lhs><lhs name\="java.util.RandomAccess"><rhs name\="java.util.ArrayList"/></lhs><lhs name\="java.lang.Cloneable"><rhs name\="java.util.ArrayList"/></lhs><lhs name\="java.util.Collection"><rhs name\="java.util.ArrayList"/></lhs><lhs name\="java.lang.Iterable"><rhs name\="java.util.ArrayList"/></lhs><lhs name\="java.util.AbstractList"><rhs name\="java.util.ArrayList"/></lhs><lhs name\="java.util.AbstractCollection"><rhs name\="java.util.ArrayList"/></lhs><lhs name\="java.util.ArrayList"><rhs name\="java.util.ArrayList"/></lhs><lhs name\="cpw.mods.fml.common.ModContainer$ModState"><rhs name\="cpw.mods.fml.common.ModContainer$ModState"/></lhs><lhs name\="cpw.mods.fml.common.ModContainer$SourceType"><rhs name\="cpw.mods.fml.common.ModContainer$SourceType"/></lhs><lhs name\="net.minecraft.src.TextureFX"><rhs name\="net.minecraft.src.ModTextureStatic"/></lhs><lhs name\="net.minecraft.src.ModTextureStatic"><rhs name\="net.minecraft.src.ModTextureStatic"/></lhs></history>
content_assist_number_of_computers=13
content_assist_lru_history=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><history maxLHS\="100" maxRHS\="10"><lhs name\="net.minecraft.src.IMinecraftRegistry"><rhs name\="net.minecraft.src.ServerRegistry"/></lhs><lhs name\="java.lang.ClassLoader"><rhs name\="java.net.URLClassLoader"/></lhs><lhs name\="java.util.logging.Level"><rhs name\="java.util.logging.Level"/></lhs><lhs name\="java.util.logging.Formatter"><rhs name\="cpw.mods.fml.common.FMLLogFormatter"/></lhs><lhs name\="java.lang.Enum"><rhs name\="cpw.mods.fml.common.ModContainer$TickType"/><rhs name\="cpw.mods.fml.common.ModContainer$ModState"/><rhs name\="cpw.mods.fml.common.ModContainer$SourceType"/></lhs><lhs name\="cpw.mods.fml.common.ModContainer$TickType"><rhs name\="cpw.mods.fml.common.ModContainer$TickType"/></lhs><lhs name\="cpw.mods.fml.common.ModContainer"><rhs name\="cpw.mods.fml.common.modloader.ModLoaderModContainer"/></lhs><lhs name\="cpw.mods.fml.common.modloader.ModLoaderModContainer"><rhs name\="cpw.mods.fml.common.modloader.ModLoaderModContainer"/></lhs><lhs name\="java.util.List"><rhs name\="java.util.ArrayList"/></lhs><lhs name\="java.util.RandomAccess"><rhs name\="java.util.ArrayList"/></lhs><lhs name\="java.lang.Cloneable"><rhs name\="java.util.ArrayList"/></lhs><lhs name\="java.util.Collection"><rhs name\="java.util.ArrayList"/></lhs><lhs name\="java.lang.Iterable"><rhs name\="java.util.ArrayList"/></lhs><lhs name\="java.util.AbstractList"><rhs name\="java.util.ArrayList"/></lhs><lhs name\="java.util.AbstractCollection"><rhs name\="java.util.ArrayList"/></lhs><lhs name\="java.util.ArrayList"><rhs name\="java.util.ArrayList"/></lhs><lhs name\="cpw.mods.fml.common.ModContainer$ModState"><rhs name\="cpw.mods.fml.common.ModContainer$ModState"/></lhs><lhs name\="cpw.mods.fml.common.ModContainer$SourceType"><rhs name\="cpw.mods.fml.common.ModContainer$SourceType"/></lhs><lhs name\="net.minecraft.src.TextureFX"><rhs name\="net.minecraft.src.ModTextureStatic"/></lhs><lhs name\="net.minecraft.src.ModTextureStatic"><rhs name\="net.minecraft.src.ModTextureStatic"/></lhs><lhs name\="cpw.mods.fml.client.OverrideInfo"><rhs name\="cpw.mods.fml.client.OverrideInfo"/></lhs></history>
content_assist_number_of_computers=17
content_assist_proposals_background=255,255,255
content_assist_proposals_foreground=0,0,0
eclipse.preferences.version=1

2
fml/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide.prefs
View file

@ -4,6 +4,6 @@ PROBLEMS_FILTERS_MIGRATE=true
SAVE_ALL_BEFORE_BUILD=true
TASKS_FILTERS_MIGRATE=true
eclipse.preferences.version=1
platformState=1333336227263
platformState=1333336227380
quickStart=true
tipsAndTricks=true

11
fml/eclipse/.metadata/.plugins/org.eclipse.debug.core/.launches/FML-Client.launch
View file

@ -6,8 +6,19 @@
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
<listEntry value="1"/>
</listAttribute>
<stringAttribute key="org.eclipse.hyades.trace.ui.ATTR_DATA_COLLECTOR" value="org.eclipse.tptp.trace.jvmti.jvmtiMechanism:org.eclipse.tptp.analysisType.jvmti.execution"/>
<stringAttribute key="org.eclipse.hyades.trace.ui.ATTR_DESTINATION_FILE" value=""/>
<stringAttribute key="org.eclipse.hyades.trace.ui.ATTR_DESTINATION_MONITOR" value="DefaultMonitor"/>
<stringAttribute key="org.eclipse.hyades.trace.ui.ATTR_DESTINATION_PROJECT" value="ProfileProject"/>
<booleanAttribute key="org.eclipse.hyades.trace.ui.ATTR_PROFILE_TO_FILE" value="false"/>
<stringAttribute key="org.eclipse.hyades.trace.ui.ATTR_PROFILING_SET" value="tptp-dummy-profiling-set-FML-Client"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="Start"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="FML-Client"/>
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xincgc -Xmx1024M -Xms1024M"/>
<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:FML-Client/jars}"/>
<booleanAttribute key="org.eclipse.tptp.platform.jvmti.client.ATTR_EXEC_AUTO_POLLING" value="true"/>
<booleanAttribute key="org.eclipse.tptp.platform.jvmti.client.ATTR_EXEC_CPU_TIME" value="true"/>
<booleanAttribute key="org.eclipse.tptp.platform.jvmti.client.ATTR_EXEC_FLOW" value="true"/>
<booleanAttribute key="org.eclipse.tptp.platform.jvmti.client.ATTR_EXEC_MANUAL_POLLING" value="false"/>
<intAttribute key="org.eclipse.tptp.platform.jvmti.client.ATTR_EXEC_POLLING_TIME" value="60"/>
</launchConfiguration>

6
fml/eclipse/.metadata/.plugins/org.eclipse.debug.core/.launches/FML-Server.launch
View file

@ -6,6 +6,12 @@
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
<listEntry value="1"/>
</listAttribute>
<stringAttribute key="org.eclipse.hyades.trace.ui.ATTR_DATA_COLLECTOR" value="org.eclipse.tptp.trace.jvmti.jvmtiMechanism:org.eclipse.tptp.analysisType.jvmti.execution"/>
<stringAttribute key="org.eclipse.hyades.trace.ui.ATTR_DESTINATION_FILE" value=""/>
<stringAttribute key="org.eclipse.hyades.trace.ui.ATTR_DESTINATION_MONITOR" value="DefaultMonitor"/>
<stringAttribute key="org.eclipse.hyades.trace.ui.ATTR_DESTINATION_PROJECT" value="ProfileProject"/>
<booleanAttribute key="org.eclipse.hyades.trace.ui.ATTR_PROFILE_TO_FILE" value="false"/>
<stringAttribute key="org.eclipse.hyades.trace.ui.ATTR_PROFILING_SET" value="tptp-dummy-profiling-set-FML-Server"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="net.minecraft.server.MinecraftServer"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="FML-Server"/>
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xincgc -Xmx1024M -Xms1024M"/>

5
fml/eclipse/.metadata/.plugins/org.eclipse.debug.ui/launchConfigurationHistory.xml
View file

@ -7,7 +7,10 @@
<favorites/>
</launchGroup>
<launchGroup id="org.eclipse.debug.ui.launchGroup.profile">
<mruHistory/>
<mruHistory>
<launch memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;launchConfiguration local=&quot;true&quot; path=&quot;FML-Client&quot;/&gt;&#10;"/>
<launch memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;launchConfiguration local=&quot;true&quot; path=&quot;Clean-Client&quot;/&gt;&#10;"/>
</mruHistory>
<favorites/>
</launchGroup>
<launchGroup id="org.eclipse.debug.ui.launchGroup.debug">

4
fml/eclipse/Clean-Client/.classpath
View file

@ -9,12 +9,12 @@
</classpathentry>
<classpathentry kind="lib" path="jars/bin/lwjgl_util.jar">
<attributes>
<attribute name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY" value="Client/jars/bin/natives"/>
<attribute name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY" value="Clean-Client/jars/bin/natives"/>
</attributes>
</classpathentry>
<classpathentry kind="lib" path="jars/bin/lwjgl.jar">
<attributes>
<attribute name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY" value="Client/jars/bin/natives"/>
<attribute name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY" value="Clean-Client/jars/bin/natives"/>
</attributes>
</classpathentry>
<classpathentry kind="lib" path="jars/bin/minecraft.jar"/>

15
fml/patches/minecraft/net/minecraft/src/RenderEngine.java.patch
View file

@ -9,17 +9,21 @@
import java.awt.Color;
import java.awt.Graphics;
import java.awt.image.BufferedImage;
@@ -16,6 +19,9 @@
@@ -13,9 +16,13 @@
import java.util.Iterator;
import java.util.List;
import java.util.Map;
+
import javax.imageio.ImageIO;
+
import org.lwjgl.opengl.GL11;
+import cpw.mods.fml.client.FMLClientHandler;
+import cpw.mods.fml.common.FMLCommonHandler;
+
public class RenderEngine
{
public static boolean field_1609_a = false;
@@ -459,23 +465,37 @@
@@ -459,23 +466,38 @@
for (int var2 = 0; var2 < this.field_1604_f.size(); ++var2)
{
TextureFX var3 = (TextureFX)this.field_1604_f.get(var2);
@ -40,8 +44,9 @@
+ Profiler.func_40663_a(var3.getClass().getSimpleName());
var3.func_783_a();
+ Profiler.func_40662_b();
+ if (var3.field_1127_a.length!=var3.textureGridSize<<2) {
+ if (var3.field_1127_a.length!=var3.textureGridSize<<2 && !var3.hasWarned) {
+ FMLCommonHandler.instance().getFMLLogger().warning(String.format("Detected a texture FX discrepancy in %s (%d, %d)",var3.getClass().getSimpleName(), var3.field_1127_a.length, var3.textureGridSize<<2));
+ var3.hasWarned=true;
+ continue;
+ }
this.field_1605_e.clear();
@ -63,7 +68,7 @@
}
}
}
@@ -635,4 +655,8 @@
@@ -635,4 +657,8 @@
GL11.glBindTexture(GL11.GL_TEXTURE_2D, p_1076_1_);
}
}

3
fml/patches/minecraft/net/minecraft/src/TextureFX.java.patch
View file

@ -1,11 +1,12 @@
--- ../src-base/minecraft/net/minecraft/src/TextureFX.java 0000-00-00 00:00:00.000000000 -0000
+++ ../src-work/minecraft/net/minecraft/src/TextureFX.java 0000-00-00 00:00:00.000000000 -0000
@@ -10,6 +10,8 @@
@@ -10,6 +10,9 @@
public int field_1130_d = 0;
public int field_1129_e = 1;
public int field_1128_f = 0;
+ public int textureGridSize = 256;
+ public int textureLength = 16;
+ public boolean hasWarned = false;
public TextureFX(int p_i616_1_)
{