Skip to content

Commit

Permalink
Merge pull request #1 from 1fxe/gradle
Browse files Browse the repository at this point in the history
Converting to gradle
  • Loading branch information
1fxe authored Mar 31, 2021
2 parents 4ae45ee + 22b3009 commit f5a9593
Show file tree
Hide file tree
Showing 17 changed files with 638 additions and 201 deletions.
55 changes: 55 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
name: Recaf4Forge Release

on:
push:
branches: [master]

jobs:
validation:
name: "Post build - Validation"
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2.3.4
- name: Gradle Wrapper Validation
uses: gradle/wrapper-validation-action@v1.0.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: 8
java-package: jdk+fx

- name: Step 2 - Grant execute permission for gradlew
run: chmod +x gradlew

- name: Step 3 - Build with Gradle
run: ./gradlew build

- name: Step 4 - Read version
id: read_property
uses: christian-draeger/read-properties@1.0.1
with:
path: ${{ env.PROPERTIES_PATH }}
property: version

- 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: Recaf4Forge ${{ steps.read_property.outputs.value }}

29 changes: 9 additions & 20 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,22 +1,11 @@
.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
/.gradle/
20 changes: 0 additions & 20 deletions CONTRIBUTING.md

This file was deleted.

31 changes: 24 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)

</div>

Expand All @@ -14,11 +15,23 @@ Inspired by [Luyten4Forge](https://github.com/KevinPriv/Luyten4Forge)
This is a plugin for Recaf which can automatically detects a Minecraft Forge Mods version using the mcmod.info and
applies the correct mapping. It also allows you to export the Forge MDK for the version.

The mappings are stored in this jar file, so you don't have to manually find them.
The mappings and mdks are stored in this jar file, so you don't have to manually find them.

The mappings currently work for 1.8, 1.8.9 and 1.9.4
<hr>

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

Expand All @@ -36,12 +49,16 @@ The Forge MDK export works for 1.8.9 and 1.9.4

</details>

## TODO
#### TODO

- Notifications
- Add support for other versions
- Add translations?
- Fix notifications disappearing too fast

<hr>

## Contributing

### Contributing
Contributors are welcome 👍🏽

See [Contributing](CONTRIBUTING.md)
Thanks [Recaf-development](https://github.com/videogame-player/recaf-development) for the gradle plugin
30 changes: 30 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
import org.apache.tools.ant.filters.ReplaceTokens

plugins {
id 'java'
id "me.videogame.recaf" version "1.2"
}

group = project.group
version = project.version
description = project.description
sourceCompatibility = JavaVersion.VERSION_1_8

recaf {
mainClass = project.mainClass
}

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
}
7 changes: 7 additions & 0 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
name=Recaf4Forge
version=1.1.4
group=dev.fxe
description=Recaf4Forge
mainClass=dev.fxe.recaf4forge.Recaf4Forge

org.gradle.jvmargs=-Xmx2G
Binary file added gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
5 changes: 5 additions & 0 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
185 changes: 185 additions & 0 deletions gradlew
Original file line number Diff line number Diff line change
@@ -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" "$@"
Loading

0 comments on commit f5a9593

Please sign in to comment.