Commit Graph

4503 Commits

Author SHA1 Message Date
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 c12bb689fb MinecraftForge/FML@a39482c4b7 Splash screen implementation
MinecraftForge/FML@01fea095cd Merge branch '1.7.10-load-progress' of github.com:RainWarrior/FML into 1.7.10
MinecraftForge/FML@364b4bbbb0 Call some loader stuffs
MinecraftForge/FML@61a891280d Make sure to close the splash screen if there's gonna be an error display
2015-04-21 00:30:52 -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 50215307f2 MinecraftForge/FML@d14d1a8fea Update to use the inherited jar format. Simplifies a lot.. 2015-04-20 22:27:10 -04:00
cpw b049b39760 Update to use the inherited jar format. Simplifies a lot.. 2015-04-20 22:25:29 -04:00
cpw 96cbadb874 Expose the fluid that a block was constructed with, useful for 'non-default'
configuration of fluidblocks. Shouldn't be used outside of this purpose.
2015-04-20 10:29:04 -04:00
cpw 50608986fe Replace the OLD fluid in the fluidID map, not the new one.. 2015-04-20 10:01:36 -04:00
cpw 7bbe8df2b8 Fix static initializer derp. 2015-04-20 09:26:27 -04:00
cpw 0543828603 Make FluidStack hold a delegate for the fluid. This can then float based on what is "live" at present. 2015-04-20 09:06:23 -04:00
cpw 7e9d2fb509 Reformat ItemArmor$ArmorMaterial.getBaseItem to use an if/then/else structure. The switch
causes the generation of an internal class which may derp custom armor addition.
Closes #1799
2015-04-19 12:04:22 -04:00
cpw dcb2f2588c Actually use the override constraint in ticket requests. Closes #1802 2015-04-19 11:57:39 -04:00
cpw 178acfbb20 Change logging to avoid the String.format bug. Closes #1809 2015-04-19 11:52:23 -04:00
cpw 57408af2a3 MinecraftForge/FML@8f9e3a7e30 Exceptions during construction phase should not propogate and cause an immediate crash. Closes #638 2015-04-18 21:54:01 -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
cpw 54af750717 Verify that the fluid registry doesn't contain "junk" fluids thru reflection. 2015-04-18 21:37:45 -04:00
Lex Manos 1effc27790 Fixed NBTSizeTracker missing a lot of data being read. Also made new NBT object allocation claim 32-bits in the size tracker.
(cherry picked from commit de066a86da)

Conflicts:
	patches/minecraft/net/minecraft/nbt/CompressedStreamTools.java.patch
	patches/minecraft/net/minecraft/nbt/NBTTagList.java.patch
2015-04-18 21:22:44 -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
KingLemming 61984561cd Merge pull request #1805 from KingLemming/1.7.10
OreDict functionality updates.
2015-04-16 17:20:43 -04:00
King Lemming cd3bbfb02c Adds some new Ore querying functionality.
Also attempts to size initial Hashmaps in a logical manner.

Signed-off-by: King Lemming <kinglemming@gmail.com>
2015-04-16 17:18:37 -04:00
Lumien 81ab4cbc5f Added LivingExperienceDropsEvent to change the amount of experience an entity drops 2015-04-14 11:58:00 +02: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 475d7fc02d Revert KL's change, requesting a ore WILL register it.
Registering like this and returning a new empty list allows for modders to register their recipes and such without requiring to be executed after someone actually adds an item. If handled properly this allows for more flexible load orders, and more responsive code.
2015-04-13 21:28:16 -07:00
KingLemming b30b551197 Merge pull request #1796 from KingLemming/1.7.10
Adjusts OreDictionary to prevent invalid registrations.
2015-04-13 22:41:25 -04:00
King Lemming 3cd7f6bd87 Adjusts OreDictionary to prevent invalid registrations.
Getting Ore Names for a non-existent ore will no longer automatically add that Name to the list nor generate an ID.

Tweaks a warning message in the FluidContainerRegistry. No functionality change.

Signed-off-by: King Lemming <kinglemming@gmail.com>
2015-04-13 22:40:38 -04: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
cpw 277495c8e4 MinecraftForge/FML@dfce4cd8d0 Allow registering custom language adapters.
MinecraftForge/FML@9fecd72cf0 Some tidyup of the PR
MinecraftForge/FML@10ac2a4fd9 Fix itemCtorArgs javadoc in registerBlock
MinecraftForge/FML@86f70d37a4 Patch TracingPrintStream to handle Kotlin IO.
2015-04-11 18:20:11 -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
cpw 5c88164211 And handle the null case in the constructor itself. Closes #1794 (again) 2015-04-11 17:38:15 -04:00
cpw 230d757a89 Fix NPE - Closes #1794 2015-04-11 17:27:14 -04:00
cpw 9671179453 Fluids are now tracked internally by mod. This allows for the server and the world to specify a "default"
in the case of a possible alternative fluid implementation. If you always called registerFluid, things
should work pretty seamlessly, but if you didn't (gating with an isFluidRegistered check for example)
you should change to register anyway. This way, even if you're not default in the overall instance, you may
become default if you're the only mod present on a server, for example, or in a world save.

This should radically decrease the mixups caused by mod load ordering problems, and other issues around fluid
tracking.
2015-04-11 17:18:53 -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 eb12936a52 MinecraftForge/FML@0da1263ff9 Enhance error output for bad textures a bit more and try and capture more types of error.. 2015-04-11 12:30:20 -04: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 345d905438 MinecraftForge/FML@be5ec06e31 Cleaning up the missing resource stack spam, and condensing the information into a usefully understandable format. 2015-04-11 01:03:50 -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 6049d371f3 MinecraftForge/FML@ce791cb1f2 Rework EventSubscriptionTransformer to bake @Cancelable and @HasResult values, should increase EventBus performance even more by removing logic from Event constructors.
MinecraftForge/FML@852710962a Clean up some dead code
2015-04-10 22:46:53 -04:00