Commit Graph

2805 Commits

Author SHA1 Message Date
embeddedt
e9cc6caad5
Merge remote-tracking branch 'origin/1.20' into 1.21.1 2025-07-13 19:21:20 -04:00
embeddedt
54e55e7534
Don't specify ordering for JEI dependency 2025-07-13 19:15:21 -04:00
embeddedt
6a7b18cc6b
Compare prototype maps using value equality 2025-07-13 18:27:00 -04:00
embeddedt
3fd3fce262
Make deduplicator's hash function also use identity for hashing 2025-07-13 17:01:33 -04:00
embeddedt
d47e412011
Merge remote-tracking branch 'origin/1.20' into 1.21.1 2025-07-13 14:46:26 -04:00
embeddedt
65ab37b819
Fix reobfuscation issue 2025-07-13 14:31:58 -04:00
embeddedt
873e3bd676
Fix race condition when mods create tags on different threads 2025-07-12 22:22:58 -04:00
embeddedt
6b37051980
Fix faster_ingredients bypassing defensive copy of ItemValue
Kudos to @nutant233 for noticing this
2025-07-04 18:42:39 -04:00
embeddedt
39a43398ba
Deduplicate ingredient values in other constructor 2025-07-03 21:44:34 -04:00
embeddedt
96092c7189
Merge 1.20 into 1.21.1 2025-07-03 08:08:19 -04:00
embeddedt
cf5c81f7e2
Hotfix: disable ingredient_item_deduplication by default 2025-07-03 08:08:03 -04:00
embeddedt
1501fe29e6
Deduplicate ingredient item values using reference equality of components
This is necessary to work around Neo's changes to Holder.Reference
equality

Related: #577
2025-07-02 18:16:21 -04:00
embeddedt
2f25bb4bae
Merge remote-tracking branch 'origin/1.20' into 1.21.1 2025-07-01 20:53:16 -04:00
embeddedt
9d280f51df
Remove tterrag maven 2025-07-01 20:48:02 -04:00
embeddedt
528d9c80c8
Depend on CTM from CF rather than tterrag maven 2025-07-01 20:44:39 -04:00
embeddedt
5ea3880e80
Merge remote-tracking branch 'origin/1.20' into 1.21.1 2025-07-01 20:36:43 -04:00
embeddedt
f26ed86973
Disable smart ingredient sync with CraftTweaker installed
Related: #570
2025-06-16 19:49:46 -04:00
embeddedt
38f1370d59
Do not register smart ingredient sync channel if option is off
Related: #570
2025-06-16 19:21:25 -04:00
embeddedt
387c94296b
Merge remote-tracking branch 'origin/1.20' into 1.21.1 2025-06-05 22:07:36 -04:00
embeddedt
213e0ceb9a
Fix incorrect kick logic 2025-06-05 22:07:09 -04:00
embeddedt
2811af7112
Inject DFU blast setup hook 2025-06-05 22:06:53 -04:00
embeddedt
470d30cdb5
Merge remote-tracking branch 'origin/1.20' into 1.21.1 2025-06-05 21:36:12 -04:00
embeddedt
f59d4adf92
Defer construction of recipe book search tree 2025-06-05 21:36:00 -04:00
embeddedt
7688fc2b16
Implement Java 17-compatible DFU cache blaster 2025-06-05 21:35:21 -04:00
embeddedt
d23b38f1be
Merge remote-tracking branch 'origin/1.20' into 1.21.1 2025-06-05 19:06:16 -04:00
embeddedt
20b3d8bffa
Do not apply optimization to subclasses of ItemValue 2025-06-05 18:08:19 -04:00
embeddedt
fbf4a533c2
Merge remote-tracking branch 'origin/1.20' into 1.21.1 2025-06-04 22:55:55 -04:00
embeddedt
2e0ec6ae9e
Add ingredient item value ItemStack deduplication
Inspired by AllTheLeaks, but done slightly differently to hopefully
be compatible with more mods
2025-06-04 22:53:28 -04:00
embeddedt
ae7df998bf
Merge remote-tracking branch 'origin/1.20' into 1.21.1 2025-06-02 19:18:13 -04:00
embeddedt
a170f072ff
Invalidate memoization for non-category creative tabs when categories are rebuilt 2025-06-02 19:15:20 -04:00
embeddedt
e7542afd1c
Disable mixin.perf.faster_ingredients with VMP installed
Related: #565
2025-06-01 15:24:29 -04:00
embeddedt
71b444288b
Remove nbt_memory_usage
This will be replaced by more targeted optimizations towards the
most common allocators of duplicate keys. The current implementation
forces every key to be interned which may be redundant in many cases
(e.g. when constants are given to the compound tag)
2025-05-30 22:20:51 -04:00
embeddedt
94271b866b
Add world join profiling 2025-05-30 21:35:52 -04:00
embeddedt
6e591f5ace
Add more sysprops 2025-05-30 21:23:51 -04:00
embeddedt
4802988bbb
Add sysprop to allow using async profiler for launch profiling 2025-05-30 21:18:22 -04:00
embeddedt
619e15e62d
Handle mods inserting null entries into LRUMap 2025-05-28 17:13:37 -04:00
embeddedt
dbdb7c37a6
Merge remote-tracking branch 'origin/1.20' into 1.21.1 2025-05-19 16:00:38 -04:00
embeddedt
292b80cf37
Fix missing bitmask when compressing smaller datums into long 2025-05-19 15:19:46 -04:00
embeddedt
aa31256655
Merge remote-tracking branch 'origin/1.20' into 1.21.1 2025-05-19 14:58:23 -04:00
embeddedt
5048e74c79
Do not bypass Ingredient.TagValue#getItems during server resource reload
This breaks KubeJS/CraftTweaker's workarounds for tags not being
available during RecipeManager#apply (even though they become available
right after)

Related: #555
2025-05-19 14:55:50 -04:00
embeddedt
7dcaa6b641
Merge remote-tracking branch 'origin/1.20' into 1.21.1 2025-05-19 12:49:01 -04:00
embeddedt
c3086e5249
Remove defensive copy of model location collection in replaceAll
The defensive copy shouldn't be necessary, as the set is effectively
immutable anyways
2025-05-19 12:37:32 -04:00
embeddedt
bb658319cb
Try to use a more optimal Set implementation for filtering 2025-05-19 12:17:50 -04:00
embeddedt
14f1552ad7
Use Guava immutable list to avoid extra internal copying 2025-05-19 11:59:44 -04:00
embeddedt
61c8cfdca6
Slight tweaks to ModelLocationBuilder 2025-05-19 11:30:13 -04:00
embeddedt
af526b9113
Include ModernFix itself in time calculations for dynamic resources 2025-05-19 11:02:07 -04:00
embeddedt
6df33005a7
Fix copy-and-paste mistake in compact unihex logic 2025-05-19 10:24:13 -04:00
embeddedt
e9cb602ab7
Add some universe filters 2025-05-18 22:42:56 -04:00
embeddedt
a13587e139
Fix presizing of model location set & use more efficient string generation logic 2025-05-18 21:55:51 -04:00
embeddedt
6979b56d8c
Merge branch 'unihex' into 1.20 2025-05-18 21:06:09 -04:00