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

787 commits

Author SHA1 Message Date
RainWarrior
bf16d0066b Fixed zip being closed too early in the server language loading. 2016-04-05 18:53:19 +03:00
RainWarrior
d44c9082fa Fixed mod languages not being loaded on the server. 2016-04-05 10:41:42 +03: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
ce4bb8fe93 Fix improper logic in ItemHandlerHelper.giveItemToPlayer causing some items to not be added. Closes #2705 2016-04-04 15:44:03 -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
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
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
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
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
38c57d9038 Make NoteBlockEvent raw constructor protected to allow subclasses. Closes #2153 2016-03-30 15:26:48 -07:00
LexManos
746c07fc6c Fix EntityPlayer still running old armor logic. Closes #2670 2016-03-30 14:05:27 -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
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
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
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
a9d23f5e78 Cleanup: removed IEEP, removed redundant casts, fixed imports, fixed typos. 2016-03-24 22:22:20 +03:00
Take Weiland
bc5313c67b Fix PopulateChunkEvent.Post not firing 2016-03-24 02:24:36 +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
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
LexManos
3ce53a7ee0 Make OreDictionary.initVanillaEntries() private so that dumb modders will stop calling it. 2016-03-21 19:57:59 -07:00
LexManos
d878c866b3 Allow finite fluids to be drained correctly 2016-03-21 19:56:31 -07:00
LexManos
1d21345dfd Merge pull request #2531 from Choonster/finite-fluid-drain-fix 
Allow finite fluids to be drained correctly
 2016-03-21 19:54:53 -07:00
LexManos
ac44fe298a Merge pull request #2592 from matthewprenger/patch-1 
Pass exceptions thrown in mod event buses back to FML to handle appropriately
 2016-03-21 19:39:09 -07:00
LexManos
81e0f2350d Merge pull request #2593 from williewillus/dupedropfix 
[1.9] Fix double dropping of items. Closes #2549
 2016-03-21 19:35:58 -07:00
LexManos
5cb4fe33bc Merge pull request #2614 from williewillus/entitycaps 
Expose IItemHandler on vanilla entities
 2016-03-21 19:27:25 -07:00
Vincent Lee
dabb17f869 Update according to suggestions 2016-03-21 20:31:33 -05:00
LexManos
c7b8020279 Exclude jna from termal tansformer. 2016-03-21 18:20:30 -07:00
LexManos
08a3b654b9 Add ShieldDecoration and Tipped arrows to recipe sorter. Closes #2613 2016-03-21 18:20:15 -07:00
LexManos
cc5dea0df6 Fixed Item.shouldCauseReequipAnimation hook. 2016-03-21 17:56:59 -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
RainWarrior
bebf22c0b0 Added default left hand transforms for forge transform strings. Closes #2615. 2016-03-21 18:55:22 +03:00
RainWarrior
438145995c Ignore blocks/items with null registry name during model loading. Fixes NPE during resource reloading in worlds with removed blocks/items. 2016-03-21 18:29:45 +03:00
RainWarrior
4e6ad80370 Removed blockCenterToCorner from TRSRTransformation constructor. Closes #2461. 2016-03-21 18:23:27 +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
RainWarrior
4b53f0716b instance -> INSTANCE 2016-03-21 10:48:52 +03: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
cpw
ce8a758667 Merge branch 'master' into 1.9 2016-03-19 21:19:19 -04:00
Vincent Lee
c39328993e Fix double dropping of items. Closes #2549 2016-03-19 19:57:11 -05:00
Matthew Prenger
ee6c041424 Pass exceptions thrown in mod event buses back to FML to handle apropriately 2016-03-19 19:07:04 -05:00
RainWarrior
ad03581fbe Fixed sprite not being passed to the quad builder for custom models. 2016-03-19 09:48:46 +03:00
RainWarrior
a81dfbc4ef Fixed quads that don't need diffuse lighting getting it anyway. 2016-03-17 14:11:24 +03: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
LexManos
f22ed86ad9 Remove our entity position fixer. Vanilla fixed the bug in 1.9. 2016-03-16 18:24:11 -07:00
RainWarrior
6b926f9a06 Javadocs, small cleanup. 2016-03-16 05:17:33 +03:00
RainWarrior
8b4bce37de Fixed progress reporting for model loading. 2016-03-16 05:00:44 +03:00
RainWarrior
78a397bc69 Fixed incorrect rotations for items in the left hand. Closes #2548. 2016-03-16 04:23:28 +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
Vasco Lavos
05801a74af 1.9: Fixed registering armor materials through EnumHelper exploding 
1.9 ArmorMaterial now requires a SoundEvent for the equip sound.
 2016-03-15 17:52:58 +00: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
RainWarrior
5d352bda6c Big model loader refactoring: simplified a lot of things, broke some error reporting. Still generally works. 2016-03-13 16:16:25 +03:00
RainWarrior
a799bbad2d First version of updated of ModelLoader, mostly works. 2016-03-13 12:10:50 +03:00
RainWarrior
4650ee2789 Updated to latest mappings. Exc is broken, some anonymous classes didn't map to srg names. 2016-03-13 04:40:03 +03:00
Bernhard Bonigl
bcab92daf6 Fix CombinedInvWrapper accessing incorrect slots 
Closes #2533
 2016-03-12 22:17:57 +01:00
RainWarrior
5c9808ada8 Fixed emply hand not rendering in first person. 2016-03-11 00:43:18 +03:00
cpw
cdf8a820a6 Capture Biome Registry within FML 2016-03-09 23:01:04 -05:00
RainWarrior
8e9b403fbf Fixed (hopefully) perspective transformations for custom models too. 2016-03-10 04:48:13 +03:00
RainWarrior
cf93859095 Fix items rendering too low in first person. 2016-03-10 04:19:54 +03:00
cpw
98f606d4d2 Move the patch into the fml override handler, for less patch 2016-03-09 20:08:24 -05:00
RainWarrior
173cec4149 Fix perspective transformations for left-handed items, disable ModelAnimationDebug until model loading is fixed. 2016-03-10 03:38:58 +03:00
LexManos
873899a62b Fixed position being shifted before being sent to shouldSideBeRendered. 2016-03-09 15:15:52 -08:00
LexManos
e4da09df2a Bump version info. Rather important. 2016-03-09 14:52:32 -08:00
LexManos
90b2c86a9f Added bypass functions to Defaulted registry, DO NOT USE THIS MODDERS FORGE INTERNAL ONLY. 
And some other fixups for running.
 2016-03-09 14:41:13 -08:00
LexManos
7b7156e87f Interaction hooks need to be re-added but compiles {Doesn't run} 2016-03-09 14:11:56 -08:00