diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml new file mode 100644 index 0000000..fdf967e --- /dev/null +++ b/.github/workflows/gradle.yml @@ -0,0 +1,47 @@ +# This workflow uses actions that are not certified by GitHub. +# They are provided by a third-party and are governed by +# separate terms of service, privacy policy, and support +# documentation. +# This workflow will build a Java project with Gradle and cache/restore any dependencies to improve the workflow execution time +# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-gradle + +name: Java CI with Gradle + +on: + push: + branches: + - master + - 'dev/**' + pull_request: + +permissions: + contents: read + +jobs: + build: + runs-on: macos-latest + steps: + - uses: actions/checkout@v3.6.0 + - name: Set up JDK 21 + uses: actions/setup-java@v4.2.1 + with: + java-version: '21' + distribution: 'temurin' + - name: Build with Gradle + uses: gradle/actions/setup-gradle@v3 + with: + arguments: build + - name: Upload a Build Artifact Jar + uses: actions/upload-artifact@master + with: + # Artifact name + name: McDeob-Java-Jar + # A file, directory or wildcard pattern that describes what to upload + path: build/libs/McDeob-*.jar + - name: Upload a Build Artifact macOS DMG + uses: actions/upload-artifact@master + with: + # Artifact name + name: McDeob-macOS-DMG + # A file, directory or wildcard pattern that describes what to upload + path: build/libs/McDeob-*.dmg diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml deleted file mode 100644 index 2da4ba6..0000000 --- a/.github/workflows/maven.yml +++ /dev/null @@ -1,42 +0,0 @@ -# This workflow will build a Java project with Maven -# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven - -name: Java CI with Maven - -on: - push: - branches: '**' - pull_request: - branches: '**' - -jobs: - build: - - runs-on: macos-latest - - steps: - - uses: actions/checkout@v3.6.0 - - name: Set up JDK 16 - uses: actions/setup-java@v4.4.0 - with: - java-version: '23.0.0+37' - distribution: 'temurin' - - name: Build with Maven - run: mvn -B package -P macos --file pom.xml - - name: Upload a Build Artifact - uses: actions/upload-artifact@v4.4.0 - with: - # Artifact name - name: McDeob-Jar - # A file, directory or wildcard pattern that describes what to upload - path: | - target/McDeob*.jar - - name: Upload a macOS Build Artifact - uses: actions/upload-artifact@v4.4.0 - with: - # Artifact name - name: McDeob-macOS - # A file, directory or wildcard pattern that describes what to upload - path: | - target/*.dmg - diff --git a/README.md b/README.md index 48dcb35..602fb0b 100644 --- a/README.md +++ b/README.md @@ -46,9 +46,14 @@ That said, you may **NOT** upload the resulting files to something like GitHub. ## Building/Compiling: If you wish to compile the jar yourself, simply clone the repo and run: -`mvn clean package` -If you want the macOS APP and DMG file run: -`mvn clean package -P macos` +`./gradlew jar` + +If you wish to compile the macOS app, run: +`./gradlew createApp` + +If you want the macOS app and DMG file, run: +`./gradlew createDmg` + Super Simple!!! ## Tools: diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 index 0000000..472de41 --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,67 @@ +import groovy.lang.Closure + +plugins { + id("java") + id("com.gradleup.shadow") version "9.2.0" + id("edu.sc.seis.macAppBundle") version "2.3.1" +} + +// Version of McDeob +val projectVersion = "3.3.0" +java.sourceCompatibility = JavaVersion.VERSION_21 + +repositories { + mavenLocal() + maven("https://repo.papermc.io/repository/maven-public/") + maven("https://hub.spigotmc.org/nexus/content/repositories/public/") + maven("https://jitpack.io") + maven("https://repo.maven.apache.org/maven2/") +} + +dependencies { + compileOnly("org.jetbrains:annotations:24.1.0") + implementation("org.json:json:20210307") { + isTransitive = false + } + implementation("net.md-5:SpecialSource:1.11.5-SNAPSHOT") { + //exclude("com.google.guava") + exclude("com.opencsv") + } + implementation("io.papermc:patched-spigot-fernflower:0.1+build.13") { + isTransitive = false + } +} + +tasks { + compileJava { + options.release = 21 + options.compilerArgs.add("-Xlint:unchecked") + options.compilerArgs.add("-Xlint:deprecation") + } + shadowJar { + enableAutoRelocation = true + relocationPrefix = "shaded-libs" + archiveFileName = project.name + "-" + projectVersion + ".jar" + manifest.attributes["Main-Class"] = "com.shanebeestudios.mcdeob.McDeob" + } + jar { + dependsOn(shadowJar) + } + createDmg { + dependsOn(jar) + } +} + +macAppBundle { + mainClassName = "com.shanebeestudios.mcdeob.McDeob" + icon = "src/main/resources/images/1024.icns" + runtimeConfigurationName = "shadow" + jarTask = "shadowJar" + appOutputDir = "libs" + dmgOutputDir = "libs" + dmgName = "McDeob-macOS-$projectVersion" + bundleExtras["CFBundleVersion"] = projectVersion + bundleExtras["CFBundleShortVersionString"] = "Version" + bundleExtras["NSRequiresAquaSystemAppearance"] = false + javaExtras["-Xms3G"] = null +} diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..8bdaf60 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 0000000..cea7a79 --- /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.12-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100755 index 0000000..ef07e01 --- /dev/null +++ b/gradlew @@ -0,0 +1,251 @@ +#!/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 + +CLASSPATH="\\\"\\\"" + + +# 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" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + 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" \ + -classpath "$CLASSPATH" \ + -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 0000000..db3a6ac --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,94 @@ +@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 + +set CLASSPATH= + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -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 e7018b9..0000000 --- a/pom.xml +++ /dev/null @@ -1,151 +0,0 @@ - - - 4.0.0 - - com.shanebeestudios - McDeob - 3.3.0 - - - 16 - 16 - UTF-8 - - - - - paper-repo - https://repo.papermc.io/repository/maven-public/ - - - spigot-repo - https://hub.spigotmc.org/nexus/content/repositories/public/ - - - jitpack.io - https://jitpack.io - - - - - - - org.json - json - 20231013 - - - org.jetbrains - annotations - 24.1.0 - - - net.md-5 - SpecialSource - 1.11.5-SNAPSHOT - - - io.papermc - patched-spigot-fernflower - 0.1+build.13 - - - - - - macos - - - - - de.perdian.maven.plugins - macosappbundler-maven-plugin - 1.21.0 - - - true - false - ${project.name}-${project.version}-macOS - - - false - - - src/main/resources/images/1024.icns - com.shanebeestudios.mcdeob.McDeob - 16+ - - -Xms3G - - - - - - package - - bundle - - - - - - - - - - - - src/main/resources/filtered - true - - - src/main/resources - false - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.10.1 - - 16 - 16 - - - - org.apache.maven.plugins - maven-jar-plugin - 3.2.0 - - - - true - libs/ - com.shanebeestudios.mcdeob.McDeob - - - - - - - org.apache.maven.plugins - maven-shade-plugin - 3.2.1 - - - shade - package - - shade - - - - - - - - - diff --git a/src/main/java/com/shanebeestudios/mcdeob/Processor.java b/src/main/java/com/shanebeestudios/mcdeob/Processor.java index 1383f6e..981429f 100644 --- a/src/main/java/com/shanebeestudios/mcdeob/Processor.java +++ b/src/main/java/com/shanebeestudios/mcdeob/Processor.java @@ -21,6 +21,7 @@ import java.io.IOException; import java.io.InputStream; import java.net.HttpURLConnection; +import java.net.URI; import java.net.URL; import java.nio.file.Files; import java.nio.file.Path; @@ -160,7 +161,7 @@ public boolean downloadJar() { final HttpURLConnection connection; long connectionContentLength; try { - final URL jarURL = new URL(this.version.getJarURL()); + final URL jarURL = URI.create(this.version.getJarURL()).toURL(); connection = (HttpURLConnection) jarURL.openConnection(); connectionContentLength = connection.getContentLengthLong(); } catch (IOException e) { @@ -203,7 +204,7 @@ public boolean downloadMappings() { final HttpURLConnection connection; try { - final URL mappingURL = new URL(this.version.getMapURL()); + final URL mappingURL = URI.create(this.version.getMapURL()).toURL(); connection = (HttpURLConnection) mappingURL.openConnection(); } catch (IOException e) { logException("Failed to open connection to Mojang servers", e); diff --git a/src/main/resources/images/1024.icns b/src/main/resources/images/1024.icns old mode 100644 new mode 100755 index df8affc..64e9a6e Binary files a/src/main/resources/images/1024.icns and b/src/main/resources/images/1024.icns differ diff --git a/src/main/resources/images/1024.png b/src/main/resources/images/1024.png index 5f54998..64c39ed 100644 Binary files a/src/main/resources/images/1024.png and b/src/main/resources/images/1024.png differ