Skip to content

Commit

Permalink
Some fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
AlphaKR93 committed Jan 22, 2025
1 parent 0c58a0b commit 5788942
Show file tree
Hide file tree
Showing 28 changed files with 386 additions and 894 deletions.
3 changes: 3 additions & 0 deletions build-data/dev-imports.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,6 @@
# mc_data chat_type/chat.json
# mc_data dimension_type/overworld.json
#

minecraft net.minecraft.server.commands.PardonCommand
minecraft net.minecraft.server.commands.PardonIpCommand
34 changes: 3 additions & 31 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,11 @@ import org.gradle.api.tasks.testing.logging.TestLogEvent

plugins {
java
`kotlin-dsl`
`maven-publish`
`always-up-to-date`
alias(libs.plugins.shadow) apply false
alias(libs.plugins.paperweight)
}

val jdkVersion = property("jdkVersion").toString().toInt()
kotlin.jvmToolchain(jdkVersion)

repositories {
mavenCentral()
maven("https://repo.papermc.io/repository/maven-public/") { name = "papermc"
Expand Down Expand Up @@ -67,7 +62,7 @@ tasks {
apiCoordinates.set("${project.group}:${brandName.lowercase()}-api")
libraryRepositories.addAll(
"https://repo1.maven.org/maven2/",
"https://papermc.io/repo/repository/maven-public/",
"https://repo.papermc.io/repository/maven-public/",
"https://repo.codemc.io/repository/maven-public/",
"https://jitpack.io",
)
Expand All @@ -84,7 +79,7 @@ allprojects {
apply(plugin = "java")
apply(plugin = "maven-publish")

java.toolchain.languageVersion.set(JavaLanguageVersion.of(jdkVersion))
java.toolchain.languageVersion.set(JavaLanguageVersion.of(21))

publishing.repositories.maven("https://maven.pkg.github.com/$providerRepo") {
name = "github"
Expand Down Expand Up @@ -116,7 +111,7 @@ subprojects {
tasks {
withType<JavaCompile>().configureEach {
options.encoding = Charsets.UTF_8.name()
options.release = jdkVersion
options.release = 21
}

withType<Javadoc> {
Expand All @@ -136,26 +131,3 @@ subprojects {
}
}
}

val paperRepoVal = property("paperRepo").toString()
val paperBranch = property("paperBranch").toString()
val purpurRepoVal = property("purpurRepo").toString()
val purpurBranch = property("purpurBranch").toString()
val pufferfishRepoVal = property("pufferfishRepo").toString()
val pufferfishBranch = property("pufferfishBranch").toString()
val isUsePufferfish = property("usePufferfish").toString().toBoolean()
alwaysUpToDate {

paperRepo.set(paperRepoVal)
paperRef.set(paperBranch)
paperCommitName.set("paperCommit")

purpurRepo.set(purpurRepoVal)
purpurRef.set(purpurBranch)
purpurCommitName.set("purpurCommit")

pufferfishRepo.set(pufferfishRepoVal)
pufferfishRef.set(pufferfishBranch)
usePufferfish.set(isUsePufferfish)

}
31 changes: 0 additions & 31 deletions buildSrc/build.gradle.kts

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit 5788942

Please sign in to comment.