From eb0d8a25027a874ad2341cb77883fa5cc06cfd88 Mon Sep 17 00:00:00 2001 From: Cow Date: Wed, 16 Jun 2021 12:19:21 +0200 Subject: Updated Gradle related things based on asbyth's instructions --- build.gradle | 18 ++++++++++++++++-- gradle/wrapper/gradle-wrapper.jar | Bin 52271 -> 59203 bytes gradle/wrapper/gradle-wrapper.properties | 2 +- .../cowlection/command/TabCompletableCommand.java | 2 +- 4 files changed, 18 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index c9883f2..56090b8 100644 --- a/build.gradle +++ b/build.gradle @@ -4,11 +4,15 @@ buildscript { jcenter() maven { name = "forge" - url = "http://files.minecraftforge.net/maven" + url = "https://maven.minecraftforge.net/" + } + maven { + name = "jitpack" + url = "https://jitpack.io/" } } dependencies { - classpath 'net.minecraftforge.gradle:ForgeGradle:2.1-SNAPSHOT' + classpath "com.github.asbyth:ForgeGradle:6f53277" } } apply plugin: 'net.minecraftforge.gradle.forge' @@ -90,6 +94,16 @@ processResources { } } +task moveResources { + doLast { + ant.move file: "${buildDir}/resources/main", + todir: "${buildDir}/classes/java" + } +} + +moveResources.dependsOn processResources +classes.dependsOn moveResources + import org.apache.tools.ant.filters.FixCrLfFilter // update versions in update.json copy { diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 30d399d..e708b1c 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 fb87029..f1c758a 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-all.zip diff --git a/src/main/java/de/cowtipper/cowlection/command/TabCompletableCommand.java b/src/main/java/de/cowtipper/cowlection/command/TabCompletableCommand.java index b873714..43ed2b6 100644 --- a/src/main/java/de/cowtipper/cowlection/command/TabCompletableCommand.java +++ b/src/main/java/de/cowtipper/cowlection/command/TabCompletableCommand.java @@ -28,7 +28,7 @@ public class TabCompletableCommand extends CommandBase { @Override public String getCommandUsage(ICommandSender sender) { - return null; + return "/" + cmdName + " [additional parameters]. This client-command provides username tab-completion for the equivalent server-side command."; } @Override -- cgit