Skip to content

Commit

Permalink
thaumcraft integration
Browse files Browse the repository at this point in the history
  • Loading branch information
KELETU66666 committed Mar 14, 2024
1 parent c18e23c commit da1c862
Show file tree
Hide file tree
Showing 20 changed files with 621 additions and 182 deletions.
163 changes: 35 additions & 128 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,161 +1,68 @@
buildscript {
repositories {
mavenCentral()
maven {
name = "forge"
url = "http://files.minecraftforge.net/maven"
}
maven {
name = "sonatype"
url = "https://oss.sonatype.org/content/repositories/snapshots/"
}
jcenter()
maven { url = "http://files.minecraftforge.net/maven" }
maven { url = "https://plugins.gradle.org/m2/" }
}
dependencies {
classpath 'net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT'
classpath 'com.wynprice.cursemaven:CurseMaven:2.1.1'
}
}

repositories {
maven {
name 'CB Maven FS'
url "http://chickenbones.net/maven/"
}
maven {
name 'ForgeFS'
url 'http://files.minecraftforge.net/maven'
}
maven { // JEI
name = "progwml6"
url "http://dvs1.progwml6.com/files/maven"
}
maven { //IC2
name = "IC2"
url = "http://maven.ic2.player.to/"
}
maven { // JEI Bees & Thaumcraft
name = "CurseForge"
url = "https://minecraft.curseforge.com/api/maven/"
}
maven {
name "CoFH"
url "http://maven.covers1624.net/"
}
maven { // Baubles
name "Thiakil"
url = "http://maven.thiakil.com"
}
maven { // Botania
name "BlameJared"
url "https://maven.blamejared.com/"
}
}

apply plugin: 'net.minecraftforge.gradle.forge'
apply plugin: 'com.wynprice.cursemaven'

ext.configFile = file "build.properties"
version = "1.12.2-kedition-0.0.1"
group = "magicbees"
archivesBaseName = "MagicBees"

configFile.withReader {
def prop = new Properties()
prop.load(it)
project.ext.config = new ConfigSlurper().parse prop
project.ext.modVersion = "${config.mod_version}." + (System.env.BUILD_NUMBER ?: "localBuild")
sourceCompatibility = targetCompatibility = '1.8'
compileJava {
sourceCompatibility = targetCompatibility = '1.8'
}

ext.modInfo = file "mod.properties"
minecraft {
version = "1.12.2-14.23.5.2847"
runDir = "run"

modInfo.withReader {
def prop = new Properties()
prop.load(it)
project.ext.mod = new ConfigSlurper().parse prop
mappings = "stable_39"
accessTransformer(file('src/main/resources/META-INF/magicbees_at.cfg'))
// makeObfSourceJar = false // an Srg named sources jar is made by default. uncomment this to disable.
}

version = "${config.minecraft_version}-" + modVersion
group= mod.group // http://maven.apache.org/guides/mini/guide-naming-conventions.html
archivesBaseName = mod.fileName

sourceCompatibility = 1.8
targetCompatibility = 1.8

minecraft {
version = config.minecraft_version + "-" + config.forge_version
runDir = "run"
repositories {
maven {
url "http://www.cursemaven.com"
}
}

replaceIn mod.mainClass
replace "#FORGE_VER#", config.forge_version
dependencies {
deobfCompile 'curse.maven:forestry-59751:2918418'
deobfCompile 'curse.maven:jei-238222:3040523'

mappings = config.mappings
deobfCompile 'curse.maven:thaumcraft-223628:2629023'
deobfCompile 'curse.maven:baubles-227083:2518667'

useDepAts = true
deobfCompile 'curse.maven:botania-225643:3330934'
deobfCompile 'curse.maven:applied-energistics-2-223794:2747063'
}

dependencies {
//JEI
deobfProvided "mezz.jei:jei_${config.minecraft_version}:${config.jei_version}:api"
runtime "mezz.jei:jei_${config.minecraft_version}:${config.jei_version}"
runtime "jei-bees:jeibees:${config.jeibees_version}:mc${config.minecraft_version}"

//Forestry
deobfCompile("net.sengir.forestry:forestry_${config.forestry_version}") {
transitive = false
}

//AE2
runtime "applied-energistics-2:appliedenergistics2-${config.ae2_version}"

//Railcraft
runtime "railcraft:railcraft:${config.railcraft_version}"

//Thaumcraft
deobfCompile "thaumcraft:Thaumcraft:${config.minecraft_version}:${config.thaumcraft_version}"
runtime "com.azanor.baubles:Baubles:1.12-${config.baubles_version}"

//Botania
deobfCompile "vazkii.botania:Botania:${config.botania_version}"

//Thermal Expansion & Redstone Arsenal
runtime ("cofh:ThermalExpansion:${config.minecraft_version}-${config.thermal_expansion_version}:universal") {
exclude group: 'mezz.jei'
}
runtime ("cofh:RedstoneArsenal:${config.minecraft_version}-${config.rsa_version}:universal") {
exclude group: 'mezz.jei'
}
//All TE & RSA deps below, thx...
runtime ("cofh:RedstoneFlux:1.12-${config.rf_version}:universal") { //MC 1.12 instead of 1.12.2....
exclude group: 'mezz.jei'
}
runtime ("cofh:CoFHCore:${config.minecraft_version}-${config.cofh_version}:universal") {
exclude group: 'mezz.jei'
}
runtime ("cofh:CoFHWorld:${config.minecraft_version}-${config.cofh_world_version}:universal") {
exclude group: 'mezz.jei'
}
runtime ("cofh:ThermalFoundation:${config.minecraft_version}-${config.thermal_foundation_version}:universal") {
exclude group: 'mezz.jei'
}
runtime "codechicken:CodeChickenLib:${config.minecraft_version}-${config.ccl_version}:universal"
jar {
manifest.attributes('FMLAT': 'magicbees_at.cfg')
}

processResources {
// this will ensure that this task is redone when the versions change.
inputs.property "version", modVersion
inputs.property "mcversion", config.minecraft_version
inputs.property "version", project.version
inputs.property "mcversion", project.minecraft.version

// replace stuff in mcmod.info, nothing else
from(sourceSets.main.resources.srcDirs) {
include 'mcmod.info'

// replace version and mcversion
expand 'version':modVersion, 'mcversion':config.minecraft_version, 'modid': mod.modid
expand 'version':project.version, 'mcversion':project.minecraft.version
}

// copy everything else, thats not the mcmod.info
// copy everything else except the mcmod.info
from(sourceSets.main.resources.srcDirs) {
exclude 'mcmod.info'
}
}

jar {
manifest {
attributes 'FMLAT': 'magicbees_at.cfg'
}
}
12 changes: 12 additions & 0 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# Sets default memory used for gradle commands. Can be overridden by user or command line properties.
# This is required to provide enough memory for the Minecraft decompilation process.
org.gradle.jvmargs=-Xmx3G
org.gradle.daemon=true
org.gradle.parallel=true
forgeVersion=1.12.2-14.23.5.2860
mcpVersion=stable_39

systemProp.http.proxyHost=127.0.0.1
systemProp.http.proxyPort=7890
systemProp.https.proxyHost=127.0.0.1
systemProp.https.proxyPort=7890
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
3 changes: 1 addition & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#Sat Aug 17 17:06:09 CEST 2019
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-bin.zip
78 changes: 43 additions & 35 deletions gradlew
Original file line number Diff line number Diff line change
@@ -1,25 +1,43 @@
#!/usr/bin/env bash
#!/usr/bin/env sh

##############################################################################
##
## Gradle start up script for UN*X
##
##############################################################################

# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS=""
# 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 ( ) {
warn () {
echo "$*"
}

die ( ) {
die () {
echo
echo "$*"
echo
Expand All @@ -30,6 +48,7 @@ die ( ) {
cygwin=false
msys=false
darwin=false
nonstop=false
case "`uname`" in
CYGWIN* )
cygwin=true
Expand All @@ -40,31 +59,11 @@ case "`uname`" in
MINGW* )
msys=true
;;
NONSTOP* )
nonstop=true
;;
esac

# For Cygwin, ensure paths are in UNIX format before anything is touched.
if $cygwin ; then
[ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
fi

# 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\"`/" >&-
APP_HOME="`pwd -P`"
cd "$SAVED" >&-

CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar

# Determine the Java command to use to start the JVM.
Expand All @@ -90,7 +89,7 @@ location of your Java installation."
fi

# Increase the maximum file descriptors if we can.
if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
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
Expand All @@ -114,6 +113,7 @@ fi
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`
Expand Down Expand Up @@ -154,11 +154,19 @@ if $cygwin ; then
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=("$@")
# Escape application args
save () {
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
echo " "
}
eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
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"

# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
cd "$(dirname "$0")"
fi

exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
exec "$JAVACMD" "$@"
14 changes: 4 additions & 10 deletions gradlew.bat
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@
@rem Set local scope for the variables with windows NT shell
if "%OS%"=="Windows_NT" setlocal

@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=

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

Expand Down Expand Up @@ -46,10 +46,9 @@ echo location of your Java installation.
goto fail

:init
@rem Get command-line arguments, handling Windowz variants
@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.
Expand All @@ -60,11 +59,6 @@ set _SKIP=2
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
Expand Down
Loading

0 comments on commit da1c862

Please sign in to comment.