-
Notifications
You must be signed in to change notification settings - Fork 31
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
Update to 1.20.5 #200
Conversation
1dc8ea9
to
0a6c055
Compare
Updating the |
@@ -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 |
There was a problem hiding this comment.
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) { |
There was a problem hiding this comment.
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
Collections.emptyMap(), //TODO cookies | ||
MC.gui.getChat().storeState(), //TODO state | ||
false)) { |
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
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 |
There was a problem hiding this comment.
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.
- Neoforge builds temporarily disabled - Code not yet updated - Bumped Gradle & JDK to 8.5 & 21 - Source/target compatibility still set to 17
21dd21f
to
fb614f6
Compare
Neoforge builds temporarily disabled.See upstream PR 1.20.5 Port neoforged/NeoForge#794Feel 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?