upstream/MinecraftForge
1
0 Fork 0
mirror of https://github.com/MinecraftForge/MinecraftForge.git synced 2026-11-13 00:37:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Dump old mcp config

Browse Source
This commit is contained in:
LexManos committed 2012-08-04 02:29:24 -07:00
1 parent e59bb6679e
commit f6010fd077
17 files changed
-60264
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

conf/astyle.cfg
-19
View File
@@ -1,19 +0,0 @@
# Artistic Style format configuration
# see http://astyle.sourceforge.net/astyle.html
style=allman
add-brackets
break-closing-brackets
indent-switches
max-instatement-indent=2
pad-oper
pad-header
unpad-paren
break-blocks
delete-empty-lines
conf/client.exc
-7618
View File
File diff suppressed because it is too large. Load diff
conf/client.srg
-11689
View File
File diff suppressed because it is too large. Load diff
conf/fields.csv
-5920
View File
File diff suppressed because it is too large. Load diff
conf/methods.csv
-5009
View File
File diff suppressed because it is too large. Load diff
conf/params.csv
-13219
View File
File diff suppressed because it is too large. Load diff
conf/patches/gk.java
-10
View File
@@ -1,10 +0,0 @@
// this is needed for the sound engine to work with deobfuscated sourcecode without crashing
public class gk
{
public static int c(double d)
{
int i = (int)d;
return d >= (double)i ? i : i - 1;
}
}
conf/patches/minecraft.patch
-1372
View File
File diff suppressed because it is too large. Load diff
conf/patches/minecraft_ff.patch
-117
View File
@@ -1,117 +0,0 @@
diff -r -U 3 minecraft\net\minecraft\client\Minecraft.java minecraft_patched\net\minecraft\client\Minecraft.java
--- minecraft\net\minecraft\client\Minecraft.java Fri Mar 30 23:25:51 2012
+++ minecraft_patched\net\minecraft\client\Minecraft.java Fri Mar 30 23:38:36 2012
@@ -1618,11 +1618,13 @@
this.field_6324_e.func_600_a(var6.field_22395_a + var10, 64, var6.field_22396_c + var8);
if(!this.field_6327_b.func_35643_e()) {
+/*
while(true) {
if(this.field_6324_e.func_6465_g()) {
continue;
}
}
+*/
}
}
}
diff -r -U 3 minecraft\net\minecraft\src\CodecMus.java minecraft_patched\net\minecraft\src\CodecMus.java
--- minecraft\net\minecraft\src\CodecMus.java Fri Mar 30 23:25:52 2012
+++ minecraft_patched\net\minecraft\src\CodecMus.java Fri Mar 30 23:38:36 2012
@@ -1,5 +1,6 @@
package net.minecraft.src;
+import java.io.IOException;
import java.io.InputStream;
import net.minecraft.src.MusInputStream;
import paulscode.sound.codecs.CodecJOrbis;
@@ -7,6 +8,11 @@
public class CodecMus extends CodecJOrbis {
protected InputStream openInputStream() {
+ try {
return new MusInputStream(this, this.url, this.urlConnection.getInputStream());
+ }
+ catch (IOException e) {
+ return null;
+ }
}
}
diff -r -U 3 minecraft\net\minecraft\src\ItemMap.java minecraft_patched\net\minecraft\src\ItemMap.java
--- minecraft\net\minecraft\src\ItemMap.java Fri Mar 30 23:25:53 2012
+++ minecraft_patched\net\minecraft\src\ItemMap.java Fri Mar 30 23:38:36 2012
@@ -19,7 +19,6 @@
}
public static MapData func_28013_a(short p_28013_0_, World p_28013_1_) {
- "map_" + p_28013_0_;
MapData var3 = (MapData)p_28013_1_.func_28103_a(MapData.class, "map_" + p_28013_0_);
if(var3 == null) {
int var4 = p_28013_1_.func_28101_b("map");
@@ -32,7 +31,6 @@
}
public MapData func_28012_a(ItemStack p_28012_1_, World p_28012_2_) {
- "map_" + p_28012_1_.func_21181_i();
MapData var4 = (MapData)p_28012_2_.func_28103_a(MapData.class, "map_" + p_28012_1_.func_21181_i());
if(var4 == null) {
p_28012_1_.func_28156_b(p_28012_2_.func_28101_b("map"));
diff -r -U 3 minecraft\net\minecraft\src\MusInputStream.java minecraft_patched\net\minecraft\src\MusInputStream.java
--- minecraft\net\minecraft\src\MusInputStream.java Fri Mar 30 23:25:54 2012
+++ minecraft_patched\net\minecraft\src\MusInputStream.java Fri Mar 30 23:38:36 2012
@@ -1,5 +1,6 @@
package net.minecraft.src;
+import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
import net.minecraft.src.CodecMus;
@@ -27,7 +28,12 @@
}
public int read(byte[] p_read_1_, int p_read_2_, int p_read_3_) {
+ try {
p_read_3_ = this.field_1515_d.read(p_read_1_, p_read_2_, p_read_3_);
+ }
+ catch (IOException e) {
+ return 0;
+ }
for(int var4 = 0; var4 < p_read_3_; ++var4) {
byte var5 = p_read_1_[p_read_2_ + var4] = (byte)(p_read_1_[p_read_2_ + var4] ^ this.field_1516_c >> 8);
diff -r -U 3 minecraft\net\minecraft\src\NetworkMasterThread.java minecraft_patched\net\minecraft\src\NetworkMasterThread.java
--- minecraft\net\minecraft\src\NetworkMasterThread.java Fri Mar 30 23:25:54 2012
+++ minecraft_patched\net\minecraft\src\NetworkMasterThread.java Fri Mar 30 23:38:36 2012
@@ -11,6 +11,7 @@
this.field_1086_a = p_i570_1_;
}
+ @SuppressWarnings("deprecation")
public void run() {
try {
Thread.sleep(5000L);
diff -r -U 3 minecraft\net\minecraft\src\RenderGlobal.java minecraft_patched\net\minecraft\src\RenderGlobal.java
--- minecraft\net\minecraft\src\RenderGlobal.java Fri Mar 30 23:25:54 2012
+++ minecraft_patched\net\minecraft\src\RenderGlobal.java Fri Mar 30 23:38:36 2012
@@ -1458,7 +1458,7 @@
double var15 = this.field_1439_t.field_22009_h.field_611_ak - p_40193_2_;
double var17 = this.field_1439_t.field_22009_h.field_610_al - p_40193_4_;
double var19 = this.field_1439_t.field_22009_h.field_609_am - p_40193_6_;
- Object var21 = null;
+ EntityFX var21 = null;
if(p_40193_1_.equals("hugeexplosion")) {
this.field_1439_t.field_6321_h.func_1192_a(var21 = new EntityHugeExplodeFX(this.field_1448_k, p_40193_2_, p_40193_4_, p_40193_6_, p_40193_8_, p_40193_10_, p_40193_12_));
} else if(p_40193_1_.equals("largeexplode")) {
diff -r -U 3 minecraft\net\minecraft\src\ThreadedFileIOBase.java minecraft_patched\net\minecraft\src\ThreadedFileIOBase.java
--- minecraft\net\minecraft\src\ThreadedFileIOBase.java Fri Mar 30 23:25:55 2012
+++ minecraft_patched\net\minecraft\src\ThreadedFileIOBase.java Fri Mar 30 23:38:36 2012
@@ -20,7 +20,9 @@
}
public void run() {
+ while (true) {
this.func_40568_b();
+ }
}
private void func_40568_b() {
conf/patches/minecraft_osx.patch
-12
View File
@@ -1,12 +0,0 @@
diff -r -U 3 minecraft/net/minecraft/src/RenderGlobal.java minecraft_patched/net/minecraft/src/RenderGlobal.java
--- minecraft/net/minecraft/src/RenderGlobal.java 2012-02-25 12:51:18.000000000 +1300
+++ minecraft_patched/net/minecraft/src/RenderGlobal.java 2012-02-25 13:13:03.850786399 +1300
@@ -954,7 +954,7 @@
f2 = f6;
f3 = f7;
}
- float f5 = 0.0004882812F;
+ float f5 = 0.0004882813F;
double d = (float)field_1435_x + p_4141_1_;
double d1 = field_1439_t.field_22009_h.field_9285_at + (field_1439_t.field_22009_h.field_611_ak - field_1439_t.field_22009_h.field_9285_at) * (double)p_4141_1_ + d * 0.029999999329447746D;
double d2 = field_1439_t.field_22009_h.field_9283_av + (field_1439_t.field_22009_h.field_609_am - field_1439_t.field_22009_h.field_9283_av) * (double)p_4141_1_;
conf/patches/minecraft_server.patch
-1295
View File
File diff suppressed because it is too large. Load diff
conf/patches/minecraft_server_ff.patch
-35
View File
@@ -1,35 +0,0 @@
diff -r -U 3 minecraft_server\net\minecraft\src\ItemMap.java minecraft_server_patched\net\minecraft\src\ItemMap.java
--- minecraft_server\net\minecraft\src\ItemMap.java Fri Mar 30 23:27:06 2012
+++ minecraft_server_patched\net\minecraft\src\ItemMap.java Fri Mar 30 23:40:00 2012
@@ -22,7 +22,6 @@
}
public MapData func_28023_a(ItemStack p_28023_1_, World p_28023_2_) {
- "map_" + p_28023_1_.func_21125_h();
MapData var4 = (MapData)p_28023_2_.func_28103_a(MapData.class, "map_" + p_28023_1_.func_21125_h());
if(var4 == null) {
p_28023_1_.func_28145_b(p_28023_2_.func_28104_b("map"));
diff -r -U 3 minecraft_server\net\minecraft\src\NetworkMasterThread.java minecraft_server_patched\net\minecraft\src\NetworkMasterThread.java
--- minecraft_server\net\minecraft\src\NetworkMasterThread.java Fri Mar 30 23:27:07 2012
+++ minecraft_server_patched\net\minecraft\src\NetworkMasterThread.java Fri Mar 30 23:40:00 2012
@@ -11,6 +11,7 @@
this.field_829_a = p_i577_1_;
}
+ @SuppressWarnings("deprecation")
public void run() {
try {
Thread.sleep(5000L);
diff -r -U 3 minecraft_server\net\minecraft\src\ThreadedFileIOBase.java minecraft_server_patched\net\minecraft\src\ThreadedFileIOBase.java
--- minecraft_server\net\minecraft\src\ThreadedFileIOBase.java Fri Mar 30 23:27:07 2012
+++ minecraft_server_patched\net\minecraft\src\ThreadedFileIOBase.java Fri Mar 30 23:40:00 2012
@@ -20,7 +20,9 @@
}
public void run() {
+ while (true) {
this.func_40509_b();
+ }
}
private void func_40509_b() {
conf/patches/minecraft_server_osx.patch
View File
Whitespace-only changes.
conf/patches/splashes.txt
-1
View File
@@ -1 +0,0 @@
Now it is YOURCRAFT!
conf/server.exc
-5580
View File
File diff suppressed because it is too large. Load diff
conf/server.srg
-8364
View File
File diff suppressed because it is too large. Load diff
conf/version.cfg
-4
View File
@@ -1,4 +0,0 @@
[VERSION]
MCPVersion = 6.2
ClientVersion = 1.2.5
ServerVersion = 1.2.5