Commit Graph
5153 Commits
Author SHA1 Message Date
LexManos 07a2b67b7f Cleanup OBJLoader parse function and fix issues related to JVM differences.
Also fix support for sopme of the spec that was partially respected.
2016-04-06 01:45:43 -07:00
LexManos fb0bdd1276 Enhance some error logging related to OBJLoader issues, and RegistryEntries. 2016-04-06 01:44:08 -07:00
Fry a48fd56fdc Merge pull request #2723 from mezz/pick-fix
Fix some plain keybinds not working when a modifier is active
2016-04-06 10:11:07 +04:00
mezz e68908e9d5 Fix some plain keybinds not working when a modifier is active 2016-04-05 23:01:26 -07:00
LexManos 045e8bf806 Merge pull request #2719 from mezz/pick-fix
Fix #2717 Pick block hotkey not working in inventories
2016-04-05 18:30:39 -07:00
mezz 7587ca7c71 Fix #2717 Pick block hotkey not working in inventories 2016-04-05 18:25:25 -07:00
LexManos b9d18a263c Merge pull request #2718 from nekosune/patch-1
Corrected CapabilityItemHandler.readNBT ignoring anything in slot 0 in 1.9
2016-04-05 17:49:48 -07:00
Katrina Swales 8d50c9e988 Corrected CapabilityItemHandler.readNBT ignoring anything in slot 0 in 1.9 2016-04-06 01:43:23 +01:00
RainWarrior cb7685a3b0 Fixed forge fluid having a collision box. 2016-04-05 18:55:42 +03:00
RainWarrior bf16d0066b Fixed zip being closed too early in the server language loading. 2016-04-05 18:53:19 +03:00
Fry 628613d27f Merge pull request #2709 from iTitus/bucketModel
Fix dynbucket item transformation.
2016-04-05 13:44:44 +04:00
iTitus 63a6a2e50b Fix dynbucket item transformation. 2016-04-05 10:49:51 +02:00
RainWarrior ab2b07f149 Fixed some test mods not being marked as client-only. 2016-04-05 11:46:05 +03:00
RainWarrior d44c9082fa Fixed mod languages not being loaded on the server. 2016-04-05 10:41:42 +03:00
LexManos 25d7b80119 Merge pull request #2708 from Zaggy1024/1.9
Fix PlaySoundEvent replacing a sound with PositionedSound causing an NPE.
2016-04-04 20:55:12 -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
LexManos 034efaff3d Merge pull request #2604 from williewillus/pie
New PlayerInteractEvent for 1.9
2016-04-04 18:06:11 -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 ce4bb8fe93 Fix improper logic in ItemHandlerHelper.giveItemToPlayer causing some items to not be added. Closes #2705 2016-04-04 15:44:03 -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
RainWarrior 2ae47c0903 Made both exceptions occuring during item model loading print in the log; closes #2696. 2016-04-04 18:07:06 +03:00
RainWarrior 879b7b5a61 Added the ability to change the printed model error count; Added printing of actual exceptions causing missing variants related to blockstate loading, closes #2689. 2016-04-04 16:02:21 +03:00
AEnterprise dbe9053d50 onBlockHarvested is no longer called twice 2016-04-04 11:37:40 +02:00
LexManos 1e3df55689 Merge pull request #2702 from McJty/1.9
Added DimensionManager.createProviderFor() to WorldClient constructor…
2016-04-03 22:49:11 -07: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
Fry 132e0d8f93 Merge pull request #2697 from mezz/keyBinding19-3
Fix inability to attack while holding modifier keys
2016-04-04 00:19:52 +04:00
mezz bc2b5ad517 Fix inability to attack while holding modifier keys 2016-04-03 13:15:18 -07:00
Fry df1adb577c Merge pull request #2695 from mezz/keyBinding19-2
Re-Add key binding modifiers and contexts.
2016-04-03 12:50:08 +04: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
RainWarrior 77772ac3f5 Changed generic signature of GameRegistry.register methods to work around the type inference bug; updated all example mods to the new block/item registration method. 2016-04-03 10:14:16 +03:00
LexManos fc57d5e6c6 Merge pull request #2693 from Adubbz/1.9
Fixed mismatched registry names and mod ids
2016-04-02 23:04:15 -07:00
LexManos d13449b1b3 Merge pull request #2692 from mezz/keyBinding19
[1.9] Add key binding modifiers and contexts.
2016-04-02 23:02:59 -07:00
LexManos 087a7d8c59 Properly deprecate and link the replacement methods in GameRegistry. Add helper method for registering a block with default ItemBlock because people keep complaining -.- 2016-04-02 22:16:22 -07:00
Adubbz 8374a80283 Fixed mismatch registry names and mod ids 2016-04-03 15:13:25 +10: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
LexManos 8058c675ab Fixed compile error in registry code with Eclipse. 2016-04-02 12:01:40 -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
cpw efcb9ee570 Support ResLocations for IMC 2016-04-02 12:19:36 -04:00
RainWarrior 4c8da35655 Improved UV offset hackery - should fix most visible custom model seams. 2016-04-02 18:49:18 +03:00
cpw c74216bdf2 MinecraftForge-2684 [1.9] New Registry ignores keys 2016-04-02 11:38:03 -04:00
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 <[email protected]>
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 d803f7db76
Author: LexManos <[email protected]>
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 eb5e5b4b42
Author: LexManos <[email protected]>
Date:   Tue Mar 22 02:14:16 2016 -0700

    More cleanup.

commit edbc56b2ff
Author: LexManos <[email protected]>
Date:   Tue Mar 22 02:05:23 2016 -0700

    More cleanups, removed deprecated UniqueIdentifier {ResourceLocation now}

commit e2df8d1be3
Author: LexManos <[email protected]>
Date:   Tue Mar 22 01:29:19 2016 -0700

    Stupid generics....

commit 46d57dc467
Author: LexManos <[email protected]>
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