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

1124 commits

Author SHA1 Message Date
Kina
68cd48287b make WorldSavedData implement NBTSerializable (#2745) 2016-04-09 16:09:06 -07:00
mezz
a018e14939 Add cancelable event for Potions shifting the gui position (#2667) 
Add cancelable event for Potions shifting the gui position
 2016-04-08 20:18:17 -07:00
LexManos
2a4067a539 Fix being kicked from server when climbing ladders. 2016-04-07 13:12:10 -07:00
LexManos
8fefac110e Fix potential desync between Forge's Villager profession and vanilla's int based system. 2016-04-07 12:29:00 -07:00
LexManos
fbe628d058 Merge pull request #2729 from kashike/feature/bossinfo 
Remove @SideOnly(Side.CLIENT) from BossInfo/BossInfoServer methods
 2016-04-06 16:19:18 -07:00
kashike
72edc41a7c Remove @SideOnly(Side.CLIENT) from BossInfo/BossInfoServer methods 
These methods can also be used by the server (see BossInfoServer, it sends packets to the client but the methods are @SideOnly(Side.CLIENT))
 2016-04-06 15:57:54 -07:00
mezz
7587ca7c71 Fix #2717 Pick block hotkey not working in inventories 2016-04-05 18:25:25 -07:00
Zaggy1024
68023ce40b Fixed using PlaySoundEvent to replace a sound with a PositionedSound causing an NPE due to the Sound field not being set by a call to ISound.createAccessor(SoundHandler). 2016-04-04 22:18:34 -05:00
LexManos
8180bed027 Merge pull request #2707 from mezz/keyBinding19-4 
Add modifier support to vanilla keybindings.
 2016-04-04 18:06:29 -07:00
Vincent Lee
e8ea52558b Player Interact Event 2016-04-04 19:58:46 -05:00
mezz
8f49ea7c5f Add modifier support to vanilla keybindings. 
Add Orange conflict color for modifier/key conflicts
(like Ctrl and Ctrl-Z conflicting)
Related to #2692
 2016-04-04 16:52:16 -07:00
LexManos
8fd0817c81 Merge pull request #2704 from AEnterprise/1.9 
onBlockHarvested is no longer called twice
 2016-04-04 15:49:49 -07:00
LexManos
9f1505dd53 Fixed EntityJoinWorldEvent not being fired for some entitites on Server Worlds. Closes #2685 2016-04-04 15:33:45 -07:00
LexManos
6342bfea3e Fix issue caused by setting spawnRadius to 0. Closes #2624 2016-04-04 15:22:17 -07:00
AEnterprise
dbe9053d50 onBlockHarvested is no longer called twice 2016-04-04 11:37:40 +02:00
McJty
9c3def9cb0 Added DimensionManager.createProviderFor() to WorldClient constructor similar to what is done 
in WorldServer to make sure the correct provider is created client-side too.
 2016-04-04 06:26:46 +02:00
LexManos
1811d88266 Merge pull request #2616 from iTitus/updateNotificationIcon 
Add update notification icon made by @gigaherz, closes #2582
 2016-04-03 18:22:27 -07:00
mezz
bc2b5ad517 Fix inability to attack while holding modifier keys 2016-04-03 13:15:18 -07:00
mezz
21d39f6558 Re-Add key binding modifiers and contexts. 2016-04-03 01:46:29 -07:00
RainWarrior
9baabf9249 Revert "Add key binding modifiers and contexts.", until it's fixed. 
This reverts commit 34c3af7e85.
 2016-04-03 11:01:09 +03:00
mezz
34c3af7e85 Add key binding modifiers and contexts. 
Same as #2674, but for Minecraft 1.9
 2016-04-02 21:25:44 -07:00
cpw
404995122a Capture a vanilla freeze - will be used when FML connects to vanilla servers, soon 2016-04-02 14:16:17 -04:00
RainWarrior
4c8da35655 Improved UV offset hackery - should fix most visible custom model seams. 2016-04-02 18:49:18 +03: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
tterrag1098
5862aaf3a0 Add state param to canRenderInLayer 2016-04-01 03:12:01 -04: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
7a8475df6e Fix landing particles not showing up. Cloes #2661 2016-03-30 15:59:14 -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
mezz
0f06365e1f Fix Block.getPickBlock returning an ItemStack with a null Item 2016-03-28 16:21:35 -07: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
6385d7cc9f Fixed diffuse lighting not being applied if forge lighting pipeline is disabled, closes #2651 2016-03-26 09:29:28 +03: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
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
756c58d5cb Removed RenderWorldEvent, encapsulated all public event fields. 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
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
LexManos
9edd056f55 Fix typo causing biomes to be generated in wrong chunks. Closes #2632 2016-03-22 18:59:37 -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
LexManos
2a1c98048e Merge pull request #2587 from diesieben07/spawn_egg_fix 
Fix mod spawn eggs and EntityList.func_188429_b
 2016-03-21 19:42:59 -07:00
Thutmose
e349855688 Fix pushing players inside blocks. 
same changes made to the 1.9 branch
 2016-03-21 22:33:35 -04:00
LexManos
5cb4fe33bc Merge pull request #2614 from williewillus/entitycaps 
Expose IItemHandler on vanilla entities
 2016-03-21 19:27:25 -07:00
LexManos
a365582b58 Added support for custom dyes with Banners. Closes #2596 2016-03-21 19:24:12 -07:00
LexManos
f14f77d445 Fix pushing players inside blocks. 2016-03-21 18:42:37 -07:00
Vincent Lee
dabb17f869 Update according to suggestions 2016-03-21 20:31:33 -05:00
LexManos
2ca7cff075 Fix Chests not opening correctly with semi-solid blocks on top. 2016-03-21 17:56:59 -07:00
LexManos
1830d6de89 Merge pull request #2618 from Thutmose/patch-1 
Allow players sized smaller than 1 block to walk into small spaces
 2016-03-21 17:15:26 -07:00
LexManos
b317d5d107 Merge pull request #2605 from Thutmose/playersize 
Fixed players smaller than 1 block not being able to walk under overhang
 2016-03-21 17:15:11 -07:00
LexManos
6fd9a2c00e Rework DimensionManager for new DimensionType enum, replaces the old provider registry. Also fixed save folder issues with dimensions. Closes #2570 2016-03-21 17:12:34 -07:00
Thutmose
ba294d48dc Allow players sized smaller than 1 block to walk into small spaces 
Same as #2605 but for 1.9 branch
 2016-03-21 18:31:25 -04:00
Thutmose
cd81cd0934 Allow players sized smaller than 1 block to walk into small spaces 2016-03-21 17:41:41 -04:00
RainWarrior
9eb04ce1ef Made VertexBuffer.sortVertexData cleanup pointers after it's done. Closes #2528. 2016-03-21 18:54:25 +03:00
RainWarrior
c589a3a299 Implemented slightly more generic version of UVLock, re-enabled it for json models. Closes #2607. 2016-03-21 18:06:35 +03:00
Vincent Lee
30db41be9a Expose IItemHandler on vanilla entities 2016-03-21 09:24:36 -05:00
CovertJaguar
f61605c7af Add missing Minecart/Track hook. 2016-03-21 03:18:25 -07:00
RainWarrior
286c8c05b7 Separated model classes to client and common packages. 2016-03-21 10:48:52 +03:00
RainWarrior
5f62404f8a Switched animation system to capabilities, added animated item example, fixed state passing in MultiModel. 2016-03-21 10:48:52 +03:00
LexManos
558348125d Merge pull request #2610 from gigaherz/1.9-enchantment 
Fix for enchantment table rolling invalid enchants
 2016-03-20 21:53:07 -07:00
LexManos
4c5bc9c613 Merge pull request #2590 from blay09/patch-1 
[1.9] Fix KeyInputEvent only being fired if Keyboard.getEventKeyState() is false
 2016-03-20 21:50:20 -07:00
gigaherz
449bf3a292 Fix a condition that caused the enchantment table to roll invalid enchantments. 2016-03-21 04:18:16 +01:00
CovertJaguar
17589e61bd Fix #2601 Minecart infinite acceleration 2016-03-20 16:33:49 -07:00
Take Weiland
313d7bbc11 Fix EntityList.func_188429_b not supporting mod-entities, fixes spawn eggs, fixes #2581 2016-03-20 15:10:22 +01:00
Corosauce
c01e98e25f Fix for patch targetting the wrong field to change for failed pathfinding penalty 2016-03-20 02:05:38 -04:00
LexManos
5ad2fc90cb Merge pull request #2589 from diesieben07/player_riding_fix 
Fix broken patch in EntityPlayer.updateRidden
 2016-03-19 21:23:25 -07:00
LexManos
9e475300f9 Merge pull request #2586 from williewillus/fixcrops 
[1.9] Fix BlockCrops looking for wrong AGE property for subclasses. Fix #2555
 2016-03-19 21:13:18 -07:00
LexManos
d4cb82b019 Merge pull request #2585 from iTitus/patch-1 
Fix the EntityPlayer patch
 2016-03-19 21:12:23 -07:00
Blay09
8c38f6c1d3 Fix KeyInputEvent only being fired if Keyboard.getEventKeyState() is false. 
It used to be called for both key-up and key-down states prior to 1.9, so I assume Vanilla's changes to F3 behavior broke the patch.
 2016-03-20 00:12:08 +01:00
Take Weiland
590f3f610e Fix broken patch in EntityPlayer.updateRidden 2016-03-20 00:11:03 +01:00
Vincent Lee
b1a5339b29 Fix #2555 2016-03-19 17:15:26 -05:00
iTitus
d5d0374015 Fix the EntityPlayer patch 
In 1.8.9 the call goes to getDisplayNameString() so that any changes from the PlayerEvent.NameFormat event are being take into account.
In this patch the call goes to func_70005_c_() which is the getter for the GameProfile name.
I changed it back.

Sorry if you do not want to accept it because it is a one-liner.
 2016-03-19 22:37:59 +01:00
Corosauce
8ea90eb39e Fix for patch targetting the wrong field to change for failed pathfinding penalty 2016-03-19 16:55:19 -04:00
RainWarrior
7795570421 Fixed outline shader rendering, closes #2560. 2016-03-19 08:24:59 +03:00
RainWarrior
f37a80b302 Fixed Block.doesSideBlockRendering, closes #2564. 2016-03-19 07:20:25 +03:00
RainWarrior
3f3989f6ac Fixed invalid index calculation in BakedQuadRetextured. 2016-03-18 16:55:21 +03:00
RainWarrior
a81dfbc4ef Fixed quads that don't need diffuse lighting getting it anyway. 2016-03-17 14:11:24 +03:00
Fry
2c55969ff3 Merge pull request #2559 from Adubbz/master 
BlockColors and ItemColors no longer assume non-Vanilla id constancy. Added a getter for ItemColors.
 2016-03-17 08:40:58 +04:00
RainWarrior
b8bb8c374c Fixed MultiLayerModel not getting correct submodels; Unified the gui lighting of normal and custom models - diffuse lighting is now done in the pipeline, no need for IColoredBakedQuad anymore. 2016-03-17 07:29:44 +03:00
Adubbz
02e228095e BlockColors and ItemColors no longer assume non-Vanilla id constancy. Added a getter for ItemColors. 2016-03-17 14:27:55 +11:00
LexManos
0b0b5097e5 Fixed NPE when sneak using a item. 2016-03-16 18:25:53 -07:00
LexManos
1d2d9ebc83 Fixed Sand not falling. 2016-03-16 18:25:26 -07:00
LexManos
c442cd2909 Fixed onUseStop being called twice {Bows firing twice} 2016-03-16 18:25:14 -07:00
LexManos
1591373bf6 Fix vanilla bug where bows consumed tipped arrows in creative. 2016-03-16 18:24:48 -07:00
LexManos
f22ed86ad9 Remove our entity position fixer. Vanilla fixed the bug in 1.9. 2016-03-16 18:24:11 -07:00
RainWarrior
8b4bce37de Fixed progress reporting for model loading. 2016-03-16 05:00:44 +03:00
RainWarrior
87f4351783 Removed imports in patches. 2016-03-16 04:23:40 +03:00
RainWarrior
4189f63905 Fixed EffectRenderer patch, closes #2547. 2016-03-16 04:23:40 +03:00
RainWarrior
12c051d52b Fixed incorrect culling of mod TESRs. 2016-03-16 04:23:40 +03:00
RainWarrior
b81a13d010 Fixed model error reporting, fixed model errors in test mods that shouldn't happen, fixed custom texture loading, made more things private/final. 2016-03-16 01:42:23 +03:00
LexManos
ae72fa7ceb Fixed breaking of tall grass. It now uses fortune. Expanded grass seed hooks to allow Fortune. Potentially removing in future in favor of LootTables. 2016-03-15 01:17:38 -07:00
LexManos
7b0d8f09e9 Fix digging blocks in survival. 2016-03-14 23:44:10 -07:00
LexManos
28ae283b96 PlayerManager updated. 2016-03-14 22:58:01 -07:00
LexManos
c27b13c705 Update patches for fixed inner class suffeling in srg files. 2016-03-13 18:32:53 -07:00