Skip to content

Commit

Permalink
Initial 1.12.2 update
Browse files Browse the repository at this point in the history
  • Loading branch information
Sollace committed Aug 31, 2018
1 parent 0429f39 commit ac5dbf8
Show file tree
Hide file tree
Showing 50 changed files with 661 additions and 737 deletions.
11 changes: 2 additions & 9 deletions build.gradle
Expand Up @@ -12,7 +12,7 @@ buildscript {
}
}
dependencies {
classpath 'net.minecraftforge.gradle:ForgeGradle:2.2-SNAPSHOT'
classpath 'net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT'
}
}
configurations {
Expand All @@ -39,8 +39,7 @@ sourceSets {
}
}

// Basic project information
version = "r36"
version = "r37"
group = "eu.ha3"
archivesBaseName = 'presencefootsteps'
ext.revision = "0"
Expand All @@ -52,23 +51,17 @@ minecraft {
}

processResources {
// this will ensure that this task is redone when the versions change.
def props = [
version: version,
mcversion: minecraft.version,
revision: revision
]

inputs.properties props

// replace stuff in litemod.json, nothing else
from(sourceSets.main.resources.srcDirs) {
include 'litemod.json'
// replace version and mcversion
expand props
}

// copy everything else, thats not the litemod.json
from(sourceSets.main.resources.srcDirs) {
exclude 'litemod.json'
}
Expand Down
6 changes: 3 additions & 3 deletions gradle.properties
Expand Up @@ -5,6 +5,6 @@ description=MAtmos, a Minecraft mod.
url=http://presencefootsteps.ha3.eu
organization=
buildType=SNAPSHOT
buildVersion=1.11
mcVersion=1.11
mcMappings=snapshot_20161128
buildVersion=1.12.2
mcVersion=1.12.2
mcMappings=stable_39
Binary file added gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
5 changes: 5 additions & 0 deletions gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.8.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
172 changes: 172 additions & 0 deletions gradlew
@@ -0,0 +1,172 @@
#!/usr/bin/env sh

##############################################################################
##
## 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

# 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"

# 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" "$@"
84 changes: 84 additions & 0 deletions gradlew.bat
@@ -0,0 +1,84 @@
@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

: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=%*

: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
6 changes: 3 additions & 3 deletions main-src/eu/ha3/matmos/expansions/Expansion.java
Expand Up @@ -347,13 +347,13 @@ public ExpansionDebugUnit obtainDebugUnit()
String folderName = frp.getPackName();
// XXX: getPackName might not be specified to return the folder name?

final File folder = new File(Minecraft.getMinecraft().mcDataDir, "resourcepacks/" + folderName);
final File folder = new File(Minecraft.getMinecraft().gameDir, "resourcepacks/" + folderName);

if (folder.exists() && folder.isDirectory())
{
System.out.println(this.identity.getLocation().getResourcePath());
System.out.println(this.identity.getLocation().getPath());
final File file =
new File(folder, "assets/matmos/" + this.identity.getLocation().getResourcePath());
new File(folder, "assets/matmos/" + this.identity.getLocation().getPath());

return new FolderResourcePackEditableEDU() {
@Override
Expand Down
2 changes: 1 addition & 1 deletion main-src/eu/ha3/matmos/expansions/ExpansionManager.java
Expand Up @@ -109,7 +109,7 @@ private void addExpansion(ExpansionIdentity identity)
this.userconfigFolder, identity.getUniqueName() + ".cfg"));
this.expansions.put(identity.getUniqueName(), expansion);

if (identity.getLocation().getResourcePath().endsWith(".xml"))
if (identity.getLocation().getPath().endsWith(".xml"))
{
File folder = new File(this.userconfigFolder, "DO NOT EDIT UNLESS COPIED/");
if (!folder.exists())
Expand Down
2 changes: 1 addition & 1 deletion main-src/eu/ha3/matmos/game/data/MODULE_CONSTANTS.java
Expand Up @@ -24,6 +24,6 @@ public class MODULE_CONSTANTS
public static String NO_ITEM = "";
public static String NO_POWERMETA = "";
public static String NO_NAME = "";
public static int NO_ENTITY = -1;
public static String NO_ENTITY = "";
public static int NO_META = -1;
}
10 changes: 6 additions & 4 deletions main-src/eu/ha3/matmos/game/data/ModularDataGatherer.java
Expand Up @@ -17,6 +17,7 @@
import eu.ha3.matmos.game.mod.MAtMod;
import eu.ha3.matmos.game.system.IDontKnowHowToCode;
import eu.ha3.matmos.log.MAtLog;
import net.minecraft.inventory.EntityEquipmentSlot;

import java.util.*;

Expand Down Expand Up @@ -115,10 +116,11 @@ public void load()
addModule(new R__meta_option(this.data, this.mod), 200);
addModule(new R__server_info(this.data), 200);
addModule(new S__detect(this.data, this, "detect_mindist", "detect_radius", 256, 2, 5, 10, 20, 50));
addModule(new S__ench_armor(this.data, 0));
addModule(new S__ench_armor(this.data, 1));
addModule(new S__ench_armor(this.data, 2));
addModule(new S__ench_armor(this.data, 3));

for (EntityEquipmentSlot i : EntityEquipmentSlot.values()) {
addModule(new S__ench_armor(this.data, i));
}

addModule(new S__ench_current(this.data));
addModule(new S__ply_hitscan(this.data));
addModule(new S__ply_leash(this.data));
Expand Down
@@ -1,6 +1,8 @@
package eu.ha3.matmos.game.data.abstractions.module;

import eu.ha3.matmos.engine.core.interfaces.Data;
import net.minecraft.client.Minecraft;
import net.minecraft.entity.player.EntityPlayer;

import java.util.Map;
import java.util.TreeMap;
Expand Down Expand Up @@ -67,4 +69,8 @@ protected void EI(EI ei)
{
this.eis.put(ei.getName(), ei);
}

protected EntityPlayer getPlayer() {
return Minecraft.getMinecraft().player;
}
}

0 comments on commit ac5dbf8

Please sign in to comment.