Commit Graph

331 Commits

Author SHA1 Message Date
embeddedt
552eea488d Merge 1.16 into 1.18 2023-11-07 17:27:22 -05:00
embeddedt
215b797e7b Fix replaceAll being broken on the model registry
Thanks Guava.
2023-11-07 17:26:01 -05:00
embeddedt
53b7d34649
Merge 1.18 into 1.19.2 2023-11-04 09:02:15 -04:00
embeddedt
2ecd0c654b
Merge 1.16 into 1.18 2023-11-04 09:02:14 -04:00
embeddedt
4de9022e3c
Warn if keySet is used by a mod when dynamic resources is on 2023-11-04 09:00:57 -04:00
embeddedt
819cb13d43 Merge 1.18 into 1.19.2 2023-10-30 14:53:53 -04:00
embeddedt
32ad8f6df1 Update RS integration for 1.18+ 2023-10-30 14:53:34 -04:00
embeddedt
0b5145f290
Merge 1.18 into 1.19.2 2023-10-28 20:06:01 -04:00
embeddedt
0a72abb519
Merge 1.16 into 1.18 2023-10-28 20:06:00 -04:00
embeddedt
5d984f653e
Don't log error if NO_GROUP field is missing
Fixes error message in log with Connector
2023-10-28 20:05:55 -04:00
embeddedt
54c7dbd16e Merge 1.18 into 1.19.2 2023-10-24 12:45:37 -04:00
embeddedt
c5a5b01bfb Merge 1.16 into 1.18 2023-10-24 12:45:35 -04:00
embeddedt
6740857274 Fix unsanitized input being passed to TinyFD 2023-10-24 12:45:13 -04:00
embeddedt
5fbbacbe11
Merge 1.18 into 1.19.2 2023-10-13 10:47:51 -04:00
embeddedt
4b8ec822fe
Merge 1.16 into 1.18 2023-10-13 10:47:50 -04:00
embeddedt
49c1bc71ba
Patch modded shape caches to be thread-safe
Related: #260
2023-10-13 10:47:44 -04:00
embeddedt
ea918a44c4 Merge 1.18 into 1.19.2 2023-10-07 17:48:36 -04:00
embeddedt
5c73ddeaf8 Port vehicle mixin to 1.18 2023-10-07 17:48:30 -04:00
embeddedt
1a358582a5 Merge 1.18 into 1.19.2 2023-10-07 17:46:23 -04:00
embeddedt
2d14bc3b1b Merge 1.16 into 1.18 2023-10-07 17:46:21 -04:00
embeddedt
6593b6a5cf Preserve rotation 2023-10-07 17:42:04 -04:00
embeddedt
204c8b78c4 Fix lag caused by Forge vehicle resync patch
This patch previously set the player to the entity's position,
which is not always correct for entities that position the player
at an offset (e.g. boats with two entities). Move the player using
positionRider() instead

Original PR: https://github.com/MinecraftForge/MinecraftForge/pull/5160
2023-10-07 17:27:23 -04:00
embeddedt
d7d75e88d5 Merge 1.18 into 1.19.2 2023-10-06 17:07:46 -04:00
embeddedt
6c7a5c70f5 Merge 1.16 into 1.18 2023-10-06 17:07:23 -04:00
embeddedt
d877ab46f0 Remove reference to Component in NightConfigFixer 2023-10-06 17:06:10 -04:00
embeddedt
c87dee4f3f Merge 1.18 into 1.19.2 2023-10-05 14:30:23 -04:00
embeddedt
fb720782b9 Merge 1.16 into 1.18 2023-10-05 14:30:21 -04:00
embeddedt
36673f275e Tweak dynamic resources injection point on Forge
Related: #252
2023-10-05 14:29:28 -04:00
embeddedt
c387e91f0d Merge 1.18 into 1.19.2 2023-10-05 14:12:33 -04:00
embeddedt
9c02b2c393 Update mixin for 1.18 2023-10-05 14:12:26 -04:00
embeddedt
9306743001 Update package for 1.18 2023-10-05 14:09:25 -04:00
embeddedt
a1f867c26d Merge remote-tracking branch 'origin/1.16' into 1.18 2023-10-05 14:09:04 -04:00
embeddedt
2710a02b2a Detect vanilla connection using custom logic 2023-10-05 14:08:44 -04:00
embeddedt
4090a91272 Merge 1.18 into 1.19.2 2023-10-05 13:37:48 -04:00
embeddedt
00144af296 Merge 1.16 into 1.18 2023-10-05 13:37:46 -04:00
embeddedt
96d01e5a1e Don't read modded recipe book settings on vanilla connection
Related: https://github.com/neoforged/NeoForge/issues/150
2023-10-05 13:37:31 -04:00
embeddedt
7b1d9ff8bb
Improve Async Locator backport for 1.16 2023-09-22 22:05:10 -04:00
embeddedt
17e3b40bf9 Merge 1.18 into 1.19.2 2023-09-20 17:58:52 -04:00
embeddedt
0aabad688b Merge 1.16 into 1.18 2023-09-20 17:58:50 -04:00
embeddedt
7ff300d8df Add Vampirism to mods requiring fallback model iterator
Related: #242
2023-09-20 17:58:25 -04:00
embeddedt
fcde6104eb
Possible NPE fixes for KubeJS 2023-08-30 19:39:41 -04:00
embeddedt
eac4ddac4c
Merge 1.18 into 1.19.2 2023-08-29 15:17:04 -04:00
embeddedt
987c5dc321
Change mixin priority 2023-08-29 15:16:54 -04:00
embeddedt
ec99687702
Fix Canary compat 2023-08-29 15:08:50 -04:00
embeddedt
11f1be0d2c Merge 1.18 into 1.19.2 2023-08-24 21:47:02 -04:00
embeddedt
4418dd2eab Fix misapplied Forge patch that no longer checks currently loading chunk 2023-08-24 21:46:23 -04:00
embeddedt
9390f7fca9
Merge 1.18 into 1.19.2 2023-08-18 15:16:53 -04:00
embeddedt
7490809a42
Merge 1.16 into 1.18 2023-08-18 15:16:52 -04:00
embeddedt
45f92f7fce
Disable config reload message for now
There isn't a good way to print this in a way that will catch the
modification in all scenarios, and that doesn't annoy the user
2023-08-18 15:16:20 -04:00
embeddedt
7552199f5e
Merge 1.18 into 1.19.2 2023-08-18 14:39:24 -04:00
embeddedt
73c80d0603
Merge 1.16 into 1.18 2023-08-18 14:39:24 -04:00
embeddedt
fa9103fb06
Convert milliseconds to nanoseconds correctly 2023-08-18 14:39:07 -04:00
embeddedt
da944c330b
Merge 1.18 into 1.19.2 2023-08-18 14:35:24 -04:00
embeddedt
6b1f5232fa
Merge 1.16 into 1.18 2023-08-18 14:35:23 -04:00
embeddedt
672ca92aab
Show time to bootstrap stage on Forge 2023-08-18 14:35:15 -04:00
embeddedt
a06fca791a
Fix Forge experimental world suppression not working on first reopen 2023-08-15 21:18:39 -04:00
embeddedt
5079ce65ba
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-08-13 16:36:02 -04:00
embeddedt
47a04c66f1
Fix chunk future chain not being bypassed during entity load
Backport of https://github.com/neoforged/NeoForge/pull/99
2023-08-13 16:34:23 -04:00
embeddedt
d9184833ec
Introduce MixinExtras 2023-08-13 15:53:20 -04:00
embeddedt
b776587f2d
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-08-12 12:02:43 -04:00
embeddedt
70a2a2194f
Merge remote-tracking branch 'origin/1.16' into 1.18 2023-08-12 11:54:31 -04:00
embeddedt
d1c9be8900
Clean up warnings 2023-08-12 11:41:04 -04:00
embeddedt
df8da0823a
Merge remote-tracking branch 'origin/1.16' into 1.18 2023-08-12 11:31:45 -04:00
embeddedt
21ee0dc1cf
Add warning for Connectedness and dynamic resources 2023-08-12 11:28:07 -04:00
embeddedt
0a18e9c1dc
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-08-11 19:45:31 -04:00
embeddedt
e949ed67ef
Merge 1.16 into 1.18 2023-08-11 19:44:22 -04:00
embeddedt
a51b1563b1
Try to make config reload message appear less often
Related: #210
2023-08-11 19:31:36 -04:00
embeddedt
6c465c7182
Update use of Component 2023-08-08 10:26:57 -04:00
embeddedt
46be9a801c
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-08-08 10:26:30 -04:00
embeddedt
b8d0e5fee2
Merge remote-tracking branch 'origin/1.16' into 1.18 2023-08-08 10:26:09 -04:00
embeddedt
e2aa482187
Try to provide more guidance to users when reloading configs 2023-08-08 10:24:48 -04:00
embeddedt
39e8e4a2ae
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-08-07 21:53:21 -04:00
embeddedt
8875710f3d
Use client commands on 1.18+ for /mfrc 2023-08-07 21:51:54 -04:00
embeddedt
41ca9fc251
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-08-05 12:07:53 -04:00
embeddedt
1a25984e88
Merge remote-tracking branch 'origin/1.16' into 1.18 2023-08-05 11:46:24 -04:00
embeddedt
c1277a2bf5
Make a copy of the top-level model list when collecting materials
This should prevent CMEs if material collection triggers a model
load
2023-08-05 11:42:44 -04:00
embeddedt
c3eb1369ac
Merge 1.18 into 1.19.2 2023-08-04 09:44:04 -04:00
embeddedt
9c380e52d1
Merge 1.16 into 1.18 2023-08-04 09:44:03 -04:00
embeddedt
e04b05dcc8
Don't return null for models we claim are in the faked model registry 2023-08-04 09:42:07 -04:00
embeddedt
f05d33969f
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-08-03 20:02:15 -04:00
embeddedt
f225e6cf75
Merge remote-tracking branch 'origin/1.16' into 1.18 2023-08-03 19:57:15 -04:00
embeddedt
14170ade1f
Implement /mfrc and /mfsrc commands to reload configs on client/server respectively 2023-08-03 19:45:37 -04:00
embeddedt
c8749940f7
Show log message after reloads are processed 2023-08-03 18:09:57 -04:00
embeddedt
dbff17a1ff
Better fix for config corruption
Defer posting of all config reload events to the main thread, and
don't process any until after the launch finishes. This should
hopefully fix some synchronization issues
2023-08-03 18:08:46 -04:00
embeddedt
1989f122c6
Remove locking system for Night Config files
This can cause deadlocks if mods themselves are also using their
own internal locks (Sophisticated Backpacks does this on 1.16 by
using a CHM)

This system will be replaced by a command/keybind to manually reload
configs
2023-08-03 17:54:30 -04:00
embeddedt
4972081d8a
Forcefully inject access transformers from mods even if a load error occurs
Related: https://github.com/neoforged/NeoForge/issues/43
2023-08-03 17:04:41 -04:00
embeddedt
c5f73c5e26
Merge 1.18 into 1.19.2 2023-08-03 17:01:12 -04:00
embeddedt
eac9edb13a
Fix Forge overriding ResourceKey.equals() with a slower implementation 2023-08-03 16:29:13 -04:00
embeddedt
89c7e58101
Merge 1.18 into 1.19.2 2023-08-03 11:27:52 -04:00
embeddedt
6d53262a9f
Merge 1.16 into 1.18 2023-08-03 11:27:51 -04:00
embeddedt
24792b96cc
Move ModernFix branding to right side of screen 2023-08-03 11:27:32 -04:00
embeddedt
d77946a5ab
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-08-02 16:23:22 -04:00
embeddedt
0d190a4c80
Merge remote-tracking branch 'origin/1.16' into 1.18 2023-08-02 16:17:45 -04:00
embeddedt
201db412a4
Rewrite tracking code for game load/world join timing 2023-08-02 16:08:36 -04:00
embeddedt
1d1e7b640a
Call Item.fillItemCategory() on all items when removing creative search trees
This fixes obscure issues caused by mods that accidentally rely on that
method to initialize other classes

Resolves https://github.com/Shadows-of-Fire/GatewaysToEternity/issues/29
2023-08-02 09:33:05 -04:00
embeddedt
49f9644714
Merge 1.18 into 1.19.2 2023-07-31 15:34:02 -04:00
embeddedt
2bc5b39895
Merge remote-tracking branch 'origin/1.16' into 1.18 2023-07-31 13:14:25 -04:00
embeddedt
3e4f1ab23a
Improve registry performance with large entry counts 2023-07-31 13:13:39 -04:00
embeddedt
472531d1b6
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-07-31 11:17:33 -04:00
embeddedt
4fe235cdbd
Workaround for mods instantiating PathResourcePack incorrectly 2023-07-31 11:14:38 -04:00