mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-19 03:49:14 +00:00
140 lines
5.3 KiB
Diff
140 lines
5.3 KiB
Diff
--- ../src-base/minecraft/net/minecraft/client/renderer/RenderEngine.java
|
|
+++ ../src-work/minecraft/net/minecraft/client/renderer/RenderEngine.java
|
|
@@ -1,8 +1,11 @@
|
|
package net.minecraft.client.renderer;
|
|
|
|
+import cpw.mods.fml.client.TextureFXManager;
|
|
+import cpw.mods.fml.common.FMLLog;
|
|
import cpw.mods.fml.relauncher.Side;
|
|
import cpw.mods.fml.relauncher.SideOnly;
|
|
import java.awt.Color;
|
|
+import java.awt.Dimension;
|
|
import java.awt.Graphics;
|
|
import java.awt.image.BufferedImage;
|
|
import java.awt.image.ImageObserver;
|
|
@@ -15,6 +18,9 @@
|
|
import java.util.Iterator;
|
|
import java.util.List;
|
|
import java.util.Map;
|
|
+import java.util.logging.Level;
|
|
+import java.util.logging.Logger;
|
|
+
|
|
import javax.imageio.ImageIO;
|
|
import net.minecraft.client.renderer.texturefx.TextureFX;
|
|
import net.minecraft.client.settings.GameSettings;
|
|
@@ -39,6 +45,8 @@
|
|
public TexturePackList field_78366_k;
|
|
private BufferedImage field_78364_l = new BufferedImage(64, 64, 2);
|
|
|
|
+ public static Logger log = FMLLog.getLogger();
|
|
+
|
|
public RenderEngine(TexturePackList p_i3192_1_, GameSettings p_i3192_2_)
|
|
{
|
|
this.field_78366_k = p_i3192_1_;
|
|
@@ -102,8 +110,9 @@
|
|
this.field_78359_d.put(p_78346_1_, var7);
|
|
return var7;
|
|
}
|
|
- catch (IOException var6)
|
|
- {
|
|
+ catch (Exception var6)
|
|
+ {
|
|
+ log.log(Level.INFO, String.format("An error occured reading texture file %s (getTexture)", p_78346_1_), var6);
|
|
var6.printStackTrace();
|
|
int[] var5 = this.func_78348_b(this.field_78364_l);
|
|
this.field_78359_d.put(p_78346_1_, var5);
|
|
@@ -250,6 +259,7 @@
|
|
|
|
int var3 = p_78351_1_.getWidth();
|
|
int var4 = p_78351_1_.getHeight();
|
|
+ TextureFXManager.instance().setTextureDimensions(p_78351_2_, var3, var4, (List<TextureFX>)field_78367_h);
|
|
int[] var5 = new int[var3 * var4];
|
|
byte[] var6 = new byte[var3 * var4 * 4];
|
|
p_78351_1_.getRGB(0, 0, var3, var4, var5, 0, var3);
|
|
@@ -410,6 +420,7 @@
|
|
|
|
public void func_78355_a(TextureFX p_78355_1_)
|
|
{
|
|
+ TextureFXManager.instance().onPreRegisterEffect(p_78355_1_);
|
|
this.field_78367_h.add(p_78355_1_);
|
|
p_78355_1_.func_76846_a();
|
|
}
|
|
@@ -422,28 +433,44 @@
|
|
{
|
|
TextureFX var3 = (TextureFX)this.field_78367_h.get(var2);
|
|
var3.field_76851_c = this.field_78365_j.field_74337_g;
|
|
- var3.func_76846_a();
|
|
- var1 = this.func_82772_a(var3, var1);
|
|
+ if (TextureFXManager.instance().onUpdateTextureEffect(var3))
|
|
+ {
|
|
+ var1 = this.func_82772_a(var3, var1);
|
|
+ }
|
|
}
|
|
}
|
|
|
|
public int func_82772_a(TextureFX p_82772_1_, int p_82772_2_)
|
|
{
|
|
- this.field_78358_g.clear();
|
|
- this.field_78358_g.put(p_82772_1_.field_76852_a);
|
|
- this.field_78358_g.position(0).limit(p_82772_1_.field_76852_a.length);
|
|
-
|
|
- if (p_82772_1_.field_76850_b != p_82772_2_)
|
|
+ Dimension dim = TextureFXManager.instance().getTextureDimensions(p_82772_1_);
|
|
+ int tWidth = dim.width >> 4;
|
|
+ int tHeight = dim.height >> 4;
|
|
+ int tLen = tWidth * tHeight << 2;
|
|
+
|
|
+ if (p_82772_1_.field_76852_a.length == tLen)
|
|
+ {
|
|
+ this.field_78358_g.clear();
|
|
+ this.field_78358_g.put(p_82772_1_.field_76852_a);
|
|
+ this.field_78358_g.position(0).limit(p_82772_1_.field_76852_a.length);
|
|
+ }
|
|
+ else
|
|
+ {
|
|
+ TextureFXManager.instance().scaleTextureFXData(p_82772_1_.field_76852_a, field_78358_g, tWidth, tLen);
|
|
+ }
|
|
+
|
|
+ if (p_82772_1_.field_76848_d != p_82772_2_)
|
|
{
|
|
p_82772_1_.func_76845_a(this);
|
|
- p_82772_2_ = p_82772_1_.field_76850_b;
|
|
+ p_82772_2_ = p_82772_1_.field_76848_d;
|
|
}
|
|
|
|
for (int var3 = 0; var3 < p_82772_1_.field_76849_e; ++var3)
|
|
{
|
|
+ int xOffset = p_82772_1_.field_76850_b % 16 * tWidth + var3 * tWidth;
|
|
for (int var4 = 0; var4 < p_82772_1_.field_76849_e; ++var4)
|
|
{
|
|
- GL11.glTexSubImage2D(GL11.GL_TEXTURE_2D, 0, p_82772_1_.field_76850_b % 16 * 16 + var3 * 16, p_82772_1_.field_76850_b / 16 * 16 + var4 * 16, 16, 16, GL11.GL_RGBA, GL11.GL_UNSIGNED_BYTE, this.field_78358_g);
|
|
+ int yOffset = p_82772_1_.field_76850_b / 16 * tHeight + var4 * tHeight;
|
|
+ GL11.glTexSubImage2D(GL11.GL_TEXTURE_2D, 0, xOffset, yOffset, tWidth, tHeight, GL11.GL_RGBA, GL11.GL_UNSIGNED_BYTE, this.field_78358_g);
|
|
}
|
|
}
|
|
|
|
@@ -509,8 +536,9 @@
|
|
this.field_78361_b = false;
|
|
this.field_78363_a = false;
|
|
}
|
|
- catch (IOException var7)
|
|
- {
|
|
+ catch (Exception var7)
|
|
+ {
|
|
+ log.log(Level.INFO,String.format("An error occured reading texture file %s (refreshTexture)", var9), var7);
|
|
var7.printStackTrace();
|
|
}
|
|
}
|
|
@@ -546,8 +574,9 @@
|
|
this.field_78361_b = false;
|
|
this.field_78363_a = false;
|
|
}
|
|
- catch (IOException var6)
|
|
- {
|
|
+ catch (Exception var6)
|
|
+ {
|
|
+ log.log(Level.INFO,String.format("An error occured reading texture file data %s (refreshTexture)", var9), var6);
|
|
var6.printStackTrace();
|
|
}
|
|
}
|