diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index df174ce..75be78c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -4,7 +4,7 @@ on: push: branches: - '1.20.4' - - '1.21.3' + - '1.21.1' #echo "$(${{github.workspace}}/gradlew printVersion -q | awk -F "version:" '{printf $2}')" jobs: diff --git a/Jenkinsfile b/Jenkinsfile deleted file mode 100644 index 03c37aa..0000000 --- a/Jenkinsfile +++ /dev/null @@ -1,36 +0,0 @@ -pipeline { - agent any - environment { - WEBHOOKURL = credentials('JenkinsDiscordWebhook') - } - stages { - stage('Prepare Build') { - steps { - sh '''cp -a /var/lib/jenkins/buildMetadata/ObserverLib-1.19/. . -rm -rf README.md''' - } - } - stage('Build') { - steps { - sh '''./gradlew build publish''' - } - } - stage('Prepare Archive') { - steps { - sh '''cp -a ./build/libs/. . -rm -rf build gradle .gradle -find . ! -name \'*.jar\' -delete''' - } - } - stage('Archive') { - steps { - archiveArtifacts '*.jar' - } - } - stage('Notify') { - steps { - discordSendHellFire link: env.BUILD_URL, result: currentBuild.currentResult, webhookURL: "${WEBHOOKURL}" - } - } - } -} diff --git a/build.gradle b/build.gradle index 4fbd299..4a65292 100644 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,7 @@ plugins { id 'eclipse' id 'idea' id 'maven-publish' - id 'net.neoforged.gradle.userdev' version '7.0.145' + id 'net.neoforged.gradle.userdev' version '7.0.170' } tasks.named('wrapper', Wrapper).configure { @@ -48,7 +48,7 @@ runs { } data { - programArguments.addAll '--mod', project.mod_id, '--all', '--output', file('src/generated/resources/').getAbsolutePath(), '--existing', file('src/main/resources/').getAbsolutePath() + arguments.addAll '--mod', project.mod_id, '--all', '--output', file('src/generated/resources/').getAbsolutePath(), '--existing', file('src/main/resources/').getAbsolutePath() } } diff --git a/gradle.properties b/gradle.properties index 2008078..fed7657 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,18 +2,18 @@ org.gradle.jvmargs=-Xmx4G org.gradle.daemon=false org.gradle.debug=false -neogradle.subsystems.parchment.minecraftVersion=1.21 -neogradle.subsystems.parchment.mappingsVersion=2024.11.10 +neogradle.subsystems.parchment.minecraftVersion=1.21.1 +neogradle.subsystems.parchment.mappingsVersion=2024.11.17 -minecraft_version=1.21 -minecraft_version_range=[1.21,1.21.1) -neo_version=21.0.167 -neo_version_range=[21.0.0-beta,) +minecraft_version=1.21.1 +minecraft_version_range=[1.21.1,1.22) +neo_version=21.1.85 +neo_version_range=[21.1.0,) loader_version_range=[4,) mod_id=observerlib mod_name=ObserverLib -mod_license=All Rights Reserved +mod_license=GNU Lesser General Public License v3.0 mod_version=1.9.0 mod_group_id=hellfirepvp.observerlib mod_authors=HellFirePvP diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 2c35211..a4b76b9 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 09523c0..e2847c8 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME