kejonaMC · Konicai · Jul 6, 2021 · Jul 6, 2021 · Jul 6, 2021 · Jul 6, 2021
diff --git a/src/main/resources/config.toml → devconfig.yml b/src/main/resources/config.toml → devconfig.yml
@@ -1,26 +1,38 @@
-# GeyserUpdater
+# GeyserUpdater configuration with more settings enabled
 # Made by Jens & YHDiamond
 
 # NOTICE: Please read the README on our github page for full information regarding these options!
 # https://github.com/ProjectG-Plugins/GeyserUpdater
 
-# If enabled, GeyserUpdater will check for new Geyser builds on server start, and on the interval specified by Auto-Update-Interval. If a new build exists, it will be downloaded.
-Auto-Update-Geyser=false
+default-updates:
+  geyser:
+    enable: true
+    auto-check: true
+    auto-update: true
+  floodgate:
+    enable: false
+    auto-check: true
+    auto-update: false
+
 # The interval in hours between each auto update check.
-Auto-Update-Interval=24
+auto-update-interval: 24
+# The maximum amount of seconds that a download is allowed to run for. Increase if you are running into issues on a slow internet connection.
+download-time-limit: 300
+# Delete the downloaded file if the file hash of the downloaded file did not match what the download server provided.
+# Or if the file hash was not checked and the download time limit was reached, or an exception occurred.
+# If the file hash is not correct the downloaded file is likely corrupt or unfinished.
+delete-on-fail: true
 
 # If enabled, GeyserUpdater will attempt to restart the server 10 seconds after a new version of Geyser has been successfully downloaded.
 # If you aren't using a hosting provider or a server wrapper, you will need a restart script.
-Auto-Restart-Server=false
+auto-restart-server: true
 # When enabled, GeyserUpdater will automatically generate a restart script for you. If you are using CraftBukkit or a proxy
 # you will need to use the generated script to start your server! If you are using a hosting provider or a server wrapper you probably don't need this.
-Auto-Script-Generating=false
-
+auto-script-generating: true
 # Configure the message that is sent to all online players warning them that the server will be restarting in 10 seconds.
-Restart-Message-Players='&2This server will be restarting in 10 seconds!'
+restart-message-players: "§2This server will be restarting in 10 seconds!"
 
 # Enable debug logging
-Enable-Debug=false
-
+enable-debug: true
 # Please do not change this version value!
-Config-Version=2
+config-version: 3
diff --git a/guDeploy.sh b/guDeploy.sh
@@ -14,14 +14,14 @@ waterDir="Waterfall-guDeploy"
 velocityDir="Velocity-guDeploy"
 
 #Links
-guLink="https://ci.projectg.dev/job/GeyserUpdater/job/1.5.0/lastSuccessfulBuild/artifact/target/GeyserUpdater-1.5.0.jar"
-geyserLink="https://ci.opencollab.dev/job/GeyserMC/job/Geyser/job/master/720/artifact/bootstrap/"
+guLink="https://ci.projectg.dev/job/GeyserUpdater/job/1.6.0/lastSuccessfulBuild/artifact/target/GeyserUpdater-1.6.0.jar"
+geyserLink="https://ci.opencollab.dev/job/GeyserMC/job/Geyser/job/master/821/artifact/bootstrap/"
 
 buildToolsLink="https://hub.spigotmc.org/jenkins/job/BuildTools/lastSuccessfulBuild/artifact/target/BuildTools.jar"
-paperLink="https://papermc.io/api/v2/projects/paper/versions/1.16.5/builds/750/downloads/paper-1.16.5-750.jar"
+paperLink="https://papermc.io/api/v2/projects/paper/versions/1.17.1/builds/209/downloads/paper-1.17.1-209.jar"
 bungeeLink="https://ci.md-5.net/job/BungeeCord/lastSuccessfulBuild/artifact/bootstrap/target/BungeeCord.jar"
-waterLink="https://papermc.io/api/v2/projects/waterfall/versions/1.16/builds/425/downloads/waterfall-1.16-425.jar"
-velocityLink="https://versions.velocitypowered.com/download/1.1.5.jar"
+waterLink="https://papermc.io/api/v2/projects/waterfall/versions/1.17/builds/448/downloads/waterfall-1.17-448.jar"
+velocityLink="https://versions.velocitypowered.com/download/3.0.0.jar"
 
 
 echo "[WARN] This script can generate up to 500MB of data!"
@@ -40,12 +40,20 @@ else
 fi
 
 # Download file for a given link
+# first arg is link, second arg is output file name (optional)
 download () {
-  jarURL="$1"
   if [[ "$downloadCmd" == "curl" ]]; then
-    curl "$jarURL" -O
+    if [[ -z "$2" ]]; then
+      curl "$1" -O
+    else
+      curl "$1" --output "$2"
+    fi
   else
-    wget "$jarURL"
+    if [[ -z "$2" ]]; then
+      wget "$1"
+    else
+      curl "$1" --output-document "$2"
+    fi
   fi
 }
 
@@ -57,56 +65,35 @@ getAllPlugins () {
   mkdir "$pluginCache"
   cd "$pluginCache" || exit
 
-  mkdir Common
-  cd Common || exit
+  mkdir "Common"
+  cd "Common" || exit
+  mkdir "GeyserUpdater"
+  cd "GeyserUpdater" || exit
+  echo
+  echo "[INFO] Downloading GeyserUpdater config"
+  download "https://raw.githubusercontent.com/ProjectG-Plugins/GeyserUpdater/1.6.0/devconfig.yml" "config.yml"
+  cd ../
   echo
   echo "[INFO] Downloading GeyserUpdater"
   download "$guLink"
   cd ../
 
   mkdir "Spigot"
   cd "Spigot" || exit
-  mkdir "GeyserUpdater"
-  cd "GeyserUpdater" || exit
-  echo "Auto-Update-Geyser: true
-Auto-Restart-Server: true
-Restart-Message-Players: '&2This server will be restarting in 10 seconds!'
-Auto-Script-Generating: true
-Enable-Debug: true
-Config-Version: 2" > config.yml
-  cd ../
   echo
   echo "[INFO] Downloading Geyser-Spigot.jar"
   download "$geyserLink"spigot/target/Geyser-Spigot.jar
   cd ../
 
-  mkdir BungeeCord
-  cd BungeeCord || exit
-  mkdir GeyserUpdater
-  cd GeyserUpdater || exit
-  echo "Auto-Update-Geyser: true
-Auto-Restart-Server: true
-Restart-Message-Players: '&2This server will be restarting in 10 seconds!'
-Auto-Script-Generating: true
-Enable-Debug: true
-Config-Version: 2" > config.yml
-  cd ../
+  mkdir "BungeeCord"
+  cd "BungeeCord" || exit
   echo
   echo "[INFO] Downloading Geyser-BungeeCord.jar"
   download "$geyserLink"bungeecord/target/Geyser-BungeeCord.jar
   cd ../
 
   mkdir "Velocity"
   cd "Velocity" || exit
-  mkdir "geyserupdater"
-  cd "geyserupdater" || exit
-  echo "Auto-Update-Geyser=true
-Auto-Restart-Server=true
-Restart-Message-Players='&2This server will be restarting in 10 seconds!'
-Auto-Script-Generating=true
-Enable-Debug=true
-Config-Version=2" > config.toml
-  cd ../
   echo
   echo "[INFO] Downloading Geyser-Velocity"
   download "$geyserLink"velocity/target/Geyser-Velocity.jar

diff --git a/pom.xml b/pom.xml
@@ -4,90 +4,78 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>com.projectg</groupId>
+    <groupId>dev.projectg</groupId>
     <name>GeyserUpdater</name>
     <artifactId>GeyserUpdater</artifactId>
-    <version>1.5.0</version>
+    <version>1.6.0</version>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
+        <jackson.version>2.10.2</jackson.version>
     </properties>
 
     <repositories>
-        <repository>
-            <id>bungeecord-repo</id>
-            <url>https://oss.sonatype.org/content/repositories/snapshots</url>
-        </repository>
-        <repository>
-            <id>velocity</id>
-            <url>https://nexus.velocitypowered.com/repository/maven-public/</url>
-        </repository>
         <repository>
             <id>spigot-repo</id>
             <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
         </repository>
         <repository>
-            <id>opencollab-release-repo</id>
-            <url>https://repo.opencollab.dev/maven-releases/</url>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
+            <id>jitpack.io</id>
+            <url>https://jitpack.io</url>
         </repository>
         <repository>
-            <id>opencollab-snapshot-repo</id>
-            <url>https://repo.opencollab.dev/maven-snapshots/</url>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
+            <id>velocity</id>
+            <url>https://nexus.velocitypowered.com/repository/maven-public/</url>
         </repository>
     </repositories>
 
     <dependencies>
         <dependency>
-            <groupId>net.md-5</groupId>
-            <artifactId>bungeecord-api</artifactId>
-            <version>1.16-R0.5-SNAPSHOT</version>
-            <type>jar</type>
+            <groupId>org.spigotmc</groupId>
+            <artifactId>spigot-api</artifactId>
+            <version>1.12.2-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>net.md-5</groupId>
-            <artifactId>bungeecord-api</artifactId>
-            <version>1.16-R0.5-SNAPSHOT</version>
-            <type>javadoc</type>
+            <groupId>com.github.SpigotMC.BungeeCord</groupId>
+            <artifactId>bungeecord-proxy</artifactId>
+            <!-- Provides easier access to BungeeCord classes unavailable in the api -->
+            <version>a7c6ede</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>com.velocitypowered</groupId>
             <artifactId>velocity-api</artifactId>
-            <version>1.1.8</version>
+            <version>3.0.0</version>
             <scope>provided</scope>
         </dependency>
+        <!-- for logging on velocity -->
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-core</artifactId>
             <version>2.13.2</version>
             <scope>provided</scope>
         </dependency>
+        <!-- for our configuration -->
         <dependency>
-            <groupId>org.bukkit</groupId>
-            <artifactId>bukkit</artifactId>
-            <version>1.8-R0.1-SNAPSHOT</version>
-            <scope>provided</scope>
+            <groupId>org.spongepowered</groupId>
+            <artifactId>configurate-yaml</artifactId>
+            <version>4.1.2</version> <!-- this may not be the latest available version -->
+        </dependency>
+        <!-- For nullability annotations -->
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+            <version>3.0.2</version>
         </dependency>
+        <!-- Misc -->
         <dependency>
-            <groupId>org.geysermc</groupId>
-            <artifactId>connector</artifactId>
-            <version>1.4.0-SNAPSHOT</version>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>1.18.22</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
@@ -109,6 +97,27 @@
                     <target>1.8</target>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>3.2.4</version>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                        <configuration>
+                            <relocations>
+                                <relocation>
+                                    <pattern>org.spongepowered.configurate</pattern>
+                                    <shadedPattern>dev.projectg.geyserupdater.shaded.configurate</shadedPattern>
+                                </relocation>
+                            </relocations>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 </project>