diff --git a/.github/workflows/build-and-test.yaml b/.github/workflows/build-and-test.yaml index 0683b6e2..f1179306 100644 --- a/.github/workflows/build-and-test.yaml +++ b/.github/workflows/build-and-test.yaml @@ -19,19 +19,31 @@ jobs: steps: - name: Checkout uses: actions/checkout@v4 - - name: Set up Java ${{ matrix.java-version }} + + + - name: Set up Java 8 + uses: actions/setup-java@v4 + with: + java-version: 8 + distribution: temurin + java-package: jdk + cache: gradle + + # for gradle build + - name: Set up Java 17 uses: actions/setup-java@v4 with: - java-version: ${{ matrix.java-version }} + java-version: 17 distribution: temurin java-package: jdk - cache: maven - - name: Build with Maven + cache: gradle + + - name: Build with Gradle shell: bash run: | - mvn clean install - - run: mkdir staging && cp target/*.jar staging - - run: echo "NOW=$(date +'%d-%m-%Y_%H-%M')" >> $GITHUB_ENV + ./gradlew build -Pjava_version=${{ matrix.java-version }} + - run: mkdir staging && cp build/libs/*.jar staging + - run: echo "NOW=$(date +'%Y-%m-%d_%H-%M')" >> $GITHUB_ENV - name: Upload artifacts uses: actions/upload-artifact@v4 with: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index abb7a4ea..8da6c229 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -14,17 +14,23 @@ jobs: - name: Checkout uses: actions/checkout@v4 - # Step 2: Set up JDK 1.8 - - name: Set up JDK 1.8 + - name: Set up JDK 8 uses: actions/setup-java@v2 with: distribution: 'temurin' java-version: 8 - # Step 3: Get the version from pom.xml - - name: Get the version from pom.xml + # Step 2: Set up JDK 17 (for building with Gradle) + - name: Set up JDK 17 + uses: actions/setup-java@v2 + with: + distribution: 'temurin' + java-version: 17 + + # Step 3: Get the version from gradle.properties + - name: Get the version from gradle.properties id: get_version - run: echo "PROJECT_VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)" >> $GITHUB_ENV + run: echo "PROJECT_VERSION=$(./gradlew -q properties | grep "^version:" | awk '{print $2}')" >> $GITHUB_ENV # Step 4: Fail if snapshot version - name: Fail if snapshot version @@ -59,7 +65,7 @@ jobs: echo "app_name=${APP_NAME}" >> src/main/resources/version.properties echo "release_version=${{ env.RELEASE_VERSION }}" >> src/main/resources/version.properties - echo "maven_version=${{ env.PROJECT_VERSION }}" >> src/main/resources/version.properties + echo "gradle_version=${{ env.PROJECT_VERSION }}" >> src/main/resources/version.properties # Build Type if [[ "${{ github.ref }}" == "refs/heads/master" || "${{ github.ref }}" == "refs/heads/main" ]]; then @@ -80,8 +86,8 @@ jobs: echo "build_author=${{ github.actor }}" >> src/main/resources/version.properties # Step 7: Build with Maven - - name: Build with Maven - run: mvn clean package + - name: Build with Gradle + run: ./gradlew build -Pjava_version=8 # Step 8: Create GitHub Release - name: Create GitHub Release @@ -91,6 +97,6 @@ jobs: tag_name: ${{ env.RELEASE_VERSION }} name: ${{ env.RELEASE_VERSION }} files: | - target/*.jar + build/libs/*.jar env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.gitignore b/.gitignore index 82fe35cb..30a1fe76 100644 --- a/.gitignore +++ b/.gitignore @@ -8,4 +8,6 @@ build/ dependency-reduced-pom.xml .DS_Store -run/ \ No newline at end of file +run/ +/.gradle +/buildSrc/.gradle diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 index 00000000..57c63ea3 --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,105 @@ +// To import vars from gradle.properties, add an entry to buildSrc/src/main/kotlin/ProjectInfo.kt + +java.toolchain.languageVersion = JavaLanguageVersion.of(javaVersion) +java.sourceCompatibility = JavaVersion.toVersion(javaVersion) +java.targetCompatibility = JavaVersion.toVersion(javaVersion) + +repositories { + mavenCentral() + mavenLocal() + maven { + url = uri("https://repo.maven.apache.org/maven2/") + } +} + +plugins { + id("java") + id("maven-publish") + id("idea") + id("eclipse") + id("net.kyori.blossom") version "2.1.0" + id("com.gradleup.shadow") version "9.2.2" + id("application") +} + +dependencies { + implementation("com.googlecode.json-simple:json-simple:1.1.1") + implementation("net.sf.jopt-simple:jopt-simple:6.0-alpha-3") + implementation("jline:jline:0.9.94") + implementation("org.xerial:sqlite-jdbc:3.41.2.2") + implementation("com.mysql:mysql-connector-j:9.2.0") + implementation("org.avaje:ebean:2.7.3") + implementation("org.yaml:snakeyaml:1.7") + implementation("com.google.guava:guava-collections:r03") + implementation("org.jetbrains:annotations:20.0.0") + + // Bukkit Mods + implementation("com.google.guava:guava:32.0.1-jre") + implementation("org.apache.commons:commons-lang3:3.12.0") + implementation("com.google.code.gson:gson:2.9.0") +} + +// For exposing statics to Java, see BuildParameters.java.peb inside the main/java-templates dir +sourceSets.main.configure { + blossom.javaSources { + property("server_software_name", serverSoftwareName) + property("version", version.toString()) + property("description", description) + property("homepage_url", homepageUrl) + property("source_url", sourceUrl) + } +} + +// Applies templating to files, you can access values by using ${name} +// Uses the values from buildSrc +// +// Uncomment when you want to process a resource. +//tasks.processResources { +// filesMatching(listOf()) { +// expand(project.properties) +// } +//} + +tasks.withType() { + options.encoding = "UTF-8" +} + +tasks.withType() { + options.encoding = "UTF-8" +} + +tasks.named("jar").configure { + manifest { + from("src/main/resources/META-INF/MANIFEST.MF") + } + + archiveClassifier = "original" +} + +tasks.shadowJar { + duplicatesStrategy = DuplicatesStrategy.EXCLUDE + + archiveClassifier = "" + + from(listOf(sourceSets.main.get().output)) + + exclude("junit/**") +} + +tasks.assemble { + dependsOn(tasks.shadowJar) +} + +// shadowjar creates handy task already, but if you don't like the name, just change this to "run" and set the classpath manually +tasks.named("runShadow") { +// dependsOn(tasks.shadowJar) + + var d = File("run"); + if (!d.exists()) + d.mkdirs() + + workingDir = d + +// classpath = files(tasks.shadowJar.get().archiveFile.get().asFile) + mainClass = "org.bukkit.craftbukkit.Main" +} \ No newline at end of file diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts new file mode 100755 index 00000000..acfdd977 --- /dev/null +++ b/buildSrc/build.gradle.kts @@ -0,0 +1,17 @@ +plugins { + `kotlin-dsl` +} + +repositories { + mavenCentral() +} + +java { + toolchain { + languageVersion = JavaLanguageVersion.of(8) + } +} + +kotlin { + jvmToolchain(8) +} \ No newline at end of file diff --git a/buildSrc/src/main/kotlin/ProjectInfo.kt b/buildSrc/src/main/kotlin/ProjectInfo.kt new file mode 100755 index 00000000..d0d4e6c1 --- /dev/null +++ b/buildSrc/src/main/kotlin/ProjectInfo.kt @@ -0,0 +1,15 @@ +import org.gradle.api.Project + +// Exposes gradle.properties vars to build.gradle.kts + +object ProjectInfo + +val Project.serverSoftwareName: String get() = properties["server_software_name"].toString() +val Project.description: String get() = properties["description"].toString() +val Project.projectVersion: String get() = properties["version"].toString() + +val Project.homepageUrl: String get() = properties["homepage_url"].toString() +val Project.issueUrl: String get() = properties["issue_url"].toString() +val Project.sourceUrl: String get() = properties["source_url"].toString() + +val Project.javaVersion: String get() = properties["java_version"].toString() diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 00000000..20409a28 --- /dev/null +++ b/gradle.properties @@ -0,0 +1,13 @@ +org.gradle.configuration-cache=true +org.gradle.parallel=true +org.gradle.caching=true + +server_software_name=Project Poseidon UberBukkit +description=Fork of Poseidon providing Bukkit #1060 to older Beta versions (b1.0-b1.7.3) +version=2.0.2 + +homepageUrl= +issueUrl=https://github.com/moresteck/uberbukkit/issues +sourceUrl=https://github.com/moresteck/uberbukkit + +java_version=8 \ No newline at end of file diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml new file mode 100644 index 00000000..e69de29b diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 00000000..8bdaf60c Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 00000000..ca025c83 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100755 index 00000000..adff685a --- /dev/null +++ b/gradlew @@ -0,0 +1,248 @@ +#!/bin/sh + +# +# Copyright © 2015 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# SPDX-License-Identifier: Apache-2.0 +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 00000000..e509b2dd --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,93 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:execute +@rem Setup the command line + + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/pom.xml b/pom.xml deleted file mode 100644 index e0815cfc..00000000 --- a/pom.xml +++ /dev/null @@ -1,167 +0,0 @@ - - 4.0.0 - org.bukkit - uberbukkit - jar - 2.0.2 - UberBukkit - - UTF-8 - unknown - - - - com.googlecode.json-simple - json-simple - 1.1.1 - - - net.sf.jopt-simple - jopt-simple - 6.0-alpha-3 - - - jline - jline - 0.9.94 - jar - compile - - - org.xerial - sqlite-jdbc - 3.41.2.2 - jar - compile - - - com.mysql - mysql-connector-j - 9.2.0 - jar - compile - - - - org.avaje - ebean - 2.7.3 - jar - compile - - - org.yaml - snakeyaml - 1.7 - jar - compile - - - com.google.guava - guava-collections - r03 - jar - compile - - - org.jetbrains - annotations - 20.0.0 - - - - - com.google.guava - guava - 32.0.1-jre - jar - compile - - - org.apache.commons - commons-lang3 - 3.12.0 - - - - com.google.code.gson - gson - 2.9.0 - - - - - - clean install - - - org.apache.maven.plugins - maven-jar-plugin - 3.2.0 - - - - org.bukkit.craftbukkit.Main - UberBukkit - Moresteck - Bukkit - ${api.version} - Bukkit Team - true - - - - net/bukkit/ - - true - - - - com/bukkit/ - - true - - - - org/bukkit/ - - true - - - - - - - - org.apache.maven.plugins - maven-shade-plugin - 3.2.4 - - - package - - shade - - - - - junit:junit - - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.8.1 - - 1.8 - 1.8 - - - - - diff --git a/settings.gradle.kts b/settings.gradle.kts new file mode 100644 index 00000000..99277571 --- /dev/null +++ b/settings.gradle.kts @@ -0,0 +1,8 @@ +pluginManagement { + repositories { + gradlePluginPortal() + mavenCentral() + } +} + +rootProject.name = "uberbukkit" diff --git a/src/main/java-templates/uk/betacraft/uberbukkit/BuildParameters.java.peb b/src/main/java-templates/uk/betacraft/uberbukkit/BuildParameters.java.peb new file mode 100644 index 00000000..bd0804cc --- /dev/null +++ b/src/main/java-templates/uk/betacraft/uberbukkit/BuildParameters.java.peb @@ -0,0 +1,6 @@ +package uk.betacraft.uberbukkit; + +public class BuildParameters { + public static final String SERVER_SOFTWARE_NAME = "{{ server_software_name }}"; + public static final String VERSION = "{{ version }}"; +} diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java index 3331fbe1..ff75587c 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -44,6 +44,7 @@ import org.yaml.snakeyaml.Yaml; import org.yaml.snakeyaml.constructor.SafeConstructor; import org.yaml.snakeyaml.error.MarkedYAMLException; +import uk.betacraft.uberbukkit.BuildParameters; import java.io.File; import java.io.FileInputStream; @@ -54,10 +55,10 @@ import java.util.logging.Logger; public final class CraftServer implements Server { - private final String serverName = "Project Poseidon Craftbukkit"; + private final String serverName = BuildParameters.SERVER_SOFTWARE_NAME; //Poseidon Versions private final String serverEnvironment = "POSEIDON"; - private final String serverVersion = "1.1.10"; + private final String serverVersion = BuildParameters.VERSION; private final String releaseType = "DEVELOPMENT"; private final String protocolVersion = "1.7.3"; private final String GameVersion = "b1.7.3"; diff --git a/src/main/java/uk/betacraft/uberbukkit/Uberbukkit.java b/src/main/java/uk/betacraft/uberbukkit/Uberbukkit.java index 53bc338a..c60b4188 100644 --- a/src/main/java/uk/betacraft/uberbukkit/Uberbukkit.java +++ b/src/main/java/uk/betacraft/uberbukkit/Uberbukkit.java @@ -8,8 +8,7 @@ import java.util.List; public class Uberbukkit { - // TODO: Change this automatically migration to Gradle - private static final String version = "2.0.2"; + private static final String version = BuildParameters.VERSION; private static Integer pvn = null; private static List pvns = null; diff --git a/src/main/resources/META-INF/MANIFEST.MF b/src/main/resources/META-INF/MANIFEST.MF index a77e8c3f..d75dcbd8 100644 --- a/src/main/resources/META-INF/MANIFEST.MF +++ b/src/main/resources/META-INF/MANIFEST.MF @@ -1,13 +1,11 @@ Manifest-Version: 1.0 -Created-By: 1.6.0 +Implementation-Title: UberBukkit +Implementation-Vendor: Moresteck Specification-Title: Bukkit -Main-Class: org.bukkit.craftbukkit.Main -Specification-Version: unknown Specification-Vendor: Bukkit Team -Implementation-Version: git-Bukkit-0.0.0-980-g4ed23b1-b1060jnks -Implementation-Vendor: Bukkit Team +Specification-Version: unknown +Main-Class: org.bukkit.craftbukkit.Main Sealed: true -Implementation-Title: CraftBukkit Name: net/bukkit/ Sealed: true