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

1083 commits

Author SHA1 Message Date
LexManos
1e6ae7d1f7 Fix modid field name for ProjectInjector. 2016-12-16 13:01:23 -08:00
LexManos
7fe8c48983 Enable Enforcement of modid formatting. Must be lowercase and <= 64 characters 2016-12-09 14:36:15 -08:00
LexManos
babe0c2d53 Bump version for RB. 2016-12-05 20:54:35 -08:00
mezz
8eea766288 [1.11.x] Refine fluid placement utilities (#3509) 2016-12-05 20:17:47 -08:00
LexManos
160427b12c Properly filter out annotations that are for multiple mods in the same mod source. 
This prevents disabled mods from getting their proxies injected.
Also prevents mods from getting their proxies injected multiple times.
Effects the @EventBusSubscriber, @Instance, @Metadata, @SidedProxy annotations.
If the target modid is not in the annotation data, and there are multiple mods in the source, it will attempt to find it by matching the annotations's class names.
This is a potentially breaking change. Review your logs for "skipping" messages.
 2016-12-05 17:19:15 -08:00
LexManos
c6bc4ec5a9 Make SlotItemHandler override Slot.getSlotStackLimit. Closes #3497 
Make Container.mergeItemStack respect target slot's max size when slot is non-empty. Closes #3498
Fix Shift clicking in Beacons with stacked items when fuel slot is empty.
 2016-12-05 12:56:05 -08:00
LexManos
4b7219c07f Fix for showing config default values twice in tooltip (#2257) (#3338) 
(cherry picked from commit be73ec3d5ebd972cfacb0f255f71112a0430bc43)
 2016-12-05 12:07:44 -08:00
LexManos
f9c74cfc77 Added isItemValidForSlot check to hopper extraction (#3444) 
(cherry picked from commit 0348760a774ca7ed9639376baadae38e272f5bf8)
 2016-12-05 12:06:16 -08:00
LexManos
c1e832bff0 Fix NPE when rendering missing mod screen with version bound requirements. #3501 2016-12-05 12:03:23 -08:00
LexManos
61fc4a70a3 Make sure to log kick messages in NetworkDispatcher. Closes #3507 2016-12-05 12:01:53 -08:00
Ben Staddon
6921ee54f5 [1.11] Fix null checks in shouldCauseReequipAnimation (#3482) 2016-12-03 10:47:57 -08:00
mezz
a913a8a0f9 [1.11] Add biome dictionary types for newer biomes (#3475) 2016-12-03 10:46:36 -08:00
mezz
e09e6c0f24 Add a way for modded GuiScreens to cancel mouse and keyboard events (#3438) 2016-12-03 10:32:09 -08:00
liach
2337b0a6ae Moved TextureStitchEvent.Pre to allow custom sprites for blocks (#3436) 2016-12-01 20:49:23 -08:00
Ben Staddon
14f3120eed Fix sky colour blending not working for render distances >16 (#3476) 2016-12-01 18:49:34 -08:00
diesieben07
96f88538d5 BiomeDictionary code cleanup (#3466) 2016-11-30 15:48:44 -08:00
TechnicianLP
dac8e49f50 Added EquipmentChangeEvent (#3411) 2016-11-30 15:15:14 -08:00
Marvin Rösch
5da0ac73b9 Update assets to new Forge brand (#3464) 2016-11-30 14:56:31 -08:00
LexManos
8d20258f3c First pass at exposing data fixers to modders. 
Each mod gets its own version number, mods SHOULD NOT rely on other
mod's fixers, just care about yourself.
Walkers can use IDataFixerData to retrieve their version.
 2016-11-28 16:05:41 -08:00
Vincent Lee
c17b40790b Add getSlotLimit(slot) to IItemHandler (#3445) 2016-11-28 16:03:47 -08:00
cpw
b048c1a4b5 Pass along if the respawn event was the result of the end being conquered or not (end respawning is really FUNKY code and uses death instead of 'change dimension') 2016-11-27 23:58:41 -05:00
Ben Staddon
86a772ee8c Clean up handling of changes to IVertexConsumer (#3458) 2016-11-27 02:01:26 -08:00
mezz
daee86d14d Provide access to ShapedOreRecipe width and height (#3439) 2016-11-27 01:49:13 -08:00
Ben Staddon
059605e352 Quick fix for another ItemStack null check (#3426) 2016-11-27 01:49:06 -08:00
mezz
c22382d12e Fix using the wrong Pair implementation (#3449) 2016-11-24 20:15:32 -08:00
mezz
969a75154f Fix #3432 Hopper and Dropper item moving does not exactly match vanilla (#3442) 2016-11-23 12:45:07 -08:00
mezz
2bd8b95a3b Cleanup some null checks and remove deprecated methods in Item and Block (#3429) 2016-11-22 15:20:05 -08:00
LexManos
2823447b6e Fix max CustomPayload size, 1MB not 16MB. 2016-11-22 12:13:30 -08:00
LexManos
e03d5915e5 Insert FML packet handler into Vanilla pipelines in case modders send FMLPacket to vanilla. Fixes #3422 2016-11-22 12:13:07 -08:00
LexManos
8f03658f1f Fix AbstractMethodException in FML Registries. Closes #3427 2016-11-20 16:15:15 -08:00
LexManos
f12a4b5c1e Fix Item transfers related to Hoppers. 2016-11-18 14:42:22 -08:00
Shadowfacts
9cf74914e7 Initial annotations/nullability changes (#3392) 2016-11-18 13:24:03 -08:00
iChun
1fa0c0c548 Add GetCollisionBoxesEvent. Allows manipulation of the collision boxes of blocks for entities. MC1.11 edition. (#3405) 2016-11-18 12:24:55 -08:00
LexManos
97ea0c4713 First draft of Entity Registry re-write. 2016-11-17 19:06:42 -08:00
LexManos
85a2a2e661 Fix issues with ZombieVillagers Closes #3398 
1.11 doesn't intertwine zombie types anymore so our edits to split them out for custom professions are not needed.
 2016-11-17 12:14:23 -08:00
Terrence Ezrol
f028ba88f5 Fix Villagers for 1.11 (#3401) 
- Add cartographer registry entry
- Fix textures for the nitwit
 2016-11-17 10:59:13 -08:00
mezz
150566d9a3 [1.11] Fix nullability issues around ForgeHooks and Capabilities (#3395) 2016-11-17 10:44:31 -08:00
Larsg310
bf090cb4c2 Change OreDictionary over from "null" to the new ItemStack system. (#3400) 2016-11-17 10:43:22 -08:00
LexManos
6dcd276de1 Restore the ability to register modded TileEntities. 2016-11-16 16:54:34 -08:00
mezz
eb6b3ea228 Implement fluid item capabilities without item swapping 2016-11-16 16:17:21 -08:00
mezz
6f1a44a405 Remove deprecated Fluid stuff 2016-11-16 16:17:21 -08:00
Shadowfacts
bf8fa5d286 Fix crafting causing crash (#3388) Closes #3387 2016-11-16 16:15:24 -08:00
LexManos
42a7036393 Fix ItemStackHandler's constructor ignoring size. Closes #3386 2016-11-16 16:06:52 -08:00
LexManos
6741967608 Make EntityShulker fire EnderTeleportEvent. Closes #3383 
(cherry picked from commit d48985fafaed6de6f09136b999ca8aa44184a7b9)
 2016-11-16 16:05:41 -08:00
LexManos
f0d9bf7886 Added event to allow modification of player visibility to mobs/AI (#3382) 
(cherry picked from commit 0a5ef64d6ea96fe85d7c62107081ced649e6a3e9)
 2016-11-16 15:10:14 -08:00
mezz
e498dc7532 [1.11] Fix initCapabilities for ItemStacks (#3379) 2016-11-16 14:15:02 -08:00
LexManos
f8cba13b5b Fix localizations not loading correctly in legacy resource packs. 2016-11-15 22:59:31 -08:00
LexManos
648067efc2 Fixed test cases for 1.11 changes. 2016-11-15 20:28:12 -08:00
LexManos
c459b87ec9 Initial 1.11 release update. 2016-11-15 19:26:10 -08:00
cpw
4e6a774075 Initial 1.11-pre1 update 2016-11-13 17:09:55 -05:00
cpw
9ab96fbda6 Update to 20161111 mcp names 2016-11-12 10:05:32 -05:00
mezz
7a4aa5a1c4 Improve error message from crashes during loading (#3362) 2016-11-10 20:00:11 -06:00
Draco18s
998a78c3c1 Added events for crop growth (#3320) 2016-11-07 14:40:44 -08:00
Max Becker
42e0fbbb02 Add support for custom entity selectors in commands (#3356) 2016-11-05 13:12:05 -07:00
LatvianModder
27ebd0e9b9 Added PermissionAPI (#3155) 2016-11-04 13:36:30 -07:00
Choonster TheMage
9a9c02fa25 Add hand argument to BlockEvent.PlaceEvent (#3221) (#3270) 2016-11-03 11:53:12 -07:00
Jezza
5802a3b0b6 Fixes #3237 and #2752. (#3347) 
* Fix #3237 by correctly utilising the keepLooking argument.

* Explain within SimpleNetworkWrapper's javadoc that the execute of the handler isn't on the main Minecraft thread.
 2016-11-03 03:34:25 -07:00
Draco18s
dc871ea273 Made default slot implementation respect inventory stack size limit. 2016-11-01 13:41:14 -07:00
boni
5f9034d95b Call Looting Event on player death and loot table drops (#3275) 
* Call Looting Event on player death and loot table drops

* Simplify patches

* More code cleanup: Replace old usage with compact forgehooks implementation
 2016-10-30 10:53:50 -05:00
CoderAtParadise
bd62cf81fd Fixed Ore Dictionary replacing the oak boat recipe (#3329) 
Fixes the oak boat recipe being able to be crafted with any wood
 2016-10-24 13:44:18 -07:00
RWTema
a1bbcf8a0b Improve the default isItemValid() and getItemStackLimit() implementations in SlotItemHandler. You can now properly swap the player's held itemstack with the slot's itemstack. (#3273) 2016-10-24 12:44:56 -07:00
LexManos
159ca09c54 Special case not drooping snowballs for water and snow layers. Closes #3326 2016-10-23 14:07:24 -07:00
mezz
bea5d44273 Add better key modifier behavior for GUI contexts (#3307) 2016-10-14 13:14:27 -07:00
LexManos
490573a71f Fix Tabbing issues with config classes. 2016-10-11 12:21:14 -07:00
LexManos
9c7d20b3a1 Initial pass a re-working the configuration system. 
Work in progress.
 2016-10-10 22:15:35 -07:00
cpw
d7dda9e960 Fix substitutions being broken after freezing - actually store the original state in registry copies, not the computed state, which is wrong because it only sees the sub, not the original. 2016-10-10 15:04:45 -04:00
cpw
5f06c95cfa Revert "Another fix for registry substitutions. Closes #3212" 
This reverts commit ec2977afc9.
 2016-10-10 15:04:45 -04:00
LexManos
6e8c05343c @ObjectHolder will now inject null for dummied objects. Closes #3301 2016-10-09 15:57:18 -07:00
Steven Blom
d3da111c08 Allow all Forge Registries to work with ObjectHolder (#3220) 2016-10-09 13:34:38 -07:00
LexManos
7a63e67e9d Revert commits related to filtering proxy and Automatic Subscriber annotations. 
Broke some existing setups, will require a annotation definition change in 1.11.
 2016-10-09 12:36:21 -07:00
mezz
d159f5f4e2 Fix proxy injector filtering. (#3300) 2016-10-09 01:22:28 -07:00
LexManos
92eb71ae9c Bump version for new Recommended Build. 2016-10-08 16:33:27 -07:00
LexManos
bc303074f6 Introduce IContextSetter for events. 
This will set the active mod container for events using the normal EventBus.
Fixes improper warnings from initializing mods using the new Registry events.
Modders, you should not use this as it has many performance implementations
and if abused will slow down the event bus A LOT. ActiveModContainer is not
thread safe.
 2016-10-08 16:30:53 -07:00
LexManos
c0db34796b Filter out proxy injectors for incorrect mods. 
Prevents mod classes being initialized early when multiple mods are in the same source.
 2016-10-08 16:27:49 -07:00
mmehnert
4feb1dff50 caseSensitiveCustomCategories must be set before loading the configuration file. (#3269) 
Otherwise one set with categories in lowercase letters and on case sensitive
set is generated.
 2016-09-22 17:03:35 -07:00
tterrag
d3ad8aed76 Fix typo in sky rendering causing tons of BlockPos allocations (#3267) 2016-09-21 12:50:24 -07:00
cpw
7a84376044 Add in registry registration events, new subscription events you can use to make sure you're registering things at the "best" time. 2016-09-17 21:13:15 -04:00
LexManos
1107088acb Add support for generic filtering of events. 
Please DO NOT use this in performance sensitive environments where you will have tons of things added to the listener list.
If that's the case define sub-classes as they have completely separate lists and will thus be more efficient when firing the event.
 2016-09-17 15:08:23 -07:00
James Mitchell
89eb8f067d Remove oredict for Bone Block recipe, stop white dye to bonemeal exploit (#3255) 2016-09-15 01:03:52 -07:00
LatvianModder
3b5ada083e Added getCommandMap() & getSortedCommandList() in CommandTreeBase (#3251) 2016-09-13 12:46:23 -07:00
Steven Blom
8dca9f2694 New event to allow mutating a baby entity based on it's parents (#3227) 2016-09-13 09:32:27 -07:00
LatvianModder
4e3b6b0f15 Added CommandTreeBase (#3193) 2016-09-13 00:36:51 -07:00
Marvin Rösch
bf6437c12a Fix universal bucket not being returned in crafting recipes (#3234) 2016-09-13 00:02:01 -07:00
LexManos
b879cc9b73 Fix potential shading issue in GuiEditArrayEntries. Closes #3247 2016-09-12 14:48:55 -07:00
LexManos
45097fed0c Introducing a new standardized energy capability system. 
Heavily inspired by the old RedstoneFlux API developed by King Lemming and Team CoFH.
 2016-09-12 14:47:59 -07:00
Paul Fulham
0c8f51bc95 Fix item use stats (#3216) 2016-08-22 21:29:48 -07:00
LexManos
12769dbaae Fixed decorate event being called with SHROOM type for both convered trees and large mushrooms. Closes #3215 2016-08-22 16:40:24 -07:00
LexManos
ec2977afc9 Another fix for registry substitutions. Closes #3212 2016-08-21 15:54:57 -07:00
LexManos
d6d9a45100 Add legacy support for signature change of AddCallback. 2016-08-20 17:11:17 -07:00
boni
8dbfe1baad Expand getHarvestLevel to include player and blockstate (#3192) 2016-08-19 15:54:37 -07:00
Abastro
dd41990db4 Fixed NPE from missing Capabilities (#3191) 2016-08-14 13:58:54 -07:00
LexManos
0e286f880e Fix World Capabilities NPE when there are no attached capabilities. 2016-08-14 01:48:41 -07:00
Abastro
bfddcfb4fc Introduced Capabilities for World (#3069) 2016-08-13 20:42:00 -07:00
MrIbby
d17c025557 Added PlayerBrewedPotionEvent (#3187) 2016-08-13 13:38:45 -07:00
cpw
03c8852961 Don't crash if you select a fake player 2016-08-13 16:37:58 -04:00
LexManos
3a48a9cd73 Skip searching for mods in the JAVA_HOME directory. Closes #2249 and #2250 2016-08-13 13:28:21 -07:00
shartte
7643be8cdc Unlike BakedQuad, UnpackedBakedQuad does not propagate the diffuse lighting flag to Vertex Consumers. Made UnpackedBakedQuad conform to BakedQuad's behavior. (#3181) 2016-08-12 14:33:38 -07:00
LexManos
4cd0f88a69 Add RenderTooltipEvent (#3034) 2016-08-12 13:57:07 -07:00
LexManos
1c8f22ed43 Set ModelLoader.WHITE's texture size iniatlly instead of defaulting to zero and being set later. 2016-08-12 13:49:46 -07:00
James Mitchell
f20d728ed7 Fix #3165 Dispensers with buckets can destroy fluid handler blocks (#3180) 2016-08-12 01:36:18 -07:00
LexManos
fe2243df9f Removed unintentional functionality when using the Splash Screen. 2016-08-08 17:54:12 -07:00
LexManos
62ec59103a Compleetly skip FML handshake for Vanilla connections. Should fix race condition. Closes #3084 2016-08-08 17:35:15 -07:00
LexManos
69af6a9b8c Fix name in legacy support in registry changes. 2016-08-08 17:32:49 -07:00
AlgorithmX2
bc6b008364 Fix Vertex Transformer for breaking models (#3132) 
* Add setTexture to IVertexConsumer and propagate it.
 2016-08-04 16:37:59 -07:00
LexManos
7c4ffde39c Fix Forge fluids not serializing properly. Closes #3152 2016-08-02 15:55:46 -07:00
LexManos
f4e8804c8a Restone binary compatibility with registry substitution rework. 
Modders please switch to using the provided RegistryBuilder to ensure more forward compatbility. Closes #3144
 2016-08-02 15:55:18 -07:00
LexManos
f088e3df6b Second pass at fixing 'Dissapearing Doors' This now more robustly fixes ALL uses of get and has slight performance improvements for itterable states. Closes #3139 2016-07-31 14:30:05 -07:00
LexManos
0f6b16cada Added config option to disable Forge's fix of Stair/Slab face culling. 
Some vanilla resource packs exploit this issue in their custom models causing unintended rendering issues.
 2016-07-30 10:31:46 -07:00
cpw
4dcee246d5 Another pass at substitutions - now capable of fixing up ItemBlock to point at the right block when a block is substituted, should also handle substituting itemblocks. There's some hackery in the way we have to change the value of ItemBlock.block, but it's not too egregious in my opinion. 2016-07-29 17:08:52 -04:00
cpw
1473334f61 Merge remote-tracking branch 'origin/pr/3120' into 1.10.x 2016-07-28 23:15:32 -04:00
cpw
7e15ab7da1 Fix anvil output slots being wrong by adding new ones. Closes #3121 without breaking existing mod workarounds for the badly ordered slots. 2016-07-28 22:17:35 -04:00
cpw
de80d4c4af Clean up some legacy settings, making sure there's translation strings. Closes #2965 Thanks for the prompt Zaggy! 2016-07-28 21:47:36 -04:00
AlgorithmX2
a3d8664028 Use extended state for breaking models (#3086) 2016-07-28 16:00:36 -07:00
cpw
5d9169db0f Merge remote-tracking branch 'origin/pr/3125' into 1.10.x 2016-07-28 18:25:45 -04:00
Alexandre DUPONCHEL
b0fd97557e FIX : IndexOutOfBoundException 2016-07-28 17:59:59 +02:00
cpw
543156a008 Tidy up some more todos 2016-07-27 10:52:48 -04:00
cpw
056ff67a81 Mark it for actual removal in 1.11 2016-07-27 10:41:20 -04:00
cpw
ab64d1a166 Fix a vanilla bug with the blockstate ID map not being properly symmetric with respect to block.getStateFromMeta - closes #3012 properly but probably has a random MCJIRA ticket somewhere too. 2016-07-26 17:16:42 -04:00
Dakota Pierone
0cf2cdfdb3 Update decorate for biomes to support Decorate event 2016-07-24 10:40:14 -07:00
cpw
cfba330459 Rename the event to RenderSpecificHandEvent 2016-07-24 10:56:05 -04:00
cpw
31b3825069 Merge remote-tracking branch 'origin/pr/3115' into 1.10.x 2016-07-24 10:38:20 -04:00
cpw
cace1f00b2 Merge remote-tracking branch 'origin/pr/3110' into 1.10.x 2016-07-24 10:08:46 -04:00
Bernhard Bonigl
bc27f0e204 Add shouldCauseBlockBreakReset callback to Item. This allows to keep breaking blocks if the NBT or similar changes. 2016-07-24 13:52:27 +02:00
Joseph C. Sible
fc43ebbd7e Use CreateFluidSourceEvent for mod fluids as well 2016-07-23 22:39:54 -04:00
Joseph C. Sible
b95d443f22 Add CreateFluidSourceEvent to control infinite fluid sources 2016-07-23 22:39:54 -04:00
cpw
d7245c5ffe Merge remote-tracking branch 'origin/pr/3055' into 1.10.x - closes #3055 and #3043 hopefully. Complex solution, but it seems legit. Needs testing. 2016-07-23 20:14:51 -04:00
cpw
45b299ce06 Something that needs to happen: warn people about bad modids- if they're not lowercased, or if they're too long. 2016-07-23 20:01:54 -04:00
Vincent Lee
7ed5fc7e00
Add missing cancelable 2016-07-23 12:33:14 -05:00
Vincent Lee
94a41e1fcc
Add hand-specific render event 2016-07-23 12:29:58 -05:00
cpw
b7739ffc71 Some tweaks to ContainedDeps - it should extract to a file in versionedMods directly, even if the tag in the jar has a subpath element. It'll also skip if there is a matching filename in the main mods dir. 2016-07-21 13:59:02 -04:00
cpw
7d4bf619fe More tests. Substitutions now work, and a fix is included. *sigh* Closes too many bugs to count. 2016-07-20 16:03:56 -04:00
cpw
22394f87d5 Some test harness stuffs. Time to get the registry manager properly tested. 2016-07-19 19:21:52 -04:00
LexManos
5f234fdcf8 Added support for using static methods as event listeners, Register the .class instead of an instance. 
And added an improvement to calltime listener rebuilding.
 2016-07-13 12:08:13 -07:00
LexManos
b76b223d62 Bump version for a RB 2016-07-11 12:38:15 -07:00
cpw
7e36205ba7 Merge #3060 into 1.10.x 2016-07-09 11:58:09 -04:00
Vincent Lee
f76af6103e Add throwable impact event (#3071) 2016-07-08 21:12:45 -07:00
LexManos
3e6099055e Fix hopper extract behavior being broken on edge cases due to IItemHandler capability. Closes #3062 2016-07-03 13:45:26 -07:00
Bernhard Bonigl
432e3ab08a Add an event that allows to modify the looting level based on damage source 2016-07-03 15:19:31 +02:00
LexManos
f58d1cae1a Fixed FPS graph and new debug lines not being rendered in Debug screen. Closes #3054 2016-07-01 13:53:26 -07:00
LexManos
72f7c0be1f Forge will now load extra mods from mods/mod_list.json and mods/mc_version/mod_list.json. 
As defined by the same json spec as --modListFile.
And now if repositoryRoot is prefixed with absolute: the path will NOT be relative to the MC directory.
 2016-06-30 00:16:40 -07:00
Mumfrey
32459b01b6 Store member field mappings in the mapping table, possible fix for #3043 2016-06-29 15:33:27 +01:00
LexManos
6ad65f4e64 Fixed MC version number... 
I could of SWORN we removed this in favor of a automated system...
 2016-06-28 22:27:47 -07:00
LexManos
373fa8f7a3 1.10.2 Update 2016-06-28 21:25:04 -07:00
diesieben07
4b9bf30fed Fix mob-spawners crashing for non-living entities and simply the patch in the process (#3042) 2016-06-26 16:35:59 -07:00
mezz
18b2eeef90 Fix milk bucket is fillable with water or lava when milk is unregistered (#3039) 2016-06-26 12:19:04 -07:00
mezz
1871cf1b02 Fix FluidContainerRegistry handling potions as water bottles (#3037) 2016-06-26 12:18:11 -07:00
mezz
99616a503f Remove duplicated universal buckets from the creative list (#3035) 2016-06-26 12:18:02 -07:00
cpw
0b1e94babd Big warning for recipe types found without being registered, it turns out this is pretty severe, modders need to fix it. 2016-06-26 12:52:14 -04:00
mezz
fde90973c3 Fix comparison stability of the Recipe Sorter with unknown recipes #2962 (#3030) 2016-06-25 17:13:24 -04:00
LexManos
dd3c3a249e Fixed Husks rendering as standard zombies. Closes #3028 2016-06-25 11:05:46 -07:00