Commit Graph

563 Commits

Author SHA1 Message Date
embeddedt
0ea384f3e6
Merge remote-tracking branch 'origin/1.19.2' into 1.20 2023-12-27 19:08:21 -05:00
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
6578040e77
Merge remote-tracking branch 'origin/1.19.2' into 1.20 2023-12-27 15:27:03 -05:00
embeddedt
ecef37ac60
Make handlers not static 2023-12-27 15:26:58 -05:00
embeddedt
456bca47b6
Merge 1.20 into 1.20.4 2023-12-27 15:20:17 -05:00
embeddedt
2406c1a338
Merge remote-tracking branch 'origin/1.19.2' into 1.20 2023-12-26 20:53:09 -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
95496fc27c
Merge 1.19.2 into 1.20 2023-12-23 17:15:32 -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
fa9d39bd31
Merge 1.20 into 1.20.4 2023-12-21 13:41:56 -05:00
embeddedt
ed74748994
Merge 1.19.2 into 1.20 2023-12-21 13:41:55 -05:00
embeddedt
0111102d25
Remove obsolete mixin 2023-12-21 13:41:30 -05:00
embeddedt
c5afe3c769
Merge remote-tracking branch 'origin/1.19.2' into 1.20 2023-12-21 13:32:19 -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
ba2b740075
Merge remote-tracking branch 'origin/1.20' into 1.20.4 2023-12-14 20:46:02 -05:00
embeddedt
8677532629
Merge remote-tracking branch 'origin/1.19.2' into 1.20 2023-12-14 20:44:44 -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
0ea5139315
Merge remote-tracking branch 'origin/1.20.2' into 1.20.4 2023-12-11 10:16:48 -05:00
embeddedt
8d5e66218e
Merge 1.20 into 1.20.2 2023-12-11 09:56:49 -05:00
embeddedt
9464f07a5a
Replace hacky capturing with MixinExtras 2023-12-09 14:32:52 -05:00
embeddedt
28ac5eaec4
Merge remote-tracking branch 'origin/1.19.2' into 1.20 2023-12-09 14:08:31 -05:00
embeddedt
2ec1000ae8
Merge remote-tracking branch 'origin/1.20' into 1.20.2 2023-12-09 13:51:22 -05:00
embeddedt
11f313f6e7
Avoid capturedLocation being replaced unexpectedly 2023-12-09 13:50:04 -05:00
embeddedt
ccfc282cfc
Remove hot allocations in ForgeRegistry#getDelegateOrThrow 2023-12-07 22:14:30 -05:00
embeddedt
fcf21283d8
Switch build target to NeoForge 2023-12-03 19:44:05 -05:00
embeddedt
bfdd1f913d
Merge 1.20 into 1.20.2 2023-12-03 19:28:56 -05:00
embeddedt
cb09af7e86 Mark registry redirect as non-required
Related: #309
2023-11-30 15:45:27 -05:00
embeddedt
29d1f88539
Merge 1.20 into 1.20.2 2023-11-27 07:43:52 -05:00
embeddedt
2e9166c7df
Rewrite missing model emulation functionality for 1.20+ dynres implementation
Fixes #308
2023-11-27 07:38:53 -05:00
embeddedt
7be382a3ce More ClientOnlyMixin 2023-11-23 10:16:01 -05:00
embeddedt
acb6809459 Merge 1.20 into 1.20.2 2023-11-23 10:12:20 -05:00
embeddedt
7c57ffd2c6 Merge 1.19.2 into 1.20 2023-11-23 10:12:19 -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
13ee6b3523 Merge 1.20 into 1.20.2 2023-11-23 09:51:14 -05:00
embeddedt
1002baa6b1 Merge 1.19.2 into 1.20 2023-11-23 09:51:13 -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
33609d234c Completely remove BitSet trimming 2023-11-21 12:27:02 -05:00
TonimatasDEV
6e3134161a
Forge 1.20.2 (#301) 2023-11-21 12:17:11 -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
193b0922cc Remove blockstate lambda fallback on Forge
The conversion of MRL->state->MRL is very costly and slows down
model bake events by a lot. Since Fabric Model Loading API is
now standard, there is no need to pass models through the lambda
anymore
2023-11-10 15:42:37 -05:00
embeddedt
abfaea19a5 Merge 1.19.2 into 1.20 2023-11-07 17:27:26 -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
d11e9ac190
Mark Embers as requiring namespaced model registry
Related: #284
2023-11-05 21:00:25 -05:00
embeddedt
3551ab645a
Fix compile errors 2023-11-04 10:26:58 -04:00
embeddedt
cc60cba1f2
Refactor Forge dynamic resources implementation to be similar to Fabric 2023-11-04 10:21:38 -04:00
embeddedt
fb84fda4de
Merge 1.19.2 into 1.20 2023-11-04 09:02:16 -04: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
482c0ca503 Allow dimensions to be removed
Fixes https://github.com/neoforged/NeoForge/issues/102
2023-10-31 09:50:01 -04:00
embeddedt
b6a47da3b0 Merge 1.19.2 into 1.20 2023-10-30 14:54:19 -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
72a653e532
Merge branch 'experiment/loading-screen' into 1.20 2023-10-29 21:04:35 -04:00
embeddedt
81baeea35b
Support earlyy baking models on Forge as well
Fixes FFAPI model provider hooks not running
2023-10-28 20:12:46 -04:00
embeddedt
f4f3eff242
Merge 1.19.2 into 1.20 2023-10-28 20:06:02 -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
7cb660f955
Fix FFAPI Model Loading API v1 causing missing item models 2023-10-28 20:00:48 -04:00
Fury_Phoenix
c0cdbd122e
Unify ModelMangerMixin (#265) 2023-10-25 14:26:01 -04:00
embeddedt
fd61abb375 Drop TinyFD patch on 1.20+ 2023-10-24 12:45:56 -04:00
embeddedt
735a626cf3 Merge 1.19.2 into 1.20 2023-10-24 12:45:39 -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
7cbea84706
Merge 1.19.2 into 1.20 2023-10-13 10:47:52 -04:00
embeddedt
5fbbacbe11
Merge 1.18 into 1.19.2 2023-10-13 10:47:51 -04:00