Commit graph

1433 commits

Author SHA1 Message Date
Christian
abf452f889 Fix the keybinding array to the right one 2014-01-09 08:40:42 -05:00
Christian
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
Jadar
13c998ae5e undid readme change 2014-01-06 15:58:42 -06:00
Jadar
37b0797e3e changed the readme to reflect new setup task. 2014-01-06 11:09:34 -06:00
Jadar
183c317b83 added override toString method for getting full name. 2014-01-06 10:25:13 -06:00
Lex Manos
5e4ddab6ba Mark jopt needed on the server, herp derp, blame Abrar! 2014-01-05 19:02:47 -08:00
Christian
7f05ffa511 Fix stupid hardcoding derp 2014-01-03 23:04:24 -05:00
Christian
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
Christian
ec0d44b8c9 Fix up mcpname derp in GuiScrollingList. 2014-01-02 22:44:26 -05:00
Christian
c67e3d3abe Merge branch 'patch-1' of github.com:airbreather/FML 2014-01-02 22:21:25 -05:00
Christian
62dde437ca Tweaks 2014-01-02 22:18:02 -05:00
Christian
43dd8a8ee7 Fix up readmes and credits. We no longer support modloader. 2014-01-02 22:18:02 -05:00
iChun
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
Christian
aa963c5df6 Config GUIs in the modlist now work. 2014-01-02 11:51:16 -05:00
airbreather
37686f33af Avoiding redundant calls to LogManager 2014-01-01 11:40:32 -05:00
Christian
7a62801209 Tweak button positions. 2014-01-01 02:09:40 -05:00
iChun
29d84cc6af Fix button size for GuiModList 2014-01-01 14:16:23 +08:00
Christian
584ad55ce6 Starting work on the actual GUI. Still work to do. Needs an API. 2014-01-01 00:57:24 -05:00
Christian
a9ae906546 Fix derpiness with Mods button when Realms is available 2013-12-31 20:21:28 -05:00
Christian
3e0285e508 Lots of network cleanup. Gui packets now work too! 2013-12-31 19:55:41 -05:00
Christian
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
Christian
a80409c59a Add in the tweakclass, fix the json for lzma @ the server. 2013-12-30 13:06:59 -05:00
Christian
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
Christian
e27b438f7d Fire simple network connect/disconnect gameevents. 2013-12-28 17:51:40 -05:00
Christian
7b7b8245db Fix example mod code for 1.7 2013-12-28 13:44:37 -05:00
Christian
c68f3119a4 Attempt to load old pre-1.7 worlds. ENSURE YOU HAVE A BACKUP! 2013-12-27 11:48:55 -05:00
Christian
fa0bce3efb Make gradlew executable on linux 2013-12-27 11:26:46 -05:00
Christian
3030324b99 AT for renderblocks 2013-12-27 00:08:49 -05:00
Christian
59405fc7ee Update render registry 2013-12-27 00:07:48 -05:00
Christian
2362fdb9d5 Fix handling world reloads when new stuffs are added 2013-12-26 12:42:40 -05:00
Lex Manos
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
Christian
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
Christian
54731a2acc Fix build script 2013-12-23 20:24:54 -05:00
Lex Manos
20e0f821b3 Add new required --accessToken to launch specs. 2013-12-22 18:35:50 -08:00
Christian
61c6980105 bump to legacy launcher 1.9 with logging unification stuffs. 2013-12-18 11:15:53 -05:00
Christian
8b621292e3 More tweaking on id stuffs at worldload 2013-12-18 11:15:03 -05:00
Christian
f6f746ceca Working on id missing handling 2013-12-18 08:34:44 -05:00
Lex Manos
78f822e51c Update patches for Gradle's rename rewrite: MinecraftForge/ForgeGradle@19e7acf2a2 2013-12-18 04:01:37 -08:00
Christian
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
Christian
5aa0054f23 ICraftingHandler, IPickupHandler are now both events. 2013-12-17 11:24:57 -05:00
Christian
751c5e39a4 Code to disable mods at runtime, or other times. 2013-12-17 10:51:00 -05:00
Christian
95f0447881 Ticks, Player events, keybindings, all migrated to the new event driven system. 2013-12-16 23:18:00 -05:00
Christian
041054ea8b Fire a user event down the channels when a handshake has occured. 2013-12-16 20:00:01 -05:00
Christian
69ce79e1d7 Patch some GUIs. We're gonna add some basic mod gui config support. 2013-12-16 11:48:39 -05:00
Christian
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
Christian
a0fcbdccb5 Update for log4j2 2013-12-16 11:47:48 -05:00
Christian
d188a5ad82 Some patching touchups 2013-12-13 00:18:05 -05:00
LexManos
ed62082e1e Merge pull request #316 from AbrarSyed/patch-4
Update shiped ForgeGradle for 1.7
2013-12-12 17:23:04 -08:00
Lex Manos
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
Abrar Syed
e4fe6ab949 Update shiped ForgeGradle for 1.7 2013-12-12 17:11:37 -06:00
Christian
e4479b81cb First functional release under reobfuscation. 2013-12-12 18:01:09 -05:00
Christian
7956c2f659 Fix AT, Fix exc. Almost works now! 2013-12-12 01:39:30 -05:00
Lex Manos
1322e3407b Kill old patches and add rejects to ignore file. 2013-12-11 20:39:15 -08:00
Christian
b3e35e381f Clean up patches for latest exc. 2013-12-11 23:03:30 -05:00
Christian
7b93e40d7c Fix exc this time *sigh* 2013-12-11 22:58:46 -05:00
Christian
1533d88ef8 Fix the exc file. Fix the deobfremapper for handling inner classes. 2013-12-11 22:54:51 -05:00
Christian
fb7913f583 Fix stupid possible compiler error. 2013-12-11 20:17:08 -05:00
Christian
5e57ce519e SpawnAdjustment packet. Clean up stuffs. No more compile errors. 2013-12-11 19:29:52 -05:00
Christian
5086f22370 Entity spawning works. 2013-12-11 18:46:25 -05:00
Christian
5eb2aec84e Fixed remote and local connections work with mods now. 2013-12-11 12:35:08 -05:00
Christian
4f6aabda09 Add in a remapping event for mods to consume. 2013-12-10 19:25:49 -05:00
Christian
985e4ceb4a Cleanups 2013-12-10 17:29:26 -05:00
Christian
531334b122 ID syncing. 2013-12-10 14:32:06 -05:00
Lex Manos
9f76245783 Did it manually, forgot it needed the end comma 2013-12-09 20:49:37 -08:00
Lex Manos
cf6b9e7c1a Update for fixed Enum cleaning and names. 2013-12-09 20:44:17 -08:00
Lex Manos
d92633d368 Add mappings for Items/Blocks fields. 2013-12-09 20:43:57 -08:00
Lex Manos
cda439fe9d Add sonatype snapshots repo for SpecialSource snapshots. 2013-12-09 20:43:27 -08:00
Christian
4fc600010e ID loading from the server save now works. 2013-12-09 21:36:49 -05:00
Christian
eff9a3cedc More network stuff, partially done id syncing. 2013-12-09 01:22:24 -05:00
Christian
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
Christian
89c7a02146 More cleanup. Bidirectional server <-> client network works for mods as well as FML|HS now. 2013-12-06 11:17:40 -05:00
Christian
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
Christian
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
Christian
fadff73489 The basic network handshaking for FML is done. All scenarios seem to work. 2013-12-04 00:11:08 -05:00
Christian
37a00f0158 Update gitignore 2013-12-02 23:54:15 -05:00
Christian
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
Christian
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
Abrar Syed
75b64fe9b8 fix derp in example builscript 2013-11-26 14:23:31 -06:00
Lex Manos
45aa1485b3 Don't validate signatures in dev env. 2013-11-20 13:18:26 -08:00
Lex Manos
7b737de2c1 Make the working directory the root of the eclipse workspace. 2013-11-17 19:26:21 -08:00
AbrarSyed
af3e74d940 updated samples 2013-11-17 18:21:24 -06:00
LexManos
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
Christian
b7b97efe81 Actually do it correctly. Should be more forge friendly now. 2013-11-13 19:10:11 -05:00
Christian
90e3b49ea5 Merge branch '1.6.4' 2013-11-13 07:55:12 -05:00
Christian
56c9c3c77f Way to go, missing import. *sigh* 2013-11-13 07:45:37 -05:00
Christian
c060a44371 Don't try and open GUIs on the server. 2013-11-12 18:04:25 -05:00
Christian
b8ece10f0b Merge branch '1.6.4' 2013-11-12 17:02:08 -05:00
pahimar
95a8b419ef Add in null protection for client/server sides of handleChat 2013-11-11 14:12:02 -05:00
Christian
82004fe703 Kill more references to modloader. 2013-11-10 13:15:26 -05:00
Christian
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
Christian
5cec48da72 Deprecation cleanup. Bye bye more modloader stuffs 2013-11-10 11:58:34 -05:00
Christian
a8e44dad47 First pass : kill modloader, clean up warnings 2013-11-10 11:49:06 -05:00
Lex Manos
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
Abrar Syed
43bcf33f49 Update 1.6.4-rel.json 2013-11-09 21:14:58 -06:00
Christian
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
Christian
e378a24759 Fix license and naming 2013-11-09 14:28:54 -05:00
AbrarSyed
923b2069ec added src distribution gradle file 2013-11-09 14:28:54 -05:00
Lex Manos
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
Lex Manos
e034f74311 Include eclipse template workspace, for packaging in src distro. 2013-11-09 14:28:54 -05:00
Lex Manos
8364a4e522 Add gradle wrapper 2013-11-09 14:28:53 -05:00
Lex Manos
d0bae88b04 Publish to repo folder for local testing. 2013-11-09 14:28:53 -05:00
AbrarSyed
c272eceac8 Step 3: The Rebirth 2013-11-09 14:28:53 -05:00
Lex Manos
d41794a9b6 Step 2: The Reformation 2013-11-09 14:28:53 -05:00
AbrarSyed
d2d36880b0 Step 1: The Purge 2013-11-09 14:28:53 -05:00
Christian
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
Christian
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
Christian
83d8713bea Fix derp with custom properties. They work now! 2013-11-05 22:23:24 -05:00
Christian
289678252b Fix recursive API dependency resolution. Allows nested APIs, such as BuildCraft's 2013-10-31 09:39:34 -04:00
Christian
cfeebf7810 Fix up duplicate entries 2013-10-30 22:46:19 -04:00
Christian
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
9efeaa8caa Attempt to inject coremods as tweakers, so both can share a dependency ordering 2013-10-27 13:28:50 -04:00
Christian
f7a6bb7eb7 Wrapping coremods as tweakers. Part 1. 2013-10-20 11:53:07 +02:00
Christian
cfb78d482a 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
09c7df2bb3 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
0b0b94978c Make each mod's EventBus log a child of it's main logger. 2013-10-19 18:24:24 -07:00
Christian
fa97bebf34 Fix up handling the new method signature data for NetworkCheckHandlers 2013-10-14 21:28:15 -04:00
Christian
c56f2e3b37 Use null to empty, so missing values work. *sigh* 2013-10-13 22:36:47 -04:00
Christian
5e03f2e85b 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
Kevin Ji
cfcdb92c8e Very minor style fixes
Replacing tabs with spaces consistently, making brace styles consistent, etc.
2013-10-09 19:53:50 -07:00
Christian
daf454af62 Support, and fix up, interface lists for Optional 2013-10-09 13:58:14 -04:00
Lex Manos
1754a5820a 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
b542f13c5c ModLoader is officially deprecated. It will all cease to be with 1.7. 2013-10-06 11:06:31 -04:00
Christian
955d532264 Optional shouldn't be constructable itself. It's purely a wrapper thing. 2013-10-06 10:56:47 -04:00
Christian
19173a7b97 Add in support for Optional interfaces and methods. Be gone coremods! 2013-10-04 17:20:05 -04:00
Christian
ea25a3ffd0 Fix null killing the server 2013-09-29 15:51:38 -04:00
Lex Manos
7e53a294fe Fix md5s for new checksums.sha1 in scala libraries. 2013-09-28 19:47:32 -07:00
Christian
05c66728e7 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
dc72bfe56a Cross-modsystem compatibility fix with thanks to Mumfrey @ liteloader 2013-09-27 10:01:39 -04:00
Christian
ef70a1d29e Add to both the classloader and the parent 2013-09-26 13:01:00 -04:00
Christian
9bcf633e8c Fix deobf tweaker 2013-09-26 10:11:29 -04:00
Christian
036cda37b0 TYPOS!!! 2013-09-26 09:33:48 -04:00
Christian
cbf22b0ab5 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
952d602f49 Update for launchwrapper 1.8 2013-09-25 16:40:59 -04:00
Christian
61ae96f03a Use the negative cache in latest legacylauncher. 2013-09-25 11:46:11 -04:00
Christian
96d9c3b8bc 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
c1623cb8e3 Update to new installer that uses xz compression and better support for non-standard jvms 2013-09-24 23:21:17 -07:00
Christian
8f17d1c694 And use the parent that's actually going to be valid. *sigh* 2013-09-24 08:42:13 -04:00
Christian
8929267b20 Herpaderp. Make addURL accessible. *sigh* 2013-09-24 07:33:11 -04:00
Christian
48c92084da Fix injection of tweaker into system 2013-09-23 13:33:16 -04:00
Simon McVittie
5bf7d3cb4b 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
85811a013d Fix classpath for launchwrapper 1.7 2013-09-21 16:15:05 -04:00
Christian
0c365eb893 Update workspaces for 1.6.4 2013-09-20 17:23:18 -04:00
Christian
da0972980b Fix up a deep crash in the early server init hanging the client 2013-09-20 17:12:01 -04:00
Christian
74b7cba492 Update for MC 1.6.4 2013-09-20 16:25:12 -04:00
Lex Manos
1928c177ac Make final transformers actually work on methods as well. 2013-09-19 12:59:12 -07:00
Christian
d2712dafdb Format the log messages through MessageFormat. Thanks CovertJaguar for the pointer. Closes #282 2013-09-19 08:23:56 -04:00
Lex Manos
fcf2af484d Update the src distro's eclipse workspace. 2013-09-18 15:21:56 -07:00
Christian
b721a51bc4 Update mc_versions data and commands patch and eclipse workspace 2013-09-18 18:01:04 -04:00
Christian
3768ca1713 Update mcp mod info 2013-09-18 17:02:41 -04:00
Christian
2ea5f04228 Update for real 1.6.3 update 2013-09-18 16:59:28 -04:00