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

2202 commits

This branch
This branch
All branches
Author SHA1 Message Date
Christian
71b3ba2041 MinecraftForge/FML@503da3a257 Don't consider null NetworkDispatchers. This should fix a bunch of fakeplayer issues. 2014-05-13 08:16:22 -04:00
Lex Manos
f95ca18707 Fixed No Blue Orchids spawn in swamp when using bone meal Closes #1072 2014-05-12 12:36:36 -07:00
Lex Manos
711e92a59f Fully clear DimensionManager's DimensionID bitset when world is loaded. Closes #1074 2014-05-12 11:46:03 -07:00
Christian
26c55d89ef Fix forge validating strict versions on remote connections. 2014-05-12 13:49:46 -04:00
Christian
51b55eaf25 MinecraftForge/FML@a8cbef2321 Finally hopefully fully kills the race condition causing a classcast on slow machines. 
MinecraftForge/FML@8dbd1ae0a1 Fix ObjectIntIdentityMap sporadically matching non-identical objects.
MinecraftForge/FML@42713c66e5 Merge pull request #426 from sfPlayer1/master
 2014-05-12 10:51:00 -04:00
Adubbz
4454d3f341 Greatly simplified the addition of new biomes to the default world 2014-05-11 15:06:14 +10:00
Christian
bb52a6b062 MinecraftForge/FML@d8b6adb259 Add a helper for casting some common collection types into generic form 
MinecraftForge/FML@5275cea844 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:54:23 -04:00
Lex Manos
80511409ff Updated FML: 
MinecraftForge/FML@a70308ef41 Update mcmod.info
MinecraftForge/FML@8555344eb3 updated wrapper to gradle 1.12
MinecraftForge/FML@1d5fc60f82 Merge pull request #411 from matthewprenger/master
MinecraftForge/FML@3612ad0c25 Attempt to fix another race condition related to reading NetClientHandler.
MinecraftForge/FML@c73a2076e3 Fix potential rance condition in connecting to vanilla servers as well. And move latch into client side only.
MinecraftForge/FML@1436ac2f14 Fine use FMLCommonHandler.
MinecraftForge/FML@542e9acec1 documented dependencies
MinecraftForge/FML@ddc2cfbe86 Merge pull request #402 from AbrarSyed/patch-1
MinecraftForge/FML@362ec8dee7 Merge pull request #419 from Thog92/master
MinecraftForge/FML@b9de9ebc96 Revert "Fix refreshResources not happening if an error occurs."
MinecraftForge/FML@738ce1d7cd Re-add removed genericiterable to clean a warning
MinecraftForge/FML@b0eb1ef7c6 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.
MinecraftForge/FML@de546bdf6c Clean up some missing generic info
MinecraftForge/FML@cd43eacbb2 Ensure that the loadcontroller is ready to preinit.
MinecraftForge/FML@f2fe80dc36 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
MinecraftForge/FML@0c36868f92 Fix network disconnect with message on the client side in NetworkDispatcher.
 2014-05-09 13:34:08 -07:00
LexManos
51628825e5 Merge pull request #1064 from bspkrs/patch-2 
Fixed unforeseen NPE
 2014-05-08 08:40:25 -07:00
bspkrs
e625622b6e Fixed unforeseen NPE 2014-05-08 10:22:48 -04:00
Lex Manos
9e1f038c16 Revert "Implemented hashCode and equals in ItemStack, Closes #986" 
This reverts commit 0b01545a03.
 2014-05-07 22:08:06 -07:00
Lex Manos
0b01545a03 Implemented hashCode and equals in ItemStack, Closes #986 2014-05-07 15:28:03 -07:00
Lex Manos
c8abc41aa0 Fix extended entity properties being lost when leaving the end, This introduces the concept of calling IExtendedEntityProperties.init when entites/worlds change. Lets see if mods explode. 2014-05-07 14:52:18 -07:00
LexManos
3b79370be1 Merge pull request #1062 from bspkrs/master 
New GuiScreen events and a new ElementType DEBUG for RenderGameOverlayEvent
 2014-05-07 13:58:18 -07:00
bspkrs
eb2549c773 New GuiScreen events and a new ElementType DEBUG for RenderGameOverlayEvent 2014-05-07 16:52:10 -04:00
Lex Manos
d881baa581 Added new hook to WeightedRandom.getItem that allows for use of custom rnadom generators, prevents redundant code in mods. 2014-05-07 13:27:05 -07:00
Lex Manos
f81c0cb58f Fixed hard references in WorldGenBigTree and ForgeCommand that caused worlds to leak in the client. 2014-05-07 12:18:56 -07:00
Lex Manos
0fe2584b77 Updated FML: 
MinecraftForge/FML@2c56c32c5a Fix saving backups with the raw name. Fix air block not being assigned as the default.
MinecraftForge/FML@d0f8073fa5 Merge pull request #413 from sfPlayer1/master
MinecraftForge/FML@810b1f3075 Clean some generic warnings up. Make a generic list handler. Helpful for others I think too.
MinecraftForge/FML@fff86ee9d3 Fix refreshResources not happening if an error occurs.
MinecraftForge/FML@76d8d0e870 Fix mod version checking
MinecraftForge/FML@b84d0760ae Fix display of mod status at the server
MinecraftForge/FML@251af1d09d Fixed memory leak on the client caused by Netty holding references to the World.
 2014-05-07 12:17:52 -07:00
LexManos
5fc3e7e913 Merge pull request #1060 from Azanor/master 
Fix for Block.getExplosionResistance getting passed the wrong parameters
 2014-05-07 09:41:43 -07:00
Azanor
2e1033b045 Fix for Block.getExplosionResistance getting passed the wrong parameters 
It is being sent the x, x, y coordinates instead of x, y, z
 2014-05-07 17:21:58 +02:00
LexManos
80fd60eaff Merge pull request #1051 from Deadrik/ChunkProviderFixes 
ReplaceBiomeBlocks Event changes
 2014-04-29 17:38:37 -07:00
Bioxx
f848955263 Adds a new ReplaceBiomeBlocks Event constructor that supplies the metadata array if applicable and updates the ChunkProviderGenerate class to pass in the metadata array. 2014-04-29 19:40:32 -04:00
LexManos
d01758e90d Merge pull request #1050 from CovertJaguar/master 
Flexible Rail return value was inverted between 1.6 and 1.7
 2014-04-29 14:12:33 -07:00
CovertJaguar
5f6e1167f4 Fix issue with flexible rail return value 
Between 1.6 and 1.7 the return value to BlockRailBase.isFlexibleRail()
was inverted. While this is not a huge deal and could be worked around
by simply inverting your return value, it does mean its no longer
consistent with the function name and javadocs.
 2014-04-29 14:07:59 -07:00
Christian
63a205c043 No, this is not me modding either. I'm doing this as a favour for Lex, who's a bit computerless at the minute. 
MinecraftForge/FML@77c254a6d9 I am not modding, I am fixing an annoyance. The MCP version has long since been 9.03. Also, the JSON from MC updated..
MinecraftForge/FML@7f01cf549b I'm still not modding. Player has contributed greatly to the 1.7 release of FML. He needs authorship credit.
MinecraftForge/FML@2b8d0f6680 Fix SimpleNetworkWrapper - this is not me modding, I didn't realize it was broken until Pahimar told me.
MinecraftForge/FML@ddee7eb117 Fix vanilla bug causing integrated server saving from 2 threads concurrently after a crash
MinecraftForge/FML@59a5adfdb3 Registry: Fix Block-before-ItemBlock allocation when loading 1.6 world saves, more validation
MinecraftForge/FML@d88b2aa0c5 prevent the world from getting saved twice at shutdown
MinecraftForge/FML@9b1cbab03b Registry: Crash earlier with conflicting name/object registrations.
MinecraftForge/FML@7ba167c500 Registry: Misc tweaks
MinecraftForge/FML@78248da399 Registry: Treat all 1.6 entries as items.
 2014-04-28 15:59:30 -04:00
LexManos
022cefc72a Merge pull request #1044 from bspkrs/patch-1 
Fixed typo in update checker
 2014-04-20 03:52:55 -07:00
bspkrs
3fa0c70f2b get a spelling checker :P 2014-04-18 11:21:40 -04:00
Lex Manos
a008339c6e Bump Forge version in prep for release. 2014-04-16 17:30:50 -07:00
Lex Manos
172ea90c59 Try and fix invalid framebuffer depth/stencil setup, Thanks Ivoforce. Closes #1032 2014-04-15 12:03:31 -07:00
LexManos
cc08cb46c8 Merge pull request #1038 from planetguy32/master 
Fix infinite loop in RecipeSorter
 2014-04-15 14:47:36 -04:00
planetguy32
fd59ab261f Fix infinite loop in RecipeSorter 
If recipe is multiple levels of inheritance from Object and not categorized, cls=cls.getSuperclass(); needs to be repeated more than once. It must therefore be moved to inside the while loop.
 2014-04-12 20:04:02 -07:00
LexManos
2cef9c5cb2 Merge pull request #1029 from iChun/patch-1 
Fixes stencil buffers on platforms not supporting OpenGL 3.0 or higher.
 2014-04-07 10:43:02 -07:00
iChun
cc54645bf3 Fixes stencil buffers on platforms not supporting OpenGL 3.0 or higher. 2014-04-08 01:09:17 +08:00
Lex Manos
2b40a5e3ce Small wording change in license to allow for specifc differnet licnense contributions. 
Updated FML:
MinecraftForge/FML@e58562d3ed Fix remaining issue with autoassigned Block and Item IDs overlapping.
MinecraftForge/FML@a82195772e Registry: Block IDs after failing to find a mapping for them
MinecraftForge/FML@fd9389015f Fix FMLMissingMappingsEvent.get
MinecraftForge/FML@5eebd4df71 Registry: Implement support for remapping blocks/items to a new name.
MinecraftForge/FML@7325aa5033 Registry: cleanup, fix missing id error GUI formatting
MinecraftForge/FML@eb29d651eb Fix old 1.7 worlds with broken ID mappings
MinecraftForge/FML@6fd3c12a4a Registry: allow handling missing blocks/items regardless of the mod id
MinecraftForge/FML@038fa17ad3 Merge branch 'master' of https://github.com/MinecraftForge/FML
MinecraftForge/FML@49c623f59c initial attempt at a better way to ask the user in case of startup issues
MinecraftForge/FML@9be92dcfcb Registry: Complain about bogus registrations
MinecraftForge/FML@fd6d55afcc 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
MinecraftForge/FML@c47fc3b382 Enable custom gui rendering only as required
MinecraftForge/FML@f77632df35 Remove unneeded entity spawn debug logging.
MinecraftForge/FML@c7adb42199 Registry: Repair mismatched ItemBlocks as well Fix a few misc issues
MinecraftForge/FML@c8a245a985 Registry: Fix debug info
MinecraftForge/FML@c8a0b72eba Registry: Complain about missing mods when repairing broken worlds Registry: Reduce console spam
MinecraftForge/FML@8e44006f43 Registry: Protect against putObject misuse, handle duplicate registrations better
MinecraftForge/FML@294c93212c Registry: Add support for registering ItemBlocks before their Blocks
MinecraftForge/FML@3b42b33b6e Merge pull request #400 from sfPlayer1/master
 2014-04-07 10:01:56 -07:00
LexManos
ae81ad58ea Merge pull request #1028 from alexbegt/patch-1 
Small Fix: Held Items & Multiple Render Passes
 2014-04-06 16:34:58 -07:00
Alexander Behrhof
36298e2bfe Small Fix: Held Items & Multiple Render Passes 
Passes beyond 1 now have the correct icon.
 2014-04-06 17:29:23 -04:00
Lex Manos
7b19768c4c Fix line offset in Minecraft patch, and mix RenderPlayer looping once to many on multi-pass items. 2014-04-04 14:20:56 -07:00
LexManos
094d80fe66 Merge pull request #1024 from ShetiPhian/patch-1 
Add a variable for SoundCategory in PlaySoundEvent17
 2014-04-03 19:59:56 -07:00
ShetiPhian
bba42d4230 Update PlaySoundEvent17.java 2014-04-03 22:25:49 -04:00
Lex Manos
621fb050ce Finally do SoundSystem workup for 1.7, Closes #982 2014-04-03 03:12:22 -07:00
Lex Manos
5fbc70173c Add NPE protection to GuiingameMenu.actionPerformed, Closes #961 2014-04-03 02:11:17 -07:00
Lex Manos
72d22c5827 Update access transformer, Closes #951 and #1021 2014-04-03 02:10:43 -07:00
Lex Manos
12e8d95e9f Fix potential threading issue if FluidRegistry.loopupFluidForBlock is called from two threads at the same time before being setup. Closes #936 2014-04-02 23:53:05 -07:00
Lex Manos
14b9d639a2 Use BiomeGenBase's array size instead of hardcoding it in BiomeDictionary. Closes #871 2014-04-02 23:46:52 -07:00
Lex Manos
5f62afb5f2 Add AnvilUpdateEvent which is fired when a user places a item in both input slots of a Anvil and allows modders to control the output. Closes #838 2014-04-02 18:33:13 -07:00
Lex Manos
33bf2c8a69 Add ANIMALS tpe to PopulateChunkEvent.Populate Custom providers should call this function if they spawn animals curing population. Closes #790 2014-04-02 17:40:03 -07:00
Lex Manos
56084b584d ItemStack sensitive version of Item.getAttributeModifiers, Closes #816 2014-04-02 17:24:25 -07:00
Lex Manos
b0bfea4e03 New hook to truely seperate the display of the 'durability' bar from the current / max durability. Allowing modders to control that display easier. 2014-04-02 17:08:22 -07:00
Lex Manos
aa0c902d22 Advanced Model Loader available server-side for data driven models. To be cleanuped and re-evaluated in 1.8. Closes #773 2014-04-01 15:02:06 -07:00
Lex Manos
d9a1c718bf Add position to BreakSpeed event. Closes #621 2014-04-01 15:00:25 -07:00