LexManos
3e346cb8b2
Add filter support for MCPMerger, and filter out libraries from the server's 'fat jar'.
2013-06-23 23:06:25 -07:00
Christian
39858c6ead
No more debug please
2013-06-15 01:11:29 -04:00
Christian
30d836fa36
More fixups for new launcher model
2013-06-14 20:45:52 -04:00
Christian
07a5efe612
Merge in binpatch and use launcher
2013-06-14 17:21:49 -04:00
Christian
21240df8bc
More tweaks
2013-06-14 09:32:51 -04:00
Christian
a923a2c142
Server side tested and working. Setup is complex atm. That will change.
2013-06-13 09:57:55 -04:00
Christian
4802d04bfd
First cut of runtime binary patching. Needs some work to actually test it in a real scenario..
2013-06-12 08:53:10 -04:00
Christian
c170b98a8c
Attempt to properly fix deadlock if the internal server derps. It should never hang now. Damn you fast computer..
2013-06-11 14:41:19 -04:00
Christian
146e773264
Fix sysout with trailing messages after a newline
2013-06-06 11:52:15 -04:00
Christian
1261c7a3e0
Add in an optional modid identifier for @SidedProxy. It's main use is when both scala and java @Mods reside in the
...
same package, and you want the @SidedProxy behaviour for a specific @Mod language type. In general it should not be needed otherwise.
2013-06-06 10:05:34 -04:00
Christian
fea7a25a86
Don't continue trying to send events to mods that depend on errored mods.
2013-06-04 13:59:04 -04:00
Christian
8602848f2c
Don't throw an exception if the scala adapter find a java proxy. I may add some distinguishers to @SidedProxy so you know which mod it's for.
2013-06-04 12:51:46 -04:00
Christian
2a064ffdc7
Send the "suspect list", and print the suspect versions
2013-05-27 11:03:23 -04:00
Christian
6ca37a60b7
Throw the sorting exception
2013-05-27 10:46:22 -04:00
Christian
e3cd509b9a
More tweaks to the mod sorting code
2013-05-27 10:09:51 -04:00
Christian
ece6290c19
Try and clean up cycle detection output a bit
2013-05-27 09:25:50 -04:00
Christian
aa18bed75e
Fix server side derp with Forge network packet handler
2013-05-21 11:01:50 -04:00
Christian
c8cc7b27d1
Separate network mod config from setup. Allows for Forge Packet Handler nicety
2013-05-20 21:40:42 -04:00
Florian Nücke
15e6ddcb14
Merge declaration and initialization of a variable.
2013-05-08 20:16:15 +02:00
Florian Nücke
a14c627cd7
Some more Scala @SidedProxy adjustments. Now properly supporting pure singletons, i.e.
...
object C {
@SidedProxy(...)
var proxy: P = null
}
Removed fallback, as all such singletons are properly handled by the new code now, and class implementations fall back to the code also used for plain Java mods.
2013-05-08 19:04:35 +02:00
Florian Nücke
283dfb6e7d
Alternative @SidedProxy setter for Scala.
2013-05-08 05:36:28 +02:00
CovertJaguar
ce99b80932
Improved Entity Spawn Error
2013-04-29 20:41:20 -07:00
Christian
4d442ac219
Fix possible NPEs in GameData
2013-04-22 21:14:34 -04:00
cpw
d15889075c
Merge pull request #225 from MarcinSc/master
...
Suggested fix for issue 221
2013-04-21 11:32:51 -07:00
Marcin Sciesinski
bdee7e3c5b
Fixing the GameRegistry. Now it is possible to register a Block with a BlockItem using following code:
...
MyBlock myBlock = new MyBlock();
GameRegistry.registerBlock(myBlock, MyBlockItem.class, "myBlock");
where MyBlockItem class has one constructor with signature:
public MyBlockItem(int id, Block block)
2013-04-21 19:01:18 +01:00
Christian
0512525c58
Add a to string to fmlmodcontainer: should mean less derpy cyclic dependency data
2013-04-21 13:58:18 -04:00
Glought
074d7c2ec7
Update FMLDeobfuscatingRemapper.java
...
Fixes a "Type mismath:cannot convert from element type Object to FieldNode" error at line 176.
2013-04-21 05:09:19 -07:00
Christian
3446f1ce26
Fix scala supporting SidedProxy. It should work now.
2013-04-20 23:31:22 -04:00
Christian
e204d580a8
Fix possible NPE in findItemStack, closes #218
2013-04-17 07:55:33 -04:00
Christian
3d142df102
Use more expressive language when a version specifier is a simple unbounded above condition
2013-04-16 13:46:55 -04:00
Christian
0888a95f2d
Fix to output versions in crash logs
2013-04-16 13:46:55 -04:00
cpw
470070e2ce
Merge pull request #216 from agaricusb/add-srgname
...
Add srgname to registerTileEntityWithAlternatives
2013-04-15 15:50:47 -07:00
Christian
1a9cb9e3c9
Add in some caching of the read field descriptions for efficiency
2013-04-15 17:30:35 -04:00
Agaricus
03bc9cf00a
Add type info to properly deobfuscate overloaded fields. Fixes #210 .
2013-04-14 16:54:11 -07:00
Agaricus
76275cafc4
Add srgname to registerTileEntityWithAlternatives
2013-04-14 14:11:37 -07:00
LexManos
5cd066767a
Sanitize input to isRemappedClass to use '/' as a package seperator like the srg files.
2013-04-04 23:30:10 -07:00
LexManos
2c0133af1d
Added the ability to save transformed classes to disc for debugging.
2013-04-04 10:32:48 -07:00
Christian
cc2bf9d8ac
Fix NPE when branding isn't present
2013-03-31 10:01:46 -04:00
Christian
41cd50d4c0
Change snooper/crash report brand handling. fmlbranding now loads another string!
2013-03-30 12:12:54 -04:00
Christian
1bfb87a701
Fix up derp in access transformer
2013-03-27 19:23:10 -04:00
Christian
27fe51a39c
Attempt to make any "default package" class public. This might fix problems with certain modloader mods that ship changes to vanilla classes.
2013-03-27 16:54:26 -04:00
Christian
a408fec0b8
Add some information, and a log message letting you know it worked
2013-03-23 16:01:20 -04:00
Christian
f41210d982
Add a mechanism to dump the registry- useful for mod developers.
2013-03-23 15:39:34 -04:00
Christian
49ebcae9a1
Validate supplied stack size
2013-03-23 15:10:13 -04:00
Christian
4550b5795a
Clone the itemstack, and allow for passing in a stacksize
2013-03-23 14:58:25 -04:00
Christian
db46ea94bc
Itemstacks in the GameRegistry (manual registration by mods)
2013-03-23 14:48:57 -04:00
James Clarke
84684cf3b6
Fixed FMLRelaunchLog's Newline Handling
...
System.out.println("\n") causes currentMessage to start with a newline character, which means idx will always be 0 from then on. Therefore if idx is 0 messages must still be logged, otherwise no more messages sent to stdout will be logged and they will just accumulate in currentMessage.
2013-03-22 09:19:39 +00:00
LexManos
11d5ac1e07
Fix NPE with CoreMods who do not have the new MCVersion annotation.
2013-03-19 13:48:18 -07:00
Christian
b8f72c678b
Support simple mc version test in coremods, only effective through
...
jar loading.
Also, log some more data about the environment.
2013-03-17 23:40:12 -04:00
Christian
ed17b11a76
Use the relaunch log, for class circularity safety.
2013-03-17 23:19:39 -04:00
Christian
ab79ef7e19
Fix the logger to treat newlines better, hopefully. Closes #199
2013-03-17 23:15:18 -04:00
LexManos
a8ae410493
Fix potential NPE in class loading and add extra debug information.
2013-03-17 11:54:26 -07:00
Christian
06347b2a54
Fix AllPublic access transformer not affecting methods. Should fix modloader
...
compatibility
2013-03-14 15:53:19 -04: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
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
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
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
RainWarrior
c2fce94d6b
Fixes GameRegistry.registerBlock
2013-03-09 14:06:12 +04:00
Christian
07513ff7c8
Support the MCP format of partial reobfuscation for portability. Ensure modloader-like compatibility
2013-03-08 23:13:39 -05: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
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
879213019b
Don't enforce signatures on minecraft classes
2013-03-02 14:48:08 -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
f9094e3f85
Tweaks to runtime deobf
2013-03-02 01:49:45 -05: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
b5ba054fe5
Update libs for 1.5. Lots of new libs.
2013-02-26 00:16:57 -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
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
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
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
