mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-13 00:37:52 +00:00
Some patching touchups
This commit is contained in:
1 parent
0098c57f94
commit
3b2994a3de
4 files changed
+22
-17
No files matched your search
@@ -44,7 +44,7 @@
|
||||
Display.setVSyncEnabled(this.field_71474_y.field_74352_v);
|
||||
}
|
||||
|
||||
@@ -915,9 +924,11 @@
|
||||
@@ -916,9 +925,11 @@
|
||||
|
||||
if (!this.field_71454_w)
|
||||
{
|
||||
@@ -56,7 +56,7 @@
|
||||
}
|
||||
|
||||
GL11.glFlush();
|
||||
@@ -1490,11 +1501,15 @@
|
||||
@@ -1491,11 +1502,15 @@
|
||||
|
||||
public void func_71407_l()
|
||||
{
|
||||
@@ -72,7 +72,7 @@
|
||||
this.field_71424_I.func_76320_a("gui");
|
||||
|
||||
if (!this.field_71445_n)
|
||||
@@ -1977,6 +1992,8 @@
|
||||
@@ -1978,6 +1993,8 @@
|
||||
this.field_71453_ak.func_74428_b();
|
||||
}
|
||||
|
||||
|
||||
@@ -1,12 +0,0 @@
|
||||
--- ../src-base/minecraft/net/minecraft/entity/player/EntityPlayerMP.java
|
||||
+++ ../src-work/minecraft/net/minecraft/entity/player/EntityPlayerMP.java
|
||||
@@ -11,6 +11,9 @@
|
||||
import java.util.Iterator;
|
||||
import java.util.LinkedList;
|
||||
import java.util.List;
|
||||
+import java.util.Queue;
|
||||
+import java.util.concurrent.ConcurrentLinkedQueue;
|
||||
+
|
||||
import net.minecraft.crash.CrashReport;
|
||||
import net.minecraft.crash.CrashReportCategory;
|
||||
import net.minecraft.entity.Entity;
|
||||
@@ -44,3 +44,11 @@
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -137,7 +151,6 @@
|
||||
}
|
||||
}
|
||||
|
||||
- @SideOnly(Side.CLIENT)
|
||||
public double func_145835_a(double p_145835_1_, double p_145835_3_, double p_145835_5_)
|
||||
{
|
||||
double d3 = (double)this.field_145851_c + 0.5D - p_145835_1_;
|
||||
@@ -16,12 +16,12 @@
|
||||
+ InputStream inputstream = StringTranslate.class.getResourceAsStream("/assets/minecraft/lang/en_US.lang");
|
||||
+ localInject(inputstream);
|
||||
+ }
|
||||
+
|
||||
+
|
||||
+ public static void inject(InputStream inputstream)
|
||||
+ {
|
||||
+ field_74817_a.localInject(inputstream);
|
||||
+ }
|
||||
+
|
||||
+
|
||||
+ private void localInject(InputStream inputstream)
|
||||
+ {
|
||||
try
|
||||
@@ -30,3 +30,12 @@
|
||||
Iterator iterator = IOUtils.readLines(inputstream, Charsets.UTF_8).iterator();
|
||||
|
||||
while (iterator.hasNext())
|
||||
@@ -49,7 +61,7 @@
|
||||
|
||||
this.field_150511_e = System.currentTimeMillis();
|
||||
}
|
||||
- catch (IOException ioexception)
|
||||
+ catch (Exception ioexception)
|
||||
{
|
||||
;
|
||||
}
|
||||
Reference in new issue
Block a user