Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

5.0+1.16.1 #11

Merged

Conversation

KingContaria
Copy link
Member

  • fix registry tags not being reloaded if datapacks are used between non-datapack resets
  • java 8 compat
  • seedqueue compat
  • misc cleanup

KingContaria and others added 15 commits August 8, 2024 00:43
also removed some ci/cd stuff and specified that its a client mod

(cherry picked from commit 8122b198ce6ec1716e314ba34d8f8c9c48918a93)
now compares datapacks used against vanillas DataPackSettings.SAFE_MODE to allow mod datapacks from fabric api
before it would not reload registry tags if a datapack had been loaded between worlds using the cache, making the registry tags not reload even though they needed to
also uses mixinextras for some nicer mixins now

(cherry picked from commit 4fc0928922b29607a85e7684ea768fd71b5919d4)
also changed back the redirect to an inject-cancel because it better covers what we want to do, which is stopping the cancelling of anything to do with our cached resource manager, including potential stuff other mods could put in the close method that would still run with the redirect

(cherry picked from commit c55501c78ef4bda13b118cc0d03d1d488f3095bc)
(cherry picked from commit 0f84c6d87f10502f208414297dbb9081c460ae34)
its unnecessary, the only thing being initiliazed by it would be the LOGGER and we don't actually need it that early for anything, we can just create it whenever the class is loaded normally

(cherry picked from commit 1f738bb01c30acffe859ed896a125d545743b4be)
(cherry picked from commit 0a7d00d79b4070b5fe7d4c386d1e290d27af18c6)
last ci/cd version was 4.0, so we start fresh with 5.0

(cherry picked from commit e5f662945196286e63b4ef2779a3c0bf93251a82)
(cherry picked from commit 87f91cdc9a3dcb3123e079b9698956f7a85403e2)
(cherry picked from commit 7e0b0405d9d9e9a74e369959c7cda911495f5a50)
this replaces a much more brittle mixinsquared compat mixin in seedqueue

(cherry picked from commit 119db8b293cc158406af3c1339a881eb197fd54d)
(cherry picked from commit ff77b31f24f503db340c15f11953751d1f44b27f)
(cherry picked from commit 05b579bb04b20264e0f1778b2b410362f5b27a45)
(cherry picked from commit ce84e5580a00693c5395453f860259fdc43d9fc7)
(cherry picked from commit 8676b6c7c27cb09c681a887aad164da6bff8c8a2)
this ensures the check to reload recipes is run when loading an existing seedqueue entry

(cherry picked from commit f7135c71906de45c37f6ae8751de928ac5bb7752)
Copy link
Member

@tildejustin tildejustin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

approved a bit ago

@tildejustin tildejustin merged commit bb91b30 into Minecraft-Java-Edition-Speedrunning:1.16.1 Aug 8, 2024
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants