update buildscript

build.properties

@@ -1,27 +1 @@
-systemProp.file.encoding=utf-8
-dir.development=./
-dir.mcp=${dir.development}forge/mcp
-version.minecraft=1.7.10
-version.forge=10.13.4.1614
-version.mod.major=2
-version.mod.minor=4
-version.mod.revis=4
-version.ae=rv3-beta-22
-version.oc=MC1.7.10-1.7.4.1265
-version.bc=7.1.14
-version.waila=1.5.10_1.7.10
-version.ccl=1.1.3.140
-version.ccc=1.0.7.+
-version.nei=1.0.5.+
-version.igw=1.1.3-18
-version.wc=1.7.10-rv3-1.8.7.4-bigbass-1
-cf.wc=2307/524
-gregtech.version=5.09.23
-ic2.version=2.2.821-experimental
-thaumicenergistics.version=1.0.0.1
-cofhlib.cf=2230/207
-cofhlib.version=[1.7.10]1.2.1-185
-cofhcore.cf=2246/697
-cofhcore.version=[1.7.10]3.1.4-329-dev
-
 version.extracells=rv2-23

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,5 @@
-#Wed Jul 02 15:54:47 CDT 2014
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4.1-bin.zip

gradlew

@@ -1,25 +1,59 @@
-#!/usr/bin/env bash
+#!/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
 ##
 ##############################################################################
 
-# 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='"-Xmx64m" "-Xms64m"'
+
 # 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 +64,7 @@ die ( ) {
 cygwin=false
 msys=false
 darwin=false
+nonstop=false
 case "`uname`" in
   CYGWIN* )
     cygwin=true
@@ -40,31 +75,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.
@@ -77,20 +92,18 @@ if [ -n "$JAVA_HOME" ] ; then
     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" ] ; 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
@@ -110,10 +123,11 @@ 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
+# 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`
@@ -154,11 +168,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" "$@"

gradlew.bat

@@ -1,3 +1,19 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
 @if "%DEBUG%" == "" @echo off
 @rem ##########################################################################
 @rem
@@ -8,14 +24,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="-Xmx64m" "-Xms64m"
+
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
 
@@ -46,10 +62,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 +75,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
@@ -87,4 +97,4 @@ exit /b 1
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal
 
-:omega
+:omega

src/main/resources/mcmod.info

@@ -1,10 +1,10 @@
 [
 {
-  "modid": "extracells",
-  "name": "Extra Cells 2",
+  "modid": "${modId}",
+  "name": "${modName}",
   "description": "Adds new ME Storage Cells and some other cool stuff to AE 2.",
-  "version": "${version}",
-  "mcversion": "${mcversion}",
+  "version": "${modVersion}",
+  "mcversion": "${minecraftVersion}",
   "url": "http://www.minecraftforum.net/forums/mapping-and-modding/minecraft-mods/1289077-ae-add-on-m3gas-extracells-2-1-x-2-2-x",
   "updateUrl": "",
   "authorList": ["M3gaFr3ak", "DrummerMC"],
@@ -13,4 +13,4 @@
   "screenshots": [],
   "dependencies": ["Applied Energistics 2"]
 }
-]
+]

src/main/scala/extracells/Extracells.scala

@@ -20,7 +20,13 @@ import net.minecraft.item.ItemStack
 import net.minecraftforge.common.MinecraftForge
 import net.minecraftforge.common.config.Configuration
 
-@Mod(modid = "extracells", name = "Extra Cells", modLanguage = "scala", dependencies = "after:LogisticsPipes|Main;after:Waila;required-after:appliedenergistics2")
+@Mod(
+	modid = "extracells",
+	name = "Extra Cells",
+	version = "GRADLETOKEN_VERSION",
+	modLanguage = "scala",
+	dependencies = "after:LogisticsPipes|Main;after:Waila;required-after:appliedenergistics2"
+)
 object Extracells {
 
 

src/main/scala/extracells/block/BlockCertusTank.java

@@ -2,6 +2,7 @@
 
 import appeng.api.implementations.items.IAEWrench;
 import buildcraft.api.tools.IToolWrench;
+import cpw.mods.fml.common.Optional;
 import extracells.network.ChannelHandler;
 import extracells.registries.BlockEnum;
 import extracells.render.RenderHandler;
@@ -24,6 +25,7 @@
 import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.common.Loader;
 
+@Optional.Interface(iface = "gregtech.api.items.GT_MetaGenerated_Tool", modid = "gregtech")
 public class BlockCertusTank extends BlockEC {
 
 	IIcon breakIcon;
@@ -114,6 +116,17 @@ public String getUnlocalizedName() {
 	public boolean isOpaqueCube() {
 		return false;
 	}
+
+	@Optional.Method(modid = "gregtech")
+	public boolean gtWrench(ItemStack current, World worldObj, int x, int y, int z, EntityPlayer entityplayer) {
+		if (current.getItem() instanceof GT_MetaGenerated_Tool && ((GT_MetaGenerated_Tool) current.getItem()).canWrench(entityplayer, x, y, z)) {
+			dropBlockAsItem(worldObj, x, y, z, getDropWithNBT(worldObj, x, y, z));
+			worldObj.setBlockToAir(x, y, z);
+			((GT_MetaGenerated_Tool) current.getItem()).wrenchUsed(entityplayer, x, y, z);
+			return true;
+		}
+		return false;
+	}
 
 	@Override
 	public boolean onBlockActivated(World worldObj, int x, int y, int z,
@@ -123,36 +136,22 @@ public boolean onBlockActivated(World worldObj, int x, int y, int z,
 
 		if (entityplayer.isSneaking() && current != null) {
 			try {
-				if (current.getItem() instanceof IToolWrench
-						&& ((IToolWrench) current.getItem()).canWrench(
-						entityplayer, x, y, z)) {
-					dropBlockAsItem(worldObj, x, y, z,
-							getDropWithNBT(worldObj, x, y, z));
+				if (current.getItem() instanceof IToolWrench && ((IToolWrench) current.getItem()).canWrench(entityplayer, x, y, z)) {
+					dropBlockAsItem(worldObj, x, y, z, getDropWithNBT(worldObj, x, y, z));
 					worldObj.setBlockToAir(x, y, z);
-					((IToolWrench) current.getItem()).wrenchUsed(entityplayer,
-							x, y, z);
+					((IToolWrench) current.getItem()).wrenchUsed(entityplayer, x, y, z);
 					return true;
 				}
 			} catch (Throwable e) {
 				// No IToolWrench
 			}
-			if (current.getItem() instanceof IAEWrench
-					&& ((IAEWrench) current.getItem()).canWrench(current,
-					entityplayer, x, y, z)) {
-				dropBlockAsItem(worldObj, x, y, z,
-						getDropWithNBT(worldObj, x, y, z));
+			if (current.getItem() instanceof IAEWrench && ((IAEWrench) current.getItem()).canWrench(current, entityplayer, x, y, z)) {
+				dropBlockAsItem(worldObj, x, y, z, getDropWithNBT(worldObj, x, y, z));
 				worldObj.setBlockToAir(x, y, z);
 				return true;
 			}
 			try {
-				if (current.getItem() instanceof GT_MetaGenerated_Tool
-						&& ((GT_MetaGenerated_Tool) current.getItem()).canWrench(
-						entityplayer, x, y, z)) {
-					dropBlockAsItem(worldObj, x, y, z,
-							getDropWithNBT(worldObj, x, y, z));
-					worldObj.setBlockToAir(x, y, z);
-					((GT_MetaGenerated_Tool) current.getItem()).wrenchUsed(entityplayer,
-							x, y, z);
+				if (gtWrench(current, worldObj, x, y, z, entityplayer)) {
 					return true;
 				}
 			} catch (Throwable e) {