keith/ForgePatch
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Wiki Activity
988 commits 1 branch 2 tags 103 MiB
Commit graph

489 commits

Author SHA1 Message Date
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
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
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
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
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
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
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
CovertJaguar
224d933564 Added an accessor for villagers 2013-01-07 14:55:17 -08: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
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
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
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
Christian
5770708e75 Update to MC 1.4.6 2012-12-17 21:48:29 -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
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
Christian
a26b495ef9 Move Side and SideOnly to relauncher package 2012-12-15 23:21:26 -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
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
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
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
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
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
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
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
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
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
9cdbadb66c Merge branch 'master' into repackage 
Conflicts:
	patches/minecraft/net/minecraft/client/EntityFX.java.patch
 2012-12-03 17:31:29 -05:00
Christian
25a10d6fc4 Fix up MCP version 2012-11-20 08:47:14 -05:00
LexManos
586807c2c8 Update FML imports 2012-11-20 03:14:36 -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
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
719f5f2bde Update FML for MC 1.4.5 2012-11-16 16:31:06 -05: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
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
8ec0cf6ab9 Update to 1.4.3 2012-11-01 23:53:13 -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
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
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
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
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
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
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
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
7da5727e3e Fix CommonHandler for rename of the server thread class 2012-10-20 12:31:35 -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
528670d103 Updated the AT config and Marker config for 1.4 obf 2012-10-20 00:36:33 -07: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
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
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
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
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
639039dd18 Fix language registry additions, closes #113 2012-09-28 22:12:23 -04: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