932734170d
Merge branch 'logging' of github.com:AbrarSyed/FML into abrar-borked
2014-01-20 08:06:45 -05:00
188488abc3
Make sidedproxy support non-public fields. Closes #344
2014-01-20 07:55:26 -05:00
ad15c01cd8
Try and stop the epic channel closed spam at close time. Closes #353
2014-01-20 07:53:09 -05:00
8121f3fcae
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
48ff8b895a
Allow connection when server is apparently offline. Might allow :NOFML circumvention though. Hmmm. Closes #359
2014-01-20 07:46:17 -05:00
9c9e04c2e1
Check the mod, not it's container, in the check handler. Closes #358
2014-01-20 07:42:35 -05:00
1ef1507299
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
755726bb7c
Add a type adapter for artifact version. Should fix #354
2014-01-19 10:49:28 -05:00
608d401b75
Merge pull request #355 from jk-5/errorhandling
...
Throw an exception when discriminator is not found
2014-01-19 07:38:41 -08:00
f080c5d2e8
Make NetworkEventFiringHandler sharable
...
Fixes #356
2014-01-19 12:27:31 +01:00
1a548b5bb5
Throw an exception when discriminator is not found
2014-01-19 11:21:24 +01:00
44a093e74b
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
a0f021d985
put max number of FML log files to 3
2014-01-19 00:53:58 +00:00
41dcef50f7
changed fml log level to all
2014-01-19 00:49:47 +00:00
189dc35060
Move placement of single player world load hook to fix NPEs.
2014-01-18 13:05:18 -08:00
3b367fcb8e
Fix memory leak?!
2014-01-17 23:36:03 -05:00
d7ed255e17
Fix NPE at startup
2014-01-17 23:35:53 -05:00
b21975b8f0
Clean up some warnings about @Override
2014-01-17 23:19:22 -05:00
b4a6418d1c
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
f9bc1f0847
Put logging exception handlers on all channel inbounds. Fix problem with failure to login. Closes #350
2014-01-17 17:00:55 -05:00
135633b2ad
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
b70742e72d
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
971289194c
Add in some tests and examples for the "simple" network stuff
2014-01-16 18:07:25 -05:00
42c04dab2e
Clean up some warnings. Add in simple network impl
2014-01-16 18:06:36 -05:00
cb33a05824
Merge branch 'simplenet'
2014-01-16 14:59:13 -05:00
ef1ee38b55
Fix bukkit connectivity issue.
2014-01-16 14:58:28 -05:00
c3974f2e81
Some fixes and tweaks
2014-01-16 09:14:39 -05:00
f125c0ddd3
Added basic Mojang account authentication support for development time login.
2014-01-14 16:49:03 -08:00
14272e4932
At the request of AbrarSyed.
2014-01-14 15:39:24 +11:00
725aba9d41
Divert connection through FML, so we can deny connections to servers that don't want us
2014-01-13 13:47:18 -05:00
1a41990745
Fix possible NPE derp
2014-01-13 13:46:22 -05:00
2e76283ccd
Fix up privacy derp in TickEvent. Closes #343
2014-01-13 08:43:33 -05:00
9017256609
Fix openGui. Closes #342
2014-01-13 08:40:56 -05:00
670f76accd
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
7a8eda46c4
Fix potential ordering issue, clean up some imports
2014-01-11 22:01:01 -05:00
5176bc8841
Logging Changes
2014-01-11 16:43:14 +00:00
8639a76726
Propagate Optional method removal to trait implementation classes
2014-01-10 00:56:00 +04:00
f6476c1970
Fix csv string vs list of strings. Thanks immibis. Closes #334
2014-01-09 14:55:52 -05:00
6cdc949de7
Merge pull request #336 from jadar/master
...
added override toString method for getting full name.
2014-01-09 11:54:54 -08:00
ad305ef997
Fix TargetPoint to be static
2014-01-09 08:41:52 -05:00
abf452f889
Fix the keybinding array to the right one
2014-01-09 08:40:42 -05:00
f7d932d418
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
13c998ae5e
undid readme change
2014-01-06 15:58:42 -06:00
37b0797e3e
changed the readme to reflect new setup task.
2014-01-06 11:09:34 -06:00
183c317b83
added override toString method for getting full name.
2014-01-06 10:25:13 -06:00
5e4ddab6ba
Mark jopt needed on the server, herp derp, blame Abrar!
2014-01-05 19:02:47 -08:00
7f05ffa511
Fix stupid hardcoding derp
2014-01-03 23:04:24 -05:00
d102e694c8
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
ec0d44b8c9
Fix up mcpname derp in GuiScrollingList.
2014-01-02 22:44:26 -05:00
c67e3d3abe
Merge branch 'patch-1' of github.com:airbreather/FML
2014-01-02 22:21:25 -05:00
62dde437ca
Tweaks
2014-01-02 22:18:02 -05:00
43dd8a8ee7
Fix up readmes and credits. We no longer support modloader.
2014-01-02 22:18:02 -05:00
5eaedffe3b
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
aa963c5df6
Config GUIs in the modlist now work.
2014-01-02 11:51:16 -05:00
37686f33af
Avoiding redundant calls to LogManager
2014-01-01 11:40:32 -05:00
7a62801209
Tweak button positions.
2014-01-01 02:09:40 -05:00
29d84cc6af
Fix button size for GuiModList
2014-01-01 14:16:23 +08:00
584ad55ce6
Starting work on the actual GUI. Still work to do. Needs an API.
2014-01-01 00:57:24 -05:00
a9ae906546
Fix derpiness with Mods button when Realms is available
2013-12-31 20:21:28 -05:00
3e0285e508
Lots of network cleanup. Gui packets now work too!
2013-12-31 19:55:41 -05:00
e4d2f73fe2
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
a80409c59a
Add in the tweakclass, fix the json for lzma @ the server.
2013-12-30 13:06:59 -05:00
9caa3842cf
Allow itemstacks for furnace recipe inputs. Allow passing extra arguments through registerblock into the itemblock constructor.
2013-12-28 18:04:30 -05:00
e27b438f7d
Fire simple network connect/disconnect gameevents.
2013-12-28 17:51:40 -05:00
7b7b8245db
Fix example mod code for 1.7
2013-12-28 13:44:37 -05:00
c68f3119a4
Attempt to load old pre-1.7 worlds. ENSURE YOU HAVE A BACKUP!
2013-12-27 11:48:55 -05:00
fa0bce3efb
Make gradlew executable on linux
2013-12-27 11:26:46 -05:00
3030324b99
AT for renderblocks
2013-12-27 00:08:49 -05:00
59405fc7ee
Update render registry
2013-12-27 00:07:48 -05:00
2362fdb9d5
Fix handling world reloads when new stuffs are added
2013-12-26 12:42:40 -05:00
f4fc6377b3
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
41e930a4b9
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
54731a2acc
Fix build script
2013-12-23 20:24:54 -05:00
20e0f821b3
Add new required --accessToken to launch specs.
2013-12-22 18:35:50 -08:00
61c6980105
bump to legacy launcher 1.9 with logging unification stuffs.
2013-12-18 11:15:53 -05:00
8b621292e3
More tweaking on id stuffs at worldload
2013-12-18 11:15:03 -05:00
f6f746ceca
Working on id missing handling
2013-12-18 08:34:44 -05:00
78f822e51c
Update patches for Gradle's rename rewrite: MinecraftForge/ForgeGradle@19e7acf2a2
2013-12-18 04:01:37 -08:00
58fc22e6b4
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
5aa0054f23
ICraftingHandler, IPickupHandler are now both events.
2013-12-17 11:24:57 -05:00
751c5e39a4
Code to disable mods at runtime, or other times.
2013-12-17 10:51:00 -05:00
95f0447881
Ticks, Player events, keybindings, all migrated to the new event driven system.
2013-12-16 23:18:00 -05:00
041054ea8b
Fire a user event down the channels when a handshake has occured.
2013-12-16 20:00:01 -05:00
69ce79e1d7
Patch some GUIs. We're gonna add some basic mod gui config support.
2013-12-16 11:48:39 -05:00
26056619a9
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
a0fcbdccb5
Update for log4j2
2013-12-16 11:47:48 -05:00
d188a5ad82
Some patching touchups
2013-12-13 00:18:05 -05:00
ed62082e1e
Merge pull request #316 from AbrarSyed/patch-4
...
Update shiped ForgeGradle for 1.7
2013-12-12 17:23:04 -08:00
5e6ff7e729
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
e4fe6ab949
Update shiped ForgeGradle for 1.7
2013-12-12 17:11:37 -06:00
e4479b81cb
First functional release under reobfuscation.
2013-12-12 18:01:09 -05:00
7956c2f659
Fix AT, Fix exc. Almost works now!
2013-12-12 01:39:30 -05:00
1322e3407b
Kill old patches and add rejects to ignore file.
2013-12-11 20:39:15 -08:00
b3e35e381f
Clean up patches for latest exc.
2013-12-11 23:03:30 -05:00
7b93e40d7c
Fix exc this time *sigh*
2013-12-11 22:58:46 -05:00
1533d88ef8
Fix the exc file. Fix the deobfremapper for handling inner classes.
2013-12-11 22:54:51 -05:00
fb7913f583
Fix stupid possible compiler error.
2013-12-11 20:17:08 -05:00
5e57ce519e
SpawnAdjustment packet. Clean up stuffs. No more compile errors.
2013-12-11 19:29:52 -05:00
5086f22370
Entity spawning works.
2013-12-11 18:46:25 -05:00
5eb2aec84e
Fixed remote and local connections work with mods now.
2013-12-11 12:35:08 -05:00
4f6aabda09
Add in a remapping event for mods to consume.
2013-12-10 19:25:49 -05:00
985e4ceb4a
Cleanups
2013-12-10 17:29:26 -05:00
531334b122
ID syncing.
2013-12-10 14:32:06 -05:00
9f76245783
Did it manually, forgot it needed the end comma
2013-12-09 20:49:37 -08:00
cf6b9e7c1a
Update for fixed Enum cleaning and names.
2013-12-09 20:44:17 -08:00
d92633d368
Add mappings for Items/Blocks fields.
2013-12-09 20:43:57 -08:00
cda439fe9d
Add sonatype snapshots repo for SpecialSource snapshots.
2013-12-09 20:43:27 -08:00
4fc600010e
ID loading from the server save now works.
2013-12-09 21:36:49 -05:00
eff9a3cedc
More network stuff, partially done id syncing.
2013-12-09 01:22:24 -05:00
bead2dab97
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
89c7a02146
More cleanup. Bidirectional server <-> client network works for mods as well as FML|HS now.
2013-12-06 11:17:40 -05:00
add83f145a
Check in patches. Add in some network timeout tweaking values so you can debug the network.
2013-12-06 08:07:09 -05:00
1c44a6c181
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
fadff73489
The basic network handshaking for FML is done. All scenarios seem to work.
2013-12-04 00:11:08 -05:00
37a00f0158
Update gitignore
2013-12-02 23:54:15 -05:00
e5ffbd7fdf
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
f10969e3aa
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
75b64fe9b8
fix derp in example builscript
2013-11-26 14:23:31 -06:00
45aa1485b3
Don't validate signatures in dev env.
2013-11-20 13:18:26 -08:00
7b737de2c1
Make the working directory the root of the eclipse workspace.
2013-11-17 19:26:21 -08:00
af3e74d940
updated samples
2013-11-17 18:21:24 -06:00
a5efa91e6a
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
b7b97efe81
Actually do it correctly. Should be more forge friendly now.
2013-11-13 19:10:11 -05:00
90e3b49ea5
Merge branch '1.6.4'
2013-11-13 07:55:12 -05:00
56c9c3c77f
Way to go, missing import. *sigh*
2013-11-13 07:45:37 -05:00
c060a44371
Don't try and open GUIs on the server.
2013-11-12 18:04:25 -05:00
b8ece10f0b
Merge branch '1.6.4'
2013-11-12 17:02:08 -05:00
95a8b419ef
Add in null protection for client/server sides of handleChat
2013-11-11 14:12:02 -05:00
82004fe703
Kill more references to modloader.
2013-11-10 13:15:26 -05:00
2867dfdfa5
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
5cec48da72
Deprecation cleanup. Bye bye more modloader stuffs
2013-11-10 11:58:34 -05:00
a8e44dad47
First pass : kill modloader, clean up warnings
2013-11-10 11:49:06 -05:00
394cfa940e
Join the developers list in the pom and fix the client run configs in the workspace.
2013-11-09 19:22:17 -08:00
43bcf33f49
Update 1.6.4-rel.json
2013-11-09 21:14:58 -06:00
4cefffa1c9
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
e378a24759
Fix license and naming
2013-11-09 14:28:54 -05:00
923b2069ec
added src distribution gradle file
2013-11-09 14:28:54 -05:00
b4a5c25d36
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
e034f74311
Include eclipse template workspace, for packaging in src distro.
2013-11-09 14:28:54 -05:00
8364a4e522
Add gradle wrapper
2013-11-09 14:28:53 -05:00
d0bae88b04
Publish to repo folder for local testing.
2013-11-09 14:28:53 -05:00
c272eceac8
Step 3: The Rebirth
2013-11-09 14:28:53 -05:00
d41794a9b6
Step 2: The Reformation
2013-11-09 14:28:53 -05:00
d2d36880b0
Step 1: The Purge
2013-11-09 14:28:53 -05:00
7831555a7f
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
3b42a14dba
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
83d8713bea
Fix derp with custom properties. They work now!
2013-11-05 22:23:24 -05:00
289678252b
Fix recursive API dependency resolution. Allows nested APIs, such as BuildCraft's
2013-10-31 09:39:34 -04:00
cfeebf7810
Fix up duplicate entries
2013-10-30 22:46:19 -04:00
ee8630bc55
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