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

Pull in MCP's 1.4 conf files.

This commit is contained in:
LexManos 2012-10-19 23:57:05 -07:00
parent ecf14df030
commit 7fcdb47edb
9 changed files with 17345 additions and 14557 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fml/conf/fields.csv
View File

@ -1072,6 +1072,7 @@ field_72699_b,players,2,players in the current instance
field_72700_c,playerInstances,2,A map of chunk position (two ints concatenated into a long) to PlayerInstance
field_72701_a,theWorldServer,2,
field_72737_D,maxBlockZ,2,Maximum block Z
field_72738_E,damagedBlocks,2,Stores blocks currently being broken. Key is entity ID of the thing doing the breaking. Value is a DestroyBlockProgress
field_72739_F,renderDistance,2,
field_72740_G,renderEntitiesStartupCounter,2,Render entities startup counter (init value=2)
field_72741_A,minBlockZ,2,Minimum block Z
@ -1223,7 +1224,7 @@ field_73139_h,lastPitch,2,
field_73140_i,lastHeadMotion,2,
field_73141_v,ridingEntity,2,
field_73142_u,ticksSinceLastForcedTeleport,2,"every 400 ticks a full teleport packet is sent, rather than just a ""move me +x"" command, so that position remains fully synced."
field_73143_t,trackMotion,2,
field_73143_t,sendVelocityUpdates,2,
field_73144_s,isDataInitialized,2,set to true on first sendLocationToClients
field_73145_r,posZ,2,
field_73146_q,posY,2,

1 searge name side desc
1072 field_72700_c playerInstances 2 A map of chunk position (two ints concatenated into a long) to PlayerInstance
1073 field_72701_a theWorldServer 2
1074 field_72737_D maxBlockZ 2 Maximum block Z
1075 field_72738_E damagedBlocks 2 Stores blocks currently being broken. Key is entity ID of the thing doing the breaking. Value is a DestroyBlockProgress
1076 field_72739_F renderDistance 2
1077 field_72740_G renderEntitiesStartupCounter 2 Render entities startup counter (init value=2)
1078 field_72741_A minBlockZ 2 Minimum block Z
1224 field_73140_i lastHeadMotion 2
1225 field_73141_v ridingEntity 2
1226 field_73142_u ticksSinceLastForcedTeleport 2 every 400 ticks a full teleport packet is sent, rather than just a "move me +x" command, so that position remains fully synced.
1227 field_73143_t trackMotion sendVelocityUpdates 2
1228 field_73144_s isDataInitialized 2 set to true on first sendLocationToClients
1229 field_73145_r posZ 2
1230 field_73146_q posY 2

1013
fml/conf/joined.exc
View File

File diff suppressed because it is too large Load Diff

29479
fml/conf/joined.srg
View File

File diff suppressed because it is too large Load Diff

8
fml/conf/mcp.cfg
View File

@ -36,8 +36,8 @@ DirNatives = %(DirJars)s/bin/natives
Client = %(DirJars)s/bin/minecraft.jar
Server = %(DirJars)s/minecraft_server.jar
LWJGL = %(DirJars)s/bin/jinput.jar,%(DirJars)s/bin/lwjgl.jar,%(DirJars)s/bin/lwjgl_util.jar
MD5Client = 969699f13e5bbe7f12e40ac4f32b7d9a
MD5Server = c047f82522e53f2ec3c6b64304dfad0f
MD5Client = 32a654388b54d3e4bb29c1a46e7d6a12
MD5Server = 99f84541e184979c5b0312e9afc56ce1
[RETROGUARD]
Location = %(DirRuntime)s/bin/retroguard.jar
@ -123,8 +123,8 @@ LogFile = %(DirLogs)s/mcp.log
LogFileErr = %(DirLogs)s/mcperr.log
UpdateUrl =
IgnoreUpdate = %(DirBin)s,%(DirLib)s,%(DirLogs)s,%(DirModSrc)s,%(DirReobf)s,%(DirSrc)s,%(DirTemp)s,%(DirEclipse)s/Client/bin,%(DirEclipse)s/Server/bin,%(DirJars)s/world,%(DirJars)s/saves,%(DirJars)s/resources
RGIndex = 80000
ParamIndex = 4000
RGIndex = 82000
ParamIndex = 5000
[ASTYLE]
AstyleConfig = %(DirConf)s/astyle.cfg

7
fml/conf/methods.csv
View File

@ -121,7 +121,9 @@ func_70220_a,moveTowards,2,"The location the eye should float/move towards. Curr
func_70227_a,onImpact,2,Called when this EntityFireball hits a block or entity.
func_70239_b,setDamage,2,
func_70240_a,setKnockbackStrength,2,Sets the amount of knockback the arrow applies when it hits a mob.
func_70241_g,getIsCritical,2,Whether the arrow has a stream of critical hit particles flying behind it.
func_70242_d,getDamage,2,
func_70243_d,setIsCritical,2,Whether the arrow has a stream of critical hit particles flying behind it.
func_70244_c,setArrowHeading,2,"Uses the provided coordinates as a heading and determines the velocity from it with the set force and random variance. Args: x, y, z, force, forceVariation"
func_70265_b,setTimeSinceHit,2,Sets the time to count down from since the last time entity was hit.
func_70266_a,setDamageTaken,2,Sets the damage taken from the last hit.
@ -765,7 +767,7 @@ func_71548_a,saveProfilerResults,2,
func_71549_c,getWittyComment,2,"Returns a random ""witty"" comment."
func_71552_a,setTime,2,Set the time in the server object.
func_71553_b,addTime,2,Adds (or removes) time in the server object.
func_71554_c,reallyToggleDownfall,2,Toggle rain and enable thundering.
func_71554_c,toggleDownfall,2,Toggle rain and enable thundering.
func_71555_a,getCommands,2,"returns a map of string to commads. All commands are returned, not just ones which someone has permission to use."
func_71556_a,executeCommand,2,
func_71557_a,getPossibleCommands,2,returns all commands that the commandSender can use
@ -1862,6 +1864,7 @@ func_74192_a,drawSlotInventory,2,Draws an inventory slot
func_74199_h,getIMerchant,2,Gets the Instance of IMerchant interface.
func_74221_h,displayDebuffEffects,2,Displays debuff/potion effects that are currently being applied to the player
func_74226_k,needsScrollBars,2,returns (if you are not on the inventoryTab) and (the flag isn't set) and( you have more than 1 page of items)
func_74228_j,updateCreativeSearch,2,
func_74229_i,getInventory,2,Returns the creative inventory
func_74231_b,renderCreativeInventoryHoveringText,2,"Renders the creative inventory hovering text if mouse is over it. Returns true if did render or false otherwise. Params: current creative tab to be checked, current mouse x position, current mouse y position."
func_74233_a,renderCreativeTab,2,Renders passed creative inventory tab into the screen.
@ -3338,6 +3341,7 @@ func_77871_c,createMapDataPacket,2,returns null if no update is to be sent
func_77872_a,updateMapData,2,
func_77873_a,getMapData,2,
func_77874_a,getMPMapData,2,
func_77875_a,tryPlaceContainedLiquid,2,Attempts to place the liquid contained inside the bucket.
func_77877_c,getMaxDamageArray,2,"Returns the 'max damage' factor array for the armor, each piece of armor have a durability factor (that gets multiplied by armor material factor)"
func_77883_f,getBlockID,2,Returns the blockID for this Item
func_77884_a,canPlaceItemBlockOnSide,2,Returns true if the given ItemBlock can be placed on the given side of the given block position.
@ -3351,6 +3355,7 @@ func_77913_a,applyIngredient,2,"Generate a data value for a potion, given its pr
func_77914_a,checkFlag,2,Is the bit given set to 1?
func_77916_d,isFlagUnset,2,"Returns 0 if the flag is set, 1 if it is not set."
func_77917_b,getPotionEffects,2,Returns a list of effects for the specified potion damage value.
func_77941_a,onBlockDestroyed,2,
func_77942_o,hasTagCompound,2,Returns true if the ItemStack has an NBTTagCompound. Currently used to store enchantments.
func_77943_a,tryPlaceItemIntoWorld,2,
func_77944_b,copyItemStack,2,"Creates a copy of a ItemStack, a null parameters will return a null."

1 searge name side desc
121 func_70227_a onImpact 2 Called when this EntityFireball hits a block or entity.
122 func_70239_b setDamage 2
123 func_70240_a setKnockbackStrength 2 Sets the amount of knockback the arrow applies when it hits a mob.
124 func_70241_g getIsCritical 2 Whether the arrow has a stream of critical hit particles flying behind it.
125 func_70242_d getDamage 2
126 func_70243_d setIsCritical 2 Whether the arrow has a stream of critical hit particles flying behind it.
127 func_70244_c setArrowHeading 2 Uses the provided coordinates as a heading and determines the velocity from it with the set force and random variance. Args: x, y, z, force, forceVariation
128 func_70265_b setTimeSinceHit 2 Sets the time to count down from since the last time entity was hit.
129 func_70266_a setDamageTaken 2 Sets the damage taken from the last hit.
767 func_71549_c getWittyComment 2 Returns a random "witty" comment.
768 func_71552_a setTime 2 Set the time in the server object.
769 func_71553_b addTime 2 Adds (or removes) time in the server object.
770 func_71554_c reallyToggleDownfall toggleDownfall 2 Toggle rain and enable thundering.
771 func_71555_a getCommands 2 returns a map of string to commads. All commands are returned, not just ones which someone has permission to use.
772 func_71556_a executeCommand 2
773 func_71557_a getPossibleCommands 2 returns all commands that the commandSender can use
1864 func_74199_h getIMerchant 2 Gets the Instance of IMerchant interface.
1865 func_74221_h displayDebuffEffects 2 Displays debuff/potion effects that are currently being applied to the player
1866 func_74226_k needsScrollBars 2 returns (if you are not on the inventoryTab) and (the flag isn't set) and( you have more than 1 page of items)
1867 func_74228_j updateCreativeSearch 2
1868 func_74229_i getInventory 2 Returns the creative inventory
1869 func_74231_b renderCreativeInventoryHoveringText 2 Renders the creative inventory hovering text if mouse is over it. Returns true if did render or false otherwise. Params: current creative tab to be checked, current mouse x position, current mouse y position.
1870 func_74233_a renderCreativeTab 2 Renders passed creative inventory tab into the screen.
3341 func_77872_a updateMapData 2
3342 func_77873_a getMapData 2
3343 func_77874_a getMPMapData 2
3344 func_77875_a tryPlaceContainedLiquid 2 Attempts to place the liquid contained inside the bucket.
3345 func_77877_c getMaxDamageArray 2 Returns the 'max damage' factor array for the armor, each piece of armor have a durability factor (that gets multiplied by armor material factor)
3346 func_77883_f getBlockID 2 Returns the blockID for this Item
3347 func_77884_a canPlaceItemBlockOnSide 2 Returns true if the given ItemBlock can be placed on the given side of the given block position.
3355 func_77914_a checkFlag 2 Is the bit given set to 1?
3356 func_77916_d isFlagUnset 2 Returns 0 if the flag is set, 1 if it is not set.
3357 func_77917_b getPotionEffects 2 Returns a list of effects for the specified potion damage value.
3358 func_77941_a onBlockDestroyed 2
3359 func_77942_o hasTagCompound 2 Returns true if the ItemStack has an NBTTagCompound. Currently used to store enchantments.
3360 func_77943_a tryPlaceItemIntoWorld 2
3361 func_77944_b copyItemStack 2 Creates a copy of a ItemStack, a null parameters will return a null.

1159
fml/conf/params.csv
View File

File diff suppressed because it is too large Load Diff

141
fml/conf/patches/minecraft_ff.patch
View File

@ -1,7 +1,7 @@
diff -r -U 3 minecraft\net\minecraft\client\Minecraft.java minecraft_patched\net\minecraft\client\Minecraft.java
--- minecraft\net\minecraft\client\Minecraft.java Tue Aug 14 20:15:26 2012
+++ minecraft_patched\net\minecraft\client\Minecraft.java Tue Aug 14 20:18:48 2012
@@ -539,9 +539,8 @@
--- 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;
}
@ -12,7 +12,7 @@ diff -r -U 3 minecraft\net\minecraft\client\Minecraft.java minecraft_patched\net
if(this.field_71434_R && this.field_71433_S != null) {
this.func_71377_b(this.field_71433_S);
return;
@@ -559,7 +558,6 @@
@@ -561,7 +560,6 @@
this.func_71373_a(new GuiMemoryErrorScreen());
System.gc();
}
@ -20,7 +20,7 @@ diff -r -U 3 minecraft\net\minecraft\client\Minecraft.java minecraft_patched\net
}
} catch (MinecraftError var12) {
;
@@ -577,8 +575,6 @@
@@ -579,8 +577,6 @@
this.func_71405_e();
}
@ -30,11 +30,13 @@ diff -r -U 3 minecraft\net\minecraft\client\Minecraft.java minecraft_patched\net
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 Tue Aug 14 20:15:26 2012
+++ minecraft_patched\net\minecraft\src\CodecMus.java Tue Aug 14 20:18:48 2012
@@ -1,5 +1,6 @@
--- 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;
@ -43,16 +45,17 @@ diff -r -U 3 minecraft\net\minecraft\src\CodecMus.java minecraft_patched\net\min
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 ex) {
+ 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 Tue Aug 14 20:15:26 2012
+++ minecraft_patched\net\minecraft\src\ComponentStrongholdRightTurn.java Tue Aug 14 20:18:48 2012
--- 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 {
@ -65,18 +68,9 @@ diff -r -U 3 minecraft\net\minecraft\src\ComponentStrongholdRightTurn.java minec
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 Tue Aug 14 20:15:26 2012
+++ minecraft_patched\net\minecraft\src\DedicatedServer.java Tue Aug 14 20:25:02 2012
@@ -183,7 +183,7 @@
}
- protected CrashReport func_71230_b(CrashReport p_71230_1_) {
+ public CrashReport func_71230_b(CrashReport p_71230_1_) {
p_71230_1_ = super.func_71230_b(p_71230_1_);
p_71230_1_.func_71500_a("Type", new CallableType(this));
return p_71230_1_;
@@ -193,7 +193,7 @@
--- 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);
}
@ -85,10 +79,43 @@ diff -r -U 3 minecraft\net\minecraft\src\DedicatedServer.java minecraft_patched\
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 Tue Aug 14 20:15:26 2012
+++ minecraft_patched\net\minecraft\src\FontRenderer.java Tue Aug 14 20:18:48 2012
@@ -711,8 +711,6 @@
--- 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) {
@ -97,18 +124,18 @@ diff -r -U 3 minecraft\net\minecraft\src\FontRenderer.java minecraft_patched\net
case 167:
if(var5 < var3 - 1) {
++var5;
@@ -726,6 +724,8 @@
@@ -728,6 +726,8 @@
}
}
break;
+ case 32:
+ var6 = var5;
+ 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 Tue Aug 14 20:15:26 2012
+++ minecraft_patched\net\minecraft\src\IntegratedServer.java Tue Aug 14 20:24:49 2012
--- 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;
}
@ -118,38 +145,10 @@ diff -r -U 3 minecraft\net\minecraft\src\IntegratedServer.java minecraft_patched
boolean var1 = this.field_71348_o;
this.field_71348_o = this.field_71347_n.func_71752_f();
if(!var1 && this.field_71348_o) {
@@ -145,7 +145,7 @@
this.field_71349_l.func_71404_a(p_71228_1_);
}
- protected CrashReport func_71230_b(CrashReport p_71230_1_) {
+ public CrashReport func_71230_b(CrashReport p_71230_1_) {
p_71230_1_ = super.func_71230_b(p_71230_1_);
p_71230_1_.func_71500_a("Type", new CallableType3(this));
p_71230_1_.func_71500_a("Is Modded", new CallableIsModded(this));
diff -r -U 3 minecraft\net\minecraft\src\ItemMap.java minecraft_patched\net\minecraft\src\ItemMap.java
--- minecraft\net\minecraft\src\ItemMap.java Tue Aug 14 20:15:26 2012
+++ minecraft_patched\net\minecraft\src\ItemMap.java Tue Aug 14 20:18:48 2012
@@ -24,7 +24,6 @@
}
public static MapData func_77874_a(short p_77874_0_, World p_77874_1_) {
- "map_" + p_77874_0_;
MapData var3 = (MapData)p_77874_1_.func_72943_a(MapData.class, "map_" + p_77874_0_);
if(var3 == null) {
int var4 = p_77874_1_.func_72841_b("map");
@@ -37,7 +36,6 @@
}
public MapData func_77873_a(ItemStack p_77873_1_, World p_77873_2_) {
- "map_" + p_77873_1_.func_77960_j();
MapData var4 = (MapData)p_77873_2_.func_72943_a(MapData.class, "map_" + p_77873_1_.func_77960_j());
if(var4 == null) {
p_77873_1_.func_77964_b(p_77873_2_.func_72841_b("map"));
diff -r -U 3 minecraft\net\minecraft\src\RenderGlobal.java minecraft_patched\net\minecraft\src\RenderGlobal.java
--- minecraft\net\minecraft\src\RenderGlobal.java Tue Aug 14 20:15:27 2012
+++ minecraft_patched\net\minecraft\src\RenderGlobal.java Tue Aug 14 20:18:48 2012
@@ -1431,7 +1431,7 @@
--- 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_;
@ -159,8 +158,8 @@ diff -r -U 3 minecraft\net\minecraft\src\RenderGlobal.java minecraft_patched\net
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 Tue Aug 14 20:15:27 2012
+++ minecraft_patched\net\minecraft\src\TcpMasterThread.java Tue Aug 14 20:18:48 2012
--- 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_;
}
@ -170,15 +169,15 @@ diff -r -U 3 minecraft\net\minecraft\src\TcpMasterThread.java minecraft_patched\
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 Tue Aug 14 20:15:27 2012
+++ minecraft_patched\net\minecraft\src\ThreadedFileIOBase.java Tue Aug 14 20:18:48 2012
@@ -20,7 +20,9 @@
--- 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() {
+ while(true) {
this.func_75736_b();
+ }
- this.func_75736_b();
+ while(true)
+ this.func_75736_b();
}
private void func_75736_b() {
private void func_75736_b() {

86
fml/conf/patches/minecraft_server_ff.patch
View File

@ -1,6 +1,6 @@
diff -r -U 3 minecraft_server\net\minecraft\src\ComponentStrongholdRightTurn.java minecraft_server_patched\net\minecraft\src\ComponentStrongholdRightTurn.java
--- minecraft_server\net\minecraft\src\ComponentStrongholdRightTurn.java Tue Aug 14 20:16:02 2012
+++ minecraft_server_patched\net\minecraft\src\ComponentStrongholdRightTurn.java Tue Aug 14 20:19:30 2012
--- minecraft_server\net\minecraft\src\ComponentStrongholdRightTurn.java Sat Oct 20 04:11:53 2012
+++ minecraft_server_patched\net\minecraft\src\ComponentStrongholdRightTurn.java Sat Oct 20 04:14:21 2012
@@ -11,6 +11,10 @@
public class ComponentStrongholdRightTurn extends ComponentStrongholdLeftTurn {
@ -13,18 +13,9 @@ diff -r -U 3 minecraft_server\net\minecraft\src\ComponentStrongholdRightTurn.jav
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_server\net\minecraft\src\DedicatedServer.java minecraft_server_patched\net\minecraft\src\DedicatedServer.java
--- minecraft_server\net\minecraft\src\DedicatedServer.java Tue Aug 14 20:16:03 2012
+++ minecraft_server_patched\net\minecraft\src\DedicatedServer.java Tue Aug 14 20:24:26 2012
@@ -184,7 +184,7 @@
}
- protected CrashReport func_71230_b(CrashReport p_71230_1_) {
+ public CrashReport func_71230_b(CrashReport p_71230_1_) {
p_71230_1_ = super.func_71230_b(p_71230_1_);
p_71230_1_.func_71500_a("Type", new CallableType(this));
return p_71230_1_;
@@ -194,7 +194,7 @@
--- minecraft_server\net\minecraft\src\DedicatedServer.java Sat Oct 20 04:11:53 2012
+++ minecraft_server_patched\net\minecraft\src\DedicatedServer.java Sat Oct 20 04:13:58 2012
@@ -195,7 +195,7 @@
System.exit(0);
}
@ -33,20 +24,42 @@ diff -r -U 3 minecraft_server\net\minecraft\src\DedicatedServer.java minecraft_s
super.func_71190_q();
this.func_71333_ah();
}
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 Tue Aug 14 20:16:03 2012
+++ minecraft_server_patched\net\minecraft\src\ItemMap.java Tue Aug 14 20:19:30 2012
@@ -24,7 +24,6 @@
diff -r -U 3 minecraft_server\net\minecraft\src\EntityArrow.java minecraft_server_patched\net\minecraft\src\EntityArrow.java
--- minecraft_server\net\minecraft\src\EntityArrow.java Sat Oct 20 04:11:53 2012
+++ minecraft_server_patched\net\minecraft\src\EntityArrow.java Sat Oct 20 04:13:43 2012
@@ -381,4 +381,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_server\net\minecraft\src\EnumFacing.java minecraft_server_patched\net\minecraft\src\EnumFacing.java
--- minecraft_server\net\minecraft\src\EnumFacing.java Sat Oct 20 04:11:53 2012
+++ minecraft_server_patched\net\minecraft\src\EnumFacing.java Sat Oct 20 04:13:22 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 @@
}
public MapData func_77873_a(ItemStack p_77873_1_, World p_77873_2_) {
- "map_" + p_77873_1_.func_77960_j();
MapData var4 = (MapData)p_77873_2_.func_72943_a(MapData.class, "map_" + p_77873_1_.func_77960_j());
if(var4 == null) {
p_77873_1_.func_77964_b(p_77873_2_.func_72841_b("map"));
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_server\net\minecraft\src\TcpMasterThread.java minecraft_server_patched\net\minecraft\src\TcpMasterThread.java
--- minecraft_server\net\minecraft\src\TcpMasterThread.java Tue Aug 14 20:16:03 2012
+++ minecraft_server_patched\net\minecraft\src\TcpMasterThread.java Tue Aug 14 20:19:30 2012
--- minecraft_server\net\minecraft\src\TcpMasterThread.java Sat Oct 20 04:11:54 2012
+++ minecraft_server_patched\net\minecraft\src\TcpMasterThread.java Sat Oct 20 04:18:38 2012
@@ -11,6 +11,7 @@
this.field_74504_a = p_i3285_1_;
}
@ -56,26 +69,15 @@ diff -r -U 3 minecraft_server\net\minecraft\src\TcpMasterThread.java minecraft_s
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 Tue Aug 14 20:16:03 2012
+++ minecraft_server_patched\net\minecraft\src\ThreadedFileIOBase.java Tue Aug 14 20:19:30 2012
@@ -20,7 +20,9 @@
--- minecraft_server\net\minecraft\src\ThreadedFileIOBase.java Sat Oct 20 04:11:54 2012
+++ minecraft_server_patched\net\minecraft\src\ThreadedFileIOBase.java Sat Oct 20 04:19:13 2012
@@ -20,7 +20,8 @@
}
public void run() {
+ while(true) {
this.func_75736_b();
+ }
- this.func_75736_b();
+ while(true)
+ this.func_75736_b();
}
private void func_75736_b() {
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 Wed Aug 01 18:15:37 2012
+++ minecraft_server_patched\net\minecraft\src\ItemMap.java Wed Aug 01 18:27:23 2012
@@ -24,7 +24,6 @@
}
public static MapData func_77874_a(short p_77874_0_, World p_77874_1_) {
- "map_" + p_77874_0_;
MapData var3 = (MapData)p_77874_1_.func_72943_a(MapData.class, "map_" + p_77874_0_);
if(var3 == null) {
int var4 = p_77874_1_.func_72841_b("map");

6
fml/conf/version.cfg
View File

@ -1,4 +1,4 @@
[VERSION]
MCPVersion = 7.2
ClientVersion = 1.3.2
ServerVersion = 1.3.2
MCPVersion = 7.17
ClientVersion = 1.4
ServerVersion = 1.4