From 22131b38d992cc5a502d6b839d6d298cf9c3b607 Mon Sep 17 00:00:00 2001 From: David Berdik Date: Wed, 7 Jul 2021 09:36:02 -0400 Subject: [PATCH] Migrated to a more mature Gradle plugin for building Herobrine using the Mojang mappings. --- build.gradle | 34 ++++------------------------------ settings.gradle | 2 +- 2 files changed, 5 insertions(+), 31 deletions(-) diff --git a/build.gradle b/build.gradle index b2f84c6..3225eca 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ plugins { id 'java-library' - id 'com.github.yannicklamprecht.spigot.tools' version '1.0.1' + id 'xyz.jpenilla.special-gradle' version '1.0.0-SNAPSHOT' } java { @@ -34,34 +34,8 @@ dependencies { } tasks { - spigotTools { - mojangMapped.set(true) - version.set("1.17") - outputClassifier.set("spigot-mapped") - } -} - -task genReleaseJar { - group = 'spigottools' - description = 'Generates a Spigot-mapped version of the jar for use with Spigot.' - ext.toolingDir = System.getProperty("user.dir") - ext.homeDir = project.gradle.gradleUserHomeDir.parent - - doLast { - exec { - workingDir "${buildDir}" - commandLine 'java', '-jar', ext.toolingDir + '/tooling/specialsource/SpecialSource.jar', '-i', 'libs/' + rootProject.name + '.jar', - '-o', 'libs/' + rootProject.name + '-obf.jar', '-m', - ext.homeDir + '/.m2/repository/org/spigotmc/minecraft-server/1.17-R0.1-SNAPSHOT/minecraft-server-1.17-R0.1-SNAPSHOT-maps-mojang.txt', - '--reverse', '--live' - } - - exec { - workingDir "${buildDir}" - commandLine 'java', '-jar', ext.toolingDir + '/tooling/specialsource/SpecialSource.jar', '-i', 'libs/' + rootProject.name + '-obf.jar', - '-o', 'libs/' + rootProject.name + '-final.jar', '-m', - ext.homeDir + '/.m2/repository/org/spigotmc/minecraft-server/1.17-R0.1-SNAPSHOT/minecraft-server-1.17-R0.1-SNAPSHOT-maps-spigot.csrg', - '--live' - } + specialGradle { + minecraftVersion.set("1.17") + specialSourceVersion.set("1.10.0") } } \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index 1dfdddd..a68ceac 100644 --- a/settings.gradle +++ b/settings.gradle @@ -9,7 +9,7 @@ pluginManagement { repositories { - maven { url = "https://eldonexus.de/repository/maven-releases/" } + maven { url = "https://repo.jpenilla.xyz/snapshots/" } gradlePluginPortal() } }