From 828ada8aa6ba3dcc946a9859059f43c30091528e Mon Sep 17 00:00:00 2001 From: Christian Weeks Date: Mon, 14 May 2012 13:20:50 -0400 Subject: [PATCH] Only log the warning once per texture --- .../.settings/org.eclipse.jdt.ui.prefs | 5 ++--- .../.settings/org.eclipse.ui.ide.prefs | 2 +- .../.launches/FML-Client.launch | 11 +++++++++++ .../.launches/FML-Server.launch | 6 ++++++ .../launchConfigurationHistory.xml | 5 ++++- fml/eclipse/Clean-Client/.classpath | 4 ++-- .../net/minecraft/src/RenderEngine.java.patch | 15 ++++++++++----- .../net/minecraft/src/TextureFX.java.patch | 3 ++- 8 files changed, 38 insertions(+), 13 deletions(-) diff --git a/fml/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs b/fml/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs index a4e82e80e..123ba5f57 100644 --- a/fml/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs +++ b/fml/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs @@ -1,7 +1,6 @@ -LexicalSortingAction.isChecked=true content_assist_favorite_static_members= -content_assist_lru_history= -content_assist_number_of_computers=13 +content_assist_lru_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 diff --git a/fml/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide.prefs b/fml/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide.prefs index 54c6b96bf..a3279e743 100644 --- a/fml/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide.prefs +++ b/fml/eclipse/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide.prefs @@ -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 diff --git a/fml/eclipse/.metadata/.plugins/org.eclipse.debug.core/.launches/FML-Client.launch b/fml/eclipse/.metadata/.plugins/org.eclipse.debug.core/.launches/FML-Client.launch index 32a690130..e80d0b106 100644 --- a/fml/eclipse/.metadata/.plugins/org.eclipse.debug.core/.launches/FML-Client.launch +++ b/fml/eclipse/.metadata/.plugins/org.eclipse.debug.core/.launches/FML-Client.launch @@ -6,8 +6,19 @@ + + + + + + + + + + + diff --git a/fml/eclipse/.metadata/.plugins/org.eclipse.debug.core/.launches/FML-Server.launch b/fml/eclipse/.metadata/.plugins/org.eclipse.debug.core/.launches/FML-Server.launch index bc93c869b..e7e10d808 100644 --- a/fml/eclipse/.metadata/.plugins/org.eclipse.debug.core/.launches/FML-Server.launch +++ b/fml/eclipse/.metadata/.plugins/org.eclipse.debug.core/.launches/FML-Server.launch @@ -6,6 +6,12 @@ + + + + + + diff --git a/fml/eclipse/.metadata/.plugins/org.eclipse.debug.ui/launchConfigurationHistory.xml b/fml/eclipse/.metadata/.plugins/org.eclipse.debug.ui/launchConfigurationHistory.xml index deec8137a..f483bf775 100644 --- a/fml/eclipse/.metadata/.plugins/org.eclipse.debug.ui/launchConfigurationHistory.xml +++ b/fml/eclipse/.metadata/.plugins/org.eclipse.debug.ui/launchConfigurationHistory.xml @@ -7,7 +7,10 @@ - + + + + diff --git a/fml/eclipse/Clean-Client/.classpath b/fml/eclipse/Clean-Client/.classpath index 947f87f6d..6bf817e74 100644 --- a/fml/eclipse/Clean-Client/.classpath +++ b/fml/eclipse/Clean-Client/.classpath @@ -9,12 +9,12 @@ - + - + diff --git a/fml/patches/minecraft/net/minecraft/src/RenderEngine.java.patch b/fml/patches/minecraft/net/minecraft/src/RenderEngine.java.patch index d0e97c40c..f9c395ed1 100644 --- a/fml/patches/minecraft/net/minecraft/src/RenderEngine.java.patch +++ b/fml/patches/minecraft/net/minecraft/src/RenderEngine.java.patch @@ -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_); } } diff --git a/fml/patches/minecraft/net/minecraft/src/TextureFX.java.patch b/fml/patches/minecraft/net/minecraft/src/TextureFX.java.patch index 0f449b855..8f7fc0346 100644 --- a/fml/patches/minecraft/net/minecraft/src/TextureFX.java.patch +++ b/fml/patches/minecraft/net/minecraft/src/TextureFX.java.patch @@ -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_) {