embeddedt
c1182944f3
Redirect fetchChoiceType directly in vanilla code instead of fully disabling it
...
Should address #204
2023-08-08 18:17:01 -04:00
embeddedt
795aca19e0
Don't enable blast_search_trees with REI present on 1.16
2023-08-05 19:42:34 -04:00
embeddedt
1931101545
Merge 1.18 into 1.19.2
2023-08-05 12:52:04 -04:00
embeddedt
ae3eab8320
Merge 1.16 into 1.18
2023-08-05 12:52:03 -04:00
embeddedt
abb8cbd23f
Make sure missing model never becomes null
2023-08-05 12:26:18 -04:00
embeddedt
605058522e
Merge remote-tracking branch 'origin/1.18' into 1.19.2
2023-08-05 12:11:30 -04:00
embeddedt
431231c4ee
Merge remote-tracking branch 'origin/1.16' into 1.18
2023-08-05 12:10:53 -04:00
embeddedt
371e5119f1
Never return a non-null model if it was top level in vanilla
2023-08-05 12:07:21 -04:00
embeddedt
f05d33969f
Merge remote-tracking branch 'origin/1.18' into 1.19.2
2023-08-03 20:02:15 -04:00
embeddedt
4972081d8a
Forcefully inject access transformers from mods even if a load error occurs
...
Related: https://github.com/neoforged/NeoForge/issues/43
2023-08-03 17:04:41 -04:00
embeddedt
c5f73c5e26
Merge 1.18 into 1.19.2
2023-08-03 17:01:12 -04:00
embeddedt
022367c8d6
Merge 1.16 into 1.18
2023-08-03 17:01:11 -04:00
embeddedt
5853f9b034
Fix NPE on Forge error screen
2023-08-03 17:00:30 -04:00
embeddedt
f469d591b8
Remove item quirk entirely on 1.19+
2023-08-03 13:13:09 -04:00
embeddedt
72e3a115d6
Move item filling quirk to correct vanilla location on 1.19+
2023-08-03 13:08:18 -04:00
embeddedt
200cf00fe4
Merge 1.18 into 1.19.2
2023-08-02 22:08:41 -04:00
embeddedt
12c2214432
Merge 1.16 into 1.18
2023-08-02 22:08:15 -04:00
embeddedt
df9d2fbe2f
Remove default impl from ModernFixPlatformHooks
2023-08-02 22:08:01 -04:00
embeddedt
88e0016e31
Merge remote-tracking branch 'origin/1.18' into 1.19.2
2023-08-02 19:35:34 -04:00
embeddedt
54dda96849
Merge remote-tracking branch 'origin/1.16' into 1.18
2023-08-02 19:21:23 -04:00
embeddedt
82218ce18f
Fix world load time being printed if it wasn't actually set
2023-08-02 17:16:42 -04:00
embeddedt
f4ab932924
Fix incorrect return value from deduplicated postprocessing map
2023-08-02 16:30:18 -04:00
embeddedt
d77946a5ab
Merge remote-tracking branch 'origin/1.18' into 1.19.2
2023-08-02 16:23:22 -04:00
embeddedt
0d190a4c80
Merge remote-tracking branch 'origin/1.16' into 1.18
2023-08-02 16:17:45 -04:00
embeddedt
201db412a4
Rewrite tracking code for game load/world join timing
2023-08-02 16:08:36 -04:00
embeddedt
ad19e11213
Merge 1.18 into 1.19.2
2023-08-02 15:45:55 -04:00
embeddedt
2ff09ef382
Merge 1.16 into 1.18
2023-08-02 15:45:54 -04:00
embeddedt
2c1e036857
Bail out early if empty map is passed to CanonizingStringMap.putAll
2023-08-02 14:59:52 -04:00
embeddedt
31b5114a8d
Merge remote-tracking branch 'origin/1.18' into 1.19.2
2023-08-02 11:50:45 -04:00
embeddedt
1cd7b7e0c7
Merge remote-tracking branch 'origin/1.16' into 1.18
2023-08-02 11:48:27 -04:00
embeddedt
db5f99f3f6
Merge remote-tracking branch 'origin/1.16' into 1.18
2023-07-31 22:25:50 -04:00
embeddedt
25dc08eb79
Make dynamic codecs actually work
2023-07-31 22:18:26 -04:00
embeddedt
11fe75578c
Add option to generate block codecs on the fly instead of at startup
2023-07-31 21:51:45 -04:00
embeddedt
49f9644714
Merge 1.18 into 1.19.2
2023-07-31 15:34:02 -04:00
embeddedt
49fa5bf14a
Lock FerriteCore deduplication fix to dev only
2023-07-31 15:23:37 -04:00
embeddedt
e540c9d58d
Improve FerriteCore memory usage for blocks with one state
2023-07-31 14:23:14 -04:00
embeddedt
9d6f51695a
Update MappedRegistry mixin for 1.18
2023-07-31 13:14:48 -04:00
embeddedt
2bc5b39895
Merge remote-tracking branch 'origin/1.16' into 1.18
2023-07-31 13:14:25 -04:00
embeddedt
3e4f1ab23a
Improve registry performance with large entry counts
2023-07-31 13:13:39 -04:00
embeddedt
467d4818d8
Default reuse_datapacks to false
...
This optimization is only meaningful when swapping worlds (probably
uncommon among players) and it's hard to predict what mods will have
issues. Can be enabled by modpack devs for their own packs/testing
if they wish
2023-07-30 20:19:59 -04:00
embeddedt
78ff767b9e
Merge 1.18 into 1.19.2
2023-07-30 12:57:40 -04:00
embeddedt
762728c0a6
Merge 1.16 into 1.18
2023-07-30 12:57:39 -04:00
embeddedt
ee75ef19aa
Clean up dead code
2023-07-29 20:40:50 -04:00
embeddedt
f08ca83440
Merge 1.18 into 1.19.2
2023-07-28 22:00:21 -04:00
embeddedt
4d0ac56bd8
Merge 1.16 into 1.18
2023-07-28 22:00:20 -04:00
embeddedt
edfa7f0c41
Merge remote-tracking branch 'origin/1.18' into 1.19.2
2023-07-28 21:25:46 -04:00
embeddedt
ea593d5002
Remove debug message
2023-07-28 21:21:45 -04:00
embeddedt
88a2b25281
Merge remote-tracking branch 'origin/1.16' into 1.18
2023-07-28 21:19:40 -04:00
embeddedt
5da78f7565
Render sub-options more nicely
2023-07-28 21:19:15 -04:00
embeddedt
f036350b0a
Add option parenting, gate changes to sub-options when parent option is off
2023-07-28 21:04:53 -04:00
embeddedt
3456b8cf23
Merge remote-tracking branch 'origin/1.18' into 1.19.2
2023-07-27 16:41:07 -04:00
embeddedt
7b02351f11
Update for 1.18
2023-07-27 16:39:15 -04:00
embeddedt
f3f66e1873
Merge remote-tracking branch 'origin/1.16' into 1.18
2023-07-27 16:35:06 -04:00
embeddedt
13cc103be2
Switch to compile-only Arch Transformer
2023-07-27 16:26:16 -04:00
embeddedt
accd6cb143
Merge 1.16 into 1.18
2023-07-26 09:37:03 -04:00
embeddedt
46fd26a879
Merge 1.18 into 1.19.2
2023-07-26 09:37:03 -04:00
embeddedt
0a9644a8a0
More documentation inside config file
2023-07-26 09:18:05 -04:00
embeddedt
7ad09acec6
Add code to show default values of options (currently unused)
...
Related: #186
2023-07-26 09:00:45 -04:00
embeddedt
82445d2ba2
Merge 1.18 into 1.19.2
2023-07-24 17:19:00 -04:00
embeddedt
70fc67199f
Merge 1.16 into 1.18
2023-07-24 17:18:32 -04:00
embeddedt
84e27a7c4d
Fix ender dragon model leaking client world
2023-07-24 17:15:10 -04:00
embeddedt
5babe993df
Merge 1.18 into 1.19.2
2023-07-24 16:04:32 -04:00
embeddedt
6ae1992329
Merge 1.16 into 1.18
2023-07-24 16:04:31 -04:00
embeddedt
7f44701670
Display ModernFix version in early part of log
2023-07-24 16:03:29 -04:00
embeddedt
18db311712
Merge 1.18 into 1.19.2
2023-07-23 19:23:26 -04:00
embeddedt
000e9746ba
Merge 1.16 into 1.18
2023-07-23 19:23:25 -04:00
embeddedt
7fa6c45f07
Fix dragging in ModLoader too early
2023-07-23 19:21:00 -04:00
embeddedt
bbcc58f103
Merge 1.18 into 1.19.2
2023-07-23 18:33:26 -04:00
embeddedt
0c3cade976
Merge 1.16 into 1.18
2023-07-23 18:33:25 -04:00
embeddedt
2246b79a85
Fix mod mixins not being disabled if there is an early load error
2023-07-23 18:32:50 -04:00
embeddedt
4cdf5e6b3d
Fix missing ClientOnly annotations
2023-07-22 15:35:36 -04:00
embeddedt
4c80deae25
Backport Diagonal Fences fix to 1.19.2
...
Related: #171
2023-07-21 10:47:50 -04:00
embeddedt
22d0d55d79
Merge 1.18 into 1.19.2
2023-07-20 20:18:44 -04:00
embeddedt
50ab84af42
Merge 1.16 into 1.18
2023-07-20 20:18:43 -04:00
embeddedt
4397f274a5
Prevent CME from thread dumper
2023-07-20 20:18:34 -04:00
embeddedt
754e7741c7
Merge 1.18 into 1.19.2
2023-07-19 17:32:36 -04:00
embeddedt
4f428b0e5d
Merge 1.16 into 1.18
2023-07-19 17:32:18 -04:00
embeddedt
ad60b1dec6
Fix timing of dynamic baked model registry handoff
2023-07-19 17:31:24 -04:00
embeddedt
d1a1fce7e1
Improve reliability of ItemOverrideBakedModel if not replaced
2023-07-19 17:08:23 -04:00
embeddedt
af5ece3fe9
Merge 1.18 into 1.19.2
2023-07-19 16:46:13 -04:00
embeddedt
91980319d2
Merge 1.16 into 1.18
2023-07-19 16:46:13 -04:00
embeddedt
8383053b5c
Fix wall block deduplication crashing when invasive mods replace vanilla walls
...
Related: #168
2023-07-19 16:45:32 -04:00
embeddedt
12ec9b08bf
Update ItemOverrideBakedModel for 1.19
2023-07-19 12:15:29 -04:00
embeddedt
3fed2ef08d
Merge remote-tracking branch 'origin/1.18' into 1.19.2
2023-07-19 12:09:39 -04:00
embeddedt
d9b9586af3
Update item override patch to 1.18
2023-07-19 12:08:15 -04:00
embeddedt
6fda7393b3
Merge remote-tracking branch 'origin/1.16' into 1.18
2023-07-19 11:51:00 -04:00
embeddedt
ac436db456
Add support to dynamic resources for item overrides
2023-07-19 11:50:16 -04:00
embeddedt
e65f8fbb32
Add option to override overrides
...
Absolutely no support is guaranteed when this is used
2023-07-19 10:05:09 -04:00
embeddedt
ab7c982589
Merge 1.18 into 1.19.2
2023-07-17 16:08:28 -04:00
embeddedt
92643a244e
Merge 1.16 into 1.18
2023-07-17 16:08:27 -04:00
embeddedt
5ec070843d
Use CachedResourcePath in resource finder
...
Reduces memory usage by ~50%
2023-07-17 13:42:50 -04:00
embeddedt
594c47f08b
Merge 1.18 into 1.19.2
2023-07-16 20:00:06 -04:00
embeddedt
94d5121a26
Merge 1.16 into 1.18
2023-07-16 20:00:06 -04:00
embeddedt
4f186c03f5
Filter valid paths using explicit joiner instead of Path.toString
...
to avoid issues on Windows
2023-07-16 19:59:22 -04:00
embeddedt
48fdb94343
Merge 1.18 into 1.19.2
2023-07-15 20:37:18 -04:00
embeddedt
67343b5680
Merge 1.16 into 1.18
2023-07-15 20:37:17 -04:00
embeddedt
ad948f0ec1
Rework wall block caching to cache collision shapes as well
2023-07-15 20:36:56 -04:00
embeddedt
c63a8fa21e
Deduplicate wall block shapes
2023-07-15 20:23:59 -04:00
embeddedt
09d24c542e
Merge 1.18 into 1.19.2
2023-07-15 15:07:17 -04:00
embeddedt
9fcc1f5dc2
Merge 1.16 into 1.18
2023-07-15 15:05:56 -04:00
embeddedt
dff181accb
Allow corrupt JSONs when scanning models for textures
...
Fixes Hexerei textures being missing on 1.18
2023-07-15 15:05:25 -04:00
embeddedt
c684b56124
Merge 1.18 into 1.19.2
2023-07-13 21:43:48 -04:00
embeddedt
dccde1a422
Merge 1.16 into 1.18
2023-07-13 21:43:47 -04:00
embeddedt
6cd99383b9
Disable item_cache_flag when Lithium or derivatives are present,
...
as they rely on the broken cache logic
2023-07-13 21:43:40 -04:00
embeddedt
0116a31616
Hotfix for Class.descriptorString() not existing on Java 8
2023-07-13 21:20:16 -04:00
embeddedt
bd179f817f
Merge 1.18 into 1.19.2
2023-07-13 17:08:57 -04:00
embeddedt
fd72aa4fac
Merge 1.16 into 1.18
2023-07-13 17:08:57 -04:00
embeddedt
793fb5f388
Allow spam_thread_dump to work even earlier
2023-07-13 17:08:32 -04:00
embeddedt
5318347ab2
Merge remote-tracking branch 'origin/1.18' into 1.19.2
2023-07-12 11:49:19 -04:00
embeddedt
aff4e0c2d0
Drop chunk status transition patch from paper_chunk_patches
...
Research by ishland suggests that vanilla already does this, at least
since 1.18
2023-07-12 10:53:12 -04:00
embeddedt
eded461866
Merge remote-tracking branch 'origin/1.18' into 1.19.2
2023-07-11 21:23:38 -04:00
embeddedt
c1e40ebe1f
Update item empty cache patch for 1.18
2023-07-11 21:23:22 -04:00
embeddedt
406a4a3a91
Merge remote-tracking branch 'origin/1.18' into 1.19.2
2023-07-11 21:17:59 -04:00
embeddedt
896c8d1f5f
Merge remote-tracking branch 'origin/1.16' into 1.18
2023-07-11 21:14:47 -04:00
embeddedt
816346e919
Make mod overrides higher priority than user configuration
...
Prevents players inadvertently enabling incompatible options
2023-07-11 21:13:02 -04:00
embeddedt
4c484f5125
Recognize ThreadTweak when disabling overlapping patches
2023-07-11 19:03:20 -04:00
embeddedt
c7aaa15a19
Remove emptyCacheFlag from item stacks (fixes MC-258939)
2023-07-11 17:25:26 -04:00
embeddedt
2ca29efd77
Merge 1.18 into 1.19.2
2023-07-11 17:00:19 -04:00
embeddedt
3c9e5d2f0f
Disable deduplicate_climate_parameters by default
...
The 1.5-2MB this saves in vanilla isn't worth the cost of deduplication
in larger modpacks. Option still works fine and can be re-enabled
2023-07-11 16:58:19 -04:00
embeddedt
84cc58d30b
Merge 1.18 into 1.19.2
2023-07-11 14:25:33 -04:00
embeddedt
1f043c7088
Attempt fix for occasional world holes when paper_chunk_patches is enabled
...
1.18 seems to never return an unloaded Either here, instead always calling
scheduleChunkGeneration, so we do the same. This hasn't regressed
memory usage from some testing on 1.20.
2023-07-11 14:22:12 -04:00
embeddedt
1ba2a1fae0
Merge remote-tracking branch 'origin/1.18' into 1.19.2
2023-07-10 20:28:20 -04:00
embeddedt
e87c85b75c
Merge remote-tracking branch 'origin/1.16' into 1.18
2023-07-10 20:24:38 -04:00
embeddedt
546d1df48f
Prevent mixin.perf suboptions from defaulting to on if an explicit
...
option is not added
2023-07-10 19:13:01 -04:00
embeddedt
4ea7b864a8
Add facility to hide mixin options outside dev
2023-07-10 19:00:37 -04:00
embeddedt
11f107d60b
Merge 1.18 into 1.19.2
2023-07-10 09:02:43 -04:00
embeddedt
829994f5b5
Merge 1.16 into 1.18
2023-07-10 09:02:42 -04:00
embeddedt
5315d80859
Use synchronized HashMap instead of CHM to permit null keys for buggy mods
...
Related: #157
2023-07-10 09:01:18 -04:00
embeddedt
a34ac84e00
Merge 1.18 into 1.19.2
2023-07-09 20:35:40 -04:00
embeddedt
e248e2966a
Merge 1.16 into 1.18
2023-07-09 20:35:39 -04:00
embeddedt
f040f66bf9
Make backing maps in ItemProperties thread-safe
...
Helps prevent CMEs on Forge 1.16
2023-07-09 19:02:59 -04:00
embeddedt
637f844601
Merge 1.18 into 1.19.2
2023-07-09 14:15:12 -04:00
embeddedt
1815554070
Merge 1.16 into 1.18
2023-07-09 14:15:11 -04:00
embeddedt
5f255a83dc
Implement Map.replace on DynamicBakedModelProvider
...
Related: #154
2023-07-09 14:14:34 -04:00
embeddedt
28c456e4c5
Merge 1.18 into 1.19.2
2023-07-09 13:32:34 -04:00
embeddedt
2d12c6e282
Merge remote-tracking branch 'origin/1.16' into 1.18
2023-07-09 13:31:01 -04:00
embeddedt
d987c1227b
Scan fallback resource managers as well as main resource manager
...
For buggy mods such as https://github.com/FoundationGames/EnhancedBlockEntities/issues/162
2023-07-09 13:27:18 -04:00
embeddedt
a502a509ed
Merge 1.16 into 1.18
2023-07-08 14:51:43 -04:00
embeddedt
bb0c4fdf54
Ignore RuntimeException when gathering blockstate paths
2023-07-08 14:51:07 -04:00
embeddedt
87cd49a291
Merge 1.18 into 1.19.2
2023-07-07 20:23:40 -04:00
embeddedt
8fd31f3190
Merge 1.16 into 1.18
2023-07-07 20:23:39 -04:00
embeddedt
f3a2ca73e8
Log all option overrides once at startup rather than per mixin
2023-07-07 20:23:10 -04:00
embeddedt
f27d6e154c
Make disabling feature.measure_time also disable game/world load messages
2023-07-07 20:19:08 -04:00
embeddedt
6020ff7ee1
Merge 1.18 into 1.19.2
2023-07-07 19:19:44 -04:00
embeddedt
b99e253715
Merge 1.16 into 1.18
2023-07-07 19:19:43 -04:00
embeddedt
1c0fca8f06
Spotless
2023-07-07 12:40:46 -04:00
embeddedt
cb55bd3612
Merge 1.18 into 1.19.2
2023-07-07 12:35:55 -04:00
embeddedt
2ec8a2719e
Merge 1.16 into 1.18
2023-07-07 12:35:53 -04:00
embeddedt
79219d286f
Fix issue with anonymous classes in mixin
...
Related: #151
2023-07-07 12:34:36 -04:00
embeddedt
9ce029b35d
Merge remote-tracking branch 'origin/1.18' into 1.19.2
2023-07-06 21:24:11 -04:00
