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

2529 commits

Author SHA1 Message Date
mrp-v2
e421ea164c
Fix custom teleporters NPE (#7296) 2020-09-08 13:29:07 -07:00
Tschipp
bd5e107628
Add partialTicks to RenderNameplateEvent (#7277) 2020-09-08 13:24:02 -07:00
NoahBeech
a477671c03
Fixing logic in getCurrentRailPosition to correctly identify the rail… (#7276) 2020-09-08 13:23:18 -07:00
sciwhiz12
47f05a4fcd
Bump resource pack version to 6 (#7299) 2020-09-08 13:02:28 -07:00
sciwhiz12
47ba5b7a89
Remove dead ForgeHooks.canToolHarvestBlock function. (#7262) 2020-09-08 13:01:26 -07:00
ChampionAsh5357
05480843cd
Re-implement DrawHighlightEvent$HighlightEntity Firing (#7233) 2020-09-08 12:50:06 -07:00
ichttt
0e1ed8c936
Reimplement FarmlandWaterManager (#7213) 2020-09-08 12:25:48 -07:00
Cyborgmas
edf41bda19
Add dataprovider for Global Loot Modifiers (#6960) 2020-09-08 12:11:08 -07:00
ichttt
051416b823
Fix crash when dumping crash report for an exception that has a null cause (#7308) 2020-09-08 12:00:55 -07:00
cpw
84fe2cbcc4
Tweak crash report dump to visit all the causes up to the top. 
Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2020-09-06 21:29:21 -04:00
cpw
4ff0d246ce
Fix ExplodedDirectoryLocator visiting non-existent paths. Closes #7203 
Also, bump modlauncher to 7.0.1 to fix resources.

Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2020-09-06 19:38:58 -04:00
cpw
9051021474
Fix some potential issues in crash dumping during mod loading 
Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2020-09-06 18:07:53 -04:00
cpw
cc473be332
Park the polling thread for a bit, if we're not the one driving the task list forwards. This allows for the actual driver to work on low cpu count machines. 
Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2020-09-06 17:55:03 -04:00
cpw
b1f73a0760
Use new enumeration mechanism in ModLauncher, to allow getResources to work. This enables serviceloader-in-mods, and other stuff that might need to visit multiple mod jars. Also, tweaked the visitor code slightly, may result in a trivial performance change. Closing #7302 as it's not really relevant any more. 
Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2020-09-06 17:54:05 -04:00
cpw
de03eb6e3c
Fix compiler issue in eclipse properly 
Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2020-09-03 12:09:29 -04:00
sciwhiz12
bef8c2da3d
Fix crash caused by previous commit (#7298) 2020-09-03 08:40:40 -04:00
LexManos
3820d1b66f Dirty casting hacks to fix eclipse compiler inference issue. I'm sorry cpw. 2020-09-02 21:15:16 -07:00
tterrag
7dbae7ea4a Fix broken ExistingFileHelper import 
Add licenses to some new files
 2020-09-02 23:37:46 -04:00
tterrag
be5885155c
Add validation via resources for tag providers (#7271) 
BREAKING CHANGE: Moved ExistingFileHelper to common package
Remove various workarounds from forge tag providers
 2020-09-02 23:18:22 -04:00
cpw
5dac065994
Move the "modloading" thread activity onto _our_ worker pool. It turns out that the vanilla worker pool can deadlock during stitching if it's insufficiently large, if modloader "waitForTransition" is also a worker member of that pool. 
Closes #7293 (to reproduce issue easily, modify Util.func_240979_a_ and change the values in the MathHelper.clamp call). I've verified that 3 and below for "max" cause the problem. (I didn't test a whole range of values, just sufficient to reproduce problem and verify fix). Note that setting it to zero (and using the "direct executor" that's inaccessible in normal operation) works as well with this fix.

Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2020-09-01 14:36:02 -04:00
cpw
1d7db95539
Fix missed debugging code. Read the config from the config. 
Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2020-08-31 22:26:53 -04:00
cpw
de24783152
Fix up slight registry change and other 1.16.2 stuffs. 
Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2020-08-31 21:30:53 -04:00
cpw
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
cpw
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
cpw
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
cpw
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
ichttt
cf09f3eeb9
Add particle culling (#6981) 2020-08-30 16:05:16 -07:00
LexManos
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
David Quintana
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
sciwhiz12
625cd746ef
Add user-friendly exceptions when config loading fails (#7214) 2020-08-21 14:27:12 -07:00
Max Becker
fc000fe913
Replace EntityHeight event with EntitySize event (#6858) 2020-08-21 11:53:37 -07:00
Davide Albiero
e3db429763
[1.16] ForgeEventFactory#canCreateFluidSource reintroduced (#7181) 2020-08-21 11:37:43 -07:00
Cyborgmas
e803006360
Cleanup and expand Forge tags (#7004) 2020-08-21 11:30:21 -07:00
sciwhiz12
07ffc890e5
Fix modproperties property in mods.toml causing exception (#7192) 2020-08-21 11:25:40 -07:00
Philip T
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
mcenderdragon
aaa1deeef2
Fix ItemStack#isDamageable is not calling Item#isDamagable (#7221) 2020-08-21 11:06:38 -07:00
Take Weiland
50197b1fa5
Improve performance and cleanup code for DelegatingResourcePack (#7228) 2020-08-21 10:48:48 -07:00
Cyborgmas
797791c2af
Fix small logging issues with loading pack.png for mods (#7265) 2020-08-21 10:24:49 -07:00
Take Weiland
c2de232703
Fix config iteration order (#7230) 2020-08-21 10:23:20 -07:00
LexManos
9118c3dd24 Cleanup Forge's build script, fix some unneeded patches. 
Add checkExcscheckAll tasks.
 2020-08-21 02:47:04 -07:00
malte0811
5037adede9
Improve startup time by caching the manifest data for mod jars (#7256) 2020-08-20 21:29:02 -07:00
Yunus
a5aca97e31
Removed HarvestDropsEvent (#7193) 2020-08-18 22:47:38 -07:00
Cyborgmas
edca0c7293
Remove forge optional tags in favor of Vanilla's new system. (#7246) 2020-08-18 22:22:34 -07:00
LexManos
132cc3659d New method for creating modded tag references, fix connecting to vanilla servers. 2020-08-14 12:04:55 -07:00
LexManos
680c4062f4 Fix creating nether portals. 2020-08-14 12:04:17 -07:00
sean
e1efab0452
Print mod file name on InvalidModFileException (#7241) 2020-08-13 19:16:53 -07:00
LexManos
fe43088c96 Initial 1.16.2 Update 2020-08-13 00:35:08 -07:00
David Quintana
a3c4ffd2c1 Fix ModelRegistryEvent firing every time resources reload instead of just once. 2020-08-09 22:04:44 +02:00
David Quintana
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
sciwhiz12
54b4089afd
Add harvest levels for hoes and new 1.16 blocks for pickaxes Fixes #7187 (#7189) 2020-08-03 17:06:36 -07:00
sciwhiz12
493608e1b5
Fix debug world not generating modded blocks (#6926) 2020-08-03 17:00:31 -07:00
ChampionAsh5357
0984777c98
New IForgeBlock#getToolModifiedState hook allow better control over tools interacting with blocks. (#7176) 2020-08-03 16:49:26 -07:00
brandon3055
399bc6c9c3
Add support for custom elytra (#7202) 2020-08-03 15:55:10 -07:00
Take Weiland
20702456ac
Re-introduce "outdated" notification on Mods button in main menu (#7123) 2020-08-03 15:11:06 -07:00
tterrag
8f9e52c260 Implement forge IBakedModel methods in vanilla wrapper models 2020-07-29 23:10:40 -04:00
LexManos
e62805f1d7 Fix another case of swallowed errors not shutting down mods. 2020-07-28 16:44:29 -07:00
cpw
ff752ab14b
Revert "Properly shutdown FMLModContainer's event bus when an error in a lifecycle event is detected." 
This reverts commit 30bad1e2

Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2020-07-28 19:17:35 -04:00
cpw
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

Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2020-07-28 19:17:29 -04:00
LexManos
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
LexManos
30bad1e26d Properly shutdown FMLModContainer's event bus when an error in a lifecycle event is detected. 2020-07-28 12:01:15 -07:00
LexManos
5104824a1b Enable EventBus type check during ForgeDev, and add IModBusEvent marker to ModelRegistryEvent. 2020-07-28 10:24:52 -07:00
LexManos
4ffcdaa6da Make license toml entry optional during 1.16.1 
There are to many existing mods to make this required.
Yes, we are technically before a RB and can do breaking changes. However this is too large.
 2020-07-28 00:16:18 -07:00
cpw
95d2b6ae89
Missed one event. NewRegistry needs the marker. 
Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2020-07-27 21:13:53 -04:00
cpw
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
cpw
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
LexManos
7717795f42 Fix Biome generation error. 2020-07-27 15:56:04 -07:00
Tschipp
941b9a1d1f
Re-added PlayerEvent.NameFormat (#6992) 2020-07-27 14:16:35 -07:00
Xerousso
27798c5804
Fixed modded overworld biomes not spawning [1.16.x] (#6990) 2020-07-27 14:10:42 -07:00
Cyclonit
9d84b5df31
Added EntityLeaveWorldEvent (#6984) 2020-07-27 14:06:01 -07:00
Take Weiland
c9f9fd01b5
Re-add patch for PlayerSetSpawnEvent (#6977) 2020-07-27 13:41:35 -07:00
cpw
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
LexManos
7b43b9f8c0 Run Forge's data generators to sync 1.16 vanilla changes. 2020-07-21 17:34:23 -07:00
cpw
daa85d3c5b
Don't show the early launcher GUI when running data. It's not needed and prevents use on automated builds. 
Need to investigate why a bunch of tags seem to be being blown away by rerunning on forge.

Signed-off-by: cpw <cpw+github@weeksfamily.ca>
 2020-07-21 20:12:33 -04:00
Cyborgmas
24f3ef5ffe
Load Modded Datapacks in DatapackScreen, before world creation (#6913) 2020-07-20 15:56:21 -07:00
tterrag
a3edfd3748 Fix inconsistencies with model/blockstate datagen 2020-07-18 18:34:35 -04:00
Max Becker
96b9a057b7
Filter duplicate mod files from mod file scan data (#6855) 2020-07-17 10:35:38 -07:00
LexManos
638d1d31de Fixed Forge commands. Closes #6973 Closes #6974 Closes #6976 2020-07-16 14:08:13 -07:00
Jared
00013865b0
Added an event for registering commands. closes #6968 (#6969) 2020-07-15 12:30:41 -07:00
Tyler Hancock
6722e7a428
Make all functions in Style common. (#6931) 2020-07-13 17:15:32 -07:00
seymourimadeit
0f56b4c4ee
Mark Raid.WaveMembers as an extensible enum. (#6878) 2020-07-13 15:40:37 -07:00
LexManos
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
Richard Freimer
065ebde57e
Fix race condition with DeferredRegister for custom registries (#6951) 2020-07-10 14:08:22 -07:00
sciwhiz12
6b3f2f46fa
Remove hooks into beacon base/payments. Vanilla uses tags now for extensibility. (#6948) 2020-07-10 10:49:42 -07:00
Jared
e4ffbeb329
Expose the DataPackRegistries instance to the AddReloadListenerEvent (#6933) 2020-07-08 14:24:01 -07:00
Richard Freimer
2ad347b043
Fix the modifier combined name for keybinds displaying two pluses outside of forgedev #6901 (#6902) 2020-07-06 14:26:54 -07:00
Richard Freimer
91a2b02590
Reimplement ITeleporter Patches (#6886) 2020-07-06 13:45:22 -07:00
Mysterious_Dev
a567ddaa10
Add function to add items with the same behavior as the pumpkin for enderman (#6890) 2020-07-06 13:34:01 -07:00
Richard Freimer
68e71009f3
Custom Item integration with Piglins (#6914) 2020-07-06 13:30:17 -07:00
ichttt
0227bfe9ee
Some dead code cleanup, and re-implement some bed hooks. (#6903) 2020-07-06 13:19:53 -07:00
Take Weiland
df57e0a1ba
Fix missing null checks in ForgeIngameGui (#6907) 2020-07-06 13:06:31 -07:00
Cyborgmas
ff86201523
New AddReloadListenerEvent that gathers server side data reload handlers. (#6849) 2020-07-06 12:41:57 -07:00
David Quintana
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
David Quintana
a690a7526a Fix multi-layer item rendering. 2020-07-03 05:54:46 +02:00
David Quintana
517bbc8b5b Update copyright year to 2020. 2020-07-02 19:49:11 +02:00
David Quintana
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
Cyborgmas
45152c6073 Pass matrixstack in tooltip render events (#6885) 2020-07-02 14:43:41 +02:00
tterrag
a0b0e6788d Fix improper handling of baked lighting in forge light pipeline 
Closes #6812
 2020-07-02 01:53:52 -04:00
MelanX
bf1a0461cb
Add hoe tool type (#6872) 2020-06-30 13:17:57 -07:00
ichttt
4aa53dbb00
Fix loading screen color and text (#6824) 2020-06-30 13:16:51 -07:00
Take Weiland
d1016f752e
Add senderUUID to ClientChatReceivedEvent (#6881) 2020-06-30 12:57:23 -07:00