Commit Graph

630 Commits

Author SHA1 Message Date
embeddedt
e3a41d7416
Merge 1.18 into 1.19.2 2024-02-02 20:38:30 -05:00
embeddedt
8b0080256c
Merge 1.16 into 1.18 2024-02-02 20:38:30 -05:00
embeddedt
f12d7723c0
Call onDynamicResourcesStatusChange if dynamic resources is enabled 2024-02-02 20:38:25 -05:00
embeddedt
1f7db94281 Merge 1.18 into 1.19.2 2024-01-12 15:49:02 -05:00
embeddedt
5d6abe46f5 Merge 1.16 into 1.18 2024-01-12 15:49:00 -05:00
embeddedt
03e7df5308 Make dynamic maps return empty immutable collections instead of throwing 2024-01-12 15:28:34 -05:00
embeddedt
ac4ebd871c
Merge 1.18 into 1.19.2 2024-01-04 20:31:05 -05:00
embeddedt
1d67197df1
Merge 1.16 into 1.18 2024-01-04 20:31:04 -05:00
embeddedt
d0fd498682
Suppress mixin forceload logging when clear_mixin_info is on 2024-01-01 12:25:16 -05:00
embeddedt
35c82b81c8
Mark WorldSelectionList mixin as client-only 2023-12-28 14:33:39 -05:00
embeddedt
5772661dfb
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-12-28 14:26:26 -05:00
embeddedt
f6c7b3109b
Merge remote-tracking branch 'origin/1.16' into 1.18 2023-12-28 14:25:15 -05:00
embeddedt
4512bc6fbd
Generate config options from both 'mixins' and 'client' keys 2023-12-28 12:31:29 -05:00
Fury_Phoenix
7e53a8bc73
Eliminate extraneous casts (#327) 2023-12-28 09:38:54 -05:00
Fury_Phoenix
06bfd71d07
Generate mixin configs automatically using custom AP (#305) 2023-12-28 09:36:49 -05:00
embeddedt
ae8cfbaa3d
Disable dynamic DFU when Litematica is installed 2023-12-27 19:12:11 -05:00
embeddedt
d90a56ff40
Merge 1.18 into 1.19.2 2023-12-27 15:20:16 -05:00
embeddedt
bcd2e80821
Merge 1.16 into 1.18 2023-12-27 15:20:15 -05:00
embeddedt
152cdc4469
Disable ModelDataManager fixes if Rubidium is installed
Since legacy Rubidium versions only retrieve model data on a worker
thread, the data will probably never be refreshed, causing rendering
issues.
2023-12-27 15:19:13 -05:00
embeddedt
0abffa26ee
Merge 1.18 into 1.19.2 2023-12-23 21:28:41 -05:00
embeddedt
7e57ad8279
Merge 1.16 into 1.18 2023-12-23 21:28:02 -05:00
embeddedt
97ba361867
Retrieve quads on incorrect cullface lists if direction matches 2023-12-23 21:27:39 -05:00
embeddedt
9034688502
Merge 1.18 into 1.19.2 2023-12-23 19:05:37 -05:00
embeddedt
cef8abe247
Merge 1.16 into 1.18 2023-12-23 19:05:37 -05:00
embeddedt
60b372870b
Fix nixie tubes being invisible with faster_item_rendering 2023-12-23 19:05:16 -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
8058d4caa9
Remove dynamic item overrides
This system conflicts with other optimization mods (e.g. Noxesium)
and is annoying to maintain. Please stop using item overrides and
use real items/mods instead
2023-12-23 17:12:50 -05:00
embeddedt
7efe10a8a9
Merge 1.18 into 1.19.2 2023-12-23 15:57:40 -05:00
embeddedt
94fbefd901
Update mixin 2023-12-23 15:57:12 -05:00
embeddedt
8bcd85d079
Merge 1.18 into 1.19.2 2023-12-23 15:54:20 -05:00
embeddedt
ee8093fc50
Merge 1.16 into 1.18 2023-12-23 15:54:19 -05:00
embeddedt
a7c2424b14
Handle missing models in item overrides 2023-12-23 15:53:40 -05:00
embeddedt
5ff2951b5a
Work around Flywheel leaving freed buffers in BufferBuilder 2023-12-23 14:12:16 -05:00
embeddedt
f59aa5b19c
Merge 1.18 into 1.19.2 2023-12-21 16:51:10 -05:00
embeddedt
00fa8227c3
Merge 1.16 into 1.18 2023-12-21 16:50:40 -05:00
embeddedt
bc2e84bacc
Cache item override model instance 2023-12-21 16:50:08 -05:00
embeddedt
5e8a111fed
Merge 1.18 into 1.19.2 2023-12-14 21:11:57 -05:00
embeddedt
fe65ffa4d1
Merge 1.16 into 1.18 2023-12-14 21:11:56 -05:00
embeddedt
240fa4b510
Implement dynamic model cache on vanilla ItemModelShaper 2023-12-14 21:11:10 -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
bf43ba7bf4 Merge 1.18 into 1.19.2 2023-11-23 10:12:18 -05:00
embeddedt
c0f162716b Merge 1.16 into 1.18 2023-11-23 10:12:17 -05:00
embeddedt
2946b3a7b5 Handle path arrays with empty components correctly
Related: #304
2023-11-23 10:11:45 -05:00
embeddedt
61ce2e7117 Mark buffer builder fix as client only 2023-11-23 09:58:20 -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
8bc92e051e
Merge 1.18 into 1.19.2 2023-11-11 17:26:26 -05:00
embeddedt
adc3dbaf57
Merge 1.16 into 1.18 2023-11-11 17:26:25 -05:00
embeddedt
7c0f8b8bef
Stop logging for suspicious async chunkloads if they complete quickly enough 2023-11-11 17:26:21 -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
8bb70222ce
Merge 1.18 into 1.19.2 2023-11-05 21:59:08 -05:00
embeddedt
2f3df11220
Merge 1.16 into 1.18 2023-11-05 21:59:07 -05:00
embeddedt
134dc0ef20
Fix path replacements being too aggressive 2023-11-05 21:58:42 -05:00
embeddedt
58f79e25e9
Update Diagonal Fences mixin on 1.19 2023-10-30 09:41:48 -04:00
embeddedt
6b01f0450b
Merge 1.16 into 1.18 2023-10-29 21:15:43 -04:00
embeddedt
6a8d63a2cd
Merge 1.18 into 1.19.2 2023-10-29 21:15:43 -04:00
embeddedt
ced7f866d8
Revert "Use copy-on-write map for permanent overrides"
This solution is also not good enough. It causes catastrophic
time complexity with mods that call get and put in rapid
succession (i.e. every Forge mod using ModelBakeEvent)
2023-10-29 21:14:51 -04:00
embeddedt
d4f09f6ff9
Merge 1.18 into 1.19.2 2023-10-29 11:36:16 -04:00
embeddedt
fccbae33db
Merge 1.16 into 1.18 2023-10-29 11:36:15 -04:00
embeddedt
621ecf6b3e
Use copy-on-write map for permanent overrides 2023-10-29 11:35:46 -04:00
embeddedt
b9d81f44e6
Merge 1.18 into 1.19.2 2023-10-28 09:54:24 -04:00
embeddedt
93fbbfe2d1
Force UnsafeBufferHelper to be classloaded at startup 2023-10-28 09:50:25 -04:00
Moulberry
e36ba04921
Avoid mods causing double free when BufferBuilder leak fix is enabled 2023-10-28 09:44:12 -04:00
embeddedt
b7b510f807 Merge 1.18 into 1.19.2 2023-10-25 17:18:43 -04:00
embeddedt
4054bd8a23 Merge 1.16 into 1.18 2023-10-25 17:18:42 -04:00
embeddedt
89dab59980 Revert "Change permanentOverrides to ConcurrentHashMap"
This reverts commit a5b5733965.

We require the ability to store null values in the map for now
2023-10-25 17:17:52 -04:00
embeddedt
f4ce7072a6 Enable dynamic sounds now that Guava issue is worked around 2023-10-25 15:03:16 -04:00
embeddedt
b10e9de54c Merge 1.18 into 1.19.2 2023-10-25 14:58:33 -04:00
embeddedt
14abfef522 Merge 1.16 into 1.18 2023-10-25 14:58:01 -04:00
embeddedt
77760d7dd2 Remember previous scroll position on config screen 2023-10-25 14:56:37 -04:00
embeddedt
f391e97a62 Handle Knot behaving differently from FML with getResource 2023-10-25 14:34:45 -04:00
embeddedt
fd68efec0c Remove async_jei option from 1.18 listing 2023-10-25 14:30:10 -04:00
embeddedt
04a72f4d90 Merge 1.18 into 1.19.2 2023-10-25 14:24:16 -04:00
embeddedt
8b37a1dbfc Disable buffer builder fix when isometric-renders is installed
Related: #273
2023-10-25 14:23:27 -04:00
embeddedt
b943dc1449 Fix deobfuscation check not working on Forge 1.18+ 2023-10-25 14:22:20 -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
Phoenix-Starlight
9f040b2c43
Dynamic sounds code cleanup (#264) 2023-10-14 22:17:00 -04:00
embeddedt
a5b5733965
Change permanentOverrides to ConcurrentHashMap
Should help address thread contention noted while profiling
2023-10-14 13:24:26 -04:00
embeddedt
b567658318
Disable async_jei by default, to match newer versions
There have been a couple isolated reports of weird JEI behavior,
and this might be why
2023-10-14 13:20:26 -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
Phoenix-Starlight
e7277b89d5
Fix dynamic_sounds breaking on 1.16 (#259)
An issue in Guava (https://github.com/google/guava/issues/3081) causes the removal listener to fire even when entries haven't actually been removed. We filter them to get around this.
2023-10-12 22:19:46 -04:00
embeddedt
cebe1c308a
Merge 1.18 into 1.19.2 2023-10-10 17:40:29 -04:00
embeddedt
39fa555209
Merge 1.16 into 1.18 2023-10-10 17:40:29 -04:00
embeddedt
538d332310
Disable dynamic sounds by default until it can be tested more 2023-10-10 17:39:54 -04:00
embeddedt
40b04cbded
Fix cache_upgraded_structures leaking open input streams 2023-10-09 08:36:35 -04:00
embeddedt
b1e91686da Merge 1.18 into 1.19.2 2023-10-07 18:47:09 -04:00
embeddedt
5007c5e286 Merge 1.16 into 1.18 2023-10-07 18:47:08 -04:00
embeddedt
bf6979e45b Cleanup dynamic sounds patch, bump eviction time to 5 minutes 2023-10-07 18:44:33 -04:00
Phoenix-Starlight
803aaba204
Dynamic sound unloading (#234) 2023-10-07 18:41:52 -04:00
embeddedt
cedcd94417 Merge 1.18 into 1.19.2 2023-10-03 13:45:36 -04:00
embeddedt
43ca13cdf2 Attempt to free leaked BufferBuilders 2023-10-03 13:45:18 -04:00
embeddedt
c5fee81b8a
Merge 1.18 into 1.19.2 2023-09-24 11:55:26 -04:00