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

Update some stuff for updated tweaks

This commit is contained in:
Christian Weeks 2012-05-24 21:39:16 -04:00
parent d7c9010c92
commit f5598573a2
5 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fml/client/net/minecraft/src/BaseMod.java
View File

@ -38,9 +38,9 @@ public abstract class BaseMod implements IWorldGenerator, IPickupNotifier, IDisp
{ {
Minecraft mc = (Minecraft) minecraftInstance; Minecraft mc = (Minecraft) minecraftInstance;
// World and render ticks // World and render ticks
if ((tickEnd && tick==TickType.WORLD) || (tickEnd && tick==TickType.RENDER)) { if ((tickEnd && tick==TickType.WORLD) || (!tickEnd && tick==TickType.RENDER)) {
return onTickInGame((Float) data[0], mc); return onTickInGame((Float) data[0], mc);
} else if (((tickEnd && tick==TickType.WORLDGUI) || (tickEnd && tick==TickType.GUI))) { } else if (((tickEnd && tick==TickType.WORLDGUI) || (!tickEnd && tick==TickType.GUI))) {
return onTickInGUI((Float) data[0], mc, (GuiScreen)data[1]); return onTickInGUI((Float) data[0], mc, (GuiScreen)data[1]);
} }
return true; return true;

2
fml/client/net/minecraft/src/ModLoader.java
View File

@ -659,7 +659,7 @@ public class ModLoader
@Deprecated @Deprecated
public static boolean renderBlockIsItemFull3D(int modelID) public static boolean renderBlockIsItemFull3D(int modelID)
{ {
return FMLClientHandler.instance().renderItemAsFull3DBlock(modelID); return false;
} }
@Deprecated @Deprecated

8
fml/patches/minecraft/net/minecraft/client/Minecraft.java.patch
View File

@ -27,7 +27,7 @@
this.func_6250_c("Startup"); this.func_6250_c("Startup");
this.field_6286_O = new OpenGlCapsChecker(); this.field_6286_O = new OpenGlCapsChecker();
this.field_6301_A.func_340_a(this.field_6304_y); this.field_6301_A.func_340_a(this.field_6304_y);
@@ -744,9 +750,11 @@ @@ -747,9 +753,11 @@
this.field_6327_b.func_6467_a(this.field_9237_P.field_1378_c); this.field_6327_b.func_6467_a(this.field_9237_P.field_1378_c);
} }
@ -39,7 +39,7 @@
} }
GL11.glFlush(); GL11.glFlush();
@@ -1340,6 +1348,7 @@ @@ -1343,6 +1351,7 @@
this.func_28001_B(); this.func_28001_B();
} }
@ -47,7 +47,7 @@
Profiler.func_40663_a("stats"); Profiler.func_40663_a("stats");
this.field_25001_G.func_27178_d(); this.field_25001_G.func_27178_d();
Profiler.func_40661_c("gui"); Profiler.func_40661_c("gui");
@@ -1730,6 +1739,7 @@ @@ -1733,6 +1742,7 @@
} }
Profiler.func_40662_b(); Profiler.func_40662_b();
@ -55,7 +55,7 @@
this.field_6287_N = System.currentTimeMillis(); this.field_6287_N = System.currentTimeMillis();
} }
@@ -2250,7 +2260,11 @@ @@ -2253,7 +2263,11 @@
{ {
var2 = p_main_0_[1]; var2 = p_main_0_[1];
} }

2
fml/patches/minecraft/net/minecraft/src/NetClientHandler.java.patch
View File

@ -25,7 +25,7 @@
this.field_1212_e.field_6308_u.func_552_a(p_4113_1_.field_517_a); this.field_1212_e.field_6308_u.func_552_a(p_4113_1_.field_517_a);
} }
@@ -1026,4 +1030,13 @@ @@ -1031,4 +1035,13 @@
var2.field_35212_aW.field_35759_a = p_50100_1_.field_50072_a; var2.field_35212_aW.field_35759_a = p_50100_1_.field_50072_a;
var2.field_35212_aW.field_35758_c = p_50100_1_.field_50071_c; var2.field_35212_aW.field_35758_c = p_50100_1_.field_50071_c;
} }

40
fml/patches/minecraft/net/minecraft/src/RenderBlocks.java.patch
View File

@ -239,7 +239,7 @@
{ {
Tessellator var5 = Tessellator.field_1512_a; Tessellator var5 = Tessellator.field_1512_a;
int var6 = this.field_1772_a.func_602_e(p_22331_2_, p_22331_3_, p_22331_4_); int var6 = this.field_1772_a.func_602_e(p_22331_2_, p_22331_3_, p_22331_4_);
@@ -310,7 +343,7 @@ @@ -313,7 +346,7 @@
return true; return true;
} }
@ -248,7 +248,7 @@
{ {
p_40730_1_.func_213_a(0.4375F, 0.0F, 0.4375F, 0.5625F, 0.875F, 0.5625F); p_40730_1_.func_213_a(0.4375F, 0.0F, 0.4375F, 0.5625F, 0.875F, 0.5625F);
this.func_1228_k(p_40730_1_, p_40730_2_, p_40730_3_, p_40730_4_); this.func_1228_k(p_40730_1_, p_40730_2_, p_40730_3_, p_40730_4_);
@@ -384,7 +417,7 @@ @@ -387,7 +420,7 @@
return true; return true;
} }
@ -257,7 +257,7 @@
{ {
this.func_1228_k(p_40728_1_, p_40728_2_, p_40728_3_, p_40728_4_); this.func_1228_k(p_40728_1_, p_40728_2_, p_40728_3_, p_40728_4_);
Tessellator var5 = Tessellator.field_1512_a; Tessellator var5 = Tessellator.field_1512_a;
@@ -467,7 +500,7 @@ @@ -470,7 +503,7 @@
return true; return true;
} }
@ -266,7 +266,7 @@
{ {
int var5 = this.field_1772_a.func_602_e(p_22332_2_, p_22332_3_, p_22332_4_); int var5 = this.field_1772_a.func_602_e(p_22332_2_, p_22332_3_, p_22332_4_);
int var6 = var5 & 3; int var6 = var5 & 3;
@@ -557,7 +590,7 @@ @@ -563,7 +596,7 @@
this.field_1773_d = false; this.field_1773_d = false;
} }
@ -275,7 +275,7 @@
{ {
int var6 = this.field_1772_a.func_602_e(p_31074_2_, p_31074_3_, p_31074_4_); int var6 = this.field_1772_a.func_602_e(p_31074_2_, p_31074_3_, p_31074_4_);
boolean var7 = p_31074_5_ || (var6 & 8) != 0; boolean var7 = p_31074_5_ || (var6 & 8) != 0;
@@ -660,7 +693,7 @@ @@ -676,7 +709,7 @@
return true; return true;
} }
@ -284,7 +284,7 @@
{ {
int var16 = 108; int var16 = 108;
@@ -683,7 +716,7 @@ @@ -699,7 +732,7 @@
var19.func_983_a(p_31076_3_, p_31076_7_, p_31076_11_, var24, var26); var19.func_983_a(p_31076_3_, p_31076_7_, p_31076_11_, var24, var26);
} }
@ -293,7 +293,7 @@
{ {
int var16 = 108; int var16 = 108;
@@ -706,7 +739,7 @@ @@ -722,7 +755,7 @@
var19.func_983_a(p_31081_3_, p_31081_7_, p_31081_11_, var24, var26); var19.func_983_a(p_31081_3_, p_31081_7_, p_31081_11_, var24, var26);
} }
@ -302,7 +302,7 @@
{ {
int var16 = 108; int var16 = 108;
@@ -736,7 +769,7 @@ @@ -752,7 +785,7 @@
this.field_1773_d = false; this.field_1773_d = false;
} }
@ -311,7 +311,7 @@
{ {
int var6 = this.field_1772_a.func_602_e(p_31080_2_, p_31080_3_, p_31080_4_); int var6 = this.field_1772_a.func_602_e(p_31080_2_, p_31080_3_, p_31080_4_);
int var7 = BlockPistonExtension.func_31050_c(var6); int var7 = BlockPistonExtension.func_31050_c(var6);
@@ -2707,7 +2740,7 @@ @@ -2728,7 +2761,7 @@
} }
} }
@ -320,7 +320,7 @@
{ {
int var5 = 0; int var5 = 0;
float var6 = 0.0F; float var6 = 0.0F;
@@ -3239,7 +3272,7 @@ @@ -3260,7 +3293,7 @@
var27 = p_22330_1_.func_211_a(this.field_1772_a, p_22330_2_, p_22330_3_, p_22330_4_, 2); var27 = p_22330_1_.func_211_a(this.field_1772_a, p_22330_2_, p_22330_3_, p_22330_4_, 2);
this.func_1220_c(p_22330_1_, (double)p_22330_2_, (double)p_22330_3_, (double)p_22330_4_, var27); this.func_1220_c(p_22330_1_, (double)p_22330_2_, (double)p_22330_3_, (double)p_22330_4_, var27);
@ -329,7 +329,7 @@
{ {
this.field_22351_H *= p_22330_5_; this.field_22351_H *= p_22330_5_;
this.field_22350_I *= p_22330_5_; this.field_22350_I *= p_22330_5_;
@@ -3362,7 +3395,7 @@ @@ -3383,7 +3416,7 @@
var27 = p_22330_1_.func_211_a(this.field_1772_a, p_22330_2_, p_22330_3_, p_22330_4_, 3); var27 = p_22330_1_.func_211_a(this.field_1772_a, p_22330_2_, p_22330_3_, p_22330_4_, 3);
this.func_1225_d(p_22330_1_, (double)p_22330_2_, (double)p_22330_3_, (double)p_22330_4_, p_22330_1_.func_211_a(this.field_1772_a, p_22330_2_, p_22330_3_, p_22330_4_, 3)); this.func_1225_d(p_22330_1_, (double)p_22330_2_, (double)p_22330_3_, (double)p_22330_4_, p_22330_1_.func_211_a(this.field_1772_a, p_22330_2_, p_22330_3_, p_22330_4_, 3));
@ -338,7 +338,7 @@
{ {
this.field_22351_H *= p_22330_5_; this.field_22351_H *= p_22330_5_;
this.field_22350_I *= p_22330_5_; this.field_22350_I *= p_22330_5_;
@@ -3485,7 +3518,7 @@ @@ -3506,7 +3539,7 @@
var27 = p_22330_1_.func_211_a(this.field_1772_a, p_22330_2_, p_22330_3_, p_22330_4_, 4); var27 = p_22330_1_.func_211_a(this.field_1772_a, p_22330_2_, p_22330_3_, p_22330_4_, 4);
this.func_1231_e(p_22330_1_, (double)p_22330_2_, (double)p_22330_3_, (double)p_22330_4_, var27); this.func_1231_e(p_22330_1_, (double)p_22330_2_, (double)p_22330_3_, (double)p_22330_4_, var27);
@ -347,7 +347,7 @@
{ {
this.field_22351_H *= p_22330_5_; this.field_22351_H *= p_22330_5_;
this.field_22350_I *= p_22330_5_; this.field_22350_I *= p_22330_5_;
@@ -3608,7 +3641,7 @@ @@ -3629,7 +3662,7 @@
var27 = p_22330_1_.func_211_a(this.field_1772_a, p_22330_2_, p_22330_3_, p_22330_4_, 5); var27 = p_22330_1_.func_211_a(this.field_1772_a, p_22330_2_, p_22330_3_, p_22330_4_, 5);
this.func_1236_f(p_22330_1_, (double)p_22330_2_, (double)p_22330_3_, (double)p_22330_4_, var27); this.func_1236_f(p_22330_1_, (double)p_22330_2_, (double)p_22330_3_, (double)p_22330_4_, var27);
@ -356,7 +356,7 @@
{ {
this.field_22351_H *= p_22330_5_; this.field_22351_H *= p_22330_5_;
this.field_22350_I *= p_22330_5_; this.field_22350_I *= p_22330_5_;
@@ -3632,7 +3665,7 @@ @@ -3653,7 +3686,7 @@
return var8; return var8;
} }
@ -365,7 +365,7 @@
{ {
if (p_35924_1_ == 0) if (p_35924_1_ == 0)
{ {
@@ -3714,7 +3747,7 @@ @@ -3735,7 +3768,7 @@
var28 = p_4152_1_.func_211_a(this.field_1772_a, p_4152_2_, p_4152_3_, p_4152_4_, 2); var28 = p_4152_1_.func_211_a(this.field_1772_a, p_4152_2_, p_4152_3_, p_4152_4_, 2);
this.func_1220_c(p_4152_1_, (double)p_4152_2_, (double)p_4152_3_, (double)p_4152_4_, var28); this.func_1220_c(p_4152_1_, (double)p_4152_2_, (double)p_4152_3_, (double)p_4152_4_, var28);
@ -374,7 +374,7 @@
{ {
var8.func_987_a(var18 * p_4152_5_, var21 * p_4152_6_, var24 * p_4152_7_); var8.func_987_a(var18 * p_4152_5_, var21 * p_4152_6_, var24 * p_4152_7_);
this.func_1220_c(p_4152_1_, (double)p_4152_2_, (double)p_4152_3_, (double)p_4152_4_, 38); this.func_1220_c(p_4152_1_, (double)p_4152_2_, (double)p_4152_3_, (double)p_4152_4_, 38);
@@ -3730,7 +3763,7 @@ @@ -3751,7 +3784,7 @@
var28 = p_4152_1_.func_211_a(this.field_1772_a, p_4152_2_, p_4152_3_, p_4152_4_, 3); var28 = p_4152_1_.func_211_a(this.field_1772_a, p_4152_2_, p_4152_3_, p_4152_4_, 3);
this.func_1225_d(p_4152_1_, (double)p_4152_2_, (double)p_4152_3_, (double)p_4152_4_, var28); this.func_1225_d(p_4152_1_, (double)p_4152_2_, (double)p_4152_3_, (double)p_4152_4_, var28);
@ -383,7 +383,7 @@
{ {
var8.func_987_a(var18 * p_4152_5_, var21 * p_4152_6_, var24 * p_4152_7_); var8.func_987_a(var18 * p_4152_5_, var21 * p_4152_6_, var24 * p_4152_7_);
this.func_1225_d(p_4152_1_, (double)p_4152_2_, (double)p_4152_3_, (double)p_4152_4_, 38); this.func_1225_d(p_4152_1_, (double)p_4152_2_, (double)p_4152_3_, (double)p_4152_4_, 38);
@@ -3746,7 +3779,7 @@ @@ -3767,7 +3800,7 @@
var28 = p_4152_1_.func_211_a(this.field_1772_a, p_4152_2_, p_4152_3_, p_4152_4_, 4); var28 = p_4152_1_.func_211_a(this.field_1772_a, p_4152_2_, p_4152_3_, p_4152_4_, 4);
this.func_1231_e(p_4152_1_, (double)p_4152_2_, (double)p_4152_3_, (double)p_4152_4_, var28); this.func_1231_e(p_4152_1_, (double)p_4152_2_, (double)p_4152_3_, (double)p_4152_4_, var28);
@ -392,7 +392,7 @@
{ {
var8.func_987_a(var19 * p_4152_5_, var22 * p_4152_6_, var25 * p_4152_7_); var8.func_987_a(var19 * p_4152_5_, var22 * p_4152_6_, var25 * p_4152_7_);
this.func_1231_e(p_4152_1_, (double)p_4152_2_, (double)p_4152_3_, (double)p_4152_4_, 38); this.func_1231_e(p_4152_1_, (double)p_4152_2_, (double)p_4152_3_, (double)p_4152_4_, 38);
@@ -3762,7 +3795,7 @@ @@ -3783,7 +3816,7 @@
var28 = p_4152_1_.func_211_a(this.field_1772_a, p_4152_2_, p_4152_3_, p_4152_4_, 5); var28 = p_4152_1_.func_211_a(this.field_1772_a, p_4152_2_, p_4152_3_, p_4152_4_, 5);
this.func_1236_f(p_4152_1_, (double)p_4152_2_, (double)p_4152_3_, (double)p_4152_4_, var28); this.func_1236_f(p_4152_1_, (double)p_4152_2_, (double)p_4152_3_, (double)p_4152_4_, var28);
@ -401,7 +401,7 @@
{ {
var8.func_987_a(var19 * p_4152_5_, var22 * p_4152_6_, var25 * p_4152_7_); var8.func_987_a(var19 * p_4152_5_, var22 * p_4152_6_, var25 * p_4152_7_);
this.func_1236_f(p_4152_1_, (double)p_4152_2_, (double)p_4152_3_, (double)p_4152_4_, 38); this.func_1236_f(p_4152_1_, (double)p_4152_2_, (double)p_4152_3_, (double)p_4152_4_, 38);
@@ -5270,6 +5303,10 @@ @@ -5291,6 +5324,10 @@
p_1227_1_.func_213_a(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F); p_1227_1_.func_213_a(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F);
} }
@ -412,7 +412,7 @@
} }
else else
{ {
@@ -5326,6 +5363,17 @@ @@ -5347,6 +5384,17 @@
public static boolean func_1219_a(int p_1219_0_) public static boolean func_1219_a(int p_1219_0_)
{ {