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
bbe4b9fbc2
More fixes
2012-12-16 21:22:55 -05:00
3369976c05
Updated MCP download mirriors upon Searge's request.
2012-12-16 05:35:46 -08:00
a26b495ef9
Move Side and SideOnly to relauncher package
2012-12-15 23:21:26 -05:00
8f3b1aeff7
Fix newline fun
2012-12-15 22:37:32 -05:00
d811fea82c
More stuff for the thingy
2012-12-15 22:30:16 -05:00
16651d6994
Remove old NEI/CCC compatibility code and other classloading tweaks
2012-12-15 20:40:08 -05:00
70b9cd6e1f
Fix var name messup
2012-12-13 00:22:30 -08:00
60b6913a87
Update released eclipse project to link BouncyCastle
2012-12-12 23:44:28 -08:00
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
d13187d689
Fix possible escape leakage..
2012-12-12 19:31:05 -05:00
238dcdd18d
More robust eclipse workspace replacement
2012-12-12 14:31:07 -08:00
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
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
229a501def
Remove extraneous patch file
2012-12-11 20:37:12 -05:00
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
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
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
65a8bbf9e7
Fix patches, rebased with HEAD
2012-12-10 15:37:48 -08:00
9be4b14371
Remade python dist as 32-bit.
2012-12-10 15:26:15 -08:00
1c5b8ecb7b
Fixing id map generation - should validate correctly now
2012-12-10 15:26:13 -08:00
5753eb0738
Reenabled replacement of the eclipse folder.
2012-12-10 14:56:23 -08:00
41e899dcea
Remade python dist as 32-bit.
2012-12-10 14:56:05 -08:00
aee1a3f24d
Fixing id map generation - should validate correctly now
2012-12-09 22:24:16 -05:00
3f383e2dc6
Fix up idmap code
2012-12-09 22:01:13 -05:00
5e0af1f2cb
Some derp protection in the workspace copy.
2012-12-09 02:20:21 -08:00
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
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
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
21c66eaf98
Updated the update_packages script to support different mcp locations
2012-12-08 21:40:39 -08:00
1742abb139
Update fml_marker.cfg, Minecraft is now runnable!
2012-12-08 20:25:29 -08:00
804e597aca
Update all imports for repackaging. Branch is compileable.
2012-12-08 20:21:03 -08:00
e63311b4d0
Some stragler patches
2012-12-08 19:34:35 -08:00
b02f93aeed
Updated patches to new packages.
2012-12-08 19:33:29 -08:00
ded6b4667b
Give new classes a distinct package to be moved from.
2012-12-08 17:50:14 -08:00
2009c89bf7
Fixed 0.tree to actually refresh the workspace.
2012-12-08 17:35:11 -08:00
3e1efdf05b
Remerged branch, and updated dev eclipse workspace.
2012-12-08 17:08:51 -08:00
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
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
57fe3c475a
Fix build eclipse extractor task
2012-12-08 16:46:46 -08:00
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
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
7b7255013a
Fix build eclipse extractor task
2012-12-04 18:04:45 -05:00
71044df76b
Fix typo
2012-12-04 01:30:38 -05:00
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
fa34555efa
Try and make branch non-derpy
2012-12-03 23:47:23 -05:00
45583a7420
Try defaulting branch differently
2012-12-03 22:26:12 -05:00
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
61a90e9e74
Assume Forge is the parent directory when checking for AT configs.
2012-12-03 16:53:03 -08:00
9cdbadb66c
Merge branch 'master' into repackage
...
Conflicts:
patches/minecraft/net/minecraft/client/EntityFX.java.patch
2012-12-03 17:31:29 -05:00
6fdf5960ef
Name both zips the same format
2012-12-03 08:38:20 -05:00
329fe50b1d
Last part of branch name only please
2012-12-03 08:30:44 -05:00
461173a778
Try and get a valid branch name on jenkins
2012-12-03 08:23:21 -05:00
16418dd7ad
Clean up build.xml script- support outputting a branched jar file
2012-12-03 08:13:20 -05:00
e334a469fb
Small derp in install.py
2012-12-02 20:26:36 -08:00
d583a760ec
Try marking python as binary.
2012-12-02 20:19:55 -08:00
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
5cf07b008e
Windows Python distrabution created using py2exe, thanks Fesh0r for the script.
2012-12-02 19:56:17 -08:00
adad5c96cf
Marked more spots in gui/items bitmask as being free.
2012-11-21 15:58:04 -08:00
10cdc06cc3
Delete duplicate file
2012-11-20 18:07:39 -08:00
78ff6182fe
Finished repackaging net.minecraft.* net.minecraft.client is left
2012-11-20 17:58:22 -08:00
7fb23bf89f
More re-packaging, got most classes out of the default package.
2012-11-20 17:22:55 -08:00
25a10d6fc4
Fix up MCP version
2012-11-20 08:47:14 -05:00
389608116f
Merge joined.exc add update howto
2012-11-20 08:38:33 -05:00
f74b8ac30b
Revert "Fix MC-2497 - derpy torch flames. Moved from forge. Everyone should benefit."
...
This reverts commit fa567014a54b3273002fe9cf424ab4cf3ec54c3a.
2012-11-20 08:27:13 -05:00
554d86f59b
Remove common folder from projects
2012-11-20 03:15:45 -08:00
f75bf90e77
Move IBossDisplayData to shared
2012-11-20 03:15:16 -08:00
8b1ed2d255
First half of new patches
2012-11-20 03:15:01 -08:00
586807c2c8
Update FML imports
2012-11-20 03:14:36 -08:00
73a22bb571
Inital script side commit for MC source repackaging done.
2012-11-20 01:55:41 -08:00
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
745b697779
Forgot mcp.cfg
2012-11-19 15:47:18 -08:00
950154aa61
Updated to 1.4.5b
2012-11-19 15:35:08 -08:00
5e5919f61c
Fix python error
2012-11-19 15:03:13 -08:00
786b04c57d
Modified decompile so that we do not have to decompile the server, saves time.
2012-11-19 15:01:04 -08:00
72938c9133
Cleaned up some tabs
2012-11-19 15:00:11 -08:00
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
02b6904843
Attempt to fix a possible comodification risk
2012-11-18 20:40:48 -05:00
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
0340719ca2
Fix mod display list. Shouldn't be derpy anymore.
2012-11-17 23:51:14 -05:00
c445ab004b
Fix World patch- workaround no longer required and leftovers are bad.
2012-11-17 23:44:53 -05:00
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
783926194e
Fix MC-2497 - derpy torch flames. Moved from forge. Everyone should benefit.
2012-11-16 22:50:21 -05:00
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
1c9b59b405
Clean up a patch
2012-11-16 16:49:44 -05:00
719f5f2bde
Update FML for MC 1.4.5
2012-11-16 16:31:06 -05:00
6191f2530c
Fix for ModLoader static overrides not displaying.
2012-11-15 14:08:41 -08:00
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
5355348181
Fix spelling issue.
2012-11-08 21:01:31 -08:00
4e2f04c48a
FML setup should now download and verify all the minecraft files needed to run MCP.
2012-11-08 17:54:05 -08:00
96971abe13
Small fix to some MCP metadata for pre2
2012-11-08 20:34:45 -05:00
3dbe774ec1
Update to MC 1.4.4
2012-11-08 17:55:20 -05:00
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
9c3b07f53a
Clean up some patch fuzz
2012-11-02 17:32:39 -04:00
c2350be4a7
Update joined.exc file from latest conf
2012-11-02 17:23:54 -04:00
8ec0cf6ab9
Update to 1.4.3
2012-11-01 23:53:13 -04:00
1a11b9c0e6
A useful tool for performing updates
2012-11-01 23:11:21 -04:00
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
92010b5bca
Patch a file handle leak in RegionFileCache handling when under memory pressure.
2012-10-31 22:58:01 -04:00
30db9154b2
Update MCP mapings again, yay bad syncs.
2012-10-31 09:23:17 -07:00
Christian