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

957 commits

Author SHA1 Message Date
LexManos
26b5059396 Fix sluggish scrolling on GuiScrollList's and fix small rendering issue with scroll bar on certian screen sizes. 2016-05-02 14:13:33 -07:00
boni
8fdd76bae1 Fix SidedInvWrapper accessing wrong slots for setStackInSlot. (#2797) 
Fix DoubleChestItemHandler not implementing IItemHandlerModifiable
 2016-05-02 12:19:54 -07:00
mezz
9c9107c434 Close #2780 add CMD localization for Mac key bindings (#2792) 2016-04-29 12:04:48 -07:00
Vincent Lee
35999f9a20 Boss bar render event (#2701) 
Allow control over increment height
 2016-04-14 22:34:45 -07:00
iTitus
fa21f2b44c Fix forge:default-block transformation. (#2760) 
The first-person left-hand rotation was a little bit of.
 2016-04-13 22:53:25 +04:00
LexManos
205f5c13c8 Expose a central place to access all of Vanilla and Forge's registries using the new registry API. 2016-04-09 22:33:39 -07:00
mezz
c560af69a5 Fix log spam from invalid key modifiers (#2746) 2016-04-09 17:02:03 -07:00
Matthew Prenger
2a3774def3 Don't use import static with net.minecraft classes. Using the latest MCP snapshots this causes an import conflict. (#2742) 2016-04-09 16:03:46 -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
Matti Ruohonen
03584ec411 Fix ForgeChunkManager world unloading check (#2736) 2016-04-07 15:39:55 -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
Craig Burton
d31cf8ddbc Update ore dictionary (#2721) 
Updated the Ore Dictionary with more vanilla items:
  -Prismarine Shard ( "gemPrismarine" )
  -Prismarine Crystals ( "dustPrismarine" )
  -Prismarine Block ( "blockPrismarine" )
  -Prismarine Brick ( "blockPrismarineBrick" )
  -Dark Prismarine ( "blockDarkPrismarine" )
  -Nether Wart ( "cropNetherWart" )
  -Sugarcane ( "sugarcane" )
  -Paper ( "paper" )
  -Ender Pearl ( "enderpearl" )
  -Bone ( "bone)
  -Gunpowder ( "gunpowder)
  -String ( "string" )
  -Nether Star ( "netherStar" )
  -Leather ( "leather" )
  -Feather ( "feather" )
  -Egg ( "egg" )
  -End Stone ( "endstone" )
  -Torch ( "torch" )
  -Vine ( "vine" )
  -Cactus ( "blockCactus" )
  -Grass ( "grass")
  -Obsidian ( "obsidian" )
  -Red Sandstone ( added to "sandstone" )
  -Crafting Table ( "workbench" )
  -Slime Block ( "blockSlime" )
  -Granite ( "stoneGranite" )
  -Polished Granite ( "stoneGranitePolished" )
  -Diorite ( "stoneDiorite" )
  -Polished Diorite ( "stoneDioritePolished" )
  -Andesite ( "stoneAndesite" )
  -Polished Andesite ( "stoneAndesitePolished" )
 2016-04-07 11:49:31 -07:00
RainWarrior
db04370830 Made forge fluids use smooth lighting. 2016-04-06 16:13:51 +03:00
LexManos
7973984227 Fixed NPE in dedicated server languages. And fixed logger for main FML event bus. 2016-04-06 02:11:27 -07:00
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
mezz
e68908e9d5 Fix some plain keybinds not working when a modifier is active 2016-04-05 23:01:26 -07:00
Katrina Swales
8d50c9e988 Corrected CapabilityItemHandler.readNBT ignoring anything in slot 0 in 1.9 2016-04-06 01:43:23 +01:00
Katrina Swales
f4ca1f61b9 Corrected readNBT ignoring anything in slot 0 2016-04-05 19:44:20 +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
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
cpw
e8a7e28110 Another AT, for the player 2016-03-09 00:59:28 -05:00
cpw
aa24916736 Finish world, chunkloading should work again? 2016-03-09 00:48:32 -05:00
cpw
56a0d125bd Remove more chestgenhooks stuff. Clean up some more ATs 2016-03-08 23:39:37 -05:00
cpw
25256c8ddd More fixups, removing chestgenstuff aggressively. Use loot tables. Any missing ones WILL be added by Mojang. 2016-03-08 23:22:54 -05:00
cpw
a44d76652b Another compilation fix 
More patch tweaks for compilation errors. onItemUseTick takes an entity now, cos skellies use stuff too
 2016-03-08 16:36:50 -05:00
cpw
fffbc0f078 Some more forge code fixes 2016-03-08 16:23:54 -05:00
RainWarrior
befbb45522 Most of ItemInWorldManager reject, various small error fixes. 2016-03-08 23:33:28 +03:00
RainWarrior
4b4146bbed World 2016-03-08 22:43:05 +03:00
LexManos
776eb00ed3 10 more rejects down. 
98 errors 6 rejects left.
 2016-03-07 23:34:40 -08:00
LexManos
26ca27193c More patch work, client patches. 2016-03-07 21:06:54 -08:00
Choonster TheMage
9ca3ede736 Allow finite fluids to be drained correctly 2016-03-07 21:31:27 +11:00
cpw
f0e5baa8e5 Few more compile fixups 2016-03-07 00:23:00 -05:00
cpw
ade3bbad14 Command fixups 2016-03-07 00:08:29 -05:00
cpw
2dcb2187c0 Some client handler cleanup 2016-03-06 23:42:30 -05:00
cpw
01912a459a Some more FML related fixups 2016-03-06 23:18:36 -05:00
cpw
b342bf8481 Some fixups for FML, and use the FML registry for potions 2016-03-06 23:07:25 -05:00
LexManos
2847644368 NetworkDispatcher/FMLProxyPacket 41 more errors cleaned. 2016-03-06 18:45:21 -08:00
LexManos
09bac53ed6 Fishing is now a loot table no more need for FishingHooks. {LootTables still need to be evaludated if they need extra hooks, but thats later} Goodbye 44 compile errors! 2016-03-06 17:01:52 -08:00
LexManos
206a21d563 Fixed errrors in Fluids package. TODO: Make BlockLiquid implement IFluidBlock and REMOVE FluidContainerRegsitry. Everything *should* be able to use IFluidContainer directly. 2016-03-06 16:54:47 -08:00
RainWarrior
ee82341312 Made OBJModel.java compile. 2016-03-06 03:00:08 +03:00
RainWarrior
3e22a2b90d Model UV lock handling from the state to the model, fixed most compile errors in ModelLoader, disabled it (and ModelBakeEvent) until it's functional, fixed some errors in ForgeHooksClient. 2016-03-06 02:51:39 +03:00
RainWarrior
70670d70ea Removed generics from IModel subinterfaces, add ed ModelProcessingHelper instead. 2016-03-06 01:34:04 +03:00
cpw
0f2cead3c8 WorldServer: NOTE - ChestGenHooks has NOT been updated in accordance with plans for removing it 
GuiStats
Fixup deletion of egg handling in entity registry?
 2016-03-04 22:39:35 -05:00
RainWarrior
cb909eeb59 Fixed B3D loader, fixed some obvious errors in ModelLoader. 2016-03-05 05:02:34 +03:00
LexManos
74b2c3dfe6 World Patches work. 2016-03-04 16:40:34 -08:00
LexManos
8a506022d7 More work on misc things. 2016-03-03 02:57:38 -08:00
Adubbz
c87feabd6e Updated BiomeManager to 1.9 2016-03-03 18:33:26 +11:00
LexManos
b096f58a6d Merge pull request #2520 from Adubbz/master 
Updated the biome dictionary to support 1.9
 2016-03-02 23:24:24 -08:00
LexManos
b6bcf7bf4b Enchantments, some world, Biomes, bucks, world/gen/features. 2016-03-02 23:23:40 -08:00
Adubbz
706e894cbb Updated the biome dictionary 
Squashed commits:

[4064de6] Updated the biome dictionary
 2016-03-03 18:15:30 +11:00
RainWarrior
cff4bf21ae Updated raw types in ExtendedBlockState, fixed some ATs, updated some things that needed updating in model classes. 2016-03-02 20:00:32 +03:00
RainWarrior
24b66ff9f3 GuiOverlayDebug, ItemModelMesher, RenderManager, Stitcher fixed + minor fixes in forge gui classes. 2016-03-02 15:32:22 +03:00
LexManos
7fadb5aeb8 Small renames before bed. 2016-03-02 01:44:41 -08:00
LexManos
8863aab9e5 Items done, <1000 errors whoot! 2016-03-01 23:38:31 -08:00
LexManos
ad788880e5 Some entity patches. 2016-03-01 20:42:36 -08:00
RainWarrior
728319cbb5 Fixed most errors in the model stuff, except for ModelLoader and b3d and obj getQuads/handleBlockState methods. 2016-03-01 23:19:38 +03:00
RainWarrior
d9b69fda65 FontRenderer 2016-03-01 21:08:51 +03:00
RainWarrior
d35c38d261 EntityRenderer, most of RenderGlobal, minor fix to LayerBipedArmor. 2016-03-01 20:52:19 +03:00
RainWarrior
c9a01a439d A bunch of rendering rejects updated. 2016-03-01 19:22:21 +03:00
LexManos
ac7c4d2f6c Some import renames and compile error fixes, killed ~800. 2016-03-01 04:58:03 -08:00
LexManos
1f80eb17df util, tileentity, stats, realms. Potions got an overhaul and out registry will need to be adapted. 2016-03-01 04:07:00 -08:00
LexManos
f654157adb net.minecraft.block.* patches 2016-03-01 00:31:58 -08:00
LexManos
250a77b359 Merge pull request #2476 from Abastro/fovfixes 
Added Event: EntityViewRenderEvent#FOVModifier
 2016-02-29 13:20:46 -08:00
Matthew Miller (Me4502)
f1ad05dd8e Added local click position to PlayerInteractEvent. 2016-02-27 11:27:21 +10:00
Abastro
c4ca8270b9 Added EntityViewRenderEvent#FOVModifier 
Enables mods to modify raw FOV directly.
Avoids modifier limit from FOVUpdateEvent.
Aware of blocks which are needed for fov change related with materials.
 2016-02-27 09:25:19 +09:00
LexManos
ecfb9accaa Fixed dummy blocks not being removed from registry on dedicated server correctly. Closes #2487 
Also added some more debug logs!
 2016-02-24 16:56:20 -08:00
LexManos
0dd796fb16 Merge pull request #2497 from bonii-xx/universal_bucket 
Fix WordServer.canCreatureTypeSpawnHere not using Forge Events.
 2016-02-23 01:04:09 -08:00
Bernhard Bonigl
17e960c158 Fix WordServer.canCreatureTypeSpawnHere not using Forge Events. 
Followup of #2496
 2016-02-23 09:53:26 +01:00
LexManos
b009546a94 Merge pull request #2496 from bonii-xx/universal_bucket 
Fix WorldEvent.PotentialSpawns Event passing the list instance of the…
 2016-02-22 11:16:55 -08:00
Bernhard Bonigl
de1c270644 Fix WorldEvent.PotentialSpawns Event passing the list instance of the ChunkProvider to users 2016-02-22 18:45:31 +01:00
RainWarrior
e495b7599c ModelLoader: added verbose error logging showing items/blockstates associated with model locations; removed redundant cast leftover from ungenerified code; fixed up a couple of warnings. 2016-02-22 03:53:26 +03:00
cpw
3e4107a222 Fix race condition when using indexed codec in a LAN server. Fixes spurious crash when LAN server is running. 2016-02-20 16:04:31 -05:00
cpw
c88bc769ef Log when it's likely the indexedcodec is gonna fail, because of LAN server derps likely. Try and give some context for debuggers. 2016-02-19 23:18:46 -05:00
Fry
34382745ab Merge pull request #2488 from bonii-xx/universal_bucket 
Fix universal bucket logging an exception
 2016-02-19 13:27:59 +03:00
Bernhard Bonigl
9b128aaed2 Fix universal bucket logging an exception 2016-02-19 11:17:23 +01:00
LexManos
f77d50b48c Fix loading of world ID maps for worlds without dummy data. Closes #2477 2016-02-17 12:06:57 -08:00
LexManos
13a25ee0ba Merge pull request #2474 from bonii-xx/universal_bucket 
Fix customized bucket names not getting translated correctly
 2016-02-17 13:31:12 -06:00
RainWarrior
e8915b6a55 Added default levels for fluid extended properties in fluid model. 2016-02-16 14:13:19 +03:00
Bernhard Bonigl
eb879b3020 Fix customized bucket names not getting translated correctly 2016-02-16 09:39:33 +01:00
LexManos
6b51665c42 Merge pull request #2333 from bonii-xx/universal_bucket 
Add an universal bucket.
 2016-02-15 17:56:05 -06:00
Bernhard Bonigl
1055206ba8 Add universal bucket 2016-02-16 00:49:01 +01:00
Take Weiland
b875274c4f Fix the entity shader hook 2016-02-14 15:25:11 +01:00
Fry
4d33fe6b26 Merge pull request #2467 from iLexiconn/master 
Added hook to add entity spectator shader
 2016-02-14 12:26:47 +03:00
Ross Allan
ccf5da2113 Workaround JDK-8087309: Constant folding "static final boolean" in boolean expressions is incomplete 2016-02-13 14:43:37 +00:00
iLexiconn
776f5b91d5 Added hook to add entity spectator shader 2016-02-13 00:09:04 +01:00
LexManos
06130912c5 Protect BlockSnapshot and Chunk.getTileEntity from mutible BlockPos instances. Closes #2438 2016-02-11 16:48:32 -08:00
LexManos
f4b0506515 Add missing classes to CrashReport preloading. Closes #2421 2016-02-11 16:28:25 -08:00
RainWarrior
ed9517a8b4 Fix custom model loader reload hook not firing during registration. 2016-02-10 10:20:13 +03:00
RainWarrior
7e7b855ddf Fix multiple registrations of reloading hooks in custom model loaders. 2016-02-09 16:09:55 +03:00
RainWarrior
12c924751a Fix TRSRTransformation.toItemTransform. Closes #2425. 2016-02-07 17:49:06 +03:00
LexManos
8af1624f9e Merge pull request #2423 from Mumfrey/fix/jdt 
Fix ASM SignatureReader choking on invalid lambda local var signatures emitted by JDT
 2016-02-04 12:34:04 -06:00
RainWarrior
085b28ba35 Revert binary-incompatible changes in models. 2016-02-04 13:34:40 +03:00
RainWarrior
e611162de5 Fix droppers not dropping. 2016-02-03 19:11:33 +03:00
RainWarrior
bfa17d2f0d One day I will learn to include all required classes in the commit. 2016-02-02 12:42:41 +03:00
RainWarrior
3bdc75ad49 Added "gui3d" and "smooth_lighting" options to the forge blockstate. Implemented them for vanilla and B3D models. Added generic types to IModel subinterfaces, to simplify chaining. 2016-02-02 12:23:26 +03:00
Mumfrey
63798d6a8f Fix ASM SignatureReader choking on lambda signatures generated by JDT 2016-01-29 00:19:59 +00:00
RainWarrior
7b7d18f676 Provide original armor model in the custom armor model hook. 2016-01-28 07:43:55 +03:00
RainWarrior
be6c2bd588 Fixed small bug in item extraction code. 2016-01-27 13:29:07 +03:00
RainWarrior
a0bf0155ac Fix NoSuchElementException in ModelBlockAnimation caused by empty event list. 2016-01-26 01:22:21 +03:00
LexManos
e45d111685 Bump version in prep for new Recomended Build. 2016-01-25 11:32:41 -08:00
LexManos
7a0a801740 Merge pull request #2336 from VikeStep/master 
[1.8.9] Add EntityTravelToDimensionEvent
 2016-01-25 11:07:19 -08:00
RainWarrior
960717eb0c Fixed minor race condition between mouse clicks and TESR in the animation example. 2016-01-25 17:39:43 +03:00
VikeStep
026d179c0d Add EntityTravelToDimensionEvent 
Resolve Merge Conflict

Move event call inside conditional
 2016-01-25 17:57:52 +10:00
RainWarrior
e929199758 Sometimes I forget how much trivial things are missing from Java 6. 2016-01-24 10:10:21 +03:00
Fry
e9be24700e Merge pull request #2331 from RainWarrior/model-animation 
Model animation system
 2016-01-24 10:01:58 +03:00
RainWarrior
0710bdf3f5 Model animation system. 
Main things of interest:
  * IAnimationStateMachine - state machine for animations; can load
    from json.
  * AnimationTESR - automatic TESR for animated models.
  * AnimationModelBase - same for entities.
  * ITimeValue - time-varying value, used to control animation
    parameters from code.

  * TESRs can now be batched - look at TESR.renderTileEntityFast +
    TE.hasFastRenderer.
  * RegionRenderCache is not accessible to TESRs and other client-side
    logic - MinecraftForgeClient.getRegionRenderCache.
 2016-01-24 09:59:38 +03:00
LexManos
01919e4eed Fix J6 compile error in IItemHandler PR. 2016-01-23 22:52:32 -08:00
LexManos
e9a86f27fb Merge pull request #2385 from rwtema/master 
Add IItemHandler capability
 2016-01-23 22:06:29 -08:00
rwtema
a1e41f5464 Add IItemHandler capability 
Add the actual patches that I forgot.

Add simple implementations of IStorage and the factory methods.

Add ItemStackHandler. A simple IItemHandler implementaton.

return nulls, not throw nulls.

Move the vanilla wrappers to a separate class for now.

Minor clean ups of VanillaWrapper code.

Inline static methods.

Add comments.

Minor cleanup of code.

Remove redundant size field and add a validate slot index method.

Minor formatting issues.

Break early If stacksize to insert is 0.

Remove setByte() methods.

Throw exception if IItemHandler can't be modifyed in NBT loading.

Replace event handler with patches

Add capability to mine cart inventory entities.

Change formatting and registration of capability.

Make InventoryPlayer implements IItemHandler because why not. Also added a field to allow mods that add additional player inventory space to publicly expose them.

Reduce patch sizes

Lazy initialization of the item handler for vanilla tiles.

Minor formatting changes.

Create a single vanilla chest item handler that will merge with adjacent chests when detected. Added hooks to reset the cached adjacent value when a block update is detected and when a chunk loads.

Revert "Make InventoryPlayer implements IItemHandler because why not. Also added a field to allow mods that add additional player inventory space to publicly expose them."

This reverts commit 306d4a37fd0e8c8a0754411c013b750dfe8e2c87.

Fix furnace derp

Replace double chest code with a simpler method.

Vanilla wrappers implement IItemHandlerModifiable (since they are modifiable)

Minor code cleanups

Add an onContentsChanged() and onLoad() callback methods.to the default implementation.

Add slot as a parameter in the callback method.

Change IItemHandlerModifiable.setStackInSlot() to void, and added a note about not being intended for cross-mod use.

Improve ItemStackHandler handling of errored NBT.

Make the stacks array protected.

Fix a lot of derps in SlotItemHandler.

Fix derp in ItemStackHandler

Clarify comments on IItemHandler

ItemStackHandler no longer caches the stack array in local variable.

Clean up the Chests code to make intentions clearer

Vanilla hoppers have their cooldown activated when an item is inserted. Made this behavior part of an item handler (rather than the insertion code)

Fix mistake in ItemStackHandler

More documentation of potential edge cases in getStackInSlot()

Make limit checking more resiliant.
 2016-01-24 05:20:58 +00:00
LexManos
82647f5b66 Restore OreDictionary.getOres(String, boolean) and doeOreNameExist(String) functions that went MIA in git merge issue. 
Original Commit: cd3bbfb02c
 2016-01-21 13:41:26 -08:00
iLexiconn
a3d4fe5d25 Fixed makeItemStack ignoring stackSize 
Fixes #2376
 2016-01-21 15:31:39 +01:00
RainWarrior
17e8de8a3a Fixed error detection login in ModelLoader, reduced the maximum number of printed stack traces to 5 per domain. 2016-01-20 01:20:26 +03:00
LexManos
f3c2eb8e9c Fix Deobfusication transformer throwing verification errores in Eclipse development environments. 2016-01-19 02:14:22 -08:00
RainWarrior
968b7cae40 Correctly handle error caused by missing/malformed bucket model definition file. 2016-01-18 21:35:23 +03:00
LexManos
3c5103acfb Fix ItemStacks not getting the parent capability provider from items. Closes #2383 2016-01-17 13:37:57 -08:00
Bartek Bok
fae5ff67ed Allow sleeping without bed 2016-01-17 00:43:29 +01:00
RainWarrior
accf6cf218 Fixed missing model error reporting, made block and item variants sort before loading, to make the splash screen info more useful. 2016-01-17 01:57:06 +03:00
cpw
cc593d4b54 Fixed problem with LAN connections seeing the original ProxyPacket and consuming the first byte. Closes #2373 2016-01-16 16:34:02 -05:00
LexManos
7b92a27908 Clone FML packet indexes if channel is not open. Fixes potential threading issue. 2016-01-14 13:35:19 -08:00
Bernhard Bonigl
2857b710f8 Default bucket model is empty, allow bucket model without fluid. 
This allows capsules, cans, bottles,... to use the same item model for their item variant. Also it's makes much more sense.
 2016-01-14 22:13:31 +01:00
mezz
aee1bd6014 Add GuiScreenEvent.BackgroundDrawnEvent 2016-01-13 13:01:16 -08:00
cpw
9a737b0c90 Fix problem which meant runtime deobf to MCP names wasn't working. SRG named mods located in the mods dir of a dev 
environment will now load normally.
 2016-01-13 00:26:52 -05:00
LexManos
17db34ae31 New Capability system allowing for more manageable world object features. 
When combined with @Optional this should address all issues of soft dependancy on mods/apis.
This also addresses the issue of dynamic functionality in TileEntities/Entities.

Current capability providers: TileEntity, Entity, ItemStack

Also added INBTSerializeable, a generic interface for game objects that can be written to/from NBT tags.

Vanilla capabilities will be coming soon, mostly on request and review.
So start requesting capabiliteis on vanilla/Forge features.
 2016-01-11 16:04:22 -08:00
LexManos
2594196c15 Fixed GuiWrongMinecraft having wrong Log file name. Closes #2348 2016-01-10 20:31:55 -08:00
LexManos
afc46fa59a Made WrongMinecraftVersionException and ModSortingException a bit easier to read in log files. Closes: #2345 2016-01-10 11:07:12 -08:00
LexManos
76c40896e4 Remove dead code in JarDiscoverer. Closes #2346 2016-01-10 11:06:37 -08:00
RainWarrior
f42137907e Implemented face culling for item models, improves performance slightly. Closes #2326 2016-01-09 19:05:18 +03:00
RainWarrior
5c5d946ff5 Made block model loading bar more robust, and fixed the count. 2016-01-07 02:09:29 +03:00
RainWarrior
95615cb4bf Added progress bar for the ModelLoader. 2016-01-06 22:53:34 +03:00
RainWarrior
68339f51cf Derp. 2016-01-06 22:06:36 +03:00
RainWarrior
949e77b46a Model loader improvements: adding custom data/textures to models that don't need them doesn't cause a error now, since it's common to put those in the defaults section of the blockstate json; you can get IModel associated with the variant now - using ModelLoaderRegistry.getModel; MultiLayerModel should now respect transformations applied to it, and respect part transformations. 2016-01-06 22:00:43 +03:00
cpw
632d8e553d STFU I know how to code. *shouts* get off my lawn! 2016-01-04 16:18:44 -05:00
cpw
035dd4c245 Make the parent dir tree for the dep extractor 2016-01-04 09:07:28 -05:00
RainWarrior
4732acc1c4 Java6 + Eclipse + Gradle strike again. 2016-01-04 15:18:36 +03:00
RainWarrior
b8dd4c54e1 Fixed implementation if IRetexturableModel in ItemLayerModel. Closes #2244. 2016-01-04 14:21:31 +03:00
RainWarrior
f562579054 Don't crash on exception during loading of item variants from blockstate jsons. 2016-01-04 14:08:52 +03:00
RainWarrior
856a9c3cdd Fixed perspective transformation handling for fluid models, changed inventory fluid model to use unrotated still texture. 2016-01-04 13:54:45 +03:00
RainWarrior
826b1d20f8 Fixed invalid flow vector caching of still fluids. 2016-01-04 12:48:10 +03:00
RainWarrior
686b32bfd0 Fixed random offset not working properly for flatly-lit models. 2016-01-04 12:04:30 +03:00
cpw
3c08c104cc Explicitly close the file. 2016-01-03 10:06:25 -05:00
cpw
dc4dc55dcd Add a simple ContainedDep mechanic- mods can contain other mods or libs, and can specify them using a manifest tag: "ContainedDeps". 
This is a space separated (manifest standard) list of jar files that are to be extracted into the version specific directory.

There's also a special system property "fml.skipContainedDeps" that will allow for runtime skipping of extraction of contained deps (a comma separated list, based on the file name).
 2016-01-02 17:28:35 -05:00
LexManos
1a31ff9f06 Added new get/setRegistryName functions to Item and Block. 
And helper functions in GameRegistry to allow for registering using those names automatically.
This is to simplify registration and get rid of the horrible hacks users are doing now with 'unlocalised names'.
 2016-01-02 12:58:57 -08:00
cpw
fb54ea94c0 Move substitution activation after id loading. This should fix the problem of null for existing object. 2016-01-02 12:06:53 -05:00
RainWarrior
d105c444ee SidedProxy now has sensible default values - nested ClientProxy and ServerProxy classes. 2016-01-02 09:59:14 +03:00
RainWarrior
104feb2973 Reverted Render registration changes due to them working. 2016-01-01 08:51:56 +03:00
RainWarrior
a4123580b1 Nobody is left behind. 2016-01-01 02:17:10 +03:00
RainWarrior
cf2bbd1353 Fixed RenderingRegistry not working. Closes #2312. 2016-01-01 02:01:03 +03:00
cpw
6e90348dc5 Fix that the dummy registry entries don't allow clients connecting to servers. Also fix that it repeatedly nags about missing stuff in the world. 2015-12-31 17:59:11 -05:00
LexManos
50f235c81b Fix boss health bar rendering when debug overlay is enabled. Closes #2328 2015-12-31 14:48:54 -08:00
LexManos
e0f0273c5e Fix J6 compile issue with ModelFluid. 2015-12-31 14:40:32 -08:00