cpw
58fdfb6fa1
Fix patches after last fml merge.
2015-05-14 13:56:10 -04:00
cpw
cb6f92e3c7
Merged FML
2015-05-11 18:46:21 -04:00
cpw
081a949bfd
Merge branch '1.7.10'
...
Conflicts:
patches/minecraft/net/minecraft/client/Minecraft.java.patch
src/main/java/net/minecraftforge/fml/client/FMLClientHandler.java
src/main/java/net/minecraftforge/fml/client/FMLFileResourcePack.java
src/main/java/net/minecraftforge/fml/client/FMLFolderResourcePack.java
src/main/java/net/minecraftforge/fml/common/FMLCommonHandler.java
src/main/java/net/minecraftforge/fml/common/IFMLSidedHandler.java
src/main/java/net/minecraftforge/fml/common/LoadController.java
src/main/java/net/minecraftforge/fml/common/Loader.java
src/main/java/net/minecraftforge/fml/common/asm/transformers/EventSubscriptionTransformer.java
src/main/java/net/minecraftforge/fml/server/FMLServerHandler.java
src/main/resources/fml_at.cfg
2015-05-10 23:55:11 -04:00
LexManos
1f679be553
Merge pull request #1863 from Tmtravlr/master
...
Initialized the Nether Fortress chest loot
2015-05-10 16:04:07 -07:00
Tmtravlr
b2de64bc70
Initialized the Nether Fortress chest loot
...
Forced the nether fortress chest loot to initialize in ChestGenHooks
like the other types.
Changed tabs to spaces. Silly Eclipse.
2015-05-10 15:59:07 -07:00
cpw
228ce68639
Update current json
2015-05-08 13:54:11 -04:00
cpw
76c7177553
Expose the state of the loader
2015-05-07 14:17:45 -04:00
Fry
7ab952d410
Merge pull request #1853 from Silfadur/master
...
Added hook for IPerspectiveAwareModel in RenderItem.renderItemIntoGUI f...
2015-05-05 04:22:01 +03:00
Silfadur
b756bd5f9a
Added hook for IPerspectiveAwareModel in RenderItem.renderItemIntoGUI for ItemCameraTransforms.TransformType.GUI
2015-05-05 02:23:38 +02:00
RainWarrior
c28794fe38
Updated default forge logo to animated gif; reverted config folder resolution to Minecraft class due to Loader not being initialized at the point it's needed
2015-05-04 22:10:36 +03:00
RainWarrior
fb18c07722
Eliminated texture name allocation race condition
2015-05-04 21:54:33 +03:00
cpw
65ab79cf69
Revert "Merge pull request #650 from luacs1998/1.7.10"
...
This undoes the seriously broken change from Sponge to support Mixins, that breaks
a wide variety of coremods. Given the widespread incompatibility it introduces, it
won't be re-added at 1.7.10.
This reverts commit 8ccfa24764a3f4854f5334c0da1224286175e13b, reversing
changes made to 7c10b93a2ded2799d41b73b67a2766c31e992d8a.
2015-05-04 08:50:08 -04:00
cpw
c43e4a8022
Fix the ordering of the messages, so they make sense now.
2015-05-02 22:13:41 -04:00
LexManos
a003d1b360
Merge pull request #1843 from Zaggy1024/getlightvaluefix
...
Make World.setBlockState check whether the light value from getLightValue(IBlockAccess, BlockPos) has changed.
2015-05-01 17:58:30 -07:00
Zaggy1024
ee003ef77e
Fixed a bug which caused the light level not to update when a block implements Block.getLightValue(IBlockAccess, BlockPos) to change the light value for different block states.
2015-05-01 17:10:08 -05:00
LexManos
4e8d5255ed
Merge pull request #652 from AbrarSyed/patch-2
...
remapped parameters and added ending newlines
2015-04-29 14:45:59 -07:00
AbrarSyed
8e14f9e1cc
remapped parameters and added ending newlines
2015-04-29 13:37:09 -05:00
cpw
858c64ffd3
Optifine can tell us when they're ready for the new splash screen.
2015-04-29 08:15:35 -04:00
LexManos
fd8c2ba08c
Merge pull request #650 from luacs1998/1.7.10
...
Add classloader exclusion for ASM
2015-04-27 15:30:09 -07:00
LexManos
1aacf9cfe2
Merge pull request #649 from luacs1998/master
...
Add classloader exclusion for ASM
2015-04-27 15:29:34 -07:00
cpw
ddc6b0a19f
Synchronize the available libraries. Turns out we've been forcing a newer apache commons-lang(3.2.1)
...
for a long time, also sync the dev guava - we've been forcing 17 for a long time too. Bumping
commons-lang to 3.3.2 since that's what Mojang are shipping with 1.8. It has no observable ill effects
Closes #651
2015-04-26 11:32:28 -04:00
luacs1998
0c933be8dd
Add classloader exclusion for ASM
2015-04-26 20:40:22 +08:00
luacs1998
aad4678d40
Add classloader exclusion for ASM
2015-04-26 20:14:35 +08:00
LexManos
c6525cb3f3
Merge pull request #1832 from Parker8283/lhsf-1.8
...
[1.8] Fixes MC-52974: Host's skin doesn't load in LAN
2015-04-25 17:21:30 -07:00
LexManos
083e4758a4
Merge pull request #1831 from Zaggy1024/clientonlyrenderinlayer
...
Removed @SideOnly(Side.CLIENT) from EnumWorldBlockLayer.
2015-04-25 17:00:37 -07:00
Parker Young
9a7c20e791
Fixes MC-52974: Host's skin doesn't load in LAN
2015-04-25 19:58:24 -04:00
Zaggy1024
2589a0d1f6
Removed @SideOnly(Side.CLIENT) from EnumWorldBlockLayer.
2015-04-25 18:45:49 -05:00
RainWarrior
626a192ce6
Loading screen: moved config file to the standard config directory; added the option to load textures from the custom resource pack
2015-04-26 00:22:43 +03:00
cpw
46c5505565
Splash progress screen will not load in the presence of optifine anymore.
2015-04-25 15:05:28 -04:00
cpw
89daceb9eb
Add a config file that lets you add additional soft dependencies at runtime - injectedDependencies.json
...
Example here: https://gist.github.com/cpw/d3edc292631708f2d454
2015-04-25 01:30:17 -04:00
cpw
4e6aa905f0
Fix trying to close the screen during error.
2015-04-25 00:41:50 -04:00
RainWarrior
794ff1d1b4
Loading screen: logo rotation is now optional; initial support for animated textures - animation rate is fixed for now.
2015-04-25 05:12:02 +03:00
cpw
1fdd18398e
Fix broken log message in vanilla.
2015-04-24 19:02:54 -04:00
cpw
454e2e36a4
Track mipmaps and texture upload
2015-04-24 19:01:49 -04:00
RainWarrior
753115678a
fixed bar text positioning
2015-04-25 01:37:39 +03:00
RainWarrior
c8acd763ef
Thread errors should be correctly displayed in the crash report now
2015-04-25 01:27:57 +03:00
cpw
3d03b31d00
More progress bar hooks
2015-04-24 17:47:39 -04:00
cpw
d18d493174
More progress bar action!
2015-04-24 17:11:49 -04:00
cpw
ab3413a31e
Add in resource reloading to the bar. Tidy up some of the labels a bit.
2015-04-24 16:00:22 -04:00
Lex Manos
591971936d
Cleanup RenderEntityItem patch, fixes Z-fighting issue in EntityItems. Closes #1824
2015-04-23 23:46:55 -07:00
RainWarrior
53a21e7e47
Correctly track exceptions thrown in the loading screen rendering thread
2015-04-24 05:38:32 +03:00
LexManos
68def9c352
Merge pull request #647 from AbrarSyed/patch-1
...
Fixed scala module libs in dev json
2015-04-23 18:55:27 -07:00
AbrarSyed
99c60ee156
fixed scala module libs in jsons
2015-04-23 20:54:14 -05:00
LexManos
3f59b560d7
Merge pull request #1814 from Lunatrius/block-dispatcher
...
Extracted the creation of RegionRenderCache into a method for extendability
2015-04-22 13:25:48 -07:00
Lunatrius
ea9d805e4f
Extracted the creation of RegionRenderCache into a method.
...
Classes extending RegionRenderCache can change the behavior of the cache, allowing to visually change blocks (schematics etc).
2015-04-22 15:40:07 +02:00
cpw
87e6c29028
Fix up multiple injections of cmdline files via versionspecificmoddir.
...
Closes #645
2015-04-22 08:31:25 -04:00
cpw
ba354da317
Make sure to close the splash screen if there's gonna be an error display
2015-04-21 00:28:19 -04:00
cpw
6398961c48
Call some loader stuffs
2015-04-20 23:34:36 -04:00
cpw
8c54026f2d
Merge branch '1.7.10-load-progress' of github.com:RainWarrior/FML into 1.7.10
2015-04-20 23:15:37 -04:00
RainWarrior
5b06b71d04
Splash screen implementation
2015-04-21 06:09:29 +03:00
cpw
b049b39760
Update to use the inherited jar format. Simplifies a lot..
2015-04-20 22:25:29 -04:00
cpw
e1ed3c07c2
Exceptions during construction phase should not propogate and cause an immediate crash. Closes #638
2015-04-18 21:48:49 -04:00
Lex Manos
de066a86da
Fixed NBTSizeTracker missing a lot of data being read. Also made new NBT object allocation claim 32-bits in the size tracker.
2015-04-17 02:07:01 -07:00
Lex Manos
c5f22f56d8
Dissallow color codes in mod names displayed in Mod gui list. And code formatting.
2015-04-13 21:52:53 -07:00
LexManos
5a5ef86da9
Merge pull request #636 from tterrag1098/betterModList
...
Fix control codes being used for mod list sort. Clean up sorting code.
2015-04-13 17:13:52 -07:00
tterrag1098
3fbd6b0810
Fix control codes being used for mod list sort. Clean up sorting code and fix a bug with right click clearing.
2015-04-12 00:51:03 -04:00
cpw
5ac654dc1c
MinecraftForge/FML@888e489394 Allow registering custom language adapters.
...
MinecraftForge/FML@906f94ca14 Some tidyup of the PR
MinecraftForge/FML@1c025f1843 Patch TracingPrintStream to handle Kotlin IO.
2015-04-11 18:21:50 -04:00
Arkan Emberwalker
5f7c3bd72d
Patch TracingPrintStream to handle Kotlin IO.
...
Kotlins internal IO suite wraps the old System.out style, so descend
deeper in the stack when kotlin.io is detected.
2015-04-11 18:15:35 -04:00
Arkan Emberwalker
6cdde0f9e4
Patch TracingPrintStream to handle Kotlin IO.
...
Kotlins internal IO suite wraps the old System.out style, so descend
deeper in the stack when kotlin.io is detected.
2015-04-11 18:13:25 -04:00
tterrag1098
592c9c8e42
Fix itemCtorArgs javadoc in registerBlock
2015-04-11 18:09:31 -04:00
cpw
4af2ba3949
Some tidyup of the PR
2015-04-11 18:05:00 -04:00
Arkan Emberwalker
0055973f43
Allow registering custom language adapters.
...
Allows external mods/library jars to provide language adapters for
languages not supported in native Forge.
2015-04-11 18:05:00 -04:00
cpw
1fa358ccee
Some tidyup of the PR
2015-04-11 18:02:00 -04:00
Arkan Emberwalker
2b3cdaa752
Allow registering custom language adapters.
...
Allows external mods/library jars to provide language adapters for
languages not supported in native Forge.
2015-04-11 17:36:16 +01:00
cpw
fa5ab52acd
Enhance error output for bad textures a bit more and try and capture more types of error..
2015-04-11 12:12:37 -04:00
cpw
c7622c06d7
Cleaning up the missing resource stack spam, and condensing the information into a usefully understandable
...
format.
2015-04-11 00:52:58 -04:00
cpw
994f722843
Clean up some dead code
2015-04-10 22:34:06 -04:00
Lex Manos
4be96044d0
Rework EventSubscriptionTransformer to bake @Cancelable and @HasResult values, should increase EventBus performance even more by removing logic from Event constructors.
2015-04-10 22:28:39 -04:00
Lex Manos
07e14a9fa4
MinecraftForge/FML@4a753227ad Rework EventSubscriptionTransformer to bake @Cancelable and @HasResult values, should increase EventBus performance even more by removing logic from Event constructors.
2015-04-10 03:36:51 -07:00
Lex Manos
aeb4b03bf4
Rework EventSubscriptionTransformer to bake @Cancelable and @HasResult values, should increase EventBus performance even more by removing logic from Event constructors.
2015-04-10 03:28:41 -07:00
LexManos
c11952714c
Merge pull request #1752 from AbrarSyed/patch1
...
changed run configs to GradleStarts
2015-04-09 12:11:32 -07:00
Lex Manos
2f5b5f5ffe
Updated FML:
...
MinecraftForge/FML@c8160311d5 Stop IllegalFormatConversionException thrown if @Mod has flagged client-only or server-only
MinecraftForge/FML@9a894952af Merge pull request #627 from GotoLink/patch-1
MinecraftForge/FML@40faac6452 Remove J7 only constructor in EnhancedRuntimeException, J6 compiling compatibility restored.
2015-04-07 20:12:19 -07:00
Lex Manos
79ca5bbf86
Remove J7 only constructor in EnhancedRuntimeException, J6 compiling compatibility restored.
2015-04-07 19:36:20 -07:00
Lex Manos
f6c50cc3af
Remove J7 only constructor in EnhancedRuntimeException, J6 compiling compatibility restored.
2015-04-07 19:32:25 -07:00
LexManos
cf7122ed59
Merge pull request #1771 from iChun/master
...
Readded but deprecated the old RenderPlayerEvent that were deleted. Sorry, Lex.
2015-04-04 14:31:43 -07:00
iChun
b2f1b036de
Readded but deprecated the old RenderPlayerEvent that were deleted. Sorry, Lex.
2015-04-04 22:30:23 +01:00
LexManos
e0bc6fc65c
Merge pull request #1770 from iChun/master
...
Reimplement RenderPlayerEvent that was removed in the port to 1.8 from 1.7.10.
2015-04-03 21:14:46 -07:00
iChun
8c35bc1dc7
Reimplement RenderPlayerEvent that was removed in the port to 1.8 from 1.7.10.
...
RenderPlayerEvent.Specials was removed because the special effects are done in the LayerRenderer now.
2015-04-03 21:11:43 +01:00
LexManos
6d71b05838
Merge pull request #627 from GotoLink/patch-1
...
Stop IllegalFormatConversionException thrown
2015-04-02 13:32:56 -07:00
cpw
38cdbc16e2
Fix json cache crash, handle the file much more cleanly. Probably an MC JIRA since
...
it's a vanilla bug. Closes #619
2015-04-02 13:07:40 -04:00
GotoLink
5071e76881
Stop IllegalFormatConversionException thrown if @Mod has flagged client-only or server-only
...
%d is not a valid format for getModId(), which returns String.
2015-04-02 18:33:19 +02:00
Matthew Messinger
ee414b2037
Cherry-pick 01aaa7dc97480b381ca0d192ec65016d7baeb747
...
Fix mods defined via --mods or --modListFile launch args not being searched for coremods. #560
2015-04-01 19:51:44 -04:00
cpw
01000f9d34
Update FML - merge the 1.7.10 changes in to forge @ 1.8. Wow git is (sorta) AWESOME!
...
MinecraftForge/FML@6b0ae369eb Try and improve performance of the registry by avoiding superType.cast.
MinecraftForge/FML@dfebcafd49 Something I meant to add a long time ago, but it got overlooked. My apologies. Presend the (int) dimension ID in the serverhello packet. This should be 100% backward compatible with existing servers but bumping a server to this version will allow clients with this version as well to now login in dimensions outside the byte range. Probably fixes a bunch of mods that add dimensions.
MinecraftForge/FML@6011419fa0 Clean up my patch. Terrible person I am..
MinecraftForge/FML@c6bbd0e82d Forgot that I need a noarg ctor. I'm so rusty.
MinecraftForge/FML@6edc1635de Need to load the dimension from disk - do it without filling out the player so that the normal player loading (including events) works properly
MinecraftForge/FML@4ca6f6e19f What a dumb oversight. One needs to copy the active substitution set to the active gamedata. Doesn't work well otherwise.
MinecraftForge/FML@6f6cec96be Substitutions need to be activated when they're registered, otherwise they won't appear in world, ever.
MinecraftForge/FML@13ac015f0c Change iterator behaviour for the registry - include substitutions in the standard iterator, so that vanilla MC methods visit them (so they can get textures etc). The fml special one only visits the absolute set, used mostly for sanity checking and serialization.
MinecraftForge/FML@24cb4a42c4 Enhance output of common FML errors in crash reports and server GUI.
MinecraftForge/FML@12ccf9cf49 Rather than try to fall back to the backup level.dat in case of weirdness in the ID map, just fail hard. There is probably a serious modder derp in this case and there's nothing FML can do to recover the situation except avoid making it worse.
MinecraftForge/FML@e8cd368da3 It's an IllegalState not an IllegalArgument *sigh*
MinecraftForge/FML@2be9c74342 And fix itemblocks being removed, leaving behind a residual block. This is a legitimate action - use the missing mapping event to let the mod tell us about it
MinecraftForge/FML@7d8804cf65 You can't setAction to BLOCKONLY
MinecraftForge/FML@13df640d9d Pull in a lot of the FML tweaks from 1.7 to 1.8
MinecraftForge/FML@447beaa99e Merge remote-tracking branch 'origin/1.7.10'
2015-04-01 17:50:58 -04:00
cpw
8fe5d26e94
Merge remote-tracking branch 'origin/1.7.10'
...
Conflicts:
fml
2015-04-01 17:43:25 -04:00
cpw
9d1f554075
Merge remote-tracking branch 'origin/1.7.10'
2015-04-01 17:17:24 -04:00
cpw
c3559b2dbd
Pull in a lot of the FML tweaks from 1.7 to 1.8
...
Merge remote-tracking branch 'origin/1.7.10'
Conflicts:
src/main/java/cpw/mods/fml/common/MissingModsException.java
2015-04-01 17:06:12 -04:00
cpw
0a61ffb57e
MinecraftForge/FML@2afd55ab82 Fix scala mods, Closes #621
...
MinecraftForge/FML@c541b08ef6 Merge pull request #622 from diesieben07/scala-fix
MinecraftForge/FML@d5021417dd Forgot the register handling bit. Registration should work now..
MinecraftForge/FML@5a65c65686 OK, this is finally actually working, I think...
2015-04-01 16:08:42 -04:00
cpw
45ec6e0833
OK, this is finally actually working, I think...
2015-04-01 15:56:48 -04:00
RainWarrior
46b1b82f13
Fixed mipmapping not being enabled by expanding 1x1 texture
2015-04-01 16:06:03 +03:00
cpw
e1c83de490
Comment on previous commit fix - it worked. Thanks to skyboy and tterrag for investigating and verifying.
...
A chest as an acheivement icon will recreate the original problem, for note.
2015-04-01 07:13:14 -04:00
cpw
1b7ce7592c
Experimental "fix" for the weird rendering in the Acheivements screen. Thanks skyboy for spotting this.
2015-03-31 20:50:16 -04:00
cpw
0d79aa1e0a
You can't setAction to BLOCKONLY
2015-03-31 15:38:53 -04:00
cpw
d684a4e066
And fix itemblocks being removed, leaving behind a residual block. This
...
is a legitimate action - use the missing mapping event to let the mod
tell us about it
2015-03-31 15:29:51 -04:00
cpw
0b8ff5890a
It's an IllegalState not an IllegalArgument *sigh*
2015-03-31 15:11:39 -04:00
cpw
0bff21315c
Rather than try to fall back to the backup level.dat in case of weirdness
...
in the ID map, just fail hard. There is probably a serious modder derp in this
case and there's nothing FML can do to recover the situation except avoid
making it worse.
2015-03-31 15:09:49 -04:00
cpw
8309a32ad2
Forgot the register handling bit. Registration should work now..
2015-03-31 13:38:30 -04:00
LexManos
8ce395ea4e
Merge pull request #622 from diesieben07/scala-fix
...
Fix scala mods, Closes #621
2015-03-28 11:23:59 -07:00
diesieben07
8f5bb75ef2
Fix scala mods, Closes #621
2015-03-28 16:00:50 +01:00
Lex Manos
0f162ddc6a
Updated FML:
...
MinecraftForge/FML@2a268cd566 Improve mod list GUI, add sort and search
MinecraftForge/FML@951fc2d9fd First attempt at making FMLControlledRegistry something a bit more generic than just blocks/items.
MinecraftForge/FML@410582222d Merge pull request #614 from tterrag1098/betterModList
MinecraftForge/FML@ba0b176430 Fix ModDiscoverer ignoring inner classes.
MinecraftForge/FML@9cc313eab9 Merge pull request #617 from diesieben07/innerclass-disc
MinecraftForge/FML@01aaa7dc97 Fix mods defined via --mods or --modListFile launch args not being searched for coremods. #560
MinecraftForge/FML@8cecc47b85 Merge pull request #620 from killjoy1221/extra-coremod-fix
MinecraftForge/FML@38d9a5f444 Enhance output of common FML errors in crash reports and server
Force load anonymous minecraft classes used in crash reports. This prevents some crashes being hiddedn behind class definiton exceptions.GUI.
2015-03-27 03:03:31 -07:00
Lex Manos
9e7e9e5cbf
MinecraftForge/FML@24cb4a42c4 Enhance output of common FML errors in crash reports and server GUI.
...
Force load anonymous minecraft classes used in crash reports. This prevents some crashes being hiddedn behind class definiton exceptions.
2015-03-27 02:54:55 -07:00
Lex Manos
ddcc6a1aa4
Enhance output of common FML errors in crash reports and server GUI.
2015-03-27 01:40:23 -07:00
Lex Manos
68c3a85fef
Enhance output of common FML errors in crash reports and server GUI.
2015-03-27 01:17:57 -07:00
LexManos
b1f18107e6
Merge pull request #620 from killjoy1221/extra-coremod-fix
...
Fixed typo causing coremods to be missed in certain situations.
2015-03-24 05:13:45 -07:00
Matthew Messinger
8da78750aa
Fix mods defined via --mods or --modListFile launch args not being searched for coremods. #560
2015-03-23 22:58:02 -04:00
cpw
ce10d0dfd0
MinecraftForge/FML@4ca6f6e19f What a dumb oversight. One needs to copy the active substitution set to the active gamedata. Doesn't work well otherwise.
...
MinecraftForge/FML@6f6cec96be Substitutions need to be activated when they're registered, otherwise they won't appear in world, ever.
MinecraftForge/FML@13ac015f0c Change iterator behaviour for the registry - include substitutions in the standard iterator, so that vanilla MC methods visit them (so they can get textures etc). The fml special one only visits the absolute set, used mostly for sanity checking and serialization.
2015-03-22 13:07:06 -04:00
cpw
c2f11ecc35
Change iterator behaviour for the registry - include substitutions in the standard iterator, so that
...
vanilla MC methods visit them (so they can get textures etc). The fml special one only visits the
absolute set, used mostly for sanity checking and serialization.
Closes #618
2015-03-22 12:56:05 -04:00
cpw
2451e49df2
Substitutions need to be activated when they're registered, otherwise they won't appear in world, ever.
2015-03-22 12:54:05 -04:00
cpw
3df54d3d0f
What a dumb oversight. One needs to copy the active substitution set to the active gamedata. Doesn't work well otherwise.
...
Closes #616
2015-03-22 12:03:37 -04:00
LexManos
3bb9c6a92c
Merge pull request #617 from diesieben07/innerclass-disc
...
Fix ModDiscoverer ignoring inner classes.
2015-03-21 13:15:43 -07:00
LexManos
8d09b39d80
Merge pull request #1755 from simon816/custom-tileentity-data
...
Add getTileData() to TileEntity
2015-03-21 13:10:43 -07:00
diesieben07
961570f253
Fix ModDiscoverer ignoring inner classes.
2015-03-21 19:15:26 +01:00
simon816
301088acdc
Add getTileData() to TileEntity
...
- The same idea as Entity.getEntityData()
2015-03-21 01:23:55 +00:00
cpw
c9fd2b6173
MinecraftForge/FML@6b0ae369eb Try and improve performance of the registry by avoiding superType.cast.
...
MinecraftForge/FML@dfebcafd49 Something I meant to add a long time ago, but it got overlooked. My apologies. Presend the (int) dimension ID in the serverhello packet. This should be 100% backward compatible with existing servers but bumping a server to this version will allow clients with this version as well to now login in dimensions outside the byte range. Probably fixes a bunch of mods that add dimensions.
MinecraftForge/FML@6011419fa0 Clean up my patch. Terrible person I am..
MinecraftForge/FML@c6bbd0e82d Forgot that I need a noarg ctor. I'm so rusty.
MinecraftForge/FML@6edc1635de Need to load the dimension from disk - do it without filling out the player so that the normal player loading (including events) works properly
2015-03-20 16:12:05 -04:00
cpw
f4972b7611
Need to load the dimension from disk - do it without filling out the player so that the normal player loading (including events)
...
works properly
2015-03-20 15:55:16 -04:00
cpw
613c5edc7d
Forgot that I need a noarg ctor. I'm so rusty.
2015-03-20 15:11:12 -04:00
cpw
a8cbbfcd99
Clean up my patch. Terrible person I am..
2015-03-20 15:00:19 -04:00
cpw
889c967a5b
Something I meant to add a long time ago, but it got overlooked. My apologies. Presend the (int)
...
dimension ID in the serverhello packet. This should be 100% backward compatible with existing servers
but bumping a server to this version will allow clients with this version as well to now login in
dimensions outside the byte range. Probably fixes a bunch of mods that add dimensions.
2015-03-20 14:19:54 -04:00
LexManos
36d6d74e95
Merge pull request #1754 from JamiesWhiteShirt/master
...
Added newVolume and newPitch to PlaySoundAtEntityEvent.
2015-03-19 13:47:36 -07:00
JamiesWhiteShirt
3b567a92d8
Added newVolume and newPitch to PlaySoundAtEntityEvent. Deprecated ForgeEventFactory.onPlaySoundAt, added replacement ForgeEventFactory.onPlaySoundAtEntity.
2015-03-19 12:37:21 +01:00
AbrarSyed
07c42b89fd
changed run configs to GradleStarts
2015-03-17 23:40:48 -05:00
LexManos
888bab92c3
Merge pull request #1723 from Geforce132/master
...
Add an EntityMountEvent.
2015-03-16 10:01:53 -07:00
LexManos
5ac394de0e
Merge pull request #614 from tterrag1098/betterModList
...
Improve mod list GUI, adds sort buttons and a search bar
2015-03-16 10:01:12 -07:00
cpw
d81fd22792
First attempt at making FMLControlledRegistry something a bit more generic than just blocks/items.
...
It probably doesn't work yet though.
2015-03-15 16:22:28 -04:00
cpw
278612ad98
Try and improve performance of the registry by avoiding superType.cast.
2015-03-14 15:32:34 -04:00
Geforce132
d2f36d56f1
-Added EntityMountEvent.
2015-03-13 19:12:16 -05:00
tterrag1098
a27e7e03dd
Improve mod list GUI, add sort and search
2015-03-13 18:38:10 -04:00
LexManos
588f4e3350
Merge pull request #1745 from diesieben07/ingamegui-fix
...
Fix jukebox message being too low
2015-03-11 15:46:14 -07:00
diesieben07
642003e065
Fix jukebox message being too low with forge
2015-03-11 23:25:41 +01:00
Lex Manos
5229abc26d
Updated FML:
...
MinecraftForge/FML@3e7ae47f8f Fix Event Bus Access Issues
MinecraftForge/FML@c8e2a5f377 Fixed WorldInfo properties not loaded
MinecraftForge/FML@7f96b2c69a Fix Debug packet logger on local memory connections.
2015-03-04 21:13:15 -08:00
Lex Manos
418b7794d2
Fix Debug packet logger on local memory connections.
2015-03-04 21:00:31 -08:00
LexManos
6244e88f10
Merge pull request #1739 from robin4002/master
...
Remove translation and add a note for contributors
2015-03-04 11:33:06 -08:00
robin4002
af0316ab9b
remove translation and add a note for contributors
2015-03-04 20:21:16 +01:00
LexManos
4d4f82816f
Merge pull request #610 from Zot201/1.8
...
Fixed WorldInfo properties not loaded
2015-03-04 10:34:25 -08:00
Zot201
189619fcdd
Fixed WorldInfo properties not loaded
2015-03-05 03:21:19 +09:00
LexManos
7223e1a7d9
Merge pull request #609 from Zot201/1.8
...
Add transformer to allow protected/private classes to use the event bus.
2015-03-04 09:49:25 -08:00
LexManos
d93e8bcf48
Merge pull request #1733 from Zot201/enchantment-fix
...
Fixed enchanting table applying secondary enchs. Closes #1428
2015-03-02 12:10:12 -08:00
Zot201
ecca5720c8
Fixed enchanting table applying secondary enchs.
2015-03-02 17:00:38 +09:00
LexManos
7355bdf600
Merge pull request #1721 from me4502/update-event
...
Added NeighborNotifyEvent fired on server side only, allows for monitoring and disabling world 'physics' updates.
2015-02-28 22:54:48 -08:00
Me4502
c21e38cd3b
Add NeighborNotiftyEvent.
2015-03-01 16:53:32 +10:00
Zot201
ccffcf60f8
Fix Event Bus Access Issues
...
1) Allow overriding methods in subclass without extra SubscribeEvent annotations
2) Transform event subscribers to have public method/class
2015-03-01 15:37:47 +09:00
Lex Manos
1af0734f51
Fix compile error in ClientHax's PR.
2015-02-26 23:20:43 -08:00
LexManos
d82e80b2cf
Merge pull request #1729 from clienthax/master
...
Add method to set entity placement type.
2015-02-26 22:16:22 -08:00
clienthax
848dee14d2
Current spawner implementation checks the EntitySpawnPlacementRegistry hashmap to check where a entity should spawn
...
as there is no way to modify this without the use of reflection or a AT, you can not specify where you want your entity to spawn
adding this helper method will allow developers to specify where they want their entity to spawn.
Signed-off-by: Clienthax <[email protected] >
Update EntitySpawnPlacementRegistry.java.patch
2015-02-27 03:58:40 +00:00
LexManos
31e1aae91a
Merge pull request #1730 from Tmtravlr/master
...
Added Nether Fortress chest to the ChestGenHooks
2015-02-26 17:34:56 -08:00
Tmtravlr
f152741bba
Added Nether Fortress chest to the ChestGenHooks
...
I tried to follow the directions on
https://github.com/MinecraftForge/MinecraftForge/wiki/If-you-want-to-contribute-to-Forge
as best as I could. =)
If anything is wrong, let me know and I'll change it!
2015-02-26 14:25:41 -07:00
RainWarrior
638af63f4d
Hopefully fix NPE during baking of empty vanilla item models
2015-02-23 16:02:10 +03:00
Lex Manos
7c03542d94
Fire WorldEvent.Load for Client worlds. Closes #1719
2015-02-23 02:18:58 -08:00
Lex Manos
b2ca559851
Make Container.mergeItemStack respect Slot.isValidItem Closes #1630
2015-02-23 02:03:52 -08:00
Lex Manos
f16a7ff890
Fix JukeBoxes not storing the inserted record. All TE's in minecraft are in net.minecraft.tileentity EXCEPT JukeBoxes. Closes #1633 Closes #1714
2015-02-23 01:44:54 -08:00
Lex Manos
938b752036
Fix NPEs in last commit.
2015-02-21 19:49:13 -08:00
Lex Manos
9335e2907b
Fix NPEs in mlast commit.
2015-02-21 19:48:48 -08:00
Lex Manos
899ecd0d64
Updated FML:
...
MinecraftForge/FML@c9cf3136c2 New @Mod properties to define which environment to load the mod on.
clientSideOnly will only be loaded in the Client environment.
serverSideOnly will only be loaded in the Dedicated server environment.
Combine with acceptedMinecraftVersions to prevent users from loading the mod in the incorrect environment.
2015-02-21 18:43:21 -08:00
Lex Manos
7269d22449
New @Mod properties to define which environment to load the mod on.
...
clientSideOnly will only be loaded in the Client environment.
serverSideOnly will only be loaded in the Dedicated server environment.
Combine with acceptedMinecraftVersions to prevent users from loading the mod in the incorrect environment.
2015-02-21 18:33:30 -08:00
Lex Manos
46695cf4cf
Updated FML:
...
MinecraftForge/FML@5eff408975 Filter more known libraries from potential mod canidates.
MinecraftForge/FML@feb4c436db Quiet ClassPatchManager debug spam by default. Reenable using -Dfml.debugClassPatchManager=true.
MinecraftForge/FML@41e806fa95 Fix double decoding of UTF8 characters in lang files.
2015-02-21 17:28:53 -08:00
Lex Manos
0281b74c7c
Fix double decoding of UTF8 characters in lang files.
2015-02-21 17:27:21 -08:00
Lex Manos
ae085bb84d
Fixed using items on the wrong block client side caused by iChuns eyeheight update.
2015-02-19 18:09:36 -08:00
LexManos
ccfd928c9a
Merge pull request #1718 from iChun/master
...
Reimplement variable eyeHeight for players which was removed in the 1.7 to 1.8 port.
2015-02-18 19:01:06 -08:00
iChun
d66951b368
Reimplement variable eyeHeight for players which was removed in the 1.7 to 1.8 port.
2015-02-19 02:08:03 +00:00
RainWarrior
0e34510032
Removed event bus call from the ModelLoader
2015-02-17 21:20:19 +03:00
LexManos
83ca72bef2
Merge pull request #1708 from matthewprenger/PR-1
...
Ability to add prefixes and suffixes to the player's display name
2015-02-16 22:52:03 -08:00
Lex Manos
5b28eb53e8
Add safty to URL detection in chat. Closes #1712
2015-02-16 22:46:55 -08:00
RainWarrior
b14cfa45e5
RenderItem can now use baked quad color
2015-02-17 05:02:16 +03:00
RainWarrior
93cd9722b0
Added a default white texture; Fixed B3DLoader crashing when the brush has empty texture specified
2015-02-17 05:02:16 +03:00
LexManos
9e4ef54753
Merge pull request #1711 from Parker8283/patch-1
...
Added ATs for EnumFacing
2015-02-16 13:49:11 -08:00
Parker Young
e04240e5e3
Added ATs for EnumFacing
...
This publics the VALUES array and HORIZONTALS array in EnumFacing, thus giving modders access to these arrays, much like ForgeDirection had.
2015-02-16 16:30:55 -05:00
Lex Manos
0a8a535e2c
Quiet ClassPatchManager debug spam by default. Reenable using -Dfml.debugClassPatchManager=true.
2015-02-15 17:30:56 -08:00
Lex Manos
d14ad7dd9a
Filter more known libraries from potential mod canidates.
2015-02-15 17:30:18 -08:00
RainWarrior
d741b1bafc
Attributes.put (de)normalization now works as intended
2015-02-16 03:53:33 +03:00
Matthew Prenger
b4f8945fec
Add the ability to add prefixes and suffixes to the player's display name.
2015-02-15 17:47:13 -06:00
Lex Manos
f6ca556a38
Hold a weak reference to the Minecraft fake player object. Closes #1705
2015-02-15 13:00:09 -08:00
LexManos
e5cd5fc256
Merge pull request #1689 from matthewprenger/master
...
Minor tweak to UsernameCache to also cache usernames of offline players
2015-02-15 12:37:50 -08:00
RainWarrior
44e31f802a
Updated FML
2015-02-14 05:17:56 +03:00
RainWarrior
68efb9d6f4
Moved transformer wrappers to a separate package (should fix signing errors), fixed debug mods not loading in forgedev (string comparison).
2015-02-14 05:17:14 +03:00
RainWarrior
5616d0c1b0
ModelRotation.getMatrix() now returns the correct matrix; fixed the application of custom transformations to vanilla models; fixed application of transformations to B3D models; fixed the culling of rotated vanilla models
2015-02-14 04:44:41 +03:00
LexManos
316ec27e77
Merge pull request #599 from diesieben07/master
...
Handle empty lines in language files gracefully
2015-02-13 14:04:53 -08:00
RainWarrior
87ef833d32
Alternative models work once again
2015-02-14 00:23:03 +03:00
diesieben07
1a2c521b63
Handle empty lines in language files gracefully
2015-02-13 15:34:54 +01:00
RainWarrior
3e1d959a23
Updated FML
2015-02-13 08:24:32 +03:00
Fry
c85aa9351a
Merge pull request #597 from RainWarrior/blame
...
Added blaming of coremods and mods not targetting Java 6
2015-02-13 08:05:20 +03:00
RainWarrior
a4e70e44e1
Added blaming of coremods and mods not targetting Java 6
2015-02-13 08:07:27 +03:00
RainWarrior
dfc2e04255
fix ModelLoader.setCustomModelResourceLocation not storing same item with different metadata values
2015-02-09 17:19:10 +03:00
Lex Manos
0e69e84d89
Try a maven mirrior to fix build issues.
2015-02-08 17:24:44 -08:00
RainWarrior
2419d4913b
made renderLayer ThreadLocal, now it should hold correct value for use inside custom baked models
2015-02-09 02:46:01 +03:00
RainWarrior
9a6fb600ec
Reworked vanilla texture resolution, hopefully fixes NPE bug in FaceBakery
2015-02-08 15:51:41 +03:00
RainWarrior
9e90febd37
fixed NPE during loading of B3D models without textures/brushes.
...
changed default B3D color to have full opacity.
2015-02-08 15:50:35 +03:00
Matthew Prenger
0f43b95821
Minor tweak to UsernameCache to also cache usernames of offline players.
2015-02-07 03:58:27 -06:00
Lex Manos
f0d96b7c50
Fixed being kicked from the server while swimming.
2015-02-06 21:35:27 -08:00
Lex Manos
7ed7da159e
Fixed debugging Dedicated server in Forge Dev workspace.
2015-02-06 21:35:11 -08:00
Lex Manos
9704f25aa8
Fixed potential NPEs in Structure code caused by componenets not being able to load.
2015-02-05 17:03:43 -08:00
Lex Manos
c80e75de9b
Fixed potential NPEs in Structure code caused by componenets not being able to load. Closes #1686
2015-02-05 17:02:30 -08:00
Lex Manos
e903f0ff69
Added ability for language files to opt-in to loading using normal Java properties format.
...
This allows for escape characters, as well as keeping %d and %f replacements in tact.
To opt-in, the lang file must have this comment line:
# PARSE_ESCAPES
As this is opt-in, any errors resulting from misused format strings is on the modder/end user.
2015-02-04 17:23:41 -08:00
Lex Manos
b036b37a35
Fixed BlockBush and BlockCrops not respecting custom soils. Closes #1683
2015-02-04 12:20:24 -08:00
Lex Manos
48c24246a5
Fixed InitMapGenEvent's fire order so values are used. And added OCEAN_MONUMENT type. Closes #1681
2015-02-04 12:20:24 -08:00
RainWarrior
9cb7cc557a
Restore binary backwards compatibility
2015-02-04 10:05:07 +03:00
RainWarrior
b8add23d9b
ModelBakeEvent now has ModelLoader as an argument instead of ModelBakery; Added various static hooks to ModelLoader to allow registering model-related information before it's needed (prevents file-not-found errors on first baking pass); ModelLoader waits until ModelBakeEvent is done before showing any missing model exceptions; It's now possible to define models completely in-code (as illustrated by ModelBakeEventDebug).
2015-02-04 09:45:23 +03:00
Lex Manos
501665fc1e
Bump version to 11.14.1 for next development cycle.
2015-02-03 19:44:29 -08:00
Lex Manos
9c50745bdb
Updated FML:
...
MinecraftForge/FML@1de3bf733a Fix FML's package for net.miencraftforge on maven. Fixes uploading of new builds. Note: 1.7.10 builds are bug fixes only while FML/Forge for 1.8 stabelizes.
MinecraftForge/FML@05ecefb538 Update to ASM5 for Java 8 support
MinecraftForge/FML@1112c455b9 Merge pull request #595 from Grinch/master
2015-02-03 00:26:17 -08:00
RainWarrior
3a0de2edca
Fixed tracking of UV locking state. Closes #1679
2015-02-03 10:40:30 +03:00
Lex Manos
c814be0359
Updated FML: MinecraftForge/FML@22c9656196 Reset S->C CustomPayload data after Write, allowing the same packet to be written multiple times.
2015-02-02 13:08:02 -08:00
Lex Manos
79356d7023
Fixed ItemFrames not having a model. Closes #1678
2015-02-02 13:06:57 -08:00
Lex Manos
1b80328d3f
Reset S->C CustomPayload data after Write, allowing the same packet to be written multiple times. Closes #588
2015-02-02 12:09:26 -08:00
Lex Manos
76825d19b8
Fixed Buttons not dropping anything when broken. Closes #1676
2015-02-01 10:49:17 -08:00
Lex Manos
80c0ff4066
Fixed domain support in ArmorMaterial texture name. Closes #1675
2015-02-01 10:48:48 -08:00
Lex Manos
072aca4350
Updated FML:
...
MinecraftForge/FML@d00feb58c7 Remove debug code that was causing console spam in Forge.
MinecraftForge/FML@1de3bf733a Fix FML's package for net.miencraftforge on maven. Fixes uploading of new builds. Note: 1.7.10 builds are bug fixes only while FML/Forge for 1.8 stabelizes.
MinecraftForge/FML@05ecefb538 Update to ASM5 for Java 8 support
MinecraftForge/FML@1112c455b9 Merge pull request #595 from Grinch/master
MinecraftForge/FML@9c3013e02a Merge remote-tracking branch 'origin/1.8'
2015-01-31 19:00:38 -08:00
Lex Manos
c374ba5463
Merge remote-tracking branch 'origin/1.8'
2015-01-31 18:56:00 -08:00
Lex Manos
79b5c28d38
Merge remote-tracking branch 'origin/1.8'
2015-01-31 18:33:32 -08:00
LexManos
c7c29979c9
Merge pull request #595 from Grinch/master
...
Update to ASM5 for Java 8 support, IF ANYONE MAKES A MOD THAT REQUIRES JAVA8 BEFORE MINECRAFT FORCES IT ALL USERS REQUESTING SUPPORT WILL BE BANNED FROM ALL FORGE RELATED SERVICES.
2015-01-31 03:37:15 -06:00
Steven Downer
79d224f76e
Update to ASM5 for Java 8 support
...
SpecialSource updated ASM5 and ForgeGradle supports ASM5 as well but
neither FML or Forge were actually updated to support ASM5 opcodes. This
commit resolves this.
Signed-off-by: Steven Downer <[email protected] >
2015-01-28 20:17:21 -06:00
LexManos
c9670d3c1d
Merge pull request #1646 from Ivorforce/patch-1
...
Fix fluid tanks incorrectly reading NBT when empty
2015-01-22 21:09:59 -08:00
LexManos
9a2c4998ae
Merge pull request #591 from Minecrell/patch-1
...
Exclude only log4j2 queue from class loader
2015-01-18 14:46:18 -08:00
Ivorius
e629774753
Fix fluid tanks incorrectly reading NBT when empty
...
If the Empty flag was set, the tank would not correctly read the data, keeping the outdated FluidStack instead. This is especially relevant with updatable TileFluidHandler TEs.
2015-01-17 00:36:42 +01:00
LexManos
c7da6c703f
Merge pull request #575 from lumien231/1.8
...
Save the mod list of players in their NetworkDispatcher
2015-01-16 14:40:06 -08:00
Minecrell
8cfca4376f
Exclude only log4j2 queue from class loader
...
Right now the complete com.mojang package is excluded from the LaunchClassLoader on the server. This means mods can't transform authlib for example which doesn't need to be excluded for the UI to work. By excluding only the specific log4j2 QueueLogAppender, mods can also transform the classes in the com.mojang.authlib package.
2015-01-16 23:15:17 +01:00
LexManos
204c6119e7
Merge pull request #1635 from asiekierka/master
...
Fix shouldRefresh being too broad in tile entity update
2015-01-11 13:03:00 -08:00
asiekierka
0a707236e1
fix shouldRefresh being too broad in tile entity update
2015-01-11 11:12:54 +01:00
LexManos
465e330566
Merge pull request #1615 from lumien231/master
...
Fix versionCheck config option
2015-01-09 04:37:26 -08:00
LexManos
7d82925017
Merge pull request #1627 from CovertJaguar/tile-refresh
...
Bulk Chunk Data packets should also check TileEntity.shouldRefresh().
2015-01-09 03:42:46 -08:00
CovertJaguar
30196b8696
Bulk Chunk Data packets should also check TileEntity.shouldRefresh().
2015-01-07 15:37:54 -08:00
Lumien
404e8fa89e
Fix versionCheck config option
2015-01-01 17:52:44 +01:00
LexManos
d5d312b452
Merge pull request #1491 from killjoy1221/master
...
Fix MC-30864 (sending web links in chat)
2014-12-23 14:33:10 -08:00
LexManos
58a458c250
Merge pull request #578 from HEmile/1.8
...
Fixed getEffectiveSide() for Netty Server threads
2014-12-23 14:15:41 -08:00
LexManos
389abd98c1
Merge pull request #1338 from MinestrapTeam/renderpane
...
Fix Stained Glass pane rendering issues
2014-12-23 14:03:36 -08:00
LexManos
93445248e6
Merge pull request #1503 from Kittychanley/master
...
Removed exclusion of white stained glass recipes in ore dictionary.
2014-12-23 12:13:17 -08:00
HEmile
a7ff70eaa4
Fixed getEffectiveSide() for Netty Server threads
2014-12-23 20:26:37 +01:00
LexManos
010e687664
Merge pull request #1581 from Lunatrius/fix-chat
...
Fixed messages not being added to the chat history
2014-12-18 10:33:13 -08:00
Lex Manos
7419c2aa91
Fix incorrect logic in world change clumping.
2014-12-18 08:11:06 -08:00
Lex Manos
cd4e73edfa
Remove our changes to Stitcher slot allocation.
2014-12-18 08:10:38 -08:00
Lunatrius
9453c1d209
Fixed messages not being added to the chat history and ClientCommandHandler not being called when sleeping.
2014-12-17 03:38:26 +01:00
Lex Manos
2096bcb5ab
Finish removing marker in mapping entry names. FMLMissingMappingsEvent/FMLModIdMappingEvent should fire with correct names now.
2014-12-15 06:57:59 -08:00
Lex Manos
e9dbc71362
Ensure that EntitySpawn and OpenGUI packets are handled in the world thread.
...
Also log all errors that are thrown in FutureTasks.
2014-12-13 17:45:38 -08:00
Lex Manos
64952331e2
Fix texture stitcher not using all avalible spaces. Closes #1557
2014-12-11 16:40:28 -08:00
Lex Manos
f60f7d9aa6
Fixed NPE thrown when brewing event is fired and not all slots are filled.
2014-12-11 05:25:13 -08:00
Lex Manos
81086375e8
Expand PlayerWakupEvent to expose the three parameters passed into EntityPlayer.wakeUp. Closes #1486
2014-12-07 05:48:02 -08:00
Lex Manos
4cc278a125
Improved Control of Enchantment.canApplyTogether() in Mod Enchantments, allowing both enchantments to determine if they can apply together. Closes #1434
2014-12-07 05:37:11 -08:00
Lex Manos
35fac1f691
Changed ToolMaterial's repair material to ItemStack version to allow metadata sensitive versions. Closes #1355
2014-12-07 04:29:55 -08:00
Lex Manos
83bcebf3b1
Fix invalid argument being passed to Block.isNormalCube from World.updateNeighbors. Closes #1339 and Closes #1346
2014-12-07 03:49:36 -08:00
Lex Manos
4e39515d12
Add quartz_ore tool init, more mojang special casing -.- Closes #1333 and Closes #1335
2014-12-07 03:43:02 -08:00
Lex Manos
24213a8ca7
Added PotionBrewEvent.Pre/Post. To allow for modification and cancelation of Brewing. Closes #1248
2014-12-07 03:30:52 -08:00
Lex Manos
c9fe5ded9b
Add LivingHealEvent called from EntityLivingBase.heal() Closes #1282
2014-12-07 02:35:07 -08:00
Lex Manos
877ba864e7
Added CreateSpawnPosition event Closes #1053
2014-12-07 01:52:17 -08:00
Lex Manos
9cf9d6a8e8
Add "sand" to the OreDictionary Closes #1487
2014-12-07 00:44:20 -08:00
Lex Manos
49eeedd854
Fixed bug in ServerConfigurationManager.transferPlayerToDimension where it would send the old dimension's information. Closes #1548
2014-12-07 00:39:30 -08:00
Lex Manos
861c00fdfc
Added Explosion Start and Detonate events to control explosion. Closes #1469
2014-12-07 00:27:51 -08:00
LexManos
6910f40fc2
Merge pull request #1547 from Draco18s/patch-1
...
Added tessellator calls to render the block's back faces, so that the liquid properly renders when the player is immersed in the fluid.
2014-12-06 22:57:21 -08:00
Lumien
6f19fd1513
Save the mod list of players in their NetworkDispatcher (Make it accessable for mods)
2014-12-06 16:31:58 +01:00
Draco18s
bf26e639d9
Update RenderBlockFluid.java
...
Added tessellator calls to render the block's back faces, so that the liquid properly renders when the player is immersed in the fluid.
2014-12-04 16:50:26 -05:00
Lex Manos
5b07c7fead
Update Dev mcp mappings to 11-30 snapshot.
2014-12-01 18:28:18 -08:00
Lex Manos
7b2e7ac3c9
Unlink banner block and item id. Mojang should of matched these up but they didn't -.-
2014-12-01 18:00:28 -08:00
Lex Manos
4a92959cc1
Finalize modded handshakes in the World tick thread. Prevents potential CMEs when login event takes to long to fire.
2014-11-28 10:37:55 -08:00
Lex Manos
74a57bd9d6
Fix creative picking a CommandBlock minecart returning wrong item. Closes #1523
2014-11-28 06:08:39 -08:00
Kittychanley
4e79117755
Removed exclusion of white stained glass recipes in ore dictionary. Closes #1502 & #1481
2014-11-21 14:13:24 -06:00
Matthew Messinger
21ffd28adb
Fix MC-30864 (sending web links in chat)
2014-11-10 15:24:27 -05:00
Lex Manos
229848a4cb
Add details message to MissingModsException and WrongMinecraftVersionException to make the Crash logs more useful.
2014-11-08 15:13:59 -08:00
Lex Manos
0dc112a198
Add duplicate protection to ModDiscoverer, do not process files in the mods directory if we already found them in the classpath. {Such as if LiteLoader is installed and added it} Closes #557
2014-11-05 15:27:43 -08:00
LexManos
27e1b65755
Merge pull request #547 from Parker8283/1.8
...
Re-enabled Entity-Render registration
2014-10-19 18:09:12 -07:00
Parker Young
2544df8e44
Re-enabled Entity-Render registration
2014-10-19 20:05:39 -04:00
LexManos
a300935cbc
Merge pull request #545 from bspkrs/1.8
...
changed pass-thru method name to fix MCP name conflict
2014-10-14 23:28:48 -07:00
bspkrs
7e53132918
changed pass-thru method name to fix MCP name conflict
...
fixed a few old javadoc object name mistakes
2014-10-15 02:08:41 -04:00
Lex Manos
878f995711
Add the ability to register custom variant names in ModelBakery.
2014-10-13 20:48:09 -07:00
Lex Manos
70b57c337a
Removed unneeded rebuild, was toying with where to put it.
2014-10-09 05:22:50 -07:00
Lex Manos
c002b98e5e
Automatically register BlockStates when block is initally registered, and clear the list when new snapshots are injected. Modders DO NOT touch the registry in Block directly. Closes #537
2014-10-09 05:05:43 -07:00
Lex Manos
97bdcc7991
Fix FML's package for net.miencraftforge on maven. Fixes uploading of new builds.
...
Note: 1.7.10 builds are bug fixes only while FML/Forge for 1.8 stabelizes.
2014-10-06 15:36:17 -07:00
Lex Manos
471c9c5fd5
Remove debug code that was causing console spam in Forge.
2014-10-06 15:28:29 -07:00
Lex Manos
cfaedc384a
Update TerminalTransformer for new FML package. Closes #535
2014-10-06 00:53:38 -07:00
Lex Manos
e4cdefb0e1
General class name cleanup, spelling mistakes and FF decompile issues.
2014-10-04 02:05:43 -07:00
Lex Manos
468d35e635
Take control over Item.BLOCK_TO_ITEM map and register Block's to this map from GameRegistry.
2014-10-03 17:48:57 -07:00
Lex Manos
f759f73801
Renamed TileEntityRendererChestHelper -> TileEntityItemStackRenderer
...
This class is used to render any tile entities in a non-location specific major
Such as EntityItems, In minecarts, Held by entities, anyhting that isn't in world.
Switched the class names for BiomeGenForest $1 and $2 as Fernflower decompiled
them in oposite order.
2014-10-03 17:48:28 -07:00
LexManos
fe552616bf
Merge pull request #533 from AbrarSyed/patch-2
...
Added mappings to default build.gradle
2014-10-03 14:03:06 -07:00
Abrar Syed
20d78df6e6
added mappings to default build.gradle
2014-10-03 15:57:04 -05:00
Lex Manos
1b587948f8
Add joptsimple as a server required library. Closes #531
2014-10-01 11:26:06 -07:00
Lex Manos
10d3062fc6
Restructure block and item mapping data in world save and network to potentially expand to custom mod ID registry syncing. Tip: ONLY use those functions in GameData that are marked as public API as internal API may change in 1.8.
2014-10-01 01:07:23 -07:00
LexManos
27ea6bb6fa
Merge pull request #527 from bspkrs/1.8
...
Update Config Gui stuff for 1.8
2014-09-30 13:05:00 -07:00
bspkrs
927df1559e
Update Config Gui stuff for 1.8
...
updated mappings to snapshot 20140930
got rid of derpy generics code
2014-09-30 05:20:56 -04:00
Lex Manos
28ff001cc0
Move FML to net.minecraft.fml package.
2014-09-22 22:50:54 -07:00
Lex Manos
1f1166e722
Move vanilla trades to inner class to prevent initilizer order issues.
2014-09-22 19:30:14 -07:00
Lex Manos
511c370193
Preliminary network protocol re-work. vanilla clients can now connect. Further cleanup needed.
2014-09-22 19:29:40 -07:00
Lex Manos
1ac0c5d87f
Inital 1.8 patch update. 'It compiles!'
2014-09-19 17:25:14 -07:00
Lex Manos
ebb91ba280
1.8 Conf update. Uses MCPData Snapshots now.
2014-09-18 17:57:33 -07:00
Lex Manos
5f65fb754e
Add IEventExceptionHandler for EventBus to allow special handeling exceptions that are fired while running an event.
...
Events now track what 'phase' they are in during the execution process. Each EventPriority is a 'phase'.
An exception is thrown if the event attempts to set its phase to a previous one.
2014-09-08 17:54:41 -07:00
Lex Manos
6192119682
Add jsr305 dev-time dependancy for Nullable/Nonnull annotations. Unneeded at runtime.
2014-09-08 17:50:46 -07:00
cpw
ad752886b0
Allow injecting alternative container types. This is the core support code for allowing sponge plugins!
2014-09-07 20:51:54 +12:00
cpw
3dae97cb4a
Is vanilla possible with this mod load, side tests.
2014-09-07 20:13:37 +12:00
cpw
509d244ed4
Clean up import
2014-09-07 19:59:56 +12:00
cpw
9c27520427
Fix derp with ModType annotation. mods should load again now..
2014-09-01 16:05:04 -04:00
cpw
1419a02d13
Merge branch 'simple-netw-improve' of github.com:diesieben07/FML
2014-08-31 21:50:25 -04:00
cpw
88a0805e93
Merge branch 'keyup-event' of github.com:diesieben07/FML
2014-08-31 21:42:10 -04:00
diesieben07
2dc1911f54
Make Keyevent also fire for key releases
2014-09-01 01:10:29 +02:00
cpw
a04c3e12fe
Canonicalized file paths in modListFile handling with the minecraftDirectory.
2014-08-31 14:14:15 -04:00
cpw
f5cf87304b
Two new features. ModLists can have a "parent" mod list. Circularity will
...
result in a crash, so be careful. Mods specified in a child will override
ones from a parent (using the maven group:name:classifier triple to identify -
ignoring the version component)
Finally, ModSide is now doable in MANIFEST.MF. If you have this, it can tell
a mod to only load on a client, or on a dedicated server (though I'd watch out
before using the dediserver one, you'll never load in integrated servers then).
The default value is BOTH, which means you'll load both sides, other values are
CLIENT and SERVER, obviously. Perhaps, also, CAULDRON might be possible?
2014-08-31 14:00:28 -04:00
cpw
c604a5e048
Change the mods and modListFile argument handling a bit. Other tweakers will get a chance at looking
...
at them now - they're only removed right before launch.
2014-08-31 13:35:38 -04:00
cpw
981ffe362d
OK, lets make that a csv list. It'll let you be liteloader and fml in one jar file!
2014-08-30 17:45:35 -04:00
cpw
0c50d7b92d
Add in ModType to the jar manifest. If it's present, and doesn't have value "FML"
...
it will be skipped from the modloading cycle. This should let liteloader mods have a .jar extension.
2014-08-30 17:39:43 -04:00
cpw
0e13403457
Wrap the server description box a little bit shorter. Stops the overlapping. Closes #489
2014-08-29 21:54:20 -04:00
cpw
f0d8b887b4
Fix bug with entityspawn - if the entity doesn't extend livingbase, it fails
...
to write a headyaw byte, and everything will be derped for that packet.
Fixes #499 , but probably a bunch of others.
2014-08-29 21:43:17 -04:00
cpw
67ebda9ace
Merge branch 'bungeecord' of github.com:bloodmc/FML
2014-08-29 21:37:48 -04:00
bloodshot
08ac6d548f
Allow client handshake to be reset by server to support BungeeCord.
2014-08-26 20:49:20 -04:00
cpw
70c115588c
Fix java 8u20. Closes #501 and a bunch of other bugs too.
2014-08-25 17:09:50 -04:00
cpw
bd8bd65ca1
Update for launchwrapper 1.11. Fixes java 6 compatibility.
2014-08-20 23:02:27 -04:00
cpw
c87a11e165
Mark the promise a success in the outbound handler.
2014-08-20 22:49:11 -04:00
cpw
ceae256c56
Fix ups from feedback.
2014-08-20 22:46:39 -04:00
cpw
e07bd74e34
Fix NPE from a boolean
2014-08-20 10:28:50 -04:00
cpw
dddbbd3bac
ItemStack swapping
2014-08-20 10:28:39 -04:00
Clashsoft
3119f700f3
Fix Stained Glass pane rendering issues
2014-08-18 20:28:15 +02:00
cpw
2ca75b3fa4
Update to legacylauncher 1.10 and asm 5.0.3
2014-08-16 13:21:07 -04:00
cpw
19b62a9fb8
Cleanup override warnings
2014-08-16 11:30:01 -04:00
cpw
13d81e05db
More cleanup of exit handling, also add a couple more noise classes to the list of things ignored.
2014-08-16 10:32:22 -04:00
cpw
7c5eb19645
Some more tidying up of the exit handling
2014-08-16 10:32:00 -04:00
cpw
4692e66389
Allow a clean way to exit the game without big ugly warnings, but with logging information available if needed. Closes #496
2014-08-15 16:16:07 -04:00
cpw
1d336e0aa7
Fix almost invisible NPE in TerminalTransformer when loading a non-existant class
2014-08-15 16:03:45 -04:00
cpw
c8c6190566
Extend timeout for client to 5 seconds. Should fix Forge #1322
2014-08-13 10:23:01 -04:00
cpw
18c71e5f2f
Fix the ItemStack transformer to find the method and field so it works with srg and mcp naming.
2014-08-12 21:57:19 -04:00
LexManos
cb62a70d66
Merge pull request #494 from AntonBoch1244/patch-1
...
Build.Gradle Patch
2014-08-12 11:55:15 -07:00
cpw
5527b9f01e
Clear button list on FML fatal error screens. The hidden cancel button should not be
...
there.
Closes #497
2014-08-12 09:16:15 -04:00
LexManos
12d4047459
Merge pull request #484 from bspkrs/master
...
Added support for \n in GuiConfig tooltip strings + a slider fix
2014-08-07 14:41:51 -07:00
AntonBoch1244
e5fe05a1cd
Build.Gradle Patch
...
Changing assetDir to runDir and set runDir to "eclipse"
2014-08-05 22:08:58 +04:00
Christian
269080fee5
FML now supports passing a json formatted modlist as an argument, as well as a comma separated argument list.
...
These facilitate modpacks mostly, by meaning you don't need to duplicate mods. The modlist is arranged in the
maven style, with mods referenced maven-like.
2014-08-01 22:18:50 -02:30
Christian
d21f8f6dbd
Finally fix stupid NPE error caused by FML trying to parse the super of Object in IDEA envs.
2014-08-01 21:43:53 -02:30
Christian
07466ab036
First draft of add alias. It is probably not properly persistent atm.
2014-08-01 21:07:03 -02:30
Christian
7ee877a567
Last part is the itemstack transformer. Itemstacks should now only be loosely coupled with the items within.
2014-08-01 21:07:02 -02:30
cpw
2c804c9b44
Update README.txt
2014-07-31 11:00:53 -02:30
Christian
8622b3fde9
Add a constructor to CustomModLoadingDisplayException. Closes #387
2014-07-31 10:46:33 -02:30
Christian
2d37b14555
AllowPlayerLogins only after the server has completed the core init tasks. Closes #372
2014-07-31 10:17:11 -02:30
Christian
0607bffb92
Kill net.minecraft.src warning. It hasn't served a purpose in a long time now. Closes #313
2014-07-31 10:02:47 -02:30
Christian
f649eccc51
Default collections, so that we don't crash if useDependencyInfo is true. Closes #485
2014-07-31 09:53:27 -02:30
Christian
fe29a98c62
Fix nested directory for language resources. Closes MinecraftForge#1264
2014-07-31 09:48:03 -02:30
Christian
0c088a4299
Tweak Itemstack patch to always delegate to the method call. Set the field, so it's in sync.
2014-07-31 09:47:35 -02:30
Christian
f5bcb6f0ca
Add a delegate to every item and block. this should help with renaming fun stuffs. Also, fix all the tabs from my previous commits. *sigh*
2014-07-30 21:18:31 -02:30
Christian
7ac077ed36
Add a custom version range factory method. Should hush skyboy's complaints. Closes #486
2014-07-30 16:46:16 -02:30
Christian
14f7bb44d9
Make more noise when people screw up mod downloading and put .jar.zip in their mod folders.
2014-07-30 12:38:55 -02:30
Christian
f8b5ae45f1
Make LogContext optional. This can be useful for debugging mod issues, but
...
Apache's implementation in log4j2 is responsible for a very significant % of
the overall runtime. Quite frankly this is shockingly bad performance from
what is supposed to be a high performance logging framework. Anyway, until we
can figure out if we can fix it, we're turning it off by default.
2014-07-29 21:48:14 -02:30
Christian
655d902195
And fix the read side too, incase someone is trying to bitbang and failing.
2014-07-29 21:36:44 -02:30
Christian
03174602f6
If an IO exception comes from the datawatcher, spew it all over the console
...
don't discard it silently. Should stop pixelmon blaming forge for their mistakes.
2014-07-29 21:33:19 -02:30
Christian
522b648185
Merge branch 'std-redir' of github.com:Emberwalker/FML
2014-07-29 14:49:42 -02:30
Christian
6819f5d45d
Update realms to 1.3.2
2014-07-29 14:24:41 -02:30
Christian
0de92f4db7
Clean up a bunch of compiler warnings.
2014-07-29 14:11:41 -02:30
bspkrs
09d68fb7bd
added support for \n in tooltip strings
...
added \n test tooltip localization
fixed int/double conversion error in slider entry
added test slider scenario that highlighted conversion error
2014-07-24 16:51:15 -04:00
cpw
5643237fb9
Sorta revert 908491d5e7ac26becdac938f38cc90d6b9d73ce1 but merge assets
...
into the map, rather than force overwriting. Fixes skyboy's comment.
2014-07-20 10:46:22 -04:00
Lex Manos
4ba024ca2e
Hacky interm solution to #475 to buy me time to re-write FML's network protocol.
2014-07-18 12:25:02 -07:00
Lex Manos
4ed75fd963
Fix FMLAT manifest AccessTransformers, class loader fun! Closes #477
2014-07-16 00:24:03 -07:00
Lex Manos
59c628f777
Move LaunguageRegistry call above normal asset loading to allow resource packs to override mod's language systems.
2014-07-14 13:53:37 -07:00
Lex Manos
b1ec7b420c
Add ExitVisitor to the TerminalTransformer that finds and intercepts any calls to Runtime.exit or System.exit.
2014-07-12 17:20:01 -07:00
cpw
87dde51b8d
Add a terminal transformer and tweaker.
2014-07-12 17:37:41 -04:00
cpw
e8c251808b
Don't scan ObjectHolders if there was an error already, derpitude will ensure.
2014-07-12 12:03:34 -04:00
Lex Manos
e6e019896f
Update realms library to 1.3.1, and implement network latch when connecting to Realms. Tested and working.
2014-07-11 17:56:07 -07:00
Lex Manos
7cd70b3f26
Update tweaker login to use authlib.
2014-07-11 17:52:43 -07:00
LexManos
d4d562c1ca
Merge pull request #468 from bspkrs/master
...
Added slider controls for numerics. Default control is textbox, but slider can be used as a custom list entry class.
2014-07-07 20:15:10 -07:00
bspkrs
e57223a676
added slider controls for numerics. default control is textbox, but slider can be used as a custom list entry class.
...
fixed constructor javadocs in GuiConfig
2014-07-07 23:01:56 -04:00
Lex Manos
2d56512ab2
Update authlib and realms to latest json data.
2014-07-07 17:25:37 -07:00
Lex Manos
a8aac402eb
Add system property to skip doing world backups when game registry changes. This is SEVERLY ill-advised, if you do this DO NOT ask for any support.
2014-07-07 17:25:09 -07:00
Lex Manos
d969137b19
Force preferIPv4Stack to true early in the load chain to combat netty loopback issues.
2014-07-07 09:29:34 -07:00
Lex Manos
e7087fcc48
Scala people test your shit.
2014-07-06 17:12:58 -07:00
cpw
920fd866b4
Merge branch 'scalaupdate'
2014-07-06 10:05:51 -04:00
cpw
efdbdea99f
Update realms to 1.2.9
2014-07-06 10:05:34 -04:00
cpw
2994a2c8ad
Merge branch 'patch-1' of github.com:Soaryn/FML into scalaupdate
2014-07-05 16:26:48 -04:00
Soaryn
79e6167d8d
Updated Scala to latest stable
...
Updates the -dev portion of the json files for 1.7.10 for scala 2.11.1
Updates the -rel portion of the json files for 1.7.10 for scala 2.11.1
2014-07-05 22:54:58 +03:00
LexManos
7fa5ff071d
Merge pull request #465 from AbrarSyed/upgradle
...
fix run configs to use new GradleStart class
2014-07-05 03:14:27 -07:00
AbrarSyed
56f9373a17
updated run configs for GradleStart/Server classes
2014-07-04 22:02:29 -05:00
Lex Manos
3164dd95bf
Fix unneeded cast causing crash in new Config GUI system.
2014-07-03 11:13:11 -07:00
LexManos
fa512ed2d7
Merge pull request #464 from AbrarSyed/upgradle
...
updated gradle wrapper to gradle 2.0
2014-07-02 14:54:13 -07:00
AbrarSyed
fd060bcce6
updated gradle wrapper to gradle 2.0
2014-07-02 15:54:55 -05:00
diesieben07
1182bc4bd6
Add overloaded version of SimpleNetworkWrapper#registerMessage that takes the MessageHandler instance directly, allowing to specify the same handler for multiple messages.
2014-06-30 00:00:06 +02:00
cpw
71a9586fbb
API is now able to "provide" and "own" itself. Useful for libraries without a Mod in them.
...
To go along with this, you can now require an API, with a version, in your mod dependency string
2014-06-26 22:09:50 -04:00
cpw
be45501749
Merge branch 'mc179'
2014-06-26 14:54:41 -04:00
cpw
8afc9c465c
Update for release 1.7.10
2014-06-26 14:48:46 -04:00
LexManos
b7b9ddc9cd
Merge pull request #455 from rumickon/feature
...
Fix Eclipse launching attribute
2014-06-26 10:21:19 -07:00
cpw
7cafaed696
Fix library issue. mojang auth requests newer libs, so we get them at dev time. But the
...
mojang json doesn't refer them at runtime. So there's a lib mismatch. Fortunately all are
available at mojang, so we can update the json.
2014-06-25 18:28:50 -04:00
cpw
b9db002614
Fix accessing guava from transformers
2014-06-25 17:49:00 -04:00
cpw
bb7aa340dc
Merge branch 'master' into mc179
2014-06-25 17:03:05 -04:00
cpw
98d6d97c3e
Merge branch 'bspkrsgui'
2014-06-25 17:02:40 -04:00
rumickon
0a00d40ba2
Fix Eclipse launching attribute
2014-06-25 23:49:17 +04:00
cpw
25e44a8b32
Merge branch 'master' of github.com:bspkrs/FML into bspkrsgui
2014-06-25 13:09:10 -04:00
cpw
f5d8e85fc5
Fix NPE when no FMLAT is defined
2014-06-25 09:11:07 -04:00
cpw
380027daf0
Merge branch 'master' into mc179
...
Conflicts:
src/main/java/cpw/mods/fml/relauncher/FMLSecurityManager.java
2014-06-24 22:18:03 -04:00
cpw
3dbe6ccded
Fix up other exit points. Should stop process hangs for clean exits.
2014-06-24 22:15:11 -04:00
cpw
88a411550a
Add support for mod access transformers without a coremod requirement.
...
Use the "FMLAT" manifest attribute, with a space separate list of files
that live in the 'META-INF' directory. They should conform to standard AT
formatting.
2014-06-24 21:34:07 -04:00
cpw
237c28b6cb
Force the descriptors to the right type for the field they're referencing. Fixes
...
the sand issue
2014-06-24 18:34:34 -04:00
Christian
6aae913919
Harden the security manager and make it less spammy. Clean up a bunch of deprecation warnings from guava.
2014-06-21 23:03:41 -04:00
Christian
94f6fffc80
remove the deprecation patches. The methods are gone now
2014-06-21 22:48:15 -04:00
Christian
06f91d8936
Merge branch 'master' into mc179
2014-06-21 22:44:38 -04:00
Christian
9b976b7afe
Fix server side to write properly
2014-06-21 22:44:25 -04:00
Christian
ea89e1a3f7
Pre4 update
2014-06-21 21:13:22 -04:00
Christian
c1ea6639d4
Fix up some patching bugs. Fully functional @ pre3
2014-06-21 15:55:32 -04:00
Christian
90ad27d985
FML now sets a security manager (FINALLY!). It's primary purpose at this point is to catch
...
rogue calls to System.exit so that they can cause a proper crash report, rather than
silently abandoning the game.
2014-06-15 16:37:42 -04:00
Christian
1c78a09cfd
Also patch in warnings for Vec3Pool - similarly removed.
2014-06-13 08:51:07 -04:00
Christian
be7cf8c01e
Checking in pre3 work
2014-06-12 21:13:26 -04:00
Arkan Emberwalker
23c6b9d245
Implement STDOUT/STDERR redirection.
...
These streams now redirect to log4j2, with form '[class:method:line]: Original message'.
2014-06-12 20:28:56 +01:00
Christian
fada1ad7bb
Deprecate getAABBPool so people can stop using it in mods. Failure to do so will result in 1.7.10 upgrade incompatibility. Use getBoundingBox instead.
2014-06-08 21:30:47 -04:00
Christian
3084368af3
Tweak bad packet warning some. Makes it a bit more log friendly.
2014-06-08 14:35:16 -04:00
Christian
8e64a82423
Fix REPLY handling in SimpleNetworkWrapper. Closes #440
2014-06-05 14:31:44 -04:00
bspkrs
b861e95b17
Added config GUI system
2014-06-04 17:36:47 -04:00
Christian
c27f4b34f8
Merge branch 'master' into mc179
2014-06-03 13:04:49 -04:00
Christian
8883803260
Nullcheck the dispatchers on players. Should stop some crashes when spamming connectivity.
2014-06-02 22:12:13 -04:00
Christian
014acf6f1d
Log the queue as well
2014-05-27 18:56:02 -04:00
Christian
72fbc45a19
If a packet is not handled by the channel, log it, and clear it.
...
Could be spammy, but this is a serious bug and could cause a memory leak
otherwise.
2014-05-27 17:59:53 -04:00
Christian
c56fc3b490
Fix the side for the compatibility check. Should result in green ticks finally!
2014-05-26 14:57:14 -04:00
Christian
d932a23751
Warn when the objectholder finds nothing in the registry. Helps debug mismatched names.
...
Also, actually make the scoping thing work with objectholder
Also handle Blocks.air as a special case. It should never be a valid block in the block registry.
Nothing can ever replace the default block registry block. It is disabled for replacement.
Air is properly skipped
2014-05-26 11:25:25 -04:00
Lex Manos
bcec606b12
lastIndexOf, Note Don't code while sick.
2014-05-24 21:48:55 -07:00
Lex Manos
cad049caa1
-.- Save File First. My Bad.
2014-05-24 21:11:08 -07:00
Lex Manos
e69fd72d42
Fixed deobfusication of nested inner classes. And removed legacy ModLoader remaps.
2014-05-24 20:44:25 -07:00
Christian
05cde0c92f
Add in the objectholder, autopopulated by FML based on simple rules. Allows
...
for reference driven substitution of mod blocks and items based on their
server running state.
2014-05-24 22:32:24 -04:00
Christian
2c5fcc6129
Fix the null networkHandler in the MessageContext
2014-05-24 16:54:48 -04:00
LexManos
c3cf12f3b2
Merge pull request #431 from diesieben07/at-invokevirtual
...
Make ATs replace INVOKESPECIAL when needed
2014-05-22 10:13:09 -07:00
diesieben07
7ede64fbf2
Make AccessTransformer change INVOKESPECIAL to INVOKEVIRTUAL when making methods visible
2014-05-22 14:25:23 +02:00
Christian
3885f9bf84
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
ca674c2ae5
Swap Listenerlist constructor around. Should fix parent resizing issue?
2014-05-14 14:22:51 -04:00
Christian
e05d6340d7
Fix up possible CME
2014-05-13 15:11:50 -04:00
Christian
8a69b17bd6
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
3f86cd32a7
Merge pull request #426 from sfPlayer1/master
...
Fix ObjectIntIdentityMap sporadically matching non-identical objects.
2014-05-12 10:50:20 -04:00
Player
ee671c3eab
Fix ObjectIntIdentityMap sporadically matching non-identical objects.
2014-05-12 16:29:37 +02:00
Christian
39340e46aa
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
a66e8462d8
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
0a9099c8dd
Add a helper for casting some common collection types into generic form
2014-05-10 13:36:24 -04:00
Lex Manos
123f5919ba
Fix network disconnect with message on the client side in NetworkDispatcher.
2014-05-09 13:23:24 -07:00
Lex Manos
6b82a4fed8
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
3a77c79f8a
Ensure that the loadcontroller is ready to preinit.
2014-05-08 10:40:52 -04:00
Christian
f866aeaacb
Clean up some missing generic info
...
PS: NOPE: still not modding.
2014-05-08 10:36:01 -04:00
Christian
b286cb6a57
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
0b795b8bab
Re-add removed genericiterable to clean a warning
2014-05-08 09:58:03 -04:00
Christian
f628bde87b
Revert "Fix refreshResources not happening if an error occurs."
...
This reverts commit fff86ee9d3 .
2014-05-08 09:56:43 -04:00
LexManos
7229ba5c83
Merge pull request #419 from Thog92/master
...
updated wrapper to gradle 1.12
2014-05-07 15:41:05 -07:00
LexManos
51fc256111
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
437e479446
documented dependencies
2014-05-07 17:34:44 -05:00
Lex Manos
e33224054b
Fine use FMLCommonHandler.
2014-05-07 14:36:00 -07:00
Lex Manos
3cb3988491
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
18aed8bf1b
Attempt to fix another race condition related to reading NetClientHandler.
2014-05-07 13:31:16 -07:00
LexManos
e69004b50e
Merge pull request #411 from matthewprenger/master
...
Update ExampleMod mcmod.info
2014-05-07 12:39:12 -07:00
Thog92
366fc5c76c
updated wrapper to gradle 1.12
2014-05-06 22:03:44 +02:00
Lex Manos
5a2b6a604b
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
ad3b232604
Fix display of mod status at the server
2014-04-30 22:47:10 -04:00
Christian
af73743eb7
Fix mod version checking
2014-04-30 22:26:16 -04:00
Christian
0be4719fd5
Fix refreshResources not happening if an error occurs.
2014-04-30 21:55:55 -04:00
Christian
66ad8ea41a
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
ff5eb87e27
Merge pull request #413 from sfPlayer1/master
...
backup+default block use fix
2014-04-30 10:12:21 -07:00
Player
74c89da967
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
e8b3603ee8
Update mcmod.info
2014-04-28 22:27:52 -05:00
Player
2d3cd66680
Registry: Treat all 1.6 entries as items.
2014-04-26 21:56:25 +02:00
Player
dfa9f2d1a2
Registry: Misc tweaks
2014-04-26 21:56:25 +02:00
Player
7175165d15
Registry: Crash earlier with conflicting name/object registrations.
2014-04-26 21:56:25 +02:00
Player
9d00580d7e
prevent the world from getting saved twice at shutdown
2014-04-26 21:56:25 +02:00
Player
624e68e18e
Registry: Fix Block-before-ItemBlock allocation when loading 1.6 world saves, more validation
2014-04-26 21:56:25 +02:00
Player
09ff49fe58
Fix vanilla bug causing integrated server saving from 2 threads concurrently after a crash
2014-04-26 21:56:25 +02:00
Christian
c7d887f078
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
840c96a212
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
a7c15e30aa
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
ede8bb6e61
Merge pull request #400 from sfPlayer1/master
...
Fix various registry issues
2014-04-07 09:57:13 -07:00
Player
ea2972725a
Registry: Add support for registering ItemBlocks before their Blocks
2014-04-07 17:30:38 +02:00
Player
07d5d5c7af
Registry: Protect against putObject misuse, handle duplicate registrations better
2014-04-06 17:11:23 +02:00
Player
6ffbcc5903
Registry: Complain about missing mods when repairing broken worlds
...
Registry: Reduce console spam
2014-04-06 14:49:59 +02:00
Player
b5cc021754
Registry: Fix debug info
2014-04-05 01:54:07 +02:00
Player
7284104472
Registry: Repair mismatched ItemBlocks as well
...
Fix a few misc issues
2014-04-05 01:47:19 +02:00
Player
2e6b7e2eb5
Remove unneeded entity spawn debug logging.
2014-04-03 21:00:42 +02:00
Player
37a81d04d9
Enable custom gui rendering only as required
2014-04-03 17:58:53 +02:00
Player
407f6f79af
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
3eaa002091
Registry: Complain about bogus registrations
2014-04-01 14:40:24 +02:00
Player
11ab034638
initial attempt at a better way to ask the user in case of startup issues
2014-04-01 14:30:47 +02:00
Player
e013f1514d
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
0586c2b1aa
Update patches for Fixed FF in FG 1.2.
2014-03-31 16:02:54 -07:00
Player
56f31def7b
Registry: allow handling missing blocks/items regardless of the mod id
2014-03-31 04:09:59 +02:00
Player
d392ddf3be
Fix old 1.7 worlds with broken ID mappings
2014-03-30 17:17:54 +02:00
Player
939a095896
Registry: cleanup, fix missing id error GUI formatting
2014-03-27 08:30:55 +01:00
LexManos
e35a3538a6
Merge pull request #392 from AbrarSyed/master
...
Updated to ForgeGradle 1.2
2014-03-26 16:04:30 -07:00
AbrarSyed
ed79732705
updated wrapper to gradle 1.11
2014-03-26 13:34:25 -05:00
AbrarSyed
4db8573645
updated example a little
2014-03-26 13:34:01 -05:00
Player
ac44af863b
Registry: Implement support for remapping blocks/items to a new name.
2014-03-25 00:36:37 +01:00
Player
180c605570
Fix FMLMissingMappingsEvent.get
2014-03-24 21:47:25 +01:00
Player
e9ca678ab3
Registry: Block IDs after failing to find a mapping for them
2014-03-24 21:16:36 +01:00
Player
ff6083e77b
Fix remaining issue with autoassigned Block and Item IDs overlapping.
2014-03-20 23:41:01 +01:00
AbrarSyed
ff6143dc85
updated for ForgeGradle 1.2
2014-03-19 02:15:53 -05:00
LexManos
0cd40e70b6
Update README.txt
2014-03-18 01:54:32 -05:00
Lex Manos
f632ea0c36
Fix network close events never getting called. Closes #381 #382
2014-03-15 18:16:27 -07:00
Lex Manos
244e39df0c
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
9b615893d9
Fix hard link to DedicatedSerever when opening a LAN connection causing stalls on connecting.
2014-03-11 00:50:55 -07:00
Lex Manos
d3d244f4a2
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
55199c25d8
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
e7e85ad07b
Reload game settings after mod loading is finished to capture mod keybindings. Closes #378
2014-02-22 20:59:25 -08:00
Christian
322e691d04
FML expands S3F to support payloads up to 2 megs in size. Should be transparent
2014-02-16 18:30:27 -05:00
cpw
9910256063
Merge pull request #373 from bloodmc/master
...
Prevent player data getting reset during disconnects.
2014-02-14 10:57:50 -07:00
cpw
bd8ffc99d4
Merge pull request #371 from bl4ckscor3/patch-1
...
Fix ExampleMod.java for build #1024+
2014-02-14 10:57:32 -07:00
bloodshot
f1db5dd5af
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
2bf052ad91
Some argumentation
2014-02-08 22:41:02 -05:00
Christian
64aa12b7e6
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
2d1f9f2811
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
a5fb93271c
Fix ExampleMod.java for build #1024+
2014-02-08 12:34:01 +01:00
Dan Roque
982f5c7e1b
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
dbf2c416c7
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
284c1eb06b
Update MCP mapping snapshot to latest crowdsourced names.
2014-02-04 22:56:27 -08:00
Christian
f8532711cb
Clean up FMLEventChannel. Closes #367 .
2014-02-04 20:01:44 -05:00
Lex Manos
45efe4edfd
Fix obf error when right clicking a Empty Map.
2014-02-04 12:49:18 -08:00
Christian
5d811025a7
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
be8d33070e
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
498ab360e8
Bump gradle wrapper to 1.10
2014-01-29 21:04:55 -08:00
Christian
92f5351cf9
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
e7ba3fd525
Try harder to find a mod container.
2014-01-25 06:17:14 -05:00
Christian
bd8e9657d8
Beginning of a saveinspectionhandler.
2014-01-20 22:27:03 -05:00
Christian
acda9b5dd7
Log4j2 doesn't need debug level logging for itself anymore
2014-01-20 22:01:20 -05:00
Christian
294c825cc1
And don't spam NONE everywhere
2014-01-20 22:00:24 -05:00
Christian
5898d2a1f8
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
60abcb6341
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
d92176fe8c
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
cb47b4ac46
And turn down some more logging, now we have useful logging back again..
2014-01-20 16:09:34 -05:00
Christian
d22c79abd7
Fix derp with networkcheck
2014-01-20 16:06:50 -05:00
Christian
9fb9942498
Add in error logging for outbound messages. Fix bug with indexedcodec NPE
2014-01-20 16:02:26 -05:00
Christian
87a45d83fb
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
7a3fd048d2
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
62629d4140
Clean up and document outbound handler a bit better. Add in dispatcher target. Closes #361
2014-01-20 11:26:54 -05:00
Christian
e21e2d8168
Add in example assets dir. Closes #308
2014-01-20 08:15:55 -05:00
Christian
0189a7c97e
Merge branch 'trait-optional' of github.com:RainWarrior/FML
2014-01-20 08:14:27 -05:00
Christian
887392cf1b
And restore suppressions. ABRAR, DON'T TIDY CODE!!!!
2014-01-20 08:09:02 -05:00
Christian
932734170d
Merge branch 'logging' of github.com:AbrarSyed/FML into abrar-borked
2014-01-20 08:06:45 -05:00
Christian
188488abc3
Make sidedproxy support non-public fields. Closes #344
2014-01-20 07:55:26 -05:00
Christian
ad15c01cd8
Try and stop the epic channel closed spam at close time. Closes #353
2014-01-20 07:53:09 -05:00
Christian
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
Christian
48ff8b895a
Allow connection when server is apparently offline. Might allow :NOFML circumvention though. Hmmm. Closes #359
2014-01-20 07:46:17 -05:00
Christian
9c9e04c2e1
Check the mod, not it's container, in the check handler. Closes #358
2014-01-20 07:42:35 -05:00
Christian
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
Christian
755726bb7c
Add a type adapter for artifact version. Should fix #354
2014-01-19 10:49:28 -05:00
cpw
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
cpw
48403ce488
Merge pull request #357 from jk-5/sharable
...
Make NetworkEventFiringHandler sharable
2014-01-19 07:37:52 -08:00
jk-5
f080c5d2e8
Make NetworkEventFiringHandler sharable
...
Fixes #356
2014-01-19 12:27:31 +01:00
jk-5
1a548b5bb5
Throw an exception when discriminator is not found
2014-01-19 11:21:24 +01:00
Christian
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
Abrar Syed
a0f021d985
put max number of FML log files to 3
2014-01-19 00:53:58 +00:00
Abrar Syed
41dcef50f7
changed fml log level to all
2014-01-19 00:49:47 +00:00
Lex Manos
189dc35060
Move placement of single player world load hook to fix NPEs.
2014-01-18 13:05:18 -08:00
Christian
3b367fcb8e
Fix memory leak?!
2014-01-17 23:36:03 -05:00
Christian
d7ed255e17
Fix NPE at startup
2014-01-17 23:35:53 -05:00
Christian
b21975b8f0
Clean up some warnings about @Override
2014-01-17 23:19:22 -05:00
Christian
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
Christian
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
Christian
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
Christian
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
Christian
971289194c
Add in some tests and examples for the "simple" network stuff
2014-01-16 18:07:25 -05:00
Christian
42c04dab2e
Clean up some warnings. Add in simple network impl
2014-01-16 18:06:36 -05:00
Christian
cb33a05824
Merge branch 'simplenet'
2014-01-16 14:59:13 -05:00
Christian
ef1ee38b55
Fix bukkit connectivity issue.
2014-01-16 14:58:28 -05:00
Christian
c3974f2e81
Some fixes and tweaks
2014-01-16 09:14:39 -05:00
Lex Manos
f125c0ddd3
Added basic Mojang account authentication support for development time login.
2014-01-14 16:49:03 -08:00
LexManos
d75a934838
Merge pull request #346 from Jezzadabomb338/master
...
At the request of AbrarSyed.
2014-01-13 23:11:42 -08:00
Jezzadabomb
14272e4932
At the request of AbrarSyed.
2014-01-14 15:39:24 +11:00
Christian
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
Christian
1a41990745
Fix possible NPE derp
2014-01-13 13:46:22 -05:00
Christian
2e76283ccd
Fix up privacy derp in TickEvent. Closes #343
2014-01-13 08:43:33 -05:00
Christian
9017256609
Fix openGui. Closes #342
2014-01-13 08:40:56 -05:00
Christian
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
Christian
7a8eda46c4
Fix potential ordering issue, clean up some imports
2014-01-11 22:01:01 -05:00
AbrarSyed
5176bc8841
Logging Changes
2014-01-11 16:43:14 +00:00
RainWarrior
8639a76726
Propagate Optional method removal to trait implementation classes
2014-01-10 00:56:00 +04:00
Christian
f6476c1970
Fix csv string vs list of strings. Thanks immibis. Closes #334
2014-01-09 14:55:52 -05:00
cpw
6cdc949de7
Merge pull request #336 from jadar/master
...
added override toString method for getting full name.
2014-01-09 11:54:54 -08:00
Christian
ad305ef997
Fix TargetPoint to be static
2014-01-09 08:41:52 -05:00
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
cpw
b501f21624
Merge pull request #311 from AbrarSyed/patch-3
...
fix derp in example builscript
2013-11-27 02:13:42 -08: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
LexManos
c45c99d07c
Merge pull request #307 from AbrarSyed/master
...
updated samples
2013-11-17 17:58:01 -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
LexManos
0ad83d84c5
Merge pull request #302 from AbrarSyed/patch-1
...
Update 1.6.4-rel.json
2013-11-09 19:15:34 -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
LexManos
efead4d200
Merge pull request #280 from mc10/patch-1
...
Very minor style fixes
2013-10-09 20:56:05 -07: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
cpw
cc3f0b0eea
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
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
Christian
12c556bc36
Update for pre-ninja 1.6.3 update
2013-09-18 16:33:11 -04:00
Christian
88f1dce658
Merge branch 'master' into newtweak
2013-09-18 14:49:53 -04:00
Christian
56bf94b441
Update for new installer and thank you.
2013-09-17 21:56:25 -04:00
Christian
466902654e
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
4fc4accb6e
Fix sidedness derp in LanguageRegistry.
2013-09-13 19:04:25 -05:00
Christian
9387bae26b
Update MCP data
2013-09-03 17:56:09 -04:00
Christian
b41a7e1dab
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
b9ac2ac13c
Use java 1.6 compatible method of closing the zip file. Stops stupid compile error.
2013-09-02 00:12:36 -04:00
Christian
4f9b778d14
Allow server side lang file injection, hopefully
2013-08-27 22:45:10 -04:00
Christian
5925fa7c79
Allow coremods to properly inject asset readers.
2013-08-27 12:31:37 -04:00
Christian
ded1a92dfd
Update tweaker for new Launcher API
2013-08-23 10:42:26 -04:00
Christian
3b4f1983ce
More exception handling for less derpiness.
2013-08-20 20:46:18 -04:00
Christian
94462565a5
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
6818c0f4da
Try and use the relaunch log, which should be classloaded..
2013-08-19 14:55:37 -04:00
Christian
4eb97daac3
Fix up scala refs, for better results
2013-08-18 18:58:36 -04:00
Christian
ed258920a0
Check keys, not values *sigh*
2013-08-17 13:27:43 -04:00
Christian
877dc77b75
And more coremod logging
2013-08-17 13:14:55 -04:00
Christian
dcba47209f
Add in some log information
2013-08-17 13:10:28 -04:00
Christian
904e2df1f9
And actually instantiate the collection *sigh*
2013-08-17 12:57:15 -04:00
Christian
643e3d441a
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
8f9b54a97a
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
7c7cafbae1
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
779139b3ca
Fix stupid derp is stupid. Closes #275 and means sp614x can do his thing
2013-08-16 16:18:50 -04:00
LexManos
4406d1e171
Update installer.
2013-08-06 11:42:38 -07:00
LexManos
3787e5d701
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
ea33f502fc
Fixed install.sh not passing arguments to install.py
2013-08-03 17:43:57 +01:00
cpw
1a9a16495a
Merge pull request #266 from grompe/patch-1
...
Add missing SideOnly in BaseMod
2013-08-01 04:21:22 -07:00
Grom PE
971dc1eb00
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
952218c845
Add in some reverse lookup methods for game registry data
2013-07-29 22:05:22 +02:00
cpw
7d31e4b25e
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
e71ee7721b
Fix keybindings being derped
2013-07-28 20:52:12 +02:00
LexManos
f872ac0a90
Use json 2.9.1 nightly for OSX in release json like vanilla does.
2013-07-17 12:21:26 -07:00
LexManos
f4311e2fae
Stupid spaces and windows escaping -.-
2013-07-16 14:34:43 -07:00
LexManos
a9e2a2089f
Add quotes for paths with spaces -.-
2013-07-16 13:35:14 -07:00
LexManos
f40e4cf3a8
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
9de739723f
Fix potential NPE in villager skin registry.
2013-07-16 10:32:29 -07:00
LexManos
136e2180f7
Fix server launching.
2013-07-15 10:57:44 -07:00
Christian
10c6e5e353
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
d0c2a8e62b
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
8f2823709c
The server.classpath generates the runtime manifest, so it needs the
...
non-debug asm jars.
2013-07-14 11:12:42 -04:00
LexManos
bf6f038793
Update Forge signature for new private key
2013-07-12 03:05:20 -07:00
LexManos
5d89e17ae9
Update build and eclipse workspaces for debug asm.
2013-07-12 00:22:11 -07:00
Christian
caeb0afecf
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
3dd0b5d496
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
09cf5feee5
Kill mcp's truncate method, for more useful logs.
2013-07-10 15:23:21 -07:00
Christian
e33a1a02bf
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
32680bb84d
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
28727a51a6
Update FML for new stealth update for 1.6.2
2013-07-09 15:00:28 -04:00
cpw
11bf88fceb
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
1fe0dcec09
And don't forget to remove the test code
2013-07-09 08:31:40 -04:00
Christian
fbfc11c9a9
Decode the file URL. Hopefully will make things work more..
2013-07-09 08:30:47 -04:00
LexManos
95aa81bb3f
Disable signature check of client for now, it's broken.
2013-07-09 05:04:11 -07:00
LexManos
50a8b1cc68
Temporarily disable GuiModList's Mod logos.
2013-07-09 03:27:49 -07:00
LexManos
a0211c4fb7
Don't validate signatures on servers, they are not signed.
2013-07-09 03:27:29 -07:00
LexManos
f45499612d
Add MC Version to installed version name.
2013-07-09 03:27:01 -07:00
LexManos
66531ad420
Fix NPE in new debug line when patch targets don't exist.
2013-07-09 01:21:50 -07:00
Christian
67caa6692d
Don't initialize the server.
2013-07-08 22:31:15 -04:00
Christian
2f299820fb
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
9071d7d5e2
Test server-siding ResourceLocation
2013-07-08 19:31:00 -04:00
Christian
e0b7d1599c
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
bfe955dbf2
Update for stealth update. Thanks mojang!
2013-07-08 13:19:55 -04:00
Christian
e64c07a109
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
94315253b1
Tweak debug data on patched classes
2013-07-08 12:28:32 -04:00
Captain Shadows
b788686126
@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
611668931e
Update eclipse workspaces for 1.6.2
2013-07-07 13:11:22 -07:00
Christian
ab3220cbb3
Add the jsons for 1.6.2
2013-07-07 16:05:53 -04:00
Christian
d164343522
Update for 1.6.2 and MCP 8.04
2013-07-07 15:49:11 -04:00
Christian
dcab319acf
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
53a607bad9
Merge pull request #247 from jk-5/patch-1
...
Pull request for #232
2013-07-06 18:54:54 -07:00
Christian
9c8b8bb794
Update mcp data. fixes #248
2013-07-06 21:25:36 -04:00
Christian
412a86ec71
Fix coremod injection into main system. Should stop double-dipping coremods.
2013-07-06 20:51:00 -04:00
Jeffrey Kog
3f257231a5
Update ModLoaderFuelHelper.java
2013-07-04 08:33:03 +02:00
LexManos
d04480b8b0
Move Resource refreshing until affter postInit.
2013-07-03 22:29:10 -07:00
LexManos
a1db21a601
Fix missing argument and startclient/startserver support.
2013-07-03 19:30:30 -07:00
LexManos
4f535cfbf8
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
0b1fdde35d
Fix eclipse workspaces and launch configurations.
2013-07-03 18:22:57 -07:00
LexManos
c3974de125
Add deobf-data to setup env.
2013-07-03 18:22:06 -07:00
Christian
30ec1e06c7
Update key
2013-07-03 08:28:59 -04:00
Christian
a2a8f1247f
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
e45767d20a
More javadoc cleanup
2013-07-02 19:39:02 -04:00
Christian
aaaffda3f0
Fix up some deprecation warnings, and clean up coremod code that's going
...
away.
2013-07-02 19:27:50 -04:00
Christian
d648514a90
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
f8f78c8a80
Fix transformer search
2013-07-02 18:40:23 -04:00
cpw
18c5bde7d0
Merge pull request #243 from jrtc27/modclassloader
...
Fixed ClassCastException when loading ModLoader mods
2013-07-02 15:32:35 -07:00
James Clarke
b2ef2bed36
Fixed ClassCastException when loading ModLoader mods
2013-07-02 20:48:00 +01:00
Christian
5d0d45ea40
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
58a00d68a4
Keep these on our servers until the launcher is actually fixed -.-
2013-07-01 23:26:40 -07:00
Christian
0f319c41e0
Remember to update your patches!!!!
2013-07-02 02:14:31 -04:00
Christian
76a1489d4b
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
f978e6b50e
Fix EventHandler annotation.
2013-07-02 01:08:51 -04:00
Christian
160b2dc749
Fix -rel json
2013-07-02 01:02:02 -04:00
LexManos
b474a69a90
Point scala downloads to our servers, Launcher doesn't like standard maven repos.
2013-07-01 21:53:13 -07:00
LexManos
b758104a37
Fix json syntax error.
2013-07-01 20:33:26 -07:00
Christian
fa9789a3d4
Fix up release JSON
2013-07-01 23:14:31 -04:00
Christian
46dcb86a62
Update json samples
2013-07-01 22:58:08 -04:00
LexManos
0f3e999323
Build installer package for the new client launcher.
2013-07-01 19:40:19 -07:00
LexManos
69d1a35cd5
Add FML Installer logo crated by @ZaverSLO https://twitter.com/ZaverSLO/status/349947190300508162
2013-07-01 19:38:44 -07:00
LexManos
7e8e083c80
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
ed5d8fa2e6
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
ddbec7d9dd
Update mcp URL.
2013-07-01 11:06:20 -04:00
Christian
3e8f4552dd
Cleanup coremod code, server side working now.
2013-06-30 22:51:56 -04:00
LexManos
cd9a5d63a2
Add deobf data to merge-common, worspace is now actually runnable!
2013-06-30 19:41:51 -07:00
LexManos
f37e5b8338
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
4e1ac5b80d
Fix wrong project name in distro eclipse launch.
2013-06-30 18:33:26 -07:00
LexManos
d92b8e8589
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
5735c7f603
Client launch for eclipse
2013-06-30 21:06:33 -04:00
Christian
de18b5ecc1
Functional client @ 1.6.1
2013-06-30 21:02:23 -04:00
Christian
7371511e5a
Tweak commands patch
2013-06-30 19:33:47 -04:00
Christian
569b791b93
1.6.1
2013-06-30 16:50:30 -04:00
Christian
a82c90d7d6
Merge branch '16launch'
2013-06-30 13:20:46 -04:00
Christian
72e0adedeb
Some fixes for updated mcp code
2013-06-30 13:17:20 -04:00
Christian
daa85290e4
More fixups
2013-06-30 09:04:50 -04:00
LexManos
ae922989ed
Another typo
2013-06-30 03:55:26 -07:00
LexManos
bdc0011e90
Fix typo in new packages.
2013-06-30 01:01:55 -07:00
LexManos
c7758deffa
Push conf folder for 1.6, Relied heavily on a yet-unreleased version of MCP.
2013-06-29 22:48:24 -07:00
Christian
572c9acc59
More fixes, binpatching works
2013-06-29 15:16:18 -04:00
Christian
5b5f05859c
First draft of 1.6 update
2013-06-29 13:33:14 -04:00
Christian
70b1dcfbac
New mappings for marker
2013-06-29 09:20:59 -04:00
Christian
069aba5b46
Tweak missing mapping
2013-06-29 09:20:59 -04:00
LexManos
837a6fdf8a
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
58ce9b33b3
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
028c77c3a0
Add Clean Server/Client launcher. Update Start.java to new Main class and login system.
2013-06-28 22:12:07 -07:00
LexManos
da8fb7f8a0
Update eclipse projects for new libraries dependancies, and update packages for new 1.6 classes.
2013-06-28 20:31:02 -07:00
LexManos
4cd3d06286
Add suggestions output if it can.
2013-06-27 22:58:00 -07:00
LexManos
030e8e71a8
Fixed update_packages.py for new folder strcture.
2013-06-27 22:30:40 -07:00
LexManos
cf448bb934
Add missing argument
2013-06-27 22:29:10 -07:00
LexManos
90c643183e
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
611c3b9591
Add a simple property annotation system for mods.
2013-06-27 08:40:31 -04:00
Christian
b2e9557b87
Changed to the EventHandler annotation universally, documentation and stuff.
2013-06-26 14:52:56 -04:00
Christian
3c0048b6d6
Fixes, so it builds again..
2013-06-24 16:30:18 -04:00
Christian
b985ec886a
Ignore binpatch
2013-06-24 16:03:54 -04:00
LexManos
3e346cb8b2
Add filter support for MCPMerger, and filter out libraries from the server's 'fat jar'.
2013-06-23 23:06:25 -07:00
LexManos
82c0fbce60
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
39858c6ead
No more debug please
2013-06-15 01:11:29 -04:00
Christian
14ddd2be05
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
30d836fa36
More fixups for new launcher model
2013-06-14 20:45:52 -04:00
Christian
07a5efe612
Merge in binpatch and use launcher
2013-06-14 17:21:49 -04:00
Christian
21240df8bc
More tweaks
2013-06-14 09:32:51 -04:00
Christian
a923a2c142
Server side tested and working. Setup is complex atm. That will change.
2013-06-13 09:57:55 -04:00
Christian
4802d04bfd
First cut of runtime binary patching. Needs some work to actually test it in a real scenario..
2013-06-12 08:53:10 -04:00
Christian
83ed6fa32c
Small tweaks to the mcp data. Nothing major..
2013-06-11 14:47:23 -04:00
Christian
c170b98a8c
Attempt to properly fix deadlock if the internal server derps. It should never hang now. Damn you fast computer..
2013-06-11 14:41:19 -04:00
Christian
146e773264
Fix sysout with trailing messages after a newline
2013-06-06 11:52:15 -04:00
Christian
1261c7a3e0
Add in an optional modid identifier for @SidedProxy. It's main use is when both scala and java @Mods reside in the
...
same package, and you want the @SidedProxy behaviour for a specific @Mod language type. In general it should not be needed otherwise.
2013-06-06 10:05:34 -04:00
Christian
fea7a25a86
Don't continue trying to send events to mods that depend on errored mods.
2013-06-04 13:59:04 -04:00
Christian
8602848f2c
Don't throw an exception if the scala adapter find a java proxy. I may add some distinguishers to @SidedProxy so you know which mod it's for.
2013-06-04 12:51:46 -04:00
Christian
2a064ffdc7
Send the "suspect list", and print the suspect versions
2013-05-27 11:03:23 -04:00
Christian
6ca37a60b7
Throw the sorting exception
2013-05-27 10:46:22 -04:00
Christian
8be20d6805
Add in a pretty sorting error screen
2013-05-27 10:28:00 -04:00
Christian
e3cd509b9a
More tweaks to the mod sorting code
2013-05-27 10:09:51 -04:00
Christian
ece6290c19
Try and clean up cycle detection output a bit
2013-05-27 09:25:50 -04:00
Christian
aa18bed75e
Fix server side derp with Forge network packet handler
2013-05-21 11:01:50 -04:00
Christian
c8cc7b27d1
Separate network mod config from setup. Allows for Forge Packet Handler nicety
2013-05-20 21:40:42 -04:00
cpw
8f779cf618
Merge pull request #230 from fnuecke/master
...
Alternative setter logic for @SidedProxy in Scala classes/mods.
2013-05-11 15:34:37 -07:00
LexManos
6b39f612df
Don't spit error on LWJGL not supporting 4.3 just warning.
2013-05-11 10:55:39 -07:00
Florian Nücke
15e6ddcb14
Merge declaration and initialization of a variable.
2013-05-08 20:16:15 +02:00
Florian Nücke
a14c627cd7
Some more Scala @SidedProxy adjustments. Now properly supporting pure singletons, i.e.
...
object C {
@SidedProxy(...)
var proxy: P = null
}
Removed fallback, as all such singletons are properly handled by the new code now, and class implementations fall back to the code also used for plain Java mods.
2013-05-08 19:04:35 +02:00
Florian Nücke
283dfb6e7d
Alternative @SidedProxy setter for Scala.
2013-05-08 05:36:28 +02:00
LexManos
4db40c7861
Add version detection to astyle and print error if it doesnt detect version 2.0+
...
Also fixed astyle's config for max-instatement-indent that sometimes caused crashes with certian versions of astyle.
2013-05-03 14:26:27 -07:00
cpw
3d5658b90f
Merge pull request #227 from CovertJaguar/patch-1
...
Improved Entity Spawn Error
2013-04-29 22:10:53 -07:00
CovertJaguar
ce99b80932
Improved Entity Spawn Error
2013-04-29 20:41:20 -07:00
LexManos
42564b3988
Fix scalac detection to actually use the located command instead of defaulting to 'scalac'
2013-04-28 16:35:23 -07:00
LexManos
bff831ce8d
Update MCP's md5 for the fixed srg files.
2013-04-28 12:33:42 -07:00
Christian
3baad0a897
Update for minecraft 1.5.2
2013-04-27 01:24:06 -04:00
Christian
2c7c944e96
Don't leave scala running in interactive mode.
2013-04-23 22:56:18 -04:00
LexManos
74e9b293e1
Fix patch derp.
2013-04-23 19:47:43 -07:00
Christian
5a81b37bcf
Fix when an old scalac is present on the system to not fail the build
2013-04-23 22:43:51 -04:00
Christian
cee176eb96
Some fixups for scala compilation in MCP. Scala should now be compilable and reobfuscatable with srgnames in MCP.
2013-04-23 07:40:49 -04:00
Christian
e97834b433
Fix URL for MCP
2013-04-23 07:22:25 -04:00
Christian
4d442ac219
Fix possible NPEs in GameData
2013-04-22 21:14:34 -04:00
Christian
8974a78c0a
Attempt to reduce lines on the screen for id mismatch. Hopefully prevents game crashes.
2013-04-22 21:14:34 -04:00
cpw
d15889075c
Merge pull request #225 from MarcinSc/master
...
Suggested fix for issue 221
2013-04-21 11:32:51 -07:00
Marcin Sciesinski
bdee7e3c5b
Fixing the GameRegistry. Now it is possible to register a Block with a BlockItem using following code:
...
MyBlock myBlock = new MyBlock();
GameRegistry.registerBlock(myBlock, MyBlockItem.class, "myBlock");
where MyBlockItem class has one constructor with signature:
public MyBlockItem(int id, Block block)
2013-04-21 19:01:18 +01:00
Christian
0512525c58
Add a to string to fmlmodcontainer: should mean less derpy cyclic dependency data
2013-04-21 13:58:18 -04:00
cpw
76ffd19bc5
Merge pull request #224 from Glought/master
...
Fix for Issue #223
2013-04-21 08:13:54 -07:00
Glought
074d7c2ec7
Update FMLDeobfuscatingRemapper.java
...
Fixes a "Type mismath:cannot convert from element type Object to FieldNode" error at line 176.
2013-04-21 05:09:19 -07:00
Christian
3446f1ce26
Fix scala supporting SidedProxy. It should work now.
2013-04-20 23:31:22 -04:00
Christian
6c0bb61425
Fix a small modloader compatibility derp: closes #222
2013-04-20 22:55:56 -04:00
Christian
e204d580a8
Fix possible NPE in findItemStack, closes #218
2013-04-17 07:55:33 -04:00
Christian
3d142df102
Use more expressive language when a version specifier is a simple unbounded above condition
2013-04-16 13:46:55 -04:00
Christian
0888a95f2d
Fix to output versions in crash logs
2013-04-16 13:46:55 -04:00
cpw
470070e2ce
Merge pull request #216 from agaricusb/add-srgname
...
Add srgname to registerTileEntityWithAlternatives
2013-04-15 15:50:47 -07:00
Christian
3020daf42d
Merge branch 'agaricusb-fix-deobf-field'
2013-04-15 17:31:09 -04:00
Christian
1a9cb9e3c9
Add in some caching of the read field descriptions for efficiency
2013-04-15 17:30:35 -04:00
Agaricus
03bc9cf00a
Add type info to properly deobfuscate overloaded fields. Fixes #210 .
2013-04-14 16:54:11 -07:00
Agaricus
76275cafc4
Add srgname to registerTileEntityWithAlternatives
2013-04-14 14:11:37 -07:00
Christian
0a1f3e3150
MCP names update
2013-04-10 12:28:20 -04:00
LexManos
d89f0dc683
Re-worked the Texture patches, optifine helper function, and re-added support for dynamically rotating the texture for mod authors who do things horribly wrong.
2013-04-09 20:06:41 -07:00
Christian
ff95739dc8
Fix compilation derp, and clean up rotation helper.
2013-04-09 21:20:31 -04:00
Christian
2208df18c4
And add the patches *sigh*
2013-04-09 20:26:10 -04:00
Christian
10f08460a6
Very significant improvement in performance by using glSubImage to upload data. Inspired by frequent complaints about performance of hires
...
texture packs. They probably still need a beefy system but should work. Hopefully I can figure out why the subImage GL side copy isn't working
properly for an even more significant speed boost. But this gets things started.
2013-04-09 20:15:14 -04:00
LexManos
bc44fbe7dd
Fixed issue with instalation when java/javac commands had quotes.
2013-04-05 10:26:33 -07:00
LexManos
5cd066767a
Sanitize input to isRemappedClass to use '/' as a package seperator like the srg files.
2013-04-04 23:30:10 -07:00
LexManos
2c0133af1d
Added the ability to save transformed classes to disc for debugging.
2013-04-04 10:32:48 -07:00
Christian
cc2bf9d8ac
Fix NPE when branding isn't present
2013-03-31 10:01:46 -04:00
Christian
5be6e8b756
And the core patches for that
2013-03-30 12:13:53 -04:00
Christian
41cd50d4c0
Change snooper/crash report brand handling. fmlbranding now loads another string!
2013-03-30 12:12:54 -04:00
Christian
1bfb87a701
Fix up derp in access transformer
2013-03-27 19:23:10 -04:00
Christian
27fe51a39c
Attempt to make any "default package" class public. This might fix problems with certain modloader mods that ship changes to vanilla classes.
2013-03-27 16:54:26 -04:00
Christian
a408fec0b8
Add some information, and a log message letting you know it worked
2013-03-23 16:01:20 -04:00
Christian
f41210d982
Add a mechanism to dump the registry- useful for mod developers.
2013-03-23 15:39:34 -04:00
Christian
49ebcae9a1
Validate supplied stack size
2013-03-23 15:10:13 -04:00
Christian
4550b5795a
Clone the itemstack, and allow for passing in a stacksize
2013-03-23 14:58:25 -04:00
Christian
db46ea94bc
Itemstacks in the GameRegistry (manual registration by mods)
2013-03-23 14:48:57 -04:00
Christian
1d0e8e9935
Fix mismatch screen a bit. Should render more correctly now and
...
at least not be blank in a lot of circumstances..
2013-03-22 10:20:53 -04:00
cpw
b6835334b2
Merge pull request #208 from jrtc27/patch-1
...
Fixed FMLRelaunchLog's Newline Handling
2013-03-22 05:44:38 -07:00
James Clarke
84684cf3b6
Fixed FMLRelaunchLog's Newline Handling
...
System.out.println("\n") causes currentMessage to start with a newline character, which means idx will always be 0 from then on. Therefore if idx is 0 messages must still be logged, otherwise no more messages sent to stdout will be logged and they will just accumulate in currentMessage.
2013-03-22 09:19:39 +00:00
Christian
7e87a2e18f
Fix up patch properly. Also, fix md5s for the jars.
2013-03-22 01:48:21 -04:00
cpw
d5bce9d7f8
Merge pull request #206 from mDiyo/patch-1
...
Fix missing block world rendering
2013-03-21 07:41:35 -07:00
mDiyo
68f48f4acc
Fix missing block world rendering
2013-03-21 07:10:55 -07:00
LexManos
c33f8316d9
Merge MC 1.5.1 branch to master.
2013-03-21 04:10:30 -07:00
LexManos
83b1acb169
Merge pull request #204 from agaricusb/fix-mcpdir
...
Fix install.py --mcp-dir option
2013-03-20 10:24:27 -07:00
LexManos
b6f2573adb
Updated for new PR client jar.
2013-03-20 08:59:25 -07:00
Agaricus
79abc05c20
Fix install.py --mcp-dir option. Fixes #204 .
2013-03-19 21:42:04 -07:00
LexManos
c0eaa8d743
Someone derped up this function bad, revert name.
2013-03-19 17:54:06 -07:00
LexManos
4900d41946
Updated to latest MCP and Minecraft 1.5.1 Pre-release.
2013-03-19 15:48:42 -07:00
LexManos
11d5ac1e07
Fix NPE with CoreMods who do not have the new MCVersion annotation.
2013-03-19 13:48:18 -07:00
Christian
b8f72c678b
Support simple mc version test in coremods, only effective through
...
jar loading.
Also, log some more data about the environment.
2013-03-17 23:40:12 -04:00
Christian
ed17b11a76
Use the relaunch log, for class circularity safety.
2013-03-17 23:19:39 -04:00
Christian
ab79ef7e19
Fix the logger to treat newlines better, hopefully. Closes #199
2013-03-17 23:15:18 -04:00
LexManos
a8ae410493
Fix potential NPE in class loading and add extra debug information.
2013-03-17 11:54:26 -07:00
cpw
e53e39343b
Merge pull request #200 from bspkrs/patch-2
...
Added comments to note FML-only methods
2013-03-14 18:37:08 -07:00
Christian
06347b2a54
Fix AllPublic access transformer not affecting methods. Should fix modloader
...
compatibility
2013-03-14 15:53:19 -04:00
bspkrs
30f76c67e5
Added comments to note FML-only methods
2013-03-14 01:29:36 -03:00
LexManos
d98a805b30
OS X's python 2.6.1 has a bug in zipfile.extractall that makes it unzip directories as regular files. So switch to extract
2013-03-13 13:11:43 -07:00
LexManos
99b938a800
Allocate more ram {typically 256 is defailt} to fermflower, should fix decomplication issues on OSX
2013-03-13 13:11:10 -07:00
Christian
a208d69a09
Fix up stupid derp in IMC code: actually reset the IMC list after
...
each delivery. Fixes a bunch of mods. Sorry everyone.
2013-03-13 15:09:50 -04:00
Christian
a80049eca2
Pass obfuscation status to coremods
2013-03-12 21:06:37 -04:00
Christian
78732231d4
Fix up deep tree deobfuscation
2013-03-12 20:33:19 -04:00
LexManos
71fc1afd0d
Missed joined.exc, must fix scripts.
2013-03-12 15:12:49 -07:00
LexManos
619c97a634
Update MCP for latest PR silent update.
2013-03-12 15:02:58 -07:00
LexManos
81d9e8315c
Readjust size of mods button when Minecraft Realms button is enabled.
2013-03-11 16:20:56 -07:00
Christian
1f4098d779
Update MCP, fixes the "broken texture packs" problem.
2013-03-11 16:31:26 -04:00
Christian
f08dec0d63
Fix "0 mods" display when installed in forge.
2013-03-10 12:12:22 -04:00
Christian
afb18ee321
Change type of connection queue to a concurrent linked queue. Much more efficient, hopefully. Closes #189
2013-03-10 01:25:36 -05:00
Christian
b6d98f47a8
Merge branch 'master' of github.com:Uristqwerty/FML
2013-03-10 01:22:24 -05:00
Christian
424ba13bb2
Fix supertype parsing to handle null superclass (Hi Object!). Closes #160
2013-03-10 01:20:08 -05:00
Christian
72f55cfd08
Fix demo mode crash. Closes #187
2013-03-10 01:15:16 -05:00
Christian
d3d4e7683c
Fix coremods without a manifest crashing the game. Closes #181
2013-03-10 01:05:31 -05:00
Christian
796f70b545
Fix reflection helper: it needs to unmap the classname to find the field maps.
2013-03-09 17:58:18 -05:00
Christian
46b909e818
Try a different way of remapping the fields. Should work because it's userspace, not relauncher space
2013-03-09 17:36:31 -05:00
Christian
a713300e0a
Revert "Use the reobfuscation maps in the reflection helper for field lookups: should help some reflection cases with the deobf."
...
This reverts commit 485db6be2e .
2013-03-09 17:32:11 -05:00
Christian
c33cd0d9ea
Use the reobfuscation maps in the reflection helper for field lookups: should help some reflection cases with the deobf.
2013-03-09 17:19:48 -05:00
Christian
0d3d03ab83
Fix up some relauncher stuff: the vanilla applet works now, as do other applets. Deobf data is resolveable for them too.
2013-03-09 15:25:58 -05:00
LexManos
d24461c50a
Fixed srg name of minecraftDir for runtime deobf.
2013-03-09 11:52:40 -08:00
Christian
f13437df46
Fix runtime deobfuscation for remapped inner classes
2013-03-09 14:06:39 -05:00
LexManos
a8da44fb8f
Fix Multi-part entity children ID issue, mobs with custom spawning must deal with child ids themselves.
2013-03-09 10:07:41 -08:00
Christian
a98bf99037
Fix up some small things, merging into mainline
2013-03-09 12:39:36 -05:00
Christian
23ea71130f
Merge branch 'snapshot15'
2013-03-09 12:26:14 -05:00
Christian
1176144590
Fix accidental commands.patch overwrite
2013-03-09 12:25:24 -05:00
Christian
9b8c65d3c2
Merge branch 'snapshot15'
2013-03-09 12:19:37 -05:00
Christian
3c14424e30
Some fixes for the snapshot
2013-03-09 12:10:13 -05:00
Christian
1a3022ae7a
Revert "Fix modlist to use the new texture binding functions, i think"
...
This reverts commit 48544db690 .
Conflicts:
client/cpw/mods/fml/client/GuiModList.java
2013-03-09 11:12:12 -05:00
cpw
3f197d0b30
Merge pull request #195 from RainWarrior/snapshot15
...
Fixes GameRegistry.registerBlock
2013-03-09 07:07:48 -08:00
RainWarrior
c2fce94d6b
Fixes GameRegistry.registerBlock
2013-03-09 14:06:12 +04:00
Christian
2dece4d42a
Update MCP info for latest
2013-03-08 23:14:30 -05:00
Christian
07513ff7c8
Support the MCP format of partial reobfuscation for portability. Ensure modloader-like compatibility
2013-03-08 23:13:39 -05:00
LexManos
6f124e0f1a
Update for new MCP with srg reobf.
2013-03-08 18:11:44 -08:00
Christian
ed3b056305
Update to MCP 1.5 and minecraft 1.5.
2013-03-08 20:36:05 -05:00
Christian
0de7554d8b
Global object registry, also, support the new itemblockwithmetadata constructor
2013-03-08 13:17:12 -05:00
Christian
304e717aea
Scala support!
...
It's still primitive, I hope that people will like it. I do :)
2013-03-07 20:22:24 -05:00
Christian
f744cd0686
Tweak license text- any osi licensed project can use the asm transformer code
2013-03-07 19:41:52 -05:00
Christian
845a9c5792
Fix up state transition derp when the server crashes with an error- it shouldn't double-derp
2013-03-07 19:37:52 -05:00
Christian
ba5165f86b
Strip deprecated code
2013-03-07 19:33:34 -05:00
Christian
d2509a70b7
Refresh copyright notices on everything
2013-03-07 19:25:48 -05:00
Christian
545d5e0524
Refresh the renderengine after modloading is complete. Should fix issues with out-of-place texture registration by mods.
2013-03-07 19:02:26 -05:00
Christian
e7e2ffd8fb
FIX massive performance issue with FML. Thanks to @sfPlayer1 for finding
...
this epic derp on my part!
2013-03-06 14:00:28 -05:00
Christian
56be84a3b8
Update next render to 40
2013-03-04 22:52:24 -05:00
Christian
9cbf2a08e9
Capture Minecraft logs into FML logging
2013-03-04 22:45:58 -05:00
LexManos
95497900c3
Force file name encoding to UTF-8, caused different zips on different systems.
2013-03-04 18:19:06 -08:00
LexManos
530b6fb074
Ignore again, testing submodule.
2013-03-03 11:54:53 -08:00
LexManos
fd94a8f541
Ignore this commit.
2013-03-03 11:52:47 -08:00
Christian
a37607979d
Ignore deobf data
2013-03-03 14:04:41 -05:00
Christian
c8a403fa24
Force the joined.srg timestamp to zero- avoids annoying sha1 differences
2013-03-02 15:06:13 -05:00
Christian
879213019b
Don't enforce signatures on minecraft classes
2013-03-02 14:48:08 -05:00
Christian
b1e826eb62
Update MCP URL for snapshot
2013-03-02 10:56:25 -05:00
Christian
3a2d167885
Fix up runtime deobfuscation. Working well now.
2013-03-02 10:46:32 -05:00
Christian
429dfc3d3d
Build, and use, MC versioned deobfuscation data
2013-03-02 10:30:45 -05:00
Christian
245e7312b2
Merge branch 'runtimedeobf' into snapshot15
2013-03-02 10:04:06 -05:00
Christian
8b8b150aa9
Add in build for deobf data zip file, update for official mcp 7.39
2013-03-02 10:02:02 -05:00
LexManos
97f2bbe5dd
Fix exc for renamed Behavior classes.
2013-03-02 00:48:44 -08:00
LexManos
a0a4683ef9
Actually remove classes from the csv when removed, and moved All EntityMinecart entities to net.minecraft.entity.item
2013-03-02 00:12:31 -08:00
LexManos
5ef2c4c5ab
Delete unneeded patch
2013-03-02 00:11:48 -08:00
LexManos
e0c7e3859d
Readd ignore for argo and bouncycastle, needed for our replacement to work properly.
2013-03-02 00:11:33 -08:00
Christian
793ae904af
Update FML to 1.5 snapshot 13w09c
2013-03-02 02:06:32 -05:00
Christian
f9094e3f85
Tweaks to runtime deobf
2013-03-02 01:49:45 -05:00
LexManos
81bf16decd
Update distribuited eclipse's classpath for updated libraries.
2013-02-28 04:22:34 -08:00
LexManos
4272159492
Fix crash in GuiModList for mod logo files, logo is not rendering for unknow reason.
2013-02-27 22:41:00 -08:00
LexManos
d8e82d4c35
Fix bug in rename_vars where certian items would fail to be renamed.
2013-02-27 22:40:15 -08:00
LexManos
3d48e707e8
Just enable server side compile, and warn not to cmplain to us.
2013-02-26 14:54:18 -08:00
LexManos
685aecddac
Fixup reobfusication of server code if present.
2013-02-26 14:34:51 -08:00
Christian
e7b1242cfb
Tweak IASM hook api. You can return multiple classes now.
2013-02-26 15:04:45 -05:00
Christian
e4dd3791ef
Merge branch 'runtimedeobf' into snapshot15
2013-02-26 10:24:03 -05:00
Christian
7b0745c336
Change readFully to actually read a bunch of bytes at once now. Thanks to nallar and aartbluestoke for the suggestion to
...
revisit this..
2013-02-26 01:07:14 -05:00
Christian
2e269c967a
Clean up more junk
2013-02-26 00:28:12 -05:00
Christian
b5ba054fe5
Update libs for 1.5. Lots of new libs.
2013-02-26 00:16:57 -05:00
Christian
939bf833b3
Fix renderengine patch *sigh*
2013-02-25 22:06:20 -05:00
Christian
22831e6b63
Merge branch 'master' into snapshot15
...
Conflicts:
patches/minecraft/net/minecraft/client/renderer/RenderEngine.java.patch
2013-02-25 21:53:56 -05:00
Christian
c056f49796
Merge branch 'master' into snapshot15
...
Conflicts:
client/cpw/mods/fml/client/TextureFXManager.java
2013-02-25 21:18:08 -05:00
cpw
53855cc96b
Merge pull request #188 from immibis/master
...
Console log thread should be a daemon thread.
2013-02-22 22:35:14 -08:00
immibis
75c1dc1091
Console log thread should be a daemon thread.
2013-02-23 19:27:16 +13:00
LexManos
604e81a323
Fix sprite map issue.
2013-02-22 14:45:25 -08:00
Christian
ad582c82a0
Merge branch 'master' into runtimedeobf
2013-02-17 16:29:13 -05:00
Christian
4cafd6c627
Fix Language Registry, closes #163
2013-02-17 16:28:54 -05:00
Christian
d25d70d59d
Fix Language Registry, closes #163
2013-02-17 16:22:58 -05:00
Christian
047de02402
Merge branch 'master' into runtimedeobf
2013-02-16 14:28:29 -05:00
LexManos
bd25e14545
Option to disable renaming for srgnames.
2013-02-08 14:50:17 -08:00
Christian
ae58a0dbe3
Fix HD mob skins, FINALLY!!!
...
Stupid eyes are stupid.
2013-02-06 01:25:46 -05:00
Christian
06eea87b71
Fix up mistake that broke all modloading. Nice.
2013-02-04 10:58:48 -05:00
Christian
11f226e813
Fix some class naming and packaging issues, pending an MCP update
...
for the same
2013-02-02 10:54:48 -05:00
Christian
92a377a4e8
Update for MCP 7.34 and MC 13w05b
2013-02-01 23:05:23 -05:00
Christian
74043f515f
MCP compilation works
2013-02-01 22:42:28 -05:00
Christian
3101006e58
IMC tweaks: runtimeMessages now work (thanks for all that testing for this much requested feature!)
...
and IMCEvent will no longer remove messages if no one gets them, so you can do
just manual runtime polling, if you wish.
2013-01-31 13:39:53 -05:00
Christian
46ccfb235d
More logging tweaks. You can probably configure individual mod log files if you wish now
2013-01-30 20:55:12 -05:00
Christian
0c6019da8f
A log of logging cleanup. FML will now read logging.properties to configure logging channels a couple of times during startup.
...
You should be able to filter a lot of messages based on things like modid and certain FML related features that can be noisy
like item tracking.
Should close #175
2013-01-30 18:57:21 -05:00
Christian
7c6c1254fc
Final part of the deobfuscation data setup- fields are now deobfuscated as well.
...
All that remains, is to figure out what and how to distribute the deobfuscation data itself.
2013-01-28 17:48:44 -05:00
Christian
0c4347f2c3
Read the joined.srg file directly from lib/deobfuscation_data.zip now. Still debating distribution method.
2013-01-28 17:39:22 -05:00
Christian
b41af51ccf
Now actually works for mods, somewhat. It currently generates access violations for
...
ModLoader mods that presume access to fields that are not actually accessible from
a different package.
2013-01-27 22:42:36 -05:00
Christian
9c2b899454
Method deobfuscation now works
2013-01-27 21:50:08 -05:00
Christian
82415f3962
Working to read class names and remap them at runtime.
2013-01-27 17:09:00 -05:00
Christian
b4c7fe1d0e
First draft runtime deobf
2013-01-27 15:55:37 -05:00
Christian
5c99e3488a
Try and handle "death on startup" a bit cleaner
2013-01-27 15:54:36 -05:00
Christian
c19646421a
Deprecate the old GUI ticktype. They're dead and have been for some time.
2013-01-24 17:29:46 -05:00
Christian
3dbffd1754
Tweak a method signature
2013-01-24 10:23:36 -05:00
LexManos
d9db242f4c
Add parameters to FML install to enable/disable certian aspects. Applying patches, running transformer/merger, and decompiling server.
2013-01-24 03:08:19 -08:00
Christian
331e6bcf62
Merge branch 'master' into snapshot15
...
Fix up compilation and patching errors
Conflicts:
common/cpw/mods/fml/common/registry/GameRegistry.java
conf/joined.srg
conf/params.csv
conf/version.cfg
patches/minecraft/net/minecraft/server/dedicated/DedicatedServer.java.patch
2013-01-22 15:21:22 -05:00
Christian
1b332fc1ea
Fix up packages.csv ordering for easier diffing
2013-01-22 14:43:27 -05:00
Christian
51fcf93605
Update for MCP7.30c - fixes redstone rendering issues
2013-01-22 14:40:09 -05:00
Christian
472ca8c8a9
Add in a registry method to allow for alternative TileEntity names- they will be used to support
...
loading maps containing the older definitions.
2013-01-22 13:11:32 -05:00
Christian
c13502c690
Remember to add the new patches!
2013-01-22 09:32:53 -05:00
Christian
6962786e4b
The "ServerStarting" event should now properly crash the server if it fails,
...
so the client will properly exit. Also, added in a "pre-server-start" event
that fires before the worlds are loaded for a save, just for you immibis.
2013-01-22 09:17:04 -05:00
Christian
509b5f8e7e
Javadoc cleanup
2013-01-21 21:37:29 -05:00
Christian
825ecf1a7f
Fix breaking change
2013-01-20 17:54:56 -05:00
Christian
7f4818fd94
Merge branch 'patch-1' of https://github.com/bspkrs/FML into gh-updates
2013-01-20 11:31:47 -05:00
Christian
b52c44e42b
Merge branch 'FMLLogFormatter' of https://github.com/donington/FML into gh-updates
2013-01-20 11:31:24 -05:00
Christian
2c58102515
Update MCP to MCP7.26a and refresh MCP names
2013-01-20 10:30:36 -05:00
Christian
3ddf9b2382
Update address of the FML repository to the new location in all the files
2013-01-18 21:26:43 -05:00
bspkrs
cb769265f0
Fix logical error in comment text
2013-01-16 23:49:09 -05:00
Christian
d576691bfa
Update license text to make clear that FML is not a way to sidestep
...
MCP licensing.
2013-01-15 16:54:26 -05:00
Christian
180173fa94
Fix mcp conf md5 signatures for the snapshot
2013-01-12 14:25:03 -05:00
donington
3e4ed24750
FMLLogFormatter: dynamic log level name
...
FMLLogFormatter now uses getLocalizedName or getName for log level name
Changes to be committed:
modified: common/cpw/mods/fml/relauncher/FMLLogFormatter.java
2013-01-12 00:42:36 -05:00
Christian
334e386b56
Temporary hosting
2013-01-12 00:38:42 -05:00
Christian
c048ec7aef
Another packaging update. I think we're done now.
2013-01-12 00:33:32 -05:00
Christian
3e5a3fb0e4
Fix modlist to use the new texture binding functions, i think
2013-01-12 00:27:11 -05:00
Christian
59af780c91
A couple of packaging tweaks, clean up more junk. It may come back but for now it's gone
2013-01-12 00:17:35 -05:00
Christian
cad228093d
Delete old patches not needed anymore
2013-01-11 23:53:14 -05:00
Christian
431372dc5f
Initial patch update for snapshot
2013-01-11 23:47:05 -05:00
Christian
31faf09c49
Initial setup for snapshot- the client compiles, but patches fail to apply.
2013-01-11 22:49:09 -05:00
LexManos
674a9e5e52
Updated patches for new JAD style names.
2013-01-11 13:16:40 -08:00
LexManos
04e4ce6266
FML will now rename local variables to have JAD-style names instead of FernFlower var## names. New script to do this, to allow for modders to run it over there own code: python rename_vars.py -mcp [folders to rename]...
2013-01-11 13:16:23 -08:00
Christian
8edde44161
Fix incorrect end length calculation. Closes #161 Thanks BStramke!
2013-01-11 09:41:47 -05:00
Christian
79c7933b5e
Fix LanguageRegistry loading files in UTF-8 format. loadLocalization should work for non-xml in
...
all languages now (assumes UTF-8)
2013-01-08 08:46:50 -05:00
cpw
256aef5e0f
Merge pull request #158 from CovertJaguar/patch-2
...
Added an accessor for villagers
2013-01-08 05:36:45 -08:00
CovertJaguar
224d933564
Added an accessor for villagers
2013-01-07 14:55:17 -08:00
LexManos
550928735e
New python script to update java files for new package names. Usage: paython update_packages.py --mcp-dir <mcp folder> [Folders To Repackage]
2013-01-06 22:10:19 -08:00
LexManos
00f65d2c40
New python script for signing partial jar files. See comments inside for details.
2013-01-06 22:09:12 -08:00
Christian
55ca46b382
Move server stopped *after* the server has actually stopped. *sigh*
2012-12-31 01:20:35 -05:00
Christian
80193d4969
Add in a "server stopped" event
2012-12-30 23:52:38 -05:00
Christian
2454ed0fbf
Add in some classloader debugging information: use fml.debugClassLoading=true as a system property
...
to track down problems with classes not being found or loading erratically.
2012-12-30 21:32:37 -05:00
Christian
3715b73f05
Revert MCP name change for canConnectRedstone - it conflicts with a forge method of the same name and breaks 1.4.6 to 1.4.7 compatibility
2012-12-29 00:00:24 -05:00
Christian
964c51f4ae
Update for MC 1.4.7
2012-12-28 10:07:53 -05:00
Christian
bf9272f61e
Fix multiple GUI containers for ML containers. Sorry ultimatechest that
...
this fix took so long, a bug report at github.com/cpw/FML would help,
next time ;)
2012-12-27 23:00:52 -05:00
Christian
193aae6030
Log if there's a problem reading the class bytes
2012-12-27 23:00:37 -05:00
LexManos
95f0315634
Fix NPE in fingerprint loading, and pass expectged fingerprint to FMLFingerprintViolationEvent
2012-12-25 15:59:30 -08:00
Christian
35ee8510fe
Fix a message delivery issue in IMC
2012-12-24 09:41:22 -05:00
Christian
052d798970
Some tweaks for signing and ID matching
2012-12-23 22:27:26 -05:00
LexManos
484a673b1f
Remove unneeded file
2012-12-20 14:30:59 -08:00
LexManos
c5a1b58d85
Fixed placement of onConnectionClosed callback.
2012-12-20 14:30:41 -08:00
LexManos
909b629fa4
MCP will reobf classes with reserved names in windows to a legal file name. And FML will try to read these classes over the default ones.
2012-12-19 19:10:00 -08:00
LexManos
48551959ec
Output obfed files with reserved windows names to _NAME.class
2012-12-19 18:12:11 -08:00
LexManos
c77f20ae17
Add quotes around javac command.
2012-12-19 02:58:09 -08:00
Christian
6201e51134
Update MCP to newer version
...
Fix fingerprint fire
2012-12-18 16:43:48 -05:00
Christian
2fc0ba693c
InterModComms now supports a runtime polling based model for inter-mod comms at
...
runtime.
Deprecate method that shouldn't be used. COPY it's content to your mod. Don't CALL it.
2012-12-18 13:58:57 -05:00
Christian
926766b487
Don't be as alarming about item overwrites.
2012-12-18 08:33:46 -05:00
Christian
7caae273c5
Added configuration file which allows modids to ignore ID validation checking. IT WILL CRASH YOUR GAME in 99.999% of cases.
...
Immibis is a whingy ass. And TinyTimRob too. Now STFU and GTFO. closes #510 for ever.
2012-12-18 08:15:46 -05:00
LexManos
ca2d1fb033
Dixed ev eclipse worksapce, now references BC.
2012-12-18 05:10:32 -08:00
LexManos
ec8d75d1b2
Added client src folder to classpath for startclient/startserver.
2012-12-18 05:06:20 -08:00
LexManos
e9cabc2b7e
Removed hardcoded additions
2012-12-18 05:05:25 -08:00
Christian
5770708e75
Update to MC 1.4.6
2012-12-17 21:48:29 -05:00
Christian
251cb92b12
Fix build script
2012-12-17 17:56:00 -05:00
Christian
0b36189547
more 1.4.6 tweaks
2012-12-17 17:00:54 -05:00
Christian
47dfd99d4f
More work
2012-12-17 14:30:51 -05:00
Christian
289ce3339a
Merge branch 'securityupdate'
2012-12-17 11:46:47 -05:00
Christian
65473ad838
Merge branch 'master' into securityupdate
2012-12-17 11:46:27 -05:00
Christian
25c367f9db
Fix up handling null names. *sigh*
2012-12-17 10:29:54 -05:00
Christian
e6c71bb148
Some tweaks to item identification. The GameRegistry methods are deprecated
...
to encourage you to use the new named ones instead. These will force a
name on the item/block, allowing for stronger matching than "sequential guessing"
2012-12-16 22:57:11 -05:00
Christian
bbe4b9fbc2
More fixes
2012-12-16 21:22:55 -05:00
LexManos
3369976c05
Updated MCP download mirriors upon Searge's request.
2012-12-16 05:35:46 -08:00
Christian
a26b495ef9
Move Side and SideOnly to relauncher package
2012-12-15 23:21:26 -05:00
Christian
8f3b1aeff7
Fix newline fun
2012-12-15 22:37:32 -05:00
Christian
d811fea82c
More stuff for the thingy
2012-12-15 22:30:16 -05:00
Christian
16651d6994
Remove old NEI/CCC compatibility code and other classloading tweaks
2012-12-15 20:40:08 -05:00
Uristqwerty
47281f2de1
Simplify logic in tick start/end
...
Change the EnumSet equivalent of "A &= ~ new(~B)" to "A &= B".
This eliminates the need for one temporary object in a frequently called loop, and reduces the number of methods that need to be invoked.
2012-12-14 04:14:17 -05:00
LexManos
70b9cd6e1f
Fix var name messup
2012-12-13 00:22:30 -08:00
LexManos
60b6913a87
Update released eclipse project to link BouncyCastle
2012-12-12 23:44:28 -08:00
Christian
1dcf3bfbdc
Change ID management slightly. IDs are tracked by block type for itemblock items now. This means servers will need to update.
...
Also, ordinal rearrangements within a mod will no longer trigger server disconnection, though a warning will still be logged.
2012-12-12 19:31:05 -05:00
Christian
d13187d689
Fix possible escape leakage..
2012-12-12 19:31:05 -05:00
LexManos
238dcdd18d
More robust eclipse workspace replacement
2012-12-12 14:31:07 -08:00
LexManos
1812016e29
Kill decompile if astyle is not found and set execution bits on mcp .sh files and astyle-osx
2012-12-11 21:47:45 -08:00
Christian
55dc3467de
Change to download bouncy castle as well. We also finally properly use the downloaded libs
...
even in vanilla code!
2012-12-11 22:37:07 -05:00
Christian
229a501def
Remove extraneous patch file
2012-12-11 20:37:12 -05:00
Christian
64226c3d7e
Merge branch 'repackage'
...
Conflicts:
build.xml
client/cpw/mods/fml/client/FMLClientHandler.java
client/cpw/mods/fml/client/GuiIdMismatchScreen.java
common/cpw/mods/fml/common/FMLCommonHandler.java
common/cpw/mods/fml/common/IFMLSidedHandler.java
common/cpw/mods/fml/common/network/ModIdMapPacket.java
common/cpw/mods/fml/common/network/ModListResponsePacket.java
common/cpw/mods/fml/common/registry/GameData.java
common/cpw/mods/fml/common/registry/GameRegistry.java
common/cpw/mods/fml/common/registry/ItemData.java
common/cpw/mods/fml/common/registry/LanguageRegistry.java
common/cpw/mods/fml/server/FMLServerHandler.java
install/fml.py
patches/minecraft/net/minecraft/client/Minecraft.java.patch
patches/minecraft/net/minecraft/server/MinecraftServer.java.patch
patches/minecraft/net/minecraft/world/storage/SaveHandler.java.patch
2012-12-11 14:58:38 -05:00
Christian
f97b330605
Merge branch 'repackage' of github.com:cpw/FML into repackage
...
Conflicts:
common/cpw/mods/fml/common/registry/GameData.java
2012-12-11 14:49:23 -05:00
cpw
29348240fc
Merge pull request #145 from pahimar/master
...
More logging of loading files in LanguageRegistry
2012-12-11 08:28:39 -08:00
pahimar
5ef0cbfc32
Update common/cpw/mods/fml/common/registry/LanguageRegistry.java
...
Add in logging of what file failed to be loaded
2012-12-11 11:27:05 -05:00
LexManos
65a8bbf9e7
Fix patches, rebased with HEAD
2012-12-10 15:37:48 -08:00
LexManos
9be4b14371
Remade python dist as 32-bit.
2012-12-10 15:26:15 -08:00
Christian
1c5b8ecb7b
Fixing id map generation - should validate correctly now
2012-12-10 15:26:13 -08:00
LexManos
5753eb0738
Reenabled replacement of the eclipse folder.
2012-12-10 14:56:23 -08:00
LexManos
41e899dcea
Remade python dist as 32-bit.
2012-12-10 14:56:05 -08:00
Christian
aee1a3f24d
Fixing id map generation - should validate correctly now
2012-12-09 22:24:16 -05:00
Christian
3f383e2dc6
Fix up idmap code
2012-12-09 22:01:13 -05:00
LexManos
5e0af1f2cb
Some derp protection in the workspace copy.
2012-12-09 02:20:21 -08:00
LexManos
00bdb3dc0b
Removed remaining references to src/common
...
Fixed eclipse workspace replacemnt on source dist
Cleanup some outputs
2012-12-09 02:10:28 -08:00
LexManos
3537fb7f21
Updated build script to not use the mcp common directory as it doesn't exist anymore.
2012-12-08 21:41:51 -08:00
LexManos
099b8259a6
Fished moving out the rest of the default packaged classes to aproperiate packages. Updated patches and code to reflect.
2012-12-08 21:41:16 -08:00
LexManos
21c66eaf98
Updated the update_packages script to support different mcp locations
2012-12-08 21:40:39 -08:00
LexManos
1742abb139
Update fml_marker.cfg, Minecraft is now runnable!
2012-12-08 20:25:29 -08:00
LexManos
804e597aca
Update all imports for repackaging. Branch is compileable.
2012-12-08 20:21:03 -08:00
LexManos
e63311b4d0
Some stragler patches
2012-12-08 19:34:35 -08:00
LexManos
b02f93aeed
Updated patches to new packages.
2012-12-08 19:33:29 -08:00
LexManos
ded6b4667b
Give new classes a distinct package to be moved from.
2012-12-08 17:50:14 -08:00
LexManos
2009c89bf7
Fixed 0.tree to actually refresh the workspace.
2012-12-08 17:35:11 -08:00
LexManos
3e1efdf05b
Remerged branch, and updated dev eclipse workspace.
2012-12-08 17:08:51 -08:00
Christian
f4070ff625
Add in storage, detection and validation of the ItemID array between client and server
...
and also for world saves. May help with item configuration issues.
2012-12-08 17:05:18 -08:00
Christian
e6d66322fe
Add a modid on the mods list, should make it easier to do things like forge chunkloading config
2012-12-08 16:46:47 -08:00
Christian
57fe3c475a
Fix build eclipse extractor task
2012-12-08 16:46:46 -08:00
Christian
bccad16ea6
Add in storage, detection and validation of the ItemID array between client and server
...
and also for world saves. May help with item configuration issues.
2012-12-07 01:52:16 -05:00
Christian
d4b06fd4bc
Add a modid on the mods list, should make it easier to do things like forge chunkloading config
2012-12-04 18:08:27 -05:00
Christian
7b7255013a
Fix build eclipse extractor task
2012-12-04 18:04:45 -05:00
Christian
71044df76b
Fix typo
2012-12-04 01:30:38 -05:00
Christian
edb4e08b22
Merge branch 'master' into repackage
...
Conflicts:
eclipse/Clean/.classpath
eclipse/Clean/.project
eclipse/FML/.classpath
eclipse/FML/.project
install/fml.py
2012-12-04 01:24:50 -05:00
Christian
fa34555efa
Try and make branch non-derpy
2012-12-03 23:47:23 -05:00
Christian
45583a7420
Try defaulting branch differently
2012-12-03 22:26:12 -05:00
Christian
e8ff9f25d9
Remove old eclipse workspace and ship/extract as a zip file (use ant setupenvironment)
...
Fix up install.py for forge multibranch changes
2012-12-03 19:55:37 -05:00
LexManos
61a90e9e74
Assume Forge is the parent directory when checking for AT configs.
2012-12-03 16:53:03 -08:00
Christian
9cdbadb66c
Merge branch 'master' into repackage
...
Conflicts:
patches/minecraft/net/minecraft/client/EntityFX.java.patch
2012-12-03 17:31:29 -05:00
Christian
6fdf5960ef
Name both zips the same format
2012-12-03 08:38:20 -05:00
Christian
329fe50b1d
Last part of branch name only please
2012-12-03 08:30:44 -05:00
Christian
461173a778
Try and get a valid branch name on jenkins
2012-12-03 08:23:21 -05:00
Christian
16418dd7ad
Clean up build.xml script- support outputting a branched jar file
2012-12-03 08:13:20 -05:00
LexManos
e334a469fb
Small derp in install.py
2012-12-02 20:26:36 -08:00
LexManos
d583a760ec
Try marking python as binary.
2012-12-02 20:19:55 -08:00
LexManos
c584d4e3db
FML will now attempt to download MCP as part of the install process
...
Now shipping a py2exe version of python for windows.
Linux/Macs should come with python pre-installed so they do not have a distrabution here.
2012-12-02 19:59:22 -08:00
LexManos
5cf07b008e
Windows Python distrabution created using py2exe, thanks Fesh0r for the script.
2012-12-02 19:56:17 -08:00
LexManos
adad5c96cf
Marked more spots in gui/items bitmask as being free.
2012-11-21 15:58:04 -08:00
LexManos
10cdc06cc3
Delete duplicate file
2012-11-20 18:07:39 -08:00
LexManos
78ff6182fe
Finished repackaging net.minecraft.* net.minecraft.client is left
2012-11-20 17:58:22 -08:00
LexManos
7fb23bf89f
More re-packaging, got most classes out of the default package.
2012-11-20 17:22:55 -08:00
Christian
25a10d6fc4
Fix up MCP version
2012-11-20 08:47:14 -05:00
Christian
389608116f
Merge joined.exc add update howto
2012-11-20 08:38:33 -05:00
Christian
f74b8ac30b
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
554d86f59b
Remove common folder from projects
2012-11-20 03:15:45 -08:00
LexManos
f75bf90e77
Move IBossDisplayData to shared
2012-11-20 03:15:16 -08:00
LexManos
8b1ed2d255
First half of new patches
2012-11-20 03:15:01 -08:00
LexManos
586807c2c8
Update FML imports
2012-11-20 03:14:36 -08:00
LexManos
73a22bb571
Inital script side commit for MC source repackaging done.
2012-11-20 01:55:41 -08:00
LexManos
397d36e900
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
745b697779
Forgot mcp.cfg
2012-11-19 15:47:18 -08:00
LexManos
950154aa61
Updated to 1.4.5b
2012-11-19 15:35:08 -08:00
LexManos
5e5919f61c
Fix python error
2012-11-19 15:03:13 -08:00
LexManos
786b04c57d
Modified decompile so that we do not have to decompile the server, saves time.
2012-11-19 15:01:04 -08:00
LexManos
72938c9133
Cleaned up some tabs
2012-11-19 15:00:11 -08:00
LexManos
f842aa75bb
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
02b6904843
Attempt to fix a possible comodification risk
2012-11-18 20:40:48 -05:00
Christian
8025bf3a2c
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
0340719ca2
Fix mod display list. Shouldn't be derpy anymore.
2012-11-17 23:51:14 -05:00
Christian
c445ab004b
Fix World patch- workaround no longer required and leftovers are bad.
2012-11-17 23:44:53 -05:00
LexManos
8d26642a84
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
783926194e
Fix MC-2497 - derpy torch flames. Moved from forge. Everyone should benefit.
2012-11-16 22:50:21 -05:00
Christian
e8c5b0791f
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
1c9b59b405
Clean up a patch
2012-11-16 16:49:44 -05:00
Christian
719f5f2bde
Update FML for MC 1.4.5
2012-11-16 16:31:06 -05:00
LexManos
6191f2530c
Fix for ModLoader static overrides not displaying.
2012-11-15 14:08:41 -08:00
Christian
8a40e72f90
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
5355348181
Fix spelling issue.
2012-11-08 21:01:31 -08:00
LexManos
4e2f04c48a
FML setup should now download and verify all the minecraft files needed to run MCP.
2012-11-08 17:54:05 -08:00
Christian
96971abe13
Small fix to some MCP metadata for pre2
2012-11-08 20:34:45 -05:00
Christian
3dbe774ec1
Update to MC 1.4.4
2012-11-08 17:55:20 -05:00
Christian
27aa35aa17
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
9c3b07f53a
Clean up some patch fuzz
2012-11-02 17:32:39 -04:00
Christian
c2350be4a7
Update joined.exc file from latest conf
2012-11-02 17:23:54 -04:00
Christian
8ec0cf6ab9
Update to 1.4.3
2012-11-01 23:53:13 -04:00
Christian
1a11b9c0e6
A useful tool for performing updates
2012-11-01 23:11:21 -04:00
Christian
448b85ceeb
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
92010b5bca
Patch a file handle leak in RegionFileCache handling when under memory pressure.
2012-10-31 22:58:01 -04:00
LexManos
30db9154b2
Update MCP mapings again, yay bad syncs.
2012-10-31 09:23:17 -07:00
LexManos
ac41e0928e
Updated MCP mapings.
2012-10-31 07:40:53 -07:00
LexManos
755cceb5cb
StartServer is now useable in merged code base.
2012-10-31 07:40:40 -07:00
Christian
771c818cd4
Remove some debug, closes #123
2012-10-30 21:53:08 -04:00
Christian
17d1f1f157
Fix up tick management outside of mod loading phases for ModLoader mods.
2012-10-30 21:47:06 -04:00
Christian
5197e98fb1
Negatively cache failed class lookups, should help with @SideOnly performance issues.
2012-10-30 21:17:17 -04:00
Christian
1bd53fe75f
Fix some whitespace issues, handle possibly bugged entities as well
2012-10-30 09:13:18 -04:00
Christian
01048c704b
Vanilla/mod bug fixes: CME on entity processing, TileEntity resetting chunk on save/load.
2012-10-29 17:41:08 -04:00
Christian
dd011e16d2
Support for ModLoader 1.4.2. Good job Risu!
2012-10-28 23:55:58 -04:00
Christian
463514fbbe
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
5115306e76
Fix a small problem with the new MCP container- it can cause NPEs. Nice.
2012-10-26 07:55:23 -04:00
Christian
1a31cd0886
Fix up some javadoc complaints
2012-10-25 16:18:42 -04:00
Christian
f7403a509f
Update build - include MCP information in the source pack
2012-10-25 10:00:34 -04:00
Christian
c2f4738c8c
MCP deserves lots of credit. So here it is.
2012-10-25 09:02:49 -04:00
Christian
8a6680f9c7
Fix instantiation bug
2012-10-24 21:58:36 -04:00
Christian
a72f6b1eff
Simple InterMod comms. Send a message using FMLInterModComms.sendMessage(). Receive messages through an @IMCCallback
2012-10-24 16:39:55 -04:00
Christian
39d6ef64c2
Update for MC 1.4.2
2012-10-24 15:12:06 -04:00
Christian
f9db650310
Duplicate Mod display screen.
2012-10-24 09:41:46 -04:00
Christian
4d620ade3e
Fix typo in access transformer
2012-10-23 21:21:28 -04:00
Christian
fc0fc0cc75
Fix the merge for forge
2012-10-23 18:36:05 -04:00
Christian
a3e71f4016
Fix up references to minecraftDir in obf code
2012-10-23 18:10:06 -04:00
Christian
6e8902da86
Update FML for Minecraft 1.4.1
2012-10-23 18:00:33 -04:00
LexManos
37697d7f44
First update to 1.4.1, patches need updating.
2012-10-23 14:44:04 -07:00
LexManos
54f5225530
Add some null checks, and throw descriptive exception when SideTransformer prevents a class from loading.
2012-10-23 13:32:02 -07:00
Christian
190c71eeb5
Ship a client only class so the merge works both sides.
2012-10-21 22:50:20 -04:00
Christian
b88f2e6938
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
8af47f2bb9
Fix up FML python script for forge
2012-10-21 08:19:36 -04:00
Christian
bdb8a7c059
Update to MCP pre 3. Fixes some weirdnesses with explosions.
2012-10-21 07:11:09 -04:00
Christian
76be826ffb
Merge branch '1.4'
2012-10-20 18:07:22 -04:00
Christian
2fcea16485
Update for MCP release
2012-10-20 18:02:26 -04:00
Christian
698f0e69eb
Remove fuzz from patches for INetworkManager change
2012-10-20 17:16:50 -04:00
Christian
8ce9b05d8b
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
c7002207fb
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
fabc324487
Update gitignore - ignore the files that will change or be deleted
2012-10-20 15:14:06 -04:00
Christian
1a3c19430c
Add in "starter" image for eclipse workspace
2012-10-20 15:02:37 -04:00
Christian
6c48db441c
Eclipse workspace fixup 2?
2012-10-20 14:42:25 -04:00
Christian
75fa0f2bdb
Clean up eclipse workspace- part 1
2012-10-20 14:09:44 -04:00
Christian
279b5d5e23
Clean up a bit of patch fuzz
2012-10-20 12:39:40 -04:00
Christian
7da5727e3e
Fix CommonHandler for rename of the server thread class
2012-10-20 12:31:35 -04:00
Christian
59738c493a
Update with RC2 MCP. Use the joined.exc file directly since MCP now provides it.
2012-10-20 12:27:30 -04:00
Christian
70c342908f
Fix exception for CodecMus
2012-10-20 12:12:43 -04:00
Christian
7ac53b4772
Fix some compilation issues. Requires resolving the worldclient abstract method
2012-10-20 11:30:01 -04:00
LexManos
ce847a7c53
Inital patch update to 1.4
2012-10-20 02:43:03 -07:00
LexManos
7afbc1ab93
Moved into EntityVillager
2012-10-20 02:42:34 -07:00
LexManos
2028b0aa7f
Fix line ending detection during checkout.
2012-10-20 02:32:29 -07:00
LexManos
f59de49682
We don't need logging here...
2012-10-20 02:27:26 -07:00
LexManos
ed3f7c14e3
remove useless -Server projects
2012-10-20 00:43:02 -07:00
LexManos
528670d103
Updated the AT config and Marker config for 1.4 obf
2012-10-20 00:36:33 -07:00
LexManos
c106909d91
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
671892fd32
Update MCP Merge config.
2012-10-19 23:57:49 -07:00
LexManos
7fcdb47edb
Pull in MCP's 1.4 conf files.
2012-10-19 23:57:05 -07:00
LexManos
ecf14df030
Fix error in merging of exec's
2012-10-19 21:14:03 -07:00
Christian
9b1375f536
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
ce138ec571
Typos!
2012-10-18 21:00:58 -04:00
Christian
5b4de7b2b5
Try and avoid an NPE in crash reports
2012-10-18 14:41:32 -04:00
Christian
3599c11599
Fix logging problems- log death messages and re-route the server through FML logs properly.
2012-10-17 18:05:23 -04:00
Christian
4af51b0cad
Fix the test mod
2012-10-16 13:24:29 -04:00
Christian
4c39831d2b
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
4aced4ae02
Fix classpath for server
2012-10-16 12:40:01 -04:00
Christian
7327ea75f7
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
a82285964f
Update FML internal classpath. Helpful for coremod devs
2012-10-16 09:47:06 -04:00
Christian
e770c87084
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
924425074f
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
c0795e9bee
FML as a whole is now subject to transformers.
2012-10-16 09:20:30 -04:00
Christian
4f0ddca554
Bonus extra character. thanks randomitter!
2012-10-16 09:06:13 -04:00
cpw
abc651d618
Merge pull request #116 from Vazkii/patch-1
...
Add Null check to FMLClientHandler.sendPacket
2012-10-07 10:45:22 -07:00
Vazkii
f2e4e20f35
Add Null check to FMLClientHandler.sendPacket
2012-10-05 17:36:52 +02:00
Christian
124f47f55c
Update patches *sigh*
2012-10-02 22:04:25 -04:00
Christian
550e622bc7
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
a554846e57
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
0ed0d284b5
New stuff on the ModLoader! Risu has been busy. Closes #114
2012-10-02 08:29:12 -04:00
Christian
9a8a38d345
Mods can now declare a range of minecraft versions they will run against
2012-10-02 01:29:46 -04:00
Christian
7cd5ae04f7
Fix maps supporting greater than byte() dimension sizing
2012-09-29 00:21:42 -04:00
Christian
639039dd18
Fix language registry additions, closes #113
2012-09-28 22:12:23 -04:00
cpw
52da67717f
Merge pull request #112 from pahimar/master
...
Additonal Language Registry functionality
2012-09-26 21:57:53 -07:00
pahimar
df7d2b7161
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
7dbda77f10
Extreme headless mode is back!
2012-09-25 22:46:47 -04:00
Christian
eb034416ae
Fix parent child counts showing properly. Closes #107 thanks scott!
2012-09-25 19:00:36 -04:00
Christian
d21bc1085c
It's useMetadata, not usesMetadata. thanks myrathi and psx. closes #110
2012-09-25 18:57:42 -04:00
Christian
2bee777740
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
b29aebf338
Try and fix the newline capture so consoles show on the server on windows again
2012-09-24 17:22:39 -04:00
Christian
37340b0f80
Readd ancient searge name so dan200 and computercraft can run again. REMOVE THAT CODE DAN.
2012-09-24 17:22:16 -04:00
Christian
98151df96b
Fix missing import. Thanks ichun :(
2012-09-21 18:17:56 -04:00
Christian
f73d283341
Version file searching should work for directories too
2012-09-21 17:39:52 -04:00
Christian
cb2535fa95
Fix bug causing NPE if non-whitelisted player joins an FML server without FML installed
2012-09-21 10:12:39 -04:00
cpw
d1458c594e
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
efb0e73df9
Fixed ModTextureAnimation not updating and not binding to correct image.
2012-09-17 23:46:09 +08:00
Christian
a837d82e68
Tidy code
2012-09-16 21:44:11 -04:00
Christian
9b081b9d46
Change version.properties search slightly, allow access to found file from the preinit event
2012-09-16 21:42:59 -04:00
Christian
83a57f5259
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
e619e00079
Fix up reversed assignment for version fallback
2012-09-16 21:05:56 -04:00
LexManos
8f0b7c05fe
Fixup Item in hand rendering of textures > 16x
2012-09-15 18:24:27 -07:00
LexManos
b404f294c5
Make the exception print for headless servers if the Downloader cant initalize.
2012-09-15 18:06:59 -07:00
LexManos
48d12444c0
Remove a bunch of warning about javadoc, not a real fix, but no more warning.
2012-09-15 18:04:56 -07:00
LexManos
82fba4bfaa
Update MCP Mapings
2012-09-15 17:09:45 -07:00
LexManos
ec2a59bde8
Makes GetModSrc check the common folder when attempting to extract source files
2012-09-15 17:09:34 -07:00
Christian
149a626e5a
Tie parent/child containers together again. Should close #96
2012-09-15 15:58:20 -04:00
Christian
9cd4ed0c91
Village mating produces added villagers, and the egg should place
...
added villagers too. Closes #97 .
2012-09-15 15:49:08 -04:00
Christian
09558e9e15
Clean up stale references to the Player stored in the NetworkRegistry,
...
closes #100
2012-09-15 15:36:26 -04:00
cpw
23c89ec054
Merge pull request #99 from CovertJaguar/patch-1
...
More readable state event logs
2012-09-15 12:20:26 -07:00
CovertJaguar
13756b6f2c
More readable init logs
2012-09-14 00:47:48 -07:00
Christian
0de240c4fe
Fix onConnectionClosed not being called on the client side of a connection
2012-09-09 11:29:08 -04:00
Christian
74343a0cff
Add in exclusion list for IFMLLoadingPlugin.
2012-09-08 12:19:03 -04:00
Christian
3461c12d95
Remove debug cruft
2012-09-07 23:14:54 -04:00
Christian
67d8b3b475
To properly align with packet9respawn, make packet1login's dimension an int as well
2012-09-07 22:57:01 -04:00
Christian
ab34f2d2cf
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
c4d5c89f85
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
67b9fbe363
Fix dependency checking: you can depend on specific versions of FML
2012-09-07 19:08:28 -04:00
cpw
75c0e65092
Merge pull request #94 from iChun/patch-1
...
Fix handleTinyPacket using short instead of int.
2012-09-07 05:43:39 -07:00
iChun
7a0ab7e563
Fix handleTinyPacket using short instead of int.
...
Silly cpw :P
2012-09-07 18:35:26 +08:00
Christian
e564610b54
Fix up tiny packet handler to actually work
2012-09-06 22:59:38 -04:00
Christian
94d076a14a
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
d2e99c3443
Add in a little bit of protocol cleanup. Start work on allowing multiple
...
protocol versions
2012-09-06 21:54:43 -04:00
Christian
45bbdd14d6
Give a way to build the packet131mapdata packet correctly populated
2012-09-06 10:12:37 -04:00
Christian
8b8d9a58f6
Capture and leverage Packet131MapData
2012-09-06 10:03:30 -04:00
Christian
50c74f93bd
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
6d9b9fde47
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
7a58542fb8
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
61153abf7b
And handle the other way to globally register an entity
2012-09-03 21:37:20 -04:00
Christian
788d1c9925
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
6de655df47
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
2af15b3a95
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
5bea2a0bbd
Fix headless operation, hopefully
2012-09-02 13:29:46 -04:00
Christian
599476d587
Fix up trying to re-add stuff to the classpath when it's already there
2012-09-02 12:56:08 -04:00
Christian
d538dcf06f
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
6072420a02
Expose GuiMerchantButton
2012-09-02 12:15:13 -04:00
Christian
6056c760d4
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
8f70ed5f33
Also, make missing entity not blow things up
2012-08-31 16:49:35 -04:00
Christian
17cbb9d3b7
Fix entity tracker "update" packet not computing correctly. Should work now..
2012-08-31 16:41:05 -04:00
Christian
bd137b7f06
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
befe8f5f47
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
74d6437856
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
93f9cc45f9
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
ece5483ad7
Add in an ItemRenderer null check so FML can run render adding mods
2012-08-29 13:58:56 -04:00
Christian
8df9a051d6
Inverted boolean logic. Grrr.
2012-08-29 13:44:40 -04:00
Christian
81a8e94c79
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
3415dbfd0d
Remove debug statements
2012-08-28 23:07:37 -04:00
Christian
3b0c0fcecf
Fix keybindings not loading properly from gamesettings file after restart
2012-08-28 22:15:18 -04:00
Christian
62a7d347e7
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
d105213aed
Some tests
2012-08-26 22:23:05 -04:00
Christian
870214000f
Fix trying to load the client side packet handler, when on the server, hopefully?
2012-08-26 22:18:57 -04:00
Christian
5a6275f0e1
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
b32dea398b
Fix missing addCommand call: thanks "spawnwolf test command"
2012-08-26 13:07:35 -04:00
Christian
4b371d8d5b
Fix a couple of modloader mods. Thanks!
2012-08-26 12:52:50 -04:00
Christian
85a585725b
Some functionality fixes for @Instance injection.
2012-08-26 10:55:55 -04:00
Christian
fe73f11443
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
a0302861cf
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
1da6a1fc6c
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
b308be04e7
And more mod sorting fixes.
2012-08-24 12:10:43 -04:00
Christian
67fa435dd4
Actually *use* the sorted mod list
2012-08-24 11:58:18 -04:00
cpw
82551503bd
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
542219112a
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
6657b6561b
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
02792c45e6
Actually fix the corrupt JSON problem
2012-08-23 17:27:53 -04:00
Christian
4f6861ee50
Fix isModLoaded for "disabled" mods, and the toposort as well
2012-08-23 17:08:18 -04:00
Christian
1870b7d793
A bit more information for dependency handling
2012-08-23 16:46:23 -04:00
Christian
c465b17afe
Fix up handing corrupt mcmod.info
2012-08-23 16:43:28 -04:00
Christian
72097d5bf5
Fix a problem with network ids
2012-08-23 16:38:34 -04:00
Christian
87fa59b0f7
Fix up version handling properly. Hopefully, and the error screen.
2012-08-23 15:29:17 -04:00
Christian
675f4115aa
Only active mods should have dependencies checked, and be sorted
2012-08-23 14:33:54 -04:00
Christian
e7c6a47951
Fix oddity with Screen, print a version out in the sorted list!
2012-08-23 14:28:49 -04:00
Christian
9974f7a6d5
Fix metadata
2012-08-23 14:05:17 -04:00
Christian
4b6b090712
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
e6dce6cdbc
Fix missing serverSendPacket
2012-08-23 09:02:12 -04:00
Christian
e37b40dac9
Trading support for ModLoader - thanks Herblore!
2012-08-23 01:40:03 -04:00
Christian
4e8668c922
Close the jar, for cleanliness sake
2012-08-23 01:39:35 -04:00
Christian
12f66bdc86
Fix authors - it'll read both "authors" and "authorList" from the json now
2012-08-23 01:17:47 -04:00
Christian
346661cc6b
More ML compatibility - fix up dragon mounts, thanks!
2012-08-23 00:37:45 -04:00
Christian
fe0d081eec
Fix up loading mods that are grandchildren of BaseMod
2012-08-23 00:04:34 -04:00
Christian
0ae888e8f8
Fix entity handling for ModLoader mods, thanks parachute mod!
2012-08-22 23:46:16 -04:00
Christian
213cc63eca
Merge ChickenBones pull into FML - adds player trackers
2012-08-22 18:00:55 -04:00
Christian
908a57f3c4
Fix formatting
2012-08-22 18:00:38 -04:00
Christian
8f6883da8e
Tweak patches and hooks slightly
2012-08-22 17:58:46 -04:00
Christian
9bfa7acf0d
More precise error handling when an invalid class is present
2012-08-22 17:50:07 -04:00
Christian
af104b81f2
Fix textures not applying properly
2012-08-22 17:50:07 -04:00
Christian
5233ae520d
Fix up entity spawning - hopefully they won't warp anymore.
2012-08-22 17:50:07 -04:00
Christian
d544e56ec3
Add in a helper on the server start event for adding commands to
...
the server.
2012-08-22 17:50:07 -04:00
Christian
be7b413bec
Move villager trading hook up a bit. thanks sengir.
2012-08-22 17:50:07 -04:00
Christian
550c206997
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
5330afb78e
Update build to not bother building client jar. Universal is everything
...
now.
2012-08-22 17:50:07 -04:00
Christian
ebc1aea5d2
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
f0d5732477
More precise error handling when an invalid class is present
2012-08-22 17:36:26 -04:00
Christian
4d44836bb3
Fix textures not applying properly
2012-08-22 17:27:06 -04:00
Chicken Bones
fe263206e2
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
0806bc7b22
Added IPlayerTracker hooks
2012-08-23 06:28:53 +10:00
Christian
e713f7b1c2
Fix up entity spawning - hopefully they won't warp anymore.
2012-08-22 15:11:59 -04:00
Christian
252f3a5a92
Add in a helper on the server start event for adding commands to
...
the server.
2012-08-22 15:11:43 -04:00
Christian
1720382475
Move villager trading hook up a bit. thanks sengir.
2012-08-22 11:50:03 -04:00
Christian
7ff1e60af9
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
09fe35d43c
Update build to not bother building client jar. Universal is everything
...
now.
2012-08-22 11:12:26 -04:00
Christian
f9332bab3a
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
5d59af0cec
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
d27e722903
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
ba16217fe2
Try and stop sendPacketToAllAround from being crashy
2012-08-21 18:50:26 -04:00
Christian
63e8249040
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
a17396eca5
Fix up dispenser handling, add in new params for the dispenser: breaks IDispenseHandler, sorry
2012-08-20 21:44:54 -04:00
Christian
ab90aa4d99
Fix up MLProp handling for null info
2012-08-20 21:44:47 -04:00
Christian
b8a30cec94
GUIs working in FML for ML mods
2012-08-20 21:44:28 -04:00
Christian
bb98ae9e28
Support gui opening for Shelf mod
2012-08-20 21:43:59 -04:00
LexManos
85e3c330e7
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
45175c0e94
Expose more of the village construction parts for building village
...
pieces
2012-08-19 11:23:29 -04:00
Christian
52d3f237af
Allow access to the type "ComponentVillage"
2012-08-19 10:35:06 -04:00
Christian
09c7ea2d9d
Documentation and registration for villager stuff
2012-08-19 10:30:24 -04:00
Christian
3a0ad876b5
Fix javadoc derp
2012-08-19 10:21:19 -04:00
Christian
8a521c1d32
Villager trading, manipulation and village enhancement. Still WIP but should be functional
2012-08-19 10:13:15 -04:00
Christian
b07f1069b9
Fix exception based logging to actually log the exception!
2012-08-19 09:31:26 -04:00
Christian
3e94ee2c36
Fix up keyboard events for modloader
2012-08-19 01:44:33 -04:00
Christian
a1385f4797
Pickup notification
2012-08-19 00:26:55 -04:00
Christian
ce276375b2
Update fml_at with new transforms
2012-08-18 20:08:27 -04:00
Christian
9a540ef6d4
Fix derp where client sided packet handler would be created on a dedi server env
2012-08-18 19:50:46 -04:00
Christian
f86a29468e
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
b65a38cb30
Don't complain about minecraft source code being in "net.minecraft.src". Derp.
2012-08-18 10:09:53 -04:00
Christian
298d6db6e2
Fix ModLoader add XP Smelting
2012-08-18 10:09:25 -04:00
Christian
3d87561505
Actually register client/server packetspecs as their correct sides! fixes #71
2012-08-18 09:28:36 -04:00
Christian
1cbe058250
Error if channel name is invalid - either too short, or too long
2012-08-17 16:59:48 -04:00
Christian
8a679f6d9e
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
0e473145b3
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
73bf3a8985
Fix up ML GUI ticking. Thanks sharose!
2012-08-17 16:09:46 -04:00
Christian
5ea0932e24
Organize ALL the imports
2012-08-17 09:25:04 -04:00
Christian
290f2d6781
Expose the server in serverstart event
2012-08-17 09:25:04 -04:00
Christian
94f834d5d7
Fix up directory injection of log file locations
2012-08-17 09:25:04 -04:00
Christian
30d6970e77
Refer to FMLLog, not FMLRelaunchLog
2012-08-17 09:25:04 -04:00
Christian
8408f58fb1
Tidy up server launch - reflection not required anymore
2012-08-17 09:25:04 -04:00
Christian
0fab4eca7b
Also, log what the directory discoverer finds for mcmod.info
2012-08-17 09:25:04 -04:00
Christian
549969ade6
And log the exception if it has a problem reading the jar file
2012-08-17 09:25:04 -04:00
Christian
26bb005731
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
8444fa6d3c
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
11c1cae8b0
Some compatibility fixes for Rei's minimap, and tidy up a couple of things
2012-08-16 13:55:42 -04:00
Christian
4d87779d39
Fix Forge branding string call
2012-08-16 13:01:48 -04:00
Christian
1cc6778038
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
a7a1f55091
Fix critical bug in FML load controller that complains about injected mod containers
2012-08-16 08:34:12 -04:00
Christian
e1fd0b1d7b
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
81512c3458
Small fixes, including showing the FULL name of Forge Mod Loader
2012-08-15 19:54:56 -04:00
Christian
fcf6fd57ee
Fix up null array in keybinding handler
2012-08-15 19:17:21 -04:00
Christian
7988323073
Actually add in the system property for the minecraft home, should fix multimc too
2012-08-15 19:16:36 -04:00
Christian
ba902537ca
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
96b78514a8
Cleanup fml.py a little, should fix double printing of 'patching file'
2012-08-15 03:10:45 -07:00
LexManos
e0cb8cd503
Wrap mod description rendering in BLEND calls https://github.com/MinecraftForge/MinecraftForge/issues/96
2012-08-15 02:52:29 -07:00
LexManos
022b3e57dc
Made getmodifiedsrc noop for server.
2012-08-15 00:50:40 -07:00
LexManos
9ad520cb2a
Fix new eclipse workspace to load the project properly from start.
2012-08-15 00:50:16 -07:00
Christian
c1e0cbb7f1
Merge branch 'minecraft132'
...
Yes, we are already on 1.3.2
2012-08-14 22:33:28 -04:00
Christian
071caee228
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
352df9cc30
Fix renderer's not getting the rendermanager set on them at registration time
2012-08-14 22:32:19 -04:00
LexManos
eef3303dfe
Finished update to MCP 7.2, MC 1.3.2 pre.
2012-08-14 19:24:49 -07:00
Christian
75fb35b240
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
04fc1c6c59
Fix renderer's not getting the rendermanager set on them at registration time
2012-08-14 21:59:47 -04:00
LexManos
646a0b4fc4
Fixup included workspace to have single project with client/server launches.
2012-08-14 17:42:40 -07:00
Christian
3d0bd2bc7a
Start working on MC 1.3.2
2012-08-14 20:09:24 -04:00
Christian
b69364e168
Add in a helper for code migrating from ML renderer stuff
2012-08-14 19:09:22 -04:00
Christian
e856f6196a
Merge pull request #62 from calclavia/patch-1
...
Shortcut function for addNameForObject()
2012-08-14 13:52:58 -07:00
calclavia
4c5dcb543f
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
a234fdf00b
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
5f4423119a
Fix entity spawn packets
2012-08-14 08:20:28 -04:00
LexManos
d7dcbe7007
Force a Jenkins build
2012-08-14 01:21:56 -07:00
LexManos
f98c252bcb
Merge pull request #60 from remuladgryta/master
...
fixed 'derp' error on @NetworkMod
2012-08-14 01:16:29 -07:00
remuladgryta
438c8eca35
fixed java.lang.NoSuchMethodException
...
getServerHandlerSpecDefaultValue() and
getClientHandlerSpecDefaultValue() should no longer give derp exeption
2012-08-14 09:50:22 +03:00
LexManos
f1a8b2ea72
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
908227ce0c
Merge remote-tracking branch 'origin/master'
2012-08-13 21:05:14 -07:00
LexManos
bbcdaa7dfb
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
6f10295936
Hopefully let build continue if server reobf fails, and fix derp in FMLNetworkHandler for entities
2012-08-13 23:25:08 -04:00
Christian
a8f69529fd
Fix up concurrent modification exception - ticks for players now occur on both sides
2012-08-13 22:55:23 -04:00
Christian
7de5191848
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
416cac675b
Actually fix the applet launch - it now launches properly *and* closes the window
2012-08-13 22:12:36 -04:00
Christian
17bf8dc363
Fix up relaunch of the applet
2012-08-13 21:44:43 -04:00
Christian
466022b402
Change language loading a bit
2012-08-13 20:28:53 -04:00
Christian
df9ec4bf3f
Update spritehelper bitmaps for items and terrain
2012-08-13 20:08:03 -04:00
Christian
fa38c1a6b3
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
6a273dd98f
Fix derp in LanguageRegistry
2012-08-13 16:45:47 -04:00
Christian
f41391b13c
FMLModcontainer should not complain about annotations it has no idea about. so stfu fmlmodcontainer
2012-08-13 16:15:11 -04:00
Christian
179ed74456
Fix derp with EntityRegistry- bimap is not the right type for the name->container list
2012-08-13 15:55:24 -04:00
Christian
deab31fb03
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
c393299a91
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
80b3f0fd97
Capture server packet handling errors into the FML log file for diagnostics
2012-08-13 11:52:30 -04:00
Christian
519d2365ca
one more change for the road :)
2012-08-13 01:24:02 -04:00
Christian
71642f02f8
Don't spit debug all over the floor
2012-08-13 00:24:15 -04:00
Christian
0c3535ff26
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
6f4dbd5376
Add in callableminecraftversion
2012-08-12 23:54:41 -04:00
Christian
9b74df5e62
Entity AI accessibility, also AccessTransformer can make certain classes public now
2012-08-12 23:50:27 -04:00
Christian
8d8f36bac0
Add in a simple packet dispatcher for sending packets around
2012-08-12 22:45:18 -04:00
Christian
8a0cfed5c6
Add in a sided packet registry so that client vs server can vary
2012-08-12 22:23:03 -04:00
Christian
e229b6f6eb
Fix double forge init on server
2012-08-12 20:34:23 -04:00
Christian
8a74a152e5
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
c1dccae4b8
Fixed getNextAvailableRenderId() returning ids in use by vanilla
2012-08-12 14:45:03 +02:00
LexManos
f73e4b6169
Fix MCPMerger injecting Side/SideOnly when it already exists.
2012-08-12 04:27:36 -07:00
LexManos
9777204547
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
0b343c1a49
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
4f7996e361
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
20029feb88
Fix NPE with no channels - always register FML
2012-08-12 00:17:07 -04:00
LexManos
c4149f7b55
Added missing quotes around compile command.
2012-08-11 16:03:33 -07:00
Christian
f20ef77a91
Fix up the network mod issue properly. Maintain a real cache of mod objects
2012-08-11 16:21:03 -04:00
Christian
6d79241652
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
4f9cc6b398
Fix up command patch to actually work
2012-08-11 14:12:23 -04:00
Christian
5a0d08b892
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
85f665dd1d
Fix build script- put client in first
2012-08-11 13:05:37 -04:00
Christian
2d31dbba15
Put the marker on the server ML file too
2012-08-11 13:04:59 -04:00
Christian
938cecbdf7
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
57de5c1b90
Fix up launch when obfuscated *sigh*
2012-08-11 12:24:43 -04:00
Christian
35fda10b50
Update netclienthandler patch.
2012-08-11 12:10:22 -04:00
Christian
d663884aa5
Fix NPE for server relaunch
2012-08-11 12:05:13 -04:00
Christian
ff18294591
Fix up Package.getPackage(), also fix up loadcontroller construction
2012-08-11 11:44:55 -04:00
Christian
3918c5e810
Add in Package.getPackage() support for sengir
2012-08-11 11:12:16 -04:00
Christian
92b7ed1182
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
185f8ddbc7
Newlines in diff file
2012-08-11 02:27:19 -07:00
LexManos
953f99787e
Add special case to add Side/SideOnly to difflist
2012-08-11 02:25:40 -07:00
Christian
7e35f13f30
Fix up some network related stuff and optimize mod lookup a bit
2012-08-11 02:43:04 -04:00
Christian
2e66429b03
Fix up proxy injector to inject properly
2012-08-11 02:24:29 -04:00
LexManos
1e4d788cd0
Fix decompile
2012-08-10 20:41:59 -07:00
Christian
7440cc89e9
Fix NPE on missing mods - still need to actually handle missing mods properly on client
2012-08-10 23:27:11 -04:00
Christian
fde0619e9b
New downloader UI and new downloader backend - should be more robust now
2012-08-10 23:18:52 -04:00
LexManos
a1c14779d2
Added -no_gen_conf to jenkins build
2012-08-10 20:09:47 -07:00
LexManos
5a1f84ed5b
Added some extra error prints, hopeully get something useful when installed in the client.
2012-08-10 18:54:06 -07:00
LexManos
49385961d9
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
dd319a2938
SidedProxy should work again - anywhere. Make sure it's on a static field though
2012-08-10 17:42:43 -04:00
Christian
7b2d09844c
More ticking hooks, and some other bits of clean up. Very close to "done" now.
2012-08-10 17:11:01 -04:00
Christian
b5dc18ff7e
Fix up modloader and clean up junk method
2012-08-10 16:42:21 -04:00
Christian
5e7cb9106d
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
fcd4a8e854
Readded common folder to startclient/server.
2012-08-10 12:38:59 -07:00
Christian
1c189ae762
Add in a registration method for gui handlers
2012-08-10 11:12:57 -04:00
Christian
a58306abc6
Overwrote lex's command patch
2012-08-10 10:57:18 -04:00
Christian
3c1b234a61
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
ba0cc6ec12
Added common folder support to startclient/startserver
2012-08-09 20:34:16 -07:00
LexManos
349da399ff
Added some missing quotes that caused issues if your workspace had a space in it.
2012-08-09 20:01:51 -07:00
LexManos
dca24fd567
Add lib folder to installed eclipse
2012-08-09 19:02:28 -07:00
Christian
6eb4bceee3
Add in missing patch - also, launch FML properly from the server
2012-08-09 09:21:16 -04:00
Christian
6d0f7ace17
Entity spawn adjustment - tracker
2012-08-09 08:40:32 -04:00
LexManos
859ebae365
Fix ModLoader compilation, and MCPmerger invocation for Forge.
2012-08-09 03:04:25 -07:00
LexManos
3d26511322
Include conf folder and merge config in source zip
2012-08-08 23:44:32 -07:00
Christian
185babbd85
Entity spawning - done
2012-08-09 01:58:14 -04:00
Christian
d970f7a530
Generate a universal binary package since we can now :)
2012-08-09 01:57:42 -04:00
Christian
83fdb602e2
Merge branch 'MergingClientServer'
2012-08-08 22:58:33 -04:00
Christian
c1bd11e64a
Reorganized all the current patches
2012-08-08 22:57:37 -04:00
Christian
c1b3bfd007
Fix up annotation parser to parse arrays and enums
2012-08-08 22:10:56 -04:00
LexManos
9b81775a2f
Added SideTransformer to strip side only functions/fields out.
2012-08-08 18:53:41 -07:00
LexManos
ac8945a4f8
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
77f4cc5bea
Gui Handler ported from MC forge
2012-08-08 00:31:24 -04:00
Christian
8998d4c5e0
Revert dumb stuff with commands patch - lots of gfx patching
2012-08-07 23:11:37 -04:00
Christian
0ddf61cee2
Almost finished basic network stuff now
2012-08-07 20:41:37 -04:00
Christian
84efb72e46
Update some patches- more network work
2012-08-07 20:10:36 -04:00
Christian
f4b9055171
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
12927291a7
Fix location of forge in common handler - also some tweaks to modloader and other stuff
2012-08-06 17:27:21 -04:00
Christian
73bdd512c5
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
8bda53cb77
Add in a lot of network handler stuff - also, expose the asm harvested data
2012-08-06 09:52:42 -04:00
Christian
09098f8a0f
Remove some unneeded fields from the annotations
2012-08-05 02:24:02 -04:00
LexManos
63d5d42512
Made empty constructor for ModMetadata public
2012-08-04 22:51:57 -07:00
LexManos
7e68b53196
Fix path trimming for copytree
2012-08-04 20:36:27 -07:00
Christian
e92be964fd
Change property name to fml.modStates not fml.disabledMods- it makes more sense that way
2012-08-04 12:35:46 -04:00
Christian
969de94d8a
Add in a bit of logging when events get sent to mod containers
2012-08-04 11:45:40 -04:00
Christian
e39092335a
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
ae79c79447
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
fc8c2ac6e4
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
fbc968e1b4
Change place commands.py backup is stored.
2012-08-03 23:24:58 -07:00
LexManos
08eb7c5c45
FML finish won't updatemcp automatically, easier integration with forge.
2012-08-03 17:36:16 -07:00
LexManos
18aec5b257
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
34706d6acf
Moved setting up eclipse to setup_mcp
2012-08-03 16:56:00 -07:00
LexManos
b572c6a038
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
2fccc04903
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
7949a15226
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
476dfbc754
Fix MockBlock compile
2012-08-03 01:47:09 -07:00
LexManos
f1717526d8
Download argo/guava source references in install, and updated eclipse workspaces to reference them.
2012-08-02 23:36:00 -07:00
LexManos
56153c43d6
Cleaned up commands.patch, removed debug print in fml.py
2012-08-02 21:14:06 -07:00
LexManos
79ed963c4a
Remove clientdrop, old reference files.
2012-08-02 20:32:51 -07:00
LexManos
5f848d3d2a
Delete some dead files
2012-08-02 19:42:12 -07:00
Christian
1b20de0ab6
Fix commands patch, WorldType patch and some ML compat stuff
2012-08-02 20:09:18 -02:30
Christian
6d70a76c95
More fixes
2012-08-02 16:50:30 -02:30
Christian
b51c357d50
More build fixes for jenkins
2012-08-02 10:33:29 -02:30
Christian
e44515304a
Try and fix the jenkins build
2012-08-02 10:30:52 -02:30
Christian
dab4179024
Change some event names, hook up the event code for server events for FML
2012-08-02 09:31:03 -02:30
Christian
2df9ba14d4
Merge branch 'newfmlmod'
2012-08-02 08:52:11 -02:30
LexManos
1e47f3e468
Introduced patching of runtime/commands.py to allow for usage of the src/common folder.
2012-08-02 00:51:51 -07:00
Christian
582a785fb8
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
ff152479e6
More stuff
2012-08-01 21:19:11 -02:30
Christian
7f8bf56d4f
Fix classpath for Client, maybe?
2012-08-01 21:19:11 -02:30
Christian
22fd1652a0
Line endings for this branch
2012-08-01 21:18:55 -02:30
Christian
5f51e63385
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
4fb08f1660
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
d0036dda00
Updated eclipse projects to have src-common linked resources
2012-08-01 03:52:03 -07:00
LexManos
4ca63717e5
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
62535863ad
Add temp AccessTransformer config for FML
2012-08-01 03:18:31 -07:00
LexManos
629b384f0d
Discard old setup script
2012-08-01 03:18:02 -07:00
LexManos
b9982f18f5
Fixed AccessTransformer issue with trying to load files, instead of resources.
2012-08-01 03:17:36 -07:00
Christian
1753b28475
Commit the start of some pluggable transformers
2012-07-31 09:46:45 -04:00
Christian
e7a7b3c844
XP for smelting
2012-07-30 23:07:53 -04:00
Christian
6f8b39ea09
Beginning the 1.3.1 update
2012-07-30 22:31:07 -04:00
Christian
e001103ed8
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
d1d12e4ebd
Fix up coremods with relaunch, add in a sample "coremod"
2012-07-30 11:34:30 -04:00
Christian
b79ec382d7
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
a850ea6bc0
Fix whitespace issue
2012-07-29 23:54:07 -04:00
Christian
825f1a8b50
Fix window sticking around - it doesn't anymore
2012-07-29 23:46:52 -04:00
Christian
e1fc02b5b9
Add in "transform excluded" classes that we still need to take loading responsibility for
2012-07-29 23:30:37 -04:00
Christian
b53ce2aa90
Added in some dialogs when things don't go so well
2012-07-29 22:55:53 -04:00
Christian
ba28161f16
New logging stuff, also the early plugin api for forge
2012-07-29 22:54:59 -04:00
Christian
50ed44359d
Merge branch 'minecraft1.3' into newfmlmod
2012-07-23 23:02:25 -02:30
Christian
f78400711e
Fix up mod classloading delegation
2012-07-23 22:54:36 -02:30
Christian
69e895e687
Some patches to go along with the other changes
2012-07-23 22:51:16 -02:30
Christian
769663466f
More stuff as I roll out the changes
2012-07-23 22:50:37 -02:30
Christian
9e4131c3e8
A bunch more fixes for FML mods
2012-07-23 16:33:17 -02:30
Christian
8b5ddf1739
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
5561f8218a
New key handling
2012-07-22 20:25:18 -02:30
Christian
2a19eca517
Check in a lot of recent work
2012-07-22 11:56:38 -02:30
Christian
3115f92ee4
Check in new fml mod work so far. Lots still to do.
2012-07-14 13:58:46 -04:00
LexManos
2671641b83
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
0a9ee584bf
Added call to clean_source to build script to fix patch fuzz on windows.
2012-07-12 18:06:39 -07:00
LexManos
48dcdca805
Fix Client-Clean project to use relative path to argo.
2012-07-12 18:06:01 -07:00
Christian
2db9292ba5
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
9d6266d85b
Fix up mod classloading delegation
2012-07-06 15:59:16 -04:00
Christian
25fb847dc1
Fixes
2012-07-06 10:42:49 -04:00
Christian
98e31e5f03
Incorporate server patches into client
2012-07-06 10:29:17 -04:00
Christian
0ff59e7978
Remove two places that are unpatchable now
2012-07-06 09:52:21 -04:00
Christian
97cfbb990d
Server repatching
2012-07-06 09:44:00 -04:00
Christian
59949849f0
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
be59dfff54
Launch through the applet launcher too
2012-07-06 01:04:33 -04:00
Christian
32e93213f1
Some patches for the server
2012-07-05 22:31:46 -04:00
Christian
b9466b8ee5
Lots of client patch fixup
2012-07-05 18:13:47 -04:00
Christian
275b78957a
Update git ignore to ignore a fernflowerzip that's lying around
2012-07-05 15:38:37 -04:00
Christian
4ab2a3cb6b
And we have a brand, "fml". We're definitely modded :)
2012-07-05 15:36:31 -04:00
Christian
58576c2a19
UnexpectedThrowable is now the much more awesome CrashReport!
2012-07-05 15:35:38 -04:00
Christian
c0b707a9bd
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
e8b09f4692
Got the relauncher downloading and injecting library files
2012-07-05 15:23:37 -04:00
Christian
decbe8ba7c
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
53c2b50212
FFS let this fix that bloody ticking mess that is ML compatibility.
2012-07-03 23:03:51 -04:00
Christian
3d8a5edc30
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
275fd394c1
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
d1f791f94e
Merge branch 'master' into minecraft1.3
2012-07-03 08:15:58 -04:00
Christian
60b50bb7f2
Tweak build xml for more cleanliness
2012-07-03 08:14:35 -04:00
Christian
9cafdf94ac
Merge branch 'antscriptupdates'
2012-07-02 23:50:49 -04:00
Christian
07a1927c25
Update some stuff
2012-07-02 23:49:40 -04:00
Christian
777b4407c2
Merge branch 'antscriptupdates' into minecraft1.3
2012-07-02 23:49:06 -04:00
Christian
a98ffafd71
Add in more options for ant script and clean up needing to clean every time.
2012-07-02 23:43:29 -04:00
Christian
414d59b1aa
Merge branch 'testrecover'
2012-07-02 20:19:23 -04:00
Christian
f0aa28162e
Merge branch 'antscriptupdates' into minecraft1.3
2012-07-02 15:56:33 -04:00
Christian
f0484a8941
Merge branch 'antscriptupdates'
2012-07-02 15:55:24 -04:00
Christian
2090264599
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
ecaa158981
Merge branch 'antscriptupdates' into minecraft1.3
...
Conflicts:
build.xml
2012-07-02 15:21:15 -04:00
Christian
33517d2b8d
Merge branch 'antscriptupdates'
2012-07-02 15:17:32 -04:00
Christian
6c99b80b73
Add in a setupenvironment ant target specifically for setting up an FML environment from scratch
2012-07-02 15:16:40 -04:00
Christian
0418f01886
Harvest MC version from MCP
2012-07-02 13:31:45 -04:00
Christian
6f8409a2ce
fix sided proxy bukkit test (not used so not a biggie)
2012-07-02 12:32:41 -04:00
Christian
a8f599983e
Harvest MC version from MCP
2012-07-02 12:24:37 -04:00
Christian
b51ce21b70
Initial checkin. Some patches are probably missing, but client compiles.
2012-06-29 20:18:04 -04:00
Christian
731dbf5175
Working simple scheduled ticking, Player ticks
2012-06-28 23:37:30 -04:00
Christian
d3b48f0c21
Support tick spacing through new IScheduledTickHandler
2012-06-28 17:10:35 -04:00
Christian
ce9be2864c
Change TickType.WORLD to send the world as arg[0] to match the server.
2012-06-28 14:24:34 -04:00
Christian
541951416e
And there are not 1000 seconds in a second
2012-06-28 08:31:32 -04:00
Christian
4f8d71e289
Seconds are 1000 milliseconds long. Not 1 millisecond long.
2012-06-28 08:27:21 -04:00
Christian
7098d613a0
Tweak profiler command on bukkit
2012-06-28 08:21:24 -04:00
Christian
e688e04446
Fix up a derp in the timing command
2012-06-27 22:13:55 -04:00
Christian
0878bd1fcf
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
1c7bcf8077
Tweak for end profiling
2012-06-26 23:37:54 -04:00
Christian
81d4d77202
Add in simple profiler for bukkit
2012-06-26 23:16:23 -04:00
Christian
5a5ff97f39
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
a7caad10ba
Add in bukkit support for recipe change
2012-06-26 15:40:30 -04:00
Christian
64dab3c8d7
Add in a new recipe handler registry method for ease of adding recipes to MC
2012-06-26 15:29:34 -04:00
Christian
5d4fdd1337
Update tester mod
2012-06-22 09:30:47 -04:00
Christian
77479d8b74
Fix ticking for GUI ticks too!
2012-06-22 09:30:27 -04:00
Christian
dd7ee6e268
Fix dependency string processing error
2012-06-22 06:21:04 -04:00
Christian
1236abf679
ModSorting test case
2012-06-21 21:56:16 -04:00
Christian
64d1b29c43
Fix ticking properly - ML world ticks now fire once, properly
2012-06-21 18:11:40 -04:00
LexManos
262c68a81d
Added stupididty exception for common issue with getMinecraftLogger.
2012-06-21 03:17:33 -07:00
Christian
21042e6913
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
58d6e58b93
Update bukkit with changes
2012-06-20 12:36:48 -04:00
Christian
6ba65d047f
Revert "Test failing build"
...
This reverts commit 744febc38e915a12c388fe01ba6715d31b6b6ee2.
2012-06-20 08:44:49 -04:00
Christian
63be4cb88f
Revert "Revert "Fail the build when recompilation fails""
...
This reverts commit c2d920d738a294462338fbe955c62a0f4034304c.
2012-06-20 08:44:08 -04:00
Christian
acbc8d9a1b
Revert "Fail the build when recompilation fails"
...
This reverts commit 482e3be3c9a96df8cefad81d78c7a4e83ad898b4.
2012-06-20 08:39:11 -04:00
Christian
e8db35228b
Test failing build
2012-06-20 08:35:47 -04:00
Christian
198dd807fd
Fail the build when recompilation fails
2012-06-20 08:35:14 -04:00
Christian
02f9578b52
Fix huge bug/typo in basemodticker that stopped ticks getting sent
2012-06-20 08:03:57 -04:00
LexManos
308525987d
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
ef7514288b
Remove cr's from modinfo descriptions, they print oddly in Minecraft.
2012-06-19 19:58:48 -07:00
LexManos
8a7b91fb1c
Print mod metadata info errors if we are in MCP.
2012-06-19 19:55:28 -07:00
LexManos
07bebf187c
Should fix concurent modification exceptions when using removeSpawns
2012-06-19 19:44:52 -07:00
LexManos
5ee3a057a2
Remove some eclipse preference files
2012-06-19 19:44:07 -07:00
LexManos
9495094a48
Update gitignore to ignore some eclipse preference files.
2012-06-19 19:43:46 -07:00
LexManos
c0dffcbcec
Merge pull request #29 from ScottKillen/master
...
Fixed WorldType to allow custom WorldTypes
2012-06-19 19:22:06 -07:00
LexManos
06fffe54b1
Added EntityRendererProxy class for compatibility with ModLoader mods that rely on it's existance.
2012-06-17 19:30:10 -07:00
Christian
944fd02fca
More ticking cleanup
2012-06-17 18:53:49 -04:00
Christian
4385704172
Remove WorldLoad tick from modloader mods- too early. *sigh*
2012-06-17 18:49:19 -04:00
Christian
6d46fefd83
Make sure to reset the clock trigger
2012-06-17 18:41:54 -04:00
Christian
ce71f85095
Force all client modloader ticks to occur at render end
2012-06-17 18:41:05 -04:00
Scott Killen
83fa5ffa5e
Client
...
======
Added hook in GuiCreateWorld to allow WorldType to present GUI on world creation.
2012-06-17 15:05:16 -04:00
Scott Killen
f85c7a48ca
**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
efc8d1bb37
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
aec5bbb50f
Merge pull request #27 from TheNoid/master
...
Make FML logs use system line endings …
2012-06-14 12:06:19 -07:00
Dion Williams
64f7b219af
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
27f8d07e44
Server side fix for invalid parameter to onCrafting
2012-06-13 20:02:35 -07:00
LexManos
c306da9d6d
Proper fix for scroll list not covering all of the hidden scroll items.
2012-06-13 19:59:54 -07:00
Christian
5a24f7f0d7
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
6826174464
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
04917a9a8c
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
a5b699c2ca
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
5115f4f1e4
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
b12cafb5c5
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
ad8e9f10c3
Fix up "errored" mod states so they actually read as errors
2012-06-09 11:07:07 -04:00
Christian
b8ae8664ac
Fix up bukkit for biome code
2012-06-09 10:47:43 -04:00
Christian
df205d7d3f
Fix up biome handling for client and server
2012-06-09 10:27:24 -04:00
Scott Killen
abcb583dd0
- 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
bc72bf11ee
Tweak error handling - report the exception that caused the bailout
2012-06-08 15:31:30 -04:00
Christian
4a050fbdba
Fix parameter ordering in ticks
2012-06-08 15:22:40 -04:00
Christian
16ab855df5
Update bukkit for world gen tweaks
2012-06-07 19:47:11 -04:00
Christian
320503340b
Change world generation to expose a mod interface
2012-06-07 19:44:03 -04:00
Christian
749cb7bcd6
Update bukkit for early load change
2012-06-07 19:28:07 -04:00
Christian
00a9cd4a5f
Attempt early initialization of Minecraft Forge
2012-06-07 19:25:49 -04:00
Christian
33fc5228ce
Update bukkit handler
2012-06-07 17:57:07 -04:00
Christian
0768f82522
Add in a server side WORLDLOAD tick
2012-06-07 17:54:43 -04:00
Christian
6f91209ea8
Fix ticking- need to register the basemod tickhandler *sigh*
2012-06-07 16:31:23 -04:00
Christian
110ca0f3ba
Fix ticking for new name "GAME" vs "WORLD"
2012-06-07 16:21:01 -04:00
Christian Weeks
0814f177c5
Update bukkit handlers
2012-06-07 14:03:42 -04:00
Christian Weeks
856fa4f337
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
5acab9e790
Expose a "clean" ticking interface and fix server tick loop for world ticks
2012-06-07 11:12:51 -04:00
Christian Weeks
c62c1df791
Tweak width of description
2012-06-07 08:39:22 -04:00
LexManos
779b3298bd
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
5997bd3b87
Interm implementation of keyboardEvent for ModLoader.
2012-06-06 01:43:49 -07:00
LexManos
c6de498904
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
bf5835566a
Merge pull request #14 from crazyputje/master
...
onTickInGUI fix. Thanks crazyputje!
2012-06-04 14:41:59 -07:00
crazyputje
20fc9de087
removed 'if (client.theWorld != null)' so it also ticks in the main menu
2012-06-04 20:36:57 +03:00
Christian Weeks
eae26b0562
Helps to have a retention policy
2012-06-02 22:41:50 -04:00
Christian Weeks
eeeaf140a7
Helps to have a retention policy for runtime annotations
2012-06-02 22:40:45 -04:00
Christian Weeks
38978a35dc
Add in bukkit proxy handler
2012-06-02 22:14:25 -04:00
Christian Weeks
1f7baa09b5
More proxy code
2012-06-02 22:12:15 -04:00
Christian Weeks
f15d9c507f
Introduce a proxy side loader for mod use
2012-06-02 22:12:15 -04:00
LexManos
b56b01571c
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
202933c409
Update credits information
2012-06-02 11:45:47 -04:00
Christian Weeks
8baf435a4a
Update readme for the client side
2012-06-02 11:44:26 -04:00
Christian Weeks
446faad048
Update bukkit handler to inject names at startup
2012-06-02 11:03:20 -04:00
Christian Weeks
716b32c8ab
Merge remote-tracking branch 'origin/master'
2012-06-01 23:25:18 -04:00
Christian Weeks
c9731ed7e3
Fix up optifine detection properly
2012-06-01 23:23:50 -04:00
Christian Weeks
0e6ccd81ed
Update bukkit handler
2012-06-01 23:10:38 -04:00
Christian Weeks
de8a5cfc8b
Slight reorganization of texture ticking - accomodate optifine
2012-06-01 23:07:32 -04:00
Christian Weeks
174d6691bd
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
7d07a752d8
Fix ticking on bukkit server
2012-06-01 11:08:32 -04:00
Christian Weeks
ad5dc783d8
Fix ticking on the server
2012-06-01 11:07:14 -04:00
Christian Weeks
ed08c425af
Implement missing language load hook for server
2012-06-01 10:22:08 -04:00
Christian Weeks
2f09a048d6
Tweaks to basemod setup
2012-06-01 00:33:51 -04:00
Christian Weeks
4085617ca2
Bukkitside fixup
2012-06-01 00:27:46 -04:00
Christian Weeks
51701d09fd
Merge branch 'bukkitreorg'
2012-05-31 23:07:16 -04:00
Christian Weeks
72ad8bcde1
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
cfb99b01c8
Fix copied code. Derpbag.
2012-05-31 22:48:44 -04:00
Christian Weeks
e35d31e50d
Update FML with recent mainline changes
2012-05-31 22:48:44 -04:00
Christian Weeks
c4ad78ab87
Update bukkit with new mod fixes
2012-05-31 22:48:44 -04:00
Christian Weeks
ac779739aa
Damn you bukkit with your same names for different classes!!!! EntityPlayer->EntityHuman
2012-05-31 22:48:44 -04:00
Christian Weeks
09d5bf95ae
Fix chunk generators for bukkit
2012-05-31 22:48:44 -04:00
Christian Weeks
b2e01d8f2a
Bukkit version
2012-05-31 22:48:44 -04:00
Christian Weeks
2521e5b390
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
ae6621bfdd
More tweaks for proper API
2012-05-31 22:42:23 -04:00
Christian Weeks
dfd15acb6d
Reorganize for bukkit integration
2012-05-31 22:09:45 -04:00
Christian Weeks
660521e6f2
Fix project, new gui layout with screenshot, thanks Sengir!
2012-05-30 09:25:04 -04:00
Christian Weeks
b5a10c0153
Add in missing hooks, add branding information to the crash report
2012-05-27 07:14:35 -04:00
LexManos
d4fd21dcbc
Fixed regex issue in last push.
2012-05-27 01:40:22 -07:00
LexManos
379c5b2888
Fixed up for newline before case bodies.
2012-05-27 01:24:45 -07:00
LexManos
51a959f8a4
Should fix windows {me} generating different patches then linux {cpw}
2012-05-27 00:22:27 -07:00
Christian Weeks
7d7c395ff3
Move first tick to the real first tick
2012-05-26 02:30:21 -04:00
Christian Weeks
7c590e62c6
Merge in the mod texture changes from Lex
2012-05-26 02:29:35 -04:00
LexManos
6191ed61e0
Fixed location refs to fmlversion.properties
2012-05-25 23:25:05 -07:00
Christian Weeks
96b442e3cc
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
3454b43daa
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
f3b15940ee
Changing up the mod list data
2012-05-25 15:25:35 -04:00
LexManos
7667df0caf
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
d45134eb9a
Fix up two stupid overwrites in my mergeup from lex
2012-05-24 23:18:04 -04:00
Christian Weeks
fe710a9245
Fix derp in MTS
2012-05-24 22:13:33 -04:00
Christian Weeks
46b7dc0fec
Patch fixing
2012-05-24 21:40:34 -04:00
Christian Weeks
f5598573a2
Update some stuff for updated tweaks
2012-05-24 21:39:16 -04:00
Christian Weeks
d7c9010c92
Update FMLClient with my changes
2012-05-24 21:33:43 -04:00
Christian Weeks
012c378427
my tweaks
2012-05-24 21:06:27 -04:00
LexManos
00ca4ead44
difflist should include server and client now.
2012-05-24 03:48:59 -07:00
LexManos
2927be6247
Some patch cleanup.
2012-05-24 02:18:20 -07:00
LexManos
a9b317c941
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
1727ce69ed
Line number changed..
2012-05-24 01:33:50 -07:00
Christian Weeks
0d5ab57fa0
Fix up the watch
2012-05-18 20:42:12 -04:00
Christian Weeks
2dcd1c4065
And some tweaks to the texture handling
2012-05-18 20:17:07 -04:00
Christian Weeks
a40ba43957
Fix up some fubars in MTS and MTA
2012-05-18 20:16:41 -04:00
Christian Weeks
88f3c4f9bd
Lots of error handling.
2012-05-18 10:38:40 -04:00
Christian Weeks
dd94427f22
Missed a patch *sigh*
2012-05-17 21:57:24 -04:00
Christian Weeks
cc4641b0d9
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
a9e17048e6
Because, of course, I broke the first build...
2012-05-17 20:27:24 -04:00
Christian Weeks
abee6d2507
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
1004a3236a
Derpy exceptions derpy exception handling
2012-05-17 15:19:25 -04:00
Christian Weeks
8aacd2d127
Remove the dependency in RenderEngine, decided on the simple API for texture FX
2012-05-17 15:11:21 -04:00
Christian Weeks
bc3790e3ca
Tweak the render patch- we won't fail if the updateTexture call fails
2012-05-16 00:34:50 -04:00
Christian Weeks
77d6ae8ffa
Update patches: add in a setup for most of the texturefx classes
2012-05-16 00:01:12 -04:00
Christian Weeks
a220fb34e2
Tweaking texture loading
2012-05-16 00:00:52 -04:00
Christian Weeks
ddb1085064
Fix tileSize -> iconTileSize. Stupid MCP
2012-05-15 22:34:17 -04:00
Christian Weeks
319758bd33
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
1b299b4ff4
Fix some derpy
2012-05-15 22:18:41 -04:00
Christian Weeks
25ced3f321
Update patches for hd textures
2012-05-15 22:10:38 -04:00
Christian Weeks
0e3dcc4eda
Change hd texture handling
2012-05-15 22:05:24 -04:00
Christian Weeks
6903deb69d
Refresh the renderengine patch- catch and log some texture pack reload errors
2012-05-15 16:21:40 -04:00
Christian Weeks
5412be2d76
More mod list fixes
2012-05-15 16:19:46 -04:00
Christian Weeks
a77aeedee2
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
bc23e7a657
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
6b23024f11
ModLoader worldtype hackery compatibility
2012-05-14 16:21:05 -04:00
Christian Weeks
c2264c97aa
Fix derp
2012-05-14 14:16:50 -04:00
Christian Weeks
828ada8aa6
Only log the warning once per texture
2012-05-14 13:20:50 -04:00
Christian Weeks
5c48a3c146
push patches
2012-05-14 12:22:46 -04:00
Christian Weeks
028fc2505b
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
6f6c3ee939
Fix the serverside. FUUUUUUUU!
2012-05-14 01:45:56 -04:00
Christian Weeks
a01711361d
HD patching complete? Clean up mod info data, Dummy field for dummy mods
2012-05-14 01:39:21 -04:00
Christian Weeks
d48213b444
Improving the scroll list, HD texture patches
2012-05-13 02:46:39 -04:00
Christian Weeks
00aee5b8e1
Actually pass in the mod name
2012-05-12 02:25:15 -04:00
Christian Weeks
b26b3fda1b
Fix up incorrect dependency handling
2012-05-12 02:10:50 -04:00
Christian Weeks
ff26096a0f
Fix stupid problem with braces
2012-05-12 01:06:58 -04:00
Christian Weeks
fdd80dad80
Tick only when there's a world
2012-05-12 01:03:36 -04:00
Christian Weeks
caa5384552
Fix nulls in the mod list, start building the gui screen
2012-05-12 00:47:04 -04:00
Christian Weeks
053fd64bde
Gui related ticking
2012-05-12 00:00:33 -04:00
Christian Weeks
c689991986
Try always loading the language data
2012-05-11 23:37:58 -04:00
Christian Weeks
1146642dec
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
658f018404
Derpy derp- fix stupid pointless cast
2012-05-11 17:41:33 -04:00
Christian Weeks
394b046220
Fix missing ml.sendpacket, call in renderers
2012-05-11 17:31:28 -04:00
Christian Weeks
c032e39fed
Actually mark the sprite as used when you allocate it!
2012-05-11 16:49:21 -04:00
Christian Weeks
a6da168420
Helps to add the new hook!
2012-05-11 16:30:23 -04:00
Christian Weeks
0cd0d69ec4
Hook texture pack changes and loads so we can register override textures
2012-05-11 16:23:26 -04:00
Christian Weeks
f1453839b4
Fix problem with nulls in getModList
...
Work on the meta information file
2012-05-11 15:18:26 -04:00
Christian Weeks
7735567ce0
More tweaks to stuff: mod list, branding, more hooks
2012-05-11 01:45:36 -04:00
Christian Weeks
abc7b3f2a6
Tidying up and more hooks
2012-05-10 21:30:06 -04:00
Christian Weeks
b7861ec04c
Tweak block rendering organization. Add in worldgen for client.
2012-05-10 19:51:15 -04:00
Christian Weeks
813ad71f13
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
bb2af1d883
Tweak ordering for sorting- should be a stable sort now
2012-05-10 15:48:26 -04:00
Christian Weeks
7b5ad64378
Update git version capture
2012-05-10 13:01:39 -04:00
Christian Weeks
be9557b8ef
Ignore jenkins tags
2012-05-10 12:53:27 -04:00
Christian Weeks
57af97858b
Tweak some build stuff for versioning
2012-05-10 12:24:17 -04:00
Christian Weeks
89a6790222
Update build to actually put Loader in...
2012-05-10 11:16:58 -04:00
Christian Weeks
4c9ca1ffc1
tweak location of build properties in src jar
2012-05-10 10:09:56 -04:00
Christian Weeks
5a93998097
Lots of tweaks to mod output pretty printing. new versioning scheme.
2012-05-10 09:42:31 -04:00
LexManos
ef6bb505b9
Inventroy rendering
2012-05-10 01:25:56 -07:00
LexManos
8d0a9b770d
Fixed up the ModLoader render block hook, RP's blocks now render.
2012-05-10 01:00:07 -07:00
LexManos
2afed48993
Should fix colliding model ids with MC's internal IDs
2012-05-09 23:38:01 -07:00
Christian Weeks
f4862dc40d
Fixes
2012-05-10 02:01:23 -04:00
Christian Weeks
311ca8866e
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
7846f10c74
Add in some more stuff for handling key bindings, rendering
2012-05-07 17:44:49 -04:00
Christian Weeks
0438fbd47e
Reorganize ticking a bit
2012-05-07 01:39:55 -04:00
Christian Weeks
56e7270dee
Separate sprite handling, fix worldtype
2012-05-07 01:26:21 -04:00
Christian Weeks
b6b5955404
Working on the ticking stuff
2012-05-07 00:54:18 -04:00
LexManos
55d252b657
more client side hooks and Texture overrides/animations.
2012-05-06 16:32:59 -07:00
Christian Weeks
49be023eab
Halfway through ticking- won't compile
2012-05-06 00:58:40 -04:00
Christian Weeks
8c79b9b946
ModLoader moves forwards
2012-05-05 20:33:40 -04:00
Christian Weeks
bca823c421
Let's get hooking!
2012-05-05 19:52:53 -04:00
Christian Weeks
e0e77a6bb5
API is restored for client side. Implementation starting.
2012-05-05 14:42:46 -04:00
Christian Weeks
50a3543de0
And some patches for that
2012-05-04 17:04:18 -04:00
Christian Weeks
816b0738e4
The beginning
2012-05-04 17:02:12 -04:00
Christian Weeks
4b4ad6781e
Introduce the client side FML
2012-05-03 19:40:55 -04:00
Christian Weeks
071d54feaf
Implement addBiome, hopefully. Pushes biome list to the WorldType field. Sorry Bioxx.
2012-05-03 14:05:13 -04:00
Christian Weeks
db1f432dbf
Check in some eclipse crapola.
2012-05-03 14:04:16 -04:00
Christian Weeks
6ae8a2d5b9
Fix copied code. Derpbag.
2012-04-28 16:47:04 -04:00
Christian Weeks
f1168856bd
Update FML with recent mainline changes
2012-04-28 16:40:25 -04:00
Christian Weeks
c3b0dca9b2
Merge branch 'master' into bukkit
2012-04-28 16:35:15 -04:00
Christian Weeks
12a928536a
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
ef88519637
More text fixup
2012-04-19 23:07:07 -04:00
Christian Weeks
e6a9eb7b91
Typos
2012-04-19 22:54:10 -04:00
Christian Weeks
cf351c6118
Add in detection for MLMP and try to fail with a graceful message.
2012-04-19 22:40:59 -04:00
Christian Weeks
e510cca030
Update bukkit with new mod fixes
2012-04-18 14:06:54 -04:00
Christian Weeks
a6d6b739bd
Merge branch 'master', remote-tracking branch 'origin' into bukkit
2012-04-18 14:04:39 -04:00
Christian Weeks
e261ad1295
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
b2b4551df8
Damn you bukkit with your same names for different classes!!!! EntityPlayer->EntityHuman
2012-04-16 01:00:06 -04:00
Christian Weeks
8800abf06c
Fix chunk generators for bukkit
2012-04-15 22:42:06 -04:00
Christian Weeks
9fb72398b5
Merge branch 'master' into bukkit
2012-04-15 21:58:18 -04:00
Christian Weeks
a08eefa261
Bukkit version
2012-04-14 23:01:03 -04:00
Christian Weeks
0ec65b4b3a
Fix "soft" dependencies so they can exist properly
2012-04-14 10:01:55 -04:00
Christian
e78688acdc
Fix server patch
2012-04-10 23:05:22 -04:00
Christian
62b400c499
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
44a5b7b929
Push the patched file, as well
2012-04-09 10:24:58 -04:00
Christian Weeks
2ae31bddd2
Add in more "Player" related events. Fix up some MLProp stuff
2012-04-09 10:18:24 -04:00
Christian Weeks
f92149aef5
Fix regular expressions, thanks ChickenBones!
2012-04-09 09:19:20 -04:00
Christian Weeks
597b6f0d2c
Tweak Console handler patch so we're more friendly to forge
2012-04-08 10:04:28 -04:00
Christian Weeks
33f1e26df4
A proper console command handler, also fix ordering of loaded mods
2012-04-08 09:55:56 -04:00
Christian Weeks
07437b95ae
Add in a console command handler so you can access the command console
2012-04-08 02:00:57 -04:00
Christian Weeks
8fa4c1645c
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
83730ee9ec
Split the packet salutation in two so we can work with or without forge
2012-04-08 00:18:37 -04:00
Christian Weeks
42aee9032f
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
331768b272
Call my handleLogin hook from NetLoginHandler, tweak output in server gui and log file.
2012-04-07 22:11:01 -04:00
Christian Weeks
0ae4c2e4a9
Fix subdirectory loading properly: mods will load inside eclipse..
2012-04-06 16:14:01 -04:00
Christian Weeks
38094093b3
Actually figure out the path for directory class loading
2012-04-06 15:24:28 -04:00
Christian Weeks
cd2be85575
regular expressions in java==fail
2012-04-06 15:03:41 -04:00
Christian Weeks
b26bf5ab96
Recurse into subdirectories found
2012-04-06 14:43:12 -04:00
Christian Weeks
040a1d8cf7
Try multiple "jar" sources- for eclipse testing
2012-04-06 14:23:14 -04:00
Christian Weeks
a858478b92
it's addURL not addUrl dumbo
2012-04-06 13:57:40 -04:00
Christian Weeks
9304420a2c
it's getdeclaredmethod, dipstick
2012-04-06 13:47:01 -04:00
Christian Weeks
71a9bf9f70
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
21d11f431f
Add in a missing client side method to modloader stubbed for the server
2012-04-06 12:24:52 -04:00
Christian Weeks
47a15f4c77
Add the hooks for crafting and smelting
2012-04-06 10:34:44 -04:00
Christian Weeks
765194e8db
Should load from whatever minecraft comes from now...
2012-04-06 09:59:58 -04:00
Christian Weeks
55fe1aa1e3
Build should work now. Fix a stupid javadoc import.
2012-04-05 21:44:06 -04:00
Christian Weeks
09d37f87b0
New build script- version the src dist as well
2012-04-05 21:40:16 -04:00
Christian Weeks
fc1dfa9cca
Documentation: lots
...
Some eclipse workspace settings that might help?
2012-04-05 16:22:47 -04:00
Christian Weeks
8b1f984c53
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
ae927a3cf8
Update the patches and fix the shell script
2012-04-05 11:42:33 -04:00
Christian Weeks
3b19792a12
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
ebc532e3a9
Clean up extraneous print statements from the build
2012-04-05 10:42:15 -04:00
Christian Weeks
4470a808b1
Fix INSTALL-fml.txt file location in the server zip
2012-04-05 10:37:05 -04:00
Christian Weeks
ba7f0a8429
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
e828c1793d
Run Astyle over the FML code. Happy lex?
2012-04-05 10:07:52 -04:00
Christian Weeks
011dd869de
OK. Now the script works
2012-04-05 08:42:10 -04:00
Christian Weeks
21e55dc4c9
Crap at writing good python apparently
2012-04-05 08:29:07 -04:00
Christian Weeks
2ca5ccb861
Tweak file list script to print obf names
2012-04-05 08:25:04 -04:00
LexManos
6b4e73911b
Merge remote-tracking branch 'origin/master'
2012-04-05 00:10:36 -07:00
LexManos
3478efe0d4
Rebuilt patches with new scripts.
2012-04-05 00:10:13 -07:00
LexManos
3a5c176af4
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
9220174dbc
Created eclipse workspace, should allow simple and quick access to working on FML
2012-04-05 00:06:11 -07:00
Christian Weeks
2489469aba
Missed a couple of wording tweaks
2012-04-05 00:58:17 -04:00
Christian Weeks
11c3817779
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
371d69f89c
Tidy up some of the installation media
2012-04-04 09:48:36 -04:00
Christian Weeks
b2555e4a50
links to implementation
2012-04-03 23:09:22 -04:00
Christian Weeks
3b0126d197
Channel validation
2012-04-03 22:45:27 -04:00
Christian Weeks
053552cdcc
NetworkHandler doesn't care about channel ownership
2012-04-03 17:06:02 -04:00
Christian Weeks
5bd4f750bb
Update patches for network handler
2012-04-03 17:04:57 -04:00
Christian Weeks
09efd147e1
Modloader complete
2012-04-03 17:04:26 -04:00
Christian Weeks
cd255f4d6a
Generic container
2012-04-03 16:12:19 -04:00
Christian Weeks
1e3cd7ca97
Config dir handling
2012-04-03 15:53:59 -04:00
Christian Weeks
e243ffd1ce
MLProp
2012-04-03 15:41:25 -04:00
Christian Weeks
35ece09cfa
Mod sorting
2012-04-03 12:03:21 -04:00
Christian Weeks
971de1c2b4
Everything except ordering
2012-04-02 23:06:30 -04:00
Christian Weeks
9e404a48c5
Fix build script for generating md5s
2012-04-02 18:12:49 -04:00
Christian Weeks
63dbdd8db3
Update to 1.2.5 and hopefully forge compatibility
2012-04-02 18:09:06 -04:00
Christian Weeks
8e1f51d792
Forge support
2012-04-01 02:14:14 -04:00
Christian Weeks
a8351a0e84
Initial attempts to support forge stuff
2012-03-31 02:28:14 -04:00
Christian Weeks
ebf945f2bd
Fix NPE
2012-03-31 01:04:29 -04:00
Christian Weeks
e27f1c3a70
More logging and maybe fix default package mods
2012-03-31 00:59:43 -04:00
Christian Weeks
8091d8bdaf
Logging fun. Whee!
2012-03-31 00:52:50 -04:00
Christian Weeks
281c455b5d
Fail
2012-03-31 00:46:47 -04:00
Christian Weeks
44779a56b1
More logging
2012-03-31 00:43:54 -04:00
Christian Weeks
f37c8ae4d7
Tweak class loader
2012-03-31 00:22:08 -04:00
Christian Weeks
41f469f495
Add more patches
2012-03-30 22:28:12 -04:00
Christian Weeks
28ac773c0a
Some implementation
2012-03-30 22:26:16 -04:00
Christian Weeks
376d3995b4
tweak MC server hook
2012-03-30 21:23:04 -04:00
Christian Weeks
cec16187c1
some build and logging tweaks
2012-03-30 21:21:43 -04:00
Christian Weeks
f075e613e3
Fix build
2012-03-30 21:10:43 -04:00
Christian Weeks
7f985856ec
Fix derpy
2012-03-30 21:07:42 -04:00
Christian Weeks
d8580c2d02
Tweak loader a bit
2012-03-30 21:03:25 -04:00
Christian Weeks
12c23deee9
Fix patching
2012-03-30 20:43:58 -04:00
Christian Weeks
e5b4d1e953
More build stuff
2012-03-30 20:38:31 -04:00
Christian Weeks
18069778d9
More building fun
2012-03-30 17:36:50 -04:00
Christian Weeks
ba46c2e3bc
fix build script
2012-03-30 17:00:49 -04:00
Christian Weeks
c521479962
Add in more ignore stuff and a sample "fmlbuild.properties" file
2012-03-30 16:42:11 -04:00
Christian Weeks
620764f315
More build stuff, adding in readme etc copied from forge
2012-03-30 16:40:54 -04:00
Christian Weeks
d97aaa4e82
Move more stuff around
2012-03-30 16:25:49 -04:00
Christian Weeks
c7437f3a3b
Build system
2012-03-30 16:22:10 -04:00
Christian Weeks
cc65a26a89
Start patching fun
2012-03-30 13:33:29 -04:00
Christian Weeks
3afd52ac9d
Ignore stuff
2012-03-30 11:35:35 -04:00
Christian Weeks
efa8cf41b2
We're Forge Mod Loader, not Forge ModLoader
2012-03-30 11:35:04 -04:00
Christian Weeks
b71f486837
Tweak license to refer to github
2012-03-30 10:16:36 -04:00
Christian Weeks
2edeba5af4
Add licenses reorganize code
2012-03-30 10:11:13 -04:00
Christian Weeks
7b3fb203fc
Starting to get somewhere
2012-03-30 01:12:59 -04:00
Christian Weeks
62cca5a4b7
Thoughts on how to do the modloading properly
2012-03-28 16:44:36 -04:00
Christian Weeks
0cc2bc1923
Tab cleanup
2012-03-28 13:29:23 -04:00
Christian Weeks
7c30c12f9f
Initial commit
2012-03-28 12:53:08 -04:00