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

2186 commits

This branch
This branch
All branches
Author SHA1 Message Date
cpw
24989689b3 GIANT FML UPDATE! Bump forge revision number, and fix patches for ItemStack changes. More to come on this branch I expect. 
MinecraftForge/FML@7c5cf21904 Implement STDOUT/STDERR redirection.
MinecraftForge/FML@bc78e31cb7 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
MinecraftForge/FML@a2908e5c59 Clean up a bunch of compiler warnings.
MinecraftForge/FML@7f67523d87 Update realms to 1.3.2
MinecraftForge/FML@73f23c24b8 Merge branch 'std-redir' of github.com:Emberwalker/FML
MinecraftForge/FML@1c6b25df74 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.
MinecraftForge/FML@e77da9eb2f And fix the read side too, incase someone is trying to bitbang and failing.
MinecraftForge/FML@305d8950c9 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.
MinecraftForge/FML@bdfca1c8ed Make more noise when people screw up mod downloading and put .jar.zip in their mod folders.
MinecraftForge/FML@2108494112 Add a custom version range factory method. Should hush skyboy's complaints. Closes #486
MinecraftForge/FML@7c1e6aaa40 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*
MinecraftForge/FML@61fcb4df06 Tweak Itemstack patch to always delegate to the method call. Set the field, so it's in sync.
MinecraftForge/FML@eb8c5ab146 Fix nested directory for language resources. Closes MinecraftForge#1264
MinecraftForge/FML@7c05e5f70d Default collections, so that we don't crash if useDependencyInfo is true. Closes #485
MinecraftForge/FML@9729fe2332 Kill net.minecraft.src warning. It hasn't served a purpose in a long time now. Closes #313
MinecraftForge/FML@21e875ef22 AllowPlayerLogins only after the server has completed the core init tasks. Closes #372
MinecraftForge/FML@46cfeade80 Add a constructor to CustomModLoadingDisplayException. Closes #387
MinecraftForge/FML@a6eab2683a Update README.txt
MinecraftForge/FML@f75838461c Last part is the itemstack transformer. Itemstacks should now only be loosely coupled with the items within.
MinecraftForge/FML@51f24e9e6d First draft of add alias. It is probably not properly persistent atm.
MinecraftForge/FML@2a4c642470 Finally fix stupid NPE error caused by FML trying to parse the super of Object in IDEA envs.
MinecraftForge/FML@c1b1417ee1 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.
MinecraftForge/FML@3d42cda2a2 Build.Gradle Patch
MinecraftForge/FML@20c7add845 Merge pull request #484 from bspkrs/master
MinecraftForge/FML@26ed4b992e Clear button list on FML fatal error screens. The hidden cancel button should not be there. Closes #497
MinecraftForge/FML@ebe4f5c5e2 Merge pull request #494 from AntonBoch1244/patch-1
MinecraftForge/FML@ad0da05f5c Fix the ItemStack transformer to find the method and field so it works with srg and mcp naming.
MinecraftForge/FML@65d380181a Extend timeout for client to 5 seconds. Should fix Forge #1322
MinecraftForge/FML@45486a0b6d Fix almost invisible NPE in TerminalTransformer when loading a non-existant class
MinecraftForge/FML@13da3efce0 Allow a clean way to exit the game without big ugly warnings, but with logging information available if needed. Closes #496
MinecraftForge/FML@fda305edfe Some more tidying up of the exit handling
MinecraftForge/FML@b087f60c33 More cleanup of exit handling, also add a couple more noise classes to the list of things ignored.
MinecraftForge/FML@d6358a466b Cleanup override warnings
MinecraftForge/FML@af7a58b9e5 Update to legacylauncher 1.10 and asm 5.0.3
MinecraftForge/FML@e6d00440a6 ItemStack swapping
MinecraftForge/FML@8597e45a0e Fix NPE from a boolean
MinecraftForge/FML@b9b9daa8a9 Fix ups from feedback.
MinecraftForge/FML@d89165021f Mark the promise a success in the outbound handler.
MinecraftForge/FML@2e5ccf7988 Update for launchwrapper 1.11. Fixes java 6 compatibility.
MinecraftForge/FML@641250d853 Fix java 8u20. Closes #501 and a bunch of other bugs too.
MinecraftForge/FML@292be72639 Allow client handshake to be reset by server to support BungeeCord.
MinecraftForge/FML@092873fbe5 Merge branch 'bungeecord' of github.com:bloodmc/FML
MinecraftForge/FML@134f2f8e88 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.
MinecraftForge/FML@4852de81e0 Wrap the server description box a little bit shorter. Stops the overlapping. Closes #489
 2014-08-30 00:16:46 -04:00
LexManos
fa7ff7c6e7 Merge pull request #1300 from zlyfire/patch-1 
Update README.txt
 2014-08-20 13:01:53 -07:00
LexManos
1dadcb12be Merge pull request #1330 from bonii-xx/master 
Write the correct default value for StringList comments in the config
 2014-08-15 13:56:15 -07:00
Bernhard Bonigl
53294b843b Write the correct default value for StringList comments in the config 2014-08-15 15:57:44 +02:00
Lex Manos
ba69a1a6fd Fix AIOOB in BiomeDictionary. Closes #1326 2014-08-14 20:33:23 -07:00
cpw
6fafbf3b09 Attempt to properly resolve this daft metadata and TE nonsense. This might be mod impacting, if you maintain a reference to a TE via neighbour update calls - you 
might see two TEs for a single setblock where previously you saw one. This is a phantom TE being created by badly written neighbour triggers - I'm looking at you
redstone.

Anyway, with luck, this'll close a slew of bugs across Forge, IC2, MFR, TE, RC. Yeah, fun times. Thanks to LexManos, skyboy and KingLemming for helping figure this
issue out. Quite frankly, from now on, issues with phantom TEs will be mods behaving badly. Modders will need to adapt.
 2014-08-13 00:00:29 -04:00
LexManos
016e303379 Fix invalid math in GuiContainerCreative. 2014-08-12 17:32:53 -07:00
LexManos
5d01fa55b1 Merge pull request #1316 from GUIpsp/master 
Add ItemStack sensitive version of getItemEnchantability
 2014-08-12 11:43:59 -07:00
SackCastellon
2519822b25 Add ItemStack sensitive version of getItemEnchantability 2014-08-12 16:48:01 +01:00
Lex Manos
6f693206de Add ability for creative tabs that have search bars to customize the text box's width, and prevent the default set of enchanted books from being displayed in those tabs. Closes #1303 Closes #1301 2014-08-11 19:18:38 -07:00
LexManos
948f7145d1 Merge pull request #1187 from Abastro/skylight 
Skylight Hooks for Minecraft Forge
 2014-08-11 16:00:11 -07:00
Abastro
f590ce8641 Skylight Hooks for Minecraft Forge 
Mainly for solar/lunar eclipse.
 2014-08-11 15:42:07 +09:00
LexManos
261ba628df Merge pull request #1217 from Glassmaker/patch-1 
Adds getLocalizedName and getUnlocalizedName to FluidStack
 2014-08-10 01:42:24 -07:00
zlyfire
ce8882e89c Update README.txt 
Add in reference to running setupDecompWorkspace to get decompiled classes
 2014-08-06 16:29:34 -04:00
LexManos
98285e4df6 Merge pull request #1297 from ShetiPhian/patch-1 
Legacy Liquid Load Fix
 2014-08-05 19:47:58 -07:00
ShetiPhian
22609b1d54 Legacy Liquid Load Fix 
nbt.getString("FluidName") no longer returns null, it returns an empty string.

This patch allows legacy liquids to be resolved once again.
 2014-08-05 21:08:53 -04:00
Lex Manos
5131aed7bd Fix metadata for every permutation -.- Closes #1294 2014-08-05 15:18:02 -07:00
Lex Manos
d2682ab969 Fix patch screwup in Skyboy's Fishing PR -.- 2014-08-05 15:17:10 -07:00
LexManos
4600b015d9 Merge pull request #1296 from Vazkii/patch-3 
Fixed items with more than 2 render passes rendering wrong in first person
 2014-08-05 13:15:59 -07:00
Lizbeth Rika
63140bcf7f Fixed items with more than 2 render passes rendering weird in first person 2014-08-05 21:10:28 +01:00
LexManos
ec0691538f Merge pull request #1292 from DemoXinMC/master 
New PlayerRepairEvent and AnvilUpdateEvent
 2014-08-04 14:34:10 -07:00
DemoXin
68fd0049fb * Added AT for ContainerRepair.stackSizeToBeUsedInRepair (Now public) 
* Added ability to AnvilUpdateEvent to alter stackSizeToBeUsedInRepair (vanilla behavior is now reproducable)
* Added AnvilRepairEvent, fired when the player removes an ItemStack from the output slot of ContainerRepair, and allows the chance to damage the anvil to be altered.
 2014-08-04 16:54:35 -04:00
KingLemming
7cd820d855 Merge pull request #1288 from skyboy/master 
Add EntityFishHook AT
 2014-08-03 22:06:26 -04:00
skyboy
5f8d501ed6 Add EntityFishHook AT 2014-08-03 19:52:59 -04:00
LexManos
224987aa83 Merge pull request #1128 from skyboy/patch-fishingapi 
Add API for fishing results, I'm tired of this, If shit breaks, Blame Skyboy and King_Lemming.
 2014-08-03 16:28:32 -07:00
LexManos
dae471e7d7 Merge pull request #1272 from rwtema/master 
Fixed ItemFluidContainer always draining the maximum amount, regardless ...
 2014-08-03 15:47:58 -07:00
Lex Manos
cd2982f9b1 Closes #1280 2014-08-02 11:32:34 -07:00
Lex Manos
10192959f9 Fixed bug that allowed duplication of Fluids with redstone dust. Closes #1279 2014-08-01 18:37:54 -07:00
rwtema
eeb701cb16 Fixed ItemFluidContainer always draining the maximum amount, regardless of the amount remaining. 2014-07-31 20:52:52 +01:00
LexManos
bc8374d71c Merge pull request #1263 from Zarathul/master 
Added drainFluidContainer() and getContainerCapacity() helper methods to FluidContainerRegistry.
 2014-07-30 13:11:58 -07:00
zarathul
7a1de8c13d - Added drainFluidContainer() and getContainerCapacity() helper methods. 2014-07-30 13:23:52 +02:00
LexManos
7170a8c4c6 Merge pull request #1254 from Adubbz/master 
Added a RenderFogEvent
 2014-07-28 13:29:49 -07:00
Adubbz
2affeae979 Added an event for fog rendering 2014-07-28 17:01:38 +10:00
skyboy
cc169c3ea1 Update FishingHooks 2014-07-25 06:42:17 -04:00
cpw
a22bcf7e72 MinecraftForge/FML@3231db9376 Sorta revert 908491d5e7ac26becdac938f38cc90d6b9d73ce1 but merge assets into the map, rather than force overwriting. Fixes skyboy's comment. 2014-07-24 21:41:59 -04:00
cpw
bbcc515063 Revert old light amortization patch. It seems to be breaking chunk sending pretty badly when more 
than a couple of people are online. Tests indicate it is not useful anymore.
 2014-07-24 21:40:30 -04:00
skyboy
906dcb999d Add FishingHooks 2014-07-24 04:12:45 -04:00
Lex Manos
9febf999c0 Updated FML: 
MinecraftForge/FML@53887ac59c Hacky interm solution to #1207 to buy me time to re-write FML's network protocol.
 2014-07-18 12:29:03 -07:00
Lex Manos
c69958e34b Made skulls respect Block.isReplaceable when placing, also prevented them from deleting blocks when placed at certain angels. Closes #1233 2014-07-16 18:37:49 -07:00
Lex Manos
b2dddf545b Fixed NPE that happens sometimes when exiting the game witout fully loading a world {main a dev-time thing} 2014-07-16 18:36:12 -07:00
Lex Manos
5f20829165 Updated FML: 
MinecraftForge/FML@9d40b76197 Don't scan ObjectHolders if there was an error already, derpitude will ensure.
MinecraftForge/FML@76538c1781 Add a terminal transformer and tweaker.
MinecraftForge/FML@aec9228845 Add ExitVisitor to the TerminalTransformer that finds and intercepts any calls to Runtime.exit or System.exit.
MinecraftForge/FML@908491d5e7 Move LaunguageRegistry call above normal asset loading to allow resource packs to override mod's language systems.
MinecraftForge/FML@d13295e281 Fix FMLAT manifest AccessTransformers, class loader fun!
 2014-07-16 16:52:18 -07:00
LexManos
20cac56bfb Merge pull request #1235 from darkhax/master 
Changed exception message for duplicate enchantment ids
 2014-07-16 10:10:28 -07:00
Darkhax
08826ed84b Changed exception message for duplicate enchantment ids to contain the 
class path for both enchantments along with the enchantmnet id that has
been duplicated.
 2014-07-16 07:08:57 -06:00
LexManos
06701348d6 Merge pull request #1232 from bspkrs/patch-3 
Fixed missing assignment of constructor arg (thanks @Lunatrius)
 2014-07-15 12:26:00 -07:00
bspkrs
e35755c3e3 Fixed missing assignment of constructor arg (thanks @Lunatrius) 
I must have edited this out when I was cleaning up my formatting commit spam.
 2014-07-15 09:47:01 -04:00
LexManos
e2fe13bd17 Merge pull request #1226 from williewillus/xporb 
Fix experience orbs spawning at 32x coordinates clientside
 2014-07-14 14:56:52 -07:00
Vincent Lee
a35457ecb7 Fix comment derp (+1 squashed commits) 
Squashed commits:

[52c40bc] Fix experience orbs spawning at 32x coordinates clientside

Add // FORGE comment

Add // FORGE comment to clarify the purpose of the change
 2014-07-14 16:43:16 -05:00
LexManos
79cda09594 Merge pull request #1225 from williewillus/master 
Fix chat opacity
 2014-07-14 13:11:09 -07:00
Vincent Lee
5c0217d316 Fix chat opacity 
Add // FORGE comment

As per convention, add // FORGE comment to clarify the purpose of the change
 2014-07-13 23:44:47 -05:00
Lex Manos
52ec4f7c57 Updated FML: 
MinecraftForge/FML@ab52901b8b Force preferIPv4Stack to true early in the load chain to combat netty loopback issues.
MinecraftForge/FML@11893fbbb7 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.
MinecraftForge/FML@fdb6b34b8f Update authlib and realms to latest json data.
MinecraftForge/FML@b3a74882b4 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
MinecraftForge/FML@7c6d1f7568 Merge pull request #468 from bspkrs/master
MinecraftForge/FML@692d955c1a Update tweaker login to use authlib.
MinecraftForge/FML@c2119eb1c1 Update realms library to 1.3.1, and implement network latch when connecting to Realms. Tested and working.
 2014-07-11 18:17:50 -07:00