Skip to content

Commit

Permalink
1.20.6 update draft (#246)
Browse files Browse the repository at this point in the history
* Update Gradle and dependencies

* Craftbukkit classes are no longer relocated into a versioned package

* Change enchantment categories to tags + remove rarity

* Change smithing event using NBT to components + update some functions

* HACK remove unused NBT parse

* Use a fork of shadow plugin supporting Java 21

* Update Particles and vanilla Enchantments name in vane-enchantments

* Import org.json as API in build file

* Update more particle names

* Fix speedwalk config field name

* Use Adventure sendResourcePacks

* Use UUID for resource pack based on hash + HACK add prompt to pack request

* Resource pack prompt has been fixed in Paper

* Use components with ItemUtils' itemstack_from_string + set North compass to track lodestone

* Update resource pack version

* Catch the good exception in ItemUtil

* Get resource pack UUID from properties or config

* Don't send custom enchantments to client
  • Loading branch information
Sylfare authored May 30, 2024
1 parent 3821a2a commit 2e11f9c
Show file tree
Hide file tree
Showing 44 changed files with 578 additions and 278 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ env.sh
.project
.settings
.idea
.vscode
build
libs/
target/
Expand Down
17 changes: 9 additions & 8 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
plugins {
`java-library`
id("io.papermc.paperweight.userdev") version "1.5.11"
id("xyz.jpenilla.run-paper") version "2.2.0" // Adds runServer and runMojangMappedServer tasks for testing
id("io.papermc.paperweight.userdev") version "1.7.1"
id("xyz.jpenilla.run-paper") version "2.3.0" // Adds runServer and runMojangMappedServer tasks for testing
}

dependencies {
paperDevBundle("1.20.4-R0.1-SNAPSHOT")
paperDevBundle("1.20.6-R0.1-SNAPSHOT")
}

java {
sourceCompatibility = JavaVersion.VERSION_17
toolchain.languageVersion.set(JavaLanguageVersion.of(21))
}

// We don't need to generate an empty `vane.jar`
Expand All @@ -26,9 +26,10 @@ subprojects {
version = "1.14.0"

repositories() {
mavenLocal()
mavenCentral()
maven("https://papermc.io/repo/repository/maven-public/")
//maven("https://repo.dmulloy2.net/nexus/repository/public/")
maven("https://repo.dmulloy2.net/nexus/repository/public/")
maven("https://repo.mikeprimm.com/")
maven("https://repo.codemc.org/repository/maven-public/")
maven("https://jitpack.io")
Expand All @@ -53,14 +54,14 @@ configure(subprojects.filter {
apply(plugin = "io.papermc.paperweight.userdev")

dependencies {
paperDevBundle("1.20.4-R0.1-SNAPSHOT")
paperDevBundle("1.20.6-R0.1-SNAPSHOT")
}

tasks {
build {
dependsOn("reobfJar")
}
}
}
}

// All Projects except proxies and annotations.
Expand All @@ -85,7 +86,7 @@ configure(subprojects.filter {
}

dependencies {
implementation(group = "com.comphenix.protocol", name = "ProtocolLib", version = "5.0.0-SNAPSHOT")
implementation(group = "com.comphenix.protocol", name = "ProtocolLib", version = "5.2.1-SNAPSHOT")

compileOnly(project(":vane-annotations"))
annotationProcessor(project(path = ":vane-annotations", configuration = "reobf"))
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
4 changes: 3 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading

0 comments on commit 2e11f9c

Please sign in to comment.