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

Updated Bukkit to 1.20.6 #458

Merged
merged 8 commits into from
Jun 23, 2024

Conversation

OakLoaf
Copy link
Contributor

@OakLoaf OakLoaf commented May 31, 2024

In this PR I have also set the Github gradle-build action to run on Java 21 as it is required by 1.20.6.

I am having some trouble getting the gradle dependencies to work so have been unable to test this at all.

@OakLoaf OakLoaf marked this pull request as draft May 31, 2024 11:13
@OakLoaf
Copy link
Contributor Author

OakLoaf commented May 31, 2024

If anyone has any ideas as to why these dependencies aren't working that'd be really helpful:

A problem occurred configuring project ':platforms:bukkit:nms:v1_20_R6'.
> Failed to notify project evaluation listener.
   > Could not resolve all files for configuration ':platforms:bukkit:nms:v1_20_R6:paperweightDevelopmentBundle'.
      > Could not find io.papermc.paper:dev-bundle:1.20.6-R0.1-20240530.204353-104.
        Searched in the following locations:
          - https://repo.maven.apache.org/maven2/io/papermc/paper/dev-bundle/1.20.6-R0.1-SNAPSHOT/dev-bundle-1.20.6-R0.1-20240530.204353-104.pom
          - https://plugins.gradle.org/m2/io/papermc/paper/dev-bundle/1.20.6-R0.1-SNAPSHOT/dev-bundle-1.20.6-R0.1-20240530.204353-104.pom
          - https://maven.fabricmc.net/io/papermc/paper/dev-bundle/1.20.6-R0.1-SNAPSHOT/dev-bundle-1.20.6-R0.1-20240530.204353-104.pom
          - https://repo.codemc.org/repository/maven-public/io/papermc/paper/dev-bundle/1.20.6-R0.1-SNAPSHOT/dev-bundle-1.20.6-R0.1-20240530.204353-104.pom
          - https://papermc.io/repo/repository/maven-public/io/papermc/paper/dev-bundle/1.20.6-R0.1-SNAPSHOT/dev-bundle-1.20.6-R0.1-20240530.204353-104.pom
          - https://files.minecraftforge.net/maven/io/papermc/paper/dev-bundle/1.20.6-R0.1-SNAPSHOT/dev-bundle-1.20.6-R0.1-20240530.204353-104.pom
          - https://maven.quiltmc.org/repository/release/io/papermc/paper/dev-bundle/1.20.6-R0.1-SNAPSHOT/dev-bundle-1.20.6-R0.1-20240530.204353-104.pom
          - https://jitpack.io/io/papermc/paper/dev-bundle/1.20.6-R0.1-SNAPSHOT/dev-bundle-1.20.6-R0.1-20240530.204353-104.pom
          - https://s01.oss.sonatype.org/content/repositories/snapshots/io/papermc/paper/dev-bundle/1.20.6-R0.1-SNAPSHOT/dev-bundle-1.20.6-R0.1-20240530.204353-104.pom
          - https://repo.papermc.io/repository/maven-public/io/papermc/paper/dev-bundle/1.20.6-R0.1-SNAPSHOT/dev-bundle-1.20.6-R0.1-20240530.204353-104.pom
        Required by:
            project :platforms:bukkit:nms:v1_20_R6

Possible solution:
 - Declare repository providing the artifact, see the documentation at https://docs.gradle.org/current/userguide/declaring_repositories.html

@Arthurmeade12
Copy link

If you're not aware it looks like a lot of work has already been done on this branch here https://github.com/PolyhedralDev/Terra/commits/dev/1.20.6/

@justaureus
Copy link

If you're not aware it looks like a lot of work has already been done on this branch here https://github.com/PolyhedralDev/Terra/commits/dev/1.20.6/

Not really no, that's just the initial work required for 1.20.6. It's also only for Fabric not Paper.

@OakLoaf
Copy link
Contributor Author

OakLoaf commented Jun 1, 2024

If you're not aware it looks like a lot of work has already been done on this branch here https://github.com/PolyhedralDev/Terra/commits/dev/1.20.6/

This is a pull request for that branch :)

@IkyMax
Copy link

IkyMax commented Jun 2, 2024

Hey! This happens because in the paper repo is marked as

    `1.20.6-R0.1-20240530.204353-103`

But you're using

    `1.20.6-R0.1-20240530.204353-104`

this is in buildSrc/src/main/kotlin/Versions.kt, anyways, you should use the newest devbundle with

const val paperBuild = "$minecraft-R0.1-20240601.143523-105"

@IkyMax
Copy link

IkyMax commented Jun 2, 2024

Forget what i Said LMAO

paperBuild and paperDevBundle are two separated repos and they're NOT synced in builds, so in order to use them both, you need to specify the versions for both! Use

    const val paperBuild = "$minecraft-R0.1-20240601.143523-106"

and this

    const val paperDevBundle = "$minecraft-R0.1-20240601.143523-105"

Anyways, this is actually weird. for some reason is asking for compiling in Java 17:

image

@OakLoaf
Copy link
Contributor Author

OakLoaf commented Jun 2, 2024

Forget what i Said LMAO

paperBuild and paperDevBundle are two separated repos and they're NOT synced in builds, so in order to use them both, you need to specify the versions for both! Use

    const val paperBuild = "$minecraft-R0.1-20240601.143523-106"

and this

    const val paperDevBundle = "$minecraft-R0.1-20240601.143523-105"

Oooh ok, I'll give that a go!

@IkyMax
Copy link

IkyMax commented Jun 2, 2024

Oooh ok, I'll give that a go!

Sure! also, check the java thing lol

@OakLoaf
Copy link
Contributor Author

OakLoaf commented Jun 2, 2024

Yeahh I'll try to work out what's going on there

@OakLoaf
Copy link
Contributor Author

OakLoaf commented Jun 2, 2024

Not having much luck with this one unfortunately.
:platforms:bukkit:common:main: Could not resolve io.papermc.paper:paper-api:1.20.6-R0.1-20240601.143523-106.

@IkyMax
Copy link

IkyMax commented Jun 2, 2024

weird, let me check your repo lol

@OakLoaf
Copy link
Contributor Author

OakLoaf commented Jun 2, 2024

I'll commit my attempt real quick

@IkyMax
Copy link

IkyMax commented Jun 3, 2024

Sorry, i was busy, but i find what you need to change the repo in DependencyConfig.kt and in build.gradle.kts from https://papermc.io/repo/repository/maven-public/ to https://repo.papermc.io/repository/maven-public/

Also you need to change the Java version to 21 in CompilationConfig.kt but this breaks fabric builds so idk

@IkyMax
Copy link

IkyMax commented Jun 3, 2024

I did a bukkit build only with java version 21 and the Paper API error didn't happen but the NMS are totally broken, you also would need to migrate the bukkit API to the Bukkit long-standing API inside RegistryFetcher.java

@OakLoaf
Copy link
Contributor Author

OakLoaf commented Jun 3, 2024

Sorry, i was busy, but i find what you need to change the repo in DependencyConfig.kt and in build.gradle.kts from https://papermc.io/repo/repository/maven-public/ to https://repo.papermc.io/repository/maven-public/

Also you need to change the Java version to 21 in CompilationConfig.kt but this breaks fabric builds so idk

Ahhh ok, didn't know about the dependency kotlin file, I'll give that one a go.

I'm not surprised that the NMS wasn't working, I've not been able to index so couldn't see any method names.

@OakLoaf
Copy link
Contributor Author

OakLoaf commented Jun 3, 2024

I did a bukkit build only with java version 21 and the Paper API error didn't happen but the NMS are totally broken, you also would need to migrate the bukkit API to the Bukkit long-standing API inside RegistryFetcher.java

I'm confused, as I think this was done in my initial commit

Edit: It seems like the issee you were referring to was the issue in the Initializer interface. Resolving that at the moment

@OakLoaf OakLoaf marked this pull request as ready for review June 3, 2024 10:36
@OakLoaf
Copy link
Contributor Author

OakLoaf commented Jun 3, 2024

I've tested this with the overworld pack on a 1.20.6 server, everything appears to be working as intended with no errors in console.

@Aaron2550
Copy link
Contributor

builds fine, runs overworld 2.0 fine but i do get some errors and warnings: https://files.catbox.moe/wdw1m4.txt

@OakLoaf
Copy link
Contributor Author

OakLoaf commented Jun 3, 2024

builds fine, runs overworld 2.0 fine but i do get some errors and warnings: https://files.catbox.moe/wdw1m4.txt

Is this error from another pack? Based off of the error I would assume you need to change minecraft:skeleton to skeleton

@Aaron2550
Copy link
Contributor

Aaron2550 commented Jun 3, 2024

its https://github.com/PolyhedralDev/TerraOverworldConfig/tree/2.0 and does not show up on 1.20.4 which is why i am mentioning this here

@OakLoaf
Copy link
Contributor Author

OakLoaf commented Jun 3, 2024

its https://github.com/PolyhedralDev/TerraOverworldConfig/tree/2.0 and does not show up on 1.20.4 which is why i am mentioning this here

I've just tested on the latest modrinth release on a 1.20.4 server and the issue is still present.

@Aaron2550
Copy link
Contributor

no clue then, generated a 20kx20k world with chunky and didnt get it once

@IkyMax
Copy link

IkyMax commented Jun 10, 2024

Hey! this is normal? lol

image

@OakLoaf
Copy link
Contributor Author

OakLoaf commented Jun 10, 2024

Good spot, let me resolve this!

@OakLoaf
Copy link
Contributor Author

OakLoaf commented Jun 10, 2024

That should be resolved in 9e60db4

@OakLoaf OakLoaf changed the title Updated Bukkit to 1.20.6 Updated Bukkit to 1.21 Jun 16, 2024
@OakLoaf
Copy link
Contributor Author

OakLoaf commented Jun 16, 2024

I've updated this pr for Bukkit 1.21, I'm unsure if this reflection here 4e7de50 is the best way to do this but it's the only thing I could personally see.

This is currently untested

@TobyWarren
Copy link

Doing a test build now. Will try and setup a server to test on.

@TobyWarren
Copy link

failure.txt
Not sure if this is something on my end, but it still doesn't build.

@IkyMax
Copy link

IkyMax commented Jun 17, 2024

failure.txt Not sure if this is something on my end, but it still doesn't build.

Have you builded the Spigot version only? this usually happens because you only ran gradle build instead of the specific platform build

@TobyWarren
Copy link

failure.txt Not sure if this is something on my end, but it still doesn't build.

Have you builded the Spigot version only? this usually happens because you only ran gradle build instead of the specific platform build

Whats the command for that again?

@Aaron2550
Copy link
Contributor

Built your branch and paper 1.21, heres the log:
https://files.catbox.moe/si1g9m.log

@OakLoaf
Copy link
Contributor Author

OakLoaf commented Jun 17, 2024

Built your branch and paper 1.21, heres the log: https://files.catbox.moe/si1g9m.log

Ahh, seems like cloud will need an update

@Aaron2550
Copy link
Contributor

There was one person who reported iit not even loading on spigot as of now

@TobyWarren
Copy link

Looks like there is an issue with Terra pulling version information on 1.21 Paper, have not tested Spigot. Log attached.
latest.log

@OakLoaf OakLoaf changed the title Updated Bukkit to 1.21 Updated Bukkit to 1.20.6 Jun 18, 2024
@OakLoaf
Copy link
Contributor Author

OakLoaf commented Jun 18, 2024

Reverted 1.21 commits and moved them to #461

@Zahikusa
Copy link

Zahikusa commented Jun 22, 2024

I really need your plugin for my new server :) Anything I can help with to get this running on paper for 1.20.6?

@OakLoaf
Copy link
Contributor Author

OakLoaf commented Jun 22, 2024

It should run on 1.20.6 already if you compile it yourself

@justaureus
Copy link

These commits look good, tested this PR locally and all seems to be well. Thank you for your contributions!

@Aaron2550
Copy link
Contributor

1.20.6 test jar as of 500cf3c Terra-bukkit-6.5.0-BETA+500cf3c0b-shaded.zip

@justaureus justaureus merged commit 8d01059 into PolyhedralDev:dev/1.20.6 Jun 23, 2024
1 check failed
@OakLoaf OakLoaf deleted the dev/1.20.6/bukkit branch October 25, 2024 16:59
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.

8 participants