From 2dd4d17c3980f0812517c56b11de41c9af46ce88 Mon Sep 17 00:00:00 2001 From: filipwtf <37674069+filipwtf@users.noreply.github.com> Date: Tue, 30 Mar 2021 22:05:47 +0100 Subject: [PATCH 1/8] Converted to gradle --- .gitignore | 28 +--- CONTRIBUTING.md | 20 --- README.md | 4 +- build.gradle | 21 +++ gradle.properties | 1 + gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 59203 bytes gradle/wrapper/gradle-wrapper.properties | 5 + gradlew | 185 +++++++++++++++++++++++ gradlew.bat | 89 +++++++++++ pom.xml | 72 --------- settings.gradle | 17 +++ 11 files changed, 329 insertions(+), 113 deletions(-) delete mode 100644 CONTRIBUTING.md create mode 100644 build.gradle create mode 100644 gradle.properties create mode 100644 gradle/wrapper/gradle-wrapper.jar create mode 100644 gradle/wrapper/gradle-wrapper.properties create mode 100644 gradlew create mode 100644 gradlew.bat delete mode 100644 pom.xml create mode 100644 settings.gradle diff --git a/.gitignore b/.gitignore index 238220f..8dec292 100644 --- a/.gitignore +++ b/.gitignore @@ -1,22 +1,10 @@ -.metadata/** -.recommenders/** -.settings/** -bin/** -target/** -**/psd/** -*.class -*.dtd -*.sh -*.bat -*.lnk - -.classpath -.project - -# IntelliJ IDEA Project stuff -.idea/ -out/ +# idea +out +*.ipr *.iws *.iml -*___jb_*___ -/target/ +.idea + +# gradle +build +.gradle diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md deleted file mode 100644 index bdea0df..0000000 --- a/CONTRIBUTING.md +++ /dev/null @@ -1,20 +0,0 @@ -# Recaf plugin workspace - -This is a sample maven workspace for creating plugins for Recaf `2.X`. - -## Plugin documentation - -The official documentation can be found here: [Recaf Docs:Plugins](https://col-e.github.io/Recaf/doc-advanced-plugin.html). - -The source and javadoc artifacts are also available and can be fetched in your IDE workspace. - -## Building & modification - -Once you've downloaded or cloned the repository, you can compile with `mvn clean package`. -This will generate the file `target/plugin-{VERSION}.jar`. To add your plugin to Recaf: - -1. Navigate to the `plugins` folder. - - Windows: `%HOMEPATH%/Recaf/plugins` - - Linux: `$HOME/Recaf/plugins` -2. Copy your plugin jar into this folder -3. Run Recaf to verify your plugin loads. \ No newline at end of file diff --git a/README.md b/README.md index 6f981cd..6017a21 100644 --- a/README.md +++ b/README.md @@ -44,4 +44,6 @@ The Forge MDK export works for 1.8.9 and 1.9.4 ### Contributing -See [Contributing](CONTRIBUTING.md) \ No newline at end of file +Contributors are welcome 👍🏽 + +Thanks [Recaf-development](https://github.com/videogame-player/recaf-development) for the gradle plugin diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..1b4ae5f --- /dev/null +++ b/build.gradle @@ -0,0 +1,21 @@ +plugins { + id 'java' + id "me.videogame.recaf" version "1.1" +} + +group = 'dev.fxe' +version = '1.1.0' +description = 'Recaf4Forge' +sourceCompatibility = JavaVersion.VERSION_1_8 + +dependencies { + implementation "com.github.Col-E:Recaf:2.18.3" +} + +recaf{ + mainClass("dev.fxe.recaf_forge.Recaf4Forge") +} + +tasks.withType(JavaCompile) { + options.encoding = 'UTF-8' +} diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..4687f10 --- /dev/null +++ b/gradle.properties @@ -0,0 +1 @@ +org.gradle.jvmargs=-Xmx2G diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..e708b1c023ec8b20f512888fe07c5bd3ff77bb8f GIT binary patch literal 59203 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

K7UpUK$>l@ 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 E2O(~oYXATM literal 0 HcmV?d00001 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..442d913 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100644 index 0000000..4f906e0 --- /dev/null +++ b/gradlew @@ -0,0 +1,185 @@ +#!/usr/bin/env sh + +# +# Copyright 2015 the original author or 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. +# + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# 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"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# 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 + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# 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" + which java >/dev/null 2>&1 || 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 + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin or MSYS, switch paths to Windows format before running java +if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=`expr $i + 1` + done + case $i in + 0) set -- ;; + 1) set -- "$args0" ;; + 2) set -- "$args0" "$args1" ;; + 3) set -- "$args0" "$args1" "$args2" ;; + 4) set -- "$args0" "$args1" "$args2" "$args3" ;; + 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=`save "$@"` + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..107acd3 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,89 @@ +@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 + +@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=. +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%" == "0" goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="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! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/pom.xml b/pom.xml deleted file mode 100644 index 6a8022a..0000000 --- a/pom.xml +++ /dev/null @@ -1,72 +0,0 @@ - - 4.0.0 - - dev.fxe - recaf4forge - 1.0.9 - Recaf4Forge - - - Windows - - - Windows - - - - ${user.home}/AppData/Roaming/Recaf/plugins - - - - Linux - - - Linux - - - - ${user.home}/Library/Preferences/Recaf/plugins - - - - - UTF-8 - - - - - jitpack.io - https://jitpack.io - - - - - - com.github.Col-E - recaf - 2.4.0 - - - - - - maven-compiler-plugin - 3.7.0 - - 1.8 - 1.8 - - - - - org.apache.maven.plugins - maven-jar-plugin - 3.2.0 - - ${pluginDir} - - - - - \ No newline at end of file diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..742b2df --- /dev/null +++ b/settings.gradle @@ -0,0 +1,17 @@ +pluginManagement { + repositories { + mavenLocal() + maven { url "https://jitpack.io/" } + maven { url "http://files.minecraftforge.net/maven" } + gradlePluginPortal() + } + resolutionStrategy { + eachPlugin { + if (requested.id.id == "me.videogame.recaf") { + useModule("com.github.videogame-player:recaf-development:${requested.version}") + } + } + } +} + +rootProject.name = 'recaf4forge' From 71bfa9b22d1e25a35b4d3c59ebdd9387fd89c511 Mon Sep 17 00:00:00 2001 From: filipwtf <37674069+filipwtf@users.noreply.github.com> Date: Wed, 31 Mar 2021 15:45:07 +0100 Subject: [PATCH 2/8] Big refactor, more logging, notifications --- .github/workflows/release.yml | 40 ++++++ .../executionHistory/executionHistory.bin | Bin 0 -> 94431 bytes .../executionHistory/executionHistory.lock | Bin 0 -> 17 bytes .gradle/6.8.3/fileChanges/last-build.bin | Bin 0 -> 1 bytes .gradle/6.8.3/fileHashes/fileHashes.bin | Bin 0 -> 20947 bytes .gradle/6.8.3/fileHashes/fileHashes.lock | Bin 0 -> 17 bytes .gradle/6.8.3/gc.properties | 0 .../buildOutputCleanup.lock | Bin 0 -> 17 bytes .gradle/buildOutputCleanup/cache.properties | 2 + .gradle/buildOutputCleanup/outputFiles.bin | Bin 0 -> 19019 bytes .gradle/checksums/checksums.lock | Bin 0 -> 17 bytes .gradle/configuration-cache/gc.properties | 0 .gradle/vcs-1/gc.properties | 0 README.md | 26 +++- build.gradle | 27 ++-- gradle.properties | 6 + .../java/dev/fxe/recaf4forge/BuildInfo.java | 11 ++ .../java/dev/fxe/recaf4forge/Exporter.java | 88 ++++++++++++ .../Extractor.java | 37 +++-- .../Recaf4Forge.java | 132 ++++++++---------- .../dev/fxe/recaf4forge/gui/Notification.java | 31 ++++ 21 files changed, 304 insertions(+), 96 deletions(-) create mode 100644 .github/workflows/release.yml create mode 100644 .gradle/6.8.3/executionHistory/executionHistory.bin create mode 100644 .gradle/6.8.3/executionHistory/executionHistory.lock create mode 100644 .gradle/6.8.3/fileChanges/last-build.bin create mode 100644 .gradle/6.8.3/fileHashes/fileHashes.bin create mode 100644 .gradle/6.8.3/fileHashes/fileHashes.lock create mode 100644 .gradle/6.8.3/gc.properties create mode 100644 .gradle/buildOutputCleanup/buildOutputCleanup.lock create mode 100644 .gradle/buildOutputCleanup/cache.properties create mode 100644 .gradle/buildOutputCleanup/outputFiles.bin create mode 100644 .gradle/checksums/checksums.lock create mode 100644 .gradle/configuration-cache/gc.properties create mode 100644 .gradle/vcs-1/gc.properties create mode 100644 src/main/java/dev/fxe/recaf4forge/BuildInfo.java create mode 100644 src/main/java/dev/fxe/recaf4forge/Exporter.java rename src/main/java/dev/fxe/{recaf_forge => recaf4forge}/Extractor.java (76%) rename src/main/java/dev/fxe/{recaf_forge => recaf4forge}/Recaf4Forge.java (58%) create mode 100644 src/main/java/dev/fxe/recaf4forge/gui/Notification.java diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml new file mode 100644 index 0000000..4114b17 --- /dev/null +++ b/.github/workflows/release.yml @@ -0,0 +1,40 @@ +name: Recaf4Forge Release + +on: + push: + branches: [gradle] + +jobs: + validation: + name: "Post build - Validation" + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - uses: gradle/wrapper-validation-action@v1.3.3 + + build: + needs: validation + runs-on: ubuntu-latest + env: + PROPERTIES_PATH: gradle.properties + steps: + - uses: actions/checkout@v2.3.4 + - name: Step 1 - Setup JDK + - uses: actions/setup-java@v1.4.3 + with: + java-version: 1.8 + - name: Step 2 - Gradle build + - uses: eskatos/gradle-command-action@v1 + with: + arguments: build + - name: Step 3 - Read version + id: version + uses: christian-draeger/read-properties@1.0.1 + with: + path: ${{ env.PROPERTIES_PATH }} + property: version + - name: Step 4 - Release artifact + - uses: actions/upload-artifact@v2 + with: + name: "Recaf4Forge"-${{ steps.version.outputs.value }} + path: build/libs/*.jar diff --git a/.gradle/6.8.3/executionHistory/executionHistory.bin b/.gradle/6.8.3/executionHistory/executionHistory.bin new file mode 100644 index 0000000000000000000000000000000000000000..fa6ea37b30c3f353b093da0e6995dec620d236f4 GIT binary patch literal 94431 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 Sx2@~8!I{g&(9nz}$M_3bNaTe8 literal 0 HcmV?d00001 diff --git a/.gradle/6.8.3/fileHashes/fileHashes.lock b/.gradle/6.8.3/fileHashes/fileHashes.lock new file mode 100644 index 0000000000000000000000000000000000000000..dfe757db601c11f87cf07719812fa0f780d1e180 GIT binary patch literal 17 UcmZQx5M?(%K7qA^0Sp+O0Vvc1YXATM literal 0 HcmV?d00001 diff --git a/.gradle/6.8.3/gc.properties b/.gradle/6.8.3/gc.properties new file mode 100644 index 0000000..e69de29 diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock new file mode 100644 index 0000000000000000000000000000000000000000..23ef8609728df91cf811f608abeff069a3db7d8d GIT binary patch literal 17 UcmZS9xhJ~W-#glq0RlDy04M?j#{d8T literal 0 HcmV?d00001 diff --git a/.gradle/buildOutputCleanup/cache.properties b/.gradle/buildOutputCleanup/cache.properties new file mode 100644 index 0000000..b28d805 --- /dev/null +++ b/.gradle/buildOutputCleanup/cache.properties @@ -0,0 +1,2 @@ +#Tue Mar 30 21:35:58 BST 2021 +gradle.version=6.8.3 diff --git a/.gradle/buildOutputCleanup/outputFiles.bin b/.gradle/buildOutputCleanup/outputFiles.bin new file mode 100644 index 0000000000000000000000000000000000000000..72020afc1364ab7b10ac8586df4dc3b8d3a59744 GIT binary patch literal 19019 zcmeI%Z%7ky9LMq7&dh&g1f#Q+BbG?`C$SKU21OPs=_nNqABl-iMr3JbbI&X?=*h8) zZ4jxWB_$RG5&f%~ZOeb8p^AEMs2-dF4af6;vtbu0IY zwA+5;g;~4Wa|*dHW|ig7B$--hd<$f~1>xt*> zhkAOR9`4o-d;d+Hdye{X?q`n7ukMtMKk2>(?xl@0$9(!B2X&GA`CO@Y%iRf))>-0y zvD`5}T{2~+UdR2?U{pu -The Forge MDK export works for 1.8.9 and 1.9.4 +**Supported Versions** + +Version | Mappings | MDK + --- | --- | --- +**1.8** | ✔ | ❌ +**1.8.9** | ✔ | ✔ +**1.9.4** | ✔ | ✔ + +### Config + +Apply Mappings automatically - off by default, parses mcmod.info to try read the version + +Notifications - Off by default, Creates a popup when mappings are applied and/or source is extracted ### Example Usage @@ -36,13 +48,15 @@ The Forge MDK export works for 1.8.9 and 1.9.4 -## TODO +#### TODO -- Notifications - Add support for other versions - Add translations? +- Fix notifications disappearing too fast + +

-### Contributing +## Contributing Contributors are welcome 👍🏽 diff --git a/build.gradle b/build.gradle index 1b4ae5f..9c94d8b 100644 --- a/build.gradle +++ b/build.gradle @@ -1,21 +1,32 @@ +import org.apache.tools.ant.filters.ReplaceTokens + plugins { id 'java' - id "me.videogame.recaf" version "1.1" + id "me.videogame.recaf" version "1.2" } -group = 'dev.fxe' -version = '1.1.0' -description = 'Recaf4Forge' +group = project.group +version = project.version +description = project.description sourceCompatibility = JavaVersion.VERSION_1_8 -dependencies { - implementation "com.github.Col-E:Recaf:2.18.3" +recaf { + mainClass = project.mainClass } -recaf{ - mainClass("dev.fxe.recaf_forge.Recaf4Forge") +task processSource(type: Sync) { + from sourceSets.main.java + inputs.property '@VERSION@', version + filter(ReplaceTokens, tokens: [VERSION: version]) + into "$buildDir/src/" } tasks.withType(JavaCompile) { options.encoding = 'UTF-8' } + +compileJava { + source = processSource.outputs +} + +tasks.build.dependsOn(tasks.clean) \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 4687f10..b610665 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1 +1,7 @@ +name=Recaf4Forge +version=1.1.4 +group=dev.fxe +description=Recaf4Forge +mainClass=dev.fxe.recaf4forge.Recaf4Forge + org.gradle.jvmargs=-Xmx2G diff --git a/src/main/java/dev/fxe/recaf4forge/BuildInfo.java b/src/main/java/dev/fxe/recaf4forge/BuildInfo.java new file mode 100644 index 0000000..0af3823 --- /dev/null +++ b/src/main/java/dev/fxe/recaf4forge/BuildInfo.java @@ -0,0 +1,11 @@ +package dev.fxe.recaf4forge; + +public class BuildInfo { + + public static final String[] versions = {"1.8", "1.8.9", "1.9.4"}; + public static final String version = "@VERSION@"; + public static final String name = "Recaf4Forge"; + public static final String description = + "Recaf4Forge will automatically try apply the correct mappings for a forge mod, you are able to apply the mappings"; + +} diff --git a/src/main/java/dev/fxe/recaf4forge/Exporter.java b/src/main/java/dev/fxe/recaf4forge/Exporter.java new file mode 100644 index 0000000..5de375b --- /dev/null +++ b/src/main/java/dev/fxe/recaf4forge/Exporter.java @@ -0,0 +1,88 @@ +package dev.fxe.recaf4forge; + +import dev.fxe.recaf4forge.gui.Notification; +import me.coley.recaf.control.gui.GuiController; +import me.coley.recaf.decompile.DecompileImpl; +import me.coley.recaf.ui.MainWindow; +import me.coley.recaf.workspace.Workspace; + +import java.io.File; +import java.nio.charset.StandardCharsets; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.util.Map; +import java.util.concurrent.CompletableFuture; + +public class Exporter { + + private final Recaf4Forge recaf4Forge; + + Exporter(Recaf4Forge recaf4Forge) { + this.recaf4Forge = recaf4Forge; + } + + public void exportMDK() { + final Workspace workspace = recaf4Forge.getCurrentWorkspace(); + final String version = recaf4Forge.getCurrentVersion(); + if (!version.equalsIgnoreCase("") & workspace != null) { + String path = this.getPluginResource(version, "/mdk.zip"); + String jarName = workspace.getPrimary().getShortName().toString(); + Path mdkPath = Extractor.getResourcePath(jarName, path); + if (mdkPath == null) { + Recaf4Forge.info("Failed to get MDK path"); + return; + } + Path extractedMDK = Extractor.extractMDK(mdkPath); + if (extractedMDK == null) { + Recaf4Forge.info("Failed to extract mdk"); + return; + } + CompletableFuture.runAsync(() -> { + exportResources(extractedMDK); + exportSrc(extractedMDK); + }).thenRunAsync(() -> { + String msg = "Successfully exported the source code to " + extractedMDK; + Recaf4Forge.info(msg); + if (recaf4Forge.getController() instanceof GuiController) { + MainWindow window = MainWindow.get((GuiController) recaf4Forge.getController()); + Notification.create(BuildInfo.name + " MDK export", msg).show(window.getRoot()); + } + }); + } + } + + + /** + * Exports resource files to the mdk + * + * @param extractedMDK the path of the mdk + */ + private void exportResources(Path extractedMDK) { + for (Map.Entry resources : recaf4Forge.getCurrentWorkspace().getPrimary().getFiles().entrySet()) { + String resourcePath = + extractedMDK.toString() + File.separator + "src" + File.separator + "main" + File.separator + "resources" + File.separator + resources.getKey(); + Extractor.saveFile(Paths.get(resourcePath), resources.getValue()); + } + Recaf4Forge.info("Finished exporting resources"); + } + + /** + * Exports decompiled source code to the mdk + * + * @param extractedMDK the path of the mdk + */ + private void exportSrc(Path extractedMDK) { + for (Map.Entry resources : recaf4Forge.getCurrentWorkspace().getPrimary().getClasses().entrySet()) { + final String className = resources.getKey(); + String resourcePath = + extractedMDK.toString() + File.separator + "src" + File.separator + "main" + File.separator + "java" + File.separator + className + ".java"; + byte[] code = DecompileImpl.CFR.create(recaf4Forge.getController()).decompile(className).getBytes(StandardCharsets.UTF_8); + Extractor.saveFile(Paths.get(resourcePath), code); + } + Recaf4Forge.info("Finished exporting source code"); + } + + public String getPluginResource(String version, String resource) { + return "/mdks/" + version.replaceAll("\\.", "_") + resource; + } +} diff --git a/src/main/java/dev/fxe/recaf_forge/Extractor.java b/src/main/java/dev/fxe/recaf4forge/Extractor.java similarity index 76% rename from src/main/java/dev/fxe/recaf_forge/Extractor.java rename to src/main/java/dev/fxe/recaf4forge/Extractor.java index a0ccdbc..39f8e32 100644 --- a/src/main/java/dev/fxe/recaf_forge/Extractor.java +++ b/src/main/java/dev/fxe/recaf4forge/Extractor.java @@ -1,9 +1,8 @@ -package dev.fxe.recaf_forge; +package dev.fxe.recaf4forge; import javafx.stage.DirectoryChooser; import me.coley.recaf.ui.controls.ExceptionAlert; import org.apache.commons.io.IOUtils; -import org.jline.utils.Log; import java.io.BufferedOutputStream; import java.io.File; @@ -22,15 +21,23 @@ public class Extractor { private static final DirectoryChooser dirChooser = new DirectoryChooser(); + /** + * Creates a temporary resource file from the jar + * + * @param name file name + * @param resourcePath path to the resource in the plugin + * @return the path of the temp file + */ public static Path getResourcePath(String name, String resourcePath) { Path resource = null; try (InputStream in = Extractor.class.getResourceAsStream(resourcePath)) { - String[] strings = resourcePath.split("\\."); - String suffix = strings[strings.length - 1]; if (in == null) { - Log.info("Failed to find resource"); + Recaf4Forge.info("Failed to find resource"); return null; } + + String[] strings = resourcePath.split("\\."); + String suffix = strings[strings.length - 1]; String fileName = name == null ? String.valueOf(in.hashCode()) : name; File tempFile = File.createTempFile(fileName, suffix); tempFile.deleteOnExit(); @@ -42,6 +49,12 @@ public static Path getResourcePath(String name, String resourcePath) { return resource; } + /** + * Extracts the mdk from this plugin + * + * @param mdkPath the mdk (e.g 1_8_9) + * @return the path of the extracted mdk + */ public static Path extractMDK(Path mdkPath) { Path exportDir = getExportDir(); if (exportDir == null) return null; @@ -65,14 +78,20 @@ public static Path extractMDK(Path mdkPath) { return exportDir; } + /** + * Saves a file to a specified location + * + * @param path location to save the file + * @param data the file data + */ public static void saveFile(Path path, byte[] data) { try { Files.createDirectories(path.getParent()); try ( - final BufferedOutputStream out = new BufferedOutputStream(Files.newOutputStream( - path, - StandardOpenOption.CREATE, - StandardOpenOption.APPEND)) + final BufferedOutputStream out = new BufferedOutputStream(Files.newOutputStream( + path, + StandardOpenOption.CREATE, + StandardOpenOption.APPEND)) ) { out.write(data); } diff --git a/src/main/java/dev/fxe/recaf_forge/Recaf4Forge.java b/src/main/java/dev/fxe/recaf4forge/Recaf4Forge.java similarity index 58% rename from src/main/java/dev/fxe/recaf_forge/Recaf4Forge.java rename to src/main/java/dev/fxe/recaf4forge/Recaf4Forge.java index 1c35317..12576a1 100644 --- a/src/main/java/dev/fxe/recaf_forge/Recaf4Forge.java +++ b/src/main/java/dev/fxe/recaf4forge/Recaf4Forge.java @@ -1,43 +1,44 @@ -package dev.fxe.recaf_forge; +package dev.fxe.recaf4forge; import com.eclipsesource.json.Json; import com.eclipsesource.json.JsonValue; +import dev.fxe.recaf4forge.gui.Notification; import javafx.scene.control.Menu; import javafx.scene.control.MenuItem; import me.coley.recaf.config.Conf; import me.coley.recaf.control.Controller; -import me.coley.recaf.decompile.DecompileImpl; +import me.coley.recaf.control.gui.GuiController; import me.coley.recaf.mapping.MappingImpl; import me.coley.recaf.mapping.Mappings; import me.coley.recaf.plugin.api.ConfigurablePlugin; import me.coley.recaf.plugin.api.MenuProviderPlugin; import me.coley.recaf.plugin.api.StartupPlugin; import me.coley.recaf.plugin.api.WorkspacePlugin; +import me.coley.recaf.ui.MainWindow; import me.coley.recaf.ui.controls.ActionMenuItem; import me.coley.recaf.ui.controls.ExceptionAlert; +import me.coley.recaf.util.Log; import me.coley.recaf.util.struct.ListeningMap; import me.coley.recaf.workspace.Workspace; -import org.jline.utils.Log; import org.plugface.core.annotations.Plugin; -import java.io.File; -import java.nio.charset.StandardCharsets; import java.nio.file.Path; -import java.nio.file.Paths; -import java.util.Map; import java.util.concurrent.CompletableFuture; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; +import static dev.fxe.recaf4forge.BuildInfo.*; + /** * @author Filip */ @SuppressWarnings("unused") -@Plugin(name = "Recaf4Forge") +@Plugin(name = name) public class Recaf4Forge implements ConfigurablePlugin, MenuProviderPlugin, WorkspacePlugin, StartupPlugin { - private final String[] versions = {"1.8", "1.8.9", "1.9.4"}; private final ExecutorService executor = Executors.newSingleThreadExecutor(); + private final Exporter exporter = new Exporter(this); + private Workspace currentWorkspace = null; private String currentVersion = ""; private Controller controller; @@ -45,19 +46,22 @@ public class Recaf4Forge implements ConfigurablePlugin, MenuProviderPlugin, Work @Conf(value = "Automatically apply mappings", noTranslate = true) private boolean autoApply = false; + @Conf(value = "Notifications", noTranslate = true) + private boolean notify = false; + @Override public String getName() { - return "Recaf4Forge"; + return name; } @Override public String getVersion() { - return "1.0.5"; + return version; } @Override public String getDescription() { - return "Recaf4Forge will automatically try apply the correct mappings for a forge mod"; + return description; } @Override @@ -74,11 +78,36 @@ public void onOpened(Workspace workspace) { } } + @Override + public String getConfigTabTitle() { + return name; + } + + @Override + public void onStart(Controller controller) { + this.controller = controller; + } + + @Override + public Menu createMenu() { + MenuItem[] itemList = new MenuItem[versions.length + 1]; + int index = 0; + for (String version : versions) { + itemList[index] = new ActionMenuItem(version, () -> { + currentVersion = version; + CompletableFuture.runAsync(this::applyMapping, executor); + }); + index++; + } + itemList[index] = new ActionMenuItem("Export MDK", exporter::exportMDK); + return new Menu(getName(), null, itemList); + } + private void applyMapping() { - String path = getResourcesPath("/mappings.srg"); + String path = exporter.getPluginResource(this.currentVersion, "/mappings.srg"); Path mappingPath = Extractor.getResourcePath(null, path); if (mappingPath == null) { - Log.info(getName() + " Could not find mappings"); + info("Could not find mappings, is the resource null?"); return; } try { @@ -86,49 +115,16 @@ private void applyMapping() { mappings.setCheckFieldHierarchy(true); mappings.setCheckMethodHierarchy(true); mappings.accept(currentWorkspace.getPrimary()); + info("Finished applying mappings"); + if (this.getController() instanceof GuiController && this.notify) { + MainWindow window = MainWindow.get((GuiController) this.getController()); + Notification.create(this.getName() + " Mappings", "Successfully applied mappings!").show(window.getRoot()); + } } catch (Exception ex) { ExceptionAlert.show(ex, getName() + " Failed to apply mappings"); } } - private void exportMDK() { - if (!currentVersion.equalsIgnoreCase("") && currentWorkspace != null) { - String path = getResourcesPath("/mdk.zip"); - String jarName = currentWorkspace.getPrimary().getShortName().toString(); - Path mdkPath = Extractor.getResourcePath(jarName, path); - if (mdkPath == null) return; - Path extractedMDK = Extractor.extractMDK(mdkPath); - if (extractedMDK == null) return; - CompletableFuture.runAsync(() -> { - exportResources(extractedMDK); - exportSrc(extractedMDK); - }); - } - } - - - private void exportResources(Path extractedMDK) { - for (Map.Entry resources : currentWorkspace.getPrimary().getFiles().entrySet()) { - String resourcePath = - extractedMDK.toString() + File.separator + "src" + File.separator + "main" + File.separator + "resources" + File.separator + resources.getKey(); - Extractor.saveFile(Paths.get(resourcePath), resources.getValue()); - } - } - - private void exportSrc(Path extractedMDK) { - for (Map.Entry resources : currentWorkspace.getPrimary().getClasses().entrySet()) { - final String className = resources.getKey(); - String resourcePath = - extractedMDK.toString() + File.separator + "src" + File.separator + "main" + File.separator + "java" + File.separator + className + ".java"; - byte[] code = DecompileImpl.CFR.create(this.controller).decompile(className).getBytes(StandardCharsets.UTF_8); - Extractor.saveFile(Paths.get(resourcePath), code); - } - } - - private String getResourcesPath(String resource) { - return "/mdks/" + currentVersion.replaceAll("\\.", "_") + resource; - } - private void detectVersion() { ListeningMap data = currentWorkspace.getPrimary().getFiles(); byte[] mcModInfo = data.get("mcmod.info"); @@ -136,38 +132,28 @@ private void detectVersion() { String version = jsonValue.asArray().get(0).asObject().get("mcversion").asString(); for (String s : versions) { if (s.equalsIgnoreCase(version)) { - currentVersion = version; + this.currentVersion = version; applyMapping(); return; } } - Log.info(getName() + " Failed to find mod version"); + info("Failed to find mod version"); currentVersion = ""; } - @Override - public Menu createMenu() { - MenuItem[] itemList = new MenuItem[versions.length + 1]; - int index = 0; - for (String version : versions) { - itemList[index] = new ActionMenuItem(version, () -> { - currentVersion = version; - CompletableFuture.runAsync(this::applyMapping, executor); - }); - index++; - } - itemList[index] = new ActionMenuItem("Export MDK", this::exportMDK); - return new Menu(getName(), null, itemList); + public String getCurrentVersion() { + return this.currentVersion; } - @Override - public String getConfigTabTitle() { - return getName(); + public Workspace getCurrentWorkspace() { + return this.currentWorkspace; } - @Override - public void onStart(Controller controller) { - this.controller = controller; + public Controller getController() { + return this.controller; + } + public static void info(String msg) { + Log.info(name + " " + msg); } } diff --git a/src/main/java/dev/fxe/recaf4forge/gui/Notification.java b/src/main/java/dev/fxe/recaf4forge/gui/Notification.java new file mode 100644 index 0000000..ebd36d1 --- /dev/null +++ b/src/main/java/dev/fxe/recaf4forge/gui/Notification.java @@ -0,0 +1,31 @@ +package dev.fxe.recaf4forge.gui; + +import javafx.geometry.HPos; +import javafx.geometry.Insets; +import javafx.geometry.Pos; +import javafx.scene.Node; +import javafx.scene.control.Control; +import javafx.scene.control.Label; +import javafx.scene.layout.GridPane; +import me.coley.recaf.ui.controls.popup.DragPopup; + +public class Notification extends DragPopup { + + public Notification(Node content, Control handle) { + super(content, handle); + } + + public static Notification create(String title, String msg) { + Label lblTitle = new Label(title); + Label lblMsg = new Label(msg); + lblTitle.getStyleClass().add("h1"); + GridPane grid = new GridPane(); + GridPane.setHalignment(lblMsg, HPos.CENTER); + grid.setPadding(new Insets(15)); + grid.setHgap(10); + grid.setVgap(10); + grid.setAlignment(Pos.CENTER); + grid.add(lblMsg, 0, 1, 2, 1); + return new Notification(grid, lblTitle); + } +} From 0e1b84812e9f7b049b669032745b333306d796f4 Mon Sep 17 00:00:00 2001 From: filipwtf <37674069+filipwtf@users.noreply.github.com> Date: Wed, 31 Mar 2021 15:53:48 +0100 Subject: [PATCH 3/8] Attempt to fix workflow --- .github/workflows/release.yml | 4 ++-- .gitignore | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 4114b17..9fc4de6 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -28,7 +28,7 @@ jobs: with: arguments: build - name: Step 3 - Read version - id: version + id: read_property uses: christian-draeger/read-properties@1.0.1 with: path: ${{ env.PROPERTIES_PATH }} @@ -36,5 +36,5 @@ jobs: - name: Step 4 - Release artifact - uses: actions/upload-artifact@v2 with: - name: "Recaf4Forge"-${{ steps.version.outputs.value }} + name: Recaf4Forge-${{ steps.read_property.outputs.value }} path: build/libs/*.jar diff --git a/.gitignore b/.gitignore index 8dec292..c6f5eb1 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ out # gradle build .gradle +/.gradle/ From d68f6bc1454347f00ab208e13742b6d7b159deba Mon Sep 17 00:00:00 2001 From: filipwtf <37674069+filipwtf@users.noreply.github.com> Date: Wed, 31 Mar 2021 15:57:23 +0100 Subject: [PATCH 4/8] Attempt to fix workflow, remove .gradle --- .github/workflows/release.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 9fc4de6..cbd18a0 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -19,20 +19,24 @@ jobs: PROPERTIES_PATH: gradle.properties steps: - uses: actions/checkout@v2.3.4 + - name: Step 1 - Setup JDK - uses: actions/setup-java@v1.4.3 with: java-version: 1.8 + - name: Step 2 - Gradle build - uses: eskatos/gradle-command-action@v1 with: arguments: build + - name: Step 3 - Read version id: read_property uses: christian-draeger/read-properties@1.0.1 with: path: ${{ env.PROPERTIES_PATH }} property: version + - name: Step 4 - Release artifact - uses: actions/upload-artifact@v2 with: From 550d3353db4c8a73cc079e1c3d2bb81e77dafbcc Mon Sep 17 00:00:00 2001 From: filipwtf <37674069+filipwtf@users.noreply.github.com> Date: Wed, 31 Mar 2021 15:59:13 +0100 Subject: [PATCH 5/8] bruh --- .github/workflows/release.yml | 2 +- .../6.8.3/executionHistory/executionHistory.bin | Bin 94431 -> 0 bytes .../executionHistory/executionHistory.lock | Bin 17 -> 0 bytes .gradle/6.8.3/fileChanges/last-build.bin | Bin 1 -> 0 bytes .gradle/6.8.3/fileHashes/fileHashes.bin | Bin 20947 -> 0 bytes .gradle/6.8.3/fileHashes/fileHashes.lock | Bin 17 -> 0 bytes .gradle/6.8.3/gc.properties | 0 .../buildOutputCleanup/buildOutputCleanup.lock | Bin 17 -> 0 bytes .gradle/buildOutputCleanup/cache.properties | 2 -- .gradle/buildOutputCleanup/outputFiles.bin | Bin 19019 -> 0 bytes .gradle/checksums/checksums.lock | Bin 17 -> 0 bytes .gradle/configuration-cache/gc.properties | 0 .gradle/vcs-1/gc.properties | 0 13 files changed, 1 insertion(+), 3 deletions(-) delete mode 100644 .gradle/6.8.3/executionHistory/executionHistory.bin delete mode 100644 .gradle/6.8.3/executionHistory/executionHistory.lock delete mode 100644 .gradle/6.8.3/fileChanges/last-build.bin delete mode 100644 .gradle/6.8.3/fileHashes/fileHashes.bin delete mode 100644 .gradle/6.8.3/fileHashes/fileHashes.lock delete mode 100644 .gradle/6.8.3/gc.properties delete mode 100644 .gradle/buildOutputCleanup/buildOutputCleanup.lock delete mode 100644 .gradle/buildOutputCleanup/cache.properties delete mode 100644 .gradle/buildOutputCleanup/outputFiles.bin delete mode 100644 .gradle/checksums/checksums.lock delete mode 100644 .gradle/configuration-cache/gc.properties delete mode 100644 .gradle/vcs-1/gc.properties diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index cbd18a0..b2588f7 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -32,7 +32,7 @@ jobs: - name: Step 3 - Read version id: read_property - uses: christian-draeger/read-properties@1.0.1 + - uses: christian-draeger/read-properties@1.0.1 with: path: ${{ env.PROPERTIES_PATH }} property: version diff --git a/.gradle/6.8.3/executionHistory/executionHistory.bin b/.gradle/6.8.3/executionHistory/executionHistory.bin deleted file mode 100644 index fa6ea37b30c3f353b093da0e6995dec620d236f4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 94431 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 Sx2@~8!I{g&(9nz}$M_3bNaTe8 diff --git a/.gradle/6.8.3/fileHashes/fileHashes.lock b/.gradle/6.8.3/fileHashes/fileHashes.lock deleted file mode 100644 index dfe757db601c11f87cf07719812fa0f780d1e180..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 17 UcmZQx5M?(%K7qA^0Sp+O0Vvc1YXATM diff --git a/.gradle/6.8.3/gc.properties b/.gradle/6.8.3/gc.properties deleted file mode 100644 index e69de29..0000000 diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock deleted file mode 100644 index 23ef8609728df91cf811f608abeff069a3db7d8d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 17 UcmZS9xhJ~W-#glq0RlDy04M?j#{d8T diff --git a/.gradle/buildOutputCleanup/cache.properties b/.gradle/buildOutputCleanup/cache.properties deleted file mode 100644 index b28d805..0000000 --- a/.gradle/buildOutputCleanup/cache.properties +++ /dev/null @@ -1,2 +0,0 @@ -#Tue Mar 30 21:35:58 BST 2021 -gradle.version=6.8.3 diff --git a/.gradle/buildOutputCleanup/outputFiles.bin b/.gradle/buildOutputCleanup/outputFiles.bin deleted file mode 100644 index 72020afc1364ab7b10ac8586df4dc3b8d3a59744..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 19019 zcmeI%Z%7ky9LMq7&dh&g1f#Q+BbG?`C$SKU21OPs=_nNqABl-iMr3JbbI&X?=*h8) zZ4jxWB_$RG5&f%~ZOeb8p^AEMs2-dF4af6;vtbu0IY zwA+5;g;~4Wa|*dHW|ig7B$--hd<$f~1>xt*> zhkAOR9`4o-d;d+Hdye{X?q`n7ukMtMKk2>(?xl@0$9(!B2X&GA`CO@Y%iRf))>-0y zvD`5}T{2~+UdR2?U{pu Date: Wed, 31 Mar 2021 16:01:44 +0100 Subject: [PATCH 6/8] Done :smile: --- .github/workflows/release.yml | 27 +++++++++++++++------------ build.gradle | 2 -- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b2588f7..adae3b6 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -9,8 +9,9 @@ jobs: name: "Post build - Validation" runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - uses: gradle/wrapper-validation-action@v1.3.3 + - uses: actions/checkout@v2.3.4 + - name: Gradle Wrapper Validation + uses: gradle/wrapper-validation-action@v1.0.3 build: needs: validation @@ -21,24 +22,26 @@ jobs: - uses: actions/checkout@v2.3.4 - name: Step 1 - Setup JDK - - uses: actions/setup-java@v1.4.3 + uses: actions/setup-java@v1.4.3 with: - java-version: 1.8 + java-version: 8 + java-package: jdk+fx - - name: Step 2 - Gradle build - - uses: eskatos/gradle-command-action@v1 - with: - arguments: build + - name: Step 2 - Grant execute permission for gradlew + run: chmod +x gradlew + + - name: Step 3 - Build with Gradle + run: ./gradlew build - - name: Step 3 - Read version + - name: Step 4 - Read version id: read_property - - uses: christian-draeger/read-properties@1.0.1 + uses: christian-draeger/read-properties@1.0.1 with: path: ${{ env.PROPERTIES_PATH }} property: version - - name: Step 4 - Release artifact - - uses: actions/upload-artifact@v2 + - name: Step 5 - Release artifact + uses: actions/upload-artifact@v2 with: name: Recaf4Forge-${{ steps.read_property.outputs.value }} path: build/libs/*.jar diff --git a/build.gradle b/build.gradle index 9c94d8b..32fe7a7 100644 --- a/build.gradle +++ b/build.gradle @@ -28,5 +28,3 @@ tasks.withType(JavaCompile) { compileJava { source = processSource.outputs } - -tasks.build.dependsOn(tasks.clean) \ No newline at end of file From d5e132c8f2a42a8e55cb9581370b1d22467a4da3 Mon Sep 17 00:00:00 2001 From: filipwtf <37674069+filipwtf@users.noreply.github.com> Date: Wed, 31 Mar 2021 16:38:09 +0100 Subject: [PATCH 7/8] Release action --- .github/workflows/release.yml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index adae3b6..01bc646 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -40,8 +40,16 @@ jobs: path: ${{ env.PROPERTIES_PATH }} property: version - - name: Step 5 - Release artifact + - name: Step 5 - Upload artifact uses: actions/upload-artifact@v2 with: name: Recaf4Forge-${{ steps.read_property.outputs.value }} path: build/libs/*.jar + + - name: Step 6 - Create a Release + uses: elgohr/Github-Release-Action@master + env: + GITHUB_TOKEN: ${{ secrets.RELEASE_TOKEN }} + with: + args: v${{ steps.read_property.outputs.value }} + From 22b30098b46c102154c94aef30439dfcb2c7e0e2 Mon Sep 17 00:00:00 2001 From: filipwtf <37674069+filipwtf@users.noreply.github.com> Date: Wed, 31 Mar 2021 16:51:53 +0100 Subject: [PATCH 8/8] Finalise release workflow --- .github/workflows/release.yml | 4 ++-- README.md | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 01bc646..bf7afcb 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -2,7 +2,7 @@ name: Recaf4Forge Release on: push: - branches: [gradle] + branches: [master] jobs: validation: @@ -51,5 +51,5 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.RELEASE_TOKEN }} with: - args: v${{ steps.read_property.outputs.value }} + args: Recaf4Forge ${{ steps.read_property.outputs.value }} diff --git a/README.md b/README.md index d35d0f1..bd7e846 100644 --- a/README.md +++ b/README.md @@ -6,6 +6,7 @@ Inspired by [Luyten4Forge](https://github.com/KevinPriv/Luyten4Forge) ![VERSION](https://img.shields.io/github/v/release/1fxe/Recaf4Forge?style=flat-square) ![ISSUES](https://img.shields.io/github/issues/1fxe/Recaf4Forge?style=flat-square) +[![Recaf4Forge Release](https://github.com/1fxe/Recaf4Forge/actions/workflows/release.yml/badge.svg)](https://github.com/1fxe/Recaf4Forge/actions/workflows/release.yml)