From 1d3ba82e1482ae4186a8167677cac27d470c0a40 Mon Sep 17 00:00:00 2001
From: James Peters <jameslfc19@gmail.com>
Date: Mon, 12 Jul 2021 21:18:13 +0100
Subject: [PATCH] Update .travis.yml

Update .travis.yml

Update .travis.yml

Update .travis.yml

Fixed BuildTools error

Update .travis.yml

Update .travis.yml

Update .travis.yml

Update .travis.yml

Update .travis.yml

Update .travis.yml

Update .travis.yml

Fix BuildTools

Update .travis.yml

Update .travis.yml

Fix BuildTools
---
 .travis.yml                    | 10 +++++++---
 BuildTools/build-1.17+.sh      | 16 ++++++++--------
 ChestsPlusPlus_1_17_R1/pom.xml | 24 ++++++++++--------------
 3 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 02d3bb8..f2f032f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,10 +1,14 @@
 language: java
+dist: trusty
 
 before_install:
 - cd BuildTools
-- jdk_switcher use openjdk8
-- bash build-pre1.17.sh
-- jdk_switcher use openjdk16
+#- bash build-pre1.17.sh
+- wget https://github.com/sormuras/bach/raw/master/install-jdk.sh
+- chmod +x $TRAVIS_BUILD_DIR/BuildTools/install-jdk.sh
+- export JAVA_HOME=$HOME/openjdk16
+- $TRAVIS_BUILD_DIR/BuildTools/install-jdk.sh -F 16 --target $JAVA_HOME
+- export PATH=$JAVA_HOME/bin:$PATH
 - bash build-1.17+.sh
 - cd ../
 
diff --git a/BuildTools/build-1.17+.sh b/BuildTools/build-1.17+.sh
index 07f20d7..134e2fd 100644
--- a/BuildTools/build-1.17+.sh
+++ b/BuildTools/build-1.17+.sh
@@ -5,27 +5,27 @@ echo "Checking BuildTools 1.17+ cache"
 MAVEN_DIR="$HOME/.m2"
 
 #CraftBukkit in local repo
-CRAFTBUKKIT="${MAVEN_DIR}/repository/org/bukkit/craftbukkit"
+SPIGOT="${MAVEN_DIR}/repository/org/spigotmc/spigot"
 
 #Versions
-array=("1.17")
+array=("1.17.1")
 
 #Download BuildTools jar
 curl -s -o BuildTools.jar https://hub.spigotmc.org/jenkins/job/BuildTools/lastSuccessfulBuild/artifact/target/BuildTools.jar
 
 for i in "${array[@]}"
 do
-  VERSION_DIR="${CRAFTBUKKIT}/${i}-R0.1-SNAPSHOT"
+  VERSION_DIR="${SPIGOT}/${i}-R0.1-SNAPSHOT"
 
     if [ -d "$VERSION_DIR" ]; then
-      echo "CraftBukkit version ${i} is cached!"
+      echo "Spigot version ${i} is cached in ${VERSION_DIR}!"
       echo "Checking for latest commit! "
-      java -jar BuildTools.jar --rev ${i} --compile craftbukkit --compile-if-changed --remapped  > /dev/null 2>&1
+      java -jar BuildTools.jar --rev ${i} --compile-if-changed --remapped  > /dev/null 2>&1
       echo "Finished Check."
     else
-      echo "CraftBukkit version ${i} isn't cached!"
+      echo "Spigot version ${i} isn't cached!"
       echo "Running BuildTools!"
-      java -jar BuildTools.jar --rev ${i} --compile craftbukkit --remapped > /dev/null 2>&1
-      echo "Compiled CraftBukkit ${i}"
+      java -jar BuildTools.jar --rev ${i} --remapped > /dev/null 2>&1
+      echo "Compiled Spigot ${i} in ${VERSION_DIR}"
     fi
 done
diff --git a/ChestsPlusPlus_1_17_R1/pom.xml b/ChestsPlusPlus_1_17_R1/pom.xml
index 0354c58..70035f1 100644
--- a/ChestsPlusPlus_1_17_R1/pom.xml
+++ b/ChestsPlusPlus_1_17_R1/pom.xml
@@ -10,6 +10,10 @@
         <relativePath>../pom.xml</relativePath>
     </parent>
 
+    <properties>
+        <minecraft.version>1.17.1</minecraft.version>
+    </properties>
+
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>
     <artifactId>ChestsPlusPlus_1_17_R1</artifactId>
@@ -32,7 +36,7 @@
         <dependency>
             <groupId>org.spigotmc</groupId>
             <artifactId>spigot-api</artifactId>
-            <version>1.17-R0.1-SNAPSHOT</version>
+            <version>${minecraft.version}-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -42,18 +46,10 @@
             <scope>compile</scope>
         </dependency>
 
-        <dependency>
-            <groupId>org.bukkit</groupId>
-            <artifactId>craftbukkit</artifactId>
-            <version>1.17-R0.1-SNAPSHOT</version>
-            <classifier>remapped-mojang</classifier>
-            <scope>provided</scope>
-        </dependency>
-
         <dependency>
             <groupId>org.spigotmc</groupId>
             <artifactId>spigot</artifactId>
-            <version>1.17-R0.1-SNAPSHOT</version>
+            <version>${minecraft.version}-R0.1-SNAPSHOT</version>
             <classifier>remapped-mojang</classifier>
             <scope>provided</scope>
         </dependency>
@@ -73,9 +69,9 @@
                         </goals>
                         <id>remap-obf</id>
                         <configuration>
-                            <srgIn>org.spigotmc:minecraft-server:1.17-R0.1-SNAPSHOT:txt:maps-mojang</srgIn>
+                            <srgIn>org.spigotmc:minecraft-server:${minecraft.version}-R0.1-SNAPSHOT:txt:maps-mojang</srgIn>
                             <reverse>true</reverse>
-                            <remappedDependencies>org.spigotmc:spigot:1.17-R0.1-SNAPSHOT:jar:remapped-mojang</remappedDependencies>
+                            <remappedDependencies>org.spigotmc:spigot:${minecraft.version}-R0.1-SNAPSHOT:jar:remapped-mojang</remappedDependencies>
                             <remappedArtifactAttached>true</remappedArtifactAttached>
                             <remappedClassifierName>remapped-obf</remappedClassifierName>
                         </configuration>
@@ -88,8 +84,8 @@
                         <id>remap-spigot</id>
                         <configuration>
                             <inputFile>${project.build.directory}/${project.artifactId}-${project.version}-remapped-obf.jar</inputFile>
-                            <srgIn>org.spigotmc:minecraft-server:1.17-R0.1-SNAPSHOT:csrg:maps-spigot</srgIn>
-                            <remappedDependencies>org.spigotmc:spigot:1.17-R0.1-SNAPSHOT:jar:remapped-obf</remappedDependencies>
+                            <srgIn>org.spigotmc:minecraft-server:${minecraft.version}-R0.1-SNAPSHOT:csrg:maps-spigot</srgIn>
+                            <remappedDependencies>org.spigotmc:spigot:${minecraft.version}-R0.1-SNAPSHOT:jar:remapped-obf</remappedDependencies>
                         </configuration>
                     </execution>
                 </executions>