update gitignore

update gradle
update buildscript
This commit is contained in:
TimeConqueror authored and DreamMasterXXL committed 2021-09-06 22:18:54 +02:00
1 parent c177998b29
commit da3ce8a5f8
7 files changed
+350 -43

No files matched your search

+11
View File
@@ -0,0 +1,11 @@
.gradle/gradle.log
.gradle/
.idea/
*.iml
debug/
classes/
output/
out/
*.bat
opis.ipr
opis.iws
+3
View File
@@ -0,0 +1,3 @@
[submodule "lib/MobiusCore"]
path = lib/MobiusCore
url = https://github.com/GTNewHorizons/MobiusCore.git
+77 -43
View File
@@ -3,16 +3,20 @@ buildscript {
mavenCentral()
//jcenter()
maven {
name = "forge"
url = "http://files.minecraftforge.net/maven"
name = "gt"
url = "https://gregtech.overminddl1.com/"
}
maven {
name = "sonatype"
url = "https://oss.sonatype.org/content/repositories/snapshots/"
}
maven {
name = "jitpack.io"
url = "https://jitpack.io"
}
}
dependencies {
classpath 'net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT'
classpath 'com.github.GTNH2:ForgeGradle:FG_1.2-SNAPSHOT'
}
}
@@ -24,77 +28,107 @@ version = "1.2.5_1.7.10"
group= "mcp.mobius.opis" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
archivesBaseName = "Opis"
repositories {
mavenLocal()
mavenCentral()
maven {
name = "gt"
url = "https://gregtech.overminddl1.com/"
}
maven {
name "Mobius Repo"
url "http://mobiusstrip.eu/maven"
}
}
minecraft {
version = "1.7.10-10.13.0.1208"
assetDir = "eclipse/assets"
// Forge version
version = "1.7.10-10.13.4.1614-1.7.10"
runDir = "debug"
// Replace MOD_VERSION token with one specified in Gradle
// From https://github.com/GoryMoon/MoarSigns/blob/master/build.gradle#L46
replaceIn "CoreContainer.java"
replaceIn "modOpis.java"
replace "@MOD_VERSION@", project.version
// Shading - https://forgegradle.readthedocs.org/en/latest/user-guide/shading/
// math3 is shaded in case another mod decides to use a differing version
srgExtra "PK: org/apache/commons/math3 opisapache/math3"
}
configurations {
deployerJars
shade
compile.extendsFrom shade
}
repositories {
mavenLocal()
mavenCentral()
maven {
name "Mobius Repo"
url "http://mobiusstrip.eu/maven"
}
compile.extendsFrom shade
}
dependencies {
// Custom-built Netty for Opis
shade 'io.netty-opis:Netty-opis:4.0.23'
// Standard Maven repository dependencies
shade 'org.apache.commons:commons-math3:3.2'
shade 'org.jfree:jcommon:1.0.21'
shade 'org.jfree:jfreechart:1.0.17'
shade 'com.miglayout:miglayout-swing:4.2'
shade 'net.sf.opencsv:opencsv:2.3'
shade 'io.netty-opis:Netty-opis:4.0.23'
// shade 'io.netty:netty-all:4.0.23.Final'
// compile 'io.netty:netty-all:4.0.15.Final'
compile "mcp.mobius.mobiuscore:MobiusCore:1.2.4_1.7.10:dev"
// Necessary for deployment
deployerJars "org.apache.maven.wagon:wagon-ssh:2.2"
}
def root = project.projectDir.parentFile
sourceSets {
main {
java {
srcDir new File(root, "src")
}
resources {
srcDir new File(root, "resources")
}
}
// Includes MobiusCore submodule directory into the built jar as coremod
sourceSets.main {
java.srcDir project.projectDir.path + '/lib/MobiusCore/src/main/java'
resources.srcDir project.projectDir.path + '/lib/MobiusCore/src/main/resources'
}
compileJava {
sourceCompatibility = "1.8"
targetCompatibility = "1.8"
}
def commonManifest = {
// Allows Forge to find MobuisCore's coremod
attributes 'FMLCorePlugin': 'mcp.mobius.mobiuscore.asm.CoreDescription'
// Without this, Forge ignores Opis as it thinks there is only a coremod
attributes 'FMLCorePluginContainsFMLMod': 'true'
}
jar {
// Attach FMLCorePlugin attribute
manifest commonManifest
}
// Extra task for building a "sources" jar, for uncompiled code + comments
task sourceJar(type: Jar) {
from sourceSets.main.java
from new File(root, "dev")
// Attaches the name 'sources' to the jar
classifier = 'sources'
}
// Extra task for building a "dev" jar; built code pre-obsfucation
task devJar(type: Jar) {
from sourceSets.main.output
// Attaches the name 'dev' to the jar
classifier = 'dev'
// Attach FMLCorePlugin attribute
manifest commonManifest
}
// some crazy stuff to make sure the chicken stuff is in the mods folder...
// because it wont work otherwise... because FML doesnt laod coremods from the classpath
task copyCoreMods(type: Copy, dependsOn: "extractUserDev") {
from configurations.compile
include "**/*Mobius*.jar"
//include "**/*Chicken*.jar", "**/*NotEnoughItems*.jar"
//exclude "**/CodeChickenLib*" // because CCC downloads it anyways.. -_-
into file(minecraft.runDir + "/../mods") // paralell to the assets dir
// Fixes issues with debugging in IntelliJ
idea.module.inheritOutputDirs = true
// Fixes issues with µ character in source files
// From https://discuss.gradle.org/t/special-characters-in-java-string-literals-arent-interpreted-correctly/4665
tasks.withType(JavaCompile)
{
options.encoding = "UTF-8"
}
tasks.setupDevWorkspace.dependsOn copyCoreMods
tasks.setupDecompWorkspace.dependsOn copyCoreMods
artifacts {
archives sourceJar, devJar
archives jar, sourceJar, devJar
}
processResources
Binary file not shown.
+5
View File
@@ -0,0 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
Vendored
+164
View File
@@ -0,0 +1,164 @@
#!/usr/bin/env bash
##############################################################################
##
## 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=""
# 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, switch paths to Windows format before running java
if $cygwin ; 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=$((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
# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
function splitJvmOpts() {
JVM_OPTS=("$@")
}
eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
Vendored
+90
View File
@@ -0,0 +1,90 @@
@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 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=
@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 init
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 init
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
:init
@rem Get command-line arguments, handling Windows variants
if not "%OS%" == "Windows_NT" goto win9xME_args
if "%@eval[2+2]" == "4" goto 4NT_args
:win9xME_args
@rem Slurp the command line arguments.
set CMD_LINE_ARGS=
set _SKIP=2
:win9xME_args_slurp
if "x%~1" == "x" goto execute
set CMD_LINE_ARGS=%*
goto execute
:4NT_args
@rem Get arguments from the 4NT Shell from JP Software
set CMD_LINE_ARGS=%$
: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 %CMD_LINE_ARGS%
: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