embeddedt
837a66befc
Merge remote-tracking branch 'origin/1.18' into 1.19.2
2023-12-27 19:07:33 -05:00
embeddedt
6f0d6e473f
Merge remote-tracking branch 'origin/1.16' into 1.18
2023-12-27 19:06:49 -05:00
embeddedt
a79ea9766a
Prevent mod mixins from applying if there is a Forge loading error
2023-12-27 18:42:39 -05:00
embeddedt
675c58a437
Only call put on the model map if the replacement model is different
2023-12-27 16:13:45 -05:00
embeddedt
d1863cc66e
Make replaceAll implementation more robust, add warning
2023-12-27 16:06:22 -05:00
embeddedt
11508fbe07
Track duration of model bake events when dynamic resources is enabled
2023-12-27 16:03:54 -05:00
embeddedt
aee0b2a47d
Add Mekanism to model bake event helper
2023-12-27 15:59:51 -05:00
embeddedt
d76fd84b76
Support replaceAll on the wrapping model registry
2023-12-27 15:56:52 -05:00
embeddedt
ecef37ac60
Make handlers not static
2023-12-27 15:26:58 -05:00
embeddedt
ae561db9e3
Update mixin for 1.19 model data changes
2023-12-26 20:52:23 -05:00
embeddedt
ebf1d93422
Suppress mixin remap error
2023-12-26 20:51:26 -05:00
embeddedt
b5ef37a713
Merge remote-tracking branch 'origin/1.18' into 1.19.2
2023-12-26 20:48:37 -05:00
embeddedt
85928b5b9c
Merge remote-tracking branch 'origin/1.16' into 1.18
2023-12-26 20:47:23 -05:00
embeddedt
12b0d352cd
Fix some concurrency issues in Forge's ModelDataManager
...
Model data is now refreshed in a 3x3 radius if retrieved on
the main thread, but not refreshed at all if retrieved on a
worker. This should emulate the old behavior well enough
for most (if not all) mods, while preventing weird CMEs
from accessing block entities off-thread
2023-12-26 20:44:59 -05:00
embeddedt
d8da6c08a0
Merge 1.18 into 1.19.2
2023-12-23 17:15:26 -05:00
embeddedt
7547a9227c
Merge remote-tracking branch 'origin/1.16' into 1.18
2023-12-23 17:15:10 -05:00
embeddedt
0111102d25
Remove obsolete mixin
2023-12-21 13:41:30 -05:00
embeddedt
1cfe0216ac
Remove CTM layer hacks entirely on 1.19+, code is unused
2023-12-21 13:31:23 -05:00
embeddedt
ba6103bbc7
Merge remote-tracking branch 'origin/1.18' into 1.19.2
2023-12-21 13:28:46 -05:00
embeddedt
1f16ce835a
Merge remote-tracking branch 'origin/1.16' into 1.18
2023-12-21 13:21:29 -05:00
embeddedt
7e2f3f3fb9
Rewrite CTM predicate handling again, fix more bugs
2023-12-21 13:16:25 -05:00
embeddedt
09939a551f
Merge remote-tracking branch 'origin/1.18' into 1.19.2
2023-12-18 22:11:14 -05:00
embeddedt
af13e30f95
Merge remote-tracking branch 'origin/1.16' into 1.18
2023-12-18 22:06:24 -05:00
embeddedt
9c00f7297d
Reset block predicate when model is loaded
...
Should help invalidate Embeddium's cache
2023-12-18 22:03:18 -05:00
embeddedt
aa53a7610b
Only wrap top-level CTM models if dynamic resources is on
2023-12-18 22:02:21 -05:00
embeddedt
5fa94bf5e4
Add Elevator Mod to dynamic resources iteration list
2023-12-18 21:39:18 -05:00
embeddedt
559bdb612c
Merge remote-tracking branch 'origin/1.18' into 1.19.2
2023-12-14 20:41:47 -05:00
embeddedt
5579743b6c
Merge remote-tracking branch 'origin/1.16' into 1.18
2023-12-14 20:39:20 -05:00
embeddedt
81836a838d
Implement caching on the blockstate and item to model maps
2023-12-14 20:10:54 -05:00
embeddedt
0056a57f30
Optimize RegistryDelegate#hashCode()
2023-12-13 14:44:25 -05:00
embeddedt
a76c7f2505
Prevent mixin error if Sophisticated Backpacks isn't installed
2023-12-11 11:01:23 -05:00
embeddedt
b351febc82
Patch CME in Sophisticatd Backpacks
2023-12-11 10:58:10 -05:00
embeddedt
ccfc282cfc
Remove hot allocations in ForgeRegistry#getDelegateOrThrow
2023-12-07 22:14:30 -05:00
embeddedt
8ce41242ed
Update generic
2023-11-23 09:58:03 -05:00
embeddedt
c7a60f5112
Update RegistryObject for 1.19.2 changes
2023-11-23 09:56:35 -05:00
embeddedt
9fb1464176
Merge remote-tracking branch 'origin/1.18' into 1.19.2
2023-11-23 09:56:22 -05:00
embeddedt
488be0c748
Update RegistryObject package name
2023-11-23 09:56:11 -05:00
embeddedt
0b9b49c360
Merge 1.18 into 1.19.2
2023-11-23 09:51:05 -05:00
embeddedt
0aea884052
Merge 1.16 into 1.18
2023-11-23 09:51:03 -05:00
embeddedt
a1f3300a8a
More ClientOnlyMixin
...
Related: #297
2023-11-23 09:50:47 -05:00
embeddedt
a531df53cb
Fix RegistryObject#get allocating on every call
...
Credit to jaskarth for discovering this problem
2023-11-19 19:49:08 -05:00
embeddedt
3e52c75d0f
Merge 1.18 into 1.19.2
2023-11-07 17:27:24 -05:00
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
375c978eb4
Merge remote-tracking branch 'origin/1.18' into 1.19.2
2023-08-31 11:30:51 -04:00
embeddedt
3beef4df08
Merge remote-tracking branch 'origin/1.16' into 1.18
2023-08-31 11:24:08 -04:00
embeddedt
dc42bda09d
Move shared build code out of rootProject build.gradle
2023-08-31 11:09:56 -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
