Skip to content
Permalink
Browse files

Fixed shears not working under particular settings

Fixed potential issue saving JSON files
Fixed potential crash with null ore dictionaries
Fixed potential crash with null mining agent
Fixed ghost blocks showing up after some excavations
Updated project files
Minor code cleanup
  • Loading branch information...
Funwayguy committed Apr 16, 2018
1 parent 2097208 commit 8d492b3ffc341a8c85230cce5387b0371a26e9f1
Showing with 240 additions and 444 deletions.
  1. +11 −0 .gitignore
  2. +34 −15 build.gradle
  3. +0 −32 curse_upload
  4. +0 −2 get_deps
  5. +6 −0 gradle.properties
  6. BIN gradle/wrapper/gradle-wrapper.jar
  7. +1 −2 gradle/wrapper/gradle-wrapper.properties
  8. +43 −35 gradlew
  9. +4 −10 gradlew.bat
  10. +1 −1 src/main/java/oreexcavation/client/GuiNumberField.java
  11. +0 −206 src/main/java/oreexcavation/client/UpdateNotification.java
  12. +1 −4 src/main/java/oreexcavation/core/OreExcavation.java
  13. +0 −5 src/main/java/oreexcavation/core/proxies/ClientProxy.java
  14. +1 −1 src/main/java/oreexcavation/events/IExcavateFilter.java
  15. +1 −1 src/main/java/oreexcavation/groups/BlockBlacklist.java
  16. +7 −6 src/main/java/oreexcavation/groups/BlockEntry.java
  17. +4 −4 src/main/java/oreexcavation/groups/BlockGroups.java
  18. +1 −1 src/main/java/oreexcavation/groups/ItemBlacklist.java
  19. +7 −6 src/main/java/oreexcavation/groups/ItemEntry.java
  20. +1 −1 src/main/java/oreexcavation/handlers/EventHandler.java
  21. +29 −16 src/main/java/oreexcavation/handlers/MiningAgent.java
  22. +11 −6 src/main/java/oreexcavation/handlers/MiningScheduler.java
  23. +4 −19 src/main/java/oreexcavation/network/PacketExcavation.java
  24. +5 −5 src/main/java/oreexcavation/overrides/ToolOverride.java
  25. +3 −1 src/main/java/oreexcavation/overrides/ToolOverrideHandler.java
  26. +4 −4 src/main/java/oreexcavation/shapes/ExcavateShape.java
  27. +1 −1 src/main/java/oreexcavation/shapes/ShapeRegistry.java
  28. +4 −4 src/main/java/oreexcavation/undo/ExcavateHistory.java
  29. +1 −1 src/main/java/oreexcavation/undo/RestoreResult.java
  30. +4 −4 src/main/java/oreexcavation/utils/BigItemStack.java
  31. +40 −28 src/main/java/oreexcavation/utils/JsonHelper.java
  32. +11 −8 src/main/java/oreexcavation/utils/ToolEffectiveCheck.java
  33. +0 −15 version_build
@@ -212,3 +212,14 @@ pip-log.txt

#Mr Developer
.mr.developer.cfg


#############
## IntelliJ
#############

.gradle/
.idea/
jars/
classes/
out/
@@ -1,42 +1,61 @@
buildscript {
repositories {
jcenter()
maven { url = "http://files.minecraftforge.net/maven" }
maven {
name = "forge"
url = "https://files.minecraftforge.net/maven"
}
}
dependencies {
classpath 'net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT'
classpath "net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT"
}
}

apply plugin: 'net.minecraftforge.gradle.forge'
apply plugin: "net.minecraftforge.gradle.forge"

version = "CI_MOD_VERSION"
group= "oreexcavation" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
archivesBaseName = "OreExcavation"
version = modVersion
group= modGroup
archivesBaseName = modBaseName

sourceCompatibility = 1.8
targetCompatibility = 1.8

minecraft {
version = "1.12.2-14.23.0.2491"
mappings = "snapshot_20170624"
version = project.forgeVersion
runDir = "run"

// the mappings can be changed at any time, and must be in the following format.
// snapshot_YYYYMMDD snapshot are built nightly.
// stable_# stables are built at the discretion of the MCP team.
// Use non-default mappings at your own risk. they may not always work.
// simply re-run your setup task after changing the mappings to update your workspace.
mappings = project.mcpVersion
// makeObfSourceJar = false // an Srg named sources jar is made by default. uncomment this to disable.
}

repositories {
mavenCentral()
}

dependencies {
}

processResources
{
processResources {
// this will ensure that this task is redone when the versions change.
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'
expand 'version':project.version, 'mcversion':project.minecraft.version
include "mcmod.info"

// replace version and mcversion
expand "version":project.version, "mcversion":project.minecraft.version
}


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

This file was deleted.

This file was deleted.

@@ -0,0 +1,6 @@
modGroup = oreexcavation
modVersion = 1.4.118
modBaseName = OreExcavation

forgeVersion = 1.12.2-14.23.3.2655
mcpVersion = snapshot_20180413
BIN +2.01 KB (100%) gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
@@ -1,6 +1,5 @@
#Mon Sep 14 12:28:28 PDT 2015
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4.1-bin.zip
78 gradlew
@@ -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
@@ -30,6 +48,7 @@ die ( ) {
cygwin=false
msys=false
darwin=false
nonstop=false
case "`uname`" in
CYGWIN* )
cygwin=true
@@ -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.
@@ -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
@@ -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`
@@ -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" "$@"
@@ -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

@@ -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.
@@ -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
@@ -9,7 +9,7 @@
@SideOnly(Side.CLIENT)
public class GuiNumberField extends GuiTextField
{
public static final String REGEX_NUMBER = "[^\\.0123456789-]";
public static final String REGEX_NUMBER = "[^.0123456789-]";

public GuiNumberField(FontRenderer renderer, int posX, int posY, int sizeX, int sizeY)
{

0 comments on commit 8d492b3

Please sign in to comment.
You can’t perform that action at this time.