Commit Graph

431 Commits

Author SHA1 Message Date
embeddedt
f8c5c50ce4
Improve speed of cache building 2023-04-16 13:15:13 -04:00
embeddedt
0f3c701d2a
Prevent missing options from crashing the game 2023-04-16 12:55:52 -04:00
embeddedt
6f176ba86d
Remove reference to nonexistent config option 2023-04-16 12:55:01 -04:00
embeddedt
0e5b952ea6
Merge remote-tracking branch 'origin/main' into 1.18 2023-04-16 12:53:13 -04:00
embeddedt
ea86bc6850
More aggressive interning of cached path components 2023-04-16 12:48:16 -04:00
embeddedt
4a626043b8
Fix import 2023-04-16 12:02:50 -04:00
embeddedt
6356cba581
Merge remote-tracking branch 'origin/main' into 1.18 2023-04-16 12:02:20 -04:00
embeddedt
3922c3ec26
Reduce memory usage of dynamic CTMPackReloadListener 2023-04-16 11:55:00 -04:00
embeddedt
f36a8f4266
Clear ObjectHolder Throwable fields after registry events fire 2023-04-16 11:39:54 -04:00
embeddedt
26c690595e
Improve memory usage of 1.18 resource pack cache 2023-04-16 09:38:11 -04:00
embeddedt
61af88a2ab
Improve memory usage of resource pack cache 2023-04-16 09:35:31 -04:00
embeddedt
e9b52cdd55
Merge remote-tracking branch 'origin/main' into 1.18 2023-04-15 21:27:09 -04:00
embeddedt
9225962983
Invalidate material cache if the texture map changes on a model 2023-04-15 21:26:49 -04:00
embeddedt
99ffd3dc95
Fix running outside dev 2023-04-15 15:51:44 -04:00
embeddedt
8dbcac7afc
Speed up world creation screen 2023-04-15 15:08:05 -04:00
embeddedt
f8f0e0ca45
Port dynamic model loading to 1.19.4 2023-04-15 14:56:14 -04:00
embeddedt
c891501579
1.19.4 2023-04-15 14:22:36 -04:00
embeddedt
244873f2fd
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-04-15 12:14:15 -04:00
embeddedt
33687254cd
Merge remote-tracking branch 'origin/main' into 1.18 2023-04-15 12:13:44 -04:00
embeddedt
58d066d0db
Use high-priority mixin with injects instead of overwrites for
dynamic resources
2023-04-15 12:00:03 -04:00
embeddedt
2db0b24002
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-04-13 13:28:05 -04:00
embeddedt
76c95abf09
Merge remote-tracking branch 'origin/main' into 1.18 2023-04-13 13:27:57 -04:00
embeddedt
61710dbc85
Add missing import
Don't edit things from the command line ;)
2023-04-13 13:27:47 -04:00
embeddedt
05dde993fd
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-04-13 13:27:12 -04:00
embeddedt
f6cfde2b56
Merge remote-tracking branch 'origin/main' into 1.18 2023-04-13 13:27:03 -04:00
embeddedt
c7fd6c1393
Fix AT map not actually initializing types set 2023-04-13 13:26:45 -04:00
embeddedt
af555a2089
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-04-13 13:21:40 -04:00
embeddedt
4c6e18f5b8
Merge remote-tracking branch 'origin/main' into 1.18 2023-04-13 13:19:33 -04:00
embeddedt
c4fbde015e
Use reflection instead of mixins for SyncExecutor patch 2023-04-13 13:00:43 -04:00
embeddedt
9443c41273
Optimize access transformers 2023-04-13 12:01:41 -04:00
embeddedt
e977fcdfce
Improved chunk deadlock detection system + patch Valhelsia Structures
when installed
2023-04-12 19:06:40 -04:00
embeddedt
10149e9f87
Add integrated server watchdog 2023-04-12 16:05:08 -04:00
embeddedt
3b56f00b82
Fix world load freezing if mods access the previous server world 2023-04-12 14:42:11 -04:00
embeddedt
491c62e8a7
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-04-11 21:32:40 -04:00
embeddedt
d0d3ea080d
Merge remote-tracking branch 'origin/main' into 1.18 2023-04-11 21:32:26 -04:00
embeddedt
d709335ac2
Fetch a model the vanilla way if it fails to be present in
the lookup cache when gathering textures
2023-04-11 21:31:55 -04:00
embeddedt
8142eb8235
Port PathPackResources patch from 1.18
Forge's resource caching is not reliable
2023-04-11 11:47:09 -04:00
embeddedt
47959cddef
Port patch to 1.19 2023-04-11 11:19:23 -04:00
embeddedt
357b9af52f
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-04-11 11:16:22 -04:00
embeddedt
4f17319836
Fix compile error 2023-04-11 11:16:07 -04:00
embeddedt
1889889f01
Merge remote-tracking branch 'origin/main' into 1.18 2023-04-11 11:13:36 -04:00
embeddedt
87f74bc1b9
Skip calling stateToModelLocation 2023-04-11 11:12:13 -04:00
embeddedt
bfa9d5b12e
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-04-11 10:19:15 -04:00
embeddedt
e1a73fa4ab
Merge remote-tracking branch 'origin/main' into 1.18 2023-04-11 10:17:18 -04:00
embeddedt
f1d23f9a92
Avoid loading every permutation of a multipart model at once
Fixes the 5 second lag spike for mods like Pedestals on 1.19+
2023-04-11 10:11:10 -04:00
embeddedt
5f8f03137c
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-04-10 21:59:42 -04:00
embeddedt
2a327ef4c9
Merge remote-tracking branch 'origin/main' into 1.18 2023-04-10 21:50:58 -04:00
embeddedt
a4e6522c52 Rewrite model material gathering to use blockstate files 2023-04-10 19:25:01 -04:00
embeddedt
5f08542009 Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-04-10 16:03:23 -04:00
embeddedt
1163591f8f Merge remote-tracking branch 'origin/main' into 1.18 2023-04-10 15:59:20 -04:00
embeddedt
6374d90d4a Properly hold onto unbaked models as they are loaded 2023-04-10 15:58:12 -04:00
embeddedt
5ccdb4c165 Don't count render ticks until recipes and tags are sent 2023-04-10 11:49:12 -04:00
embeddedt
6dd27c8799 Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-04-10 10:48:06 -04:00
embeddedt
7b84d92c4a Merge remote-tracking branch 'origin/main' into 1.18 2023-04-10 10:47:02 -04:00
embeddedt
2889a4e39b Move DynamicModelBakeEvent off modloading bus
The modloading bus insists on logging every event that is fired
which is very laggy
2023-04-10 10:43:24 -04:00
embeddedt
fd53fe1cc3 Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-04-10 10:31:23 -04:00
embeddedt
f1f724f6e3 Merge remote-tracking branch 'origin/main' into 1.18 2023-04-10 10:31:05 -04:00
embeddedt
c00b984dae Say that models are always present 2023-04-10 10:30:44 -04:00
embeddedt
75a977fc39 Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-04-10 10:08:50 -04:00
embeddedt
49a0b56b74 Merge remote-tracking branch 'origin/main' into 1.18 2023-04-10 10:02:48 -04:00
embeddedt
af85a4293a Add compat for SuperMartijn642CoreLib 2023-04-10 10:02:15 -04:00
embeddedt
e38babe3c2
Merge remote-tracking branch 'origin/main' into 1.18 2023-04-10 08:02:04 -04:00
embeddedt
c010d700a8
Make entity ID syncer not crash if a class can't be loaded
Related: #55
2023-04-10 08:00:50 -04:00
embeddedt
5cca594f7d
Fix incorrect shadow method 2023-04-09 22:00:30 -04:00
embeddedt
0aeab7ef69
Fix compile errors 2023-04-09 21:00:34 -04:00
embeddedt
a8e92871c2
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-04-09 20:22:29 -04:00
embeddedt
6f3cef7e1d
Fix compile errors 2023-04-09 20:04:51 -04:00
embeddedt
21dfec3b93
Merge remote-tracking branch 'origin/main' into 1.18 2023-04-09 19:35:39 -04:00
embeddedt
882f4832df
Allow concurrent retrieval of models from the cache 2023-04-09 14:03:32 -04:00
embeddedt
e5cd9f57b5
CTM support 2023-04-09 13:52:40 -04:00
embeddedt
8937ca020d
Add ModelBakeEvent alternative for dynamic models 2023-04-09 12:48:00 -04:00
embeddedt
a6d924535e
Fix KubeJS resources not being scanned for textures 2023-04-09 12:29:47 -04:00
embeddedt
a2af0cf835
Add blockstate compression optimization (off by default for mod compat) 2023-04-08 22:15:32 -04:00
embeddedt
9ab6bc83b8
Fix debug overlay leaking chunks from the last world 2023-04-08 21:12:21 -04:00
embeddedt
d2e2040ce4
Reduce allocation rate from biome zoomer 2023-04-08 20:28:48 -04:00
embeddedt
af731b336e
Clear memory reserve 2023-04-08 20:24:34 -04:00
embeddedt
1796d80d40
Make ModelLocationCache more low-memory friendly 2023-04-08 20:01:40 -04:00
embeddedt
775bc5f027
Use ImmutableMap for resource finder 2023-04-08 19:13:21 -04:00
embeddedt
b20705a4c4
Use ImmutableMap for model location cache since it never changes 2023-04-08 19:12:08 -04:00
embeddedt
395e14ba9b
Fix leaking mixin injectors 2023-04-08 19:08:03 -04:00
embeddedt
e4d3ffbac1
Don't keep Interner instance around after collecting resources 2023-04-08 18:40:50 -04:00
embeddedt
e724c4dfb1
Strengthen exception when parsing models 2023-04-08 17:28:17 -04:00
embeddedt
4f35a6cda3
Make material gatherer resilient to JSON errors 2023-04-08 17:08:35 -04:00
embeddedt
26d76de7ef
Dynamic model loading 2023-04-08 17:01:16 -04:00
embeddedt
3a8bc41dd4
Fix mixin warnings 2023-04-07 19:03:00 -04:00
embeddedt
4dd6b7641e
Fix https://github.com/refinedmods/refinedstorage/issues/2636
Mixin version of https://github.com/refinedmods/refinedstorage/pull/3435
2023-04-07 18:54:54 -04:00
embeddedt
b988715c2c
Fix JEI search tree replacement on 1.19 2023-04-01 20:13:31 -04:00
embeddedt
ba82be7a89
Log on search tree replacement 2023-04-01 20:13:31 -04:00
embeddedt
d5d06a3452
Normalize resource paths on 1.18 as well
Seems the fix from 1.16 was accidentally not ported
2023-04-01 12:05:28 -04:00
embeddedt
3906bf9725 Don't print error message if structure file is not found
This matches vanilla behavior
2023-03-27 09:36:09 -04:00
embeddedt
304fd05955
Clean up log messages 2023-03-26 19:30:10 -04:00
embeddedt
bb9201c58c
Add some mixins to speed up dev time 2023-03-26 18:20:57 -04:00
embeddedt
b3449a2d63
Disable resource finder log 2023-03-26 18:20:47 -04:00
embeddedt
f8d17ba3ab
Disable datapack reload elision if TaC is installed
Related: #46
2023-03-26 15:25:17 -04:00
embeddedt
c37d91e476
Avoid fetching key state on background threads 2023-03-26 09:17:03 -04:00
embeddedt
5e81a49dc8 Don't use cached server resources if they got closed somehow
Related: #46
2023-03-24 10:50:47 -04:00
embeddedt
da74b29f21 Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-03-21 09:51:38 -04:00
embeddedt
b2a8b7dc97 Merge remote-tracking branch 'origin/main' into 1.18 2023-03-21 09:45:53 -04:00
embeddedt
b623b3fa96 Fix Lightspeed incompatibility
Fixes #43
2023-03-21 09:20:35 -04:00
embeddedt
a4e16704a3 Synchronize on public class to prevent obscure crashes in some cases 2023-03-21 09:16:57 -04:00
embeddedt
3728927586 Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-03-20 09:28:54 -04:00
embeddedt
1c9d8728f2 Merge remote-tracking branch 'origin/main' into 1.18 2023-03-20 09:28:02 -04:00
embeddedt
55201311c7
Load vanilla resources if revert is required 2023-03-19 17:49:31 -04:00
embeddedt
bc1c70bd0c
Remove (usually) redundant datapack reload on world creation screen
The second, Forge-added reload is enough in all cases except when
mods supply invalid datapacks.

In this edge case, we will need to reload server resources when the
user requests to revert to vanilla
2023-03-19 17:49:31 -04:00
embeddedt
0f48165b15
Remove extra log message 2023-03-19 17:48:58 -04:00
embeddedt
5167f81f1f
Cache JEResources villagers 2023-03-19 17:48:58 -04:00
embeddedt
00d0885245
Build blockstate cache on-demand instead of using a background thread
Should also hide incompatibility with buggy block impls. like Dynamic Trees
2023-03-19 17:48:58 -04:00
embeddedt
214015dfe9 Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-03-15 15:00:50 -04:00
embeddedt
36a7b93d80 Fix ImmPortals crash 2023-03-15 15:00:14 -04:00
embeddedt
fb6167ec6d
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-03-13 14:40:26 -04:00
embeddedt
8d9ae53e0e Merge remote-tracking branch 'origin/main' into 1.18 2023-03-13 14:40:03 -04:00
embeddedt
38a4776626 Fix rare structure manager crash 2023-03-13 14:39:43 -04:00
embeddedt
f30b1b70f6
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-03-11 20:49:13 -05:00
embeddedt
8457cc5eff
Avoid crashing if REI creative search fails 2023-03-11 20:48:59 -05:00
embeddedt
c9a48eb832
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-03-11 20:17:44 -05:00
embeddedt
a9605a6888
Make REI search tree higher priority than JEI one
Fixes issues with REI compat plugin
2023-03-11 20:12:01 -05:00
embeddedt
42fe91ad91
Merge remote-tracking branch 'origin/main' into 1.18 2023-03-11 11:51:31 -05:00
embeddedt
4d8537ee4f
Tweak event used to detect main menu appearing, should fix game load not being measured 2023-03-11 11:50:32 -05:00
embeddedt
cf9fa6e055
Merge remote-tracking branch 'origin/main' into 1.18 2023-03-11 11:29:52 -05:00
embeddedt
9eabaac35a
Add system to retry larger atlas sizes 2023-03-11 11:29:30 -05:00
embeddedt
3ba5b4296a
Merge remote-tracking branch 'origin/main' into 1.18 2023-03-11 11:13:27 -05:00
embeddedt
1b5df63eae
Add debug log when stitcher fails 2023-03-11 11:13:07 -05:00
embeddedt
68824eaa1b
Merge remote-tracking branch 'origin/main' into 1.18 2023-03-11 09:44:45 -05:00
embeddedt
94bc711008
Rewrite atlas size calculation logic and re-enable fast texture stitching 2023-03-11 09:38:13 -05:00
embeddedt
14e266288a
Cache BlockModelShaper.statePropertiesToString 2023-03-11 09:38:06 -05:00
embeddedt
6a7ca1e518
Remove unnecessary Files.exists call in ModFileResourcePack.getResource() 2023-03-10 20:14:11 -05:00
embeddedt
eed3a80fc1 Add support for using REI for creative search 2023-03-09 10:15:29 -05:00
embeddedt
63fa31bde1
Merge remote-tracking branch 'origin/main' into 1.18 2023-03-07 22:26:16 -05:00
embeddedt
519e9d40f8 Turn off two features when incompatible mods are present
Fixes BetterEnd crash
Fixes #35
2023-03-07 09:38:54 -05:00
embeddedt
50b11b0e1f Turn off faster texture stitching by default, has random bugs 2023-03-06 13:06:55 -05:00
embeddedt
cb23ee5a54 Add debug tool for weird crashes, off by default 2023-03-06 13:06:15 -05:00
embeddedt
7a2b57221e Return to baking models on the main thread
Mods... as usual.
2023-03-06 09:12:04 -05:00
embeddedt
61c2b943cf
Fix world load time not being set 2023-03-05 13:32:59 -05:00
embeddedt
2e3f43674f
Fix model bakery not being initialized 2023-03-05 13:32:51 -05:00
embeddedt
5df695cbbb
Add YUNG's Better Strongholds compat 2023-03-04 22:14:35 -05:00
embeddedt
9eb3ed4273
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-03-04 19:24:21 -05:00
embeddedt
7b192433b7
Merge remote-tracking branch 'origin/main' into 1.18 2023-03-04 19:22:25 -05:00
embeddedt
1c2a2c65ad
Fix some bugs 2023-03-04 19:21:49 -05:00
embeddedt
ac261a0bfd
Fix incorrectly mapped mixin 2023-03-04 17:10:56 -05:00
embeddedt
4a15e277aa
Add UID to JEI plugin 2023-03-04 16:41:52 -05:00
embeddedt
a2cbc49bb1
Hide DFU warning if Forge's DFU blocker is on 2023-03-04 16:33:02 -05:00
embeddedt
5d317b6d94
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-03-04 16:29:04 -05:00
embeddedt
01025d5b4d
Merge remote-tracking branch 'origin/main' into 1.18 2023-03-04 15:05:42 -05:00
embeddedt
6d7a450ec8
Modify branding control mixin priority 2023-03-04 15:05:24 -05:00
embeddedt
8303d85b6c
Merge remote-tracking branch 'origin/main' into 1.18 2023-03-04 13:23:53 -05:00
embeddedt
1c9935e298
Use MethodHandles to select LWJGL 3.3 methods if needed 2023-03-04 10:36:11 -05:00
embeddedt
a54e7b831a
Improve compatibility of ID desync fix, and add Roadrunner support 2023-03-04 09:10:12 -05:00
embeddedt
84ba47f174
Fix compatibility with Performant 2023-03-03 21:43:32 -05:00
embeddedt
5e296f5d3a
Merge remote-tracking branch 'origin/main' into 1.18 2023-03-03 21:20:17 -05:00
embeddedt
010de8c30f
Mark branding mixin as not required 2023-03-03 21:20:02 -05:00