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
embeddedt
127f091728
Merge remote-tracking branch 'origin/1.16' into 1.18
2023-07-06 21:14:44 -04:00
embeddedt
ff39e9022b
Get testing working, add tests for blockstate cache rebuilds
2023-07-06 19:26:44 -04:00
embeddedt
454256d455
Deduplicate climate parameters
2023-07-06 12:29:29 -04:00
embeddedt
5ca9485f0b
Add null check for ClassInfo objects
2023-07-05 21:52:02 -04:00
embeddedt
1592e1c0ce
Merge 1.18 into 1.19.2
2023-07-05 20:02:26 -04:00
embeddedt
d155dacadc
Merge 1.16 into 1.18
2023-07-05 20:02:14 -04:00
embeddedt
c6cb0acd3c
Rewrite clear_mixin_classinfo, now more aggressive
2023-07-05 20:01:43 -04:00
embeddedt
6d4071f42c
Merge 1.18 into 1.19.2
2023-07-05 14:50:05 -04:00
embeddedt
6cd49334d7
Merge 1.16 into 1.18
2023-07-05 14:47:30 -04:00
embeddedt
095b9c3277
Revamp mod warning system, also warn about FerriteCore missing
2023-07-05 14:47:17 -04:00
embeddedt
1600dc4f84
Merge remote-tracking branch 'origin/1.18' into 1.19.2
2023-07-05 12:26:14 -04:00
embeddedt
46cff62796
Merge remote-tracking branch 'origin/1.16' into 1.18
2023-07-05 12:18:00 -04:00
embeddedt
ce6ce1d341
Add option categories
2023-07-04 11:14:23 -04:00
embeddedt
18f78b9624
Add in-game patch descriptions
2023-07-03 17:04:20 -04:00
embeddedt
89a78bf43b
Merge 1.18 into 1.19.2
2023-06-27 16:40:31 -04:00
embeddedt
1e9e310922
Merge 1.16 into 1.18
2023-06-27 16:40:30 -04:00
embeddedt
8bb5e464bc
Disable cache_strongholds when LittleTiles is installed
...
Related: #143
Related: https://github.com/CreativeMD/LittleTiles/issues/859
2023-06-27 16:39:49 -04:00
embeddedt
470f8aed5b
Merge 1.18 into 1.19.2
2023-06-27 15:29:25 -04:00
embeddedt
e9ee866c60
Merge 1.16 into 1.18
2023-06-27 15:29:25 -04:00
embeddedt
4f711a4995
Populate isFabric earlier
2023-06-27 15:29:14 -04:00
embeddedt
99521e4d76
Merge 1.18 into 1.19.2
2023-06-27 11:04:04 -04:00
embeddedt
299abeb25d
Apply merge mode change to 1.18
2023-06-27 11:03:49 -04:00
embeddedt
bd3a9eb345
Merge 1.18 into 1.19.2
2023-06-26 21:26:26 -04:00
embeddedt
a937ccb07c
Merge 1.16 into 1.18
2023-06-26 21:26:01 -04:00
embeddedt
58eaf44d89
Make mixin info clearing work on Fabric
2023-06-26 21:15:19 -04:00
embeddedt
ec49868d27
Merge 1.18 into 1.19.2
2023-06-26 19:46:08 -04:00
embeddedt
25d1956da0
Merge 1.16 into 1.18
2023-06-26 19:46:07 -04:00
embeddedt
e3944d7879
Add option to aggressively clear Fabric mapping tables
2023-06-26 19:43:53 -04:00
embeddedt
b6182b4913
Merge remote-tracking branch 'origin/1.18' into 1.19.2
2023-06-26 14:30:23 -04:00
embeddedt
ce92fedf09
Give correct MC/platform info to profiler
2023-06-26 14:24:37 -04:00
embeddedt
012ed17208
Merge remote-tracking branch 'origin/1.16' into 1.18
2023-06-26 14:21:19 -04:00
embeddedt
4943702061
Add platform name to hooks
2023-06-26 14:21:07 -04:00
embeddedt
33c0cf33d9
Merge remote-tracking branch 'origin/1.16' into 1.18
2023-06-26 14:14:35 -04:00
embeddedt
60525ad594
Add option to profile launch using Spark
2023-06-26 13:58:12 -04:00
embeddedt
c93380dcf2
Merge 1.18 into 1.19.2
2023-06-26 13:04:41 -04:00
embeddedt
7849ba16f5
Merge 1.16 into 1.18
2023-06-26 13:04:40 -04:00
embeddedt
b611830b7e
Eliminate need to use platform hook to retrieve server here
2023-06-26 13:01:53 -04:00
embeddedt
d97b18e633
Merge 1.18 into 1.19.2
2023-06-22 13:42:55 -04:00
embeddedt
6678864555
Merge 1.16 into 1.18
2023-06-22 13:42:25 -04:00
embeddedt
20ca15f0c4
Add a few more features to resource pack cache engine (for 1.19.4+)
2023-06-22 13:42:15 -04:00
embeddedt
5bd745a188
Merge 1.18 into 1.19.2
2023-06-21 21:43:29 -04:00
embeddedt
1ac69035ed
Merge 1.16 into 1.18
2023-06-21 21:41:12 -04:00
embeddedt
19c6687745
More aggressively load model files
2023-06-21 21:17:11 -04:00
embeddedt
a84fa8ac0c
Merge 1.18 into 1.19.2
2023-06-20 14:34:37 -04:00
embeddedt
6a7d62b38d
Merge 1.16 into 1.18
2023-06-20 14:34:36 -04:00
embeddedt
40be7c9fc1
Add a few missing ClientOnlyMixin annotations
...
Related: #137
2023-06-20 10:43:17 -04:00
embeddedt
5d6566512c
Rewrite CanonizingStringMap to simply use a normal HashMap and intern keys
...
There are no memory savings from using the fastutil maps, and they
may be harming performance based on the Project MMO issues
Probably also the solution to #134
2023-06-20 10:31:49 -04:00
embeddedt
c1acdf1bb4
Make config wrapping possible to disable
2023-06-20 09:42:44 -04:00
