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

Update to 1.20.5 #200

Merged
merged 9 commits into from
Apr 24, 2024
Merged

Update to 1.20.5 #200

merged 9 commits into from
Apr 24, 2024

Conversation

MattSturgeon
Copy link
Member

@MattSturgeon MattSturgeon commented Apr 19, 2024

  • Neoforge builds temporarily disabled. See upstream PR 1.20.5 Port neoforged/NeoForge#794
  • Neoforge PR maven added
  • Bumped Gradle & JDK to 8.5 & 21
  • Source/target compatibility still set to 17

Feel free to push to this branch.

Some changes here may apply to the older versions too.

We'll likely want to use a Java 21 JDK on all branches now, which might mean updating them to Gradle 8.6?

@MattSturgeon MattSturgeon changed the title wip: bump versions ready for 1.20.5 Update to 1.20.5 Apr 19, 2024
settings.gradle Outdated Show resolved Hide resolved
@MattSturgeon MattSturgeon marked this pull request as ready for review April 20, 2024 03:36
@MattSturgeon
Copy link
Member Author

Updating the FreeCamera entity and a couple mixins was enough to run the game and use Freecam in-game. I haven't tested very thoroughly though.

@@ -101,7 +108,7 @@ allprojects {
// see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html
tasks.withType(JavaCompile) {
options.encoding = "UTF-8"
options.release = 17
options.release = 21
Copy link
Member Author

Choose a reason for hiding this comment

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

should we also bump our source compatibility, or leave it at 17 to make backporting easier?

Come to think of if, maybe it should be set to 8 🤔

@Mixin(EntityRenderer.class)
public class EntityRendererMixin {

// Prevent rendering of nametag in inventory screen
@Inject(method = "renderNameTag", at = @At("HEAD"), cancellable = true)
private void onRenderLabel(Entity entity, Component text, PoseStack matrices, MultiBufferSource vertexConsumers, int light, CallbackInfo ci) {
private void onRenderLabel(Entity entity, Component text, PoseStack poseStack, MultiBufferSource multiBufferSource, int light, float partialTick, CallbackInfo ci) {
Copy link
Member Author

Choose a reason for hiding this comment

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

Some of these param renames could be applied elsewhere and backported

Comment on lines 40 to 42
Collections.emptyMap(), //TODO cookies
MC.gui.getChat().storeState(), //TODO state
false)) {
Copy link
Member Author

Choose a reason for hiding this comment

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

Need to check if these are the correct values to use.

MC.gui.getChat().storeState() is used elsewhere in the MC codebase.

Copy link
Collaborator

Choose a reason for hiding this comment

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

Using an empty map for serverCookies should be fine since the networking code won't be used in the first place. Same deal with using MC.gui.getChat().storeState() for chatState

minecraft_version=1.20.4
parchment_version=1.20.2-2023.12.10
minecraft_version=1.20.5-rc1
parchment_version=1.20.4-2024.02.25
Copy link
Member Author

Choose a reason for hiding this comment

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

parchment version bump can be backported, or merged early.

IMO waiting for a full release of 1.20.5 shouldn't be necessary to merge this to main, we can always bump again later.

@hashalite hashalite merged commit f99f5c5 into main Apr 24, 2024
1 check passed
@MattSturgeon MattSturgeon deleted the 1.20.5-dev branch April 24, 2024 02:30
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