Christian
d5af053edb
First draft 1.7.9 support.
...
This is not modding minecraft. It's performing an update. Go away!
2014-05-17 16:30:13 -04:00
Christian
43e3ee1af1
Swap Listenerlist constructor around. Should fix parent resizing issue?
2014-05-14 14:22:51 -04:00
Christian
70570a863f
Fix up possible CME
2014-05-13 15:11:50 -04:00
Christian
503da3a257
Don't consider null NetworkDispatchers. This should fix a bunch of fakeplayer issues.
...
Nothing to see here. No modding being done.
2014-05-13 08:14:21 -04:00
cpw
42713c66e5
Merge pull request #426 from sfPlayer1/master
...
Fix ObjectIntIdentityMap sporadically matching non-identical objects.
2014-05-12 10:50:20 -04:00
Player
8dbd1ae0a1
Fix ObjectIntIdentityMap sporadically matching non-identical objects.
2014-05-12 16:29:37 +02:00
Christian
a8cbef2321
Finally hopefully fully kills the race condition causing a classcast
...
on slow machines.
This is me bugfixing. NOT MODDING! No! Stop it! I'm not!
2014-05-11 22:15:29 -04:00
Christian
5275cea844
Try and see if there is anything to the identityHashCode collision hypothesis. If you see this in your error messages, kindly let us know!
2014-05-10 14:53:08 -04:00
Christian
d8b6adb259
Add a helper for casting some common collection types into generic form
2014-05-10 13:36:24 -04:00
Lex Manos
0c36868f92
Fix network disconnect with message on the client side in NetworkDispatcher.
2014-05-09 13:23:24 -07:00
Lex Manos
f2fe80dc36
Fixed default network mod checking to allow client side mods without the server side. Mods wishing to REQUIRE server side components must specify a custom check handler using @NetworkCheckHandler
2014-05-09 13:22:54 -07:00
Christian
cd43eacbb2
Ensure that the loadcontroller is ready to preinit.
2014-05-08 10:40:52 -04:00
Christian
de546bdf6c
Clean up some missing generic info
...
PS: NOPE: still not modding.
2014-05-08 10:36:01 -04:00
Christian
b0eb1ef7c6
Split loadmods into loadmods and preinitmods, to allow resource loading to occur *always* between the two phases. This should fix
...
mods not being able to access resources during preinit.
PS: I'm still not modding.
2014-05-08 10:23:05 -04:00
Christian
738ce1d7cd
Re-add removed genericiterable to clean a warning
2014-05-08 09:58:03 -04:00
Christian
b9de9ebc96
Revert "Fix refreshResources not happening if an error occurs."
...
This reverts commit fff86ee9d3 .
2014-05-08 09:56:43 -04:00
LexManos
362ec8dee7
Merge pull request #419 from Thog92/master
...
updated wrapper to gradle 1.12
2014-05-07 15:41:05 -07:00
LexManos
ddc2cfbe86
Merge pull request #402 from AbrarSyed/patch-1
...
Added dependency examples to the shipped example mod's build.gradle.
2014-05-07 15:40:50 -07:00
AbrarSyed
542e9acec1
documented dependencies
2014-05-07 17:34:44 -05:00
Lex Manos
1436ac2f14
Fine use FMLCommonHandler.
2014-05-07 14:36:00 -07:00
Lex Manos
c73a2076e3
Fix potential rance condition in connecting to vanilla servers as well. And move latch into client side only.
2014-05-07 13:54:22 -07:00
Lex Manos
3612ad0c25
Attempt to fix another race condition related to reading NetClientHandler.
2014-05-07 13:31:16 -07:00
LexManos
1d5fc60f82
Merge pull request #411 from matthewprenger/master
...
Update ExampleMod mcmod.info
2014-05-07 12:39:12 -07:00
Thog92
8555344eb3
updated wrapper to gradle 1.12
2014-05-06 22:03:44 +02:00
Lex Manos
251af1d09d
Fixed memory leak on the client caused by Netty holding references to the World. Closes #415 #417
2014-05-05 22:14:13 -07:00
Christian
b84d0760ae
Fix display of mod status at the server
2014-04-30 22:47:10 -04:00
Christian
76d8d0e870
Fix mod version checking
2014-04-30 22:26:16 -04:00
Christian
fff86ee9d3
Fix refreshResources not happening if an error occurs.
2014-04-30 21:55:55 -04:00
Christian
810b1f3075
Clean some generic warnings up. Make a generic list handler. Helpful for others I think too.
2014-04-30 21:55:55 -04:00
LexManos
d0f8073fa5
Merge pull request #413 from sfPlayer1/master
...
backup+default block use fix
2014-04-30 10:12:21 -07:00
Player
2c56c32c5a
Fix saving backups with the raw name.
...
Fix air block not being assigned as the default.
2014-04-30 09:44:09 +02:00
Matthew Prenger
a70308ef41
Update mcmod.info
2014-04-28 22:27:52 -05:00
Player
78248da399
Registry: Treat all 1.6 entries as items.
2014-04-26 21:56:25 +02:00
Player
7ba167c500
Registry: Misc tweaks
2014-04-26 21:56:25 +02:00
Player
9b1cbab03b
Registry: Crash earlier with conflicting name/object registrations.
2014-04-26 21:56:25 +02:00
Player
d88b2aa0c5
prevent the world from getting saved twice at shutdown
2014-04-26 21:56:25 +02:00
Player
59a5adfdb3
Registry: Fix Block-before-ItemBlock allocation when loading 1.6 world saves, more validation
2014-04-26 21:56:25 +02:00
Player
ddee7eb117
Fix vanilla bug causing integrated server saving from 2 threads concurrently after a crash
2014-04-26 21:56:25 +02:00
Christian
2b8d0f6680
Fix SimpleNetworkWrapper - this is not me modding,
...
I didn't realize it was broken until Pahimar told me.
Put an example in the docs.
2014-04-26 09:33:09 -04:00
Christian
7f01cf549b
I'm still not modding. Player has contributed greatly to the 1.7 release of FML. He needs authorship credit.
2014-04-19 11:38:46 -04:00
Christian
77c254a6d9
I am not modding, I am fixing an annoyance. The MCP version has long since been 9.03. Also, the JSON from MC updated..
2014-04-19 10:46:04 -04:00
LexManos
3b42b33b6e
Merge pull request #400 from sfPlayer1/master
...
Fix various registry issues
2014-04-07 09:57:13 -07:00
Player
294c93212c
Registry: Add support for registering ItemBlocks before their Blocks
2014-04-07 17:30:38 +02:00
Player
8e44006f43
Registry: Protect against putObject misuse, handle duplicate registrations better
2014-04-06 17:11:23 +02:00
Player
c8a0b72eba
Registry: Complain about missing mods when repairing broken worlds
...
Registry: Reduce console spam
2014-04-06 14:49:59 +02:00
Player
c8a245a985
Registry: Fix debug info
2014-04-05 01:54:07 +02:00
Player
c7adb42199
Registry: Repair mismatched ItemBlocks as well
...
Fix a few misc issues
2014-04-05 01:47:19 +02:00
Player
f77632df35
Remove unneeded entity spawn debug logging.
2014-04-03 21:00:42 +02:00
Player
c47fc3b382
Enable custom gui rendering only as required
2014-04-03 17:58:53 +02:00
Player
fd6d55afcc
Registry: Allow ignoring missing mods from the GUI, with confirm+backup
...
Registry: Add confirm+backup for automated corrupted id table fixup
Require the user to confirm loading from a backup level.dat
2014-04-01 21:56:53 +02:00
Player
9be92dcfcb
Registry: Complain about bogus registrations
2014-04-01 14:40:24 +02:00
Player
49c623f59c
initial attempt at a better way to ask the user in case of startup issues
2014-04-01 14:30:47 +02:00
Player
038fa17ad3
Merge branch 'master' of https://github.com/MinecraftForge/FML
...
Conflicts:
src/main/java/cpw/mods/fml/client/FMLClientHandler.java
src/main/java/cpw/mods/fml/client/GuiModItemsMissing.java
src/main/java/cpw/mods/fml/common/FMLContainer.java
src/main/java/cpw/mods/fml/common/registry/FMLControlledNamespacedRegistry.java
src/main/java/cpw/mods/fml/common/registry/GameData.java
2014-04-01 07:00:20 +02:00
Lex Manos
58a4095f56
Update patches for Fixed FF in FG 1.2.
2014-03-31 16:02:54 -07:00
Player
6fd3c12a4a
Registry: allow handling missing blocks/items regardless of the mod id
2014-03-31 04:09:59 +02:00
Player
eb29d651eb
Fix old 1.7 worlds with broken ID mappings
2014-03-30 17:17:54 +02:00
Player
7325aa5033
Registry: cleanup, fix missing id error GUI formatting
2014-03-27 08:30:55 +01:00
LexManos
89cda92561
Merge pull request #392 from AbrarSyed/master
...
Updated to ForgeGradle 1.2
2014-03-26 16:04:30 -07:00
AbrarSyed
385beb504d
updated wrapper to gradle 1.11
2014-03-26 13:34:25 -05:00
AbrarSyed
2b46906ac5
updated example a little
2014-03-26 13:34:01 -05:00
Player
5eebd4df71
Registry: Implement support for remapping blocks/items to a new name.
2014-03-25 00:36:37 +01:00
Player
fd9389015f
Fix FMLMissingMappingsEvent.get
2014-03-24 21:47:25 +01:00
Player
a82195772e
Registry: Block IDs after failing to find a mapping for them
2014-03-24 21:16:36 +01:00
Player
e58562d3ed
Fix remaining issue with autoassigned Block and Item IDs overlapping.
2014-03-20 23:41:01 +01:00
AbrarSyed
c3912836dc
updated for ForgeGradle 1.2
2014-03-19 02:15:53 -05:00
LexManos
40270c881a
Update README.txt
2014-03-18 01:54:32 -05:00
Lex Manos
c2143dbeb1
Fix network close events never getting called. Closes #381 #382
2014-03-15 18:16:27 -07:00
Lex Manos
f08b485852
Fix long standing deobf issue that caused announce-player-achievements property to have no effect on dedicated servers.
2014-03-11 01:57:44 -07:00
Lex Manos
ef07de4f65
Fix hard link to DedicatedSerever when opening a LAN connection causing stalls on connecting.
2014-03-11 00:50:55 -07:00
Lex Manos
b7ad532ab5
Re-enable post initalize texture pack reloading to allow Icons to be registerd through any init phase.
2014-03-03 23:23:55 -08:00
Lex Manos
399770e572
Kill the modEventTypes list, register anything that extends FMLEvent, Fixes MissingMappingEvent handler, and any future events added.
2014-02-25 12:30:29 -08:00
Lex Manos
e8b60441cc
Reload game settings after mod loading is finished to capture mod keybindings. Closes #378
2014-02-22 20:59:25 -08:00
Christian
d0dd05a15c
FML expands S3F to support payloads up to 2 megs in size. Should be transparent
2014-02-16 18:30:27 -05:00
cpw
572d32358a
Merge pull request #373 from bloodmc/master
...
Prevent player data getting reset during disconnects.
2014-02-14 10:57:50 -07:00
cpw
33100d6bab
Merge pull request #371 from bl4ckscor3/patch-1
...
Fix ExampleMod.java for build #1024+
2014-02-14 10:57:32 -07:00
bloodshot
45409bfa0c
Prevent player dat files getting reset during disconnects.
...
Since FML nulls out the player's playerNetServerHandler during login, we need to
make sure that writePlayerData does not attempt to overwrite the player's dat file
if the player disconnects during the "Logging In" process.
2014-02-13 02:44:18 -05:00
Christian
fa5f4c8842
Some argumentation
2014-02-08 22:41:02 -05:00
Christian
995c204338
Fix failing to load a world with missing mod blocks and items. There will be a way to force worlds to load
...
when stuff is missing, but for right now, it will fail as this is "world safe".
2014-02-08 22:37:40 -05:00
Christian
c890206268
Try and handle removal of mods a bit better. Currently no way to allow a world which has missing
...
blocks to load - but i have the code in place to allow it i think.
2014-02-08 12:18:34 -05:00
bl4ckscor3
2aa73afa15
Fix ExampleMod.java for build #1024+
2014-02-08 12:34:01 +01:00
Dan Roque
064b66af3d
Prevent players from logging in until server has finished starting.
...
This improves server security as it guarantees no players will be
allowed to connect until the server has fully initialized.
2014-02-05 20:49:10 -05:00
Lex Manos
8c9e8b5270
Fix isRemote, this is integral to so many parts of the code, everyone knows it by this name, People should not change it.
2014-02-04 23:40:50 -08:00
Lex Manos
b7b3450dcd
Update MCP mapping snapshot to latest crowdsourced names.
2014-02-04 22:56:27 -08:00
Christian
6bb9b8b953
Clean up FMLEventChannel. Closes #367 .
2014-02-04 20:01:44 -05:00
Lex Manos
03fb1879d7
Fix obf error when right clicking a Empty Map.
2014-02-04 12:49:18 -08:00
Christian
cee0f0b811
Tweak so that writing to the context will automatically send a message back to
...
the originator in handshakeestablished.
2014-02-02 12:11:57 -05:00
Christian
359ac3ca2a
Ensure we check both item and block registries when finding valid IDs. Should fix #365
2014-02-01 11:05:33 +00:00
Lex Manos
d87822ad85
Bump gradle wrapper to 1.10
2014-01-29 21:04:55 -08:00
Christian
8633d780c9
And make a loud message if there isn't a modcontainer found, substitute Minecraft. In general, this can only happen
...
for coremods not properly registering their code. Closes #363
2014-01-25 06:20:09 -05:00
Christian
ab199c5811
Try harder to find a mod container.
2014-01-25 06:17:14 -05:00
Christian
544320b8d2
Beginning of a saveinspectionhandler.
2014-01-20 22:27:03 -05:00
Christian
741e172ffe
Log4j2 doesn't need debug level logging for itself anymore
2014-01-20 22:01:20 -05:00
Christian
a7ca131a33
And don't spam NONE everywhere
2014-01-20 22:00:24 -05:00
Christian
8692ca17d1
Log4j2 logging context for things. This should help add context when things go wrong in mods.
2014-01-20 21:58:39 -05:00
Christian
b6d95d704b
Name the log files properly. fml-junk is an early startup annoyance I can't kill because log4j2.
2014-01-20 21:31:20 -05:00
Christian
458b0620b4
Log the bad packet in a prettier way. Also, don't show the authlib debug data in the log file.
2014-01-20 17:29:17 -05:00
Christian
675b5a0778
And turn down some more logging, now we have useful logging back again..
2014-01-20 16:09:34 -05:00
Christian
1c793abe0e
Fix derp with networkcheck
2014-01-20 16:06:50 -05:00
Christian
a355eecb2c
Add in error logging for outbound messages. Fix bug with indexedcodec NPE
2014-01-20 16:02:26 -05:00
Christian
9a8d16b66e
Fix log4j2 config. Fix server gui to *show* logging. Fix log spamminess in the console. Fix bug in servergui that can cause deadlock.
2014-01-20 15:09:24 -05:00
Christian
5719b9ec53
Fix reply handling. Make the proxy message available for subclasses of indexedcodec. Fire user events into the network
...
event firing.
2014-01-20 11:58:14 -05:00
Christian
16d33d2989
Clean up and document outbound handler a bit better. Add in dispatcher target. Closes #361
2014-01-20 11:26:54 -05:00
Christian
32bb7315cc
Add in example assets dir. Closes #308
2014-01-20 08:15:55 -05:00
Christian
3dfb54e066
Merge branch 'trait-optional' of github.com:RainWarrior/FML
2014-01-20 08:14:27 -05:00
Christian
79b04898d4
And restore suppressions. ABRAR, DON'T TIDY CODE!!!!
2014-01-20 08:09:02 -05:00
Christian
9d2e089df6
Merge branch 'logging' of github.com:AbrarSyed/FML into abrar-borked
2014-01-20 08:06:45 -05:00
Christian
35a38d7840
Make sidedproxy support non-public fields. Closes #344
2014-01-20 07:55:26 -05:00
Christian
6a695c4348
Try and stop the epic channel closed spam at close time. Closes #353
2014-01-20 07:53:09 -05:00
Christian
a62374d4ac
findBlock should now return null, not the default block, if the thing being looked for is not found. Closes #352
2014-01-20 07:49:44 -05:00
Christian
3d26f28bcf
Allow connection when server is apparently offline. Might allow :NOFML circumvention though. Hmmm. Closes #359
2014-01-20 07:46:17 -05:00
Christian
5adacc3b33
Check the mod, not it's container, in the check handler. Closes #358
2014-01-20 07:42:35 -05:00
Christian
7ac5bddbc3
Allow indexed messages to validate themselves. Also, catch exceptions from
...
an embedded channel, and cause them to close the connection. It's ugly, but
it means that the client doesn't crash if it connects to a screwy bungycord that's trying a 1.6 handshake for some reason.
2014-01-19 22:08:19 -05:00
Christian
7907e16e96
Add a type adapter for artifact version. Should fix #354
2014-01-19 10:49:28 -05:00
cpw
79d42fca8d
Merge pull request #355 from jk-5/errorhandling
...
Throw an exception when discriminator is not found
2014-01-19 07:38:41 -08:00
cpw
dfc0899ec6
Merge pull request #357 from jk-5/sharable
...
Make NetworkEventFiringHandler sharable
2014-01-19 07:37:52 -08:00
jk-5
2524045728
Make NetworkEventFiringHandler sharable
...
Fixes #356
2014-01-19 12:27:31 +01:00
jk-5
3557fe31c9
Throw an exception when discriminator is not found
2014-01-19 11:21:24 +01:00
Christian
449ac98b77
SSP Worlds updating from 1.6 will now pop a warning message before loading, and will capture a timestamped
...
zip file in the minecraft dir before starting to load. Allows for people to test updates.
2014-01-18 22:25:35 -05:00
Abrar Syed
f23eba4352
put max number of FML log files to 3
2014-01-19 00:53:58 +00:00
Abrar Syed
f0132a6f3b
changed fml log level to all
2014-01-19 00:49:47 +00:00
Lex Manos
444a7d7fa1
Move placement of single player world load hook to fix NPEs.
2014-01-18 13:05:18 -08:00
Christian
2a5a8d0cd0
Fix memory leak?!
2014-01-17 23:36:03 -05:00
Christian
275ccac6f1
Fix NPE at startup
2014-01-17 23:35:53 -05:00
Christian
ff7b5845e7
Clean up some warnings about @Override
2014-01-17 23:19:22 -05:00
Christian
7c5d62704a
Make UniqueIdentifier final and add a hashCode. Closes #348
...
Clean up language registry. It can be used to access all translations of mods on client or server.
Auto loads from assets files.
2014-01-17 17:47:30 -05:00
Christian
53557dcd05
Put logging exception handlers on all channel inbounds. Fix problem with failure to login. Closes #350
2014-01-17 17:00:55 -05:00
Christian
9c96ca4402
Fire a custom packet channel registration/deregistration event, for any mods that care about that
...
kind of thing
2014-01-16 19:45:42 -05:00
Christian
a429e106dd
Fix bug with SSP, and hook so we can do confirmation of world loading, as well as other things
2014-01-16 18:15:45 -05:00
Christian
9cab2ab36e
Add in some tests and examples for the "simple" network stuff
2014-01-16 18:07:25 -05:00
Christian
30882b0c1d
Clean up some warnings. Add in simple network impl
2014-01-16 18:06:36 -05:00
Christian
c013870b1d
Merge branch 'simplenet'
2014-01-16 14:59:13 -05:00
Christian
dd17979a2f
Fix bukkit connectivity issue.
2014-01-16 14:58:28 -05:00
Christian
e14efe786f
Some fixes and tweaks
2014-01-16 09:14:39 -05:00
Lex Manos
a4686b1261
Added basic Mojang account authentication support for development time login.
2014-01-14 16:49:03 -08:00
LexManos
e344303ec7
Merge pull request #346 from Jezzadabomb338/master
...
At the request of AbrarSyed.
2014-01-13 23:11:42 -08:00
Jezzadabomb
b362e8a273
At the request of AbrarSyed.
2014-01-14 15:39:24 +11:00
Christian
5da6dcc7e3
Divert connection through FML, so we can deny connections to servers that don't want us
2014-01-13 13:47:18 -05:00
Christian
10d056a494
Fix possible NPE derp
2014-01-13 13:46:22 -05:00
Christian
fc69bcf280
Fix up privacy derp in TickEvent. Closes #343
2014-01-13 08:43:33 -05:00
Christian
80b00dc796
Fix openGui. Closes #342
2014-01-13 08:40:56 -05:00
Christian
28293b29ea
Add in a simple(ish) event driven network handling system. Register using newEventDrivenChannel
...
and you'll get a simple network handler that will fire events at the subscriber(s) of your
choice, whenever a packet is received. You'll also get some convenience methods for sending
to things.
2014-01-12 13:20:41 -05:00
Christian
584c0f368b
Fix potential ordering issue, clean up some imports
2014-01-11 22:01:01 -05:00
AbrarSyed
fc025a7b73
Logging Changes
2014-01-11 16:43:14 +00:00
RainWarrior
4aa2416ce5
Propagate Optional method removal to trait implementation classes
2014-01-10 00:56:00 +04:00
Christian
717a8d6945
Fix csv string vs list of strings. Thanks immibis. Closes #334
2014-01-09 14:55:52 -05:00
cpw
a89939e57e
Merge pull request #336 from jadar/master
...
added override toString method for getting full name.
2014-01-09 11:54:54 -08:00
Christian
43068eb986
Fix TargetPoint to be static
2014-01-09 08:41:52 -05:00
Christian
dd098854b0
Fix the keybinding array to the right one
2014-01-09 08:40:42 -05:00
Christian
d5bfd69e35
Fix problem with connecting to vanilla.
...
SHOW what's modded and what's vanilla in the list. Hooks that make the blocking work to come
2014-01-06 23:48:53 -05:00
Jadar
96c19b3580
undid readme change
2014-01-06 15:58:42 -06:00
Jadar
acf74a3403
changed the readme to reflect new setup task.
2014-01-06 11:09:34 -06:00
Jadar
1db3daa0e8
added override toString method for getting full name.
2014-01-06 10:25:13 -06:00
Lex Manos
0d810c01fa
Mark jopt needed on the server, herp derp, blame Abrar!
2014-01-05 19:02:47 -08:00
Christian
9de9a15530
Fix stupid hardcoding derp
2014-01-03 23:04:24 -05:00
Christian
5317672631
Add a utility method for finding the channel handler name based on type. Should fix naming weirdnesses.
2014-01-03 22:57:36 -05:00
Christian
6f1da6550e
Fix up mcpname derp in GuiScrollingList.
2014-01-02 22:44:26 -05:00
Christian
b51fb91355
Merge branch 'patch-1' of github.com:airbreather/FML
2014-01-02 22:21:25 -05:00
Christian
779cd05aa1
Tweaks
2014-01-02 22:18:02 -05:00
Christian
7bf119e1e5
Fix up readmes and credits. We no longer support modloader.
2014-01-02 22:18:02 -05:00
iChun
fa4f3015a0
Added transparent background for GuiIngameModOptions as per cpw's request. May not compile due to manual de-mcp-fication.
2014-01-02 22:18:02 -05:00
Christian
fbc1f8f6f9
Config GUIs in the modlist now work.
2014-01-02 11:51:16 -05:00
airbreather
c5e29b574a
Avoiding redundant calls to LogManager
2014-01-01 11:40:32 -05:00
Christian
3113138bd1
Tweak button positions.
2014-01-01 02:09:40 -05:00
iChun
ab5eb3ccff
Fix button size for GuiModList
2014-01-01 14:16:23 +08:00
Christian
cdd9d92a4f
Starting work on the actual GUI. Still work to do. Needs an API.
2014-01-01 00:57:24 -05:00
Christian
b3f98d1ee0
Fix derpiness with Mods button when Realms is available
2013-12-31 20:21:28 -05:00
Christian
21b13d6351
Lots of network cleanup. Gui packets now work too!
2013-12-31 19:55:41 -05:00
Christian
22ba6fda5e
Expose the nethandler in a few places, and pull out FMLEmbeddedChannel, exposing a utility method on it.
...
More to come.
2013-12-31 09:45:26 -05:00
Christian
f36152398d
Add in the tweakclass, fix the json for lzma @ the server.
2013-12-30 13:06:59 -05:00
Christian
5d069629cf
Allow itemstacks for furnace recipe inputs. Allow passing extra arguments through registerblock into the itemblock constructor.
2013-12-28 18:04:30 -05:00
Christian
061288909d
Fire simple network connect/disconnect gameevents.
2013-12-28 17:51:40 -05:00
Christian
6a5f9e135f
Fix example mod code for 1.7
2013-12-28 13:44:37 -05:00
Christian
53a1f98414
Attempt to load old pre-1.7 worlds. ENSURE YOU HAVE A BACKUP!
2013-12-27 11:48:55 -05:00
Christian
34819c9303
Make gradlew executable on linux
2013-12-27 11:26:46 -05:00
Christian
ec316f113f
AT for renderblocks
2013-12-27 00:08:49 -05:00
Christian
f8d6213829
Update render registry
2013-12-27 00:07:48 -05:00
Christian
268bbabee6
Fix handling world reloads when new stuffs are added
2013-12-26 12:42:40 -05:00
Lex Manos
c180d9b157
Add 1.7.2 base json, Gradle will automatically download updated versions of this. Keeping it in the repo allows us to see what base json we have built our jsons off of. And if it changes update accordingly.
2013-12-23 22:36:47 -08:00
Christian
7d3b1250e8
Fix handshaking properly. Also, fix ID syncup. It now will completely freeze the idmap after preinit.
...
This frozen map is used to inject "new" stuff into existing serverside worlds. Interesting sideeffect: remote
servers lacking things will change the client, to also LACK ids for those things. watch for -1 ids in your remap
events. Note: idmaps should be considered temporary per server instance. SERVERSTOPPED will restore "startup" state,
as will client logout.
2013-12-24 00:47:10 -05:00
Christian
156a9ae03a
Fix build script
2013-12-23 20:24:54 -05:00
Lex Manos
58132ccda3
Add new required --accessToken to launch specs.
2013-12-22 18:35:50 -08:00
Christian
f860c8ad3b
bump to legacy launcher 1.9 with logging unification stuffs.
2013-12-18 11:15:53 -05:00
Christian
3e76dfba34
More tweaking on id stuffs at worldload
2013-12-18 11:15:03 -05:00
Christian
31ea100b29
Working on id missing handling
2013-12-18 08:34:44 -05:00
Lex Manos
ef3856f9a3
Update patches for Gradle's rename rewrite: MinecraftForge/ForgeGradle@19e7acf2a2
2013-12-18 04:01:37 -08:00
Christian
e4b63a1801
IWorldGenerator now has an ordering at registration time. This means the order of worldgen should be much more stable.
2013-12-17 11:42:54 -05:00
Christian
85516d9588
ICraftingHandler, IPickupHandler are now both events.
2013-12-17 11:24:57 -05:00
Christian
a17489172c
Code to disable mods at runtime, or other times.
2013-12-17 10:51:00 -05:00
Christian
32561265fc
Ticks, Player events, keybindings, all migrated to the new event driven system.
2013-12-16 23:18:00 -05:00
Christian
0b419ac79c
Fire a user event down the channels when a handshake has occured.
2013-12-16 20:00:01 -05:00
Christian
4071ff38af
Patch some GUIs. We're gonna add some basic mod gui config support.
2013-12-16 11:48:39 -05:00
Christian
a2b324beb2
Copy eventhandler from Forge into FML. It is going to replace a lot of the runtime event systems.
2013-12-16 11:48:09 -05:00
Christian
557357fe17
Update for log4j2
2013-12-16 11:47:48 -05:00
Christian
3b2994a3de
Some patching touchups
2013-12-13 00:18:05 -05:00
LexManos
0098c57f94
Merge pull request #316 from AbrarSyed/patch-4
...
Update shiped ForgeGradle for 1.7
2013-12-12 17:23:04 -08:00
Lex Manos
55aa337f95
Rename synthetic bridge methods, these methods are not decompiled, but need to reobf correctly cross the recompile boundary.
2013-12-12 17:18:04 -08:00
Abrar Syed
df870c1a33
Update shiped ForgeGradle for 1.7
2013-12-12 17:11:37 -06:00
Christian
b852e30285
First functional release under reobfuscation.
2013-12-12 18:01:09 -05:00
Christian
7ea571f593
Fix AT, Fix exc. Almost works now!
2013-12-12 01:39:30 -05:00
Lex Manos
7a4ceebf5e
Kill old patches and add rejects to ignore file.
2013-12-11 20:39:15 -08:00
Christian
31efcfc3b2
Clean up patches for latest exc.
2013-12-11 23:03:30 -05:00
Christian
49cb893d12
Fix exc this time *sigh*
2013-12-11 22:58:46 -05:00
Christian
009d4dee23
Fix the exc file. Fix the deobfremapper for handling inner classes.
2013-12-11 22:54:51 -05:00
Christian
3e278acb71
Fix stupid possible compiler error.
2013-12-11 20:17:08 -05:00
Christian
d0d31d9575
SpawnAdjustment packet. Clean up stuffs. No more compile errors.
2013-12-11 19:29:52 -05:00
Christian
ef492407ef
Entity spawning works.
2013-12-11 18:46:25 -05:00
Christian
cd417c6786
Fixed remote and local connections work with mods now.
2013-12-11 12:35:08 -05:00
Christian
89e4e483c2
Add in a remapping event for mods to consume.
2013-12-10 19:25:49 -05:00
Christian
fd36f50d82
Cleanups
2013-12-10 17:29:26 -05:00
Christian
1d71c017f4
ID syncing.
2013-12-10 14:32:06 -05:00
Lex Manos
99c681ad87
Did it manually, forgot it needed the end comma
2013-12-09 20:49:37 -08:00
Lex Manos
57f7f1d7ab
Update for fixed Enum cleaning and names.
2013-12-09 20:44:17 -08:00
Lex Manos
b2550b8a69
Add mappings for Items/Blocks fields.
2013-12-09 20:43:57 -08:00
Lex Manos
a30f173627
Add sonatype snapshots repo for SpecialSource snapshots.
2013-12-09 20:43:27 -08:00
Christian
2aaaeba15e
ID loading from the server save now works.
2013-12-09 21:36:49 -05:00
Christian
9c96a0a10a
More network stuff, partially done id syncing.
2013-12-09 01:22:24 -05:00
Christian
f5c38e2359
OK, network channels appear to be working well for both dedi and integrated servers.
...
The beginnings of the new mod structure too.
2013-12-06 14:52:33 -05:00
Christian
e544adba5c
More cleanup. Bidirectional server <-> client network works for mods as well as FML|HS now.
2013-12-06 11:17:40 -05:00
Christian
58f7487cfa
Check in patches. Add in some network timeout tweaking values so you can debug the network.
2013-12-06 08:07:09 -05:00
Christian
9f928963f2
A network design I like. It uses the netty embedded channel to allow mods to build channel pipelines on top of
...
custom payload packets.
2013-12-06 03:11:03 -05:00
Christian
38cec7a11f
The basic network handshaking for FML is done. All scenarios seem to work.
2013-12-04 00:11:08 -05:00
Christian
7ab3c3a37c
Update gitignore
2013-12-02 23:54:15 -05:00
Christian
53127eec30
Merge branch 'master' of github.com:MinecraftForge/FML
...
Conflicts:
install/build.gradle
patches/minecraft/net/minecraft/client/multiplayer/NetClientHandler.java.patch
patches/minecraft/net/minecraft/network/NetServerHandler.java.patch
2013-12-02 23:52:27 -05:00
Christian
30d532f4fc
Pass 1: Most patches are restored.
...
NOTES: 1. Network is completely broken. 2. GameRegistry is partially broken. 3. ID sync is not in.
2013-12-02 23:48:26 -05:00
cpw
01fb451b69
Merge pull request #311 from AbrarSyed/patch-3
...
fix derp in example builscript
2013-11-27 02:13:42 -08:00
Abrar Syed
3714426e19
fix derp in example builscript
2013-11-26 14:23:31 -06:00
Lex Manos
c2b919d339
Don't validate signatures in dev env.
2013-11-20 13:18:26 -08:00
Lex Manos
c4b8a393f9
Make the working directory the root of the eclipse workspace.
2013-11-17 19:26:21 -08:00
LexManos
30894f7afa
Merge pull request #307 from AbrarSyed/master
...
updated samples
2013-11-17 17:58:01 -08:00
AbrarSyed
e9a7660cb8
updated samples
2013-11-17 18:21:24 -06:00
LexManos
4d46abf761
Merge pull request #306 from MinecraftForge/1.6.4
...
Actually do it correctly. Should be more forge friendly now.
2013-11-17 10:04:27 -08:00
Christian
23baf3a8ce
Actually do it correctly. Should be more forge friendly now.
2013-11-13 19:10:11 -05:00
Christian
c6a21d0d62
Merge branch '1.6.4'
2013-11-13 07:55:12 -05:00
Christian
da72640c7e
Way to go, missing import. *sigh*
2013-11-13 07:45:37 -05:00
Christian
b7f34629c3
Don't try and open GUIs on the server.
2013-11-12 18:04:25 -05:00
Christian
5500d69b77
Merge branch '1.6.4'
2013-11-12 17:02:08 -05:00
pahimar
6af42bc656
Add in null protection for client/server sides of handleChat
2013-11-11 14:12:02 -05:00
Christian
e19fcb8844
Kill more references to modloader.
2013-11-10 13:15:26 -05:00
Christian
0a62333890
Remove all public all the time from Minecraft. It is unnecessary with ModLoader gone. DEAL WITH IT. File AT public requests, make a coremod, whatever. This needed to die.
2013-11-10 12:01:26 -05:00
Christian
e7512f13e4
Deprecation cleanup. Bye bye more modloader stuffs
2013-11-10 11:58:34 -05:00
Christian
4708d77c98
First pass : kill modloader, clean up warnings
2013-11-10 11:49:06 -05:00
Lex Manos
9b1d2bdd13
Join the developers list in the pom and fix the client run configs in the workspace.
2013-11-09 19:22:17 -08:00
LexManos
a6dc03aa7e
Merge pull request #302 from AbrarSyed/patch-1
...
Update 1.6.4-rel.json
2013-11-09 19:15:34 -08:00
Abrar Syed
6cd8349542
Update 1.6.4-rel.json
2013-11-09 21:14:58 -06:00
Christian
976c589c78
Change the build to capture an MCP version, also, tweak the sources so mavenLocal can be used for ForgeGradle
2013-11-09 20:00:05 -05:00
Christian
24ec338a51
Fix license and naming
2013-11-09 14:28:54 -05:00
AbrarSyed
4f634855ac
added src distribution gradle file
2013-11-09 14:28:54 -05:00
Lex Manos
9f01e3407e
Move to install to not clutter root directory with the .bat and .sh files I know are coming.
2013-11-09 14:28:54 -05:00
Lex Manos
adeaeb74aa
Include eclipse template workspace, for packaging in src distro.
2013-11-09 14:28:54 -05:00
Lex Manos
e13c3966e0
Add gradle wrapper
2013-11-09 14:28:53 -05:00
Lex Manos
02c3b4e74b
Publish to repo folder for local testing.
2013-11-09 14:28:53 -05:00
AbrarSyed
89a07d3668
Step 3: The Rebirth
2013-11-09 14:28:53 -05:00
Lex Manos
b52eb6d699
Step 2: The Reformation
2013-11-09 14:28:53 -05:00
AbrarSyed
3281faf2be
Step 1: The Purge
2013-11-09 14:28:53 -05:00
Christian
3d25b4e793
Add in the ability to strip interface references for specific interfaces - this is probably mostly useful for
...
scala scenarios where sythetic methods are generated and is not a substitute for using Optional.Method where appropriate.
Closes #300
2013-11-09 14:27:15 -05:00
Christian
f4532410ec
Change a couple of warnings, as a prelude to 1.7- preinit is now required for all GameRegistry activity, and every item and block REQUIRES registration.
2013-11-06 16:18:41 -05:00
Christian
8f87021b0f
Fix derp with custom properties. They work now!
2013-11-05 22:23:24 -05:00
Christian
bc57ff9e83
Fix recursive API dependency resolution. Allows nested APIs, such as BuildCraft's
2013-10-31 09:39:34 -04:00
Christian
de8ab934d8
Fix up duplicate entries
2013-10-30 22:46:19 -04:00
Christian
81fe1c9682
Add in an API marker for API type packages.
...
This does several things:
1. Packages marked as API will generate a new "modid" (the provides) that can be depended on.
2. Packages marked as API will be searched systemwide, and anything declaring that package (even without the API marker)
will get an implicit dependency on the API package.
3. The API package itself will get a soft dependency on the "owner" package.
@Optional elements can refer to the API packages instead of a concrete mod as well.
2013-10-30 22:20:28 -04:00
Christian
58a299aabc
Attempt to inject coremods as tweakers, so both can share a dependency ordering
2013-10-27 13:28:50 -04:00
Christian
243a21a353
Wrapping coremods as tweakers. Part 1.
2013-10-20 11:53:07 +02:00
Christian
f0dc530b28
Fix up documentation of VersionCheckHandler - it only ever accepted a String and only works on the NetworkMod annotated class
2013-10-20 11:45:00 +02:00
Christian
dac7f590ea
Modify ordering of networkmod registration and mod instantiation. This fixes VersionCheckHandler logging an incorrect failure message due
...
to NPE.
2013-10-20 11:41:28 +02:00
Lex Manos
bf54d4d667
Make each mod's EventBus log a child of it's main logger.
2013-10-19 18:24:24 -07:00
Christian
da4337efbf
Fix up handling the new method signature data for NetworkCheckHandlers
2013-10-14 21:28:15 -04:00
Christian
f92962bbbb
Use null to empty, so missing values work. *sigh*
2013-10-13 22:36:47 -04:00
Christian
2714da1022
Primitive capability for tweakers to order. Add a "TweakOrder" integer
...
property to your manifest, or accept the default of zero.
2013-10-12 10:28:11 -04:00
LexManos
96be82343c
Merge pull request #280 from mc10/patch-1
...
Very minor style fixes
2013-10-09 20:56:05 -07:00
Kevin Ji
58577775d2
Very minor style fixes
...
Replacing tabs with spaces consistently, making brace styles consistent, etc.
2013-10-09 19:53:50 -07:00
Christian
fc3e7647d2
Support, and fix up, interface lists for Optional
2013-10-09 13:58:14 -04:00
Lex Manos
a381874bb9
Delay sound system backend initalization to speed up startup and prevent race condition on some computers.
2013-10-06 11:13:07 -07:00
Christian
55525f6d2e
ModLoader is officially deprecated. It will all cease to be with 1.7.
2013-10-06 11:06:31 -04:00
Christian
bc64ceabef
Optional shouldn't be constructable itself. It's purely a wrapper thing.
2013-10-06 10:56:47 -04:00
Christian
63ba3aa009
Add in support for Optional interfaces and methods. Be gone coremods!
2013-10-04 17:20:05 -04:00
Christian
5265e34a35
Fix null killing the server
2013-09-29 15:51:38 -04:00
Lex Manos
35ab9f52b0
Fix md5s for new checksums.sha1 in scala libraries.
2013-09-28 19:47:32 -07:00
Christian
9b55f1f48f
Attempt at a shared modlist implementation - should allow visibility between liteloader and fml for "mod list display"
2013-09-27 10:45:20 -04:00
Christian
e356f4d713
Cross-modsystem compatibility fix with thanks to Mumfrey @ liteloader
2013-09-27 10:01:39 -04:00
Christian
bfc25bc5da
Add to both the classloader and the parent
2013-09-26 13:01:00 -04:00
Christian
9f0f9e7288
Fix deobf tweaker
2013-09-26 10:11:29 -04:00
Christian
ce6404fd5b
TYPOS!!!
2013-09-26 09:33:48 -04:00
Christian
8f18a3de9a
Separate deobf tweaker so it runs last. Should fix problems with cascaded tweakers
...
expecting an obf environment.
2013-09-26 09:23:25 -04:00
Christian
9815d8c379
Update for launchwrapper 1.8
2013-09-25 16:40:59 -04:00
Christian
1d902df581
Use the negative cache in latest legacylauncher.
2013-09-25 11:46:11 -04:00
Christian
8e26c99de3
Add debugging for deobfuscation
...
Add negative caching for field and method maps. Should shortcut some work
Fix handling the case where a class doesn't exist, but still needs deobf
Ask the patch manager for the bytes for the class, not the classLoader
Fix up some more places where we should look for a patched class
Fix problem with empty source classes and runtime deobfuscation
2013-09-25 07:37:25 -04:00
Lex Manos
fc8c3bef03
Update to new installer that uses xz compression and better support for non-standard jvms
2013-09-24 23:21:17 -07:00
Christian
a4de22c1ad
And use the parent that's actually going to be valid. *sigh*
2013-09-24 08:42:13 -04:00
Christian
70cffe6982
Herpaderp. Make addURL accessible. *sigh*
2013-09-24 07:33:11 -04:00
Christian
39620f1e41
Fix injection of tweaker into system
2013-09-23 13:33:16 -04:00
cpw
0e80fcb8f7
Merge pull request #284 from smcv/uninit
...
Fix NPE when loading second single-player world
2013-09-22 18:24:56 -07:00
Simon McVittie
4a94c2c71b
Fix NPE when loading second single-player world
...
After leaving a single-player world, getServer() can return null, resulting
in the stack trace below, "Fatal errors were detected during the
transition from SERVER_STOPPING to SERVER_ABOUT_TO_START",
"The ForgeModLoader state engine has become corrupted" and the client
getting stuck forever.
Exception in thread "Server thread" java.lang.NullPointerException
at cpw.mods.fml.client.FMLClientHandler.serverStopped(FMLClientHandler.java:620)
at cpw.mods.fml.common.FMLCommonHandler.handleServerStopped(FMLCommonHandler.java:468)
at net.minecraft.server.MinecraftServer.run(MinecraftServer.java:471)
at net.minecraft.server.ThreadMinecraftServer.run(SourceFile:583)
2013-09-22 16:56:24 +01:00
Christian
79c39f8b7c
Fix classpath for launchwrapper 1.7
2013-09-21 16:15:05 -04:00
Christian
f6190e8752
Update workspaces for 1.6.4
2013-09-20 17:23:18 -04:00
Christian
0950b9fc84
Fix up a deep crash in the early server init hanging the client
2013-09-20 17:12:01 -04:00
Christian
25981706ef
Update for MC 1.6.4
2013-09-20 16:25:12 -04:00
Lex Manos
82d896a35e
Make final transformers actually work on methods as well.
2013-09-19 12:59:12 -07:00
Christian
e7dd728f95
Format the log messages through MessageFormat. Thanks CovertJaguar for the pointer. Closes #282
2013-09-19 08:23:56 -04:00
Lex Manos
8f2e675581
Update the src distro's eclipse workspace.
2013-09-18 15:21:56 -07:00
Christian
ff75416a32
Update mc_versions data and commands patch and eclipse workspace
2013-09-18 18:01:04 -04:00
Christian
95afc95b24
Update mcp mod info
2013-09-18 17:02:41 -04:00
Christian
34493b0d99
Update for real 1.6.3 update
2013-09-18 16:59:28 -04:00
Christian
e77d2547ad
Update for pre-ninja 1.6.3 update
2013-09-18 16:33:11 -04:00
Christian
40a34af431
Merge branch 'master' into newtweak
2013-09-18 14:49:53 -04:00
Christian
352117fd78
Update for new installer and thank you.
2013-09-17 21:56:25 -04:00
Christian
81328b6684
Add in support for using a mirror list and provide checksums for packed download of libs
2013-09-15 22:58:39 -04:00
Christian
b5af446d71
Fix sidedness derp in LanguageRegistry.
2013-09-13 19:04:25 -05:00
Christian
d0c6e92900
Update MCP data
2013-09-03 17:56:09 -04:00
Christian
2a9c485edc
Remove @SideOnly from 70318 (getDistance) it makes no sense that it's not on the server.
2013-09-02 12:24:17 -04:00
Christian
a13598b17e
Use java 1.6 compatible method of closing the zip file. Stops stupid compile error.
2013-09-02 00:12:36 -04:00
Christian
40b54013b4
Allow server side lang file injection, hopefully
2013-08-27 22:45:10 -04:00
Christian
1c9a853868
Allow coremods to properly inject asset readers.
2013-08-27 12:31:37 -04:00
Christian
da70cdd35a
Update tweaker for new Launcher API
2013-08-23 10:42:26 -04:00
Christian
b993cf4a98
More exception handling for less derpiness.
2013-08-20 20:46:18 -04:00
Christian
ac065ff5f7
Reset the IWorldGenerator seed for each mod, before calling. That should mean worldgen is consistent
...
and not dependent on mod ordering, or mod sideeffects.
2013-08-19 14:56:01 -04:00
Christian
913f6f6d36
Try and use the relaunch log, which should be classloaded..
2013-08-19 14:55:37 -04:00
Christian
9468e41bbf
Fix up scala refs, for better results
2013-08-18 18:58:36 -04:00
Christian
ffdd056a18
Check keys, not values *sigh*
2013-08-17 13:27:43 -04:00
Christian
f157e7a6ec
And more coremod logging
2013-08-17 13:14:55 -04:00
Christian
4a9d0f9bd5
Add in some log information
2013-08-17 13:10:28 -04:00
Christian
0398916666
And actually instantiate the collection *sigh*
2013-08-17 12:57:15 -04:00
Christian
dec9a3924d
Add in "FMLCorePluginContainsMod" in the manifest. If this value is
...
present, FML will attempt to parse your mod jar file as a normal mod
file as well, instantiating mod containers there.
2013-08-17 12:48:38 -04:00
Christian
2470120680
Clean up a couple of resources. Also, don't parse jars just because
...
they're in the mods dir
2013-08-17 11:40:15 -04:00
Christian
ba90b61607
Make sure we only add args to the argument list if a tweaker hasn't already.
...
Should fix LiteLoader compatibility issue.
2013-08-16 16:28:55 -04:00
Christian
9a5e24e338
Fix stupid derp is stupid. Closes #275 and means sp614x can do his thing
2013-08-16 16:18:50 -04:00
LexManos
29ef3d5ab4
Update installer.
2013-08-06 11:42:38 -07:00
LexManos
f46a538b41
Merge pull request #268 from Bo98/sh-args-fix
...
Fixed install.sh not passing arguments to install.py
2013-08-04 15:32:06 -07:00
Bo
182aa9c0cb
Fixed install.sh not passing arguments to install.py
2013-08-03 17:43:57 +01:00
cpw
1857064afa
Merge pull request #266 from grompe/patch-1
...
Add missing SideOnly in BaseMod
2013-08-01 04:21:22 -07:00
Grom PE
cb05c8c4aa
Add missing SideOnly in BaseMod
...
NetClientHandler exists only on client side and thus method using it should be annotated with SideOnly.
2013-08-01 14:19:30 +07:00
cpw
f275a24b43
Add in some reverse lookup methods for game registry data
2013-07-29 22:05:22 +02:00
cpw
1d84e8063e
Temporarily add a version of 'reobfuscate.py' that will resolve complex
...
reobfuscation graph issues with specialsource. Copy it over 'reobfuscate.py'
in the mcp runtime dir. Hopefully will have an MCP/specialsource fix in
the coming days.
2013-07-28 22:38:26 +02:00
cpw
57befa89bb
Fix keybindings being derped
2013-07-28 20:52:12 +02:00
LexManos
10b16d32da
Use json 2.9.1 nightly for OSX in release json like vanilla does.
2013-07-17 12:21:26 -07:00
LexManos
3f21a2c1b4
Stupid spaces and windows escaping -.-
2013-07-16 14:34:43 -07:00
LexManos
b2958c9066
Add quotes for paths with spaces -.-
2013-07-16 13:35:14 -07:00
LexManos
9520978b81
Use a temporary file for recompile's command line to combat command length to long issues.
2013-07-16 13:08:26 -07:00
LexManos
4981aa3421
Fix potential NPE in villager skin registry.
2013-07-16 10:32:29 -07:00
LexManos
c48b48ee15
Fix server launching.
2013-07-15 10:57:44 -07:00
Christian
9947ba8503
Fix logo handling. no more NPE if the logo can't be found. Also, fix location of mcp logo now.
2013-07-14 13:40:55 -04:00
Christian
a3f48734ff
Fix up jar sanity check code. FML validation of the jar works now and doesn't derp classloading.
2013-07-14 13:11:32 -04:00
Christian
0378355c37
The server.classpath generates the runtime manifest, so it needs the
...
non-debug asm jars.
2013-07-14 11:12:42 -04:00
LexManos
c625ef3009
Update Forge signature for new private key
2013-07-12 03:05:20 -07:00
LexManos
d4b30422b6
Update build and eclipse workspaces for debug asm.
2013-07-12 00:22:11 -07:00
Christian
6de36d78f5
Coremods now have a primitive dependency capability. Also, we search mods dir for special
...
"TweakClass" manifests. These are using the vanilla tweak mechanism to inject into
Minecraft. Helpful for other "platform" systems, when you don't want to have to deal
with json changes!
2013-07-11 23:23:33 -04:00
LexManos
7348929819
Kill release time scala libraries, to be re-evaluated after all movement is done and shit is fixed. May require manual instalation for mods that use scala.
2013-07-11 15:24:54 -07:00
LexManos
b9f4b02cb0
Kill mcp's truncate method, for more useful logs.
2013-07-10 15:23:21 -07:00
Christian
20e93a412e
Fix up logos in the mod screen. Clean up some unnecessary casts and suppressions, use the -debug asm
...
library at dev time, since it contains full symbols and code in compiled form.
2013-07-10 15:47:13 -04:00
Christian
e44e8b3112
Force a global asset scan prior to mod construction : you should be able to
...
reference assets anywhere in your mod now.
2013-07-10 00:42:40 -04:00
Christian
bab4d87ce7
Update FML for new stealth update for 1.6.2
2013-07-09 15:00:28 -04:00
cpw
bc9d1fe657
Merge pull request #254 from CaptainShadows/patch-1
...
@InstanceFactory was set to look for Fields instead of methods
2013-07-09 07:19:24 -07:00
Christian
d4d522c597
And don't forget to remove the test code
2013-07-09 08:31:40 -04:00
Christian
97269a5e3d
Decode the file URL. Hopefully will make things work more..
2013-07-09 08:30:47 -04:00
LexManos
c913258ca3
Disable signature check of client for now, it's broken.
2013-07-09 05:04:11 -07:00
LexManos
c7ab872c85
Temporarily disable GuiModList's Mod logos.
2013-07-09 03:27:49 -07:00
LexManos
e91431fb70
Don't validate signatures on servers, they are not signed.
2013-07-09 03:27:29 -07:00
LexManos
dfa3a2665d
Add MC Version to installed version name.
2013-07-09 03:27:01 -07:00
LexManos
4fa375683f
Fix NPE in new debug line when patch targets don't exist.
2013-07-09 01:21:50 -07:00
Christian
0db4624b27
Don't initialize the server.
2013-07-08 22:31:15 -04:00
Christian
c997f2adbc
FML now verifies that the minecraft jar is correct and intact. This is intended to discourage those who think that
...
modifying the minecraft jar is still acceptable.
2013-07-08 22:10:06 -04:00
Christian
26e5f4b4ff
Test server-siding ResourceLocation
2013-07-08 19:31:00 -04:00
Christian
2336002f20
The game is going to exit in face of patch mismatch, unless you force it to run with fml.ignorePatchDiscrepancies in the system properties.
2013-07-08 14:34:03 -04:00
Christian
e88a0cd13f
Update for stealth update. Thanks mojang!
2013-07-08 13:19:55 -04:00
Christian
dbf5fe38ce
We now generate an adler32 checksum for each patched file and verify at load time that they match.
...
Mismatch won't crash, but will emit a big warning..
2013-07-08 13:19:14 -04:00
Christian
c47d08c89d
Tweak debug data on patched classes
2013-07-08 12:28:32 -04:00
Captain Shadows
7af5c21d74
@InstanceFactory was set to look for Fields instead of methods
...
"fix it" to now match the javadoc :P
if it was set like that so modders wouldn't use it, it might be better to just say so in the documentation
2013-07-08 00:07:54 -04:00
LexManos
6f96d89e2b
Update eclipse workspaces for 1.6.2
2013-07-07 13:11:22 -07:00
Christian
111b0216fd
Add the jsons for 1.6.2
2013-07-07 16:05:53 -04:00
Christian
1d0384f8f6
Update for 1.6.2 and MCP 8.04
2013-07-07 15:49:11 -04:00
Christian
adc8972277
Add cascadedTweaks. This will allow simple coexistence for any other mod framework using
...
the tweaker system as well. Hi Voxel and LiteLoader!
2013-07-06 22:26:03 -04:00
cpw
5990e29af7
Merge pull request #247 from jk-5/patch-1
...
Pull request for #232
2013-07-06 18:54:54 -07:00
Christian
2676c8999c
Update mcp data. fixes #248
2013-07-06 21:25:36 -04:00
Christian
3a200e901e
Fix coremod injection into main system. Should stop double-dipping coremods.
2013-07-06 20:51:00 -04:00
Jeffrey Kog
c97ac284a5
Update ModLoaderFuelHelper.java
2013-07-04 08:33:03 +02:00
LexManos
54e06e841d
Move Resource refreshing until affter postInit.
2013-07-03 22:29:10 -07:00
LexManos
7ce84491d1
Fix missing argument and startclient/startserver support.
2013-07-03 19:30:30 -07:00
LexManos
532bee7ce1
Update to new MCP bugfix version, Fixes: Missing Armor/Item rendering, and Boss health mapping issues.
2013-07-03 18:23:38 -07:00
LexManos
e24f949517
Fix eclipse workspaces and launch configurations.
2013-07-03 18:22:57 -07:00
LexManos
4545beb49d
Add deobf-data to setup env.
2013-07-03 18:22:06 -07:00
Christian
3f4bf61ae6
Update key
2013-07-03 08:28:59 -04:00
Christian
155e846818
Add in support for mods/<mcversion> as a mod location. Also drop coremods as a location. They go in mods too now.
2013-07-02 23:03:01 -04:00
Christian
ba3707af22
More javadoc cleanup
2013-07-02 19:39:02 -04:00
Christian
ad79b9ed86
Fix up some deprecation warnings, and clean up coremod code that's going
...
away.
2013-07-02 19:27:50 -04:00
Christian
5f7df5e742
Revert "Keep these on our servers until the launcher is actually fixed -.-"
...
This reverts commit f1b533ad87 .
2013-07-02 19:03:06 -04:00
Christian
7aa7221756
Fix transformer search
2013-07-02 18:40:23 -04:00
cpw
8844554da6
Merge pull request #243 from jrtc27/modclassloader
...
Fixed ClassCastException when loading ModLoader mods
2013-07-02 15:32:35 -07:00
James Clarke
6f0eedc9a6
Fixed ClassCastException when loading ModLoader mods
2013-07-02 20:48:00 +01:00
Christian
f21cd286ca
Resource packs, part two. FML mods are now resource packs. Vanilla will scan anything under 'assets'
...
and turn it into a resource prefix. Use resourcelocations to look stuff up.
2013-07-02 11:11:50 -04:00
LexManos
f1b533ad87
Keep these on our servers until the launcher is actually fixed -.-
2013-07-01 23:26:40 -07:00
Christian
5a97d183df
Remember to update your patches!!!!
2013-07-02 02:14:31 -04:00
Christian
fbd57b3264
Mods are now loaded as resource packs. Vanilla will scan for valid prefixes based on subdirs of 'assets' which
...
can then be referenced as ResourceLocations with the "<prefix>:path" notation.
2013-07-02 01:39:40 -04:00
Christian
efc369ee83
Fix EventHandler annotation.
2013-07-02 01:08:51 -04:00
Christian
91ecf71109
Fix -rel json
2013-07-02 01:02:02 -04:00
LexManos
9b6525e805
Point scala downloads to our servers, Launcher doesn't like standard maven repos.
2013-07-01 21:53:13 -07:00
LexManos
dc7d02ebf6
Fix json syntax error.
2013-07-01 20:33:26 -07:00
Christian
7037184a4e
Fix up release JSON
2013-07-01 23:14:31 -04:00
Christian
bf38d94756
Update json samples
2013-07-01 22:58:08 -04:00
LexManos
3d17434510
Build installer package for the new client launcher.
2013-07-01 19:40:19 -07:00
LexManos
29d6c875d0
Add FML Installer logo crated by @ZaverSLO https://twitter.com/ZaverSLO/status/349947190300508162
2013-07-01 19:38:44 -07:00
LexManos
902772ed0c
Revert common folder fix, Common folder does nothing, feel free to delete it after first load.
2013-07-01 16:25:11 -07:00
LexManos
1229c4c4ea
Fix src distrabution, and got rid of pesky common folder in eclipse workspace. src is now installable.
2013-07-01 15:50:49 -07:00
Christian
7fecf2ad6b
Update mcp URL.
2013-07-01 11:06:20 -04:00
Christian
c418da353f
Cleanup coremod code, server side working now.
2013-06-30 22:51:56 -04:00
LexManos
110cf372eb
Add deobf data to merge-common, worspace is now actually runnable!
2013-06-30 19:41:51 -07:00
LexManos
7a004087f7
Add deobf data to src dist.
...
Dont create deobf jar as we ship the lzma
Added *.lzma to .gitignore
2013-06-30 19:15:53 -07:00
LexManos
70cfe24e67
Fix wrong project name in distro eclipse launch.
2013-06-30 18:33:26 -07:00
LexManos
8960f6869f
Add windows lzma executable
...
http://tukaani.org/xz/
He states that most things are under public domain, But I couldn't find an exact reference to this executable.
I'm going to assume it under public domain and distribuiting it here is fine. If not someone please direct me to the apropriate license and I will act accordingly.
2013-06-30 18:31:24 -07:00
Christian
71a92de5d9
Client launch for eclipse
2013-06-30 21:06:33 -04:00
Christian
3f15cd54c2
Functional client @ 1.6.1
2013-06-30 21:02:23 -04:00
Christian
12c928c538
Tweak commands patch
2013-06-30 19:33:47 -04:00
Christian
7406b38d8a
1.6.1
2013-06-30 16:50:30 -04:00
Christian
ef646d3146
Merge branch '16launch'
2013-06-30 13:20:46 -04:00
Christian
18371bd8c9
Some fixes for updated mcp code
2013-06-30 13:17:20 -04:00
Christian
e35e4b16ff
More fixups
2013-06-30 09:04:50 -04:00
LexManos
3711da9c45
Another typo
2013-06-30 03:55:26 -07:00
LexManos
6a318ddb78
Fix typo in new packages.
2013-06-30 01:01:55 -07:00
LexManos
2766f9a293
Push conf folder for 1.6, Relied heavily on a yet-unreleased version of MCP.
2013-06-29 22:48:24 -07:00
Christian
2e3f2461fa
More fixes, binpatching works
2013-06-29 15:16:18 -04:00
Christian
95f7345ff7
First draft of 1.6 update
2013-06-29 13:33:14 -04:00
Christian
bc02f3e67b
New mappings for marker
2013-06-29 09:20:59 -04:00
Christian
8db42c44bf
Tweak missing mapping
2013-06-29 09:20:59 -04:00
LexManos
404e6f1cc0
Add support for alternative maven servers in libraries.
...
Also download sources for public libraries, and atach them in eclipse. DOCUMENTATION!! YAYA!
2013-06-29 02:54:29 -07:00
LexManos
5741f669d5
Base GenDiff off deobf data's class list instead of the merged jar. Add option to delete target files that generate patches.
2013-06-29 01:40:01 -07:00
LexManos
6a67149b16
Add Clean Server/Client launcher. Update Start.java to new Main class and login system.
2013-06-28 22:12:07 -07:00
LexManos
c8d934bafd
Update eclipse projects for new libraries dependancies, and update packages for new 1.6 classes.
2013-06-28 20:31:02 -07:00
LexManos
075e240303
Add suggestions output if it can.
2013-06-27 22:58:00 -07:00
LexManos
d00665ee65
Fixed update_packages.py for new folder strcture.
2013-06-27 22:30:40 -07:00
LexManos
ebb74a5f30
Add missing argument
2013-06-27 22:29:10 -07:00
LexManos
5b0117ec76
Re-wrote/orginized a lot of fml.py. Almost everything is re-written/moved.
...
This is done in preperation for MCP to roll out SpecialSource support and the new 1.6 structure.
Also done for my sanity while reading through the code.
Intruduced a new function. If there is a 'mcp_data' folder in the FML folder, it will be copied to the MCP work directory after MCP is extracted.
It DOES overwrite anything that already exists.
This is intended for places like BuildServer to place libraries/assets to prevent them from needing to be downloaded every version.
Introduced a dev-env json. Need to write the eclipse workspace references to the new libraries.
Out custom json includes asm and legacylauncher.
Added proper OptionParsing to decompile.py
2013-06-27 20:48:52 -07:00
Christian
e06d9d0fbc
Add a simple property annotation system for mods.
2013-06-27 08:40:31 -04:00
Christian
ab91647546
Changed to the EventHandler annotation universally, documentation and stuff.
2013-06-26 14:52:56 -04:00
Christian
b236a4a4db
Fixes, so it builds again..
2013-06-24 16:30:18 -04:00
Christian
a480a83a98
Ignore binpatch
2013-06-24 16:03:54 -04:00
LexManos
3a9f123a16
Add filter support for MCPMerger, and filter out libraries from the server's 'fat jar'.
2013-06-23 23:06:25 -07:00
LexManos
8d27fb0692
Upgraded minecraft downloader to work with new launcher's asset/library system
...
New parameter:
--no-assets: Disables the downloading of minecraft's asset tree, recomended that build servers supply this flag to prevent downloading of useless data.
2013-06-20 16:23:15 -07:00
Christian
d369fe1c25
No more debug please
2013-06-15 01:11:29 -04:00
Christian
98b71f2dd4
Fix build script. Add a sample JSON file. You'll need the newest Launcher code to run this.
2013-06-14 21:00:15 -04:00
Christian
fef0f6422d
More fixups for new launcher model
2013-06-14 20:45:52 -04:00
Christian
2eb81ac88b
Merge in binpatch and use launcher
2013-06-14 17:21:49 -04:00
Christian
e02a91f008
More tweaks
2013-06-14 09:32:51 -04:00
Christian
ced1b95155
Server side tested and working. Setup is complex atm. That will change.
2013-06-13 09:57:55 -04:00
Christian
8f910dfa5d
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
05a854cd2a
Small tweaks to the mcp data. Nothing major..
2013-06-11 14:47:23 -04:00
Christian
22738de028
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
cd0466395a
Fix sysout with trailing messages after a newline
2013-06-06 11:52:15 -04:00
Christian
24c4056651
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
59fe905695
Don't continue trying to send events to mods that depend on errored mods.
2013-06-04 13:59:04 -04:00
Christian
6f3da97365
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
edc1fb24e2
Send the "suspect list", and print the suspect versions
2013-05-27 11:03:23 -04:00
Christian
f1d68ed4c8
Throw the sorting exception
2013-05-27 10:46:22 -04:00
Christian
ac97370f94
Add in a pretty sorting error screen
2013-05-27 10:28:00 -04:00
Christian
82e9de8641
More tweaks to the mod sorting code
2013-05-27 10:09:51 -04:00
Christian
843a13c1ab
Try and clean up cycle detection output a bit
2013-05-27 09:25:50 -04:00
Christian
3bf50c4bbe
Fix server side derp with Forge network packet handler
2013-05-21 11:01:50 -04:00
Christian
4922e90d81
Separate network mod config from setup. Allows for Forge Packet Handler nicety
2013-05-20 21:40:42 -04:00
cpw
a3a920437f
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
787c0c4a6a
Don't spit error on LWJGL not supporting 4.3 just warning.
2013-05-11 10:55:39 -07:00
Florian Nücke
8517a824e5
Merge declaration and initialization of a variable.
2013-05-08 20:16:15 +02:00
Florian Nücke
2cca7aa759
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
23b070c7d0
Alternative @SidedProxy setter for Scala.
2013-05-08 05:36:28 +02:00
LexManos
49111e9c5c
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
cpw
c0cca7f41d
Merge pull request #227 from CovertJaguar/patch-1
...
Improved Entity Spawn Error
2013-04-29 22:10:53 -07:00
CovertJaguar
99bb50d8f8
Improved Entity Spawn Error
2013-04-29 20:41:20 -07:00
LexManos
00f00b17bf
Fix scalac detection to actually use the located command instead of defaulting to 'scalac'
2013-04-28 16:35:23 -07:00
LexManos
62fdbad74c
Update MCP's md5 for the fixed srg files.
2013-04-28 12:33:42 -07:00
Christian
f0bba74a47
Update for minecraft 1.5.2
2013-04-27 01:24:06 -04:00
Christian
cf9b5b445b
Don't leave scala running in interactive mode.
2013-04-23 22:56:18 -04:00
LexManos
aa200923f0
Fix patch derp.
2013-04-23 19:47:43 -07:00
Christian
ddadf93ca1
Fix when an old scalac is present on the system to not fail the build
2013-04-23 22:43:51 -04:00
Christian
781c681216
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
cfda7fc738
Fix URL for MCP
2013-04-23 07:22:25 -04:00
Christian
58ba24add2
Fix possible NPEs in GameData
2013-04-22 21:14:34 -04:00
Christian
dcf069ca52
Attempt to reduce lines on the screen for id mismatch. Hopefully prevents game crashes.
2013-04-22 21:14:34 -04:00
cpw
c3fda11d10
Merge pull request #225 from MarcinSc/master
...
Suggested fix for issue 221
2013-04-21 11:32:51 -07:00
Marcin Sciesinski
11ac46daeb
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
2dcabe0123
Add a to string to fmlmodcontainer: should mean less derpy cyclic dependency data
2013-04-21 13:58:18 -04:00
cpw
42f1d87955
Merge pull request #224 from Glought/master
...
Fix for Issue #223
2013-04-21 08:13:54 -07:00
Glought
334a76de75
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
677a6e578e
Fix scala supporting SidedProxy. It should work now.
2013-04-20 23:31:22 -04:00
Christian
a3b5eaacfd
Fix a small modloader compatibility derp: closes #222
2013-04-20 22:55:56 -04:00
Christian
b3d4ea05ec
Fix possible NPE in findItemStack, closes #218
2013-04-17 07:55:33 -04:00
Christian
8f35adca7a
Use more expressive language when a version specifier is a simple unbounded above condition
2013-04-16 13:46:55 -04:00
Christian
394f424185
Fix to output versions in crash logs
2013-04-16 13:46:55 -04:00
cpw
ada52078c7
Merge pull request #216 from agaricusb/add-srgname
...
Add srgname to registerTileEntityWithAlternatives
2013-04-15 15:50:47 -07:00
Christian
0daf1a6df4
Merge branch 'agaricusb-fix-deobf-field'
2013-04-15 17:31:09 -04:00
Christian
edffd04ed2
Add in some caching of the read field descriptions for efficiency
2013-04-15 17:30:35 -04:00
Agaricus
7aea09f4ca
Add type info to properly deobfuscate overloaded fields. Fixes #210 .
2013-04-14 16:54:11 -07:00
Agaricus
5673c1dd29
Add srgname to registerTileEntityWithAlternatives
2013-04-14 14:11:37 -07:00
Christian
1774e2bf30
MCP names update
2013-04-10 12:28:20 -04:00
LexManos
4836b3272a
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
a31607ae7d
Fix compilation derp, and clean up rotation helper.
2013-04-09 21:20:31 -04:00
Christian
57ad221cc6
And add the patches *sigh*
2013-04-09 20:26:10 -04:00
Christian
00c7883088
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
1de89525cc
Fixed issue with instalation when java/javac commands had quotes.
2013-04-05 10:26:33 -07:00
LexManos
704a70902f
Sanitize input to isRemappedClass to use '/' as a package seperator like the srg files.
2013-04-04 23:30:10 -07:00
LexManos
570faeb790
Added the ability to save transformed classes to disc for debugging.
2013-04-04 10:32:48 -07:00
Christian
8b8837c9ff
Fix NPE when branding isn't present
2013-03-31 10:01:46 -04:00
Christian
eff464cf0e
And the core patches for that
2013-03-30 12:13:53 -04:00
Christian
26ccb9106e
Change snooper/crash report brand handling. fmlbranding now loads another string!
2013-03-30 12:12:54 -04:00
Christian
0d84487412
Fix up derp in access transformer
2013-03-27 19:23:10 -04:00
Christian
2bc6a0666f
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
82bc9f1b35
Add some information, and a log message letting you know it worked
2013-03-23 16:01:20 -04:00
Christian
d73ac867df
Add a mechanism to dump the registry- useful for mod developers.
2013-03-23 15:39:34 -04:00
Christian
ede93d438f
Validate supplied stack size
2013-03-23 15:10:13 -04:00
Christian
5e1949eb0e
Clone the itemstack, and allow for passing in a stacksize
2013-03-23 14:58:25 -04:00
Christian
2d368c4c2e
Itemstacks in the GameRegistry (manual registration by mods)
2013-03-23 14:48:57 -04:00
Christian
d9db27275e
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
cpw
591a25722b
Merge pull request #208 from jrtc27/patch-1
...
Fixed FMLRelaunchLog's Newline Handling
2013-03-22 05:44:38 -07:00
James Clarke
d1ff1967b5
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
012a755bb9
Fix up patch properly. Also, fix md5s for the jars.
2013-03-22 01:48:21 -04:00
cpw
748eece456
Merge pull request #206 from mDiyo/patch-1
...
Fix missing block world rendering
2013-03-21 07:41:35 -07:00
mDiyo
f709ce7579
Fix missing block world rendering
2013-03-21 07:10:55 -07:00
LexManos
33efc35b60
Merge MC 1.5.1 branch to master.
2013-03-21 04:10:30 -07:00
LexManos
687d3c059d
Merge pull request #204 from agaricusb/fix-mcpdir
...
Fix install.py --mcp-dir option
2013-03-20 10:24:27 -07:00
LexManos
aaf02ea2ac
Updated for new PR client jar.
2013-03-20 08:59:25 -07:00
Agaricus
625da6492d
Fix install.py --mcp-dir option. Fixes #204 .
2013-03-19 21:42:04 -07:00
LexManos
a573faf92d
Someone derped up this function bad, revert name.
2013-03-19 17:54:06 -07:00
LexManos
9565529baf
Updated to latest MCP and Minecraft 1.5.1 Pre-release.
2013-03-19 15:48:42 -07:00
LexManos
3c346247e1
Fix NPE with CoreMods who do not have the new MCVersion annotation.
2013-03-19 13:48:18 -07:00
Christian
ce949e6099
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
5e3af8ac0e
Use the relaunch log, for class circularity safety.
2013-03-17 23:19:39 -04:00
Christian
5cc90f060c
Fix the logger to treat newlines better, hopefully. Closes #199
2013-03-17 23:15:18 -04:00
LexManos
577b19c1cf
Fix potential NPE in class loading and add extra debug information.
2013-03-17 11:54:26 -07:00
cpw
8905237306
Merge pull request #200 from bspkrs/patch-2
...
Added comments to note FML-only methods
2013-03-14 18:37:08 -07:00
Christian
c5d5f4e516
Fix AllPublic access transformer not affecting methods. Should fix modloader
...
compatibility
2013-03-14 15:53:19 -04:00
bspkrs
24022ab6ba
Added comments to note FML-only methods
2013-03-14 01:29:36 -03:00
LexManos
6370c242f0
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
4762d4d8ef
Allocate more ram {typically 256 is defailt} to fermflower, should fix decomplication issues on OSX
2013-03-13 13:11:10 -07:00
Christian
8f2dbf7046
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
23ea835fa7
Pass obfuscation status to coremods
2013-03-12 21:06:37 -04:00
Christian
d88db6c0cf
Fix up deep tree deobfuscation
2013-03-12 20:33:19 -04:00
LexManos
c6dab815f4
Missed joined.exc, must fix scripts.
2013-03-12 15:12:49 -07:00
LexManos
7b722bfcd6
Update MCP for latest PR silent update.
2013-03-12 15:02:58 -07:00
LexManos
a90504315e
Readjust size of mods button when Minecraft Realms button is enabled.
2013-03-11 16:20:56 -07:00
Christian
3765ceb02d
Update MCP, fixes the "broken texture packs" problem.
2013-03-11 16:31:26 -04:00
Christian
dab22f5b74
Fix "0 mods" display when installed in forge.
2013-03-10 12:12:22 -04:00
Christian
b301e8e4c1
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
f647929993
Merge branch 'master' of github.com:Uristqwerty/FML
2013-03-10 01:22:24 -05:00
Christian
984291cee9
Fix supertype parsing to handle null superclass (Hi Object!). Closes #160
2013-03-10 01:20:08 -05:00
Christian
ac16845fc4
Fix demo mode crash. Closes #187
2013-03-10 01:15:16 -05:00
Christian
29edd242cd
Fix coremods without a manifest crashing the game. Closes #181
2013-03-10 01:05:31 -05:00
Christian
ca2d8bd834
Fix reflection helper: it needs to unmap the classname to find the field maps.
2013-03-09 17:58:18 -05:00
Christian
2a779ec328
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
591e65fa1a
Revert "Use the reobfuscation maps in the reflection helper for field lookups: should help some reflection cases with the deobf."
...
This reverts commit 485db6be2e .
2013-03-09 17:32:11 -05:00
Christian
485db6be2e
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
25f3fcad46
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
6bf7c9878c
Fixed srg name of minecraftDir for runtime deobf.
2013-03-09 11:52:40 -08:00
Christian
95d0ff18cd
Fix runtime deobfuscation for remapped inner classes
2013-03-09 14:06:39 -05:00
LexManos
1642bad402
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
450dd8313c
Fix up some small things, merging into mainline
2013-03-09 12:39:36 -05:00
Christian
ebdb166ec8
Merge branch 'snapshot15'
2013-03-09 12:26:14 -05:00
Christian
1eba1dfdc0
Fix accidental commands.patch overwrite
2013-03-09 12:25:24 -05:00
Christian
368a2245ef
Merge branch 'snapshot15'
2013-03-09 12:19:37 -05:00
Christian
58ee06ea8e
Some fixes for the snapshot
2013-03-09 12:10:13 -05:00
Christian
62f5adf8e2
Revert "Fix modlist to use the new texture binding functions, i think"
...
This reverts commit 48544db690 .
Conflicts:
client/cpw/mods/fml/client/GuiModList.java
2013-03-09 11:12:12 -05:00
cpw
fe1623a36a
Merge pull request #195 from RainWarrior/snapshot15
...
Fixes GameRegistry.registerBlock
2013-03-09 07:07:48 -08:00
RainWarrior
889efc1c0a
Fixes GameRegistry.registerBlock
2013-03-09 14:06:12 +04:00
Christian
0419b9d975
Update MCP info for latest
2013-03-08 23:14:30 -05:00
Christian
f1c6bdd57d
Support the MCP format of partial reobfuscation for portability. Ensure modloader-like compatibility
2013-03-08 23:13:39 -05:00
LexManos
b3e854a15d
Update for new MCP with srg reobf.
2013-03-08 18:11:44 -08:00
Christian
80a40c03e6
Update to MCP 1.5 and minecraft 1.5.
2013-03-08 20:36:05 -05:00
Christian
5bfaf7c170
Global object registry, also, support the new itemblockwithmetadata constructor
2013-03-08 13:17:12 -05:00
Christian
2d98835db8
Scala support!
...
It's still primitive, I hope that people will like it. I do :)
2013-03-07 20:22:24 -05:00
Christian
81c6421f84
Tweak license text- any osi licensed project can use the asm transformer code
2013-03-07 19:41:52 -05:00
Christian
6eeae8c49f
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
c42a210140
Strip deprecated code
2013-03-07 19:33:34 -05:00
Christian
a723aa6860
Refresh copyright notices on everything
2013-03-07 19:25:48 -05:00
Christian
e9ff699c2d
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
abe4f73a9a
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
74fffc6fdc
Update next render to 40
2013-03-04 22:52:24 -05:00
Christian
debbdc00be
Capture Minecraft logs into FML logging
2013-03-04 22:45:58 -05:00
LexManos
aed2cc446a
Force file name encoding to UTF-8, caused different zips on different systems.
2013-03-04 18:19:06 -08:00
LexManos
e74087ee43
Ignore again, testing submodule.
2013-03-03 11:54:53 -08:00
LexManos
f329084f1f
Ignore this commit.
2013-03-03 11:52:47 -08:00
Christian
33cd9ad0fe
Ignore deobf data
2013-03-03 14:04:41 -05:00
Christian
ce819ac143
Force the joined.srg timestamp to zero- avoids annoying sha1 differences
2013-03-02 15:06:13 -05:00
Christian
f0495a8abc
Don't enforce signatures on minecraft classes
2013-03-02 14:48:08 -05:00
Christian
a696db5a21
Update MCP URL for snapshot
2013-03-02 10:56:25 -05:00
Christian
fcdbb4f5b3
Fix up runtime deobfuscation. Working well now.
2013-03-02 10:46:32 -05:00
Christian
e105337ff4
Build, and use, MC versioned deobfuscation data
2013-03-02 10:30:45 -05:00
Christian
f52e2112dd
Merge branch 'runtimedeobf' into snapshot15
2013-03-02 10:04:06 -05:00
Christian
945d927fa0
Add in build for deobf data zip file, update for official mcp 7.39
2013-03-02 10:02:02 -05:00
LexManos
2ee6946824
Fix exc for renamed Behavior classes.
2013-03-02 00:48:44 -08:00
LexManos
e08c43366a
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
c508004429
Delete unneeded patch
2013-03-02 00:11:48 -08:00
LexManos
21af85323a
Readd ignore for argo and bouncycastle, needed for our replacement to work properly.
2013-03-02 00:11:33 -08:00
Christian
3410242f03
Update FML to 1.5 snapshot 13w09c
2013-03-02 02:06:32 -05:00
Christian
9b9c46d93b
Tweaks to runtime deobf
2013-03-02 01:49:45 -05:00
LexManos
de8e76c7fd
Update distribuited eclipse's classpath for updated libraries.
2013-02-28 04:22:34 -08:00
LexManos
47b5e99b6f
Fix crash in GuiModList for mod logo files, logo is not rendering for unknow reason.
2013-02-27 22:41:00 -08:00
LexManos
1a465b33f5
Fix bug in rename_vars where certian items would fail to be renamed.
2013-02-27 22:40:15 -08:00
LexManos
8e7956397d
Just enable server side compile, and warn not to cmplain to us.
2013-02-26 14:54:18 -08:00
LexManos
86a9c7d359
Fixup reobfusication of server code if present.
2013-02-26 14:34:51 -08:00
Christian
6a581803a9
Tweak IASM hook api. You can return multiple classes now.
2013-02-26 15:04:45 -05:00
Christian
b4e0c709c5
Merge branch 'runtimedeobf' into snapshot15
2013-02-26 10:24:03 -05:00
Christian
f3458456a2
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
dcb15a587c
Clean up more junk
2013-02-26 00:28:12 -05:00
Christian
937e9a0169
Update libs for 1.5. Lots of new libs.
2013-02-26 00:16:57 -05:00
Christian
decd230ac1
Fix renderengine patch *sigh*
2013-02-25 22:06:20 -05:00
Christian
5347caa1c4
Merge branch 'master' into snapshot15
...
Conflicts:
patches/minecraft/net/minecraft/client/renderer/RenderEngine.java.patch
2013-02-25 21:53:56 -05:00
Christian
52f6a674ea
Merge branch 'master' into snapshot15
...
Conflicts:
client/cpw/mods/fml/client/TextureFXManager.java
2013-02-25 21:18:08 -05:00
cpw
a16c61f7ba
Merge pull request #188 from immibis/master
...
Console log thread should be a daemon thread.
2013-02-22 22:35:14 -08:00
immibis
67f12d6dec
Console log thread should be a daemon thread.
2013-02-23 19:27:16 +13:00
LexManos
bad55cacfa
Fix sprite map issue.
2013-02-22 14:45:25 -08:00
Christian
a6e979b311
Merge branch 'master' into runtimedeobf
2013-02-17 16:29:13 -05:00
Christian
ce68456f97
Fix Language Registry, closes #163
2013-02-17 16:28:54 -05:00
Christian
29e59438c5
Fix Language Registry, closes #163
2013-02-17 16:22:58 -05:00
Christian
10d4acfad2
Merge branch 'master' into runtimedeobf
2013-02-16 14:28:29 -05:00
LexManos
1c3dc132cb
Option to disable renaming for srgnames.
2013-02-08 14:50:17 -08:00
Christian
cd96718339
Fix HD mob skins, FINALLY!!!
...
Stupid eyes are stupid.
2013-02-06 01:25:46 -05:00
Christian
22dbe411d9
Fix up mistake that broke all modloading. Nice.
2013-02-04 10:58:48 -05:00
Christian
a99d110fff
Fix some class naming and packaging issues, pending an MCP update
...
for the same
2013-02-02 10:54:48 -05:00
Christian
f21929b7d1
Update for MCP 7.34 and MC 13w05b
2013-02-01 23:05:23 -05:00
Christian
5d78b310da
MCP compilation works
2013-02-01 22:42:28 -05:00
Christian
549b6fd535
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
9fafdc1695
More logging tweaks. You can probably configure individual mod log files if you wish now
2013-01-30 20:55:12 -05:00
Christian
f169f7c92f
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
b9ccadb2f1
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
f00650481b
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
5d4c2fed88
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
66a81e7dbe
Method deobfuscation now works
2013-01-27 21:50:08 -05:00
Christian
6b5a433f65
Working to read class names and remap them at runtime.
2013-01-27 17:09:00 -05:00
Christian
b5d5c95b33
First draft runtime deobf
2013-01-27 15:55:37 -05:00
Christian
3ac891fa5a
Try and handle "death on startup" a bit cleaner
2013-01-27 15:54:36 -05:00
Christian
2dc0189179
Deprecate the old GUI ticktype. They're dead and have been for some time.
2013-01-24 17:29:46 -05:00
Christian
dd98784262
Tweak a method signature
2013-01-24 10:23:36 -05:00
LexManos
1c9a51098b
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
d075daf00e
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
1bd6847bc8
Fix up packages.csv ordering for easier diffing
2013-01-22 14:43:27 -05:00
Christian
dd832f2a88
Update for MCP7.30c - fixes redstone rendering issues
2013-01-22 14:40:09 -05:00
Christian
aebf6eb168
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
8921cfe061
Remember to add the new patches!
2013-01-22 09:32:53 -05:00
Christian
cd67596d57
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
e1c6630569
Javadoc cleanup
2013-01-21 21:37:29 -05:00
Christian
5ce4e31855
Fix breaking change
2013-01-20 17:54:56 -05:00
Christian
a99c488d49
Merge branch 'patch-1' of https://github.com/bspkrs/FML into gh-updates
2013-01-20 11:31:47 -05:00
Christian
94282c5575
Merge branch 'FMLLogFormatter' of https://github.com/donington/FML into gh-updates
2013-01-20 11:31:24 -05:00
Christian
7ad8529390
Update MCP to MCP7.26a and refresh MCP names
2013-01-20 10:30:36 -05:00
Christian
15534edce4
Update address of the FML repository to the new location in all the files
2013-01-18 21:26:43 -05:00
bspkrs
aa822e32af
Fix logical error in comment text
2013-01-16 23:49:09 -05:00
Christian
a14ab913a9
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
0165742a30
Fix mcp conf md5 signatures for the snapshot
2013-01-12 14:25:03 -05:00
donington
26a5b316de
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
2140cd8cb6
Temporary hosting
2013-01-12 00:38:42 -05:00
Christian
4a6245a215
Another packaging update. I think we're done now.
2013-01-12 00:33:32 -05:00
Christian
48544db690
Fix modlist to use the new texture binding functions, i think
2013-01-12 00:27:11 -05:00
Christian
2c89b3def3
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
5689182088
Delete old patches not needed anymore
2013-01-11 23:53:14 -05:00
Christian
4a1f4b90fd
Initial patch update for snapshot
2013-01-11 23:47:05 -05:00
Christian
f2d42d1134
Initial setup for snapshot- the client compiles, but patches fail to apply.
2013-01-11 22:49:09 -05:00
LexManos
51e7606e74
Updated patches for new JAD style names.
2013-01-11 13:16:40 -08:00
LexManos
723c2d98eb
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
7dee072e1a
Fix incorrect end length calculation. Closes #161 Thanks BStramke!
2013-01-11 09:41:47 -05:00
Christian
3e18c4160f
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
cpw
513ad19187
Merge pull request #158 from CovertJaguar/patch-2
...
Added an accessor for villagers
2013-01-08 05:36:45 -08:00
CovertJaguar
eabede2203
Added an accessor for villagers
2013-01-07 14:55:17 -08:00
LexManos
b22dbc12a2
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
708e86adfb
New python script for signing partial jar files. See comments inside for details.
2013-01-06 22:09:12 -08:00
Christian
6f1b762c9d
Move server stopped *after* the server has actually stopped. *sigh*
2012-12-31 01:20:35 -05:00
Christian
d9bfb29d6c
Add in a "server stopped" event
2012-12-30 23:52:38 -05:00
Christian
6fc7bc4941
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
fb701cdc5e
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
f7cc50b521
Update for MC 1.4.7
2012-12-28 10:07:53 -05:00
Christian
1a232cf766
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
853f54bcc2
Log if there's a problem reading the class bytes
2012-12-27 23:00:37 -05:00
LexManos
127be2237d
Fix NPE in fingerprint loading, and pass expectged fingerprint to FMLFingerprintViolationEvent
2012-12-25 15:59:30 -08:00
Christian
7e6456d7cd
Fix a message delivery issue in IMC
2012-12-24 09:41:22 -05:00
Christian
664ebda599
Some tweaks for signing and ID matching
2012-12-23 22:27:26 -05:00
LexManos
9b4a225ad2
Remove unneeded file
2012-12-20 14:30:59 -08:00
LexManos
6c59fa2d2c
Fixed placement of onConnectionClosed callback.
2012-12-20 14:30:41 -08:00
LexManos
5736d850f0
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
127d6ee8ac
Output obfed files with reserved windows names to _NAME.class
2012-12-19 18:12:11 -08:00
LexManos
2055543042
Add quotes around javac command.
2012-12-19 02:58:09 -08:00
Christian
40e57a26a9
Update MCP to newer version
...
Fix fingerprint fire
2012-12-18 16:43:48 -05:00
Christian
d604e44195
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
8b7778ccb6
Don't be as alarming about item overwrites.
2012-12-18 08:33:46 -05:00
Christian
7e30814ecb
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
e5b1dfb74c
Dixed ev eclipse worksapce, now references BC.
2012-12-18 05:10:32 -08:00
LexManos
27bc77363e
Added client src folder to classpath for startclient/startserver.
2012-12-18 05:06:20 -08:00
LexManos
506b73d0a0
Removed hardcoded additions
2012-12-18 05:05:25 -08:00
Christian
20337b6e8a
Update to MC 1.4.6
2012-12-17 21:48:29 -05:00
Christian
33ff87d8d9
Fix build script
2012-12-17 17:56:00 -05:00
Christian
af06bbd373
more 1.4.6 tweaks
2012-12-17 17:00:54 -05:00
Christian
92a47ace8b
More work
2012-12-17 14:30:51 -05:00
Christian
f285ac369a
Merge branch 'securityupdate'
2012-12-17 11:46:47 -05:00
Christian
68e76c273a
Merge branch 'master' into securityupdate
2012-12-17 11:46:27 -05:00
Christian
e98c311a2c
Fix up handling null names. *sigh*
2012-12-17 10:29:54 -05:00
Christian
293edb316e
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
2d4465eaf7
More fixes
2012-12-16 21:22:55 -05:00
LexManos
9266ff394a
Updated MCP download mirriors upon Searge's request.
2012-12-16 05:35:46 -08:00
Christian
bbfd85ed1e
Move Side and SideOnly to relauncher package
2012-12-15 23:21:26 -05:00
Christian
6ecc2303f4
Fix newline fun
2012-12-15 22:37:32 -05:00
Christian
d35cfda798
More stuff for the thingy
2012-12-15 22:30:16 -05:00
Christian
cffa2a92a6
Remove old NEI/CCC compatibility code and other classloading tweaks
2012-12-15 20:40:08 -05:00
Uristqwerty
179c504746
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
31695d5ec1
Fix var name messup
2012-12-13 00:22:30 -08:00
LexManos
bfb3020505
Update released eclipse project to link BouncyCastle
2012-12-12 23:44:28 -08:00
Christian
22a88ea2e4
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
0423fa5885
Fix possible escape leakage..
2012-12-12 19:31:05 -05:00
LexManos
d17fbb527f
More robust eclipse workspace replacement
2012-12-12 14:31:07 -08:00
LexManos
d40bb0fe32
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
a513060a81
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
8e594a347c
Remove extraneous patch file
2012-12-11 20:37:12 -05:00
Christian
9af365edcc
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
70554d6a2b
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
cpw
eb84f52493
Merge pull request #145 from pahimar/master
...
More logging of loading files in LanguageRegistry
2012-12-11 08:28:39 -08:00
pahimar
d074830d95
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
f7fe9ebeb2
Fix patches, rebased with HEAD
2012-12-10 15:37:48 -08:00
LexManos
b2c8f37aec
Remade python dist as 32-bit.
2012-12-10 15:26:15 -08:00
Christian
a5bcccab59
Fixing id map generation - should validate correctly now
2012-12-10 15:26:13 -08:00
LexManos
a11f368b62
Reenabled replacement of the eclipse folder.
2012-12-10 14:56:23 -08:00
LexManos
59656b004b
Remade python dist as 32-bit.
2012-12-10 14:56:05 -08:00
Christian
ff8cb67a99
Fixing id map generation - should validate correctly now
2012-12-09 22:24:16 -05:00
Christian
fa5256c8a7
Fix up idmap code
2012-12-09 22:01:13 -05:00
LexManos
4b19987ee6
Some derp protection in the workspace copy.
2012-12-09 02:20:21 -08:00
LexManos
9f43303073
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
a20958fb56
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
8c71098081
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
a3a5b44acb
Updated the update_packages script to support different mcp locations
2012-12-08 21:40:39 -08:00
LexManos
0473273709
Update fml_marker.cfg, Minecraft is now runnable!
2012-12-08 20:25:29 -08:00
LexManos
bf492f32f9
Update all imports for repackaging. Branch is compileable.
2012-12-08 20:21:03 -08:00
LexManos
4744677646
Some stragler patches
2012-12-08 19:34:35 -08:00
LexManos
f0af2e4ef5
Updated patches to new packages.
2012-12-08 19:33:29 -08:00
LexManos
c7f763d6f0
Give new classes a distinct package to be moved from.
2012-12-08 17:50:14 -08:00
LexManos
563b8d1215
Fixed 0.tree to actually refresh the workspace.
2012-12-08 17:35:11 -08:00
LexManos
221493453f
Remerged branch, and updated dev eclipse workspace.
2012-12-08 17:08:51 -08:00
Christian
86c928430a
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
cd0a0e51d5
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
66ff95f9d7
Fix build eclipse extractor task
2012-12-08 16:46:46 -08:00
Christian
8ad172295f
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
26a2ef5995
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
b4e3490fa1
Fix build eclipse extractor task
2012-12-04 18:04:45 -05:00
Christian
828341f987
Fix typo
2012-12-04 01:30:38 -05:00
Christian
bc03fbb3be
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
7a8dae5e35
Try and make branch non-derpy
2012-12-03 23:47:23 -05:00
Christian
d3c0e1f589
Try defaulting branch differently
2012-12-03 22:26:12 -05:00
Christian
9c77d3f25b
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
6371e9b71e
Assume Forge is the parent directory when checking for AT configs.
2012-12-03 16:53:03 -08:00
Christian
578ef5cfeb
Merge branch 'master' into repackage
...
Conflicts:
patches/minecraft/net/minecraft/client/EntityFX.java.patch
2012-12-03 17:31:29 -05:00
Christian
516954e6f9
Name both zips the same format
2012-12-03 08:38:20 -05:00
Christian
1151d5c3e3
Last part of branch name only please
2012-12-03 08:30:44 -05:00
Christian
25f1ddac30
Try and get a valid branch name on jenkins
2012-12-03 08:23:21 -05:00
Christian
39a146f8e6
Clean up build.xml script- support outputting a branched jar file
2012-12-03 08:13:20 -05:00
LexManos
037dcaefea
Small derp in install.py
2012-12-02 20:26:36 -08:00
LexManos
01d6da3a90
Try marking python as binary.
2012-12-02 20:19:55 -08:00
LexManos
8b2665980d
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
42b3e6ad56
Windows Python distrabution created using py2exe, thanks Fesh0r for the script.
2012-12-02 19:56:17 -08:00
LexManos
e709ab8a70
Marked more spots in gui/items bitmask as being free.
2012-11-21 15:58:04 -08:00
LexManos
501409d1fb
Delete duplicate file
2012-11-20 18:07:39 -08:00
LexManos
0fb3a34235
Finished repackaging net.minecraft.* net.minecraft.client is left
2012-11-20 17:58:22 -08:00
LexManos
e4ba1f863e
More re-packaging, got most classes out of the default package.
2012-11-20 17:22:55 -08:00
Christian
1f5c58b723
Fix up MCP version
2012-11-20 08:47:14 -05:00
Christian
61e4db2c3b
Merge joined.exc add update howto
2012-11-20 08:38:33 -05:00
Christian
5efc1eb34c
Revert "Fix MC-2497 - derpy torch flames. Moved from forge. Everyone should benefit."
...
This reverts commit fa567014a5 .
2012-11-20 08:27:13 -05:00
LexManos
96c6f91201
Remove common folder from projects
2012-11-20 03:15:45 -08:00
LexManos
62e69a2804
Move IBossDisplayData to shared
2012-11-20 03:15:16 -08:00
LexManos
e9352d2675
First half of new patches
2012-11-20 03:15:01 -08:00
LexManos
ee6abdf28d
Update FML imports
2012-11-20 03:14:36 -08:00
LexManos
968ee7ab09
Inital script side commit for MC source repackaging done.
2012-11-20 01:55:41 -08:00
LexManos
3b3600d44f
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
edcc5ca554
Forgot mcp.cfg
2012-11-19 15:47:18 -08:00
LexManos
ca79dfe298
Updated to 1.4.5b
2012-11-19 15:35:08 -08:00
LexManos
5945279b8b
Fix python error
2012-11-19 15:03:13 -08:00
LexManos
57bf64318b
Modified decompile so that we do not have to decompile the server, saves time.
2012-11-19 15:01:04 -08:00
LexManos
d9d0a46809
Cleaned up some tabs
2012-11-19 15:00:11 -08:00
LexManos
2fac644914
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
570592b24b
Attempt to fix a possible comodification risk
2012-11-18 20:40:48 -05:00
Christian
fde94144ec
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
f348496c10
Fix mod display list. Shouldn't be derpy anymore.
2012-11-17 23:51:14 -05:00
Christian
a5c31b5365
Fix World patch- workaround no longer required and leftovers are bad.
2012-11-17 23:44:53 -05:00
LexManos
2dc3f0ddef
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
fa567014a5
Fix MC-2497 - derpy torch flames. Moved from forge. Everyone should benefit.
2012-11-16 22:50:21 -05:00
Christian
96935bb122
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
43d3042dff
Clean up a patch
2012-11-16 16:49:44 -05:00
Christian
fec221f8a6
Update FML for MC 1.4.5
2012-11-16 16:31:06 -05:00
LexManos
b0f0635eb3
Fix for ModLoader static overrides not displaying.
2012-11-15 14:08:41 -08:00
Christian
23a25131b0
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
a6eaa2bebc
Fix spelling issue.
2012-11-08 21:01:31 -08:00
LexManos
c6a0741379
FML setup should now download and verify all the minecraft files needed to run MCP.
2012-11-08 17:54:05 -08:00
Christian
5a1930e2d6
Small fix to some MCP metadata for pre2
2012-11-08 20:34:45 -05:00
Christian
418deba5bf
Update to MC 1.4.4
2012-11-08 17:55:20 -05:00
Christian
4ff2cff3c0
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
bd2123cf9d
Clean up some patch fuzz
2012-11-02 17:32:39 -04:00
Christian
c2a603c910
Update joined.exc file from latest conf
2012-11-02 17:23:54 -04:00
Christian
db12af48fa
Update to 1.4.3
2012-11-01 23:53:13 -04:00
Christian
a0f574a0ac
A useful tool for performing updates
2012-11-01 23:11:21 -04:00
Christian
8356fe9a7b
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
6edce8b5f4
Patch a file handle leak in RegionFileCache handling when under memory pressure.
2012-10-31 22:58:01 -04:00
LexManos
ca2bbe0b5f
Update MCP mapings again, yay bad syncs.
2012-10-31 09:23:17 -07:00
LexManos
c8941a7faa
Updated MCP mapings.
2012-10-31 07:40:53 -07:00
LexManos
5e20c03736
StartServer is now useable in merged code base.
2012-10-31 07:40:40 -07:00
Christian
b19e882aab
Remove some debug, closes #123
2012-10-30 21:53:08 -04:00
Christian
9d7d32a1b5
Fix up tick management outside of mod loading phases for ModLoader mods.
2012-10-30 21:47:06 -04:00
Christian
d512539554
Negatively cache failed class lookups, should help with @SideOnly performance issues.
2012-10-30 21:17:17 -04:00
Christian
a3a93f3387
Fix some whitespace issues, handle possibly bugged entities as well
2012-10-30 09:13:18 -04:00
Christian
a7eb5dc773
Vanilla/mod bug fixes: CME on entity processing, TileEntity resetting chunk on save/load.
2012-10-29 17:41:08 -04:00
Christian
b23081df78
Support for ModLoader 1.4.2. Good job Risu!
2012-10-28 23:55:58 -04:00
Christian
66db4ec46e
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
8bd98c3a2d
Fix a small problem with the new MCP container- it can cause NPEs. Nice.
2012-10-26 07:55:23 -04:00
Christian
34cc42d3cb
Fix up some javadoc complaints
2012-10-25 16:18:42 -04:00
Christian
09eade4623
Update build - include MCP information in the source pack
2012-10-25 10:00:34 -04:00
Christian
9bfe7df373
MCP deserves lots of credit. So here it is.
2012-10-25 09:02:49 -04:00
Christian
8006b774bf
Fix instantiation bug
2012-10-24 21:58:36 -04:00
Christian
7cc91cfb0c
Simple InterMod comms. Send a message using FMLInterModComms.sendMessage(). Receive messages through an @IMCCallback
2012-10-24 16:39:55 -04:00
Christian
24d72852e7
Update for MC 1.4.2
2012-10-24 15:12:06 -04:00
Christian
cedf3d55d5
Duplicate Mod display screen.
2012-10-24 09:41:46 -04:00
Christian
d915f39996
Fix typo in access transformer
2012-10-23 21:21:28 -04:00
Christian
346691c298
Fix the merge for forge
2012-10-23 18:36:05 -04:00
Christian
6dadc1d889
Fix up references to minecraftDir in obf code
2012-10-23 18:10:06 -04:00
Christian
8a55f68a18
Update FML for Minecraft 1.4.1
2012-10-23 18:00:33 -04:00
LexManos
5645fa5847
First update to 1.4.1, patches need updating.
2012-10-23 14:44:04 -07:00
LexManos
ff0f00f64f
Add some null checks, and throw descriptive exception when SideTransformer prevents a class from loading.
2012-10-23 13:32:02 -07:00
Christian
7a34246dc9
Ship a client only class so the merge works both sides.
2012-10-21 22:50:20 -04:00
Christian
62a6b52487
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
b845cde73d
Fix up FML python script for forge
2012-10-21 08:19:36 -04:00
Christian
2c36dfbb34
Update to MCP pre 3. Fixes some weirdnesses with explosions.
2012-10-21 07:11:09 -04:00
Christian
acd880dd2a
Merge branch '1.4'
2012-10-20 18:07:22 -04:00
Christian
e6f57e5d94
Update for MCP release
2012-10-20 18:02:26 -04:00
Christian
b1de0fc17c
Remove fuzz from patches for INetworkManager change
2012-10-20 17:16:50 -04:00
Christian
ad4461932f
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
3a94211377
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
9386e23b1f
Update gitignore - ignore the files that will change or be deleted
2012-10-20 15:14:06 -04:00
Christian
10b318c71d
Add in "starter" image for eclipse workspace
2012-10-20 15:02:37 -04:00
Christian
995d5b7b3a
Eclipse workspace fixup 2?
2012-10-20 14:42:25 -04:00
Christian
bbb12c84fd
Clean up eclipse workspace- part 1
2012-10-20 14:09:44 -04:00
Christian
b50058ee47
Clean up a bit of patch fuzz
2012-10-20 12:39:40 -04:00
Christian
4a0bfa937a
Fix CommonHandler for rename of the server thread class
2012-10-20 12:31:35 -04:00
Christian
4d1ec666dd
Update with RC2 MCP. Use the joined.exc file directly since MCP now provides it.
2012-10-20 12:27:30 -04:00
Christian
b52e3d0e7d
Fix exception for CodecMus
2012-10-20 12:12:43 -04:00
Christian
a1011c99a9
Fix some compilation issues. Requires resolving the worldclient abstract method
2012-10-20 11:30:01 -04:00
LexManos
0ebd4f3d94
Inital patch update to 1.4
2012-10-20 02:43:03 -07:00
LexManos
89c68c46a2
Moved into EntityVillager
2012-10-20 02:42:34 -07:00
LexManos
e4702cb09d
Fix line ending detection during checkout.
2012-10-20 02:32:29 -07:00
LexManos
6e64fd7a11
We don't need logging here...
2012-10-20 02:27:26 -07:00
LexManos
014b3f4ad5
remove useless -Server projects
2012-10-20 00:43:02 -07:00
LexManos
7628c67883
Updated the AT config and Marker config for 1.4 obf
2012-10-20 00:36:33 -07:00
LexManos
54a322c09f
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
aadf396244
Update MCP Merge config.
2012-10-19 23:57:49 -07:00
LexManos
81e18552e3
Pull in MCP's 1.4 conf files.
2012-10-19 23:57:05 -07:00
LexManos
5686fd40a4
Fix error in merging of exec's
2012-10-19 21:14:03 -07:00
Christian
989ab3e96b
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
88f1dc97b6
Typos!
2012-10-18 21:00:58 -04:00
Christian
470a18522c
Try and avoid an NPE in crash reports
2012-10-18 14:41:32 -04:00
Christian
002951804a
Fix logging problems- log death messages and re-route the server through FML logs properly.
2012-10-17 18:05:23 -04:00
Christian
fe7a832fad
Fix the test mod
2012-10-16 13:24:29 -04:00
Christian
a2bc30b356
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
bae1f74681
Fix classpath for server
2012-10-16 12:40:01 -04:00
Christian
887aa277a4
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
e17f2677c7
Update FML internal classpath. Helpful for coremod devs
2012-10-16 09:47:06 -04:00
Christian
3b9972af39
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
5c96afec70
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
1bca393ecb
FML as a whole is now subject to transformers.
2012-10-16 09:20:30 -04:00
Christian
27cf731552
Bonus extra character. thanks randomitter!
2012-10-16 09:06:13 -04:00
cpw
94c84cd994
Merge pull request #116 from Vazkii/patch-1
...
Add Null check to FMLClientHandler.sendPacket
2012-10-07 10:45:22 -07:00
Vazkii
c2d3195e76
Add Null check to FMLClientHandler.sendPacket
2012-10-05 17:36:52 +02:00
Christian
d0e7c9e2ea
Update patches *sigh*
2012-10-02 22:04:25 -04:00
Christian
f3e1cac5a1
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
51fb513213
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
65c9fdd8d7
New stuff on the ModLoader! Risu has been busy. Closes #114
2012-10-02 08:29:12 -04:00
Christian
c1d4458acc
Mods can now declare a range of minecraft versions they will run against
2012-10-02 01:29:46 -04:00
Christian
ca1ca4f944
Fix maps supporting greater than byte() dimension sizing
2012-09-29 00:21:42 -04:00
Christian
15ee8bf5a1
Fix language registry additions, closes #113
2012-09-28 22:12:23 -04:00
cpw
a08b5b19d5
Merge pull request #112 from pahimar/master
...
Additonal Language Registry functionality
2012-09-26 21:57:53 -07:00
pahimar
8dac58ffc1
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
f0837070d6
Extreme headless mode is back!
2012-09-25 22:46:47 -04:00
Christian
dd7502a051
Fix parent child counts showing properly. Closes #107 thanks scott!
2012-09-25 19:00:36 -04:00
Christian
b36d4471e6
It's useMetadata, not usesMetadata. thanks myrathi and psx. closes #110
2012-09-25 18:57:42 -04:00
Christian
efb1066a88
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
dd39ae540b
Try and fix the newline capture so consoles show on the server on windows again
2012-09-24 17:22:39 -04:00
Christian
b39f808618
Readd ancient searge name so dan200 and computercraft can run again. REMOVE THAT CODE DAN.
2012-09-24 17:22:16 -04:00
Christian
a2c059e562
Fix missing import. Thanks ichun :(
2012-09-21 18:17:56 -04:00
Christian
19316a0d38
Version file searching should work for directories too
2012-09-21 17:39:52 -04:00
Christian
fbc7a5c063
Fix bug causing NPE if non-whitelisted player joins an FML server without FML installed
2012-09-21 10:12:39 -04:00
cpw
e9cfd10e39
Merge pull request #103 from iChun/patch-2
...
Fixed ModTextureAnimation not updating and not binding to correct image.
2012-09-19 05:12:04 -07:00
iChun
1424883773
Fixed ModTextureAnimation not updating and not binding to correct image.
2012-09-17 23:46:09 +08:00
Christian
6c746ec6d9
Tidy code
2012-09-16 21:44:11 -04:00
Christian
aacbfeb66e
Change version.properties search slightly, allow access to found file from the preinit event
2012-09-16 21:42:59 -04:00
Christian
1513b369d3
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
35852a69fb
Fix up reversed assignment for version fallback
2012-09-16 21:05:56 -04:00
LexManos
96537dc091
Fixup Item in hand rendering of textures > 16x
2012-09-15 18:24:27 -07:00
LexManos
e88ddc56ca
Make the exception print for headless servers if the Downloader cant initalize.
2012-09-15 18:06:59 -07:00
LexManos
f24ff07b30
Remove a bunch of warning about javadoc, not a real fix, but no more warning.
2012-09-15 18:04:56 -07:00
LexManos
3420ea7a2d
Update MCP Mapings
2012-09-15 17:09:45 -07:00
LexManos
87104f0e2d
Makes GetModSrc check the common folder when attempting to extract source files
2012-09-15 17:09:34 -07:00
Christian
640446b868
Tie parent/child containers together again. Should close #96
2012-09-15 15:58:20 -04:00
Christian
2cf4917ded
Village mating produces added villagers, and the egg should place
...
added villagers too. Closes #97 .
2012-09-15 15:49:08 -04:00
Christian
6394ee8714
Clean up stale references to the Player stored in the NetworkRegistry,
...
closes #100
2012-09-15 15:36:26 -04:00
cpw
7299e05fe1
Merge pull request #99 from CovertJaguar/patch-1
...
More readable state event logs
2012-09-15 12:20:26 -07:00
CovertJaguar
c4bd0405fd
More readable init logs
2012-09-14 00:47:48 -07:00
Christian
89b8236a9c
Fix onConnectionClosed not being called on the client side of a connection
2012-09-09 11:29:08 -04:00
Christian
70f55c59c0
Add in exclusion list for IFMLLoadingPlugin.
2012-09-08 12:19:03 -04:00
Christian
1c1716d833
Remove debug cruft
2012-09-07 23:14:54 -04:00
Christian
d567f79652
To properly align with packet9respawn, make packet1login's dimension an int as well
2012-09-07 22:57:01 -04:00
Christian
ecd4e46a45
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
16fe495d18
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
4f70d23d0e
Fix dependency checking: you can depend on specific versions of FML
2012-09-07 19:08:28 -04:00
cpw
290a3c94b7
Merge pull request #94 from iChun/patch-1
...
Fix handleTinyPacket using short instead of int.
2012-09-07 05:43:39 -07:00
iChun
9485dc5a96
Fix handleTinyPacket using short instead of int.
...
Silly cpw :P
2012-09-07 18:35:26 +08:00
Christian
e6abb69b0e
Fix up tiny packet handler to actually work
2012-09-06 22:59:38 -04:00
Christian
e862052bb4
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
4071ad1278
Add in a little bit of protocol cleanup. Start work on allowing multiple
...
protocol versions
2012-09-06 21:54:43 -04:00
Christian
60619643e6
Give a way to build the packet131mapdata packet correctly populated
2012-09-06 10:12:37 -04:00
Christian
b818769c1f
Capture and leverage Packet131MapData
2012-09-06 10:03:30 -04:00
Christian
12bc4bab0c
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
8fccfa21df
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
a697d043fc
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
9d812f12cc
And handle the other way to globally register an entity
2012-09-03 21:37:20 -04:00
Christian
869cf78e98
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
186680cd8c
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
5aed6d995d
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
3d7a665987
Fix headless operation, hopefully
2012-09-02 13:29:46 -04:00
Christian
10a716969b
Fix up trying to re-add stuff to the classpath when it's already there
2012-09-02 12:56:08 -04:00
Christian
0eb7180fc1
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
b1b4c61b80
Expose GuiMerchantButton
2012-09-02 12:15:13 -04:00
Christian
359cfb5c98
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
8656fd50ce
Also, make missing entity not blow things up
2012-08-31 16:49:35 -04:00
Christian
25a4dcb653
Fix entity tracker "update" packet not computing correctly. Should work now..
2012-08-31 16:41:05 -04:00
Christian
c90a853377
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
18069d8fd2
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
a40f4a75a9
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
5b6460b68c
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
c0d1348e65
Add in an ItemRenderer null check so FML can run render adding mods
2012-08-29 13:58:56 -04:00
Christian
482c163344
Inverted boolean logic. Grrr.
2012-08-29 13:44:40 -04:00
Christian
221d1131b4
ModLoader mob spawns use packet 24- build a bypass system so that
...
they can still use it
2012-08-29 12:58:16 -04:00
Christian
f19f426449
Remove debug statements
2012-08-28 23:07:37 -04:00
Christian
9dd9b6eb71
Fix keybindings not loading properly from gamesettings file after restart
2012-08-28 22:15:18 -04:00
Christian
acb0b21d6d
Fix so we always send received packets to handlers.
...
Renders 250 filtering useless unless i can figure a way to intercept *outbound* packets that isn't as messy as I'm
contemplating
2012-08-27 17:46:08 -04:00
Christian
b17dd3c695
Some tests
2012-08-26 22:23:05 -04:00
Christian
fa66ffaf3f
Fix trying to load the client side packet handler, when on the server, hopefully?
2012-08-26 22:18:57 -04:00
Christian
b106420774
Fix up network negotiation - now it will disconnect with a nice
...
error screen if there are missing mods on the client vs server
2012-08-26 22:13:43 -04:00
Christian
c971adb59b
Fix missing addCommand call: thanks "spawnwolf test command"
2012-08-26 13:07:35 -04:00
Christian
d6326deeb0
Fix a couple of modloader mods. Thanks!
2012-08-26 12:52:50 -04:00
Christian
483667c919
Some functionality fixes for @Instance injection.
2012-08-26 10:55:55 -04:00
Christian
8bef512803
Versions now have two flavours: the @Mod(version) which is the "programmatic version" and
...
is used for all version relationship calculation. The "display version" as sourced from
mcmod.info is used for display purposes only and can be literally anything. Note: they fall back
to one another when they're missing, and to "1.0" if both are absent.
Also, changed @Instance. Now, you can inject *other* mods using @Instance as long as you depend
on them as a "before" or "dependency" relationship. Classes containing @Instance will only be
loaded if the Mod the @Instance refers is present. So you don't have to worry about runtime class
resolution.
2012-08-26 10:45:00 -04:00
Christian
501009c11f
Always for ML mods into "public" class accessibility - we don't call from the default package like ML does.
2012-08-25 21:57:25 -04:00
Christian
d3d430827f
Add in a convenience method for getting a class instance based on
...
existence of another Mod. Useful for soft dependencies.
2012-08-25 21:26:41 -04:00
Christian
2d9b88bd52
And more mod sorting fixes.
2012-08-24 12:10:43 -04:00
Christian
93d5934ea7
Actually *use* the sorted mod list
2012-08-24 11:58:18 -04:00
cpw
180a279558
Merge pull request #82 from Chicken-Bones/master
...
The access transformer will now handle classes in packages.
2012-08-23 16:47:13 -07:00
Chicken Bones
cf38461911
The access transformer will now handle classes in packages.
...
Eg.
public net/minecraft/client/Minecraft.T #timer
2012-08-24 08:09:10 +10:00
Christian
2c85539517
Reverse the meaning of state in fml.modStates system property and fmlModState.properties - it was very
...
derpy before. Now: true is enabled, false is disabled, as you would expect
2012-08-23 17:37:44 -04:00
Christian
d651189581
Actually fix the corrupt JSON problem
2012-08-23 17:27:53 -04:00
Christian
f6a8cd556e
Fix isModLoaded for "disabled" mods, and the toposort as well
2012-08-23 17:08:18 -04:00
Christian
3bde961dc7
A bit more information for dependency handling
2012-08-23 16:46:23 -04:00
Christian
6396beaef7
Fix up handing corrupt mcmod.info
2012-08-23 16:43:28 -04:00
Christian
6bc6defb07
Fix a problem with network ids
2012-08-23 16:38:34 -04:00
Christian
732861092f
Fix up version handling properly. Hopefully, and the error screen.
2012-08-23 15:29:17 -04:00
Christian
9fcc452ed3
Only active mods should have dependencies checked, and be sorted
2012-08-23 14:33:54 -04:00
Christian
26302a6ff2
Fix oddity with Screen, print a version out in the sorted list!
2012-08-23 14:28:49 -04:00
Christian
62dbfb3837
Fix metadata
2012-08-23 14:05:17 -04:00
Christian
b91cbe9794
Fix up versioned dependencies so they work a lot better, also add in a missing mods screen
2012-08-23 13:43:25 -04:00
Christian
93b8ba9576
Fix missing serverSendPacket
2012-08-23 09:02:12 -04:00
Christian
23fdbbd03d
Trading support for ModLoader - thanks Herblore!
2012-08-23 01:40:03 -04:00
Christian
d7a74d84ea
Close the jar, for cleanliness sake
2012-08-23 01:39:35 -04:00
Christian
58e6dd9794
Fix authors - it'll read both "authors" and "authorList" from the json now
2012-08-23 01:17:47 -04:00
Christian
907cf2d925
More ML compatibility - fix up dragon mounts, thanks!
2012-08-23 00:37:45 -04:00
Christian
ee48a3673d
Fix up loading mods that are grandchildren of BaseMod
2012-08-23 00:04:34 -04:00
Christian
c6f362b77f
Fix entity handling for ModLoader mods, thanks parachute mod!
2012-08-22 23:46:16 -04:00
Christian
6e01c59635
Merge ChickenBones pull into FML - adds player trackers
2012-08-22 18:00:55 -04:00
Christian
d411f66903
Fix formatting
2012-08-22 18:00:38 -04:00
Christian
0768dc1610
Tweak patches and hooks slightly
2012-08-22 17:58:46 -04:00
Christian
4c3db16842
More precise error handling when an invalid class is present
2012-08-22 17:50:07 -04:00
Christian
805fd1dd90
Fix textures not applying properly
2012-08-22 17:50:07 -04:00
Christian
c59996b24b
Fix up entity spawning - hopefully they won't warp anymore.
2012-08-22 17:50:07 -04:00
Christian
e0a1e8293b
Add in a helper on the server start event for adding commands to
...
the server.
2012-08-22 17:50:07 -04:00
Christian
e8af9c0233
Move villager trading hook up a bit. thanks sengir.
2012-08-22 17:50:07 -04:00
Christian
a955d30d64
Fix LAN to try hard to find a real network interface, not just localhost
...
most of the time
2012-08-22 17:50:07 -04:00
Christian
dbab3bb259
Update build to not bother building client jar. Universal is everything
...
now.
2012-08-22 17:50:07 -04:00
Christian
bd9c4ee99a
Null protection for ticks() -- probably should uses EnumSet.noneOf() but
...
you can also use null now to stop ticking. closes #77
2012-08-22 17:50:07 -04:00
Christian
a0cbd3755d
More precise error handling when an invalid class is present
2012-08-22 17:36:26 -04:00
Christian
12323e233f
Fix textures not applying properly
2012-08-22 17:27:06 -04:00
Chicken Bones
8a308db3d4
FML will now search '<mcpdir>/forge/accesstransformers' for user defined access transformer config files to be applied during forge setup
2012-08-23 06:31:00 +10:00
Chicken Bones
0583dc8b74
Added IPlayerTracker hooks
2012-08-23 06:28:53 +10:00
Christian
789a4a3659
Fix up entity spawning - hopefully they won't warp anymore.
2012-08-22 15:11:59 -04:00
Christian
a87d0451c8
Add in a helper on the server start event for adding commands to
...
the server.
2012-08-22 15:11:43 -04:00
Christian
82e9309d27
Move villager trading hook up a bit. thanks sengir.
2012-08-22 11:50:03 -04:00
Christian
8deaa378c9
Fix LAN to try hard to find a real network interface, not just localhost
...
most of the time
2012-08-22 11:48:30 -04:00
Christian
b5363e3552
Update build to not bother building client jar. Universal is everything
...
now.
2012-08-22 11:12:26 -04:00
Christian
28a10ac340
Null protection for ticks() -- probably should uses EnumSet.noneOf() but
...
you can also use null now to stop ticking. closes #77
2012-08-22 09:43:32 -04:00
Christian
c349d51923
Automatic mod entity registration into the global entity list. This might break
...
entity code out there, sorry, but this way for most entities you no longer
need to manage the global mod entity stuff at all. just remove it. FML will
take care of the rest (note, worlds won't load the old entities)
2012-08-21 19:34:33 -04:00
Christian
ef01745e09
Add in a utility function that *might* tell you the context
...
you're running in on either client or server: FMLCommonHandler.getEffectiveSide
2012-08-21 19:15:07 -04:00
Christian
c97d6a65d0
Try and stop sendPacketToAllAround from being crashy
2012-08-21 18:50:26 -04:00
Christian
2062273504
Mods can add mod specific crash information to the crash report now
...
Forge needs to implement MinecraftForge.getCrashCallable
2012-08-21 18:48:12 -04:00
Christian
6e6436ee41
Fix up dispenser handling, add in new params for the dispenser: breaks IDispenseHandler, sorry
2012-08-20 21:44:54 -04:00
Christian
38f4a22bc4
Fix up MLProp handling for null info
2012-08-20 21:44:47 -04:00
Christian
3a8b047e3c
GUIs working in FML for ML mods
2012-08-20 21:44:28 -04:00
Christian
52483ee6bd
Support gui opening for Shelf mod
2012-08-20 21:43:59 -04:00
LexManos
dce1cbc096
Updated MCPMerger to annotate unique classes with there sides, and SideTransformer to null out any class that is loaded on the wrong side.
2012-08-19 22:26:52 -07:00
Christian
46c563a9a8
Expose more of the village construction parts for building village
...
pieces
2012-08-19 11:23:29 -04:00
Christian
1380c2ecce
Allow access to the type "ComponentVillage"
2012-08-19 10:35:06 -04:00
Christian
71a3818bdd
Documentation and registration for villager stuff
2012-08-19 10:30:24 -04:00
Christian
e3a343c797
Fix javadoc derp
2012-08-19 10:21:19 -04:00
Christian
195b1a043e
Villager trading, manipulation and village enhancement. Still WIP but should be functional
2012-08-19 10:13:15 -04:00
Christian
69e66c327f
Fix exception based logging to actually log the exception!
2012-08-19 09:31:26 -04:00
Christian
885637cc7d
Fix up keyboard events for modloader
2012-08-19 01:44:33 -04:00
Christian
90a7c8f787
Pickup notification
2012-08-19 00:26:55 -04:00
Christian
2171c0caa4
Update fml_at with new transforms
2012-08-18 20:08:27 -04:00
Christian
924a6f9254
Fix derp where client sided packet handler would be created on a dedi server env
2012-08-18 19:50:46 -04:00
Christian
ad4cffb0c6
Add in support for "dummy" keybindings- ones that are added to the list but never do anything
...
so the mod can handle it all themselves.
2012-08-18 10:24:29 -04:00
Christian
cf77ffb89d
Don't complain about minecraft source code being in "net.minecraft.src". Derp.
2012-08-18 10:09:53 -04:00
Christian
b2fdcd7f1c
Fix ModLoader add XP Smelting
2012-08-18 10:09:25 -04:00
Christian
094ce2ae18
Actually register client/server packetspecs as their correct sides! fixes #71
2012-08-18 09:28:36 -04:00
Christian
e8cb2c1bfe
Error if channel name is invalid - either too short, or too long
2012-08-17 16:59:48 -04:00
Christian
9c6c56c49d
Add a connect and read timeout for downloading libraries. This should really stop the "waiting forever" at startup screen.
2012-08-17 16:21:18 -04:00
Christian
0d5affede3
GIANT FAT WARNINGS if you use any code in net.minecraft.src or any subpackage thereof. Get it out of there, now!
2012-08-17 16:13:05 -04:00
Christian
13f210f403
Fix up ML GUI ticking. Thanks sharose!
2012-08-17 16:09:46 -04:00
Christian
c61ad51883
Organize ALL the imports
2012-08-17 09:25:04 -04:00
Christian
c0842b0797
Expose the server in serverstart event
2012-08-17 09:25:04 -04:00
Christian
2851079ff0
Fix up directory injection of log file locations
2012-08-17 09:25:04 -04:00
Christian
5197524d1c
Refer to FMLLog, not FMLRelaunchLog
2012-08-17 09:25:04 -04:00
Christian
78efd1acc6
Tidy up server launch - reflection not required anymore
2012-08-17 09:25:04 -04:00
Christian
eee0a99b88
Also, log what the directory discoverer finds for mcmod.info
2012-08-17 09:25:04 -04:00
Christian
10c96c394d
And log the exception if it has a problem reading the jar file
2012-08-17 09:25:04 -04:00
Christian
07cc3fb2d9
Fix jar loader failing to inject any metadata at all if mcmod.info is not found.
2012-08-17 09:25:04 -04:00
LexManos
e31f1433bf
Change install.cmd to install.bat, why, cuz people are .... Updated readme to mention needing server and client.
2012-08-16 22:57:11 -07:00
Christian
af06c97efd
Some compatibility fixes for Rei's minimap, and tidy up a couple of things
2012-08-16 13:55:42 -04:00
Christian
400de1d66e
Fix Forge branding string call
2012-08-16 13:01:48 -04:00
Christian
2a9285eee8
Update FML for mcp 72 final, change download location for FML files, and make the stop button work.
...
Hello is NOT going to go away :)
2012-08-16 12:22:56 -04:00
Christian
785bdde6bd
Fix critical bug in FML load controller that complains about injected mod containers
2012-08-16 08:34:12 -04:00
Christian
071e2dc524
Handle the case where a mod tries to do something stateful during constructor phase, and log a big
...
fat message about it. Don't do it!
2012-08-15 20:05:12 -04:00
Christian
fc08d072a4
Small fixes, including showing the FULL name of Forge Mod Loader
2012-08-15 19:54:56 -04:00
Christian
0019485aba
Fix up null array in keybinding handler
2012-08-15 19:17:21 -04:00
Christian
e76f145b65
Actually add in the system property for the minecraft home, should fix multimc too
2012-08-15 19:16:36 -04:00
Christian
27d5937f4c
Add in support for setting the home dir via the applet launch, also a system property for forcing the home dir
2012-08-15 17:18:11 -04:00
LexManos
868c4c5977
Cleanup fml.py a little, should fix double printing of 'patching file'
2012-08-15 03:10:45 -07:00
LexManos
5a37929ceb
Wrap mod description rendering in BLEND calls https://github.com/MinecraftForge/MinecraftForge/issues/96
2012-08-15 02:52:29 -07:00
LexManos
b1dc2dbf8a
Made getmodifiedsrc noop for server.
2012-08-15 00:50:40 -07:00
LexManos
ecfbef95c7
Fix new eclipse workspace to load the project properly from start.
2012-08-15 00:50:16 -07:00
Christian
bfd8fbefee
Merge branch 'minecraft132'
...
Yes, we are already on 1.3.2
2012-08-14 22:33:28 -04:00
Christian
f8c36104ad
KeyBinding handler change: a handler now takes an array of keys and calls back with the
...
activated key. Sorry for the inconvenience but this improves the usability of this
API a lot
2012-08-14 22:32:19 -04:00
Christian
e26230fb2d
Fix renderer's not getting the rendermanager set on them at registration time
2012-08-14 22:32:19 -04:00
LexManos
6417ad0a3c
Finished update to MCP 7.2, MC 1.3.2 pre.
2012-08-14 19:24:49 -07:00
Christian
0f988d087c
KeyBinding handler change: a handler now takes an array of keys and calls back with the
...
activated key. Sorry for the inconvenience but this improves the usability of this
API a lot
2012-08-14 22:06:49 -04:00
Christian
7c01b64aed
Fix renderer's not getting the rendermanager set on them at registration time
2012-08-14 21:59:47 -04:00
LexManos
03130c78a7
Fixup included workspace to have single project with client/server launches.
2012-08-14 17:42:40 -07:00
Christian
30ab326d2b
Start working on MC 1.3.2
2012-08-14 20:09:24 -04:00
Christian
8d1cba57f8
Add in a helper for code migrating from ML renderer stuff
2012-08-14 19:09:22 -04:00
Christian
cbfd6c1a66
Merge pull request #62 from calclavia/patch-1
...
Shortcut function for addNameForObject()
2012-08-14 13:52:58 -07:00
calclavia
81cb3c82f4
Shortcut function for addNameForObject()
...
Having that long line of code makes the code a bit ugly... Please make this shortcut function like ModLoader.addName() so I don't need to use ModLoader.addName(). :)
2012-08-15 04:45:32 +08:00
Christian
e64296e109
Handle mod duplicate detection much better. Default the name of a mod to it's id.
...
Fix up the block registry problem. Fix the packetsend from c->s actually being
"disconnect" :)
2012-08-14 13:36:29 -04:00
Christian
5872b31781
Fix entity spawn packets
2012-08-14 08:20:28 -04:00
LexManos
51b801b1c6
Force a Jenkins build
2012-08-14 01:21:56 -07:00
LexManos
9ef153c0b6
Merge pull request #60 from remuladgryta/master
...
fixed 'derp' error on @NetworkMod
2012-08-14 01:16:29 -07:00
remuladgryta
2e236faec7
fixed java.lang.NoSuchMethodException
...
getServerHandlerSpecDefaultValue() and
getClientHandlerSpecDefaultValue() should no longer give derp exeption
2012-08-14 09:50:22 +03:00
LexManos
129c356ecf
FML will skip gathering MD5s for classes in the cpw package during the the inital recompile {Make Side/SideOnly reobf properly}
2012-08-13 21:53:52 -07:00
LexManos
d8316b0bdc
Merge remote-tracking branch 'origin/master'
2012-08-13 21:05:14 -07:00
LexManos
1d3a92f3f1
Updated FML install to provide better error output, Updated commands.py patch to disable recompile of server project.
2012-08-13 21:02:55 -07:00
Christian
81c858c719
Hopefully let build continue if server reobf fails, and fix derp in FMLNetworkHandler for entities
2012-08-13 23:25:08 -04:00
Christian
341041aedb
Fix up concurrent modification exception - ticks for players now occur on both sides
2012-08-13 22:55:23 -04:00
Christian
25256b2295
Merge the last bits of the server code into the common directory, and annotate ModLoader/BaseMod for sided use
...
This means the FML-Server project is now defunct as all code is either common, client or bukkit.
2012-08-13 22:51:53 -04:00
Christian
13874ba547
Actually fix the applet launch - it now launches properly *and* closes the window
2012-08-13 22:12:36 -04:00
Christian
bde58add62
Fix up relaunch of the applet
2012-08-13 21:44:43 -04:00
Christian
9112c63347
Change language loading a bit
2012-08-13 20:28:53 -04:00
Christian
78fa2b8d78
Update spritehelper bitmaps for items and terrain
2012-08-13 20:08:03 -04:00
Christian
6922c369f3
Tidy up some APIs, expose the addOverride mechanism. This should be pluggable by forge
...
but may need work to allow for each mod to have it's own override set
2012-08-13 19:57:40 -04:00
Christian
b0fd438a1d
Fix derp in LanguageRegistry
2012-08-13 16:45:47 -04:00
Christian
99f4f0c7d3
FMLModcontainer should not complain about annotations it has no idea about. so stfu fmlmodcontainer
2012-08-13 16:15:11 -04:00
Christian
b09c1cd242
Fix derp with EntityRegistry- bimap is not the right type for the name->container list
2012-08-13 15:55:24 -04:00
Christian
5ca3bf9362
Add in a sided variant of the packethandlers in the annotation - also, a bit more
...
explicit warning on when to register blocks - if you do it after pre-init, you'll
reset the achievements
2012-08-13 15:26:29 -04:00
Christian
c6a9884bde
Generate channel registration for client, also, do it before the login events so you can send packets
2012-08-13 11:58:44 -04:00
Christian
43825ca78e
Capture server packet handling errors into the FML log file for diagnostics
2012-08-13 11:52:30 -04:00
Christian
44eeadb211
one more change for the road :)
2012-08-13 01:24:02 -04:00
Christian
7011da5fa9
Don't spit debug all over the floor
2012-08-13 00:24:15 -04:00
Christian
c61ddfa9d1
updated conf, commands patch (missing newline?) and capturing the actual running
...
MC version and validating it at relaunch time is the correct MC version.
2012-08-13 00:17:34 -04:00
Christian
e64b6dcb13
Add in callableminecraftversion
2012-08-12 23:54:41 -04:00
Christian
183dc236e4
Entity AI accessibility, also AccessTransformer can make certain classes public now
2012-08-12 23:50:27 -04:00
Christian
ef5349dec2
Add in a simple packet dispatcher for sending packets around
2012-08-12 22:45:18 -04:00
Christian
b39afc0711
Add in a sided packet registry so that client vs server can vary
2012-08-12 22:23:03 -04:00
Christian
a8579b43ac
Fix double forge init on server
2012-08-12 20:34:23 -04:00
Christian
fa92eca328
Merge pull request #50 from Krapht/master
...
Fix for getNextAvailableRenderId() returning ids in use by vanilla - thanks krapht!
2012-08-12 06:55:23 -07:00
Krapht
42165df29f
Fixed getNextAvailableRenderId() returning ids in use by vanilla
2012-08-12 14:45:03 +02:00
LexManos
9860569536
Fix MCPMerger injecting Side/SideOnly when it already exists.
2012-08-12 04:27:36 -07:00
LexManos
7aa48a167f
Added patch verification to commands.py patch, and made it so MCP will check the original jars for the server, to prevent it from saying modified when it started out clean.
2012-08-12 02:49:39 -07:00
LexManos
6e3764da48
Add DEBUG constant to Access/Side Transformers to remove spam when not needed. Also AccessTransformer and MCPMerger should return a error code when it can not process causing MCP to stop decompile.
2012-08-12 01:23:10 -07:00
Christian
4d503d6925
Fix EntityRegistry - mods can specify update frequency, range and velocity data, and also
...
patch EntityTracker to actually track FML entities
2012-08-12 00:18:04 -04:00
Christian
8e04d40034
Fix NPE with no channels - always register FML
2012-08-12 00:17:07 -04:00
LexManos
cb57cd02e0
Added missing quotes around compile command.
2012-08-11 16:03:33 -07:00
Christian
22fe48e477
Fix up the network mod issue properly. Maintain a real cache of mod objects
2012-08-11 16:21:03 -04:00
Christian
204f73cb05
Remove profiler stuff - it's been deeply reorged. I'll look at re-adding it later
2012-08-11 14:12:39 -04:00
Christian
28096abea5
Fix up command patch to actually work
2012-08-11 14:12:23 -04:00
Christian
2d7eb5cb7f
Fix commands.py to always include the two side classes so the fml jars are valid.
2012-08-11 14:01:27 -04:00
Christian
e6d6932e21
Fix build script- put client in first
2012-08-11 13:05:37 -04:00
Christian
406e5d64c0
Put the marker on the server ML file too
2012-08-11 13:04:59 -04:00
Christian
13756aad9f
Fix universal not to dupe entries in the jar, also add in the fml mod as "untransformable"
2012-08-11 12:34:25 -04:00
Christian
c1a8b16f30
Fix up launch when obfuscated *sigh*
2012-08-11 12:24:43 -04:00
Christian
e3671285c3
Update netclienthandler patch.
2012-08-11 12:10:22 -04:00
Christian
b33cff3613
Fix NPE for server relaunch
2012-08-11 12:05:13 -04:00
Christian
afc2a4a75c
Fix up Package.getPackage(), also fix up loadcontroller construction
2012-08-11 11:44:55 -04:00
Christian
7c4583c87a
Add in Package.getPackage() support for sengir
2012-08-11 11:12:16 -04:00
Christian
f563815961
Lost of work to try and complete ML support - probably still bits missing, but mostly there
2012-08-11 11:02:09 -04:00
LexManos
0ce38f747c
Newlines in diff file
2012-08-11 02:27:19 -07:00
LexManos
efce8e916b
Add special case to add Side/SideOnly to difflist
2012-08-11 02:25:40 -07:00
Christian
44728c9f93
Fix up some network related stuff and optimize mod lookup a bit
2012-08-11 02:43:04 -04:00
Christian
d96a81e4f2
Fix up proxy injector to inject properly
2012-08-11 02:24:29 -04:00
LexManos
f11844374e
Fix decompile
2012-08-10 20:41:59 -07:00
Christian
8c63203bb4
Fix NPE on missing mods - still need to actually handle missing mods properly on client
2012-08-10 23:27:11 -04:00
Christian
751299d5f1
New downloader UI and new downloader backend - should be more robust now
2012-08-10 23:18:52 -04:00
LexManos
7d479bf854
Added -no_gen_conf to jenkins build
2012-08-10 20:09:47 -07:00
LexManos
c812a4ede5
Added some extra error prints, hopeully get something useful when installed in the client.
2012-08-10 18:54:06 -07:00
LexManos
a826283111
Updated conf merger script to just merge everything, and normalize the line endings so git doesn't complain.
2012-08-10 18:25:11 -07:00
Christian
f61f30c1e6
SidedProxy should work again - anywhere. Make sure it's on a static field though
2012-08-10 17:42:43 -04:00
Christian
8f76e8ba8b
More ticking hooks, and some other bits of clean up. Very close to "done" now.
2012-08-10 17:11:01 -04:00
Christian
537d89b9e0
Fix up modloader and clean up junk method
2012-08-10 16:42:21 -04:00
Christian
0927aaa0f1
A lot of missing patches to code re-added. Almost all functionality should now
...
be restored.
ModLoader compatibility is not yet assured, there are some wrapper classes that
need re-writing first
2012-08-10 16:39:03 -04:00
LexManos
d17aad797d
Readded common folder to startclient/server.
2012-08-10 12:38:59 -07:00
Christian
53e611a03a
Add in a registration method for gui handlers
2012-08-10 11:12:57 -04:00
Christian
7ac1be8a9a
Overwrote lex's command patch
2012-08-10 10:57:18 -04:00
Christian
dd7d70d619
Fix up MCP merger - it definitely works now - the game runs and runs well.
...
Fix up a couple of small network related issues.
Fix up the server launching fml properly.
2012-08-10 10:03:33 -04:00
LexManos
b9d1d1e2f4
Added common folder support to startclient/startserver
2012-08-09 20:34:16 -07:00
LexManos
2dc00adec8
Added some missing quotes that caused issues if your workspace had a space in it.
2012-08-09 20:01:51 -07:00
LexManos
b97e937f28
Add lib folder to installed eclipse
2012-08-09 19:02:28 -07:00
Christian
c54c4e73e6
Add in missing patch - also, launch FML properly from the server
2012-08-09 09:21:16 -04:00
Christian
93528597f4
Entity spawn adjustment - tracker
2012-08-09 08:40:32 -04:00
LexManos
a85bb7bfdb
Fix ModLoader compilation, and MCPmerger invocation for Forge.
2012-08-09 03:04:25 -07:00
LexManos
0f2d00abf3
Include conf folder and merge config in source zip
2012-08-08 23:44:32 -07:00
Christian
0e4c716177
Entity spawning - done
2012-08-09 01:58:14 -04:00
Christian
85b77c3d12
Generate a universal binary package since we can now :)
2012-08-09 01:57:42 -04:00
Christian
03884b1aaa
Merge branch 'MergingClientServer'
2012-08-08 22:58:33 -04:00
Christian
dbdc76e6ea
Reorganized all the current patches
2012-08-08 22:57:37 -04:00
Christian
b8aaed368b
Fix up annotation parser to parse arrays and enums
2012-08-08 22:10:56 -04:00
LexManos
6ec3379153
Added SideTransformer to strip side only functions/fields out.
2012-08-08 18:53:41 -07:00
LexManos
b177aad1ee
Stage 1 of merging the client and server for MCP.
...
Results:
Client: 362
Server: 3 (Only due to issues of FF decompilation inconsistancies)
Common: 910
Stage 2: Write runtime transformer to remove annotated fields/methods with invalid side annotation.
2012-08-08 05:48:06 -07:00
Christian
e050c7807d
Gui Handler ported from MC forge
2012-08-08 00:31:24 -04:00
Christian
f3f7398a8b
Revert dumb stuff with commands patch - lots of gfx patching
2012-08-07 23:11:37 -04:00
Christian
da4311dc74
Almost finished basic network stuff now
2012-08-07 20:41:37 -04:00
Christian
59471f6cac
Update some patches- more network work
2012-08-07 20:10:36 -04:00
Christian
d8b92064d7
Bunch of hooks re-added : network is more complete now, lot of basemod cleanup, moving stuff into
...
the registry area
2012-08-06 22:30:13 -04:00
Christian
8e96e60179
Fix location of forge in common handler - also some tweaks to modloader and other stuff
2012-08-06 17:27:21 -04:00
Christian
54877176a6
Network support - there's still some work to do and full id sync isn't done yet, but it has proper registration
...
semantics and hooks for 250 handling
2012-08-06 16:12:50 -04:00
Christian
a3ad32a3e5
Add in a lot of network handler stuff - also, expose the asm harvested data
2012-08-06 09:52:42 -04:00
Christian
602a4f219c
Remove some unneeded fields from the annotations
2012-08-05 02:24:02 -04:00
LexManos
f24977dc3d
Made empty constructor for ModMetadata public
2012-08-04 22:51:57 -07:00
LexManos
4607f9ebb0
Fix path trimming for copytree
2012-08-04 20:36:27 -07:00
Christian
672f4a03f2
Change property name to fml.modStates not fml.disabledMods- it makes more sense that way
2012-08-04 12:35:46 -04:00
Christian
f0736ade3d
Add in a bit of logging when events get sent to mod containers
2012-08-04 11:45:40 -04:00
Christian
4da48cea7a
Allow coremods to inject a modcontainer and run code
...
this will mean that FML is deliberately and very obviously incompatible with a modloader installation.
Fix up worldtype so that the server can run.
2012-08-04 11:31:06 -04:00
LexManos
1b02ea0677
Patch commands.py to support side '2' as common, as well as fix a few small errors in the update_patches and fml scripts.
2012-08-04 03:34:34 -07:00
LexManos
0d1bd4c5d0
Merged transformers/ to /common and renamed the asm source download to align better with the asm bin file name.
2012-08-03 23:51:49 -07:00
LexManos
3f08f1a94c
Change place commands.py backup is stored.
2012-08-03 23:24:58 -07:00
LexManos
1069366219
FML finish won't updatemcp automatically, easier integration with forge.
2012-08-03 17:36:16 -07:00
LexManos
0002bd2875
Fix packaging and install to not have the src/ folder, making it align better with the dev env.
2012-08-03 17:32:23 -07:00
LexManos
823077dd7d
Moved setting up eclipse to setup_mcp
2012-08-03 16:56:00 -07:00
LexManos
34971ff3e0
Fixed ant script to support common folder building and add the new files to the dist archives.
2012-08-03 03:37:45 -07:00
LexManos
965069ba3a
setup_fml's decompile will result in proper md5 files now {if there is no compiler issues}
2012-08-03 03:35:38 -07:00
LexManos
43766751a4
Removed FMLRegistry, and IMinecraftRegistry.
...
Updated server side to use the seperated registry classes like the client does.
Updated searge name references on server
Made StatBase.statName public using AccessTransformer
Server should compile now
2012-08-03 01:50:48 -07:00
LexManos
a92da71c6b
Fix MockBlock compile
2012-08-03 01:47:09 -07:00
LexManos
da47985361
Download argo/guava source references in install, and updated eclipse workspaces to reference them.
2012-08-02 23:36:00 -07:00
LexManos
68ae32c48c
Cleaned up commands.patch, removed debug print in fml.py
2012-08-02 21:14:06 -07:00
LexManos
3373e33d4b
Remove clientdrop, old reference files.
2012-08-02 20:32:51 -07:00
LexManos
2839e79ab0
Delete some dead files
2012-08-02 19:42:12 -07:00
Christian
5bffbfbe0d
Fix commands patch, WorldType patch and some ML compat stuff
2012-08-02 20:09:18 -02:30
Christian
4080338c1b
More fixes
2012-08-02 16:50:30 -02:30
Christian
e06e9393c1
More build fixes for jenkins
2012-08-02 10:33:29 -02:30
Christian
4bb9fd7226
Try and fix the jenkins build
2012-08-02 10:30:52 -02:30
Christian
7edc7d74d4
Change some event names, hook up the event code for server events for FML
2012-08-02 09:31:03 -02:30
Christian
9a5dac605c
Merge branch 'newfmlmod'
2012-08-02 08:52:11 -02:30
LexManos
c0a781c0bd
Introduced patching of runtime/commands.py to allow for usage of the src/common folder.
2012-08-02 00:51:51 -07:00
Christian
719bea515e
Change some stuff around - begin launching the server through the wrapper too.
...
A lot of patches went in - the client and server both launch and start up mods.
2012-08-02 02:08:30 -02:30
Christian
153eafdcb0
More stuff
2012-08-01 21:19:11 -02:30
Christian
2f588cf6ef
Fix classpath for Client, maybe?
2012-08-01 21:19:11 -02:30
Christian
3ad3c474b5
Line endings for this branch
2012-08-01 21:18:55 -02:30
Christian
73ba4b68be
A load of transformer accesses- also a few tweaks to the transformer, and linux support in the fml python
2012-08-01 18:59:45 -02:30
LexManos
b786d8909a
Rewrote patch generation and application to no longer need diff, and attempt to apply common patches on decompiles that don't have one side or the other.
2012-08-01 06:54:57 -07:00
LexManos
ab45ec9fa4
Updated eclipse projects to have src-common linked resources
2012-08-01 03:52:03 -07:00
LexManos
fcbe56b504
Modified the decompiler stage to:
...
Compile and run AccessTransformer during the pre-RG stage of decompilation.
Merge resulting sources that are identical to src/common
ToDo:
Finish the common intergration:
-update_patches - Add common folder support
-apply_patches:
--patch each side, also patch all common patches to each side incase they are not merged, only if file exists.
2012-08-01 03:25:45 -07:00
LexManos
693ec7ddf6
Add temp AccessTransformer config for FML
2012-08-01 03:18:31 -07:00
LexManos
61b83ab992
Discard old setup script
2012-08-01 03:18:02 -07:00
LexManos
6ce9b1ab05
Fixed AccessTransformer issue with trying to load files, instead of resources.
2012-08-01 03:17:36 -07:00
Christian
a5d58d79fc
Commit the start of some pluggable transformers
2012-07-31 09:46:45 -04:00
Christian
dac3249dc4
XP for smelting
2012-07-30 23:07:53 -04:00
Christian
99eddbfa13
Beginning the 1.3.1 update
2012-07-30 22:31:07 -04:00
Christian
ea1fc8f358
Add in the ability to create versioned dependencies for mod relationships
...
BaseMod versions are loaded too late so will never work as a versioned
dependency requirement, but can have versioned deps of others
2012-07-30 17:01:27 -04:00
Christian
bbb5a0e891
Fix up coremods with relaunch, add in a sample "coremod"
2012-07-30 11:34:30 -04:00
Christian
3f491fa7cb
Add in events for the method pre/init/post annotations so we can add in extra data during the event phase
2012-07-30 00:33:21 -04:00
Christian
ae007fcebc
Fix whitespace issue
2012-07-29 23:54:07 -04:00
Christian
8580a99728
Fix window sticking around - it doesn't anymore
2012-07-29 23:46:52 -04:00
Christian
3257d2595d
Add in "transform excluded" classes that we still need to take loading responsibility for
2012-07-29 23:30:37 -04:00
Christian
5434b3ca24
Added in some dialogs when things don't go so well
2012-07-29 22:55:53 -04:00
Christian
1ea6ba273b
New logging stuff, also the early plugin api for forge
2012-07-29 22:54:59 -04:00
Christian
039d9252c6
Merge branch 'minecraft1.3' into newfmlmod
2012-07-23 23:02:25 -02:30
Christian
ca67d6eb6d
Fix up mod classloading delegation
2012-07-23 22:54:36 -02:30
Christian
7179edfba7
Some patches to go along with the other changes
2012-07-23 22:51:16 -02:30
Christian
baec9785a2
More stuff as I roll out the changes
2012-07-23 22:50:37 -02:30
Christian
ae2039c65d
A bunch more fixes for FML mods
2012-07-23 16:33:17 -02:30
Christian
3f803653c4
Merge remote-tracking branch 'mainlap/newkeys' into newfmlmod
...
Conflicts:
client/cpw/mods/fml/client/FMLClientHandler.java
2012-07-22 20:30:42 -02:30
Christian
6ff67693b9
New key handling
2012-07-22 20:25:18 -02:30
Christian
5501d644b9
Check in a lot of recent work
2012-07-22 11:56:38 -02:30
Christian
276fccb170
Check in new fml mod work so far. Lots still to do.
2012-07-14 13:58:46 -04:00
LexManos
e2fac06f64
Cleaned up the install script for the source distrabution to setup the workspace properly, delete argo, and download all required dependancies.
2012-07-12 18:07:58 -07:00
LexManos
25def1ceaf
Added call to clean_source to build script to fix patch fuzz on windows.
2012-07-12 18:06:39 -07:00
LexManos
c0f70309dd
Fix Client-Clean project to use relative path to argo.
2012-07-12 18:06:01 -07:00
Christian
899c1f519c
Another bloody ticking fix. This should fix mods that use ML.setInGameHook(true,false) on the
...
server side to recieve ticks.
2012-07-08 22:06:11 -04:00
Christian
5c1363150e
Fix up mod classloading delegation
2012-07-06 15:59:16 -04:00
Christian
4153584392
Fixes
2012-07-06 10:42:49 -04:00
Christian
2858731063
Incorporate server patches into client
2012-07-06 10:29:17 -04:00
Christian
874a0c32e0
Remove two places that are unpatchable now
2012-07-06 09:52:21 -04:00
Christian
4f845befaa
Server repatching
2012-07-06 09:44:00 -04:00
Christian
95194f1c5b
Add a "checkpatches" target and check if your patches are up to date before running a repatch operation
2012-07-06 09:19:58 -04:00
Christian
df6bbaa7c5
Launch through the applet launcher too
2012-07-06 01:04:33 -04:00
Christian
b1ca21a161
Some patches for the server
2012-07-05 22:31:46 -04:00
Christian
bc42a54a51
Lots of client patch fixup
2012-07-05 18:13:47 -04:00
Christian
1555bd8c53
Update git ignore to ignore a fernflowerzip that's lying around
2012-07-05 15:38:37 -04:00
Christian
649e3e7bc5
And we have a brand, "fml". We're definitely modded :)
2012-07-05 15:36:31 -04:00
Christian
ead4e5255e
UnexpectedThrowable is now the much more awesome CrashReport!
2012-07-05 15:35:38 -04:00
Christian
5eafb71083
Merge branch 'master' into minecraft1.3
...
Bring some of the ticking fixes in
Conflicts:
client/cpw/mods/fml/client/FMLClientHandler.java
patches/minecraft_server/net/minecraft/server/MinecraftServer.java.patch
2012-07-05 15:30:21 -04:00
Christian
8ed36f583d
Got the relauncher downloading and injecting library files
2012-07-05 15:23:37 -04:00
Christian
3e311fd4c1
Tweak ticking YET AGAIN. Should fire a solitary GUILOAD tick right as the game screen loads.
...
Hopefully fixes worldload tick issue too
2012-07-04 00:16:30 -04:00
Christian
a4ce90a918
FFS let this fix that bloody ticking mess that is ML compatibility.
2012-07-03 23:03:51 -04:00
Christian
ba46389a87
Separate gui ticking completely. send it as if it's a world tick. ML gui ticks are epically dumb.
...
Fix Worldload being filtered from the trigger arming.
Also, improve errors going to an error screen. There should be more information now.
2012-07-03 22:39:35 -04:00
Christian
f7e07ca7d8
Change gui ticking and world load tick. Should close issue #40 and kill it deader
...
than a very very dead thing. *$^*(#% Modloader ticking b#%$hit
2012-07-03 21:37:54 -04:00
Christian
3e80a9ee7d
Merge branch 'master' into minecraft1.3
2012-07-03 08:15:58 -04:00
Christian
dfc6f7b1c1
Tweak build xml for more cleanliness
2012-07-03 08:14:35 -04:00
Christian
753f5f7bc8
Merge branch 'antscriptupdates'
2012-07-02 23:50:49 -04:00
Christian
982271e8ec
Update some stuff
2012-07-02 23:49:40 -04:00
Christian
802ec3d86a
Merge branch 'antscriptupdates' into minecraft1.3
2012-07-02 23:49:06 -04:00
Christian
f1b0e33694
Add in more options for ant script and clean up needing to clean every time.
2012-07-02 23:43:29 -04:00
Christian
1d64fb01bd
Merge branch 'testrecover'
2012-07-02 20:19:23 -04:00
Christian
086f575a41
Merge branch 'antscriptupdates' into minecraft1.3
2012-07-02 15:56:33 -04:00
Christian
3cda115cd5
Merge branch 'antscriptupdates'
2012-07-02 15:55:24 -04:00
Christian
d491502750
Some more fixes to the ant stuff: apply patches now happens at the right time, I grab fernflower as part of
...
setup and added an updatepatches call too
2012-07-02 15:54:25 -04:00
Christian
1d4c33d161
Merge branch 'antscriptupdates' into minecraft1.3
...
Conflicts:
build.xml
2012-07-02 15:21:15 -04:00
Christian
47a879a961
Merge branch 'antscriptupdates'
2012-07-02 15:17:32 -04:00
Christian
b59184424b
Add in a setupenvironment ant target specifically for setting up an FML environment from scratch
2012-07-02 15:16:40 -04:00
Christian
a7803d1785
Harvest MC version from MCP
2012-07-02 13:31:45 -04:00
Christian
5415bf87ce
fix sided proxy bukkit test (not used so not a biggie)
2012-07-02 12:32:41 -04:00
Christian
a33f2dde77
Harvest MC version from MCP
2012-07-02 12:24:37 -04:00
Christian
bb7ef791de
Initial checkin. Some patches are probably missing, but client compiles.
2012-06-29 20:18:04 -04:00
Christian
aa1a5d3c19
Working simple scheduled ticking, Player ticks
2012-06-28 23:37:30 -04:00
Christian
a53d8c926e
Support tick spacing through new IScheduledTickHandler
2012-06-28 17:10:35 -04:00
Christian
714cd8d8df
Change TickType.WORLD to send the world as arg[0] to match the server.
2012-06-28 14:24:34 -04:00
Christian
c9f7444d06
And there are not 1000 seconds in a second
2012-06-28 08:31:32 -04:00
Christian
ea05777032
Seconds are 1000 milliseconds long. Not 1 millisecond long.
2012-06-28 08:27:21 -04:00
Christian
14fea4a3a3
Tweak profiler command on bukkit
2012-06-28 08:21:24 -04:00
Christian
0613858855
Fix up a derp in the timing command
2012-06-27 22:13:55 -04:00
Christian
6687ed360b
Fix code to use guava 10 only. Stupid bukkit plugins and daft dependencies on guava 10!
2012-06-27 08:23:53 -04:00
Christian
409506d2b2
Tweak for end profiling
2012-06-26 23:37:54 -04:00
Christian
b96d6e00c3
Add in simple profiler for bukkit
2012-06-26 23:16:23 -04:00
Christian
b6ae926fd3
Add in a mechanism to get the modcontainer for a mod - so things can be programmatically changed
2012-06-26 16:24:50 -04:00
Christian
508c986166
Add in bukkit support for recipe change
2012-06-26 15:40:30 -04:00
Christian
725201040e
Add in a new recipe handler registry method for ease of adding recipes to MC
2012-06-26 15:29:34 -04:00
Christian
70d7c8fc68
Update tester mod
2012-06-22 09:30:47 -04:00
Christian
05f9861da4
Fix ticking for GUI ticks too!
2012-06-22 09:30:27 -04:00
Christian
c588750c96
Fix dependency string processing error
2012-06-22 06:21:04 -04:00
Christian
d00e229198
ModSorting test case
2012-06-21 21:56:16 -04:00
Christian
be1a80ebbd
Fix ticking properly - ML world ticks now fire once, properly
2012-06-21 18:11:40 -04:00
LexManos
44706ae343
Added stupididty exception for common issue with getMinecraftLogger.
2012-06-21 03:17:33 -07:00
Christian
2af41e7c8c
Rename unused ML prop config files if they exist (to .bak) and
...
skip generating if not needed
2012-06-20 21:17:32 -04:00
Christian
e5c29a75de
Update bukkit with changes
2012-06-20 12:36:48 -04:00
Christian
2a36dc64bd
Revert "Test failing build"
...
This reverts commit 744febc38e915a12c388fe01ba6715d31b6b6ee2.
2012-06-20 08:44:49 -04:00
Christian
dd128c8502
Revert "Revert "Fail the build when recompilation fails""
...
This reverts commit c2d920d738a294462338fbe955c62a0f4034304c.
2012-06-20 08:44:08 -04:00
Christian
3812dc4464
Revert "Fail the build when recompilation fails"
...
This reverts commit 482e3be3c9a96df8cefad81d78c7a4e83ad898b4.
2012-06-20 08:39:11 -04:00
Christian
851038679a
Test failing build
2012-06-20 08:35:47 -04:00
Christian
146ee9b3c7
Fail the build when recompilation fails
2012-06-20 08:35:14 -04:00
Christian
6c42a77411
Fix huge bug/typo in basemodticker that stopped ticks getting sent
2012-06-20 08:03:57 -04:00
LexManos
7e24034fcc
Fix compilation error, Protip: Don't use java7 things when compiling for java6, and Don't report successful build on compilation errors cpw.
2012-06-20 02:14:07 -07:00
LexManos
e6eb550bfd
Remove cr's from modinfo descriptions, they print oddly in Minecraft.
2012-06-19 19:58:48 -07:00
LexManos
2dbb374869
Print mod metadata info errors if we are in MCP.
2012-06-19 19:55:28 -07:00
LexManos
e5efbea2ab
Should fix concurent modification exceptions when using removeSpawns
2012-06-19 19:44:52 -07:00
LexManos
bc74a16149
Remove some eclipse preference files
2012-06-19 19:44:07 -07:00
LexManos
4cd6c58159
Update gitignore to ignore some eclipse preference files.
2012-06-19 19:43:46 -07:00
LexManos
9e6fbea698
Merge pull request #29 from ScottKillen/master
...
Fixed WorldType to allow custom WorldTypes
2012-06-19 19:22:06 -07:00
LexManos
e796630120
Added EntityRendererProxy class for compatibility with ModLoader mods that rely on it's existance.
2012-06-17 19:30:10 -07:00
Christian
cad5ce54dc
More ticking cleanup
2012-06-17 18:53:49 -04:00
Christian
3c3e4ca2ff
Remove WorldLoad tick from modloader mods- too early. *sigh*
2012-06-17 18:49:19 -04:00
Christian
b9b90c6eef
Make sure to reset the clock trigger
2012-06-17 18:41:54 -04:00
Christian
747c6131bf
Force all client modloader ticks to occur at render end
2012-06-17 18:41:05 -04:00
Scott Killen
5c65939330
Client
...
======
Added hook in GuiCreateWorld to allow WorldType to present GUI on world creation.
2012-06-17 15:05:16 -04:00
Scott Killen
cddcd9ffb3
**Client**
...
* Delegated World.func_46068_G() (getHorizon), which depends on WorldType, to the WorldType class per LexManos' suggestion
2012-06-17 00:04:50 -04:00
Scott Killen
1295c3863e
Client
...
======
- Fixed WorldType to allow custom WorldTypes in world creation GUI.
- Deprecated client WorldType.getSeaLevel() and renamed it with the more accurate name of getMinimumSpawnHeight.
- Changed related reference WorldProvider.
Server
======
- Fixed WorldType to allow custom WorldTypes
- Added methods to WorldType giving it the exact abilities of client WorldType
- Adjusted WorldProvider so that it relies on WorldType the same way it does on client.
2012-06-16 23:31:17 -04:00
Christian
99ce6e2dee
Merge pull request #27 from TheNoid/master
...
Make FML logs use system line endings …
2012-06-14 12:06:19 -07:00
Dion Williams
a9d4a15a4f
Make FML logs use system line endings for consistency with Java stack traces in the logs.
2012-06-14 18:01:35 +01:00
LexManos
2fbf60a846
Server side fix for invalid parameter to onCrafting
2012-06-13 20:02:35 -07:00
LexManos
1838344b07
Proper fix for scroll list not covering all of the hidden scroll items.
2012-06-13 19:59:54 -07:00
Christian
fd6aacd0fe
Merge pull request #26 from GenuineSounds/patch-2
...
Incorrectly passing the IInventory of the extraction slot instead of the...
2012-06-13 18:52:46 -07:00
Christian
4b142cbdcc
Merge pull request #25 from GenuineSounds/patch-1
...
Having the string trimmed to 9 made most long strings show a couple of p...
2012-06-13 18:50:26 -07:00
Brian Wiegand
802425b4d5
Incorrectly passing the IInventory of the extraction slot instead of the crafting matrix, get back to me on why it's doing this instead of the default behavior of ModLoader and Forge.
2012-06-13 15:17:33 -07:00
Brian Wiegand
745d388cb0
Having the string trimmed to 9 made most long strings show a couple of pixels at the very top and very bottom. ie
...
https://dl.dropbox.com/u/79514/2012-06-13_13.25.35.png
2012-06-13 14:09:07 -07:00
LexManos
1f52ee1dea
Fixed KeyBinding issue with ModLoader container, if you register a KeyBinding twice it will discard the old one. And fixed issue where getVersion() could return null causing NPE.
2012-06-10 17:19:05 -07:00
LexManos
1af7d7970a
Made it so it will attempt to scale any Texture Effects that return data for smaller texture resolutions. Made the size descrepancy only a error for ITextureFX texture effects.
2012-06-10 05:56:52 -07:00
Christian
201edc0249
Fix up "errored" mod states so they actually read as errors
2012-06-09 11:07:07 -04:00
Christian
2f4a572a23
Fix up bukkit for biome code
2012-06-09 10:47:43 -04:00
Christian
0cf8cca248
Fix up biome handling for client and server
2012-06-09 10:27:24 -04:00
Scott Killen
af4a2589a6
- Fixed client crash bug in add/remove Biome functionality. Arrays.asList() returns a fixed-sized list per java spec. Adding and removing biomes throws UnsupportedOperationException.
...
- Fixed same on server and added disabled removeBiome functionality. This touched a lot of classes as the nonWorking removeBiome seemed to be lots of places inconsistent with addBiome.
2012-06-09 07:59:35 -04:00
Christian
2d55491692
Tweak error handling - report the exception that caused the bailout
2012-06-08 15:31:30 -04:00
Christian
1007720589
Fix parameter ordering in ticks
2012-06-08 15:22:40 -04:00
Christian
b2f470464a
Update bukkit for world gen tweaks
2012-06-07 19:47:11 -04:00
Christian
683c99c8b6
Change world generation to expose a mod interface
2012-06-07 19:44:03 -04:00
Christian
428cf691f1
Update bukkit for early load change
2012-06-07 19:28:07 -04:00
Christian
bfe54ef7e7
Attempt early initialization of Minecraft Forge
2012-06-07 19:25:49 -04:00
Christian
40dff18025
Update bukkit handler
2012-06-07 17:57:07 -04:00
Christian
4d620d91e4
Add in a server side WORLDLOAD tick
2012-06-07 17:54:43 -04:00
Christian
a502e1fc56
Fix ticking- need to register the basemod tickhandler *sigh*
2012-06-07 16:31:23 -04:00
Christian
4f0c220d99
Fix ticking for new name "GAME" vs "WORLD"
2012-06-07 16:21:01 -04:00
Christian Weeks
08a4b21460
Update bukkit handlers
2012-06-07 14:03:42 -04:00
Christian Weeks
9fd6f89fc3
Reorganize basemod ticking to use ITickHandler. Introduce "GAME" tick vs "WORLD" tick for
...
mods that want to tick per world and "globally"
2012-06-07 13:53:16 -04:00
Christian Weeks
11652d597f
Expose a "clean" ticking interface and fix server tick loop for world ticks
2012-06-07 11:12:51 -04:00
Christian Weeks
f943cd9b4b
Tweak width of description
2012-06-07 08:39:22 -04:00
LexManos
1e392e0bb3
Fix for in game tick running when it shouldn't. Fixed some tabbing issue in crazy's PR.
2012-06-06 08:01:54 -07:00
LexManos
e536c58f81
Interm implementation of keyboardEvent for ModLoader.
2012-06-06 01:43:49 -07:00
LexManos
63c02cbe35
Add static log() functions to the RenderAccessLibrary, and fixed up the logo rendering to better display the images.
2012-06-05 18:49:07 -07:00
Christian
d9a8392723
Merge pull request #14 from crazyputje/master
...
onTickInGUI fix. Thanks crazyputje!
2012-06-04 14:41:59 -07:00
crazyputje
ae52b91d13
removed 'if (client.theWorld != null)' so it also ticks in the main menu
2012-06-04 20:36:57 +03:00
Christian Weeks
370062cc55
Helps to have a retention policy
2012-06-02 22:41:50 -04:00
Christian Weeks
43eae28f55
Helps to have a retention policy for runtime annotations
2012-06-02 22:40:45 -04:00
Christian Weeks
c2c27044b5
Add in bukkit proxy handler
2012-06-02 22:14:25 -04:00
Christian Weeks
09722f3ffc
More proxy code
2012-06-02 22:12:15 -04:00
Christian Weeks
2cf960b64d
Introduce a proxy side loader for mod use
2012-06-02 22:12:15 -04:00
LexManos
05b31bdd6e
Fixed GuiModList Logo rendering to allow for logos of different sizes to be rendered properly. Logos will render themselves full underneath the text, It is the modder's job to make it look good.
2012-06-02 18:05:57 -07:00
Christian Weeks
e115807351
Update credits information
2012-06-02 11:45:47 -04:00
Christian Weeks
f5b29d2726
Update readme for the client side
2012-06-02 11:44:26 -04:00
Christian Weeks
dfac296402
Update bukkit handler to inject names at startup
2012-06-02 11:03:20 -04:00
Christian Weeks
9e2117c955
Merge remote-tracking branch 'origin/master'
2012-06-01 23:25:18 -04:00
Christian Weeks
4fdf2ea290
Fix up optifine detection properly
2012-06-01 23:23:50 -04:00
Christian Weeks
10fb465525
Update bukkit handler
2012-06-01 23:10:38 -04:00
Christian Weeks
d44822b7d0
Slight reorganization of texture ticking - accomodate optifine
2012-06-01 23:07:32 -04:00
Christian Weeks
18a35c1ab7
Add in optifine visibility for the mod list. Will search for an "optifine_mod.info" file on the
...
class path if sp614x wants to add one to optifine.
2012-06-01 14:55:49 -04:00
Christian Weeks
26cf077cfa
Fix ticking on bukkit server
2012-06-01 11:08:32 -04:00
Christian Weeks
c3379b44dd
Fix ticking on the server
2012-06-01 11:07:14 -04:00
Christian Weeks
3ad305aa06
Implement missing language load hook for server
2012-06-01 10:22:08 -04:00
Christian Weeks
89d74da576
Tweaks to basemod setup
2012-06-01 00:33:51 -04:00
Christian Weeks
9ad4177bfa
Bukkitside fixup
2012-06-01 00:27:46 -04:00
Christian Weeks
20c830c848
Merge branch 'bukkitreorg'
2012-05-31 23:07:16 -04:00
Christian Weeks
877bb029f9
Merge branch 'bukkit'
...
Conflicts:
common/cpw/mods/fml/common/IWorldGenerator.java
common/cpw/mods/fml/common/registry/FMLRegistry.java
common/cpw/mods/fml/common/registry/IMinecraftRegistry.java
common/net/minecraft/server/CommonRegistry.java
common/net/minecraft/server/IMinecraftRegistry.java
common/net/minecraft/src/CommonRegistry.java
common/net/minecraft/src/IMinecraftRegistry.java
2012-05-31 23:00:06 -04:00
Christian Weeks
cfb5cb1a2f
Fix copied code. Derpbag.
2012-05-31 22:48:44 -04:00
Christian Weeks
245f562e1c
Update FML with recent mainline changes
2012-05-31 22:48:44 -04:00
Christian Weeks
68dc92f0e1
Update bukkit with new mod fixes
2012-05-31 22:48:44 -04:00
Christian Weeks
ee4089304a
Damn you bukkit with your same names for different classes!!!! EntityPlayer->EntityHuman
2012-05-31 22:48:44 -04:00
Christian Weeks
f3dfa1a955
Fix chunk generators for bukkit
2012-05-31 22:48:44 -04:00
Christian Weeks
2320e42163
Bukkit version
2012-05-31 22:48:44 -04:00
Christian Weeks
bcc35775f4
Merge branch 'bukkit' - massive code reorganization for fml 2.0
...
Conflicts:
common/cpw/mods/fml/common/IWorldGenerator.java
common/cpw/mods/fml/common/registry/FMLRegistry.java
common/cpw/mods/fml/common/registry/IMinecraftRegistry.java
common/net/minecraft/server/CommonRegistry.java
common/net/minecraft/server/IMinecraftRegistry.java
common/net/minecraft/src/CommonRegistry.java
common/net/minecraft/src/IMinecraftRegistry.java
2012-05-31 22:45:19 -04:00
Christian Weeks
3239536832
More tweaks for proper API
2012-05-31 22:42:23 -04:00
Christian Weeks
9c1c414ca7
Reorganize for bukkit integration
2012-05-31 22:09:45 -04:00
Christian Weeks
20e5963059
Fix project, new gui layout with screenshot, thanks Sengir!
2012-05-30 09:25:04 -04:00
Christian Weeks
70c57e2ad6
Add in missing hooks, add branding information to the crash report
2012-05-27 07:14:35 -04:00
LexManos
4639786521
Fixed regex issue in last push.
2012-05-27 01:40:22 -07:00
LexManos
71e873ed1f
Fixed up for newline before case bodies.
2012-05-27 01:24:45 -07:00
LexManos
c416a82e64
Should fix windows {me} generating different patches then linux {cpw}
2012-05-27 00:22:27 -07:00
Christian Weeks
539252053f
Move first tick to the real first tick
2012-05-26 02:30:21 -04:00
Christian Weeks
da791ef721
Merge in the mod texture changes from Lex
2012-05-26 02:29:35 -04:00
LexManos
49bca8998a
Fixed location refs to fmlversion.properties
2012-05-25 23:25:05 -07:00
Christian Weeks
6e14c67e82
Add in a static render access class for optifine and other render editing mods to use
2012-05-25 22:13:51 -04:00
Christian Weeks
7fddb9d59e
Add in a "world load" tick fired just as the world completes loading. This SHOULD fix millinaire.
2012-05-25 17:21:30 -04:00
Christian Weeks
006112f3d3
Changing up the mod list data
2012-05-25 15:25:35 -04:00
LexManos
e075a430e2
Fixed up ModTexture* classes to use the ITextureFX events to resize the image as needed. Also fixed ModTextureStatic's not being applied properly.
2012-05-24 22:48:15 -07:00
Christian Weeks
134299b413
Fix up two stupid overwrites in my mergeup from lex
2012-05-24 23:18:04 -04:00
Christian Weeks
03059c5cd2
Fix derp in MTS
2012-05-24 22:13:33 -04:00
Christian Weeks
918d9d8687
Patch fixing
2012-05-24 21:40:34 -04:00
Christian Weeks
5017f8b038
Update some stuff for updated tweaks
2012-05-24 21:39:16 -04:00
Christian Weeks
78052d2ce2
Update FMLClient with my changes
2012-05-24 21:33:43 -04:00
Christian Weeks
8a6b10607d
my tweaks
2012-05-24 21:06:27 -04:00
LexManos
034117e253
difflist should include server and client now.
2012-05-24 03:48:59 -07:00
LexManos
a3ddd6140b
Some patch cleanup.
2012-05-24 02:18:20 -07:00
LexManos
ac292296fe
Rewrote how HD Texture support worked, to make it easier for Optifine to integrate.
...
Fixed TextureFlamesFX for extramly large texture sizes.
Fixed the texture size sceme to allow for different sizes of textures in the same pack.
2012-05-24 01:35:37 -07:00
LexManos
d50a66c8ba
Line number changed..
2012-05-24 01:33:50 -07:00
Christian Weeks
fb4d3b2ca9
Fix up the watch
2012-05-18 20:42:12 -04:00
Christian Weeks
fcdd2a9176
And some tweaks to the texture handling
2012-05-18 20:17:07 -04:00
Christian Weeks
fa921f0aa9
Fix up some fubars in MTS and MTA
2012-05-18 20:16:41 -04:00
Christian Weeks
ac221275d9
Lots of error handling.
2012-05-18 10:38:40 -04:00
Christian Weeks
33f8b158a9
Missed a patch *sigh*
2012-05-17 21:57:24 -04:00
Christian Weeks
b9b33ebe79
Add simple API to allow mods to let their textures be overriden by other mods
2012-05-17 21:47:12 -04:00
Christian Weeks
a23816134b
Because, of course, I broke the first build...
2012-05-17 20:27:24 -04:00
Christian Weeks
4e8e84244b
Some logging of texture overrides- also, only unregister if it's an actual ModTextureStatic, not if it's a subclass.
2012-05-17 15:39:04 -04:00
Christian Weeks
a94316cc9e
Derpy exceptions derpy exception handling
2012-05-17 15:19:25 -04:00
Christian Weeks
01a1bc9e6a
Remove the dependency in RenderEngine, decided on the simple API for texture FX
2012-05-17 15:11:21 -04:00
Christian Weeks
d2b69b2b08
Tweak the render patch- we won't fail if the updateTexture call fails
2012-05-16 00:34:50 -04:00
Christian Weeks
91fbba3873
Update patches: add in a setup for most of the texturefx classes
2012-05-16 00:01:12 -04:00
Christian Weeks
a4f3bc853a
Tweaking texture loading
2012-05-16 00:00:52 -04:00
Christian Weeks
b7ece58caa
Fix tileSize -> iconTileSize. Stupid MCP
2012-05-15 22:34:17 -04:00
Christian Weeks
fe354c867d
Catch throwable (NoClassDefFoundError) and don't abort loading- it's probably a badly named class file.
2012-05-15 22:23:00 -04:00
Christian Weeks
326d52f534
Fix some derpy
2012-05-15 22:18:41 -04:00
Christian Weeks
fbd9ac7d95
Update patches for hd textures
2012-05-15 22:10:38 -04:00
Christian Weeks
96018996fc
Change hd texture handling
2012-05-15 22:05:24 -04:00
Christian Weeks
9b205b1355
Refresh the renderengine patch- catch and log some texture pack reload errors
2012-05-15 16:21:40 -04:00
Christian Weeks
56f915eb66
More mod list fixes
2012-05-15 16:19:46 -04:00
Christian Weeks
46f8868961
Lots of cleanup on the mod list, pretend we're the mcpatcher for mod HD detection.
2012-05-15 15:52:19 -04:00
Christian Weeks
15089f9d87
Fix up fubar in worldprovider. Add in obfuscation detection. Capture the exception that crashes minecraft in the log file.
2012-05-14 18:21:35 -04:00
Christian Weeks
4783bfe01d
ModLoader worldtype hackery compatibility
2012-05-14 16:21:05 -04:00
Christian Weeks
7b894946bf
Fix derp
2012-05-14 14:16:50 -04:00
Christian Weeks
a01e513822
Only log the warning once per texture
2012-05-14 13:20:50 -04:00
Christian Weeks
3061fd3d8f
push patches
2012-05-14 12:22:46 -04:00
Christian Weeks
9b281f0a3c
Fix millinaire support. Fix Portal eating rendering time. add in profile visibility for mod stuff.
2012-05-14 11:38:54 -04:00
Christian Weeks
e433708056
Fix the serverside. FUUUUUUUU!
2012-05-14 01:45:56 -04:00
Christian Weeks
43eae51bb3
HD patching complete? Clean up mod info data, Dummy field for dummy mods
2012-05-14 01:39:21 -04:00
Christian Weeks
72edbe596e
Improving the scroll list, HD texture patches
2012-05-13 02:46:39 -04:00
Christian Weeks
53b5533936
Actually pass in the mod name
2012-05-12 02:25:15 -04:00
Christian Weeks
84c86fd475
Fix up incorrect dependency handling
2012-05-12 02:10:50 -04:00
Christian Weeks
a9d644e1e8
Fix stupid problem with braces
2012-05-12 01:06:58 -04:00
Christian Weeks
7ed6c7bd7f
Tick only when there's a world
2012-05-12 01:03:36 -04:00
Christian Weeks
3fd23cee0f
Fix nulls in the mod list, start building the gui screen
2012-05-12 00:47:04 -04:00
Christian Weeks
0665c93c2b
Gui related ticking
2012-05-12 00:00:33 -04:00
Christian Weeks
cd741d961e
Try always loading the language data
2012-05-11 23:37:58 -04:00
Christian Weeks
ea855f82b4
Always load the "en_US" langpack into the translation table first, then the actual language.
2012-05-11 22:20:09 -04:00
Christian Weeks
d775f42703
Derpy derp- fix stupid pointless cast
2012-05-11 17:41:33 -04:00
Christian Weeks
0981d3106d
Fix missing ml.sendpacket, call in renderers
2012-05-11 17:31:28 -04:00
Christian Weeks
a20c7f6f76
Actually mark the sprite as used when you allocate it!
2012-05-11 16:49:21 -04:00
Christian Weeks
cf9b57d9fa
Helps to add the new hook!
2012-05-11 16:30:23 -04:00
Christian Weeks
7deedb26f5
Hook texture pack changes and loads so we can register override textures
2012-05-11 16:23:26 -04:00
Christian Weeks
4c2c7cb2f3
Fix problem with nulls in getModList
...
Work on the meta information file
2012-05-11 15:18:26 -04:00
Christian Weeks
7ec180ee7c
More tweaks to stuff: mod list, branding, more hooks
2012-05-11 01:45:36 -04:00
Christian Weeks
b1ee6c3c95
Tidying up and more hooks
2012-05-10 21:30:06 -04:00
Christian Weeks
a36fccc9b0
Tweak block rendering organization. Add in worldgen for client.
2012-05-10 19:51:15 -04:00
Christian Weeks
36b05d9378
Tidy up a lot of code- ModLoader and BaseMod are now almost identical client and server side
2012-05-10 18:54:25 -04:00
Christian Weeks
2b8ac71253
Tweak ordering for sorting- should be a stable sort now
2012-05-10 15:48:26 -04:00
Christian Weeks
1ffb096508
Update git version capture
2012-05-10 13:01:39 -04:00
Christian Weeks
7a66d88e9f
Ignore jenkins tags
2012-05-10 12:53:27 -04:00
Christian Weeks
42c5b9534a
Tweak some build stuff for versioning
2012-05-10 12:24:17 -04:00
Christian Weeks
0b1f3b51e3
Update build to actually put Loader in...
2012-05-10 11:16:58 -04:00
Christian Weeks
6646b573e8
tweak location of build properties in src jar
2012-05-10 10:09:56 -04:00
Christian Weeks
201762ee50
Lots of tweaks to mod output pretty printing. new versioning scheme.
2012-05-10 09:42:31 -04:00
LexManos
99ee905038
Inventroy rendering
2012-05-10 01:25:56 -07:00
LexManos
d2afbd9216
Fixed up the ModLoader render block hook, RP's blocks now render.
2012-05-10 01:00:07 -07:00
LexManos
5f49c5f646
Should fix colliding model ids with MC's internal IDs
2012-05-09 23:38:01 -07:00
Christian Weeks
d91c22ea24
Fixes
2012-05-10 02:01:23 -04:00
Christian Weeks
4c9745f73c
Fix up build script a bit, all modloader is public, and fix tile entity renderer
2012-05-10 00:07:46 -04:00
Christian Weeks
edb0ba811f
Add in some more stuff for handling key bindings, rendering
2012-05-07 17:44:49 -04:00
Christian Weeks
a1ca27b997
Reorganize ticking a bit
2012-05-07 01:39:55 -04:00
Christian Weeks
285d187884
Separate sprite handling, fix worldtype
2012-05-07 01:26:21 -04:00
Christian Weeks
351c193b98
Working on the ticking stuff
2012-05-07 00:54:18 -04:00
LexManos
8586d8ae85
more client side hooks and Texture overrides/animations.
2012-05-06 16:32:59 -07:00
Christian Weeks
1a40f433a5
Halfway through ticking- won't compile
2012-05-06 00:58:40 -04:00
Christian Weeks
6c6f792c6b
ModLoader moves forwards
2012-05-05 20:33:40 -04:00
Christian Weeks
149fa8a577
Let's get hooking!
2012-05-05 19:52:53 -04:00
Christian Weeks
f279476684
API is restored for client side. Implementation starting.
2012-05-05 14:42:46 -04:00
Christian Weeks
0ca8ace988
And some patches for that
2012-05-04 17:04:18 -04:00
Christian Weeks
80f87ef569
The beginning
2012-05-04 17:02:12 -04:00
Christian Weeks
904efdd4d8
Introduce the client side FML
2012-05-03 19:40:55 -04:00
Christian Weeks
874d3f0b17
Implement addBiome, hopefully. Pushes biome list to the WorldType field. Sorry Bioxx.
2012-05-03 14:05:13 -04:00
Christian Weeks
603005ba18
Check in some eclipse crapola.
2012-05-03 14:04:16 -04:00
Christian Weeks
6b286543d4
Fix copied code. Derpbag.
2012-04-28 16:47:04 -04:00
Christian Weeks
28992c6f13
Update FML with recent mainline changes
2012-04-28 16:40:25 -04:00
Christian Weeks
174e208369
Merge branch 'master' into bukkit
2012-04-28 16:35:15 -04:00
Christian Weeks
c632d5145e
Fix a small issue with the build output script
...
Fix a significant issue with MLProp handling and primitives- they work now
2012-04-26 17:38:31 -04:00
Christian Weeks
f3bee8c070
More text fixup
2012-04-19 23:07:07 -04:00
Christian Weeks
8bfeb5ac21
Typos
2012-04-19 22:54:10 -04:00
Christian Weeks
05dc6f8e4b
Add in detection for MLMP and try to fail with a graceful message.
2012-04-19 22:40:59 -04:00
Christian Weeks
2eb77acf73
Update bukkit with new mod fixes
2012-04-18 14:06:54 -04:00
Christian Weeks
f7cec9be38
Merge branch 'master', remote-tracking branch 'origin' into bukkit
2012-04-18 14:04:39 -04:00
Christian Weeks
8f8ee60eb1
Tweak the loader a little bit to just use file names, not fully qualified directories when referring
...
to mods.
2012-04-18 14:03:30 -04:00
Christian Weeks
8f14c7321b
Damn you bukkit with your same names for different classes!!!! EntityPlayer->EntityHuman
2012-04-16 01:00:06 -04:00
Christian Weeks
aedb80c251
Fix chunk generators for bukkit
2012-04-15 22:42:06 -04:00
Christian Weeks
e7224c7bda
Merge branch 'master' into bukkit
2012-04-15 21:58:18 -04:00
Christian Weeks
cceeb88c6d
Bukkit version
2012-04-14 23:01:03 -04:00
Christian Weeks
65f39a50c1
Fix "soft" dependencies so they can exist properly
2012-04-14 10:01:55 -04:00
Christian
0a52ed381d
Fix server patch
2012-04-10 23:05:22 -04:00
Christian
78f2e8f38a
Merge in fixes from chickenbones for tick related problem
...
and straighten out variable naming in ModLoaderModContainer
2012-04-10 22:22:13 -04:00
Christian Weeks
9fdc403396
Push the patched file, as well
2012-04-09 10:24:58 -04:00
Christian Weeks
9c3a2f052d
Add in more "Player" related events. Fix up some MLProp stuff
2012-04-09 10:18:24 -04:00
Christian Weeks
5f26a86bf7
Fix regular expressions, thanks ChickenBones!
2012-04-09 09:19:20 -04:00
Christian Weeks
b1d9f3d833
Tweak Console handler patch so we're more friendly to forge
2012-04-08 10:04:28 -04:00
Christian Weeks
05ff62d85f
A proper console command handler, also fix ordering of loaded mods
2012-04-08 09:55:56 -04:00
Christian Weeks
b0774b89c7
Add in a console command handler so you can access the command console
2012-04-08 02:00:57 -04:00
Christian Weeks
1ec797cddb
Don't send a register unless I have channels. Add the channel to the mod channels list.
2012-04-08 01:11:32 -04:00
Christian Weeks
2ff2a78694
Split the packet salutation in two so we can work with or without forge
2012-04-08 00:18:37 -04:00
Christian Weeks
93664d10e6
Add the player object to the onLogin event so you don't need to dive internals for it during login
2012-04-07 22:38:29 -04:00
Christian Weeks
10e5d42522
Call my handleLogin hook from NetLoginHandler, tweak output in server gui and log file.
2012-04-07 22:11:01 -04:00
Christian Weeks
d531d70f1f
Fix subdirectory loading properly: mods will load inside eclipse..
2012-04-06 16:14:01 -04:00
Christian Weeks
95596bc198
Actually figure out the path for directory class loading
2012-04-06 15:24:28 -04:00
Christian Weeks
b32a92df5b
regular expressions in java==fail
2012-04-06 15:03:41 -04:00
Christian Weeks
ac6c35d7c4
Recurse into subdirectories found
2012-04-06 14:43:12 -04:00
Christian Weeks
2ed8a8b807
Try multiple "jar" sources- for eclipse testing
2012-04-06 14:23:14 -04:00
Christian Weeks
759e92cc2a
it's addURL not addUrl dumbo
2012-04-06 13:57:40 -04:00
Christian Weeks
feede96d6d
it's getdeclaredmethod, dipstick
2012-04-06 13:47:01 -04:00
Christian Weeks
fc33249d32
Fix package private resolution of fields/methods from base minecraft by loading into minecraft's class loader not our own
2012-04-06 13:27:50 -04:00
Christian Weeks
ff48f13746
Add in a missing client side method to modloader stubbed for the server
2012-04-06 12:24:52 -04:00
Christian Weeks
47e61610ca
Add the hooks for crafting and smelting
2012-04-06 10:34:44 -04:00
Christian Weeks
4f97aedbb2
Should load from whatever minecraft comes from now...
2012-04-06 09:59:58 -04:00
Christian Weeks
51203e49f9
Build should work now. Fix a stupid javadoc import.
2012-04-05 21:44:06 -04:00
Christian Weeks
1906a085ad
New build script- version the src dist as well
2012-04-05 21:40:16 -04:00
Christian Weeks
5a3ac6b96e
Documentation: lots
...
Some eclipse workspace settings that might help?
2012-04-05 16:22:47 -04:00
Christian Weeks
1146660fc6
Handle the minecraft object registry better- now the client compiles too
...
Also a quickie astyle run over the code..
2012-04-05 12:36:54 -04:00
Christian Weeks
2888e1680e
Update the patches and fix the shell script
2012-04-05 11:42:33 -04:00
Christian Weeks
7bf22659e7
Reorganize the code a little bit- move some stuff that was on FMLHandler to the common handler. Add a delegate
...
into the common handler that delegates to the right sided handler
2012-04-05 11:34:57 -04:00
Christian Weeks
86f8bbd47d
Clean up extraneous print statements from the build
2012-04-05 10:42:15 -04:00
Christian Weeks
5bc8929795
Fix INSTALL-fml.txt file location in the server zip
2012-04-05 10:37:05 -04:00
Christian Weeks
b2853aa811
Append a .class to the diff file list. Now you should just be able to iterate it and read every file in it directly.
2012-04-05 10:16:23 -04:00
Christian Weeks
c06fc00f24
Run Astyle over the FML code. Happy lex?
2012-04-05 10:07:52 -04:00
Christian Weeks
1e6eec768c
OK. Now the script works
2012-04-05 08:42:10 -04:00
Christian Weeks
33d7d77775
Crap at writing good python apparently
2012-04-05 08:29:07 -04:00
Christian Weeks
83b060b573
Tweak file list script to print obf names
2012-04-05 08:25:04 -04:00
LexManos
df656cb98d
Merge remote-tracking branch 'origin/master'
2012-04-05 00:10:36 -07:00
LexManos
cb21ddc438
Rebuilt patches with new scripts.
2012-04-05 00:10:13 -07:00
LexManos
7b45203461
Cleaned up update_patches to fix a few bugs. Updated applypatches to normalize the patch file's line endings to make them work cross platform. Added download_firnflower and setup script. As well as added the GnuWin32's diff binary, so windows can create patches as well. http://gnuwin32.sourceforge.net/
2012-04-05 00:09:29 -07:00
LexManos
ecb07e2abb
Created eclipse workspace, should allow simple and quick access to working on FML
2012-04-05 00:06:11 -07:00
Christian Weeks
647c40ba5e
Missed a couple of wording tweaks
2012-04-05 00:58:17 -04:00
Christian Weeks
9210fe1a57
Tweak the build a bit, add some more data and generate the
...
touched file list for forge
2012-04-04 11:05:31 -04:00
Christian Weeks
9efb9741d1
Tidy up some of the installation media
2012-04-04 09:48:36 -04:00
Christian Weeks
87b5c870d5
links to implementation
2012-04-03 23:09:22 -04:00
Christian Weeks
bd34b97e9b
Channel validation
2012-04-03 22:45:27 -04:00
Christian Weeks
c74e119993
NetworkHandler doesn't care about channel ownership
2012-04-03 17:06:02 -04:00
Christian Weeks
96e23dda6b
Update patches for network handler
2012-04-03 17:04:57 -04:00
Christian Weeks
c6a0bc2487
Modloader complete
2012-04-03 17:04:26 -04:00
Christian Weeks
d1efbce945
Generic container
2012-04-03 16:12:19 -04:00
Christian Weeks
381b2b8aa1
Config dir handling
2012-04-03 15:53:59 -04:00
Christian Weeks
72478fac83
MLProp
2012-04-03 15:41:25 -04:00
Christian Weeks
c4fd53d628
Mod sorting
2012-04-03 12:03:21 -04:00
Christian Weeks
ec4750f422
Everything except ordering
2012-04-02 23:06:30 -04:00
Christian Weeks
bc0caee371
Fix build script for generating md5s
2012-04-02 18:12:49 -04:00
Christian Weeks
8087bd82bf
Update to 1.2.5 and hopefully forge compatibility
2012-04-02 18:09:06 -04:00
Christian Weeks
ec3fb620dc
Forge support
2012-04-01 02:14:14 -04:00
Christian Weeks
d6e5df9092
Initial attempts to support forge stuff
2012-03-31 02:28:14 -04:00
Christian Weeks
160399cee7
Fix NPE
2012-03-31 01:04:29 -04:00
Christian Weeks
4b4e4b30a9
More logging and maybe fix default package mods
2012-03-31 00:59:43 -04:00
Christian Weeks
67ed21052f
Logging fun. Whee!
2012-03-31 00:52:50 -04:00
Christian Weeks
532f8cfce9
Fail
2012-03-31 00:46:47 -04:00
Christian Weeks
a45af9ac39
More logging
2012-03-31 00:43:54 -04:00
Christian Weeks
3b487511d7
Tweak class loader
2012-03-31 00:22:08 -04:00
Christian Weeks
a1cbb799be
Add more patches
2012-03-30 22:28:12 -04:00
Christian Weeks
8b9545d622
Some implementation
2012-03-30 22:26:16 -04:00
Christian Weeks
cd325dc3fd
tweak MC server hook
2012-03-30 21:23:04 -04:00
Christian Weeks
9768774896
some build and logging tweaks
2012-03-30 21:21:43 -04:00
Christian Weeks
e1781bf2ae
Fix build
2012-03-30 21:10:43 -04:00
Christian Weeks
b566a7b692
Fix derpy
2012-03-30 21:07:42 -04:00
Christian Weeks
e7aa295b47
Tweak loader a bit
2012-03-30 21:03:25 -04:00
Christian Weeks
2d44b44372
Fix patching
2012-03-30 20:43:58 -04:00
Christian Weeks
17e19b8cc6
More build stuff
2012-03-30 20:38:31 -04:00
Christian Weeks
e88b897635
More building fun
2012-03-30 17:36:50 -04:00
Christian Weeks
7a0bd95113
fix build script
2012-03-30 17:00:49 -04:00
Christian Weeks
be52c01b9f
Add in more ignore stuff and a sample "fmlbuild.properties" file
2012-03-30 16:42:11 -04:00
Christian Weeks
c02319cec1
More build stuff, adding in readme etc copied from forge
2012-03-30 16:40:54 -04:00
Christian Weeks
f7507d3f79
Move more stuff around
2012-03-30 16:25:49 -04:00
Christian Weeks
31d2c84541
Build system
2012-03-30 16:22:10 -04:00
Christian Weeks
84d4f7765c
Start patching fun
2012-03-30 13:33:29 -04:00
Christian Weeks
aed6bcc737
Ignore stuff
2012-03-30 11:35:35 -04:00
Christian Weeks
73e2229fb4
We're Forge Mod Loader, not Forge ModLoader
2012-03-30 11:35:04 -04:00
Christian Weeks
a0633ae5e3
Tweak license to refer to github
2012-03-30 10:16:36 -04:00
Christian Weeks
bdce70e891
Add licenses reorganize code
2012-03-30 10:11:13 -04:00
Christian Weeks
3197817a76
Starting to get somewhere
2012-03-30 01:12:59 -04:00
Christian Weeks
0a7e8a8c3e
Thoughts on how to do the modloading properly
2012-03-28 16:44:36 -04:00
Christian Weeks
b23bdc628b
Tab cleanup
2012-03-28 13:29:23 -04:00
Christian Weeks
d727aed293
Initial commit
2012-03-28 12:53:08 -04:00