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
83ed6fa32c
Small tweaks to the mcp data. Nothing major..
2013-06-11 14:47:23 -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
8be20d6805
Add in a pretty sorting error screen
2013-05-27 10:28:00 -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
cpw
8f779cf618
Merge pull request #230 from fnuecke/master
...
Alternative setter logic for @SidedProxy in Scala classes/mods.
2013-05-11 15:34:37 -07:00
LexManos
6b39f612df
Don't spit error on LWJGL not supporting 4.3 just warning.
2013-05-11 10:55:39 -07: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
LexManos
4db40c7861
Add version detection to astyle and print error if it doesnt detect version 2.0+
...
Also fixed astyle's config for max-instatement-indent that sometimes caused crashes with certian versions of astyle.
2013-05-03 14:26:27 -07:00
CovertJaguar
ce99b80932
Improved Entity Spawn Error
2013-04-29 20:41:20 -07:00
LexManos
42564b3988
Fix scalac detection to actually use the located command instead of defaulting to 'scalac'
2013-04-28 16:35:23 -07:00
LexManos
bff831ce8d
Update MCP's md5 for the fixed srg files.
2013-04-28 12:33:42 -07:00
Christian
3baad0a897
Update for minecraft 1.5.2
2013-04-27 01:24:06 -04:00
Christian
2c7c944e96
Don't leave scala running in interactive mode.
2013-04-23 22:56:18 -04:00
LexManos
74e9b293e1
Fix patch derp.
2013-04-23 19:47:43 -07:00
Christian
5a81b37bcf
Fix when an old scalac is present on the system to not fail the build
2013-04-23 22:43:51 -04:00
Christian
cee176eb96
Some fixups for scala compilation in MCP. Scala should now be compilable and reobfuscatable with srgnames in MCP.
2013-04-23 07:40:49 -04:00
Christian
e97834b433
Fix URL for MCP
2013-04-23 07:22:25 -04:00
Christian
4d442ac219
Fix possible NPEs in GameData
2013-04-22 21:14:34 -04:00
Christian
8974a78c0a
Attempt to reduce lines on the screen for id mismatch. Hopefully prevents game crashes.
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
6c0bb61425
Fix a small modloader compatibility derp: closes #222
2013-04-20 22:55:56 -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
Christian
0a1f3e3150
MCP names update
2013-04-10 12:28:20 -04:00
LexManos
d89f0dc683
Re-worked the Texture patches, optifine helper function, and re-added support for dynamically rotating the texture for mod authors who do things horribly wrong.
2013-04-09 20:06:41 -07:00
Christian
ff95739dc8
Fix compilation derp, and clean up rotation helper.
2013-04-09 21:20:31 -04:00
Christian
2208df18c4
And add the patches *sigh*
2013-04-09 20:26:10 -04:00
Christian
10f08460a6
Very significant improvement in performance by using glSubImage to upload data. Inspired by frequent complaints about performance of hires
...
texture packs. They probably still need a beefy system but should work. Hopefully I can figure out why the subImage GL side copy isn't working
properly for an even more significant speed boost. But this gets things started.
2013-04-09 20:15:14 -04:00
LexManos
bc44fbe7dd
Fixed issue with instalation when java/javac commands had quotes.
2013-04-05 10:26:33 -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
5be6e8b756
And the core patches for that
2013-03-30 12:13:53 -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
Christian
1d0e8e9935
Fix mismatch screen a bit. Should render more correctly now and
...
at least not be blank in a lot of circumstances..
2013-03-22 10:20:53 -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
Christian
7e87a2e18f
Fix up patch properly. Also, fix md5s for the jars.
2013-03-22 01:48:21 -04:00
mDiyo
68f48f4acc
Fix missing block world rendering
2013-03-21 07:10:55 -07:00
LexManos
c33f8316d9
Merge MC 1.5.1 branch to master.
2013-03-21 04:10:30 -07:00
LexManos
b6f2573adb
Updated for new PR client jar.
2013-03-20 08:59:25 -07:00
Agaricus
79abc05c20
Fix install.py --mcp-dir option. Fixes #204 .
2013-03-19 21:42:04 -07:00
LexManos
c0eaa8d743
Someone derped up this function bad, revert name.
2013-03-19 17:54:06 -07:00
LexManos
4900d41946
Updated to latest MCP and Minecraft 1.5.1 Pre-release.
2013-03-19 15:48:42 -07: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
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
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