Commit Graph

505 Commits

Author SHA1 Message Date
embeddedt
d86344f309
Add logic to clear air items of NBT from Patchouli book registry 2023-04-25 21:05:02 -04:00
embeddedt
c0d27ee01d
Update KubeJS mixin for 1.19.2 2023-04-25 19:37:48 -04:00
embeddedt
61050ec861
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-04-25 19:32:48 -04:00
embeddedt
d344385aa3
Fix compile error 2023-04-25 19:32:27 -04:00
embeddedt
fc5b63282f
Merge remote-tracking branch 'origin/main' into 1.18 2023-04-25 19:30:55 -04:00
embeddedt
e843f8ed6d
Clear KubeJS recipe event lists since mods can hold onto the event object 2023-04-25 19:29:26 -04:00
embeddedt
9c9e8269b6
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-04-25 12:11:37 -04:00
embeddedt
a60f9ffc61
Merge remote-tracking branch 'origin/main' into 1.18 2023-04-25 12:07:59 -04:00
embeddedt
e46910f3c1
Add Opticrash detection 2023-04-25 12:03:19 -04:00
embeddedt
a7f0c08a94
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-04-25 11:51:40 -04:00
embeddedt
a30777086d
Merge remote-tracking branch 'origin/main' into 1.18 2023-04-25 11:44:24 -04:00
embeddedt
e771af2330
AE2 model wrapping support 2023-04-25 11:33:26 -04:00
embeddedt
a3e7435c61
Correctly emulate nullishness of baked top level model map 2023-04-25 11:10:20 -04:00
embeddedt
16269ee144
Tweak dynamic resources injection point to prevent Connectedness crash 2023-04-25 09:51:04 -04:00
embeddedt
ec31b0361e
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-04-24 16:59:12 -04:00
embeddedt
48bec22982
Merge remote-tracking branch 'origin/main' into 1.18 2023-04-24 16:58:13 -04:00
embeddedt
863fbaf3a4
Remove a lot of now dead code 2023-04-24 16:56:27 -04:00
embeddedt
42398fcd17
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4 2023-04-24 13:55:44 -04:00
embeddedt
877db870d2
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-04-24 13:49:09 -04:00
embeddedt
da33aa7ef9
Clear vanilla memory reserve 2023-04-24 13:46:07 -04:00
embeddedt
4c36f04f56
Fix the Minecraft window teleporting back to the center of the screen
when early load finishes
2023-04-24 11:49:56 -04:00
embeddedt
a218d84931
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-04-24 11:29:31 -04:00
embeddedt
b0c4719cb6
Stricter mixin target 2023-04-24 11:15:22 -04:00
embeddedt
1248a8edf6
Merge remote-tracking branch 'origin/main' into 1.18 2023-04-24 11:12:45 -04:00
embeddedt
8cdee4826e
Disable boost worker count when Smooth Boot is installed 2023-04-24 10:50:01 -04:00
embeddedt
fdbf8d621e
Fix additional use of backgroundExecutor in dynamic resources 2023-04-24 10:49:32 -04:00
embeddedt
ee8eb02e6d
Replace mod work manager queue during vanilla bootstrap
instead of in mixin plugin
2023-04-24 10:46:17 -04:00
embeddedt
86629e7773
Move resource reloading to dedicated executor
Allows benefiting from Smooth Boot in-game (as intended)
while not slowing down launch
2023-04-24 10:35:22 -04:00
embeddedt
7eaa286a7a
Fix search trees, downgrade Forge so REI works in dev 2023-04-23 21:36:47 -04:00
embeddedt
d534dacf18
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4 2023-04-22 13:15:28 -04:00
embeddedt
7c2fd66929
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-04-22 13:15:12 -04:00
embeddedt
5f601b53b2
Merge remote-tracking branch 'origin/main' into 1.18 2023-04-22 13:14:46 -04:00
embeddedt
66d1faa7e3
Fix another logic race that could cause missing models 2023-04-22 12:27:31 -04:00
embeddedt
23ee5cf982
Merge remote-tracking branch 'origin/1.19.2' into 1.19.4 2023-04-22 11:49:43 -04:00
embeddedt
f3fd986512
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-04-21 13:41:54 -04:00
embeddedt
5958e10eff
Fix behavior for contained paths with non-vanilla PackTypes 2023-04-21 13:40:21 -04:00
embeddedt
91d7e0f1f9
Merge remote-tracking branch 'origin/main' into 1.18 2023-04-21 13:39:03 -04:00
embeddedt
9e95be14f3
Ignore non-vanilla PackTypes when caching resources 2023-04-21 13:35:12 -04:00
embeddedt
d63b5acd6e
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-04-20 21:13:36 -04:00
embeddedt
b155d8825f
Merge remote-tracking branch 'origin/main' into 1.18 2023-04-20 21:02:17 -04:00
embeddedt
36664cb23a
Don't waste time parsing UVs when performing initial model load 2023-04-20 20:45:21 -04:00
embeddedt
33d3f0e537
Use SRG names 2023-04-20 20:19:52 -04:00
embeddedt
45225a580f
Clear chunk map from integrated server worlds after server stops 2023-04-20 20:17:55 -04:00
embeddedt
a0f0600184
Make sure GC can actually happen 2023-04-20 20:02:32 -04:00
embeddedt
21dcf9d3df
Make watchdog thread not hold on to server for 60 seconds 2023-04-20 19:59:58 -04:00
embeddedt
d10ff8a24e
Ensure cached resources are cleared when connecting to multiplayer 2023-04-20 19:55:41 -04:00
embeddedt
701def339f
Fix crash when null type references are interned 2023-04-20 19:20:15 -04:00
embeddedt
a2d0984078 Add ItemColors mixin as well
Related: #59
2023-04-19 16:09:40 -04:00
embeddedt
856c3cbc11
Deduplicate some ModFileScanData 2023-04-19 09:56:35 -04:00
embeddedt
f27d94cf26
Disable class info clearing by default and only clear non-mixin entries 2023-04-18 22:24:48 -04:00
embeddedt
74c3f0ff90
Also clear ClassInfo cache after server starts 2023-04-18 22:17:32 -04:00
embeddedt
e5028535e9
Clear mixin ClassInfo cache when load finishes 2023-04-18 22:16:14 -04:00
embeddedt
201c2f3b51
Add off-by-default option to disable the DFU maps for flattening 2023-04-18 22:02:06 -04:00
embeddedt
7df692da1a Backport Starlight patch to lazily init emptiness maps 2023-04-17 18:23:30 -04:00
embeddedt
7a17c74762
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-04-16 21:13:23 -04:00
embeddedt
6ad1321048
Merge remote-tracking branch 'origin/main' into 1.18 2023-04-16 21:09:42 -04:00
embeddedt
274c41d637
Allow unloading unused structures 2023-04-16 20:54:41 -04:00
embeddedt
ad7bc8829b
Add eviction to some DFU caches 2023-04-16 20:27:42 -04:00
embeddedt
c090476925
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-04-16 14:45:04 -04:00
embeddedt
3a15e5c6bc
Merge remote-tracking branch 'origin/main' into 1.18 2023-04-16 14:39:23 -04:00
embeddedt
1602d3352f
Fix crash with some more types of empty paths 2023-04-16 14:38:11 -04:00
embeddedt
0af09b7e27
1.19 does not allow changing RenderTypes at runtime 2023-04-16 14:37:51 -04:00
embeddedt
e6716613cc
Merge remote-tracking branch 'origin/1.18' into 1.19.2 2023-04-16 14:15:10 -04:00
embeddedt
362bf03e5d
Merge remote-tracking branch 'origin/main' into 1.18 2023-04-16 13:31:20 -04:00
embeddedt
c8523b3844
Incrementing the index is important 2023-04-16 13:31:01 -04:00
embeddedt
dcd37391fe
Fix incorrect merge 2023-04-16 13:24:34 -04:00
embeddedt
44d178bb89
Merge remote-tracking branch 'origin/main' into 1.18 2023-04-16 13:21:40 -04:00
embeddedt
3497adfa6d
Bugfixes 2023-04-16 13:21:10 -04:00
embeddedt
4c8c6ead28
Merge remote-tracking branch 'origin/main' into 1.18 2023-04-16 13:16:06 -04:00
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