keith/ForgePatch
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Wiki Activity
1281 commits 1 branch 2 tags 103 MiB
Commit graph

1234 commits

Author SHA1 Message Date
Christian
0de7554d8b Global object registry, also, support the new itemblockwithmetadata constructor 2013-03-08 13:17:12 -05:00
Christian
304e717aea Scala support! 
It's still primitive, I hope that people will like it. I do :)
 2013-03-07 20:22:24 -05:00
Christian
f744cd0686 Tweak license text- any osi licensed project can use the asm transformer code 2013-03-07 19:41:52 -05:00
Christian
845a9c5792 Fix up state transition derp when the server crashes with an error- it shouldn't double-derp 2013-03-07 19:37:52 -05:00
Christian
ba5165f86b Strip deprecated code 2013-03-07 19:33:34 -05:00
Christian
d2509a70b7 Refresh copyright notices on everything 2013-03-07 19:25:48 -05:00
Christian
545d5e0524 Refresh the renderengine after modloading is complete. Should fix issues with out-of-place texture registration by mods. 2013-03-07 19:02:26 -05:00
Christian
e7e2ffd8fb FIX massive performance issue with FML. Thanks to @sfPlayer1 for finding 
this epic derp on my part!
 2013-03-06 14:00:28 -05:00
Christian
56be84a3b8 Update next render to 40 2013-03-04 22:52:24 -05:00
Christian
9cbf2a08e9 Capture Minecraft logs into FML logging 2013-03-04 22:45:58 -05:00
LexManos
95497900c3 Force file name encoding to UTF-8, caused different zips on different systems. 2013-03-04 18:19:06 -08:00
LexManos
530b6fb074 Ignore again, testing submodule. 2013-03-03 11:54:53 -08:00
LexManos
fd94a8f541 Ignore this commit. 2013-03-03 11:52:47 -08:00
Christian
a37607979d Ignore deobf data 2013-03-03 14:04:41 -05:00
Christian
c8a403fa24 Force the joined.srg timestamp to zero- avoids annoying sha1 differences 2013-03-02 15:06:13 -05:00
Christian
879213019b Don't enforce signatures on minecraft classes 2013-03-02 14:48:08 -05:00
Christian
b1e826eb62 Update MCP URL for snapshot 2013-03-02 10:56:25 -05:00
Christian
3a2d167885 Fix up runtime deobfuscation. Working well now. 2013-03-02 10:46:32 -05:00
Christian
429dfc3d3d Build, and use, MC versioned deobfuscation data 2013-03-02 10:30:45 -05:00
Christian
245e7312b2 Merge branch 'runtimedeobf' into snapshot15 2013-03-02 10:04:06 -05:00
Christian
8b8b150aa9 Add in build for deobf data zip file, update for official mcp 7.39 2013-03-02 10:02:02 -05:00
LexManos
97f2bbe5dd Fix exc for renamed Behavior classes. 2013-03-02 00:48:44 -08:00
LexManos
a0a4683ef9 Actually remove classes from the csv when removed, and moved All EntityMinecart entities to net.minecraft.entity.item 2013-03-02 00:12:31 -08:00
LexManos
5ef2c4c5ab Delete unneeded patch 2013-03-02 00:11:48 -08:00
LexManos
e0c7e3859d Readd ignore for argo and bouncycastle, needed for our replacement to work properly. 2013-03-02 00:11:33 -08:00
Christian
793ae904af Update FML to 1.5 snapshot 13w09c 2013-03-02 02:06:32 -05:00
Christian
f9094e3f85 Tweaks to runtime deobf 2013-03-02 01:49:45 -05:00
LexManos
81bf16decd Update distribuited eclipse's classpath for updated libraries. 2013-02-28 04:22:34 -08:00
LexManos
4272159492 Fix crash in GuiModList for mod logo files, logo is not rendering for unknow reason. 2013-02-27 22:41:00 -08:00
LexManos
d8e82d4c35 Fix bug in rename_vars where certian items would fail to be renamed. 2013-02-27 22:40:15 -08:00
LexManos
3d48e707e8 Just enable server side compile, and warn not to cmplain to us. 2013-02-26 14:54:18 -08:00
LexManos
685aecddac Fixup reobfusication of server code if present. 2013-02-26 14:34:51 -08:00
Christian
e7b1242cfb Tweak IASM hook api. You can return multiple classes now. 2013-02-26 15:04:45 -05:00
Christian
e4dd3791ef Merge branch 'runtimedeobf' into snapshot15 2013-02-26 10:24:03 -05:00
Christian
7b0745c336 Change readFully to actually read a bunch of bytes at once now. Thanks to nallar and aartbluestoke for the suggestion to 
revisit this..
 2013-02-26 01:07:14 -05:00
Christian
2e269c967a Clean up more junk 2013-02-26 00:28:12 -05:00
Christian
b5ba054fe5 Update libs for 1.5. Lots of new libs. 2013-02-26 00:16:57 -05:00
Christian
939bf833b3 Fix renderengine patch *sigh* 2013-02-25 22:06:20 -05:00
Christian
22831e6b63 Merge branch 'master' into snapshot15 
Conflicts:
	patches/minecraft/net/minecraft/client/renderer/RenderEngine.java.patch
 2013-02-25 21:53:56 -05:00
Christian
c056f49796 Merge branch 'master' into snapshot15 
Conflicts:
	client/cpw/mods/fml/client/TextureFXManager.java
 2013-02-25 21:18:08 -05:00
immibis
75c1dc1091 Console log thread should be a daemon thread. 2013-02-23 19:27:16 +13:00
LexManos
604e81a323 Fix sprite map issue. 2013-02-22 14:45:25 -08:00
Christian
4cafd6c627 Fix Language Registry, closes #163 2013-02-17 16:28:54 -05:00
Christian
d25d70d59d Fix Language Registry, closes #163 2013-02-17 16:22:58 -05:00
Christian
047de02402 Merge branch 'master' into runtimedeobf 2013-02-16 14:28:29 -05:00
LexManos
bd25e14545 Option to disable renaming for srgnames. 2013-02-08 14:50:17 -08:00
Christian
ae58a0dbe3 Fix HD mob skins, FINALLY!!! 
Stupid eyes are stupid.
 2013-02-06 01:25:46 -05:00
Christian
06eea87b71 Fix up mistake that broke all modloading. Nice. 2013-02-04 10:58:48 -05:00
Christian
11f226e813 Fix some class naming and packaging issues, pending an MCP update 
for the same
 2013-02-02 10:54:48 -05:00
Christian
92a377a4e8 Update for MCP 7.34 and MC 13w05b 2013-02-01 23:05:23 -05:00
Christian
74043f515f MCP compilation works 2013-02-01 22:42:28 -05:00
Christian
3101006e58 IMC tweaks: runtimeMessages now work (thanks for all that testing for this much requested feature!) 
and IMCEvent will no longer remove messages if no one gets them, so you can do
just manual runtime polling, if you wish.
 2013-01-31 13:39:53 -05:00
Christian
46ccfb235d More logging tweaks. You can probably configure individual mod log files if you wish now 2013-01-30 20:55:12 -05:00
Christian
0c6019da8f A log of logging cleanup. FML will now read logging.properties to configure logging channels a couple of times during startup. 
You should be able to filter a lot of messages based on things like modid and certain FML related features that can be noisy
like item tracking.
Should close #175
 2013-01-30 18:57:21 -05:00
Christian
7c6c1254fc Final part of the deobfuscation data setup- fields are now deobfuscated as well. 
All that remains, is to figure out what and how to distribute the deobfuscation data itself.
 2013-01-28 17:48:44 -05:00
Christian
0c4347f2c3 Read the joined.srg file directly from lib/deobfuscation_data.zip now. Still debating distribution method. 2013-01-28 17:39:22 -05:00
Christian
b41af51ccf Now actually works for mods, somewhat. It currently generates access violations for 
ModLoader mods that presume access to fields that are not actually accessible from
a different package.
 2013-01-27 22:42:36 -05:00
Christian
9c2b899454 Method deobfuscation now works 2013-01-27 21:50:08 -05:00
Christian
82415f3962 Working to read class names and remap them at runtime. 2013-01-27 17:09:00 -05:00
Christian
b4c7fe1d0e First draft runtime deobf 2013-01-27 15:55:37 -05:00
Christian
5c99e3488a Try and handle "death on startup" a bit cleaner 2013-01-27 15:54:36 -05:00
Christian
c19646421a Deprecate the old GUI ticktype. They're dead and have been for some time. 2013-01-24 17:29:46 -05:00
Christian
3dbffd1754 Tweak a method signature 2013-01-24 10:23:36 -05:00
LexManos
d9db242f4c Add parameters to FML install to enable/disable certian aspects. Applying patches, running transformer/merger, and decompiling server. 2013-01-24 03:08:19 -08:00
Christian
331e6bcf62 Merge branch 'master' into snapshot15 
Fix up compilation and patching errors

Conflicts:
	common/cpw/mods/fml/common/registry/GameRegistry.java
	conf/joined.srg
	conf/params.csv
	conf/version.cfg
	patches/minecraft/net/minecraft/server/dedicated/DedicatedServer.java.patch
 2013-01-22 15:21:22 -05:00
Christian
1b332fc1ea Fix up packages.csv ordering for easier diffing 2013-01-22 14:43:27 -05:00
Christian
51fcf93605 Update for MCP7.30c - fixes redstone rendering issues 2013-01-22 14:40:09 -05:00
Christian
472ca8c8a9 Add in a registry method to allow for alternative TileEntity names- they will be used to support 
loading maps containing the older definitions.
 2013-01-22 13:11:32 -05:00
Christian
c13502c690 Remember to add the new patches! 2013-01-22 09:32:53 -05:00
Christian
6962786e4b The "ServerStarting" event should now properly crash the server if it fails, 
so the client will properly exit. Also, added in a "pre-server-start" event
that fires before the worlds are loaded for a save, just for you immibis.
 2013-01-22 09:17:04 -05:00
Christian
509b5f8e7e Javadoc cleanup 2013-01-21 21:37:29 -05:00
Christian
825ecf1a7f Fix breaking change 2013-01-20 17:54:56 -05:00
Christian
7f4818fd94 Merge branch 'patch-1' of https://github.com/bspkrs/FML into gh-updates 2013-01-20 11:31:47 -05:00
Christian
b52c44e42b Merge branch 'FMLLogFormatter' of https://github.com/donington/FML into gh-updates 2013-01-20 11:31:24 -05:00
Christian
2c58102515 Update MCP to MCP7.26a and refresh MCP names 2013-01-20 10:30:36 -05:00
Christian
3ddf9b2382 Update address of the FML repository to the new location in all the files 2013-01-18 21:26:43 -05:00
bspkrs
cb769265f0 Fix logical error in comment text 2013-01-16 23:49:09 -05:00
Christian
d576691bfa Update license text to make clear that FML is not a way to sidestep 
MCP licensing.
 2013-01-15 16:54:26 -05:00
Christian
180173fa94 Fix mcp conf md5 signatures for the snapshot 2013-01-12 14:25:03 -05:00
donington
3e4ed24750 FMLLogFormatter: dynamic log level name 
FMLLogFormatter now uses getLocalizedName or getName for log level name

Changes to be committed:
	modified:   common/cpw/mods/fml/relauncher/FMLLogFormatter.java
 2013-01-12 00:42:36 -05:00
Christian
334e386b56 Temporary hosting 2013-01-12 00:38:42 -05:00
Christian
c048ec7aef Another packaging update. I think we're done now. 2013-01-12 00:33:32 -05:00
Christian
3e5a3fb0e4 Fix modlist to use the new texture binding functions, i think 2013-01-12 00:27:11 -05:00
Christian
59af780c91 A couple of packaging tweaks, clean up more junk. It may come back but for now it's gone 2013-01-12 00:17:35 -05:00
Christian
cad228093d Delete old patches not needed anymore 2013-01-11 23:53:14 -05:00
Christian
431372dc5f Initial patch update for snapshot 2013-01-11 23:47:05 -05:00
Christian
31faf09c49 Initial setup for snapshot- the client compiles, but patches fail to apply. 2013-01-11 22:49:09 -05:00
LexManos
674a9e5e52 Updated patches for new JAD style names. 2013-01-11 13:16:40 -08:00
LexManos
04e4ce6266 FML will now rename local variables to have JAD-style names instead of FernFlower var## names. New script to do this, to allow for modders to run it over there own code: python rename_vars.py -mcp [folders to rename]... 2013-01-11 13:16:23 -08:00
Christian
8edde44161 Fix incorrect end length calculation. Closes #161 Thanks BStramke! 2013-01-11 09:41:47 -05:00
Christian
79c7933b5e Fix LanguageRegistry loading files in UTF-8 format. loadLocalization should work for non-xml in 
all languages now (assumes UTF-8)
 2013-01-08 08:46:50 -05:00
CovertJaguar
224d933564 Added an accessor for villagers 2013-01-07 14:55:17 -08:00
LexManos
550928735e New python script to update java files for new package names. Usage: paython update_packages.py --mcp-dir <mcp folder> [Folders To Repackage] 2013-01-06 22:10:19 -08:00
LexManos
00f65d2c40 New python script for signing partial jar files. See comments inside for details. 2013-01-06 22:09:12 -08:00
Christian
55ca46b382 Move server stopped *after* the server has actually stopped. *sigh* 2012-12-31 01:20:35 -05:00
Christian
80193d4969 Add in a "server stopped" event 2012-12-30 23:52:38 -05:00
Christian
2454ed0fbf Add in some classloader debugging information: use fml.debugClassLoading=true as a system property 
to track down problems with classes not being found or loading erratically.
 2012-12-30 21:32:37 -05:00
Christian
3715b73f05 Revert MCP name change for canConnectRedstone - it conflicts with a forge method of the same name and breaks 1.4.6 to 1.4.7 compatibility 2012-12-29 00:00:24 -05:00
Christian
964c51f4ae Update for MC 1.4.7 2012-12-28 10:07:53 -05:00
Christian
bf9272f61e Fix multiple GUI containers for ML containers. Sorry ultimatechest that 
this fix took so long, a bug report at github.com/cpw/FML would help,
next time ;)
 2012-12-27 23:00:52 -05:00
Christian
193aae6030 Log if there's a problem reading the class bytes 2012-12-27 23:00:37 -05:00
LexManos
95f0315634 Fix NPE in fingerprint loading, and pass expectged fingerprint to FMLFingerprintViolationEvent 2012-12-25 15:59:30 -08:00
Christian
35ee8510fe Fix a message delivery issue in IMC 2012-12-24 09:41:22 -05:00
Christian
052d798970 Some tweaks for signing and ID matching 2012-12-23 22:27:26 -05:00
LexManos
484a673b1f Remove unneeded file 2012-12-20 14:30:59 -08:00
LexManos
c5a1b58d85 Fixed placement of onConnectionClosed callback. 2012-12-20 14:30:41 -08:00
LexManos
909b629fa4 MCP will reobf classes with reserved names in windows to a legal file name. And FML will try to read these classes over the default ones. 2012-12-19 19:10:00 -08:00
LexManos
48551959ec Output obfed files with reserved windows names to _NAME.class 2012-12-19 18:12:11 -08:00
LexManos
c77f20ae17 Add quotes around javac command. 2012-12-19 02:58:09 -08:00
Christian
6201e51134 Update MCP to newer version 
Fix fingerprint fire
 2012-12-18 16:43:48 -05:00
Christian
2fc0ba693c InterModComms now supports a runtime polling based model for inter-mod comms at 
runtime.
Deprecate method that shouldn't be used. COPY it's content to your mod. Don't CALL it.
 2012-12-18 13:58:57 -05:00
Christian
926766b487 Don't be as alarming about item overwrites. 2012-12-18 08:33:46 -05:00
Christian
7caae273c5 Added configuration file which allows modids to ignore ID validation checking. IT WILL CRASH YOUR GAME in 99.999% of cases. 
Immibis is a whingy ass. And TinyTimRob too. Now STFU and GTFO. closes #510 for ever.
 2012-12-18 08:15:46 -05:00
LexManos
ca2d1fb033 Dixed ev eclipse worksapce, now references BC. 2012-12-18 05:10:32 -08:00
LexManos
ec8d75d1b2 Added client src folder to classpath for startclient/startserver. 2012-12-18 05:06:20 -08:00
LexManos
e9cabc2b7e Removed hardcoded additions 2012-12-18 05:05:25 -08:00
Christian
5770708e75 Update to MC 1.4.6 2012-12-17 21:48:29 -05:00
Christian
251cb92b12 Fix build script 2012-12-17 17:56:00 -05:00
Christian
0b36189547 more 1.4.6 tweaks 2012-12-17 17:00:54 -05:00
Christian
47dfd99d4f More work 2012-12-17 14:30:51 -05:00
Christian
65473ad838 Merge branch 'master' into securityupdate 2012-12-17 11:46:27 -05:00
Christian
25c367f9db Fix up handling null names. *sigh* 2012-12-17 10:29:54 -05:00
Christian
e6c71bb148 Some tweaks to item identification. The GameRegistry methods are deprecated 
to encourage you to use the new named ones instead. These will force a
name on the item/block, allowing for stronger matching than "sequential guessing"
 2012-12-16 22:57:11 -05:00
Christian
bbe4b9fbc2 More fixes 2012-12-16 21:22:55 -05:00
LexManos
3369976c05 Updated MCP download mirriors upon Searge's request. 2012-12-16 05:35:46 -08:00
Christian
a26b495ef9 Move Side and SideOnly to relauncher package 2012-12-15 23:21:26 -05:00
Christian
8f3b1aeff7 Fix newline fun 2012-12-15 22:37:32 -05:00
Christian
d811fea82c More stuff for the thingy 2012-12-15 22:30:16 -05:00
Christian
16651d6994 Remove old NEI/CCC compatibility code and other classloading tweaks 2012-12-15 20:40:08 -05:00
Uristqwerty
47281f2de1 Simplify logic in tick start/end 
Change the EnumSet equivalent of "A &= ~ new(~B)" to "A &= B".
This eliminates the need for one temporary object in a frequently called loop, and reduces the number of methods that need to be invoked.
 2012-12-14 04:14:17 -05:00
LexManos
70b9cd6e1f Fix var name messup 2012-12-13 00:22:30 -08:00
LexManos
60b6913a87 Update released eclipse project to link BouncyCastle 2012-12-12 23:44:28 -08:00
Christian
1dcf3bfbdc Change ID management slightly. IDs are tracked by block type for itemblock items now. This means servers will need to update. 
Also, ordinal rearrangements within a mod will no longer trigger server disconnection, though a warning will still be logged.
 2012-12-12 19:31:05 -05:00
Christian
d13187d689 Fix possible escape leakage.. 2012-12-12 19:31:05 -05:00
LexManos
238dcdd18d More robust eclipse workspace replacement 2012-12-12 14:31:07 -08:00
LexManos
1812016e29 Kill decompile if astyle is not found and set execution bits on mcp .sh files and astyle-osx 2012-12-11 21:47:45 -08:00
Christian
55dc3467de Change to download bouncy castle as well. We also finally properly use the downloaded libs 
even in vanilla code!
 2012-12-11 22:37:07 -05:00
Christian
229a501def Remove extraneous patch file 2012-12-11 20:37:12 -05:00
Christian
64226c3d7e Merge branch 'repackage' 
Conflicts:
	build.xml
	client/cpw/mods/fml/client/FMLClientHandler.java
	client/cpw/mods/fml/client/GuiIdMismatchScreen.java
	common/cpw/mods/fml/common/FMLCommonHandler.java
	common/cpw/mods/fml/common/IFMLSidedHandler.java
	common/cpw/mods/fml/common/network/ModIdMapPacket.java
	common/cpw/mods/fml/common/network/ModListResponsePacket.java
	common/cpw/mods/fml/common/registry/GameData.java
	common/cpw/mods/fml/common/registry/GameRegistry.java
	common/cpw/mods/fml/common/registry/ItemData.java
	common/cpw/mods/fml/common/registry/LanguageRegistry.java
	common/cpw/mods/fml/server/FMLServerHandler.java
	install/fml.py
	patches/minecraft/net/minecraft/client/Minecraft.java.patch
	patches/minecraft/net/minecraft/server/MinecraftServer.java.patch
	patches/minecraft/net/minecraft/world/storage/SaveHandler.java.patch
 2012-12-11 14:58:38 -05:00
Christian
f97b330605 Merge branch 'repackage' of github.com:cpw/FML into repackage 
Conflicts:
	common/cpw/mods/fml/common/registry/GameData.java
 2012-12-11 14:49:23 -05:00
pahimar
5ef0cbfc32 Update common/cpw/mods/fml/common/registry/LanguageRegistry.java 
Add in logging of what file failed to be loaded
 2012-12-11 11:27:05 -05:00
LexManos
65a8bbf9e7 Fix patches, rebased with HEAD 2012-12-10 15:37:48 -08:00
LexManos
9be4b14371 Remade python dist as 32-bit. 2012-12-10 15:26:15 -08:00
Christian
1c5b8ecb7b Fixing id map generation - should validate correctly now 2012-12-10 15:26:13 -08:00
LexManos
5753eb0738 Reenabled replacement of the eclipse folder. 2012-12-10 14:56:23 -08:00
LexManos
41e899dcea Remade python dist as 32-bit. 2012-12-10 14:56:05 -08:00
Christian
aee1a3f24d Fixing id map generation - should validate correctly now 2012-12-09 22:24:16 -05:00
Christian
3f383e2dc6 Fix up idmap code 2012-12-09 22:01:13 -05:00
LexManos
5e0af1f2cb Some derp protection in the workspace copy. 2012-12-09 02:20:21 -08:00
LexManos
00bdb3dc0b Removed remaining references to src/common 
Fixed eclipse workspace replacemnt on source dist
Cleanup some outputs
 2012-12-09 02:10:28 -08:00
LexManos
3537fb7f21 Updated build script to not use the mcp common directory as it doesn't exist anymore. 2012-12-08 21:41:51 -08:00
LexManos
099b8259a6 Fished moving out the rest of the default packaged classes to aproperiate packages. Updated patches and code to reflect. 2012-12-08 21:41:16 -08:00
LexManos
21c66eaf98 Updated the update_packages script to support different mcp locations 2012-12-08 21:40:39 -08:00
LexManos
1742abb139 Update fml_marker.cfg, Minecraft is now runnable! 2012-12-08 20:25:29 -08:00
LexManos
804e597aca Update all imports for repackaging. Branch is compileable. 2012-12-08 20:21:03 -08:00
LexManos
e63311b4d0 Some stragler patches 2012-12-08 19:34:35 -08:00
LexManos
b02f93aeed Updated patches to new packages. 2012-12-08 19:33:29 -08:00
LexManos
ded6b4667b Give new classes a distinct package to be moved from. 2012-12-08 17:50:14 -08:00
LexManos
2009c89bf7 Fixed 0.tree to actually refresh the workspace. 2012-12-08 17:35:11 -08:00
LexManos
3e1efdf05b Remerged branch, and updated dev eclipse workspace. 2012-12-08 17:08:51 -08:00
Christian
f4070ff625 Add in storage, detection and validation of the ItemID array between client and server 
and also for world saves. May help with item configuration issues.
 2012-12-08 17:05:18 -08:00
Christian
e6d66322fe Add a modid on the mods list, should make it easier to do things like forge chunkloading config 2012-12-08 16:46:47 -08:00
Christian
57fe3c475a Fix build eclipse extractor task 2012-12-08 16:46:46 -08:00
Christian
bccad16ea6 Add in storage, detection and validation of the ItemID array between client and server 
and also for world saves. May help with item configuration issues.
 2012-12-07 01:52:16 -05:00
Christian
d4b06fd4bc Add a modid on the mods list, should make it easier to do things like forge chunkloading config 2012-12-04 18:08:27 -05:00
Christian
7b7255013a Fix build eclipse extractor task 2012-12-04 18:04:45 -05:00
Christian
71044df76b Fix typo 2012-12-04 01:30:38 -05:00
Christian
edb4e08b22 Merge branch 'master' into repackage 
Conflicts:
	eclipse/Clean/.classpath
	eclipse/Clean/.project
	eclipse/FML/.classpath
	eclipse/FML/.project
	install/fml.py
 2012-12-04 01:24:50 -05:00
Christian
fa34555efa Try and make branch non-derpy 2012-12-03 23:47:23 -05:00
Christian
45583a7420 Try defaulting branch differently 2012-12-03 22:26:12 -05:00
Christian
e8ff9f25d9 Remove old eclipse workspace and ship/extract as a zip file (use ant setupenvironment) 
Fix up install.py for forge multibranch changes
 2012-12-03 19:55:37 -05:00
LexManos
61a90e9e74 Assume Forge is the parent directory when checking for AT configs. 2012-12-03 16:53:03 -08:00
Christian
9cdbadb66c Merge branch 'master' into repackage 
Conflicts:
	patches/minecraft/net/minecraft/client/EntityFX.java.patch
 2012-12-03 17:31:29 -05:00
Christian
6fdf5960ef Name both zips the same format 2012-12-03 08:38:20 -05:00
Christian
329fe50b1d Last part of branch name only please 2012-12-03 08:30:44 -05:00
Christian
461173a778 Try and get a valid branch name on jenkins 2012-12-03 08:23:21 -05:00
Christian
16418dd7ad Clean up build.xml script- support outputting a branched jar file 2012-12-03 08:13:20 -05:00
LexManos
e334a469fb Small derp in install.py 2012-12-02 20:26:36 -08:00
LexManos
d583a760ec Try marking python as binary. 2012-12-02 20:19:55 -08:00
LexManos
c584d4e3db FML will now attempt to download MCP as part of the install process 
Now shipping a py2exe version of python for windows.
Linux/Macs should come with python pre-installed so they do not have a distrabution here.
 2012-12-02 19:59:22 -08:00
LexManos
5cf07b008e Windows Python distrabution created using py2exe, thanks Fesh0r for the script. 2012-12-02 19:56:17 -08:00
LexManos
adad5c96cf Marked more spots in gui/items bitmask as being free. 2012-11-21 15:58:04 -08:00
LexManos
10cdc06cc3 Delete duplicate file 2012-11-20 18:07:39 -08:00
LexManos
78ff6182fe Finished repackaging net.minecraft.* net.minecraft.client is left 2012-11-20 17:58:22 -08:00
LexManos
7fb23bf89f More re-packaging, got most classes out of the default package. 2012-11-20 17:22:55 -08:00
Christian
25a10d6fc4 Fix up MCP version 2012-11-20 08:47:14 -05:00
Christian
389608116f Merge joined.exc add update howto 2012-11-20 08:38:33 -05:00
Christian
f74b8ac30b Revert "Fix MC-2497 - derpy torch flames. Moved from forge. Everyone should benefit." 
This reverts commit fa567014a54b3273002fe9cf424ab4cf3ec54c3a.
 2012-11-20 08:27:13 -05:00
LexManos
554d86f59b Remove common folder from projects 2012-11-20 03:15:45 -08:00
LexManos
f75bf90e77 Move IBossDisplayData to shared 2012-11-20 03:15:16 -08:00
LexManos
8b1ed2d255 First half of new patches 2012-11-20 03:15:01 -08:00
LexManos
586807c2c8 Update FML imports 2012-11-20 03:14:36 -08:00
LexManos
73a22bb571 Inital script side commit for MC source repackaging done. 2012-11-20 01:55:41 -08:00
LexManos
397d36e900 Modified merger to just consider all server classes as common. And moved the defnition of CodecMus to the config. 2012-11-19 17:45:53 -08:00
LexManos
745b697779 Forgot mcp.cfg 2012-11-19 15:47:18 -08:00
LexManos
950154aa61 Updated to 1.4.5b 2012-11-19 15:35:08 -08:00
LexManos
5e5919f61c Fix python error 2012-11-19 15:03:13 -08:00
LexManos
786b04c57d Modified decompile so that we do not have to decompile the server, saves time. 2012-11-19 15:01:04 -08:00
LexManos
72938c9133 Cleaned up some tabs 2012-11-19 15:00:11 -08:00
LexManos
f842aa75bb Change usage of ZipFile, fixes issues with Mac's default instation of python. Also cleaned the python a little bit. 2012-11-19 13:33:22 -08:00
Christian
02b6904843 Attempt to fix a possible comodification risk 2012-11-18 20:40:48 -05:00
Christian
8025bf3a2c Change texturebinding to use the textureId directly rather than iconIndex 
to determine if it needs to rebind the texture sheet
 2012-11-18 08:45:25 -05:00
Christian
0340719ca2 Fix mod display list. Shouldn't be derpy anymore. 2012-11-17 23:51:14 -05:00
Christian
c445ab004b Fix World patch- workaround no longer required and leftovers are bad. 2012-11-17 23:44:53 -05:00
LexManos
8d26642a84 Cleaned up the AT config updater, should work for any setup of the MCP workspace now. 2012-11-17 19:08:47 -08:00
Christian
783926194e Fix MC-2497 - derpy torch flames. Moved from forge. Everyone should benefit. 2012-11-16 22:50:21 -05:00
Christian
e8c5b0791f Fix an NPE in TileEntity trying to generate a crash report. Make suspicious classes just return the obvious. 
Fix NPE for FML crash report on server. Clean up dead patches.
 2012-11-16 22:50:00 -05:00
Christian
1c9b59b405 Clean up a patch 2012-11-16 16:49:44 -05:00
Christian
719f5f2bde Update FML for MC 1.4.5 2012-11-16 16:31:06 -05:00
LexManos
6191f2530c Fix for ModLoader static overrides not displaying. 2012-11-15 14:08:41 -08:00
Christian
8a40e72f90 Fix up derpy file name handling: closes #127 
Fix up duping childmods: closes #126
FMLPreinitializationEvent now offers a getLogger() that'll return your mod a personalized logger instance
 2012-11-12 17:54:21 -05:00
LexManos
5355348181 Fix spelling issue. 2012-11-08 21:01:31 -08:00
LexManos
4e2f04c48a FML setup should now download and verify all the minecraft files needed to run MCP. 2012-11-08 17:54:05 -08:00
Christian
96971abe13 Small fix to some MCP metadata for pre2 2012-11-08 20:34:45 -05:00
Christian
3dbe774ec1 Update to MC 1.4.4 2012-11-08 17:55:20 -05:00
Christian
27aa35aa17 Fix bug when a modloader mod is run on a dedicated server and has a 
connection handler assigned to it. Hi SmartMoving! Perhaps you should try
@Mod instead of BaseMod?
 2012-11-04 10:57:49 -05:00
Christian
9c3b07f53a Clean up some patch fuzz 2012-11-02 17:32:39 -04:00
Christian
c2350be4a7 Update joined.exc file from latest conf 2012-11-02 17:23:54 -04:00
Christian
8ec0cf6ab9 Update to 1.4.3 2012-11-01 23:53:13 -04:00
Christian
1a11b9c0e6 A useful tool for performing updates 2012-11-01 23:11:21 -04:00
Christian
448b85ceeb FUUUUUU! Stupid ticking. STOP REGISTERING TICK HANDLERS IN YOUR CONSTRUCTORS. 
I'm looking at you Rei's!
 2012-11-01 10:51:17 -04:00
Christian
92010b5bca Patch a file handle leak in RegionFileCache handling when under memory pressure. 2012-10-31 22:58:01 -04:00
LexManos
30db9154b2 Update MCP mapings again, yay bad syncs. 2012-10-31 09:23:17 -07:00
LexManos
ac41e0928e Updated MCP mapings. 2012-10-31 07:40:53 -07:00
LexManos
755cceb5cb StartServer is now useable in merged code base. 2012-10-31 07:40:40 -07:00
Christian
771c818cd4 Remove some debug, closes #123 2012-10-30 21:53:08 -04:00
Christian
17d1f1f157 Fix up tick management outside of mod loading phases for ModLoader mods. 2012-10-30 21:47:06 -04:00
Christian
5197e98fb1 Negatively cache failed class lookups, should help with @SideOnly performance issues. 2012-10-30 21:17:17 -04:00
Christian
1bd53fe75f Fix some whitespace issues, handle possibly bugged entities as well 2012-10-30 09:13:18 -04:00
Christian
01048c704b Vanilla/mod bug fixes: CME on entity processing, TileEntity resetting chunk on save/load. 2012-10-29 17:41:08 -04:00
Christian
dd011e16d2 Support for ModLoader 1.4.2. Good job Risu! 2012-10-28 23:55:58 -04:00
Christian
463514fbbe Add in an exclusion list tag for @Mod. The backend code isn't yet implemented, but shows the basic idea. 2012-10-27 15:13:28 -04:00
Christian
5115306e76 Fix a small problem with the new MCP container- it can cause NPEs. Nice. 2012-10-26 07:55:23 -04:00
Christian
1a31cd0886 Fix up some javadoc complaints 2012-10-25 16:18:42 -04:00
Christian
f7403a509f Update build - include MCP information in the source pack 2012-10-25 10:00:34 -04:00
Christian
c2f4738c8c MCP deserves lots of credit. So here it is. 2012-10-25 09:02:49 -04:00
Christian
8a6680f9c7 Fix instantiation bug 2012-10-24 21:58:36 -04:00
Christian
a72f6b1eff Simple InterMod comms. Send a message using FMLInterModComms.sendMessage(). Receive messages through an @IMCCallback 2012-10-24 16:39:55 -04:00
Christian
39d6ef64c2 Update for MC 1.4.2 2012-10-24 15:12:06 -04:00
Christian
f9db650310 Duplicate Mod display screen. 2012-10-24 09:41:46 -04:00
Christian
4d620ade3e Fix typo in access transformer 2012-10-23 21:21:28 -04:00
Christian
fc0fc0cc75 Fix the merge for forge 2012-10-23 18:36:05 -04:00
Christian
a3e71f4016 Fix up references to minecraftDir in obf code 2012-10-23 18:10:06 -04:00
Christian
6e8902da86 Update FML for Minecraft 1.4.1 2012-10-23 18:00:33 -04:00
LexManos
37697d7f44 First update to 1.4.1, patches need updating. 2012-10-23 14:44:04 -07:00
LexManos
54f5225530 Add some null checks, and throw descriptive exception when SideTransformer prevents a class from loading. 2012-10-23 13:32:02 -07:00
Christian
190c71eeb5 Ship a client only class so the merge works both sides. 2012-10-21 22:50:20 -04:00
Christian
b88f2e6938 Fix RenderRegistry render ID - now at 36 
Fix SpriteMaps - they're running out fast! Switch to forge if you can!
RenderBiped now has an armorlist- so armortypes add to it as well
 2012-10-21 12:41:53 -04:00
Christian
8af47f2bb9 Fix up FML python script for forge 2012-10-21 08:19:36 -04:00
Christian
bdb8a7c059 Update to MCP pre 3. Fixes some weirdnesses with explosions. 2012-10-21 07:11:09 -04:00
Christian
2fcea16485 Update for MCP release 2012-10-20 18:02:26 -04:00
Christian
698f0e69eb Remove fuzz from patches for INetworkManager change 2012-10-20 17:16:50 -04:00
Christian
8ce9b05d8b Fix for new names INetworkManager and ITexturePack. I also provide refactoring scripts for both, for your use... 2012-10-20 17:07:59 -04:00
Christian
c7002207fb Add a script to ignore git complaining about the eclipse workspace changing - run when you first open the eclipse workspace 2012-10-20 15:24:05 -04:00
Christian
fabc324487 Update gitignore - ignore the files that will change or be deleted 2012-10-20 15:14:06 -04:00
Christian
1a3c19430c Add in "starter" image for eclipse workspace 2012-10-20 15:02:37 -04:00
Christian
6c48db441c Eclipse workspace fixup 2? 2012-10-20 14:42:25 -04:00
Christian
75fa0f2bdb Clean up eclipse workspace- part 1 2012-10-20 14:09:44 -04:00
Christian
279b5d5e23 Clean up a bit of patch fuzz 2012-10-20 12:39:40 -04:00
Christian
7da5727e3e Fix CommonHandler for rename of the server thread class 2012-10-20 12:31:35 -04:00
Christian
59738c493a Update with RC2 MCP. Use the joined.exc file directly since MCP now provides it. 2012-10-20 12:27:30 -04:00
Christian
70c342908f Fix exception for CodecMus 2012-10-20 12:12:43 -04:00
Christian
7ac53b4772 Fix some compilation issues. Requires resolving the worldclient abstract method 2012-10-20 11:30:01 -04:00
LexManos
ce847a7c53 Inital patch update to 1.4 2012-10-20 02:43:03 -07:00
LexManos
7afbc1ab93 Moved into EntityVillager 2012-10-20 02:42:34 -07:00
LexManos
2028b0aa7f Fix line ending detection during checkout. 2012-10-20 02:32:29 -07:00
LexManos
f59de49682 We don't need logging here... 2012-10-20 02:27:26 -07:00
LexManos
ed3f7c14e3 remove useless -Server projects 2012-10-20 00:43:02 -07:00
LexManos
528670d103 Updated the AT config and Marker config for 1.4 obf 2012-10-20 00:36:33 -07:00
LexManos
c106909d91 Updae build to copy files that may decompile differently but are actually the same, and updated for 1.4 values. 2012-10-20 00:06:55 -07:00
LexManos
671892fd32 Update MCP Merge config. 2012-10-19 23:57:49 -07:00
LexManos
7fcdb47edb Pull in MCP's 1.4 conf files. 2012-10-19 23:57:05 -07:00
LexManos
ecf14df030 Fix error in merging of exec's 2012-10-19 21:14:03 -07:00
Christian
9b1375f536 Update build.xml - add a classpath to the manifest. This means the universal jar is now a server side launcher. 2012-10-18 21:07:33 -04:00
Christian
ce138ec571 Typos! 2012-10-18 21:00:58 -04:00
Christian
5b4de7b2b5 Try and avoid an NPE in crash reports 2012-10-18 14:41:32 -04:00
Christian
3599c11599 Fix logging problems- log death messages and re-route the server through FML logs properly. 2012-10-17 18:05:23 -04:00
Christian
4af51b0cad Fix the test mod 2012-10-16 13:24:29 -04:00
Christian
4c39831d2b Coremods can be specified via the command line: fml.coreMod.load=<listofcommaseparatedclasses> This will help with developing coremods 2012-10-16 13:21:10 -04:00
Christian
4aced4ae02 Fix classpath for server 2012-10-16 12:40:01 -04:00
Christian
7327ea75f7 Add in the ability for a client to throw a custom exception that displays a custom gui instead of the default error message. 2012-10-16 12:39:04 -04:00
Christian
a82285964f Update FML internal classpath. Helpful for coremod devs 2012-10-16 09:47:06 -04:00
Christian
e770c87084 Don't use File to separate the last element of the path. It's a URL, they're always separated by '/' 2012-10-16 09:46:08 -04:00
keepcalm
924425074f Changed RelauchLibraryManager so that files with different paths on the 
same baseURL can be implemented in one ILibrarySet.
 2012-10-16 09:46:08 -04:00
Christian
c0795e9bee FML as a whole is now subject to transformers. 2012-10-16 09:20:30 -04:00
Christian
4f0ddca554 Bonus extra character. thanks randomitter! 2012-10-16 09:06:13 -04:00
Vazkii
f2e4e20f35 Add Null check to FMLClientHandler.sendPacket 2012-10-05 17:36:52 +02:00
Christian
124f47f55c Update patches *sigh* 2012-10-02 22:04:25 -04:00
Christian
550e622bc7 Add in a savehandler strategy for reading and writing data to the 
world save. This service is only available to coremods via the
WorldAccessContainer interface on the mod wrapper. This is deliberate
and will not change.
 2012-10-02 21:54:47 -04:00
Christian
a554846e57 Add in some bukkit supporting code. Most of this is unimplemented 
until the bukkit coremod is complete.
 2012-10-02 20:26:47 -04:00
Christian
0ed0d284b5 New stuff on the ModLoader! Risu has been busy. Closes #114 2012-10-02 08:29:12 -04:00
Christian
9a8a38d345 Mods can now declare a range of minecraft versions they will run against 2012-10-02 01:29:46 -04:00
Christian
7cd5ae04f7 Fix maps supporting greater than byte() dimension sizing 2012-09-29 00:21:42 -04:00
Christian
639039dd18 Fix language registry additions, closes #113 2012-09-28 22:12:23 -04:00
pahimar
df7d2b7161 Added ability to query the Language Registry by key and language for specific localized text, as well as loading in localization text from a specific file/URL 2012-09-26 15:41:58 -04:00
Christian
7dbda77f10 Extreme headless mode is back! 2012-09-25 22:46:47 -04:00
Christian
eb034416ae Fix parent child counts showing properly. Closes #107 thanks scott! 2012-09-25 19:00:36 -04:00
Christian
d21bc1085c It's useMetadata, not usesMetadata. thanks myrathi and psx. closes #110 2012-09-25 18:57:42 -04:00
Christian
2bee777740 Fix random shuffling when manipulating biomes by using a LinkedHashSet to preserve iteration order. Closes #111 2012-09-25 18:54:46 -04:00
Christian
b29aebf338 Try and fix the newline capture so consoles show on the server on windows again 2012-09-24 17:22:39 -04:00
Christian
37340b0f80 Readd ancient searge name so dan200 and computercraft can run again. REMOVE THAT CODE DAN. 2012-09-24 17:22:16 -04:00
Christian
98151df96b Fix missing import. Thanks ichun :( 2012-09-21 18:17:56 -04:00
Christian
f73d283341 Version file searching should work for directories too 2012-09-21 17:39:52 -04:00
Christian
cb2535fa95 Fix bug causing NPE if non-whitelisted player joins an FML server without FML installed 2012-09-21 10:12:39 -04:00
iChun
efb0e73df9 Fixed ModTextureAnimation not updating and not binding to correct image. 2012-09-17 23:46:09 +08:00
Christian
a837d82e68 Tidy code 2012-09-16 21:44:11 -04:00
Christian
9b081b9d46 Change version.properties search slightly, allow access to found file from the preinit event 2012-09-16 21:42:59 -04:00
Christian
83a57f5259 Add in the capability to read an internal version as <modid>.version from a file 
in the zip call version.properties. Handy for autobuilding scripts.
 2012-09-16 21:05:56 -04:00
Christian
e619e00079 Fix up reversed assignment for version fallback 2012-09-16 21:05:56 -04:00
LexManos
8f0b7c05fe Fixup Item in hand rendering of textures > 16x 2012-09-15 18:24:27 -07:00
LexManos
b404f294c5 Make the exception print for headless servers if the Downloader cant initalize. 2012-09-15 18:06:59 -07:00
LexManos
48d12444c0 Remove a bunch of warning about javadoc, not a real fix, but no more warning. 2012-09-15 18:04:56 -07:00
LexManos
82fba4bfaa Update MCP Mapings 2012-09-15 17:09:45 -07:00
LexManos
ec2a59bde8 Makes GetModSrc check the common folder when attempting to extract source files 2012-09-15 17:09:34 -07:00
Christian
149a626e5a Tie parent/child containers together again. Should close #96 2012-09-15 15:58:20 -04:00
Christian
9cd4ed0c91 Village mating produces added villagers, and the egg should place 
added villagers too. Closes #97.
 2012-09-15 15:49:08 -04:00
Christian
09558e9e15 Clean up stale references to the Player stored in the NetworkRegistry, 
closes #100
 2012-09-15 15:36:26 -04:00
CovertJaguar
13756b6f2c More readable init logs 2012-09-14 00:47:48 -07:00
Christian
0de240c4fe Fix onConnectionClosed not being called on the client side of a connection 2012-09-09 11:29:08 -04:00
Christian
74343a0cff Add in exclusion list for IFMLLoadingPlugin. 2012-09-08 12:19:03 -04:00
Christian
3461c12d95 Remove debug cruft 2012-09-07 23:14:54 -04:00
Christian
67d8b3b475 To properly align with packet9respawn, make packet1login's dimension an int as well 2012-09-07 22:57:01 -04:00
Christian
ab34f2d2cf Attempt to build some protocol negotiation, and fix packet1login so that the dimension is a short, matching packet9respawn 2012-09-07 22:46:31 -04:00
Christian
c4d5c89f85 Compatibility level is now passed from server to client - and 
the client tracks it. This means certain packet changes can be made
without breaking comms, hopefully
 2012-09-07 19:32:36 -04:00
Christian
67b9fbe363 Fix dependency checking: you can depend on specific versions of FML 2012-09-07 19:08:28 -04:00
iChun
7a0ab7e563 Fix handleTinyPacket using short instead of int. 
Silly cpw :P
 2012-09-07 18:35:26 +08:00
Christian
e564610b54 Fix up tiny packet handler to actually work 2012-09-06 22:59:38 -04:00
Christian
94d076a14a Allow javax to be shipped by mods. Should allow some more modloader mods to work 
unaltered
 2012-09-06 22:03:02 -04:00
Christian
d2e99c3443 Add in a little bit of protocol cleanup. Start work on allowing multiple 
protocol versions
 2012-09-06 21:54:43 -04:00
Christian
45bbdd14d6 Give a way to build the packet131mapdata packet correctly populated 2012-09-06 10:12:37 -04:00
Christian
8b8d9a58f6 Capture and leverage Packet131MapData 2012-09-06 10:03:30 -04:00
Christian
50c74f93bd Make console logging pass through a single logging thread to avoid concurrency problems with launchers and stuff 2012-09-04 19:11:45 -04:00
Christian
6d9b9fde47 Overlooked chat message support *sigh*. Fixes wierd mods that communicate through custom 
chat messages rather than anything else. Hi Superior enchanting!
 2012-09-04 12:37:59 -04:00
Christian
7a58542fb8 Rescan mod packages where there was a possible mod identified to try and make sure we load it. Fixes Matmos r16 2012-09-04 11:39:51 -04:00
Christian
61153abf7b And handle the other way to globally register an entity 2012-09-03 21:37:20 -04:00
Christian
788d1c9925 Fix up mods trying to register entities outside of modloading. Now you'll get a big fat warning for doing such a derpy thing. 2012-09-03 21:32:21 -04:00
Christian
6de655df47 Fix CJB mod compatibilty for real. Gui container registration can now happen in the constructor. YUK! 2012-09-03 21:14:11 -04:00
Christian
2af15b3a95 Fix compatibility with ModLoader dispenser hook. Fixes a bug with 
IDispenseHandler too - though it means that interface is now
deprecated
 2012-09-03 11:37:17 -04:00
Christian
5bea2a0bbd Fix headless operation, hopefully 2012-09-02 13:29:46 -04:00
Christian
599476d587 Fix up trying to re-add stuff to the classpath when it's already there 2012-09-02 12:56:08 -04:00
Christian
d538dcf06f Fix out of range entity id handling for ModLoader mods a bit more. Thanks Herobrine mod! 2012-09-02 12:39:06 -04:00
Christian
6072420a02 Expose GuiMerchantButton 2012-09-02 12:15:13 -04:00
Christian
6056c760d4 Log a big fat warning for the developer in the case the network version 
is not acceptable to the mod itself. (This can happen because of a bad range
specifier for example)
 2012-08-31 23:41:29 -04:00
Christian
8f70ed5f33 Also, make missing entity not blow things up 2012-08-31 16:49:35 -04:00
Christian
17cbb9d3b7 Fix entity tracker "update" packet not computing correctly. Should work now.. 2012-08-31 16:41:05 -04:00
Christian
bd137b7f06 Fix up addRenderer to catch exceptions from the basemod, also, addrenderer now supplies a list of the 
default renderers from MC for editing and will note the changes made.
 2012-08-31 11:18:17 -04:00
Christian
befe8f5f47 Change download location for FML libraries to files.minecraftforge.net, add an encoding param to the javac command line to force utf 8 2012-08-31 11:18:17 -04:00
Christian
74d6437856 Add in random jar/zip files to the classpath. UGH this is so fucking ugly it's not funny. 2012-08-30 20:10:53 -04:00
Christian
93f9cc45f9 Use a null socket and try to prefer the result of getLocalHost in the broadcast data. 2012-08-29 16:12:40 -04:00
Christian
ece5483ad7 Add in an ItemRenderer null check so FML can run render adding mods 2012-08-29 13:58:56 -04:00