Skip to content

Commit

Permalink
Split the code base into two separate projects
Browse files Browse the repository at this point in the history
  • Loading branch information
Sm0keySa1m0n committed Apr 28, 2020
1 parent e95c5f6 commit 08dfb80
Show file tree
Hide file tree
Showing 1,596 changed files with 2,465 additions and 340 deletions.
6 changes: 6 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#
# https://help.github.com/articles/dealing-with-line-endings/
#
# These are explicitly windows files and should use crlf
*.bat text eol=crlf

38 changes: 26 additions & 12 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,15 +1,29 @@
/.gradle/
crafting-dead-core/.classpath
crafting-dead-core/.project
crafting-dead-core/runClient.launch
crafting-dead-core/runServer.launch
crafting-dead-core/.gradle/
crafting-dead-core/bin/
crafting-dead-core/.settings/
crafting-dead-core/build/
crafting-dead-core/server/
crafting-dead-core/run/
crafting-dead-core/.idea/

crafting-dead-immerse/.classpath
crafting-dead-immerse/.project
crafting-dead-immerse/runClient.launch
crafting-dead-immerse/runServer.launch
crafting-dead-immerse/.gradle/
crafting-dead-immerse/bin/
crafting-dead-immerse/.settings/
crafting-dead-immerse/build/
crafting-dead-immerse/server/
crafting-dead-immerse/run/
crafting-dead-immerse/.idea/

/.classpath
/.project
/bin/
/.settings/
/build/
/logs/
eula.txt
/crash-reports/
server.properties
/run/
/runClient.launch
/runServer.launch
/.idea/

/.settings/
/.gradle/
9 changes: 0 additions & 9 deletions README.md

This file was deleted.

89 changes: 27 additions & 62 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -17,73 +17,38 @@ plugins {
id 'eclipse'
}

apply plugin: 'net.minecraftforge.gradle'
subprojects {
apply plugin: 'net.minecraftforge.gradle'

version = '0.0.1'
group = 'com.craftingdead.mod'
archivesBaseName = 'craftingdead'
sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '1.8'

sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '1.8'

repositories {
maven {
name 'jitpack'
url 'https://jitpack.io'
}
maven {
name 'tterrag'
url 'https://maven.tterrag.com'
group = 'com.craftingdead.mod'
version = '0.0.0.1'
archivesBaseName = project.name

minecraft {
mappings channel: "${mappings_channel}", version: "${mappings_version}"
}
}

minecraft {
mappings channel: "${mappings_channel}", version: "${mappings_version}"

accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg')

runs {
client {
workingDirectory project.file('run')

property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP'

mods {
craftingdead {
source sourceSets.main
}
}
}

server {
workingDirectory project.file('server')

property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP'

mods {
craftingdead {
source sourceSets.main
}
}
}
}
}

dependencies {
minecraft group: 'net.minecraftforge', name:'forge', version: "${minecraft_version}-${forge_version}"

implementation group: 'com.github.Vatuu', name: 'discord-rpc', version: '1.6.2'
dependencies {
minecraft group: 'net.minecraftforge', name:'forge', version: "${minecraft_version}-${forge_version}"
}

jar {
manifest {
attributes([
"Implementation-Title": project.name,
"Implementation-Version": project.version,
"Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ")
])
}
}
}

jar {
manifest {
attributes([
"Specification-Title": "craftingdead",
"Specification-Vendor": "craftingdead",
"Specification-Version": "1",
"Implementation-Title": project.name,
"Implementation-Version": "${version}",
"Implementation-Vendor" :"craftingdead",
"Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ")
])
repositories {
jcenter()
maven {
name 'tterrag'
url 'https://maven.tterrag.com'
}
}
29 changes: 29 additions & 0 deletions crafting-dead-core/build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
minecraft {
accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg')

runs {
client {
workingDirectory project.file('run')

property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP'

mods {
craftingdead {
source sourceSets.main
}
}
}

server {
workingDirectory project.file('server')

property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP'

mods {
craftingdead {
source sourceSets.main
}
}
}
}
}
Binary file not shown.
5 changes: 5 additions & 0 deletions crafting-dead-core/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-4.9-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
183 changes: 183 additions & 0 deletions crafting-dead-core/gradlew
Original file line number Diff line number Diff line change
@@ -0,0 +1,183 @@
#!/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 08dfb80

Please sign in to comment.