cpw
e53e39343b
Merge pull request #200 from bspkrs/patch-2
...
Added comments to note FML-only methods
2013-03-14 18:37:08 -07:00
Christian
06347b2a54
Fix AllPublic access transformer not affecting methods. Should fix modloader
...
compatibility
2013-03-14 15:53:19 -04:00
bspkrs
30f76c67e5
Added comments to note FML-only methods
2013-03-14 01:29:36 -03:00
LexManos
d98a805b30
OS X's python 2.6.1 has a bug in zipfile.extractall that makes it unzip directories as regular files. So switch to extract
2013-03-13 13:11:43 -07:00
LexManos
99b938a800
Allocate more ram {typically 256 is defailt} to fermflower, should fix decomplication issues on OSX
2013-03-13 13:11:10 -07:00
Christian
a208d69a09
Fix up stupid derp in IMC code: actually reset the IMC list after
...
each delivery. Fixes a bunch of mods. Sorry everyone.
2013-03-13 15:09:50 -04:00
Christian
a80049eca2
Pass obfuscation status to coremods
2013-03-12 21:06:37 -04:00
Christian
78732231d4
Fix up deep tree deobfuscation
2013-03-12 20:33:19 -04:00
LexManos
71fc1afd0d
Missed joined.exc, must fix scripts.
2013-03-12 15:12:49 -07:00
LexManos
619c97a634
Update MCP for latest PR silent update.
2013-03-12 15:02:58 -07:00
LexManos
81d9e8315c
Readjust size of mods button when Minecraft Realms button is enabled.
2013-03-11 16:20:56 -07:00
Christian
1f4098d779
Update MCP, fixes the "broken texture packs" problem.
2013-03-11 16:31:26 -04:00
Christian
f08dec0d63
Fix "0 mods" display when installed in forge.
2013-03-10 12:12:22 -04:00
Christian
afb18ee321
Change type of connection queue to a concurrent linked queue. Much more efficient, hopefully. Closes #189
2013-03-10 01:25:36 -05:00
Christian
b6d98f47a8
Merge branch 'master' of github.com:Uristqwerty/FML
2013-03-10 01:22:24 -05:00
Christian
424ba13bb2
Fix supertype parsing to handle null superclass (Hi Object!). Closes #160
2013-03-10 01:20:08 -05:00
Christian
72f55cfd08
Fix demo mode crash. Closes #187
2013-03-10 01:15:16 -05:00
Christian
d3d4e7683c
Fix coremods without a manifest crashing the game. Closes #181
2013-03-10 01:05:31 -05:00
Christian
796f70b545
Fix reflection helper: it needs to unmap the classname to find the field maps.
2013-03-09 17:58:18 -05:00
Christian
46b909e818
Try a different way of remapping the fields. Should work because it's userspace, not relauncher space
2013-03-09 17:36:31 -05:00
Christian
a713300e0a
Revert "Use the reobfuscation maps in the reflection helper for field lookups: should help some reflection cases with the deobf."
...
This reverts commit 485db6be2e6b54a9a523a2b06e0d886792b0826a.
2013-03-09 17:32:11 -05:00
Christian
c33cd0d9ea
Use the reobfuscation maps in the reflection helper for field lookups: should help some reflection cases with the deobf.
2013-03-09 17:19:48 -05:00
Christian
0d3d03ab83
Fix up some relauncher stuff: the vanilla applet works now, as do other applets. Deobf data is resolveable for them too.
2013-03-09 15:25:58 -05:00
LexManos
d24461c50a
Fixed srg name of minecraftDir for runtime deobf.
2013-03-09 11:52:40 -08:00
Christian
f13437df46
Fix runtime deobfuscation for remapped inner classes
2013-03-09 14:06:39 -05:00
LexManos
a8da44fb8f
Fix Multi-part entity children ID issue, mobs with custom spawning must deal with child ids themselves.
2013-03-09 10:07:41 -08:00
Christian
a98bf99037
Fix up some small things, merging into mainline
2013-03-09 12:39:36 -05:00
Christian
23ea71130f
Merge branch 'snapshot15'
2013-03-09 12:26:14 -05:00
Christian
1176144590
Fix accidental commands.patch overwrite
2013-03-09 12:25:24 -05:00
Christian
9b8c65d3c2
Merge branch 'snapshot15'
2013-03-09 12:19:37 -05:00
Christian
3c14424e30
Some fixes for the snapshot
2013-03-09 12:10:13 -05:00
Christian
1a3022ae7a
Revert "Fix modlist to use the new texture binding functions, i think"
...
This reverts commit 48544db690bf213a322954b7bd39cb3a8ca59bb1.
Conflicts:
client/cpw/mods/fml/client/GuiModList.java
2013-03-09 11:12:12 -05:00
RainWarrior
c2fce94d6b
Fixes GameRegistry.registerBlock
2013-03-09 14:06:12 +04:00
Christian
2dece4d42a
Update MCP info for latest
2013-03-08 23:14:30 -05:00
Christian
07513ff7c8
Support the MCP format of partial reobfuscation for portability. Ensure modloader-like compatibility
2013-03-08 23:13:39 -05:00
LexManos
6f124e0f1a
Update for new MCP with srg reobf.
2013-03-08 18:11:44 -08:00
Christian
ed3b056305
Update to MCP 1.5 and minecraft 1.5.
2013-03-08 20:36:05 -05:00
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