bfeec0c7bd
Merge branch '1.16.1' into 1.16.x
...
# Conflicts:
# patches/minecraft/net/minecraft/client/Minecraft.java.patch
# patches/minecraft/net/minecraft/item/crafting/Ingredient.java.patch
# src/main/java/net/minecraftforge/fml/client/ClientModLoader.java
# src/main/java/net/minecraftforge/registries/GameData.java
2020-08-31 21:15:56 -04:00
2e42340dfa
Fix up all the things. Removed SidedProvider because it served no real purpose anymore.
...
Signed-off-by: cpw <cpw+github@weeksfamily.ca>
2020-08-31 21:00:44 -04:00
16b82bb97b
Merge branch '1.16.x' into 1.16.1
...
# Conflicts:
# src/main/java/net/minecraftforge/fml/ModList.java
# src/main/java/net/minecraftforge/fml/client/ClientModLoader.java
2020-08-30 21:44:51 -04:00
d76ee4edd7
Redo event dispatch, removes a bunch of nonsense, and tries to integrate with the vanilla CF system where possible
...
Signed-off-by: cpw <cpw+github@weeksfamily.ca>
2020-08-30 21:39:06 -04:00
cf09f3eeb9
Add particle culling ( #6981 )
2020-08-30 16:05:16 -07:00
d8eaeabf3c
Wrap vanilla's 'default' biome registry in ForgeRegistry.
...
This should allow registering mod dimensions like in 1.16.1, while the data driven system is fleshed out.
2020-08-26 09:49:41 -07:00
600e68cace
Clarify in the LazyOptional which methods carry the lazyness over to the returned value and which don't. ( #6750 )
...
For consistency, this meant making a few changes:
- Renamed the existing lazy mapping method to lazyMap, to indicate that it doesn't run the mapping immediately.
- Added a new implementation of map(), which returns Optional<T>, and resolves the value in the process.
- Changed filter() to return Optional, since there's no way to filter lazily.
- Added a new method resolve(), which helps convert the custom LazyOptional class into a standard Optional, for use
with library methods that expect Optional<T>.
* Update License headers.
2020-08-25 03:11:28 +02:00
625cd746ef
Add user-friendly exceptions when config loading fails ( #7214 )
2020-08-21 14:27:12 -07:00
fc000fe913
Replace EntityHeight event with EntitySize event ( #6858 )
2020-08-21 11:53:37 -07:00
e3db429763
[1.16] ForgeEventFactory#canCreateFluidSource reintroduced ( #7181 )
2020-08-21 11:37:43 -07:00
e803006360
Cleanup and expand Forge tags ( #7004 )
2020-08-21 11:30:21 -07:00
5a20705f05
Log info about server list warning ( #7209 )
...
Make it easier to figure out what mods are missing or have to be marked as client/server side only.
2020-08-21 11:15:44 -07:00
aaa1deeef2
Fix ItemStack#isDamageable is not calling Item#isDamagable ( #7221 )
2020-08-21 11:06:38 -07:00
50197b1fa5
Improve performance and cleanup code for DelegatingResourcePack ( #7228 )
2020-08-21 10:48:48 -07:00
797791c2af
Fix small logging issues with loading pack.png for mods ( #7265 )
2020-08-21 10:24:49 -07:00
c2de232703
Fix config iteration order ( #7230 )
2020-08-21 10:23:20 -07:00
9118c3dd24
Cleanup Forge's build script, fix some unneeded patches.
...
Add checkExcscheckAll tasks.
2020-08-21 02:47:04 -07:00
a5aca97e31
Removed HarvestDropsEvent ( #7193 )
2020-08-18 22:47:38 -07:00
edca0c7293
Remove forge optional tags in favor of Vanilla's new system. ( #7246 )
2020-08-18 22:22:34 -07:00
132cc3659d
New method for creating modded tag references, fix connecting to vanilla servers.
2020-08-14 12:04:55 -07:00
680c4062f4
Fix creating nether portals.
2020-08-14 12:04:17 -07:00
fe43088c96
Initial 1.16.2 Update
2020-08-13 00:35:08 -07:00
a3c4ffd2c1
Fix ModelRegistryEvent firing every time resources reload instead of just once.
2020-08-09 22:04:44 +02:00
a8e68328c4
Move ModelRegistryEvent invocation to when the model loading is about to start.
...
Freeze the ModelLoaderRegistry right after this event happens, just before model loading actually begins.
This means ModelRegistryEvent is now the correct place to register loaders, as it was intended.
This is a slight breaking change, but any mod that used FMLClientSetupEvent before will need to be updated regardless due to the existing race condition.
2020-08-08 03:00:15 +02:00
54b4089afd
Add harvest levels for hoes and new 1.16 blocks for pickaxes Fixes #7187 ( #7189 )
2020-08-03 17:06:36 -07:00
493608e1b5
Fix debug world not generating modded blocks ( #6926 )
2020-08-03 17:00:31 -07:00
0984777c98
New IForgeBlock#getToolModifiedState hook allow better control over tools interacting with blocks. ( #7176 )
2020-08-03 16:49:26 -07:00
399bc6c9c3
Add support for custom elytra ( #7202 )
2020-08-03 15:55:10 -07:00
20702456ac
Re-introduce "outdated" notification on Mods button in main menu ( #7123 )
2020-08-03 15:11:06 -07:00
8f9e52c260
Implement forge IBakedModel methods in vanilla wrapper models
2020-07-29 23:10:40 -04:00
e62805f1d7
Fix another case of swallowed errors not shutting down mods.
2020-07-28 16:44:29 -07:00
ff752ab14b
Revert "Properly shutdown FMLModContainer's event bus when an error in a lifecycle event is detected."
...
This reverts commit 30bad1e2
2020-07-28 19:17:35 -04:00
19a38f5cb9
Revert "Shut down all other mod handlers if the loading cycle errors. This prevents other mods from throwing errors and being blamed for initial cause. This is a temporary hack until cpw re-writes the mod event dispatcher."
...
This reverts commit 7592bbe8
2020-07-28 19:17:29 -04:00
7592bbe87e
Shut down all other mod handlers if the loading cycle errors.
...
This prevents other mods from throwing errors and being blamed for initial cause.
This is a temporary hack until cpw re-writes the mod event dispatcher.
2020-07-28 14:39:53 -07:00
30bad1e26d
Properly shutdown FMLModContainer's event bus when an error in a lifecycle event is detected.
2020-07-28 12:01:15 -07:00
5104824a1b
Enable EventBus type check during ForgeDev, and add IModBusEvent marker to ModelRegistryEvent.
2020-07-28 10:24:52 -07:00
95d2b6ae89
Missed one event. NewRegistry needs the marker.
...
Signed-off-by: cpw <cpw+github@weeksfamily.ca>
2020-07-27 21:13:53 -04:00
97dfcbc52b
Update coremods and spi, include mandatory license field in metadata. Added at top level of mods.toml file.
...
Signed-off-by: cpw <cpw+github@weeksfamily.ca>
2020-07-27 20:21:39 -04:00
532d153d33
Update modlauncher, eventbus, accesstransformers and more to use a newer mechanism for generating ASM.
...
Introduced IModBusEvent as a marker interface for events on the ModBus. Expect exceptions if you use
the modbus for events not listened there.
Signed-off-by: cpw <cpw+github@weeksfamily.ca>
2020-07-27 19:40:43 -04:00
7717795f42
Fix Biome generation error.
2020-07-27 15:56:04 -07:00
941b9a1d1f
Re-added PlayerEvent.NameFormat ( #6992 )
2020-07-27 14:16:35 -07:00
27798c5804
Fixed modded overworld biomes not spawning [1.16.x] ( #6990 )
2020-07-27 14:10:42 -07:00
9d84b5df31
Added EntityLeaveWorldEvent ( #6984 )
2020-07-27 14:06:01 -07:00
c9f9fd01b5
Re-add patch for PlayerSetSpawnEvent ( #6977 )
2020-07-27 13:41:35 -07:00
e3137213e5
Remove startupquery. Currently wasn't functional, and 1.16 has out of band state loading in all cases, so the complex functionality there is no longer needed. Going to research using the Lifecycle indicator from DFU as a proxy/replacement. Probably with some codec FUN.
...
Signed-off-by: cpw <cpw+github@weeksfamily.ca>
2020-07-21 21:26:02 -04:00
7b43b9f8c0
Run Forge's data generators to sync 1.16 vanilla changes.
2020-07-21 17:34:23 -07:00
24f3ef5ffe
Load Modded Datapacks in DatapackScreen, before world creation ( #6913 )
2020-07-20 15:56:21 -07:00
a3edfd3748
Fix inconsistencies with model/blockstate datagen
2020-07-18 18:34:35 -04:00
96b9a057b7
Filter duplicate mod files from mod file scan data ( #6855 )
2020-07-17 10:35:38 -07:00
638d1d31de
Fixed Forge commands. Closes #6973 Closes #6974 Closes #6976
2020-07-16 14:08:13 -07:00
00013865b0
Added an event for registering commands. closes #6968 ( #6969 )
2020-07-15 12:30:41 -07:00
6722e7a428
Make all functions in Style common. ( #6931 )
2020-07-13 17:15:32 -07:00
0f56b4c4ee
Mark Raid.WaveMembers as an extensible enum. ( #6878 )
2020-07-13 15:40:37 -07:00
201349f8de
Fix checkPatches task. Closes #6956
...
Fix patched in method using srg name. Closes #6965
Fix capabilities not being collected for ClientWorld. Closes #6966
Fix TagEmptyCondition using client side copy of tags instead of server. Closes #6949
Fix ExtendedButton using narrator text. Closes #6958 , Closes #6959
Fix misaligned patch in RepairContainer. Closes #6950 , Closes #6953
Fix LivingJumpEvent not being fired for players jumping horses. Closes #6929
Remove extra getToughness method in ArmorItem. Closes #6970
Remove GetCollisionBoxesEvent. Closes #6921
2020-07-13 15:17:37 -07:00
065ebde57e
Fix race condition with DeferredRegister for custom registries ( #6951 )
2020-07-10 14:08:22 -07:00
6b3f2f46fa
Remove hooks into beacon base/payments. Vanilla uses tags now for extensibility. ( #6948 )
2020-07-10 10:49:42 -07:00
e4ffbeb329
Expose the DataPackRegistries instance to the AddReloadListenerEvent ( #6933 )
2020-07-08 14:24:01 -07:00
2ad347b043
Fix the modifier combined name for keybinds displaying two pluses outside of forgedev #6901 ( #6902 )
2020-07-06 14:26:54 -07:00
91a2b02590
Reimplement ITeleporter Patches ( #6886 )
2020-07-06 13:45:22 -07:00
a567ddaa10
Add function to add items with the same behavior as the pumpkin for enderman ( #6890 )
2020-07-06 13:34:01 -07:00
68e71009f3
Custom Item integration with Piglins ( #6914 )
2020-07-06 13:30:17 -07:00
0227bfe9ee
Some dead code cleanup, and re-implement some bed hooks. ( #6903 )
2020-07-06 13:19:53 -07:00
df57e0a1ba
Fix missing null checks in ForgeIngameGui ( #6907 )
2020-07-06 13:06:31 -07:00
ff86201523
New AddReloadListenerEvent that gathers server side data reload handlers. ( #6849 )
2020-07-06 12:41:57 -07:00
8e5138da27
Attempt to use a more compatible method to initialize stencil support.
...
In case the separate attachments don't work for everyone, there's a new setting to choose the combined attachment.
2020-07-03 14:40:21 +02:00
a690a7526a
Fix multi-layer item rendering.
2020-07-03 05:54:46 +02:00
517bbc8b5b
Update copyright year to 2020.
2020-07-02 19:49:11 +02:00
ce3d8b40cf
Model system improvements:
...
- Port some things I did in 1.14 which I couldn't do in 1.15 due to breaking changes.
- Fix multi-layer block models not working (1.16 RenderType doesn't override toString the same way anymore)
- Implement multi-layer item rendering.
- Improve CompositeModel submodel data passing.
2020-07-02 19:16:40 +02:00
45152c6073
Pass matrixstack in tooltip render events ( #6885 )
2020-07-02 14:43:41 +02:00
a0b0e6788d
Fix improper handling of baked lighting in forge light pipeline
...
Closes #6812
2020-07-02 01:53:52 -04:00
bf1a0461cb
Add hoe tool type ( #6872 )
2020-06-30 13:17:57 -07:00
4aa53dbb00
Fix loading screen color and text ( #6824 )
2020-06-30 13:16:51 -07:00
d1016f752e
Add senderUUID to ClientChatReceivedEvent ( #6881 )
2020-06-30 12:57:23 -07:00
ab29145328
Re-write checkATs function and automate making Items/Blocks public.
2020-06-29 19:33:34 -07:00
99e7fad655
Reorganize modloading on the dediserver. This removes the DedicatedServer parameter from the FMLDedicatedServerSetupEvent.
...
Code for customizing the server instance should be moved to the ServerAboutToStartEvent or similar, where the server instance
is available.
This reorganization means that mods will load fully before the server is even constructed, or the server properties loaded. We also move the EULA right to the front so we don't have to wait for bootstrap.
This should fix the problems with mods which customize world data and other things.
Signed-off-by: cpw <cpw+github@weeksfamily.ca>
2020-06-29 22:09:37 -04:00
d5aa0c4a91
Fix datagen resolving tags and exploding. ( #6865 )
2020-06-29 16:39:04 -07:00
7858abe96d
Make Type classes safe to use in concurrent loading ( #6825 )
2020-06-29 13:29:32 -07:00
80d2730fec
Fix tag related issues when connecting to a vanilla server.
2020-06-29 12:42:32 -07:00
3b64ea6305
Fix Forge's internal handler being registered in wrong place.
...
Fix double call to loader end.
2020-06-28 15:08:03 -07:00
5f1a7326c7
Add a model loader that lets mods specify different models for different perspectives.
...
Allow custom models to reference vanilla item models as child models.
2020-06-28 00:32:50 +02:00
af9bb9641b
Fix swim speed being incorrect. Closes #6845
...
Fix BreakSpeedEvent having null position. Closes #6844
Add MatrixStack to BackgroundDrawnEvent. Closes #6843
Fix some patches that should of been ATs. Closes #6839
Add getter to ServerPlayer to access client's language calue if sent. Closes #6829
Some patch cleanup.
2020-06-26 16:55:04 -07:00
fc6b38d7f2
Fix blocks being harvested with incorrect tools.
2020-06-26 15:40:05 -07:00
97d4652f5f
Make installer use MCPConfig version to identify MC assets.
2020-06-26 12:52:50 -07:00
41a6d70aee
Tweak the server startup a bit, make sure methods that can't work because they run before a server exists explode saying so.
...
Also fix other launch profiles.
Signed-off-by: cpw <cpw+github@weeksfamily.ca>
2020-06-26 14:27:32 -04:00
99917e569c
Fix dedicated server loading by constructing mods before data packs are created.
2020-06-26 09:56:23 -07:00
438e3886cc
Include a getter for the matrix stack in OverlayEvent ( #6834 )
2020-06-26 15:55:33 +02:00
272ea75aab
Fixed tooltip rendering issues ( #6815 )
2020-06-26 14:24:58 +02:00
cbac95de0f
Fixed villager trades having non-applicable enchants
...
Also added an AT at lex's request
2020-06-25 22:30:44 -04:00
baf32612db
Rework BlockSnapshot and fix client notifications. Closes #6807
2020-06-25 18:41:38 -07:00
4700973dff
Update to 1.16.1 and fix a couple more patch problems
...
Signed-off-by: cpw <cpw+github@weeksfamily.ca>
2020-06-25 18:28:48 -04:00
648d53ffe1
Fix some patching derps from 1.15 merge
...
Signed-off-by: cpw <cpw+github@weeksfamily.ca>
2020-06-25 18:16:38 -04:00
ca2ed1ff7a
Final patching
...
Signed-off-by: cpw <cpw+github@weeksfamily.ca>
2020-06-25 17:55:54 -04:00
80eb12e59d
Compiling fixes - IN GAME!
2020-06-25 17:55:52 -04:00
631230b298
Patching and updates
2020-06-25 17:55:40 -04:00
6d15febdb3
Setup and import of 1.16 YEET
2020-06-25 17:55:38 -04:00
469527890f
Replace explicit shears reference in vanilla loot tables with tag for modded shears. ( #6765 )
2020-06-25 17:53:58 -04:00
20f78ac724
Modify how modfiles load slightly, for better decoupling.
...
Signed-off-by: cpw <cpw+github@weeksfamily.ca>
2020-06-25 17:51:27 -04:00
b117722d84
Throw an exception from DeferredRegister when trying to register entries after registry event has fired ( #6789 )
2020-06-25 17:51:27 -04:00
6345f2670c
Add system for dimensions to be marked for deletion ( #6515 )
2020-06-15 09:37:08 -07:00
9114bec81d
Fix dedicated server issue in some implementations of Block.getPickBlock. Closes #6566
2020-06-12 17:28:05 -07:00
cpw