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

7069 commits

This branch
This branch
All branches
Author SHA1 Message Date
cpw
c44ed8fbde MinecraftForge-2683 InvocationTargetException for Forge 1820 for 1.9 2016-04-02 07:50:02 -04:00
cpw
e72c224294 Add registries for soundevents, enchantments and potiontypes 
MinecraftForge-2576 [1.9] SoundEvents (and Enchantments and PotionTypes) need a FML registry
 2016-04-02 00:00:38 -04:00
cpw
acf8220414 Reconcile Block.patch 2016-04-01 21:28:28 -04:00
cpw
6e04a6c572 Squashed commit of the following: 
commit b3b290aec9d3010a134859da6001ea28a96c2fdc
Merge: c6ce6a0 d803f7d
Author: cpw <cpw@weeksfamily.ca>
Date:   Fri Mar 25 13:28:04 2016 -0400

    Merge branch 'RegistryRework' of https://github.com/LexManos/MinecraftForge into LexManos-RegistryRework

    Implement proper registry slaves. Should help with rollback related issues.

    Missing patch

commit d803f7db76f65db9d27302c9804a643bc853dc22
Author: LexManos <LexManos@gmail.com>
Date:   Tue Mar 22 03:36:14 2016 -0700

    Update VillagerRegistry and use it. Should in theory make custom villagers work now. Using string version instead of int id for networking.

commit eb5e5b4b42fdca26d2a104e4dc1e6a3ea3051a7b
Author: LexManos <LexManos@gmail.com>
Date:   Tue Mar 22 02:14:16 2016 -0700

    More cleanup.

commit edbc56b2ff314629d0e402709f3cf29fc79c4a3d
Author: LexManos <LexManos@gmail.com>
Date:   Tue Mar 22 02:05:23 2016 -0700

    More cleanups, removed deprecated UniqueIdentifier {ResourceLocation now}

commit e2df8d1be3c97601508f83dc97b0e8853fa1e271
Author: LexManos <LexManos@gmail.com>
Date:   Tue Mar 22 01:29:19 2016 -0700

    Stupid generics....

commit 46d57dc4677fa5ff3923e64eaccfb33d7e5aad8d
Author: LexManos <LexManos@gmail.com>
Date:   Tue Mar 22 01:00:25 2016 -0700

    Some registry tweaking to provde a non-complicated API modders can use.
 2016-04-01 20:56:06 -04:00
Hea3veN
b427b26583 Fix remapped blocks being overriden with dummy air blocks. Closes #2491 2016-04-01 20:55:19 -04:00
Fry
7668472c26 Merge pull request #2679 from tterrag1098/render_in_layer_state 
Add state param to Block.canRenderInLayer
 2016-04-01 11:13:28 +04:00
tterrag1098
5862aaf3a0 Add state param to canRenderInLayer 2016-04-01 03:12:01 -04:00
LexManos
74a0709356 Merge pull request #2678 from shadowfacts/BlockAddInfo-19 
Forward ItemBlock#addInformation to Block#addInformation
 2016-03-31 19:04:58 -07:00
Shadowfacts
b7327e6a35 Forward ItemBlock#addInformation to Block#addInformation 2016-03-31 21:12:17 -04:00
LexManos
42e4d1fa77 Merge pull request #2659 from kashike/feature/immutable-blockpos 
Replace Forge's getImmutable method with the vanilla method
 2016-03-30 16:20:43 -07:00
LexManos
82f964c00d Merge pull request #2664 from gigaherz/capability-storage 
Make access to the Capability IStorage less annoying
 2016-03-30 16:00:47 -07:00
LexManos
7a8475df6e Fix landing particles not showing up. Cloes #2661 2016-03-30 15:59:14 -07:00
LexManos
38c57d9038 Make NoteBlockEvent raw constructor protected to allow subclasses. Closes #2153 2016-03-30 15:26:48 -07:00
LexManos
9b9e48b3db Fix bows not animating properly when picking up ammo while using. Closes #2672 2016-03-30 15:21:00 -07:00
LexManos
c662810814 Fix shrubs not generating correctly. Closes #2663 2016-03-30 15:20:18 -07:00
LexManos
746c07fc6c Fix EntityPlayer still running old armor logic. Closes #2670 2016-03-30 14:05:27 -07:00
LexManos
1083984c8a Merge pull request #2634 from mezz/null-pick 
Fix Block.getPickBlock returning an ItemStack with a null Item
 2016-03-30 13:48:02 -07:00
RainWarrior
90758f8c96 Fixed StackOverflow caused by the previous commit, closes #2669. 2016-03-29 15:34:45 +03:00
RainWarrior
a073b0e386 Prevent missing model from loading multiple times. 2016-03-29 12:07:26 +03:00
mezz
0f06365e1f Fix Block.getPickBlock returning an ItemStack with a null Item 2016-03-28 16:21:35 -07:00
gigaherz
70e85b5eec Add wrapper methods for IStorage#readNBT/writeNBT. 2016-03-28 18:22:42 +02:00
kashike
45881d1c90 Replace Forge's BlockPos#getImmutable method with the included BlockPos#toImmutable (func_185334_h), while keeping the override in PooledMutableBlockPos to prevent mutable leaks. 
Also prevent a mutable blockpos leak in World#setTileEntity
 2016-03-27 09:43:56 -07:00
RainWarrior
efa7fd4dfe Fixed crosshair always being white, closes #2653. 2016-03-26 09:45:20 +03:00
RainWarrior
6e68aa4106 Enabled diffuse lighting by default in UnpackedBakedQuad.Builder. 2016-03-26 09:41:05 +03:00
RainWarrior
6385d7cc9f Fixed diffuse lighting not being applied if forge lighting pipeline is disabled, closes #2651 2016-03-26 09:29:28 +03:00
LexManos
c6ce6a00a2 Merge pull request #2650 from mezz/1.9 
Make tooltips layout in the right direction, wrap if there is no room
 2016-03-24 20:43:45 -07:00
mezz
da2964fbd3 Make tooltips layout in the right direction, wrap if there is no room 
Same as #2649, but for Minecraft 1.9
 2016-03-24 20:39:08 -07:00
LexManos
c7e54b8ecc Merge pull request #2649 from mezz/tooltips 
Make tooltips layout in the right direction, wrap if there is no room
 2016-03-24 19:18:26 -07:00
mezz
eca3b900e0 Make tooltips layout in the right direction, wrap if there is no room 
Fixes #2255
 2016-03-24 19:12:46 -07:00
RainWarrior
c891d9fe16 Disabled erroring block, fixed DynBucketTest.TestItem model. 2016-03-25 00:49:34 +03:00
LexManos
dd201c066e Merge pull request #2645 from diesieben07/populate_event 
Fix PopulateChunkEvent.Post not firing.
 2016-03-24 14:37:55 -07:00
RainWarrior
75032ebf9c Made some more public fields either private or final. 2016-03-24 22:22:21 +03:00
RainWarrior
756c58d5cb Removed RenderWorldEvent, encapsulated all public event fields. 2016-03-24 22:22:21 +03:00
RainWarrior
08c00662a0 Removed LanguageRegistry and CollectionWrapperFactory. 2016-03-24 22:22:21 +03:00
RainWarrior
1d25d9ff49 Fixed isSideSolid causing infinite loops due to the call to getActualState. 2016-03-24 22:22:21 +03:00
RainWarrior
a9d23f5e78 Cleanup: removed IEEP, removed redundant casts, fixed imports, fixed typos. 2016-03-24 22:22:20 +03:00
LexManos
7e4d7077a5 New Builder class in BlockStateContainer. Makes building containers with both listed and unlisted properties cleaner. 
Make all methods of BiomeGenBase$BiomeProperties public so that modders can use that class outside subclasses.
 2016-03-23 19:10:10 -07:00
Take Weiland
bc5313c67b Fix PopulateChunkEvent.Post not firing 2016-03-24 02:24:36 +01:00
LexManos
640670052c Merge pull request #2643 from diesieben07/beetroots 
Fix BlockCrops.getDrops not respecting new age methods (for beetroots)
 2016-03-23 16:33:03 -07:00
Take Weiland
8a6dafc3bb Fix BlockCrops.getDrops not respecting new age methods (for beetroots) 2016-03-23 19:51:15 +01:00
iTitus
ecd6f4c1d2 Add flashing update notification icon made by @gigaherz, closes #2582 
It is added to the "Mods" button in the main menu and to out-of-date mods in the mod list (there it replaces the "U").
Also fixes a little typo.
 2016-03-23 14:48:29 +01:00
RainWarrior
1d608c6fe4 Register the animation Capability. No idea how it worked before at some point. 2016-03-23 08:20:06 +03:00
RainWarrior
884cc690ea Show meaningful error if ModelLoaderRegistry is used before the missing model is initialized. 2016-03-23 08:20:06 +03:00
LexManos
9edd056f55 Fix typo causing biomes to be generated in wrong chunks. Closes #2632 2016-03-22 18:59:37 -07:00
LexManos
0ce790ca2b Fixed custom entities unique ids. 2016-03-22 15:29:42 -07:00
LexManos
25cd7cc3e1 Update FML Entity Spawn packet for 1.9's location change. Closes #2567 2016-03-22 13:35:45 -07:00
LexManos
a596984bfd Merge pull request #2622 from williewillus/dupedropfix2 
Actually fix dupe drop
 2016-03-22 13:00:28 -07:00
RainWarrior
08663587d4 Added Capability.cast, to allow avoiding unchecked casts in ICapabilityProvider.getCapability 2016-03-22 09:01:00 +03:00
LexManos
a4d5760539 Fix swap animations for sure this time. 2016-03-21 20:43:22 -07:00
Vincent Lee
b38cfc1769 Actually fix dupe drop 2016-03-21 22:39:48 -05:00