keith/ForgePatch
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Wiki Activity
ForgePatch/fml/conf/patches/minecraft_ff.patch
LexManos 7fcdb47edb Pull in MCP's 1.4 conf files.
2012-10-19 23:57:05 -07:00

183 lines
No EOL
7.5 KiB
Diff
Raw Blame History

diff -r -U 3 minecraft\net\minecraft\client\Minecraft.java minecraft_patched\net\minecraft\client\Minecraft.java
--- minecraft\net\minecraft\client\Minecraft.java Sat Oct 20 04:10:42 2012
+++ minecraft_patched\net\minecraft\client\Minecraft.java Sat Oct 20 04:20:32 2012
@@ -541,9 +541,8 @@
return;
}
- while(true) {
try {
- if(this.field_71425_J) {
+ while(this.field_71425_J) {
if(this.field_71434_R && this.field_71433_S != null) {
this.func_71377_b(this.field_71433_S);
return;
@@ -561,7 +560,6 @@
this.func_71373_a(new GuiMemoryErrorScreen());
System.gc();
}
- continue;
}
} catch (MinecraftError var12) {
;
@@ -579,8 +577,6 @@
this.func_71405_e();
}
- return;
- }
}
private void func_71411_J() {
diff -r -U 3 minecraft\net\minecraft\src\CodecMus.java minecraft_patched\net\minecraft\src\CodecMus.java
--- minecraft\net\minecraft\src\CodecMus.java Sat Oct 20 04:10:43 2012
+++ minecraft_patched\net\minecraft\src\CodecMus.java Sat Oct 20 04:17:33 2012
@@ -1,7 +1,8 @@
package net.minecraft.src;
import cpw.mods.fml.common.Side;
import cpw.mods.fml.common.asm.SideOnly;
+import java.io.IOException;
import java.io.InputStream;
import net.minecraft.src.MusInputStream;
import paulscode.sound.codecs.CodecJOrbis;
@@ -7,6 +8,10 @@
public class CodecMus extends CodecJOrbis {
protected InputStream openInputStream() {
- return new MusInputStream(this, this.url, this.urlConnection.getInputStream());
+ try {
+ return new MusInputStream(this, this.url, this.urlConnection.getInputStream());
+ } catch (IOException e) {
+ return null;
+ }
}
}
diff -r -U 3 minecraft\net\minecraft\src\ComponentStrongholdRightTurn.java minecraft_patched\net\minecraft\src\ComponentStrongholdRightTurn.java
--- minecraft\net\minecraft\src\ComponentStrongholdRightTurn.java Sat Oct 20 04:10:43 2012
+++ minecraft_patched\net\minecraft\src\ComponentStrongholdRightTurn.java Sat Oct 20 04:16:45 2012
@@ -11,6 +11,10 @@
public class ComponentStrongholdRightTurn extends ComponentStrongholdLeftTurn {
+ public ComponentStrongholdRightTurn(int p_i3843_1_, Random p_i3843_2_, StructureBoundingBox p_i3843_3_, int p_i3843_4_) {
+ super(p_i3843_1_, p_i3843_2_, p_i3843_3_, p_i3843_4_);
+ }
+
public void func_74861_a(StructureComponent p_74861_1_, List p_74861_2_, Random p_74861_3_) {
if(this.field_74885_f != 2 && this.field_74885_f != 3) {
this.func_74989_b((ComponentStrongholdStairs2)p_74861_1_, p_74861_2_, p_74861_3_, 1, 1);
diff -r -U 3 minecraft\net\minecraft\src\DedicatedServer.java minecraft_patched\net\minecraft\src\DedicatedServer.java
--- minecraft\net\minecraft\src\DedicatedServer.java Sat Oct 20 04:10:43 2012
+++ minecraft_patched\net\minecraft\src\DedicatedServer.java Sat Oct 20 04:16:25 2012
@@ -194,7 +194,7 @@
System.exit(0);
}
- protected void func_71190_q() {
+ public void func_71190_q() {
super.func_71190_q();
this.func_71333_ah();
}
diff -r -U 3 minecraft\net\minecraft\src\EntityArrow.java minecraft_patched\net\minecraft\src\EntityArrow.java
--- minecraft\net\minecraft\src\EntityArrow.java Sat Oct 20 04:10:43 2012
+++ minecraft_patched\net\minecraft\src\EntityArrow.java Sat Oct 20 04:16:13 2012
@@ -406,4 +406,6 @@
byte var1 = this.field_70180_af.func_75683_a(16);
return (var1 & 1) != 0;
}
+
+ public void func_70186_c(double var1, double var3, double var5, float var7, float var8) { }
}
diff -r -U 3 minecraft\net\minecraft\src\EnumFacing.java minecraft_patched\net\minecraft\src\EnumFacing.java
--- minecraft\net\minecraft\src\EnumFacing.java Sat Oct 20 04:10:44 2012
+++ minecraft_patched\net\minecraft\src\EnumFacing.java Sat Oct 20 04:15:54 2012
@@ -15,10 +15,6 @@
private final int field_82612_k;
private static final EnumFacing[] field_82609_l = new EnumFacing[6];
- public static EnumFacing[] func_82598_values() {
- return (EnumFacing[])field_82610_m.clone();
- }
-
private EnumFacing(int p_i5027_3_, int p_i5027_4_, int p_i5027_5_, int p_i5027_6_, int p_i5027_7_) {
this.field_82603_g = p_i5027_3_;
this.field_82613_h = p_i5027_4_;
@@ -40,7 +36,7 @@
}
static {
- EnumFacing[] var0 = func_82598_values();
+ EnumFacing[] var0 = values();
int var1 = var0.length;
for(int var2 = 0; var2 < var1; ++var2) {
diff -r -U 3 minecraft\net\minecraft\src\FontRenderer.java minecraft_patched\net\minecraft\src\FontRenderer.java
--- minecraft\net\minecraft\src\FontRenderer.java Sat Oct 20 04:10:44 2012
+++ minecraft_patched\net\minecraft\src\FontRenderer.java Sat Oct 20 04:21:56 2012
@@ -713,8 +713,6 @@
for(boolean var7 = false; var5 < var3; ++var5) {
char var8 = p_78259_1_.charAt(var5);
switch(var8) {
- case 32:
- var6 = var5;
case 167:
if(var5 < var3 - 1) {
++var5;
@@ -728,6 +726,8 @@
}
}
break;
+ case 32:
+ var6 = var5;
default:
var4 += this.func_78263_a(var8);
if(var7) {
diff -r -U 3 minecraft\net\minecraft\src\IntegratedServer.java minecraft_patched\net\minecraft\src\IntegratedServer.java
--- minecraft\net\minecraft\src\IntegratedServer.java Sat Oct 20 04:10:44 2012
+++ minecraft_patched\net\minecraft\src\IntegratedServer.java Sat Oct 20 04:15:39 2012
@@ -98,7 +98,7 @@
return true;
}
- protected void func_71217_p() {
+ public void func_71217_p() {
boolean var1 = this.field_71348_o;
this.field_71348_o = this.field_71347_n.func_71752_f();
if(!var1 && this.field_71348_o) {
diff -r -U 3 minecraft\net\minecraft\src\RenderGlobal.java minecraft_patched\net\minecraft\src\RenderGlobal.java
--- minecraft\net\minecraft\src\RenderGlobal.java Sat Oct 20 04:10:45 2012
+++ minecraft_patched\net\minecraft\src\RenderGlobal.java Sat Oct 20 04:15:23 2012
@@ -1443,7 +1443,7 @@
double var15 = this.field_72777_q.field_71451_h.field_70165_t - p_72726_2_;
double var17 = this.field_72777_q.field_71451_h.field_70163_u - p_72726_4_;
double var19 = this.field_72777_q.field_71451_h.field_70161_v - p_72726_6_;
- Object var21 = null;
+ EntityFX var21 = null;
if(p_72726_1_.equals("hugeexplosion")) {
this.field_72777_q.field_71452_i.func_78873_a(var21 = new EntityHugeExplodeFX(this.field_72769_h, p_72726_2_, p_72726_4_, p_72726_6_, p_72726_8_, p_72726_10_, p_72726_12_));
} else if(p_72726_1_.equals("largeexplode")) {
diff -r -U 3 minecraft\net\minecraft\src\TcpMasterThread.java minecraft_patched\net\minecraft\src\TcpMasterThread.java
--- minecraft\net\minecraft\src\TcpMasterThread.java Sat Oct 20 04:10:45 2012
+++ minecraft_patched\net\minecraft\src\TcpMasterThread.java Sat Oct 20 04:22:25 2012
@@ -11,6 +11,7 @@
this.field_74504_a = p_i3285_1_;
}
+ @SuppressWarnings("deprecation")
public void run() {
try {
Thread.sleep(5000L);
diff -r -U 3 minecraft\net\minecraft\src\ThreadedFileIOBase.java minecraft_patched\net\minecraft\src\ThreadedFileIOBase.java
--- minecraft\net\minecraft\src\ThreadedFileIOBase.java Sat Oct 20 04:10:45 2012
+++ minecraft_patched\net\minecraft\src\ThreadedFileIOBase.java Sat Oct 20 04:23:05 2012
@@ -20,7 +20,8 @@
}
public void run() {
- this.func_75736_b();
+ while(true)
+ this.func_75736_b();
}
private void func_75736_b() {
Reference in a new issue View git blame Copy permalink