Merge pull request #1 from GTNewHorizons/update-buildscript

Update Buildscript

.editorconfig

@@ -0,0 +1,22 @@
+# This is the universal Text Editor Configuration
+# for all GTNewHorizons projects
+# See: https://editorconfig.org/
+
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+indent_size = 4
+indent_style = space
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.{bat,ini}]
+end_of_line = crlf
+
+[*.{dtd,json,info,mcmeta,md,sh,svg,xml,xsd,xsl,yaml,yml}]
+indent_size = 2
+
+[*.lang]
+trim_trailing_whitespace = false

.gitattributes

@@ -0,0 +1,44 @@
+* text eol=lf
+
+*.[jJ][aA][rR]          binary
+
+*.[pP][nN][gG]          binary
+*.[jJ][pP][gG]          binary
+*.[jJ][pP][eE][gG]      binary
+*.[gG][iI][fF]          binary
+*.[tT][iI][fF]          binary
+*.[tT][iI][fF][fF]      binary
+*.[iI][cC][oO]          binary
+*.[sS][vV][gG]          text
+*.[eE][pP][sS]          binary
+*.[xX][cC][fF]          binary
+
+*.[kK][aA][rR]          binary
+*.[mM]4[aA]             binary
+*.[mM][iI][dD]          binary
+*.[mM][iI][dD][iI]      binary
+*.[mM][pP]3             binary
+*.[oO][gG][gG]          binary
+*.[rR][aA]              binary
+
+*.7[zZ]                 binary
+*.[gG][zZ]              binary
+*.[tT][aA][rR]          binary
+*.[tT][gG][zZ]          binary
+*.[zZ][iI][pP]          binary
+
+*.[tT][cC][nN]          binary
+*.[sS][oO]              binary
+*.[dD][lL][lL]          binary
+*.[dD][yY][lL][iI][bB]  binary
+*.[pP][sS][dD]          binary
+*.[tT][tT][fF]          binary
+*.[oO][tT][fF]          binary
+
+*.[pP][aA][tT][cC][hH]  -text
+
+*.[bB][aA][tT]          text eol=crlf
+*.[cC][mM][dD]          text eol=crlf
+*.[pP][sS]1             text eol=crlf
+
+*[aA][uU][tT][oO][gG][eE][nN][eE][rR][aA][tT][eE][dD]* binary

.github/scripts/update_version

@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+
+if ! git diff --name-only HEAD HEAD~1 | grep -qF 'build.gradle'; then
+  new_version="$(date +%s)"
+  sed --in-place "s!^//version:.*!//version: $new_version!g" build.gradle
+  git add build.gradle
+  git commit -m "[ci skip] update build script version to $new_version"
+  git push
+  printf 'Updated buildscript version to %s\n' "$new_version"
+else
+  printf 'Ignored buildscript version update: no changes detected\n'
+fi

.github/workflows/build-and-test.yml

@@ -0,0 +1,13 @@
+
+name: Build and test
+
+on:
+  pull_request:
+    branches: [ master, main ]
+  push:
+    branches: [ master, main ]
+
+jobs:
+  build-and-test:
+    uses: GTNewHorizons/GTNH-Actions-Workflows/.github/workflows/build-and-test.yml@master
+    secrets: inherit

.github/workflows/release-tags.yml

@@ -0,0 +1,14 @@
+
+name: Release tagged build
+
+on:
+  push:
+    tags: [ '*' ]
+
+permissions:
+  contents: write
+
+jobs:
+  release-tags:
+    uses: GTNewHorizons/GTNH-Actions-Workflows/.github/workflows/release-tags.yml@master
+    secrets: inherit

.gitignore

@@ -1,68 +1,32 @@
-#ant stuff
-/bin/
-#Remove OS generated garbage
-*/.DS_Store
-.DS_Store
-.DS_Store?
-.Spotlight-V100
-.Trashes
-Icon?
-ehthumbs.db
-Thumbs.db
-#gradle stuff
-/.gradle
-/build/
+.gradle
+.settings
+/.idea/
+/.vscode/
 /run/
-#IDEA files from Gradle
-.idea/
-/*.iml
-/*.ipr
-/*.iws
-#Vim backups
-*~
-#eclipse stuffs
-/.classpath
-/.project
-/.settings/
-/debug/
-*.lock
-/.metadata/
+/build/
+/eclipse/
+.classpath
+.project
+/bin/
 /config/
+/crash-reports/
 /logs/
 options.txt
 /saves/
-#sbt-eclipse junk
-/target/
-#Modeling stuff
-*.blend1
-*.blend2
-#libs
-/libs/
-/assets/
-/out/
-/crash-reports/
-/asm/
-/mods/
-*.log
-#Server stuff
-banned-ips.txt
-banned-players.txt
-ops.txt
+usernamecache.json
+banned-ips.json
+banned-players.json
+eula.txt
+ops.json
 server.properties
 servers.dat
-white-list.txt
-/world/
-banned-ips.json
-banned-ips.txt.converted
-banned-players.json
-banned-players.txt.converted
-eula.txt
-ops.txt.converted
-ops.json
 usercache.json
-white-list.txt.converted
 whitelist.json
-world-20140811-075700.zip
-.cache
-
-gradle.properties
+/out/
+*.iml
+*.ipr
+*.iws
+src/main/resources/mixins.*.json
+*.bat
+*.DS_Store
+!gradlew.bat

.travis.yml

@@ -1,18 +0,0 @@
-language: scala
-
-scala: 2.11.1
-
-notifications:
-  email: false
-
-jdk:
-  - oraclejdk7
-  - openjdk7
-  - openjdk6
-
-install: ./gradlew setupCIWorkspace -S
-script: ./gradlew build -S
-
-env:
-  global:
-    TERM=dumb

CODEOWNERS

@@ -0,0 +1,3 @@
+# Any Github changes require admin approval
+/.github/** @GTNewHorizons/admin
+

addon.gradle

@@ -0,0 +1,5 @@
+jar {
+    manifest {
+        attributes 'FMLCorePlugin': 'mrtjp.relocation.asm.RelocationPlugin'
+    }
+}

build.properties

@@ -1,7 +0,0 @@
-mod.version=0.0.1
-
-mc.version=1.7.10
-forge.version=10.13.3.1399-1.7.10
-
-mrtjp.version=1.1.0.31
-ccl.version=1.1.3.136

dependencies.gradle

@@ -0,0 +1,3 @@
+dependencies {
+    compile 'com.github.GTNewHorizons:MrTJPCore:1.1.1:dev'
+}

gradle.properties

@@ -0,0 +1,116 @@
+modName = ForgeRelocation
+
+# This is a case-sensitive string to identify your mod. Convention is to use lower case.
+modId = ForgeRelocation
+
+modGroup = mrtjp.relocation
+
+# WHY is there no version field?
+# The build script relies on git to provide a version via tags. It is super easy and will enable you to always know the
+# code base or your binary. Check out this tutorial: https://blog.mattclemente.com/2017/10/13/versioning-with-git-tags/
+
+# Will update your build.gradle automatically whenever an update is available
+autoUpdateBuildScript = false
+
+minecraftVersion = 1.7.10
+forgeVersion = 10.13.4.1614
+
+# Specify a MCP channel and mappings version for dependency deobfuscation and the deobfParams task.
+channel = stable
+mappingsVersion = 12
+
+# Define other MCP mappings for dependency deobfuscation
+remoteMappings = https://raw.githubusercontent.com/MinecraftForge/FML/1.7.10/conf/
+
+# Select a username for testing your mod with breakpoints. You may leave this empty for a random username each time you
+# restart Minecraft in development. Choose this dependent on your mod:
+# Do you need consistent player progressing (for example Thaumcraft)? -> Select a name
+# Do you need to test how your custom blocks interacts with a player that is not the owner? -> leave name empty
+developmentEnvironmentUserName = Developer
+
+# Define a source file of your project with:
+# public static final String VERSION = "GRADLETOKEN_VERSION";
+# The string's content will be replaced with your mod's version when compiled. You should use this to specify your mod's
+# version in @Mod([...], version = VERSION, [...])
+# Leave these properties empty to skip individual token replacements
+replaceGradleTokenInFile = mod.scala,package-info.java
+gradleTokenModId =
+gradleTokenModName =
+gradleTokenVersion = GRADLETOKEN_VERSION
+gradleTokenGroupName =
+
+# In case your mod provides an API for other mods to implement you may declare its package here. Otherwise, you can
+# leave this property empty.
+# Example value: apiPackage = api + modGroup = com.myname.mymodid -> com.myname.mymodid.api
+apiPackage =
+
+# Specify the configuration file for Forge's access transformers here. It must be placed into /src/main/resources/META-INF/
+# Example value: mymodid_at.cfg
+accessTransformersFile =
+
+# Provides setup for Mixins if enabled. If you don't know what mixins are: Keep it disabled!
+usesMixins = false
+# Adds some debug arguments like verbose output and export
+usesMixinDebug = false
+# Specify the location of your implementation of IMixinConfigPlugin. Leave it empty otherwise.
+mixinPlugin =
+# Specify the package that contains all of your Mixins. You may only place Mixins in this package or the build will fail!
+mixinsPackage =
+# Specify the core mod entry class if you use a core mod. This class must implement IFMLLoadingPlugin!
+# This parameter is for legacy compatibility only
+# Example value: coreModClass = asm.FMLPlugin + modGroup = com.myname.mymodid -> com.myname.mymodid.asm.FMLPlugin
+coreModClass =
+# If your project is only a consolidation of mixins or a core mod and does NOT contain a 'normal' mod ( = some class
+# that is annotated with @Mod) you want this to be true. When in doubt: leave it on false!
+containsMixinsAndOrCoreModOnly = false
+
+# Enables Mixins even if this mod doesn't use them, useful if one of the dependencies uses mixins.
+forceEnableMixins = false
+
+# If enabled, you may use 'shadowCompile' for dependencies. They will be integrated in your jar. It is your
+# responsibility check the licence and request permission for distribution, if required.
+usesShadowedDependencies = false
+
+
+# Publishing to modrinth requires you to set the MODRINTH_TOKEN environment variable to your current modrinth API token.
+
+# The project's ID on Modrinth. Can be either the slug or the ID.
+# Leave this empty if you don't want to publish on Modrinth.
+modrinthProjectId =
+
+# The project's relations on Modrinth. You can use this to refer to other projects on Modrinth.
+# Syntax: scope1-type1:name1;scope2-type2:name2;...
+# Where scope can be one of [required, optional, incompatible, embedded],
+#       type can be one of [project, version],
+#       and the name is the Modrinth project or version slug/id of the other mod.
+# Example: required-project:fplib;optional-project:gasstation;incompatible-project:gregtech
+# Note: GTNH Mixins is automatically set as a required dependency if usesMixins = true
+modrinthRelations =
+
+
+# Publishing to CurseForge requires you to set the CURSEFORGE_TOKEN environment variable to one of your CurseForge API tokens.
+
+# The project's numeric ID on CurseForge. You can find this in the About Project box.
+# Leave this empty if you don't want to publish on CurseForge.
+curseForgeProjectId =
+
+# The project's relations on CurseForge. You can use this to refer to other projects on CurseForge.
+# Syntax: type1:name1;type2:name2;...
+# Where type can be one of [requiredDependency, embeddedLibrary, optionalDependency, tool, incompatible],
+#       and the name is the CurseForge project slug of the other mod.
+# Example: requiredDependency:railcraft;embeddedLibrary:cofhlib;incompatible:buildcraft
+# Note: GTNH Mixins is automatically set as a required dependency if usesMixins = true
+curseForgeRelations =
+
+
+# Optional parameter to customize the produced artifacts. Use this to preserver artifact naming when migrating older
+# projects. New projects should not use this parameter.
+# customArchiveBaseName =
+
+# Optional parameter to prevent the source code from being published
+# noPublishedSources =
+
+# Uncomment this to disable spotless checks
+# This should only be uncommented to keep it easier to sync with upstream/other forks.
+# That is, if there is no other active fork/upstream, NEVER change this.
+# disableSpotless = true

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-2.0-bin.zip

gradlew

@@ -1,4 +1,20 @@
-#!/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.
+#
 
 ##############################################################################
 ##
@@ -6,47 +22,6 @@
 ##
 ##############################################################################
 
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
-
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
-
-# 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
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=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"
@@ -61,9 +36,49 @@ while [ -h "$PRG" ] ; do
     fi
 done
 SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >&-
+cd "`dirname \"$PRG\"`/" >/dev/null
 APP_HOME="`pwd -P`"
-cd "$SAVED" >&-
+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
 
@@ -90,7 +105,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
@@ -110,10 +125,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 +170,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 "$@")
 
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
+# 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" "$@"

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

jitpack.yml

@@ -0,0 +1,2 @@
+before_install:
+  - ./gradlew setupCIWorkspace

repositories.gradle

@@ -0,0 +1,6 @@
+repositories {
+    maven {
+        name 'GTNH Maven'
+        url 'http://jenkins.usrv.eu:8081/nexus/content/repositories/public/'
+    }
+}

resources/Changelog

@@ -1,9 +0,0 @@
-v0.0.1.4
-- FIX: Entities falling through frames during movement
-- FIX: Crash when configs try to register mod names with certain characters
-
-v0.0.1.3
-- FIX: Frame render crash when all 6 sides have no crosses
-
-v0.0.1.2
-- Initial release

resources/dependancies.info

@@ -1,6 +0,0 @@
-[{
- 	"repo": "http://files.projectredwiki.com/maven/mrtjp/MrTJPCore/@MC_VERSION@-@MRTJP_VERSION@/",
- 	"file": "MrTJPCore-@MC_VERSION@-@[email protected]",
- 	"dev": "MrTJPCore-@MC_VERSION@-@[email protected]",
- 	"class": "mrtjp.core.handler.MrTJPCoreMod"
-}]

resources/mcmod.info

@@ -1,18 +0,0 @@
-[
-{
-  "modid": "ForgeRelocation",
-  "name": "ForgeRelocation",
-  "description":"Move blocks from one place to another",
-  "version": "@VERSION@.@BUILD_NUMBER@",
-  "mcversion": "@MC_VERSION@",
-  "url": "...",
-  "authors": [ "MrTJP" ],
-  "credits": "",
-  "logoFile": "",
-  "screenshots": [],
-  "requiredMods": ["MrTJPCoreMod"],
-  "dependencies": [],
-  "dependants" : [],
-  "useDependencyInformation": true
-}
-]

settings.gradle

@@ -0,0 +1,10 @@
+plugins {
+    id 'com.diffplug.blowdryerSetup' version '1.6.0'
+}
+
+apply plugin: 'com.diffplug.blowdryerSetup'
+
+blowdryerSetup {
+    github('GTNewHorizons/ExampleMod1.7.10', 'tag', '0.1.5')
+    //devLocal '.' // Use this when testing config updates locally
+}

src/main/resources/dependancies.info

@@ -0,0 +1,6 @@
+[{
+ 	"repo": "https://github.com/GTNewHorizons/MrTJPCore/releases/download/1.1.1/",
+ 	"file": "MrTJPCore-1.7.10-1.1.1.jar",
+ 	"dev": "MrTJPCore-1.7.10-1.1.1-dev.jar",
+ 	"class": "mrtjp.core.handler.MrTJPCoreMod"
+}]

src/main/resources/mcmod.info

@@ -0,0 +1,39 @@
+{
+	"modListVersion": 2,
+	"modList": [{
+		"modid": "${modId}",
+		"name": "${modName}",
+		"description": "Move blocks from one place to another",
+		"version": "${modVersion}",
+		"mcversion": "${minecraftVersion}",
+		"url": "",
+		"updateUrl": "",
+		"authorList": ["MrTJP"],
+		"credits": "",
+		"logoFile": "",
+		"screenshots": [],
+		"parent": "",
+		"requiredMods": ["MrTJPCoreMod"],
+		"dependencies": [],
+		"dependants": [],
+		"useDependencyInformation": true
+	},
+  {
+		"modid": "MCFrames",
+		"name": "MCFrames",
+		"description": "",
+		"version": "${modVersion}",
+		"mcversion": "${minecraftVersion}",
+		"url": "",
+		"updateUrl": "",
+		"authorList": ["MrTJP"],
+		"credits": "",
+		"logoFile": "fr_logo.png",
+		"screenshots": [],
+		"parent": "",
+		"requiredMods": ["${modId}"],
+		"dependencies": [],
+		"dependants": [],
+		"useDependencyInformation": true
+	}]
+}

src/main/scala/mrtjp/mcframes/api/IFrame.java

@@ -14,8 +14,7 @@ import net.minecraft.world.World;
  * moving structure when moved through the {@link Relocator}. No other action besides
  * implementation of this interface is needed for the block to function.
  */
-public interface IFrame
-{
+public interface IFrame {
     /**
      * Used to check if this frame block is allowed to grab
      * a block on the given side.
@@ -47,4 +46,4 @@ public interface IFrame
      * @return True if the side can be grabbed by a frame block.
      */
     boolean stickIn(World w, int x, int y, int z, int side);
-}
+}

src/main/scala/mrtjp/mcframes/api/IFrameInteraction.java

@@ -14,8 +14,7 @@ import net.minecraft.world.World;
  * implement the IFrame interface. This class must be registered in
  * the {@link RelocationAPI}.
  */
-public interface IFrameInteraction extends IFrame
-{
+public interface IFrameInteraction extends IFrame {
     /**
      * Check to see if this interaction can be executed at the given
      * coordinates.
@@ -28,4 +27,4 @@ public interface IFrameInteraction extends IFrame
      *         location.
      */
     boolean canInteract(World w, int x, int y, int z);
-}
+}

src/main/scala/mrtjp/mcframes/api/IFramePlacement.java

@@ -17,8 +17,7 @@ import net.minecraft.world.World;
  * placement. This class can be registered through the
  * {@link RelocationAPI}.
  */
-public interface IFramePlacement
-{
+public interface IFramePlacement {
     /**
      * Called sequentially on all registered IFrameBlockPlacements on
      * the frame item block's onItemUse function, until one returns true.
@@ -32,5 +31,6 @@ public interface IFramePlacement
      * @param hit The exact hit position of the click.
      * @return True if something happened. This will subsequently block the actual placement of the block.
      */
-    public boolean onItemUse(ItemStack item, EntityPlayer player, World world, int x, int y, int z, int side, Vector3 hit);
-}
+    public boolean onItemUse(
+            ItemStack item, EntityPlayer player, World world, int x, int y, int z, int side, Vector3 hit);
+}

src/main/scala/mrtjp/mcframes/api/MCFramesAPI.java

@@ -14,8 +14,7 @@ import net.minecraft.util.Vec3;
  * <br><br>
  * It is recommended that mods access this class within a soft dependency class.
  */
-public abstract class MCFramesAPI
-{
+public abstract class MCFramesAPI {
     /**
      * This field will contain an implementor of this API if Relocation is installed.
      */
@@ -80,4 +79,4 @@ public abstract class MCFramesAPI
      * @return The object position if anything from the frame model was hit.
      */
     public abstract MovingObjectPosition raytraceFrame(double x, double y, double z, int mask, Vec3 start, Vec3 end);
-}
+}

src/main/scala/mrtjp/mcframes/api/StickResolver.java

@@ -5,16 +5,14 @@
  */
 package mrtjp.mcframes.api;
 
+import java.util.Set;
 import mrtjp.relocation.api.BlockPos;
 import net.minecraft.world.World;
 
-import java.util.Set;
-
 /**
  * Helper class used to resolve frame structures.
  */
-public abstract class StickResolver
-{
+public abstract class StickResolver {
     /**
      * Method used to obtain the block coordinates of every block that is part of the same
      * framed structure as the one that was given as an argument.
@@ -28,4 +26,4 @@ public abstract class StickResolver
      * @return A set of all block coordinates that are part of the structure that the input block was in.
      */
     public abstract Set<BlockPos> getStructure(World world, int x, int y, int z, BlockPos... exclusions);
-}
+}

src/main/scala/mrtjp/mcframes/api/package-info.java

@@ -0,0 +1,8 @@
+/*
+ * Copyright (c) 2015.
+ * Created by MrTJP.
+ * All rights reserved.
+ */
+
+// @API(owner = "MCFrames", provides = "MCFrames|API", apiVersion = "GRADLETOKEN_VERSION")
+package mrtjp.mcframes.api;

src/main/scala/mrtjp/mcframes/handler/mod.scala

@@ -12,15 +12,14 @@ import mrtjp.mcframes.api.MCFramesAPI
 import mrtjp.mcframes.{BlockFrame, BlockMotor, StickRegistry}
 import net.minecraft.client.gui.GuiScreen
 
-@Mod(modid = MCFramesMod.modID, useMetadata = true, modLanguage = "scala", guiFactory = "mrtjp.mcframes.handler.GuiConfigFactory")
+@Mod(modid = MCFramesMod.modID, useMetadata = true, modLanguage = "scala", guiFactory = "mrtjp.mcframes.handler.GuiConfigFactory", acceptedMinecraftVersions = "[1.7.10]", dependencies = "required-after:MrTJPCoreMod", name = MCFramesMod.modName, version = MCFramesMod.version)
 object MCFramesMod
 {
     MCFramesAPI.instance = MCFramesAPI_Impl
 
     final val modID = "MCFrames"
     final val modName = "MCFrames"
-    final val version = "@VERSION@"
-    final val buildnumber = "@BUILD_NUMBER@"
+    final val version = "GRADLETOKEN_VERSION"
 
     var blockFrame:BlockFrame = _
     var blockMotor:BlockMotor = _
@@ -78,4 +77,4 @@ object MCFramesConfig extends ModConfig("MCFrames")
         s += "    '<modID>:<blockname>m<meta>' - to assign block from mod for specific meta. \n"
         s
     }
-}
+}

src/main/scala/mrtjp/relocation/api/BlockPos.java

@@ -9,31 +9,26 @@ package mrtjp.relocation.api;
  * Lightweight block position object used to keep dependencies confined
  * to the api package, used by some of the API's methods.
  */
-public class BlockPos
-{
+public class BlockPos {
     public int x;
     public int y;
     public int z;
 
-    public BlockPos(int x, int y, int z)
-    {
+    public BlockPos(int x, int y, int z) {
         this.x = x;
         this.y = y;
         this.z = z;
     }
 
-    public boolean equals(Object obj)
-    {
-        if(!(obj instanceof BlockPos)) return false;
-        else
-        {
+    public boolean equals(Object obj) {
+        if (!(obj instanceof BlockPos)) return false;
+        else {
             BlockPos o2 = (BlockPos) obj;
             return this.x == o2.x && this.y == o2.y && this.z == o2.z;
         }
     }
 
-    public int hashCode()
-    {
-        return (this.x^this.z)*31+this.y;
+    public int hashCode() {
+        return (this.x ^ this.z) * 31 + this.y;
     }
-}
+}

src/main/scala/mrtjp/relocation/api/IMovementCallback.java

@@ -19,8 +19,7 @@ package mrtjp.relocation.api;
  * can only happen server-side.
  *
  */
-public interface IMovementCallback
-{
+public interface IMovementCallback {
     /**
      * Called once move starts.  The descriptor contains methods that
      * describe the state of the current movement that this callback
@@ -42,4 +41,4 @@ public interface IMovementCallback
      * Called when the movement completes, and all blocks have moved over.
      */
     void onMovementFinished();
-}
+}

src/main/scala/mrtjp/relocation/api/IMovementDescriptor.java

@@ -12,8 +12,7 @@ package mrtjp.relocation.api;
  * Results of all methods is only valid during movement, undefined otherwise.  Use
  * isMoving() to check before using any values from this.
  */
-public interface IMovementDescriptor
-{
+public interface IMovementDescriptor {
     /**
      * @return True if the structure is moving.
      */
@@ -28,4 +27,4 @@ public interface IMovementDescriptor
      * @return The size of the moving structure, zero if it is no longer moving.
      */
     int getSize();
-}
+}

src/main/scala/mrtjp/relocation/api/ITileMover.java

@@ -11,8 +11,7 @@ import net.minecraft.world.World;
  * Interface for an object that manages the movement of blocks and tiles that are
  * registered to it. This class should be registered through the {@link RelocationAPI}.
  */
-public interface ITileMover
-{
+public interface ITileMover {
     /**
      * Used to check if the block at the given position can move. This
      * method is only called if the specified block is tied to this
@@ -60,4 +59,4 @@ public interface ITileMover
      * @param z The z coordinate.
      */
     void postMove(World w, int x, int y, int z);
-}
+}

src/main/scala/mrtjp/relocation/api/RelocationAPI.java

@@ -14,8 +14,7 @@ import net.minecraft.world.World;
  * <br><br>
  * It is recommended that mods access this class within a soft dependency class.
  */
-public abstract class RelocationAPI
-{
+public abstract class RelocationAPI {
     /**
      * This field will contain an implementor of this API if Relocation is installed.
      */
@@ -90,4 +89,4 @@ public abstract class RelocationAPI
      * @return True if the block is currently moving.
      */
     public abstract boolean isMoving(World world, int x, int y, int z);
-}
+}

src/main/scala/mrtjp/relocation/api/Relocator.java

@@ -5,16 +5,14 @@
  */
 package mrtjp.relocation.api;
 
-import net.minecraft.world.World;
-
 import java.util.Set;
+import net.minecraft.world.World;
 
 /**
  * Helper class used to queue and execute the movement of a set of blocks.
  * See {@link mrtjp.mcframes.TileMotor} for usage.
  */
-public abstract class Relocator
-{
+public abstract class Relocator {
     /**
      * Pushes an instance of the Relocator onto the stack.
      * Must be called before using any methods.
@@ -76,7 +74,9 @@ public abstract class Relocator
      * @throws IllegalStateException If the Relocator is not on the stack.
      */
     public abstract void addBlock(int x, int y, int z);
+
     public abstract void addBlock(BlockPos bc);
+
     public abstract void addBlocks(Set<BlockPos> blocks);
 
     /**
@@ -90,4 +90,4 @@ public abstract class Relocator
      *                               or are invalid.
      */
     public abstract boolean execute();
-}
+}

src/main/scala/mrtjp/relocation/api/package-info.java

@@ -4,7 +4,7 @@
  * All rights reserved.
  */
 
-@API(owner = "ForgeRelocation", provides = "ForgeRelocation|API", apiVersion = "@VERSION@.@BUILD_NUMBER@")
+@API(owner = "ForgeRelocation", provides = "ForgeRelocation|API", apiVersion = "GRADLETOKEN_VERSION")
 package mrtjp.relocation.api;
 
-import cpw.mods.fml.common.API;
+import cpw.mods.fml.common.API;

src/main/scala/mrtjp/relocation/asm/Transformer.scala

@@ -21,14 +21,15 @@ import scala.collection.JavaConversions._
  * Add "Dfml.coreMods.load=mrtjp.relocation.asm.RelocationPlugin" to launch configs
  * to enable in a development workspace.
  */
-@IFMLLoadingPlugin.TransformerExclusions(value = Array("mrtjp.relocation.asm", "scala"))
+@IFMLLoadingPlugin.MCVersion("1.7.10")
+@IFMLLoadingPlugin.TransformerExclusions(value = Array("mrtjp.relocation.asm.*", "scala"))
 class RelocationPlugin extends IFMLLoadingPlugin with IFMLCallHook
 {
     override def getASMTransformerClass = Array("mrtjp.relocation.asm.Transformer")
     override def getSetupClass = "mrtjp.relocation.asm.RelocationPlugin"
     override def getModContainerClass = null
     override def getAccessTransformerClass = null
-    override def injectData(data:JMap[String, AnyRef]){}
+    override def injectData(data:JMap[String, AnyRef]): Unit ={}
     override def call():Void = null
 }
 
@@ -104,4 +105,4 @@ class Transformer extends IClassTransformer
         }
         else data
     }
-}
+}

src/main/scala/mrtjp/relocation/handler/mod.scala

@@ -13,15 +13,14 @@ import mrtjp.relocation.{BlockMovingRow, MovingTileRegistry}
 import net.minecraft.client.gui.GuiScreen
 import org.apache.logging.log4j.LogManager
 
-@Mod(modid = RelocationMod.modID, useMetadata = true, modLanguage = "scala", guiFactory = "mrtjp.relocation.handler.GuiConfigFactory")
+@Mod(modid = RelocationMod.modID, useMetadata = true, modLanguage = "scala", guiFactory = "mrtjp.relocation.handler.GuiConfigFactory", acceptedMinecraftVersions = "[1.7.10]", dependencies = "required-after:MrTJPCoreMod", name = RelocationMod.modName, version = RelocationMod.version)
 object RelocationMod
 {
     RelocationAPI.instance = RelocationAPI_Impl
 
     final val modID = "ForgeRelocation"
     final val modName = "ForgeRelocation"
-    final val version = "@VERSION@"
-    final val buildnumber = "@BUILD_NUMBER@"
+    final val version = "GRADLETOKEN_VERSION"
 
     val log = LogManager.getFormatterLogger(modID)
 
@@ -97,4 +96,4 @@ object RelocationConfig extends ModConfig("ForgeRelocation")
 
         s
     }
-}
+}

src/mrtjp/mcframes/api/package-info.java

@@ -1,10 +0,0 @@
-/*
- * Copyright (c) 2015.
- * Created by MrTJP.
- * All rights reserved.
- */
-
-//@API(owner = "MCFrames", provides = "MCFrames|API", apiVersion = "@VERSION@.@BUILD_NUMBER@")
-package mrtjp.mcframes.api;
-
-import cpw.mods.fml.common.API;