Commit Graph

260 Commits

Author SHA1 Message Date
embeddedt
2120774df5
Update patch for 1.18 2024-02-04 20:21:53 -05:00
embeddedt
e9c0f6df3b
Merge remote-tracking branch 'origin/1.16' into 1.18 2024-02-04 20:20:45 -05:00
embeddedt
12d69bec45
Fix https://github.com/MinecraftForge/MinecraftForge/issues/9118 2024-02-04 20:05:05 -05:00
embeddedt
41596444a3
Merge remote-tracking branch 'origin/1.16' into 1.18 2024-01-27 20:18:49 -05:00
Fury_Phoenix
c749fc1aeb
Tidy up version detection (#352) 2024-01-25 15:19:37 -05:00
embeddedt
0a8a88047c
Merge 1.16 into 1.18 2024-01-13 11:16:03 -05:00
embeddedt
d7146a0667
Restrict resource pack cache to assets/ and data/ folders 2024-01-13 11:15:19 -05:00
embeddedt
5d6abe46f5 Merge 1.16 into 1.18 2024-01-12 15:49:00 -05:00
embeddedt
6fa3e64210 Lower priority of datapack reload exception mixins 2024-01-12 15:18:11 -05:00
embeddedt
1d67197df1
Merge 1.16 into 1.18 2024-01-04 20:31:04 -05:00
embeddedt
c678ebbb91
Avoid refresh loop if no model data needs refreshing 2024-01-04 20:30:13 -05:00
embeddedt
7174ae1454
Do not actually load all models in replaceAll, use clever trick instead
Otherwise, it takes 20 seconds to run this with just Mekanism+Additions+Pneumaticcraft
2024-01-02 12:17:53 -05:00
embeddedt
3214311bb6
Slightly optimize entity capability retrieval 2024-01-01 19:03:52 -05:00
embeddedt
3fa0c3923a
Merge remote-tracking branch 'origin/1.16' into 1.18 2023-12-30 19:02:42 -05:00
embeddedt
db5a3234d2
Update MixinExtras 2023-12-30 18:59:44 -05:00
embeddedt
f6c7b3109b
Merge remote-tracking branch 'origin/1.16' into 1.18 2023-12-28 14:25:15 -05:00
embeddedt
e301d7d480
Shadow annotations project so they are in the production jar 2023-12-28 14:08:32 -05:00
Fury_Phoenix
06bfd71d07
Generate mixin configs automatically using custom AP (#305) 2023-12-28 09:36:49 -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
ebf1d93422
Suppress mixin remap error 2023-12-26 20:51:26 -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
7547a9227c
Merge remote-tracking branch 'origin/1.16' into 1.18 2023-12-23 17:15:10 -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
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
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
8ce41242ed Update generic 2023-11-23 09:58:03 -05:00
embeddedt
488be0c748 Update RegistryObject package name 2023-11-23 09:56:11 -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
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
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
32ad8f6df1 Update RS integration for 1.18+ 2023-10-30 14:53:34 -04:00