mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-18 19:39:22 +00:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
973c129f3f | ||
|
|
8bb73671ba | ||
|
|
46a9ba178f | ||
|
|
5c60c2246c | ||
|
|
e79b5d1937 | ||
|
|
9bf4f67d9d |
No files matched your search
@@ -0,0 +1 @@
|
|||||||
|
asdfsnb -a -v "svn"+
|
||||||
Binary file not shown.
File diff suppressed because it is too large.
Load diff
@@ -0,0 +1,228 @@
|
|||||||
|
net/minecraft/client/Minecraft.func_6257_q()V=org/lwjgl/LWJGLException
|
||||||
|
net/minecraft/client/Minecraft.func_6271_a()V=org/lwjgl/LWJGLException
|
||||||
|
net/minecraft/src/ChunkLoader.func_812_a(Lnet/minecraft/src/World;Lnet/minecraft/src/Chunk;)V=java/io/IOException
|
||||||
|
net/minecraft/src/ChunkLoader.func_813_a(Lnet/minecraft/src/World;II)Lnet/minecraft/src/Chunk;=java/io/IOException
|
||||||
|
net/minecraft/src/ChunkLoader.func_815_b(Lnet/minecraft/src/World;Lnet/minecraft/src/Chunk;)V=java/io/IOException
|
||||||
|
net/minecraft/src/CompressedStreamTools.func_1138_a(Ljava/io/InputStream;)Lnet/minecraft/src/NBTTagCompound;=java/io/IOException
|
||||||
|
net/minecraft/src/CompressedStreamTools.func_1139_a(Lnet/minecraft/src/NBTTagCompound;Ljava/io/DataOutput;)V=java/io/IOException
|
||||||
|
net/minecraft/src/CompressedStreamTools.func_1141_a(Ljava/io/DataInput;)Lnet/minecraft/src/NBTTagCompound;=java/io/IOException
|
||||||
|
net/minecraft/src/CompressedStreamTools.func_1143_a(Lnet/minecraft/src/NBTTagCompound;Ljava/io/OutputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/CompressedStreamTools.func_35620_b(Lnet/minecraft/src/NBTTagCompound;Ljava/io/File;)V=java/io/IOException
|
||||||
|
net/minecraft/src/CompressedStreamTools.func_35621_a(Lnet/minecraft/src/NBTTagCompound;Ljava/io/File;)V=java/io/IOException
|
||||||
|
net/minecraft/src/CompressedStreamTools.func_35622_a(Ljava/io/File;)Lnet/minecraft/src/NBTTagCompound;=java/io/IOException
|
||||||
|
net/minecraft/src/CompressedStreamTools.func_40591_a(Lnet/minecraft/src/NBTTagCompound;)[B=java/io/IOException
|
||||||
|
net/minecraft/src/CompressedStreamTools.func_40592_a([B)Lnet/minecraft/src/NBTTagCompound;=java/io/IOException
|
||||||
|
net/minecraft/src/DataWatcher.func_21125_a(Ljava/util/List;Ljava/io/DataOutputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/DataWatcher.func_21127_a(Ljava/io/DataOutputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/DataWatcher.func_21128_a(Ljava/io/DataOutputStream;Lnet/minecraft/src/WatchableObject;)V=java/io/IOException
|
||||||
|
net/minecraft/src/DataWatcher.func_21131_a(Ljava/io/DataInputStream;)Ljava/util/List;=java/io/IOException
|
||||||
|
net/minecraft/src/GuiMultiplayer.func_35328_b(Lnet/minecraft/src/ServerNBTStorage;)V=java/io/IOException
|
||||||
|
net/minecraft/src/GuiMultiplayer.func_35336_a(Lnet/minecraft/src/GuiMultiplayer;Lnet/minecraft/src/ServerNBTStorage;)V=java/io/IOException
|
||||||
|
net/minecraft/src/IChunkLoader.func_812_a(Lnet/minecraft/src/World;Lnet/minecraft/src/Chunk;)V=java/io/IOException
|
||||||
|
net/minecraft/src/IChunkLoader.func_813_a(Lnet/minecraft/src/World;II)Lnet/minecraft/src/Chunk;=java/io/IOException
|
||||||
|
net/minecraft/src/IChunkLoader.func_815_b(Lnet/minecraft/src/World;Lnet/minecraft/src/Chunk;)V=java/io/IOException
|
||||||
|
net/minecraft/src/J_CompactJsonFormatter.func_27328_a(Lnet/minecraft/src/J_JsonNode;Ljava/io/Writer;)V=java/io/IOException
|
||||||
|
net/minecraft/src/J_CompactJsonFormatter.func_27329_a(Lnet/minecraft/src/J_JsonRootNode;Ljava/io/Writer;)V=java/io/IOException
|
||||||
|
net/minecraft/src/J_JdomParser.func_27366_a(Ljava/io/Reader;)Lnet/minecraft/src/J_JsonRootNode;=net/minecraft/src/J_InvalidSyntaxException,java/io/IOException
|
||||||
|
net/minecraft/src/J_JdomParser.func_27367_a(Ljava/lang/String;)Lnet/minecraft/src/J_JsonRootNode;=net/minecraft/src/J_InvalidSyntaxException
|
||||||
|
net/minecraft/src/J_PositionTrackingPushbackReader.func_27333_c()I=java/io/IOException
|
||||||
|
net/minecraft/src/J_PositionTrackingPushbackReader.func_27334_a(C)V=java/io/IOException
|
||||||
|
net/minecraft/src/J_PositionTrackingPushbackReader.func_27336_b([C)I=java/io/IOException
|
||||||
|
net/minecraft/src/J_SajParser.func_27448_l(Lnet/minecraft/src/J_PositionTrackingPushbackReader;)I=java/io/IOException
|
||||||
|
net/minecraft/src/J_SajParser.func_27449_c(Lnet/minecraft/src/J_PositionTrackingPushbackReader;Lnet/minecraft/src/J_JsonListener;)V=net/minecraft/src/J_InvalidSyntaxException,java/io/IOException
|
||||||
|
net/minecraft/src/J_SajParser.func_27450_k(Lnet/minecraft/src/J_PositionTrackingPushbackReader;)I=java/io/IOException,net/minecraft/src/J_InvalidSyntaxException
|
||||||
|
net/minecraft/src/J_SajParser.func_27451_b(Lnet/minecraft/src/J_PositionTrackingPushbackReader;)Ljava/lang/String;=java/io/IOException,net/minecraft/src/J_InvalidSyntaxException
|
||||||
|
net/minecraft/src/J_SajParser.func_27452_i(Lnet/minecraft/src/J_PositionTrackingPushbackReader;)Ljava/lang/String;=net/minecraft/src/J_InvalidSyntaxException,java/io/IOException
|
||||||
|
net/minecraft/src/J_SajParser.func_27453_b(Lnet/minecraft/src/J_PositionTrackingPushbackReader;Lnet/minecraft/src/J_JsonListener;)V=net/minecraft/src/J_InvalidSyntaxException,java/io/IOException
|
||||||
|
net/minecraft/src/J_SajParser.func_27454_g(Lnet/minecraft/src/J_PositionTrackingPushbackReader;)Ljava/lang/String;=java/io/IOException,net/minecraft/src/J_InvalidSyntaxException
|
||||||
|
net/minecraft/src/J_SajParser.func_27455_a(Lnet/minecraft/src/J_PositionTrackingPushbackReader;Lnet/minecraft/src/J_JsonListener;)V=net/minecraft/src/J_InvalidSyntaxException,java/io/IOException
|
||||||
|
net/minecraft/src/J_SajParser.func_27456_e(Lnet/minecraft/src/J_PositionTrackingPushbackReader;)Ljava/lang/String;=java/io/IOException
|
||||||
|
net/minecraft/src/J_SajParser.func_27457_j(Lnet/minecraft/src/J_PositionTrackingPushbackReader;)C=java/io/IOException,net/minecraft/src/J_InvalidSyntaxException
|
||||||
|
net/minecraft/src/J_SajParser.func_27458_d(Lnet/minecraft/src/J_PositionTrackingPushbackReader;)C=java/io/IOException,net/minecraft/src/J_InvalidSyntaxException
|
||||||
|
net/minecraft/src/J_SajParser.func_27459_a(Lnet/minecraft/src/J_PositionTrackingPushbackReader;)Ljava/lang/String;=java/io/IOException,net/minecraft/src/J_InvalidSyntaxException
|
||||||
|
net/minecraft/src/J_SajParser.func_27460_c(Lnet/minecraft/src/J_PositionTrackingPushbackReader;)C=java/io/IOException,net/minecraft/src/J_InvalidSyntaxException
|
||||||
|
net/minecraft/src/J_SajParser.func_27461_h(Lnet/minecraft/src/J_PositionTrackingPushbackReader;)Ljava/lang/String;=java/io/IOException
|
||||||
|
net/minecraft/src/J_SajParser.func_27462_f(Lnet/minecraft/src/J_PositionTrackingPushbackReader;)Ljava/lang/String;=java/io/IOException,net/minecraft/src/J_InvalidSyntaxException
|
||||||
|
net/minecraft/src/J_SajParser.func_27463_a(Ljava/io/Reader;Lnet/minecraft/src/J_JsonListener;)V=net/minecraft/src/J_InvalidSyntaxException,java/io/IOException
|
||||||
|
net/minecraft/src/J_SajParser.func_27464_d(Lnet/minecraft/src/J_PositionTrackingPushbackReader;Lnet/minecraft/src/J_JsonListener;)V=net/minecraft/src/J_InvalidSyntaxException,java/io/IOException
|
||||||
|
net/minecraft/src/NBTBase.func_734_b(Ljava/io/DataInput;)Lnet/minecraft/src/NBTBase;=java/io/IOException
|
||||||
|
net/minecraft/src/NBTBase.func_735_a(Ljava/io/DataOutput;)V=java/io/IOException
|
||||||
|
net/minecraft/src/NBTBase.func_736_a(Ljava/io/DataInput;)V=java/io/IOException
|
||||||
|
net/minecraft/src/NBTBase.func_738_a(Lnet/minecraft/src/NBTBase;Ljava/io/DataOutput;)V=java/io/IOException
|
||||||
|
net/minecraft/src/NBTTagByte.func_735_a(Ljava/io/DataOutput;)V=java/io/IOException
|
||||||
|
net/minecraft/src/NBTTagByte.func_736_a(Ljava/io/DataInput;)V=java/io/IOException
|
||||||
|
net/minecraft/src/NBTTagByteArray.func_735_a(Ljava/io/DataOutput;)V=java/io/IOException
|
||||||
|
net/minecraft/src/NBTTagByteArray.func_736_a(Ljava/io/DataInput;)V=java/io/IOException
|
||||||
|
net/minecraft/src/NBTTagCompound.func_735_a(Ljava/io/DataOutput;)V=java/io/IOException
|
||||||
|
net/minecraft/src/NBTTagCompound.func_736_a(Ljava/io/DataInput;)V=java/io/IOException
|
||||||
|
net/minecraft/src/NBTTagDouble.func_735_a(Ljava/io/DataOutput;)V=java/io/IOException
|
||||||
|
net/minecraft/src/NBTTagDouble.func_736_a(Ljava/io/DataInput;)V=java/io/IOException
|
||||||
|
net/minecraft/src/NBTTagEnd.func_735_a(Ljava/io/DataOutput;)V=java/io/IOException
|
||||||
|
net/minecraft/src/NBTTagEnd.func_736_a(Ljava/io/DataInput;)V=java/io/IOException
|
||||||
|
net/minecraft/src/NBTTagFloat.func_735_a(Ljava/io/DataOutput;)V=java/io/IOException
|
||||||
|
net/minecraft/src/NBTTagFloat.func_736_a(Ljava/io/DataInput;)V=java/io/IOException
|
||||||
|
net/minecraft/src/NBTTagInt.func_735_a(Ljava/io/DataOutput;)V=java/io/IOException
|
||||||
|
net/minecraft/src/NBTTagInt.func_736_a(Ljava/io/DataInput;)V=java/io/IOException
|
||||||
|
net/minecraft/src/NBTTagList.func_735_a(Ljava/io/DataOutput;)V=java/io/IOException
|
||||||
|
net/minecraft/src/NBTTagList.func_736_a(Ljava/io/DataInput;)V=java/io/IOException
|
||||||
|
net/minecraft/src/NBTTagLong.func_735_a(Ljava/io/DataOutput;)V=java/io/IOException
|
||||||
|
net/minecraft/src/NBTTagLong.func_736_a(Ljava/io/DataInput;)V=java/io/IOException
|
||||||
|
net/minecraft/src/NBTTagShort.func_735_a(Ljava/io/DataOutput;)V=java/io/IOException
|
||||||
|
net/minecraft/src/NBTTagShort.func_736_a(Ljava/io/DataInput;)V=java/io/IOException
|
||||||
|
net/minecraft/src/NBTTagString.func_735_a(Ljava/io/DataOutput;)V=java/io/IOException
|
||||||
|
net/minecraft/src/NBTTagString.func_736_a(Ljava/io/DataInput;)V=java/io/IOException
|
||||||
|
net/minecraft/src/NetClientHandler.<init>(Lnet/minecraft/client/Minecraft;Ljava/lang/String;I)V=java/net/UnknownHostException,java/io/IOException
|
||||||
|
net/minecraft/src/NetworkManager.<init>(Ljava/net/Socket;Ljava/lang/String;Lnet/minecraft/src/NetHandler;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet.func_27048_a(Ljava/io/DataInputStream;I)Ljava/lang/String;=java/io/IOException
|
||||||
|
net/minecraft/src/Packet.func_27049_a(Ljava/lang/String;Ljava/io/DataOutputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet.func_324_b(Ljava/io/DataInputStream;Z)Lnet/minecraft/src/Packet;=java/io/IOException
|
||||||
|
net/minecraft/src/Packet.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet.func_328_a(Lnet/minecraft/src/Packet;Ljava/io/DataOutputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet.func_40186_c(Ljava/io/DataInputStream;)Lnet/minecraft/src/NBTTagCompound;=java/io/IOException
|
||||||
|
net/minecraft/src/Packet.func_40187_b(Ljava/io/DataInputStream;)Lnet/minecraft/src/ItemStack;=java/io/IOException
|
||||||
|
net/minecraft/src/Packet.func_40188_a(Lnet/minecraft/src/ItemStack;Ljava/io/DataOutputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet.func_40189_a(Lnet/minecraft/src/NBTTagCompound;Ljava/io/DataOutputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet0KeepAlive.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet0KeepAlive.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet100OpenWindow.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet100OpenWindow.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet101CloseWindow.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet101CloseWindow.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet102WindowClick.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet102WindowClick.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet103SetSlot.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet103SetSlot.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet104WindowItems.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet104WindowItems.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet105UpdateProgressbar.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet105UpdateProgressbar.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet106Transaction.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet106Transaction.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet107CreativeSetSlot.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet107CreativeSetSlot.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet108EnchantItem.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet108EnchantItem.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet10Flying.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet10Flying.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet11PlayerPosition.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet11PlayerPosition.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet12PlayerLook.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet12PlayerLook.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet130UpdateSign.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet130UpdateSign.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet131MapData.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet131MapData.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet13PlayerLookMove.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet13PlayerLookMove.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet14BlockDig.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet14BlockDig.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet15Place.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet15Place.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet16BlockItemSwitch.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet16BlockItemSwitch.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet17Sleep.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet17Sleep.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet18Animation.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet18Animation.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet19EntityAction.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet19EntityAction.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet1Login.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet1Login.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet200Statistic.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet200Statistic.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet201PlayerInfo.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet201PlayerInfo.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet20NamedEntitySpawn.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet20NamedEntitySpawn.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet21PickupSpawn.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet21PickupSpawn.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet22Collect.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet22Collect.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet23VehicleSpawn.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet23VehicleSpawn.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet24MobSpawn.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet24MobSpawn.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet254ServerPing.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet254ServerPing.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet255KickDisconnect.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet255KickDisconnect.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet25EntityPainting.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet25EntityPainting.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet26EntityExpOrb.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet26EntityExpOrb.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet27Position.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet27Position.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet28EntityVelocity.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet28EntityVelocity.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet29DestroyEntity.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet29DestroyEntity.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet2Handshake.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet2Handshake.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet30Entity.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet30Entity.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet31RelEntityMove.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet31RelEntityMove.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet32EntityLook.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet32EntityLook.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet33RelEntityMoveLook.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet33RelEntityMoveLook.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet34EntityTeleport.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet34EntityTeleport.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet38EntityStatus.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet38EntityStatus.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet39AttachEntity.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet39AttachEntity.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet3Chat.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet3Chat.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet40EntityMetadata.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet40EntityMetadata.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet41EntityEffect.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet41EntityEffect.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet42RemoveEntityEffect.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet42RemoveEntityEffect.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet43Experience.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet43Experience.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet4UpdateTime.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet4UpdateTime.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet50PreChunk.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet50PreChunk.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet51MapChunk.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet51MapChunk.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet52MultiBlockChange.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet52MultiBlockChange.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet53BlockChange.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet53BlockChange.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet54PlayNoteBlock.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet54PlayNoteBlock.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet5PlayerInventory.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet5PlayerInventory.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet60Explosion.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet60Explosion.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet61DoorChange.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet61DoorChange.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet6SpawnPosition.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet6SpawnPosition.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet70Bed.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet70Bed.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet71Weather.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet71Weather.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet7UseEntity.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet7UseEntity.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet8UpdateHealth.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet8UpdateHealth.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet9Respawn.func_322_a(Ljava/io/DataOutputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet9Respawn.func_327_a(Ljava/io/DataInputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/RegionFile.func_22196_b()V=java/io/IOException
|
||||||
|
net/minecraft/src/RegionFile.func_22198_a(III)V=java/io/IOException
|
||||||
|
net/minecraft/src/RegionFile.func_22200_a(I[BI)V=java/io/IOException
|
||||||
|
net/minecraft/src/RegionFile.func_22208_b(III)V=java/io/IOException
|
||||||
|
net/minecraft/src/RenderEngine.func_6526_a(Ljava/io/InputStream;)Ljava/awt/image/BufferedImage;=java/io/IOException
|
||||||
|
net/minecraft/src/StatsSyncher.func_27410_a(Ljava/util/Map;Ljava/io/File;Ljava/io/File;Ljava/io/File;)V=java/io/IOException
|
||||||
|
net/minecraft/src/StatsSyncher.func_27412_a(Lnet/minecraft/src/StatsSyncher;Ljava/util/Map;Ljava/io/File;Ljava/io/File;Ljava/io/File;)V=java/io/IOException
|
||||||
|
net/minecraft/src/TexturePackBase.func_6485_a(Lnet/minecraft/client/Minecraft;)V=java/io/IOException
|
||||||
|
net/minecraft/src/TexturePackCustom.func_6485_a(Lnet/minecraft/client/Minecraft;)V=java/io/IOException
|
||||||
|
net/minecraft/src/ThreadDownloadResources.func_1212_a(Ljava/net/URL;Ljava/io/File;J)V=java/io/IOException
|
||||||
|
net/minecraft/src/ThreadedChunkLoader.func_40551_a(Lnet/minecraft/src/ThreadedChunkLoaderPending;)V=java/io/IOException
|
||||||
|
net/minecraft/src/ThreadedChunkLoader.func_813_a(Lnet/minecraft/src/World;II)Lnet/minecraft/src/Chunk;=java/io/IOException
|
||||||
|
net/minecraft/src/ThreadedFileIOBase.func_40566_a()V=java/lang/InterruptedException
|
||||||
File diff suppressed because it is too large.
Load diff
@@ -0,0 +1,139 @@
|
|||||||
|
[DEFAULT]
|
||||||
|
DirTemp = temp
|
||||||
|
DirSrc = src
|
||||||
|
DirLogs = logs
|
||||||
|
DirBin = bin
|
||||||
|
DirJars = jars
|
||||||
|
DirReobf = reobf
|
||||||
|
DirConf = conf
|
||||||
|
DirRuntime = runtime
|
||||||
|
DirLib = lib
|
||||||
|
DirFFOut = temp/ffout
|
||||||
|
|
||||||
|
[CSV]
|
||||||
|
Classes = %(DirConf)s/classes.csv
|
||||||
|
Methods = %(DirConf)s/methods.csv
|
||||||
|
Fields = %(DirConf)s/fields.csv
|
||||||
|
|
||||||
|
[SRGS]
|
||||||
|
Client = %(DirTemp)s/client_rg.srg
|
||||||
|
Server = %(DirTemp)s/server_rg.srg
|
||||||
|
|
||||||
|
[JAR]
|
||||||
|
DirNatives = %(DirJars)s/bin/natives
|
||||||
|
Client = %(DirJars)s/bin/minecraft.jar
|
||||||
|
Server = %(DirJars)s/minecraft_server.jar
|
||||||
|
MD5Client = 3820d222b95d0b8c520d9596a756a6e6
|
||||||
|
MD5Server = 934b6010999daa1f1b1ccdf4cb77e052
|
||||||
|
|
||||||
|
[RETROGUARD]
|
||||||
|
Location = %(DirRuntime)s/bin/retroguard.jar
|
||||||
|
RetroConf = %(DirTemp)s/retroguard.cfg
|
||||||
|
RetroReobConf = %(DirTemp)s/retroguard_ro.cfg
|
||||||
|
ClientConf = %(DirTemp)s/client_rg.cfg
|
||||||
|
ServerConf = %(DirTemp)s/server_rg.cfg
|
||||||
|
ClientReobConf = %(DirTemp)s/client_ro.cfg
|
||||||
|
ServerReobConf = %(DirTemp)s/server_ro.cfg
|
||||||
|
ClientOut = %(DirTemp)s/minecraft_rg.jar
|
||||||
|
ServerOut = %(DirTemp)s/minecraft_server_rg.jar
|
||||||
|
ClientLog = %(DirLogs)s/client_rg.log
|
||||||
|
ServerLog = %(DirLogs)s/server_rg.log
|
||||||
|
ClientDeobLog = %(DirLogs)s/client_deob.log
|
||||||
|
ServerDeobLog = %(DirLogs)s/server_deob.log
|
||||||
|
|
||||||
|
[EXCEPTOR]
|
||||||
|
XClientCfg = %(DirConf)s/client.exc
|
||||||
|
XServerCfg = %(DirConf)s/server.exc
|
||||||
|
XClientOut = %(DirTemp)s/minecraft_exc.jar
|
||||||
|
XServerOut = %(DirTemp)s/minecraft_server_exc.jar
|
||||||
|
XClientLog = %(DirLogs)s/client_exc.log
|
||||||
|
XServerLog = %(DirLogs)s/server_exc.log
|
||||||
|
|
||||||
|
[DECOMPILE]
|
||||||
|
FFClientConf = -rbr=0 -dgs=1 -asc=1
|
||||||
|
FFServerConf = -rbr=0 -dgs=1 -asc=1
|
||||||
|
FFClientOut = %(DirFFOut)s/client
|
||||||
|
FFServerOut = %(DirFFOut)s/server
|
||||||
|
FFClientSrc = %(DirFFOut)s/minecraft_exc.jar
|
||||||
|
FFServerSrc = %(DirFFOut)s/minecraft_server_exc.jar
|
||||||
|
FFSource = net
|
||||||
|
|
||||||
|
[OUTPUT]
|
||||||
|
BinOut = %(DirTemp)s/bin
|
||||||
|
BinClient = %(DirTemp)s/bin/minecraft
|
||||||
|
BinServer = %(DirTemp)s/bin/minecraft_server
|
||||||
|
SrcClient = %(DirSrc)s/minecraft
|
||||||
|
SrcServer = %(DirSrc)s/minecraft_server
|
||||||
|
|
||||||
|
[PACKAGES]
|
||||||
|
PkgClient = net/minecraft/src,net/minecraft/client
|
||||||
|
PkgServer = net/minecraft/src,net/minecraft/server
|
||||||
|
|
||||||
|
[PATCHES]
|
||||||
|
PatchClient = %(DirConf)s/patches/minecraft.patch
|
||||||
|
PatchServer = %(DirConf)s/patches/minecraft_server.patch
|
||||||
|
PatchTemp = %(DirTemp)s/temp.patch
|
||||||
|
FFPatchClient = %(DirConf)s/patches/minecraft_ff.patch
|
||||||
|
FFPatchServer = %(DirConf)s/patches/minecraft_server_ff.patch
|
||||||
|
|
||||||
|
[RECOMPILE]
|
||||||
|
BinClient = %(DirBin)s/minecraft
|
||||||
|
BinServer = %(DirBin)s/minecraft_server
|
||||||
|
ClassPathClient = %(DirLib)s/,%(DirLib)s/*,%(DirJars)s/bin/minecraft.jar,%(DirJars)s/bin/jinput.jar,%(DirJars)s/bin/lwjgl.jar,%(DirJars)s/bin/lwjgl_util.jar
|
||||||
|
ClassPathServer = %(DirLib)s/,%(DirLib)s/*,%(DirJars)s/minecraft_server.jar
|
||||||
|
ClientFixes = %(DirConf)s/patches
|
||||||
|
|
||||||
|
[REOBF]
|
||||||
|
SAFFXClient = %(DirTemp)s/minecraft.saffx
|
||||||
|
SAFFXServer = %(DirTemp)s/minecraft_server.saffx
|
||||||
|
MD5Client = %(DirTemp)s/client.md5
|
||||||
|
MD5Server = %(DirTemp)s/server.md5
|
||||||
|
MD5PreReobfClient = %(DirTemp)s/client_reobf.md5
|
||||||
|
MD5PreReobfServer = %(DirTemp)s/server_reobf.md5
|
||||||
|
ObfSRGClient = %(DirTemp)s/client_ro.srg
|
||||||
|
ObfSRGServer = %(DirTemp)s/server_ro.srg
|
||||||
|
RecompJarClient = %(DirTemp)s/client_recomp.jar
|
||||||
|
RecompJarServer = %(DirTemp)s/server_recomp.jar
|
||||||
|
ObfJarClient = %(DirTemp)s/client_reobf.jar
|
||||||
|
ObfJarServer = %(DirTemp)s/server_reobf.jar
|
||||||
|
ReobfDirClient = %(DirReobf)s/minecraft
|
||||||
|
ReobfDirServer = %(DirReobf)s/minecraft_server
|
||||||
|
ReobfClientLog = %(DirLogs)s/client_reob.log
|
||||||
|
ReobfServerLog = %(DirLogs)s/server_reob.log
|
||||||
|
FixSound = minecraft/me.class
|
||||||
|
FixStart = minecraft/Start.class
|
||||||
|
NullPkg = net/minecraft/src
|
||||||
|
IgnorePkg = paulscode,com/jcraft,isom,ibxm,de/matthiasmann/twl,org/xmlpull,javax/xml
|
||||||
|
|
||||||
|
[GETMODSOURCE]
|
||||||
|
OutSRCClient = modsrc/client
|
||||||
|
OutSRCServer = modsrc/server
|
||||||
|
OutSRC = modsrc
|
||||||
|
|
||||||
|
[MCP]
|
||||||
|
LogFile = %(DirLogs)s/mcp.log
|
||||||
|
LogFileErr = %(DirLogs)s/mcperr.log
|
||||||
|
|
||||||
|
[COMMANDS]
|
||||||
|
Patcher = %(DirRuntime)s/bin/applydiff.exe
|
||||||
|
JadRetro = %(DirRuntime)s/bin/jadretro.jar
|
||||||
|
Fernflower = %(DirRuntime)s/bin/fernflower.jar
|
||||||
|
Jadwin = %(DirRuntime)s/bin/jad.exe
|
||||||
|
Jadlinux = %(DirRuntime)s/bin/jad.exe
|
||||||
|
Jadosx = %(DirRuntime)s/bin/jad-osx
|
||||||
|
Exceptor = %(DirRuntime)s/bin/exceptor.jar
|
||||||
|
CmdRG = %s -cp {classpath} RetroGuard -searge {conffile}
|
||||||
|
CmdRGReobf = %s -cp {classpath} RetroGuard -notch {conffile}
|
||||||
|
CmdJadretro = %s -jar {jarjr} {targetdir}
|
||||||
|
CmdRecompClt = %s -g -source 1.6 -target 1.6 -classpath "{classpath}" -sourcepath {sourcepath} -d {outpath} {pkgs} {fixes}/*.java
|
||||||
|
CmdRecompSrv = %s -g -source 1.6 -target 1.6 -classpath "{classpath}" -sourcepath {sourcepath} -d {outpath} {pkgs}
|
||||||
|
CmdStartSrv = %s -Xincgc -Xms1024M -Xmx1024M -cp "{classpath}" net.minecraft.server.MinecraftServer
|
||||||
|
CmdStartClt = %s -Xincgc -Xms1024M -Xmx1024M -cp "{classpath}" -Djava.library.path={natives} Start
|
||||||
|
CmdJadwin = .\{binjad} -b -d {outdir} -dead -o -r -s .java -stat -v -ff {classes}
|
||||||
|
CmdJadlinux = wine {binjad} -b -d {outdir} -dead -o -r -s .java -stat -v -ff "{classes}"
|
||||||
|
CmdJadosx = {binjad} -b -d {outdir} -dead -o -r -s .java -stat -v -ff {classes}
|
||||||
|
CmdPatchwin = .\%(Patcher)s --binary -p1 -u -i ..\..\{patchfile} -d {srcdir}
|
||||||
|
CmdPatchlinux = patch --binary -p1 -u -i ../../{patchfile} -d {srcdir}
|
||||||
|
CmdPatchosx = patch --binary -p1 -u -i ../../{patchfile} -d {srcdir}
|
||||||
|
CmdFernflower = %s -jar {jarff} {conf} {jarin} {jarout}
|
||||||
|
CmdExceptor = %s -jar {jarexc} {input} {output} {conf} {log}
|
||||||
File diff suppressed because it is too large.
Load diff
@@ -0,0 +1,27 @@
|
|||||||
|
import java.io.File;
|
||||||
|
import java.lang.reflect.Field;
|
||||||
|
|
||||||
|
import net.minecraft.client.Minecraft;
|
||||||
|
|
||||||
|
public class Start
|
||||||
|
{
|
||||||
|
public static void main(String[] args)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
// set new minecraft data folder to prevent it from using the .minecraft folder
|
||||||
|
// this makes it a portable version
|
||||||
|
Field f = Minecraft.class.getDeclaredField("minecraftDir");
|
||||||
|
Field.setAccessible(new Field[] { f }, true);
|
||||||
|
f.set(null, new File("."));
|
||||||
|
}
|
||||||
|
catch (Exception e)
|
||||||
|
{
|
||||||
|
e.printStackTrace();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// start minecraft game application
|
||||||
|
Minecraft.main(args);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,10 @@
|
|||||||
|
// this is needed for the sound engine to work with deobfuscated sourcecode without crashing
|
||||||
|
|
||||||
|
public class me
|
||||||
|
{
|
||||||
|
public static int c(double d)
|
||||||
|
{
|
||||||
|
int i = (int)d;
|
||||||
|
return d >= (double)i ? i : i - 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
File diff suppressed because it is too large.
Load diff
@@ -0,0 +1,109 @@
|
|||||||
|
diff -r -U 3 minecraft\net\minecraft\client\Minecraft.java minecraft_patched\net\minecraft\client\Minecraft.java
|
||||||
|
--- minecraft\net\minecraft\client\Minecraft.java Tue Nov 22 23:21:44 2011
|
||||||
|
+++ minecraft_patched\net\minecraft\client\Minecraft.java Wed Nov 23 00:09:14 2011
|
||||||
|
@@ -1600,11 +1600,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 Tue Nov 22 23:21:36 2011
|
||||||
|
+++ minecraft_patched\net\minecraft\src\CodecMus.java Wed Nov 23 00:09:14 2011
|
||||||
|
@@ -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() {
|
||||||
|
- 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\ItemMap.java minecraft_patched\net\minecraft\src\ItemMap.java
|
||||||
|
--- minecraft\net\minecraft\src\ItemMap.java Tue Nov 22 23:21:24 2011
|
||||||
|
+++ minecraft_patched\net\minecraft\src\ItemMap.java Wed Nov 23 00:09:14 2011
|
||||||
|
@@ -19,7 +19,6 @@
|
||||||
|
}
|
||||||
|
|
||||||
|
public static MapData func_28013_a(short var0, World var1) {
|
||||||
|
- "map_" + var0;
|
||||||
|
MapData var3 = (MapData)var1.func_28103_a(MapData.class, "map_" + var0);
|
||||||
|
if(var3 == null) {
|
||||||
|
int var4 = var1.func_28101_b("map");
|
||||||
|
@@ -32,7 +31,6 @@
|
||||||
|
}
|
||||||
|
|
||||||
|
public MapData func_28012_a(ItemStack var1, World var2) {
|
||||||
|
- "map_" + var1.func_21181_i();
|
||||||
|
MapData var4 = (MapData)var2.func_28103_a(MapData.class, "map_" + var1.func_21181_i());
|
||||||
|
if(var4 == null) {
|
||||||
|
var1.func_28156_b(var2.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 Tue Nov 22 23:21:24 2011
|
||||||
|
+++ minecraft_patched\net\minecraft\src\MusInputStream.java Wed Nov 23 00:09:14 2011
|
||||||
|
@@ -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;
|
||||||
|
@@ -28,7 +29,12 @@
|
||||||
|
}
|
||||||
|
|
||||||
|
public int read(byte[] var1, int var2, int var3) {
|
||||||
|
- var3 = this.field_1515_d.read(var1, var2, var3);
|
||||||
|
+ try {
|
||||||
|
+ var3 = this.field_1515_d.read(var1, var2, var3);
|
||||||
|
+ }
|
||||||
|
+ catch (IOException e) {
|
||||||
|
+ return 0;
|
||||||
|
+ }
|
||||||
|
|
||||||
|
for(int var4 = 0; var4 < var3; ++var4) {
|
||||||
|
byte var5 = var1[var2 + var4] = (byte)(var1[var2 + var4] ^ this.field_1516_c >> 8);
|
||||||
|
diff -r -U 3 minecraft\net\minecraft\src\RenderGlobal.java minecraft_patched\net\minecraft\src\RenderGlobal.java
|
||||||
|
--- minecraft\net\minecraft\src\RenderGlobal.java Tue Nov 22 23:21:20 2011
|
||||||
|
+++ minecraft_patched\net\minecraft\src\RenderGlobal.java Wed Nov 23 00:10:20 2011
|
||||||
|
@@ -1466,7 +1466,7 @@
|
||||||
|
double var15 = this.field_1439_t.field_22009_h.field_611_ak - var2;
|
||||||
|
double var17 = this.field_1439_t.field_22009_h.field_610_al - var4;
|
||||||
|
double var19 = this.field_1439_t.field_22009_h.field_609_am - var6;
|
||||||
|
- Object var21 = null;
|
||||||
|
+ EntityFX var21 = null;
|
||||||
|
if(var1.equals("hugeexplosion")) {
|
||||||
|
this.field_1439_t.field_6321_h.func_1192_a(var21 = new EntityHugeExplodeFX(this.field_1448_k, var2, var4, var6, var8, var10, var12));
|
||||||
|
} else if(var1.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 Tue Nov 22 23:21:30 2011
|
||||||
|
+++ minecraft_patched\net\minecraft\src\ThreadedFileIOBase.java Wed Nov 23 00:09:14 2011
|
||||||
|
@@ -21,7 +21,9 @@
|
||||||
|
}
|
||||||
|
|
||||||
|
public void run() {
|
||||||
|
- this.func_40568_b();
|
||||||
|
+ while (true) {
|
||||||
|
+ this.func_40568_b();
|
||||||
|
+ }
|
||||||
|
}
|
||||||
|
|
||||||
|
private void func_40568_b() {
|
||||||
File diff suppressed because it is too large.
Load diff
@@ -0,0 +1,26 @@
|
|||||||
|
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 Nov 22 23:21:56 2011
|
||||||
|
+++ minecraft_server_patched\net\minecraft\src\ItemMap.java Wed Nov 23 00:09:45 2011
|
||||||
|
@@ -22,7 +22,6 @@
|
||||||
|
}
|
||||||
|
|
||||||
|
public MapData func_28023_a(ItemStack var1, World var2) {
|
||||||
|
- "map_" + var1.func_21125_h();
|
||||||
|
MapData var4 = (MapData)var2.func_28103_a(MapData.class, "map_" + var1.func_21125_h());
|
||||||
|
if(var4 == null) {
|
||||||
|
var1.func_28145_b(var2.func_28104_b("map"));
|
||||||
|
diff -r -U 3 minecraft_server\net\minecraft\src\RConThreadClient.java minecraft_server_patched\net\minecraft\src\RConThreadClient.java
|
||||||
|
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 Nov 22 23:22:10 2011
|
||||||
|
+++ minecraft_server_patched\net\minecraft\src\ThreadedFileIOBase.java Wed Nov 23 00:09:45 2011
|
||||||
|
@@ -21,7 +21,9 @@
|
||||||
|
}
|
||||||
|
|
||||||
|
public void run() {
|
||||||
|
- this.func_40509_b();
|
||||||
|
+ while (true) {
|
||||||
|
+ this.func_40509_b();
|
||||||
|
+ }
|
||||||
|
}
|
||||||
|
|
||||||
|
private void func_40509_b() {
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
Now it is YOURCRAFT!
|
||||||
@@ -0,0 +1,202 @@
|
|||||||
|
net/minecraft/server/MinecraftServer.func_6008_d()Z=java/net/UnknownHostException
|
||||||
|
net/minecraft/src/ChunkLoader.func_4104_b(Lnet/minecraft/src/World;Lnet/minecraft/src/Chunk;)V=java/io/IOException
|
||||||
|
net/minecraft/src/ChunkLoader.func_659_a(Lnet/minecraft/src/World;II)Lnet/minecraft/src/Chunk;=java/io/IOException
|
||||||
|
net/minecraft/src/ChunkLoader.func_662_a(Lnet/minecraft/src/World;Lnet/minecraft/src/Chunk;)V=java/io/IOException
|
||||||
|
net/minecraft/src/CompressedStreamTools.func_40515_a([B)Lnet/minecraft/src/NBTTagCompound;=java/io/IOException
|
||||||
|
net/minecraft/src/CompressedStreamTools.func_40516_a(Lnet/minecraft/src/NBTTagCompound;)[B=java/io/IOException
|
||||||
|
net/minecraft/src/CompressedStreamTools.func_769_a(Lnet/minecraft/src/NBTTagCompound;Ljava/io/OutputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/CompressedStreamTools.func_770_a(Ljava/io/InputStream;)Lnet/minecraft/src/NBTTagCompound;=java/io/IOException
|
||||||
|
net/minecraft/src/CompressedStreamTools.func_771_a(Lnet/minecraft/src/NBTTagCompound;Ljava/io/DataOutput;)V=java/io/IOException
|
||||||
|
net/minecraft/src/CompressedStreamTools.func_774_a(Ljava/io/DataInput;)Lnet/minecraft/src/NBTTagCompound;=java/io/IOException
|
||||||
|
net/minecraft/src/DataWatcher.func_21149_a(Ljava/io/DataInputStream;)Ljava/util/List;=java/io/IOException
|
||||||
|
net/minecraft/src/DataWatcher.func_21151_a(Ljava/util/List;Ljava/io/DataOutputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/DataWatcher.func_21152_a(Ljava/io/DataOutputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/DataWatcher.func_21154_a(Ljava/io/DataOutputStream;Lnet/minecraft/src/WatchableObject;)V=java/io/IOException
|
||||||
|
net/minecraft/src/IChunkLoader.func_4104_b(Lnet/minecraft/src/World;Lnet/minecraft/src/Chunk;)V=java/io/IOException
|
||||||
|
net/minecraft/src/IChunkLoader.func_659_a(Lnet/minecraft/src/World;II)Lnet/minecraft/src/Chunk;=java/io/IOException
|
||||||
|
net/minecraft/src/IChunkLoader.func_662_a(Lnet/minecraft/src/World;Lnet/minecraft/src/Chunk;)V=java/io/IOException
|
||||||
|
net/minecraft/src/NBTBase.func_380_a(Lnet/minecraft/src/NBTBase;Ljava/io/DataOutput;)V=java/io/IOException
|
||||||
|
net/minecraft/src/NBTBase.func_381_a(Ljava/io/DataOutput;)V=java/io/IOException
|
||||||
|
net/minecraft/src/NBTBase.func_382_a(Ljava/io/DataInput;)V=java/io/IOException
|
||||||
|
net/minecraft/src/NBTBase.func_383_b(Ljava/io/DataInput;)Lnet/minecraft/src/NBTBase;=java/io/IOException
|
||||||
|
net/minecraft/src/NBTTagByte.func_381_a(Ljava/io/DataOutput;)V=java/io/IOException
|
||||||
|
net/minecraft/src/NBTTagByte.func_382_a(Ljava/io/DataInput;)V=java/io/IOException
|
||||||
|
net/minecraft/src/NBTTagByteArray.func_381_a(Ljava/io/DataOutput;)V=java/io/IOException
|
||||||
|
net/minecraft/src/NBTTagByteArray.func_382_a(Ljava/io/DataInput;)V=java/io/IOException
|
||||||
|
net/minecraft/src/NBTTagCompound.func_381_a(Ljava/io/DataOutput;)V=java/io/IOException
|
||||||
|
net/minecraft/src/NBTTagCompound.func_382_a(Ljava/io/DataInput;)V=java/io/IOException
|
||||||
|
net/minecraft/src/NBTTagDouble.func_381_a(Ljava/io/DataOutput;)V=java/io/IOException
|
||||||
|
net/minecraft/src/NBTTagDouble.func_382_a(Ljava/io/DataInput;)V=java/io/IOException
|
||||||
|
net/minecraft/src/NBTTagEnd.func_381_a(Ljava/io/DataOutput;)V=java/io/IOException
|
||||||
|
net/minecraft/src/NBTTagEnd.func_382_a(Ljava/io/DataInput;)V=java/io/IOException
|
||||||
|
net/minecraft/src/NBTTagFloat.func_381_a(Ljava/io/DataOutput;)V=java/io/IOException
|
||||||
|
net/minecraft/src/NBTTagFloat.func_382_a(Ljava/io/DataInput;)V=java/io/IOException
|
||||||
|
net/minecraft/src/NBTTagInt.func_381_a(Ljava/io/DataOutput;)V=java/io/IOException
|
||||||
|
net/minecraft/src/NBTTagInt.func_382_a(Ljava/io/DataInput;)V=java/io/IOException
|
||||||
|
net/minecraft/src/NBTTagList.func_381_a(Ljava/io/DataOutput;)V=java/io/IOException
|
||||||
|
net/minecraft/src/NBTTagList.func_382_a(Ljava/io/DataInput;)V=java/io/IOException
|
||||||
|
net/minecraft/src/NBTTagLong.func_381_a(Ljava/io/DataOutput;)V=java/io/IOException
|
||||||
|
net/minecraft/src/NBTTagLong.func_382_a(Ljava/io/DataInput;)V=java/io/IOException
|
||||||
|
net/minecraft/src/NBTTagShort.func_381_a(Ljava/io/DataOutput;)V=java/io/IOException
|
||||||
|
net/minecraft/src/NBTTagShort.func_382_a(Ljava/io/DataInput;)V=java/io/IOException
|
||||||
|
net/minecraft/src/NBTTagString.func_381_a(Ljava/io/DataOutput;)V=java/io/IOException
|
||||||
|
net/minecraft/src/NBTTagString.func_382_a(Ljava/io/DataInput;)V=java/io/IOException
|
||||||
|
net/minecraft/src/NetLoginHandler.<init>(Lnet/minecraft/server/MinecraftServer;Ljava/net/Socket;Ljava/lang/String;)V=java/io/IOException
|
||||||
|
net/minecraft/src/NetworkListenThread.<init>(Lnet/minecraft/server/MinecraftServer;Ljava/net/InetAddress;I)V=java/io/IOException
|
||||||
|
net/minecraft/src/NetworkManager.<init>(Ljava/net/Socket;Ljava/lang/String;Lnet/minecraft/src/NetHandler;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet.func_27037_a(Ljava/io/DataInputStream;I)Ljava/lang/String;=java/io/IOException
|
||||||
|
net/minecraft/src/Packet.func_27038_a(Ljava/lang/String;Ljava/io/DataOutputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet.func_40259_c(Ljava/io/DataInputStream;)Lnet/minecraft/src/NBTTagCompound;=java/io/IOException
|
||||||
|
net/minecraft/src/Packet.func_40260_a(Lnet/minecraft/src/NBTTagCompound;Ljava/io/DataOutputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet.func_40261_a(Lnet/minecraft/src/ItemStack;Ljava/io/DataOutputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet.func_40262_b(Ljava/io/DataInputStream;)Lnet/minecraft/src/ItemStack;=java/io/IOException
|
||||||
|
net/minecraft/src/Packet.func_65_b(Ljava/io/DataInputStream;Z)Lnet/minecraft/src/Packet;=java/io/IOException
|
||||||
|
net/minecraft/src/Packet.func_66_a(Lnet/minecraft/src/Packet;Ljava/io/DataOutputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet0KeepAlive.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet0KeepAlive.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet100OpenWindow.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet100OpenWindow.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet101CloseWindow.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet101CloseWindow.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet102WindowClick.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet102WindowClick.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet103SetSlot.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet103SetSlot.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet104WindowItems.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet104WindowItems.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet105UpdateProgressbar.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet105UpdateProgressbar.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet106Transaction.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet106Transaction.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet107CreativeSetSlot.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet107CreativeSetSlot.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet108EnchantItem.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet108EnchantItem.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet10Flying.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet10Flying.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet11PlayerPosition.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet11PlayerPosition.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet12PlayerLook.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet12PlayerLook.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet130UpdateSign.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet130UpdateSign.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet131MapData.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet131MapData.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet13PlayerLookMove.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet13PlayerLookMove.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet14BlockDig.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet14BlockDig.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet15Place.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet15Place.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet16BlockItemSwitch.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet16BlockItemSwitch.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet17Sleep.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet17Sleep.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet18Animation.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet18Animation.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet19EntityAction.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet19EntityAction.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet1Login.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet1Login.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet200Statistic.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet200Statistic.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet201PlayerInfo.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet201PlayerInfo.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet20NamedEntitySpawn.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet20NamedEntitySpawn.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet21PickupSpawn.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet21PickupSpawn.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet22Collect.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet22Collect.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet23VehicleSpawn.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet23VehicleSpawn.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet24MobSpawn.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet24MobSpawn.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet255KickDisconnect.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet255KickDisconnect.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet25EntityPainting.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet25EntityPainting.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet26EntityExpOrb.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet26EntityExpOrb.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet27Position.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet27Position.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet28EntityVelocity.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet28EntityVelocity.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet29DestroyEntity.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet29DestroyEntity.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet2Handshake.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet2Handshake.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet30Entity.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet30Entity.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet31RelEntityMove.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet31RelEntityMove.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet32EntityLook.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet32EntityLook.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet33RelEntityMoveLook.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet33RelEntityMoveLook.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet34EntityTeleport.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet34EntityTeleport.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet38EntityStatus.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet38EntityStatus.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet39AttachEntity.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet39AttachEntity.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet3Chat.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet3Chat.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet40EntityMetadata.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet40EntityMetadata.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet41EntityEffect.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet41EntityEffect.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet42RemoveEntityEffect.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet42RemoveEntityEffect.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet43Experience.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet43Experience.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet4UpdateTime.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet4UpdateTime.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet50PreChunk.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet50PreChunk.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet51MapChunk.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet51MapChunk.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet52MultiBlockChange.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet52MultiBlockChange.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet53BlockChange.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet53BlockChange.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet54PlayNoteBlock.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet54PlayNoteBlock.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet5PlayerInventory.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet5PlayerInventory.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet60Explosion.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet60Explosion.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet61DoorChange.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet61DoorChange.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet6SpawnPosition.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet6SpawnPosition.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet70Bed.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet70Bed.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet71Weather.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet71Weather.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet7UseEntity.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet7UseEntity.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet8UpdateHealth.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet8UpdateHealth.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet9Respawn.func_68_a(Ljava/io/DataOutputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/Packet9Respawn.func_70_a(Ljava/io/DataInputStream;)V=java/io/IOException
|
||||||
|
net/minecraft/src/RConOutputStream.func_40393_a(I)V=java/io/IOException
|
||||||
|
net/minecraft/src/RConOutputStream.func_40394_a(S)V=java/io/IOException
|
||||||
|
net/minecraft/src/RConOutputStream.func_40396_a([B)V=java/io/IOException
|
||||||
|
net/minecraft/src/RConOutputStream.func_40397_a(Ljava/lang/String;)V=java/io/IOException
|
||||||
|
net/minecraft/src/RConThreadClient.func_40453_a(IILjava/lang/String;)V=java/io/IOException
|
||||||
|
net/minecraft/src/RConThreadClient.func_40454_e()V=java/io/IOException
|
||||||
|
net/minecraft/src/RConThreadClient.func_40455_a(ILjava/lang/String;)V=java/io/IOException
|
||||||
|
net/minecraft/src/RConThreadQuery.func_40428_a([BLjava/net/DatagramPacket;)V=java/net/SocketException,java/io/IOException
|
||||||
|
net/minecraft/src/RConThreadQuery.func_40430_a(Ljava/net/DatagramPacket;)Z=java/io/IOException
|
||||||
|
net/minecraft/src/RConThreadQuery.func_40431_d(Ljava/net/DatagramPacket;)V=java/net/SocketException,java/io/IOException
|
||||||
|
net/minecraft/src/RConThreadQuery.func_40434_b(Ljava/net/DatagramPacket;)[B=java/io/IOException
|
||||||
|
net/minecraft/src/RegionFile.func_22126_b()V=java/io/IOException
|
||||||
|
net/minecraft/src/RegionFile.func_22128_a(III)V=java/io/IOException
|
||||||
|
net/minecraft/src/RegionFile.func_22130_a(I[BI)V=java/io/IOException
|
||||||
|
net/minecraft/src/RegionFile.func_22138_b(III)V=java/io/IOException
|
||||||
|
net/minecraft/src/ThreadedChunkLoader.func_40325_a(Lnet/minecraft/src/ThreadedChunkLoaderPending;)V=java/io/IOException
|
||||||
|
net/minecraft/src/ThreadedChunkLoader.func_659_a(Lnet/minecraft/src/World;II)Lnet/minecraft/src/Chunk;=java/io/IOException
|
||||||
|
net/minecraft/src/ThreadedFileIOBase.func_40508_a()V=java/lang/InterruptedException
|
||||||
@@ -0,0 +1,4 @@
|
|||||||
|
[VERSION]
|
||||||
|
MCPVersion = 5.0
|
||||||
|
ClientVersion = 1.0.0
|
||||||
|
ServerVersion = 1.0.1
|
||||||
@@ -160,6 +160,18 @@ public class ForgeHooksClient {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static String getTexture(String def, Object item)
|
||||||
|
{
|
||||||
|
if (item instanceof ITextureProvider)
|
||||||
|
{
|
||||||
|
return ((ITextureProvider)item).getTextureFile();
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
return def;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public static void renderCustomItem(ICustomItemRenderer customRenderer, RenderBlocks renderBlocks,int itemID, int meta, float f) {
|
public static void renderCustomItem(ICustomItemRenderer customRenderer, RenderBlocks renderBlocks,int itemID, int meta, float f) {
|
||||||
Tessellator tessellator = Tessellator.instance;
|
Tessellator tessellator = Tessellator.instance;
|
||||||
if (renderBlocks.useInventoryTint) {
|
if (renderBlocks.useInventoryTint) {
|
||||||
|
|||||||
@@ -242,7 +242,7 @@ public class ForgeHooks {
|
|||||||
|
|
||||||
public static final int majorVersion=1;
|
public static final int majorVersion=1;
|
||||||
public static final int minorVersion=2;
|
public static final int minorVersion=2;
|
||||||
public static final int revisionVersion=1;
|
public static final int revisionVersion=2;
|
||||||
static {
|
static {
|
||||||
System.out.printf("MinecraftForge V%d.%d.%d Initialized\n",majorVersion,minorVersion,revisionVersion);
|
System.out.printf("MinecraftForge V%d.%d.%d Initialized\n",majorVersion,minorVersion,revisionVersion);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,9 +4,16 @@ Extract the download archive directly into your MCP-directiory.
|
|||||||
It should create a folder "forge" within that directory, containing all
|
It should create a folder "forge" within that directory, containing all
|
||||||
extracted files.
|
extracted files.
|
||||||
|
|
||||||
You should use freshly decompiled jars, solely including ModLoader &
|
You should use freshly downloaded jars, solely including ModLoader &
|
||||||
ModLoaderMP respectively. Anything else can eventually cause conflicts.
|
ModLoaderMP. Anything else can eventually cause conflicts.
|
||||||
|
|
||||||
Now just start the install-bat, MCForge will install itself into the proper
|
Now just start the install.cmd/.sh, MCForge will install itself into the proper
|
||||||
locations and copy all ned files, as well as modifying the ned baseclasses.
|
locations and copy all needed files, as well as modifying the needed baseclasses.
|
||||||
|
|
||||||
|
Forge also includes a snapshot of the MCP mapings, this may not be the current
|
||||||
|
version of the mapings. But you must use the provided mapings in order for the
|
||||||
|
patch files to work together.
|
||||||
|
|
||||||
|
The install scripts should take care of everything for you, so you should not need
|
||||||
|
to run ANY MCP script before installing forge.
|
||||||
|
|
||||||
+35
-12
@@ -5,27 +5,50 @@ echo:
|
|||||||
|
|
||||||
pushd .. >nul
|
pushd .. >nul
|
||||||
|
|
||||||
|
xcopy /Y /E /I forge\conf\* conf
|
||||||
|
|
||||||
|
if exist runtime\bin\fernflower.jar move runtime\bin\fernflower.jar runtime\bin\fernflower.jar-backup
|
||||||
|
|
||||||
cmd /C cleanup.bat
|
cmd /C cleanup.bat
|
||||||
cmd /C decompile.bat
|
cmd /C decompile.bat
|
||||||
|
|
||||||
|
if exist runtime\bin\fernflower.jar-backup move runtime\bin\fernflower.jar-backup runtime\bin\fernflower.jar
|
||||||
|
|
||||||
pushd src >nul
|
pushd src >nul
|
||||||
del minecraft\net\minecraft\src\MLProp.java
|
|
||||||
copy ..\forge\MLProp.java minecraft\net\minecraft\src\MLProp.java
|
|
||||||
del minecraft_server\net\minecraft\src\MLProp.java
|
|
||||||
copy ..\forge\MLProp.java minecraft_server\net\minecraft\src\MLProp.java
|
|
||||||
|
|
||||||
..\runtime\bin\python\python_mcp ..\forge\lfcr.py ../forge/modLoaderMP.patch ../forge/modLoaderMP.patch
|
if exist ..\jars\bin\minecraft.jar (
|
||||||
..\runtime\bin\applydiff.exe -uf -p2 -i ../forge/modLoaderMP.patch
|
del minecraft\net\minecraft\src\MLProp.java
|
||||||
|
copy ..\forge\MLProp.java minecraft\net\minecraft\src\MLProp.java
|
||||||
|
|
||||||
|
for /f "delims=" %%a in ('dir /a -d /b /S ..\forge\patches\minecraft') do (
|
||||||
|
pushd "%%a" 2>nul
|
||||||
|
if errorlevel 1 (
|
||||||
|
..\runtime\bin\python\python_mcp ..\forge\lfcr.py "%%a" "%%a"
|
||||||
|
..\runtime\bin\applydiff.exe -uf -p2 -i "%%a"
|
||||||
|
) else popd
|
||||||
|
)
|
||||||
|
)
|
||||||
|
|
||||||
|
if exist ..\jars\minecraft_server.jar (
|
||||||
|
del minecraft_server\net\minecraft\src\MLProp.java
|
||||||
|
copy ..\forge\MLProp.java minecraft_server\net\minecraft\src\MLProp.java
|
||||||
|
|
||||||
for /f "delims=" %%a in ('dir /a -d /b /S ..\forge\patches') do (
|
..\runtime\bin\python\python_mcp ..\forge\lfcr.py ../forge/modLoaderMP.patch ../forge/modLoaderMP.patch
|
||||||
pushd "%%a" 2>nul
|
..\runtime\bin\applydiff.exe -uf -p2 -i ../forge/modLoaderMP.patch
|
||||||
if errorlevel 1 (
|
|
||||||
..\runtime\bin\python\python_mcp ..\forge\lfcr.py "%%a" "%%a"
|
for /f "delims=" %%a in ('dir /a -d /b /S ..\forge\patches\minecraft_server') do (
|
||||||
..\runtime\bin\applydiff.exe -uf -p2 -i "%%a"
|
pushd "%%a" 2>nul
|
||||||
) else popd
|
if errorlevel 1 (
|
||||||
|
..\runtime\bin\python\python_mcp ..\forge\lfcr.py "%%a" "%%a"
|
||||||
|
..\runtime\bin\applydiff.exe -uf -p2 -i "%%a"
|
||||||
|
) else popd
|
||||||
|
)
|
||||||
|
|
||||||
)
|
)
|
||||||
popd >nul
|
popd >nul
|
||||||
|
|
||||||
xcopy /Y /E forge\src\* src
|
xcopy /Y /E forge\src\* src
|
||||||
|
|
||||||
|
cmd /C updatemcp.bat
|
||||||
|
cmd /C updatenames.bat
|
||||||
cmd /C updatemd5.bat
|
cmd /C updatemd5.bat
|
||||||
+44
-10
@@ -5,21 +5,55 @@ echo
|
|||||||
|
|
||||||
pushd .. > /dev/null
|
pushd .. > /dev/null
|
||||||
|
|
||||||
|
rm -rf conf
|
||||||
|
mkdir conf
|
||||||
|
cp -r forge/conf/* conf
|
||||||
|
|
||||||
|
if [ -f runtime/bin/fernflower.jar ];
|
||||||
|
then
|
||||||
|
mv runtime/bin/fernflower.jar runtime/bin/fernflower.jar-backup
|
||||||
|
fi
|
||||||
|
|
||||||
./cleanup.sh
|
./cleanup.sh
|
||||||
./decompile.sh
|
./decompile.sh
|
||||||
|
|
||||||
|
if [ -f runtime/bin/fernflower.jar-backup ];
|
||||||
|
then
|
||||||
|
mv runtime/bin/fernflower.jar-backup runtime/bin/fernflower.jar
|
||||||
|
fi
|
||||||
|
|
||||||
|
|
||||||
pushd src > /dev/null
|
pushd src > /dev/null
|
||||||
find . -name *.java -exec sed -i 's/\r//g' \{\} \;
|
find . -name *.java -exec sed -i 's/\r//g' \{\} \;
|
||||||
cp ../forge/MLProp.java minecraft/net/minecraft/src/MLProp.java
|
find ../forge/ -name *.patch -exec sed -i 's/\r//g' \{\} \;
|
||||||
cp ../forge/MLProp.java minecraft_server/net/minecraft/src/MLProp.java
|
|
||||||
patch -p2 -i ../forge/modLoaderMP.patch
|
if [ -f ../jars/bin/minecraft.jar ];
|
||||||
#patch -p1 -i ../forge/mlprop.patch
|
then
|
||||||
for i in `find ../forge/patches/ -type f`
|
cp ../forge/MLProp.java minecraft/net/minecraft/src/MLProp.java
|
||||||
do
|
|
||||||
patch -p2 -i $i
|
for i in `find ../forge/patches/minecraft/ -type f`
|
||||||
done
|
do
|
||||||
|
patch -p2 -i $i
|
||||||
|
done
|
||||||
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
if [ -f ../jars/minecraft_server.jar ];
|
||||||
|
then
|
||||||
|
cp ../forge/MLProp.java minecraft_server/net/minecraft/src/MLProp.java
|
||||||
|
|
||||||
|
patch -p2 -i ../forge/modLoaderMP.patch
|
||||||
|
|
||||||
|
for i in `find ../forge/patches/minecraft_server/ -type f`
|
||||||
|
do
|
||||||
|
patch -p2 -i $i
|
||||||
|
done
|
||||||
|
fi
|
||||||
popd > /dev/null
|
popd > /dev/null
|
||||||
|
|
||||||
cp -r forge/src/* src
|
cp -r forge/src/* src
|
||||||
|
|
||||||
./updatemd5.sh
|
|
||||||
|
./updatemcp.sh
|
||||||
|
./updatenames.sh
|
||||||
|
./updatemd5.sh
|
||||||
@@ -16,3 +16,5 @@ ScotTools Background: ScotTools was an API that enabled modders to add blocks to
|
|||||||
|
|
||||||
* SpaceToad *
|
* SpaceToad *
|
||||||
|
|
||||||
|
* LexManos *
|
||||||
|
|
||||||
@@ -55,11 +55,13 @@ mkdir src
|
|||||||
mkdir src/minecraft
|
mkdir src/minecraft
|
||||||
mkdir src/minecraft_server
|
mkdir src/minecraft_server
|
||||||
mkdir patches
|
mkdir patches
|
||||||
|
mkdir conf
|
||||||
cp -r ../forge_client/src/* src/minecraft
|
cp -r ../forge_client/src/* src/minecraft
|
||||||
cp -r ../forge_server/src/* src/minecraft_server
|
cp -r ../forge_server/src/* src/minecraft_server
|
||||||
cp -r ../forge_common/* src/minecraft
|
cp -r ../forge_common/* src/minecraft
|
||||||
cp -r ../forge_common/* src/minecraft_server
|
cp -r ../forge_common/* src/minecraft_server
|
||||||
cp -r ../patches/* patches
|
cp -r ../patches/* patches
|
||||||
|
cp -r ../conf/* conf
|
||||||
cp ../lfcr.py .
|
cp ../lfcr.py .
|
||||||
cp ../install/install.cmd .
|
cp ../install/install.cmd .
|
||||||
cp ../install/install.sh .
|
cp ../install/install.sh .
|
||||||
@@ -73,6 +75,8 @@ cd src
|
|||||||
remove_svn .
|
remove_svn .
|
||||||
cd ../patches
|
cd ../patches
|
||||||
remove_svn .
|
remove_svn .
|
||||||
|
cd ../conf
|
||||||
|
remove_svn .
|
||||||
cd ..
|
cd ..
|
||||||
|
|
||||||
cd ..
|
cd ..
|
||||||
|
|||||||
@@ -25,7 +25,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
public boolean shouldSideBeRendered(IBlockAccess iblockaccess, int i, int j, int k, int l)
|
public boolean shouldSideBeRendered(IBlockAccess iblockaccess, int i, int j, int k, int l)
|
||||||
@@ -438,25 +441,56 @@
|
@@ -438,25 +441,70 @@
|
||||||
{
|
{
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
@@ -39,7 +39,14 @@
|
|||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
+ /* FORGE: Metadata-sensitive version.
|
+ /* FORGE: Metadata-sensitive version.
|
||||||
|
+ *
|
||||||
|
+ * This is deprecated in MC 1.0+ versions because of the new Enchantment
|
||||||
|
+ * system requiring a new argument. Will be removed unless a valid reason
|
||||||
|
+ * for it to remain is brought to light.
|
||||||
|
+ *
|
||||||
|
+ * Implementing this in your mod will not do anything!
|
||||||
+ */
|
+ */
|
||||||
|
+ @Deprecated
|
||||||
+ public int quantityDropped(int meta, Random random)
|
+ public int quantityDropped(int meta, Random random)
|
||||||
+ {
|
+ {
|
||||||
+ return quantityDropped(meta, 0, random);
|
+ return quantityDropped(meta, 0, random);
|
||||||
@@ -87,14 +94,21 @@
|
|||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
+ /* FORGE: This function returns the complete list of drops for a block.
|
+ /* FORGE: This function returns the complete list of drops for a block.
|
||||||
|
+ *
|
||||||
|
+ * This is deprecated in MC 1.0+ versions because of the new Enchantment
|
||||||
|
+ * system requiring a new argument. Will be removed unless a valid reason
|
||||||
|
+ * for it to remain is brought to light.
|
||||||
|
+ *
|
||||||
|
+ * Implementing this in your mod will not do anything!
|
||||||
+ */
|
+ */
|
||||||
|
+ @Deprecated
|
||||||
+ public ArrayList<ItemStack> getBlockDropped(World world,
|
+ public ArrayList<ItemStack> getBlockDropped(World world,
|
||||||
+ int i, int j, int k, int md) {
|
+ int i, int j, int k, int md) {
|
||||||
+ return getBlockDropped (world, i, j, k, md);
|
+ return getBlockDropped (world, i, j, k, md, 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
public final void dropBlockAsItem(World world, int i, int j, int k, int l, int i1)
|
public final void dropBlockAsItem(World world, int i, int j, int k, int l, int i1)
|
||||||
@@ -470,18 +504,13 @@
|
@@ -470,18 +518,13 @@
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -116,7 +130,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -805,6 +834,107 @@
|
@@ -805,6 +848,107 @@
|
||||||
return iblockaccess.isBlockNormalCube(i, j, k) ? 0.2F : 1.0F;
|
return iblockaccess.isBlockNormalCube(i, j, k) ? 0.2F : 1.0F;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
|
|
||||||
// Referenced classes of package net.minecraft.src:
|
// Referenced classes of package net.minecraft.src:
|
||||||
// BlockFlower, Block, World, EntityItem,
|
// BlockFlower, Block, World, EntityItem,
|
||||||
@@ -108,28 +109,16 @@
|
@@ -108,28 +109,22 @@
|
||||||
return 6;
|
return 6;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -16,22 +16,22 @@
|
|||||||
- {
|
- {
|
||||||
- super.dropBlockAsItemWithChance(world, i, j, k, l, f, 0);
|
- super.dropBlockAsItemWithChance(world, i, j, k, l, f, 0);
|
||||||
- if(world.multiplayerWorld)
|
- if(world.multiplayerWorld)
|
||||||
- {
|
+ @Override
|
||||||
- return;
|
+ public ArrayList<ItemStack> getBlockDropped(World world, int i, int j, int k, int md, int fortune) {
|
||||||
+ public ArrayList<ItemStack> getBlockDropped(World world,
|
|
||||||
+ int i, int j, int k, int md) {
|
|
||||||
+ ArrayList<ItemStack> tr = new ArrayList<ItemStack>();
|
+ ArrayList<ItemStack> tr = new ArrayList<ItemStack>();
|
||||||
+ if (md == 7) tr.add(new ItemStack(Item.wheat));
|
+ if (md == 7)
|
||||||
+
|
{
|
||||||
+ for(int n = 0; n < 3; n++) {
|
- return;
|
||||||
+ if (world.rand.nextInt(15) <= md)
|
+ tr.add(new ItemStack(Item.wheat));
|
||||||
+ tr.add(new ItemStack(Item.seeds));
|
|
||||||
}
|
}
|
||||||
- int j1 = 3 + i1;
|
- int j1 = 3 + i1;
|
||||||
- for(int k1 = 0; k1 < j1; k1++)
|
- for(int k1 = 0; k1 < j1; k1++)
|
||||||
- {
|
+
|
||||||
|
+ for(int n = 0; n < 3; n++)
|
||||||
|
{
|
||||||
- if(world.rand.nextInt(15) <= l)
|
- if(world.rand.nextInt(15) <= l)
|
||||||
- {
|
+ if (world.rand.nextInt(15) <= md)
|
||||||
|
{
|
||||||
- float f1 = 0.7F;
|
- float f1 = 0.7F;
|
||||||
- float f2 = world.rand.nextFloat() * f1 + (1.0F - f1) * 0.5F;
|
- float f2 = world.rand.nextFloat() * f1 + (1.0F - f1) * 0.5F;
|
||||||
- float f3 = world.rand.nextFloat() * f1 + (1.0F - f1) * 0.5F;
|
- float f3 = world.rand.nextFloat() * f1 + (1.0F - f1) * 0.5F;
|
||||||
@@ -39,8 +39,9 @@
|
|||||||
- EntityItem entityitem = new EntityItem(world, (float)i + f2, (float)j + f3, (float)k + f4, new ItemStack(Item.seeds));
|
- EntityItem entityitem = new EntityItem(world, (float)i + f2, (float)j + f3, (float)k + f4, new ItemStack(Item.seeds));
|
||||||
- entityitem.delayBeforeCanPickup = 10;
|
- entityitem.delayBeforeCanPickup = 10;
|
||||||
- world.entityJoinedWorld(entityitem);
|
- world.entityJoinedWorld(entityitem);
|
||||||
- }
|
+ tr.add(new ItemStack(Item.seeds));
|
||||||
- }
|
}
|
||||||
|
}
|
||||||
-
|
-
|
||||||
+ return tr;
|
+ return tr;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -11,7 +11,7 @@
|
|||||||
|
|
||||||
// Referenced classes of package net.minecraft.src:
|
// Referenced classes of package net.minecraft.src:
|
||||||
// BlockFlower, ColorizerGrass, ColorizerFoliage, IBlockAccess,
|
// BlockFlower, ColorizerGrass, ColorizerFoliage, IBlockAccess,
|
||||||
@@ -73,13 +76,17 @@
|
@@ -73,13 +76,24 @@
|
||||||
|
|
||||||
public int idDropped(int i, Random random, int j)
|
public int idDropped(int i, Random random, int j)
|
||||||
{
|
{
|
||||||
@@ -25,13 +25,20 @@
|
|||||||
+ return -1;
|
+ return -1;
|
||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
+ public ArrayList<ItemStack> getBlockDropped(World world,
|
+ @Override
|
||||||
+ int i, int j, int k, int md) {
|
+ public ArrayList<ItemStack> getBlockDropped(World world, int i, int j, int k, int md, int fortune)
|
||||||
+ ArrayList<ItemStack> tr=new ArrayList<ItemStack>();
|
+ {
|
||||||
+ if(world.rand.nextInt(8)!=0)
|
+ ArrayList<ItemStack> tr = new ArrayList<ItemStack>();
|
||||||
|
+ if(world.rand.nextInt(8) != 0)
|
||||||
|
+ {
|
||||||
+ return tr;
|
+ return tr;
|
||||||
+ ItemStack ist=ForgeHooks.getGrassSeed(world);
|
+ }
|
||||||
+ if(ist!=null) tr.add(ist);
|
+
|
||||||
|
+ ItemStack ist = ForgeHooks.getGrassSeed(world);
|
||||||
|
+ if (ist != null)
|
||||||
|
+ {
|
||||||
|
+ tr.add(ist);
|
||||||
|
+ }
|
||||||
+ return tr;
|
+ return tr;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -19,24 +19,27 @@
|
|||||||
+ ICustomItemRenderer customRenderer = MinecraftForgeClient.getCustomItemRenderer(itemstack.itemID);
|
+ ICustomItemRenderer customRenderer = MinecraftForgeClient.getCustomItemRenderer(itemstack.itemID);
|
||||||
+
|
+
|
||||||
+ if (customRenderer != null) {
|
+ if (customRenderer != null) {
|
||||||
+ GL11.glBindTexture(3553 /*GL_TEXTURE_2D*/, mc.renderEngine.getTexture("/terrain.png"));
|
+ String tex = ForgeHooksClient.getTexture("/terrain.png", itemstack.getItem());
|
||||||
+ ForgeHooksClient.overrideTexture (itemstack.getItem());
|
+ GL11.glBindTexture(3553 /*GL_TEXTURE_2D*/, mc.renderEngine.getTexture(tex));
|
||||||
+ ForgeHooksClient.renderCustomItem(customRenderer, renderBlocksInstance, itemstack.itemID, itemstack.getItemDamage(), entityliving.getEntityBrightness(1.0F));
|
+ ForgeHooksClient.renderCustomItem(customRenderer, renderBlocksInstance, itemstack.itemID, itemstack.getItemDamage(), entityliving.getEntityBrightness(1.0F));
|
||||||
+ } else if(itemstack.itemID < 256 && RenderBlocks.renderItemIn3d(Block.blocksList[itemstack.itemID].getRenderType()))
|
+ } else if(itemstack.itemID < 256 && RenderBlocks.renderItemIn3d(Block.blocksList[itemstack.itemID].getRenderType()))
|
||||||
{
|
{
|
||||||
GL11.glBindTexture(3553 /*GL_TEXTURE_2D*/, mc.renderEngine.getTexture("/terrain.png"));
|
- GL11.glBindTexture(3553 /*GL_TEXTURE_2D*/, mc.renderEngine.getTexture("/terrain.png"));
|
||||||
+ ForgeHooksClient.overrideTexture (Block.blocksList[itemstack.itemID]);
|
+ String tex = ForgeHooksClient.getTexture("/terrain.png", Block.blocksList[itemstack.itemID]);
|
||||||
|
+ GL11.glBindTexture(3553 /*GL_TEXTURE_2D*/, mc.renderEngine.getTexture(tex));
|
||||||
renderBlocksInstance.renderBlockAsItem(Block.blocksList[itemstack.itemID], itemstack.getItemDamage(), 1.0F);
|
renderBlocksInstance.renderBlockAsItem(Block.blocksList[itemstack.itemID], itemstack.getItemDamage(), 1.0F);
|
||||||
} else
|
} else
|
||||||
{
|
{
|
||||||
if(itemstack.itemID < 256)
|
if(itemstack.itemID < 256)
|
||||||
{
|
{
|
||||||
GL11.glBindTexture(3553 /*GL_TEXTURE_2D*/, mc.renderEngine.getTexture("/terrain.png"));
|
- GL11.glBindTexture(3553 /*GL_TEXTURE_2D*/, mc.renderEngine.getTexture("/terrain.png"));
|
||||||
+ ForgeHooksClient.overrideTexture (Block.blocksList[itemstack.itemID]);
|
+ String tex = ForgeHooksClient.getTexture("/terrain.png", Block.blocksList[itemstack.itemID]);
|
||||||
|
+ GL11.glBindTexture(3553 /*GL_TEXTURE_2D*/, mc.renderEngine.getTexture(tex));
|
||||||
} else
|
} else
|
||||||
{
|
{
|
||||||
GL11.glBindTexture(3553 /*GL_TEXTURE_2D*/, mc.renderEngine.getTexture("/gui/items.png"));
|
- GL11.glBindTexture(3553 /*GL_TEXTURE_2D*/, mc.renderEngine.getTexture("/gui/items.png"));
|
||||||
+ ForgeHooksClient.overrideTexture (Item.itemsList[itemstack.itemID]);
|
+ String tex = ForgeHooksClient.getTexture("/gui/items.png", Item.itemsList[itemstack.itemID]);
|
||||||
|
+ GL11.glBindTexture(3553 /*GL_TEXTURE_2D*/, mc.renderEngine.getTexture(tex));
|
||||||
}
|
}
|
||||||
Tessellator tessellator = Tessellator.instance;
|
Tessellator tessellator = Tessellator.instance;
|
||||||
int j = entityliving.getItemIcon(itemstack, i);
|
int j = entityliving.getItemIcon(itemstack, i);
|
||||||
@@ -11,7 +11,7 @@
|
|||||||
import java.util.Random;
|
import java.util.Random;
|
||||||
import org.lwjgl.opengl.GL11;
|
import org.lwjgl.opengl.GL11;
|
||||||
|
|
||||||
@@ -54,10 +58,36 @@
|
@@ -54,10 +58,34 @@
|
||||||
}
|
}
|
||||||
GL11.glTranslatef((float)d, (float)d1 + f2, (float)d2);
|
GL11.glTranslatef((float)d, (float)d1 + f2, (float)d2);
|
||||||
GL11.glEnable(32826 /*GL_RESCALE_NORMAL_EXT*/);
|
GL11.glEnable(32826 /*GL_RESCALE_NORMAL_EXT*/);
|
||||||
@@ -21,8 +21,7 @@
|
|||||||
+
|
+
|
||||||
+ if (customRenderer != null) {
|
+ if (customRenderer != null) {
|
||||||
+ GL11.glRotatef(f3, 0.0F, 1.0F, 0.0F);
|
+ GL11.glRotatef(f3, 0.0F, 1.0F, 0.0F);
|
||||||
+ loadTexture("/terrain.png");
|
+ loadTexture(ForgeHooksClient.getTexture("/terrain.png", itemstack.getItem()));
|
||||||
+ ForgeHooksClient.overrideTexture(itemstack.getItem());
|
|
||||||
+ float f4 = 0.25F;
|
+ float f4 = 0.25F;
|
||||||
+ f4 = 0.5F;
|
+ f4 = 0.5F;
|
||||||
+ GL11.glScalef(f4, f4, f4);
|
+ GL11.glScalef(f4, f4, f4);
|
||||||
@@ -44,24 +43,25 @@
|
|||||||
+ } else if(itemstack.itemID < 256 && RenderBlocks.renderItemIn3d(Block.blocksList[itemstack.itemID].getRenderType()))
|
+ } else if(itemstack.itemID < 256 && RenderBlocks.renderItemIn3d(Block.blocksList[itemstack.itemID].getRenderType()))
|
||||||
{
|
{
|
||||||
GL11.glRotatef(f3, 0.0F, 1.0F, 0.0F);
|
GL11.glRotatef(f3, 0.0F, 1.0F, 0.0F);
|
||||||
loadTexture("/terrain.png");
|
- loadTexture("/terrain.png");
|
||||||
+ ForgeHooksClient.overrideTexture(Block.blocksList[itemstack.itemID]);
|
+ loadTexture(ForgeHooksClient.getTexture("/terrain.png", Block.blocksList[itemstack.itemID]));
|
||||||
float f4 = 0.25F;
|
float f4 = 0.25F;
|
||||||
int j = Block.blocksList[itemstack.itemID].getRenderType();
|
int j = Block.blocksList[itemstack.itemID].getRenderType();
|
||||||
if(j == 1 || j == 19 || j == 12 || j == 2)
|
if(j == 1 || j == 19 || j == 12 || j == 2)
|
||||||
@@ -108,9 +138,11 @@
|
@@ -107,10 +135,10 @@
|
||||||
|
int i = itemstack.getIconIndex();
|
||||||
if(itemstack.itemID < 256)
|
if(itemstack.itemID < 256)
|
||||||
{
|
{
|
||||||
loadTexture("/terrain.png");
|
- loadTexture("/terrain.png");
|
||||||
+ ForgeHooksClient.overrideTexture(Block.blocksList[itemstack.itemID]);
|
+ loadTexture(ForgeHooksClient.getTexture("/terrain.png", Block.blocksList[itemstack.itemID]));
|
||||||
} else
|
} else
|
||||||
{
|
{
|
||||||
loadTexture("/gui/items.png");
|
- loadTexture("/gui/items.png");
|
||||||
+ ForgeHooksClient.overrideTexture(Item.itemsList[itemstack.itemID]);
|
+ loadTexture(ForgeHooksClient.getTexture("/gui/items.png", Item.itemsList[itemstack.itemID]));
|
||||||
}
|
}
|
||||||
if(field_27004_a)
|
if(field_27004_a)
|
||||||
{
|
{
|
||||||
@@ -162,10 +194,37 @@
|
@@ -162,10 +190,37 @@
|
||||||
|
|
||||||
public void drawItemIntoGui(FontRenderer fontrenderer, RenderEngine renderengine, int i, int j, int k, int l, int i1)
|
public void drawItemIntoGui(FontRenderer fontrenderer, RenderEngine renderengine, int i, int j, int k, int l, int i1)
|
||||||
{
|
{
|
||||||
@@ -69,9 +69,9 @@
|
|||||||
+ ICustomItemRenderer customRenderer = MinecraftForgeClient.getCustomItemRenderer(i);
|
+ ICustomItemRenderer customRenderer = MinecraftForgeClient.getCustomItemRenderer(i);
|
||||||
+ if (customRenderer != null) {
|
+ if (customRenderer != null) {
|
||||||
+ int j1 = i;
|
+ int j1 = i;
|
||||||
+ renderengine.bindTexture(renderengine.getTexture("/terrain.png"));
|
+ String tex = ForgeHooksClient.getTexture("/terrain.png", Item.itemsList [i]);
|
||||||
|
+ renderengine.bindTexture(renderengine.getTexture(tex));
|
||||||
+ Item item = Item.itemsList[i];
|
+ Item item = Item.itemsList[i];
|
||||||
+ ForgeHooksClient.overrideTexture (Item.itemsList [i]);
|
|
||||||
+ GL11.glPushMatrix();
|
+ GL11.glPushMatrix();
|
||||||
+ GL11.glTranslatef(l - 2, i1 + 3, -3F);
|
+ GL11.glTranslatef(l - 2, i1 + 3, -3F);
|
||||||
+ GL11.glScalef(10F, 10F, 10F);
|
+ GL11.glScalef(10F, 10F, 10F);
|
||||||
@@ -95,20 +95,24 @@
|
|||||||
+ } else if(i < 256 && RenderBlocks.renderItemIn3d(Block.blocksList[i].getRenderType()))
|
+ } else if(i < 256 && RenderBlocks.renderItemIn3d(Block.blocksList[i].getRenderType()))
|
||||||
{
|
{
|
||||||
int j1 = i;
|
int j1 = i;
|
||||||
renderengine.bindTexture(renderengine.getTexture("/terrain.png"));
|
- renderengine.bindTexture(renderengine.getTexture("/terrain.png"));
|
||||||
+ ForgeHooksClient.overrideTexture (Block.blocksList[i]);
|
+ String tex = ForgeHooksClient.getTexture("/terrain.png", Block.blocksList[i]);
|
||||||
|
+ renderengine.bindTexture(renderengine.getTexture(tex));
|
||||||
Block block = Block.blocksList[j1];
|
Block block = Block.blocksList[j1];
|
||||||
GL11.glPushMatrix();
|
GL11.glPushMatrix();
|
||||||
GL11.glTranslatef(l - 2, i1 + 3, -3F + zLevel);
|
GL11.glTranslatef(l - 2, i1 + 3, -3F + zLevel);
|
||||||
@@ -215,9 +274,11 @@
|
@@ -214,10 +269,12 @@
|
||||||
|
GL11.glDisable(2896 /*GL_LIGHTING*/);
|
||||||
if(i < 256)
|
if(i < 256)
|
||||||
{
|
{
|
||||||
renderengine.bindTexture(renderengine.getTexture("/terrain.png"));
|
- renderengine.bindTexture(renderengine.getTexture("/terrain.png"));
|
||||||
+ ForgeHooksClient.overrideTexture (Block.blocksList[i]);
|
+ String tex = ForgeHooksClient.getTexture("/terrain.png", Block.blocksList[i]);
|
||||||
|
+ renderengine.bindTexture(renderengine.getTexture(tex));
|
||||||
} else
|
} else
|
||||||
{
|
{
|
||||||
renderengine.bindTexture(renderengine.getTexture("/gui/items.png"));
|
- renderengine.bindTexture(renderengine.getTexture("/gui/items.png"));
|
||||||
+ ForgeHooksClient.overrideTexture(Item.itemsList[i]);
|
+ String tex = ForgeHooksClient.getTexture("/gui/items.png", Item.itemsList[i]);
|
||||||
|
+ renderengine.bindTexture(renderengine.getTexture(tex));
|
||||||
}
|
}
|
||||||
int k1 = Item.itemsList[i].getColorFromDamage(j);
|
int k1 = Item.itemsList[i].getColorFromDamage(j);
|
||||||
float f = (float)(k1 >> 16 & 0xff) / 255F;
|
float f = (float)(k1 >> 16 & 0xff) / 255F;
|
||||||
@@ -8,7 +8,7 @@
|
|||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Random;
|
import java.util.Random;
|
||||||
@@ -384,26 +385,57 @@
|
@@ -384,26 +385,71 @@
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -20,7 +20,14 @@
|
|||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
+ /* FORGE: Metadata-sensitive version.
|
+ /* FORGE: Metadata-sensitive version.
|
||||||
|
+ *
|
||||||
|
+ * This is deprecated in MC 1.0+ versions because of the new Enchantment
|
||||||
|
+ * system requiring a new argument. Will be removed unless a valid reason
|
||||||
|
+ * for it to remain is brought to light.
|
||||||
|
+ *
|
||||||
|
+ * Implementing this in your mod will not do anything!
|
||||||
+ */
|
+ */
|
||||||
|
+ @Deprecated
|
||||||
+ public int quantityDropped(int meta, Random random)
|
+ public int quantityDropped(int meta, Random random)
|
||||||
+ {
|
+ {
|
||||||
+ return quantityDropped(meta, 0, random);
|
+ return quantityDropped(meta, 0, random);
|
||||||
@@ -70,16 +77,23 @@
|
|||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
+ /* FORGE: This function returns the complete list of drops for a block.
|
+ /* FORGE: This function returns the complete list of drops for a block.
|
||||||
|
+ *
|
||||||
|
+ * This is deprecated in MC 1.0+ versions because of the new Enchantment
|
||||||
|
+ * system requiring a new argument. Will be removed unless a valid reason
|
||||||
|
+ * for it to remain is brought to light.
|
||||||
|
+ *
|
||||||
|
+ * Implementing this in your mod will not do anything!
|
||||||
+ */
|
+ */
|
||||||
|
+ @Deprecated
|
||||||
+ public ArrayList<ItemStack> getBlockDropped(World world,
|
+ public ArrayList<ItemStack> getBlockDropped(World world,
|
||||||
+ int i, int j, int k, int md) {
|
+ int i, int j, int k, int md) {
|
||||||
+ return getBlockDropped (world, i, j, k, md);
|
+ return getBlockDropped (world, i, j, k, md, 0);
|
||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
public final void dropBlockAsItem(World world, int i, int j, int k, int l, int i1)
|
public final void dropBlockAsItem(World world, int i, int j, int k, int l, int i1)
|
||||||
{
|
{
|
||||||
dropBlockAsItemWithChance(world, i, j, k, l, 1.0F, i1);
|
dropBlockAsItemWithChance(world, i, j, k, l, 1.0F, i1);
|
||||||
@@ -415,18 +447,14 @@
|
@@ -415,18 +461,14 @@
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -101,7 +115,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -725,6 +753,99 @@
|
@@ -725,6 +767,99 @@
|
||||||
return blockMaterial.getMaterialMobility();
|
return blockMaterial.getMaterialMobility();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -8,30 +8,32 @@
|
|||||||
|
|
||||||
// Referenced classes of package net.minecraft.src:
|
// Referenced classes of package net.minecraft.src:
|
||||||
// BlockFlower, Block, World, EntityItem,
|
// BlockFlower, Block, World, EntityItem,
|
||||||
@@ -108,28 +109,16 @@
|
@@ -108,28 +109,23 @@
|
||||||
return 6;
|
return 6;
|
||||||
}
|
}
|
||||||
|
|
||||||
- public void dropBlockAsItemWithChance(World world, int i, int j, int k, int l, float f, int i1)
|
- public void dropBlockAsItemWithChance(World world, int i, int j, int k, int l, float f, int i1)
|
||||||
- {
|
+ @Override
|
||||||
|
+ public ArrayList<ItemStack> getBlockDropped(World world, int i, int j, int k, int md, int fortune)
|
||||||
|
{
|
||||||
- super.dropBlockAsItemWithChance(world, i, j, k, l, f, 0);
|
- super.dropBlockAsItemWithChance(world, i, j, k, l, f, 0);
|
||||||
- if(world.singleplayerWorld)
|
- if(world.singleplayerWorld)
|
||||||
- {
|
|
||||||
- return;
|
|
||||||
+ public ArrayList<ItemStack> getBlockDropped(World world,
|
|
||||||
+ int i, int j, int k, int md) {
|
|
||||||
+ ArrayList<ItemStack> tr = new ArrayList<ItemStack>();
|
+ ArrayList<ItemStack> tr = new ArrayList<ItemStack>();
|
||||||
+ if (md == 7) tr.add(new ItemStack(Item.wheat));
|
+ if (md == 7)
|
||||||
|
+ {
|
||||||
|
+ tr.add(new ItemStack(Item.wheat));
|
||||||
|
+ }
|
||||||
+
|
+
|
||||||
+ for(int n = 0; n < 3; n++) {
|
+ for(int n = 0; n < 3; n++)
|
||||||
+ if (world.rand.nextInt(15) <= md)
|
{
|
||||||
+ tr.add(new ItemStack(Item.seeds));
|
- return;
|
||||||
}
|
- }
|
||||||
- int j1 = 3 + i1;
|
- int j1 = 3 + i1;
|
||||||
- for(int k1 = 0; k1 < j1; k1++)
|
- for(int k1 = 0; k1 < j1; k1++)
|
||||||
- {
|
- {
|
||||||
- if(world.rand.nextInt(15) <= l)
|
- if(world.rand.nextInt(15) <= l)
|
||||||
- {
|
+ if (world.rand.nextInt(15) <= md)
|
||||||
|
{
|
||||||
- float f1 = 0.7F;
|
- float f1 = 0.7F;
|
||||||
- float f2 = world.rand.nextFloat() * f1 + (1.0F - f1) * 0.5F;
|
- float f2 = world.rand.nextFloat() * f1 + (1.0F - f1) * 0.5F;
|
||||||
- float f3 = world.rand.nextFloat() * f1 + (1.0F - f1) * 0.5F;
|
- float f3 = world.rand.nextFloat() * f1 + (1.0F - f1) * 0.5F;
|
||||||
@@ -39,8 +41,9 @@
|
|||||||
- EntityItem entityitem = new EntityItem(world, (float)i + f2, (float)j + f3, (float)k + f4, new ItemStack(Item.seeds));
|
- EntityItem entityitem = new EntityItem(world, (float)i + f2, (float)j + f3, (float)k + f4, new ItemStack(Item.seeds));
|
||||||
- entityitem.delayBeforeCanPickup = 10;
|
- entityitem.delayBeforeCanPickup = 10;
|
||||||
- world.entityJoinedWorld(entityitem);
|
- world.entityJoinedWorld(entityitem);
|
||||||
- }
|
+ tr.add(new ItemStack(Item.seeds));
|
||||||
- }
|
}
|
||||||
|
}
|
||||||
-
|
-
|
||||||
+ return tr;
|
+ return tr;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -11,7 +11,7 @@
|
|||||||
|
|
||||||
// Referenced classes of package net.minecraft.src:
|
// Referenced classes of package net.minecraft.src:
|
||||||
// BlockFlower, Item, World, EntityPlayer,
|
// BlockFlower, Item, World, EntityPlayer,
|
||||||
@@ -41,13 +44,17 @@
|
@@ -41,13 +44,24 @@
|
||||||
|
|
||||||
public int idDropped(int i, Random random, int j)
|
public int idDropped(int i, Random random, int j)
|
||||||
{
|
{
|
||||||
@@ -24,13 +24,20 @@
|
|||||||
- }
|
- }
|
||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
+ public ArrayList<ItemStack> getBlockDropped(World world,
|
+ @Override
|
||||||
+ int i, int j, int k, int md) {
|
+ public ArrayList<ItemStack> getBlockDropped(World world, int i, int j, int k, int md, int fortune)
|
||||||
+ ArrayList<ItemStack> tr=new ArrayList<ItemStack>();
|
+ {
|
||||||
+ if(world.rand.nextInt(8)!=0)
|
+ ArrayList<ItemStack> tr = new ArrayList<ItemStack>();
|
||||||
|
+ if (world.rand.nextInt(8) != 0)
|
||||||
|
+ {
|
||||||
+ return tr;
|
+ return tr;
|
||||||
+ ItemStack ist=ForgeHooks.getGrassSeed(world);
|
+ }
|
||||||
+ if(ist!=null) tr.add(ist);
|
+
|
||||||
|
+ ItemStack ist = ForgeHooks.getGrassSeed(world);
|
||||||
|
+ if (ist != null)
|
||||||
|
+ {
|
||||||
|
+ tr.add(ist);
|
||||||
|
+ }
|
||||||
+ return tr;
|
+ return tr;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -8,6 +8,6 @@ set PATH=E:\cygwin\bin;%PATH%
|
|||||||
|
|
||||||
cd forge
|
cd forge
|
||||||
|
|
||||||
sh package.sh 1.2.1
|
sh package.sh 1.2.2
|
||||||
|
|
||||||
pause
|
pause
|
||||||
@@ -2,6 +2,7 @@
|
|||||||
@echo off
|
@echo off
|
||||||
|
|
||||||
set PATH=.\bin;%PATH%
|
set PATH=.\bin;%PATH%
|
||||||
|
|
||||||
echo Creating directories
|
echo Creating directories
|
||||||
for /f %%i in ('find ../src_work -type d') do (
|
for /f %%i in ('find ../src_work -type d') do (
|
||||||
set file=%%i
|
set file=%%i
|
||||||
@@ -16,14 +17,9 @@ for /f %%i in ('find ../src_work -type f') do (
|
|||||||
rem echo !file!
|
rem echo !file!
|
||||||
diff -u ../src_base!file! ../src_work!file! -r --strip-trailing-cr --new-file | sed -e "1,2s/[0-9-]* [0-9:\.]* [+-][0-9]*\b/0000-00-00 00:00:00.000000000 -0000/" | tr -d '\r' > patches!file!.patch
|
diff -u ../src_base!file! ../src_work!file! -r --strip-trailing-cr --new-file | sed -e "1,2s/[0-9-]* [0-9:\.]* [+-][0-9]*\b/0000-00-00 00:00:00.000000000 -0000/" | tr -d '\r' > patches!file!.patch
|
||||||
)
|
)
|
||||||
|
|
||||||
echo Removing empty patches
|
echo Removing empty patches
|
||||||
for /f %%i in ('find patches -size 0 -type f') do (
|
find patches -size 0 -type f -regex .+\.patch -delete
|
||||||
set file=%%i
|
|
||||||
rem Have to do this to filter out .svn entries
|
|
||||||
if /I "!file:~-6!" EQU ".patch" (
|
|
||||||
del !file:/=\!
|
|
||||||
)
|
|
||||||
)
|
|
||||||
for /f %%i in ('find patches -depth -empty -type d') do (
|
for /f %%i in ('find patches -depth -empty -type d') do (
|
||||||
set file=%%i
|
set file=%%i
|
||||||
if "!file:.svn=!" EQU "!file!" (
|
if "!file:.svn=!" EQU "!file!" (
|
||||||
@@ -31,5 +27,22 @@ for /f %%i in ('find patches -depth -empty -type d') do (
|
|||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
|
||||||
|
echo Grabbing copy of conf folder
|
||||||
|
for /f %%i in ('find conf -type f') do (
|
||||||
|
set file=%%i
|
||||||
|
if "!file:.svn=!" EQU "!file!" (
|
||||||
|
del !file:/=\!
|
||||||
|
)
|
||||||
|
)
|
||||||
|
|
||||||
|
for /f %%i in ('find conf -depth -empty -type d') do (
|
||||||
|
set file=%%i
|
||||||
|
if "!file:.svn=!" EQU "!file!" (
|
||||||
|
rmdir "%%i"
|
||||||
|
)
|
||||||
|
)
|
||||||
|
|
||||||
|
xcopy ..\conf conf /E /I /Y
|
||||||
|
|
||||||
echo Finished
|
echo Finished
|
||||||
pause
|
pause
|
||||||
+15
-4
@@ -13,11 +13,22 @@ do
|
|||||||
done
|
done
|
||||||
|
|
||||||
echo Removing empty patches
|
echo Removing empty patches
|
||||||
for i in `find patches -size 0 -type f -name \*.patch`
|
find patches -size 0 -type f -name \*.patch -delete
|
||||||
do
|
|
||||||
rm $i
|
|
||||||
done
|
|
||||||
for i in `find patches -depth -empty -type d | grep -a -v "svn"`
|
for i in `find patches -depth -empty -type d | grep -a -v "svn"`
|
||||||
do
|
do
|
||||||
rmdir "$i"
|
rmdir "$i"
|
||||||
done
|
done
|
||||||
|
|
||||||
|
echo Grabbing copy of conf folder
|
||||||
|
for i in `find conf -type f | grep -a -v "svn"`
|
||||||
|
do
|
||||||
|
rm $i
|
||||||
|
done
|
||||||
|
for i in `find conf -depth -empty -type d | grep -a -v "svn"`
|
||||||
|
do
|
||||||
|
rmdir "$i"
|
||||||
|
done
|
||||||
|
|
||||||
|
cp -r ../conf/* conf
|
||||||
|
|
||||||
|
echo Finished
|
||||||
Reference in new issue
Block a user