diff --git a/LICENSE.txt b/LICENSE similarity index 100% rename from LICENSE.txt rename to LICENSE diff --git a/build.gradle b/build.gradle new file mode 100644 index 00000000..6b06c206 --- /dev/null +++ b/build.gradle @@ -0,0 +1,157 @@ +/* + * OpenModsLib build file. + * @author Arkan + */ + +//================================================ +// Variables +mod_version = '1.2.8' +mc_ver = '1.6.4' +forge_ver = '9.11.1.964' + +//================================================ +// Pre-execute + +buildscript { + repositories { + // General deps + mavenCentral() + // Minecraft Forge + maven { + name = 'Forge' + url = 'http://files.minecraftforge.net/maven' + } + // Sonatype (for SpecialSource in 1.7+) + maven { + name = "Sonatype Nexus" + url = "https://oss.sonatype.org/content/repositories/snapshots/" + } + } + + dependencies { + classpath 'net.minecraftforge.gradle:ForgeGradle:1.0-SNAPSHOT' + } +} + +repositories { + maven { + name 'Forge' + url 'http://files.minecraftforge.net/maven' + } + maven { + name 'MinecraftS3' + url 'http://s3.amazonaws.com/Minecraft.Download/libraries' + } +} + +apply plugin: 'forge' + +//================================================ +// Dependencies + +dependencies { + compile project(":OpenModsLib") // Load OpenModsLib from submodule +} + +//================================================ +// Jar data + +// Grab system env +env = System.getenv() + +version = mc_ver + "-" + mod_version + +in_jenkins = false +// Get Jenkins metadata +jenkinsManifest = manifest { + if (env.BUILD_TAG != null) { // If this works, we'll assume we're in Jenkins atleast. + attributes("Jenkins-Build": "true", "Jenkins-Tag": env.BUILD_TAG, "Jenkins-ID": env.BUILD_ID) + in_jenkins = true + } else { + attributes("Jenkins-Build": "false") + } +} + +def branch = null +def hash = null +def proc1 = "git rev-parse --short HEAD".execute() +proc1.in.eachLine { line -> hash = line } +proc1.err.eachLine { line -> println line } +proc1.waitFor() + + +if (!in_jenkins) { + def proc2 = "git rev-parse --abbrev-ref HEAD".execute() + proc2.in.eachLine { line -> branch = line } + proc2.err.eachLine { line -> println line } + proc2.waitFor() +} else { // In Jenkins + branch = env.GIT_BRANCH.minus("origin/") +} + +// If not on master, add branch to jar name +if (branch != null && !branch.equals("master")) { + version += "-" + branch +} else { + //version += "-" + hash +} + +// Version tag for jar file name +if (env.BUILD_NUMBER != null) { + version += "-snapshot-" + env.BUILD_NUMBER +} + +// Get Git metadata (if in Jenkins) +gitManifest = manifest { + if (env.GIT_BRANCH != null) { + attributes("Git-Branch": branch, "Git-Hash": hash) + } +} + +// Setup Forge plugin +minecraft { + version = mc_ver + "-" + forge_ver + assetDir = 'run/assets' + replace '${version}', mod_version +} + +processResources { + // Process mcmod.info + from(sourceSets.main.resources.srcDirs) { + include '**/*.info' + expand 'version':mod_version,'MCVersion':mc_ver + } + + // Copy anything else directly + from(sourceSets.main.resources.srcDirs) { + exclude '**/*.info' + } +} + +//================================================ +// Jar tasks + +// Generate FML Coremod manifest +fmlManifest = manifest { + attributes("FMLCorePlugin": "openblocks.OpenBlocksCorePlugin", "FMLCorePluginContainsFMLMod": "true") +} + +// Merge Jenkins and Git manifests to form final manifest in final release jar +jar { + manifest { + from jenkinsManifest, gitManifest, fmlManifest + } +} + +// Dev jar +task deobfJar(type: Jar) { + from sourceSets.main.output + classifier = 'deobf' + manifest { + from jenkinsManifest, gitManifest, fmlManifest + } +} + +artifacts { + archives deobfJar +} diff --git a/build.xml b/build.xml deleted file mode 100644 index ed1909af..00000000 --- a/build.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 00000000..667288ad Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 00000000..9252dd92 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Mon Mar 24 08:34:10 CDT 2014 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=http\://services.gradle.org/distributions/gradle-1.11-bin.zip \ No newline at end of file diff --git a/gradlew b/gradlew new file mode 100644 index 00000000..2ec45c60 --- /dev/null +++ b/gradlew @@ -0,0 +1,164 @@ +#!/usr/bin/env bash + +############################################################################## +## +## 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="" + +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" +# 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. +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" ] ; 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"` + + # 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 + +# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules +function splitJvmOpts() { + JVM_OPTS=("$@") +} +eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS +JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" + +exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" \ No newline at end of file diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 00000000..d4552f3d --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,90 @@ +@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 + +@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 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 Windowz 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. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +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 + +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 \ No newline at end of file diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 00000000..6c9d55e3 --- /dev/null +++ b/settings.gradle @@ -0,0 +1,2 @@ +rootProject.name = 'OpenBlocks' +include ":OpenModsLib" diff --git a/integration/codechicken/nei/api/IConfigureNEI.java b/src/api/codechicken/nei/api/IConfigureNEI.java similarity index 100% rename from integration/codechicken/nei/api/IConfigureNEI.java rename to src/api/codechicken/nei/api/IConfigureNEI.java diff --git a/integration/dan200/computer/api/ComputerCraftAPI.java b/src/api/dan200/computer/api/ComputerCraftAPI.java similarity index 100% rename from integration/dan200/computer/api/ComputerCraftAPI.java rename to src/api/dan200/computer/api/ComputerCraftAPI.java diff --git a/integration/dan200/computer/api/IComputerAccess.java b/src/api/dan200/computer/api/IComputerAccess.java similarity index 100% rename from integration/dan200/computer/api/IComputerAccess.java rename to src/api/dan200/computer/api/IComputerAccess.java diff --git a/integration/dan200/computer/api/IHostedPeripheral.java b/src/api/dan200/computer/api/IHostedPeripheral.java similarity index 100% rename from integration/dan200/computer/api/IHostedPeripheral.java rename to src/api/dan200/computer/api/IHostedPeripheral.java diff --git a/integration/dan200/computer/api/ILuaContext.java b/src/api/dan200/computer/api/ILuaContext.java similarity index 100% rename from integration/dan200/computer/api/ILuaContext.java rename to src/api/dan200/computer/api/ILuaContext.java diff --git a/integration/dan200/computer/api/ILuaObject.java b/src/api/dan200/computer/api/ILuaObject.java similarity index 100% rename from integration/dan200/computer/api/ILuaObject.java rename to src/api/dan200/computer/api/ILuaObject.java diff --git a/integration/dan200/computer/api/IMedia.java b/src/api/dan200/computer/api/IMedia.java similarity index 100% rename from integration/dan200/computer/api/IMedia.java rename to src/api/dan200/computer/api/IMedia.java diff --git a/integration/dan200/computer/api/IMount.java b/src/api/dan200/computer/api/IMount.java similarity index 100% rename from integration/dan200/computer/api/IMount.java rename to src/api/dan200/computer/api/IMount.java diff --git a/integration/dan200/computer/api/IPeripheral.java b/src/api/dan200/computer/api/IPeripheral.java similarity index 100% rename from integration/dan200/computer/api/IPeripheral.java rename to src/api/dan200/computer/api/IPeripheral.java diff --git a/integration/dan200/computer/api/IPeripheralHandler.java b/src/api/dan200/computer/api/IPeripheralHandler.java similarity index 100% rename from integration/dan200/computer/api/IPeripheralHandler.java rename to src/api/dan200/computer/api/IPeripheralHandler.java diff --git a/integration/dan200/computer/api/IWritableMount.java b/src/api/dan200/computer/api/IWritableMount.java similarity index 100% rename from integration/dan200/computer/api/IWritableMount.java rename to src/api/dan200/computer/api/IWritableMount.java diff --git a/integration/dan200/computercraft/api/ComputerCraftAPI.java b/src/api/dan200/computercraft/api/ComputerCraftAPI.java similarity index 100% rename from integration/dan200/computercraft/api/ComputerCraftAPI.java rename to src/api/dan200/computercraft/api/ComputerCraftAPI.java diff --git a/integration/dan200/computercraft/api/filesystem/IMount.java b/src/api/dan200/computercraft/api/filesystem/IMount.java similarity index 100% rename from integration/dan200/computercraft/api/filesystem/IMount.java rename to src/api/dan200/computercraft/api/filesystem/IMount.java diff --git a/integration/dan200/computercraft/api/filesystem/IWritableMount.java b/src/api/dan200/computercraft/api/filesystem/IWritableMount.java similarity index 100% rename from integration/dan200/computercraft/api/filesystem/IWritableMount.java rename to src/api/dan200/computercraft/api/filesystem/IWritableMount.java diff --git a/integration/dan200/computercraft/api/lua/ILuaContext.java b/src/api/dan200/computercraft/api/lua/ILuaContext.java similarity index 100% rename from integration/dan200/computercraft/api/lua/ILuaContext.java rename to src/api/dan200/computercraft/api/lua/ILuaContext.java diff --git a/integration/dan200/computercraft/api/lua/ILuaObject.java b/src/api/dan200/computercraft/api/lua/ILuaObject.java similarity index 100% rename from integration/dan200/computercraft/api/lua/ILuaObject.java rename to src/api/dan200/computercraft/api/lua/ILuaObject.java diff --git a/integration/dan200/computercraft/api/media/IMedia.java b/src/api/dan200/computercraft/api/media/IMedia.java similarity index 100% rename from integration/dan200/computercraft/api/media/IMedia.java rename to src/api/dan200/computercraft/api/media/IMedia.java diff --git a/integration/dan200/computercraft/api/media/IMediaProvider.java b/src/api/dan200/computercraft/api/media/IMediaProvider.java similarity index 100% rename from integration/dan200/computercraft/api/media/IMediaProvider.java rename to src/api/dan200/computercraft/api/media/IMediaProvider.java diff --git a/integration/dan200/computercraft/api/peripheral/IComputerAccess.java b/src/api/dan200/computercraft/api/peripheral/IComputerAccess.java similarity index 100% rename from integration/dan200/computercraft/api/peripheral/IComputerAccess.java rename to src/api/dan200/computercraft/api/peripheral/IComputerAccess.java diff --git a/integration/dan200/computercraft/api/peripheral/IPeripheral.java b/src/api/dan200/computercraft/api/peripheral/IPeripheral.java similarity index 100% rename from integration/dan200/computercraft/api/peripheral/IPeripheral.java rename to src/api/dan200/computercraft/api/peripheral/IPeripheral.java diff --git a/integration/dan200/computercraft/api/peripheral/IPeripheralProvider.java b/src/api/dan200/computercraft/api/peripheral/IPeripheralProvider.java similarity index 100% rename from integration/dan200/computercraft/api/peripheral/IPeripheralProvider.java rename to src/api/dan200/computercraft/api/peripheral/IPeripheralProvider.java diff --git a/integration/dan200/computercraft/api/redstone/IBundledRedstoneProvider.java b/src/api/dan200/computercraft/api/redstone/IBundledRedstoneProvider.java similarity index 100% rename from integration/dan200/computercraft/api/redstone/IBundledRedstoneProvider.java rename to src/api/dan200/computercraft/api/redstone/IBundledRedstoneProvider.java diff --git a/integration/dan200/computercraft/api/turtle/ITurtleAccess.java b/src/api/dan200/computercraft/api/turtle/ITurtleAccess.java similarity index 100% rename from integration/dan200/computercraft/api/turtle/ITurtleAccess.java rename to src/api/dan200/computercraft/api/turtle/ITurtleAccess.java diff --git a/integration/dan200/computercraft/api/turtle/ITurtleCommand.java b/src/api/dan200/computercraft/api/turtle/ITurtleCommand.java similarity index 100% rename from integration/dan200/computercraft/api/turtle/ITurtleCommand.java rename to src/api/dan200/computercraft/api/turtle/ITurtleCommand.java diff --git a/integration/dan200/computercraft/api/turtle/ITurtleUpgrade.java b/src/api/dan200/computercraft/api/turtle/ITurtleUpgrade.java similarity index 100% rename from integration/dan200/computercraft/api/turtle/ITurtleUpgrade.java rename to src/api/dan200/computercraft/api/turtle/ITurtleUpgrade.java diff --git a/integration/dan200/computercraft/api/turtle/TurtleAnimation.java b/src/api/dan200/computercraft/api/turtle/TurtleAnimation.java similarity index 100% rename from integration/dan200/computercraft/api/turtle/TurtleAnimation.java rename to src/api/dan200/computercraft/api/turtle/TurtleAnimation.java diff --git a/integration/dan200/computercraft/api/turtle/TurtleCommandResult.java b/src/api/dan200/computercraft/api/turtle/TurtleCommandResult.java similarity index 100% rename from integration/dan200/computercraft/api/turtle/TurtleCommandResult.java rename to src/api/dan200/computercraft/api/turtle/TurtleCommandResult.java diff --git a/integration/dan200/computercraft/api/turtle/TurtleSide.java b/src/api/dan200/computercraft/api/turtle/TurtleSide.java similarity index 100% rename from integration/dan200/computercraft/api/turtle/TurtleSide.java rename to src/api/dan200/computercraft/api/turtle/TurtleSide.java diff --git a/integration/dan200/computercraft/api/turtle/TurtleUpgradeType.java b/src/api/dan200/computercraft/api/turtle/TurtleUpgradeType.java similarity index 100% rename from integration/dan200/computercraft/api/turtle/TurtleUpgradeType.java rename to src/api/dan200/computercraft/api/turtle/TurtleUpgradeType.java diff --git a/integration/dan200/computercraft/api/turtle/TurtleVerb.java b/src/api/dan200/computercraft/api/turtle/TurtleVerb.java similarity index 100% rename from integration/dan200/computercraft/api/turtle/TurtleVerb.java rename to src/api/dan200/computercraft/api/turtle/TurtleVerb.java diff --git a/integration/dan200/turtle/api/ITurtleAccess.java b/src/api/dan200/turtle/api/ITurtleAccess.java similarity index 100% rename from integration/dan200/turtle/api/ITurtleAccess.java rename to src/api/dan200/turtle/api/ITurtleAccess.java diff --git a/integration/dan200/turtle/api/ITurtleCommandHandler.java b/src/api/dan200/turtle/api/ITurtleCommandHandler.java similarity index 100% rename from integration/dan200/turtle/api/ITurtleCommandHandler.java rename to src/api/dan200/turtle/api/ITurtleCommandHandler.java diff --git a/integration/dan200/turtle/api/ITurtleUpgrade.java b/src/api/dan200/turtle/api/ITurtleUpgrade.java similarity index 100% rename from integration/dan200/turtle/api/ITurtleUpgrade.java rename to src/api/dan200/turtle/api/ITurtleUpgrade.java diff --git a/integration/dan200/turtle/api/TurtleAPI.java b/src/api/dan200/turtle/api/TurtleAPI.java similarity index 100% rename from integration/dan200/turtle/api/TurtleAPI.java rename to src/api/dan200/turtle/api/TurtleAPI.java diff --git a/integration/dan200/turtle/api/TurtleSide.java b/src/api/dan200/turtle/api/TurtleSide.java similarity index 100% rename from integration/dan200/turtle/api/TurtleSide.java rename to src/api/dan200/turtle/api/TurtleSide.java diff --git a/integration/dan200/turtle/api/TurtleUpgradeType.java b/src/api/dan200/turtle/api/TurtleUpgradeType.java similarity index 100% rename from integration/dan200/turtle/api/TurtleUpgradeType.java rename to src/api/dan200/turtle/api/TurtleUpgradeType.java diff --git a/integration/dan200/turtle/api/TurtleVerb.java b/src/api/dan200/turtle/api/TurtleVerb.java similarity index 100% rename from integration/dan200/turtle/api/TurtleVerb.java rename to src/api/dan200/turtle/api/TurtleVerb.java diff --git a/integration/openperipheral/api/APIHelpers.java b/src/api/openperipheral/api/APIHelpers.java similarity index 100% rename from integration/openperipheral/api/APIHelpers.java rename to src/api/openperipheral/api/APIHelpers.java diff --git a/integration/openperipheral/api/Alias.java b/src/api/openperipheral/api/Alias.java similarity index 100% rename from integration/openperipheral/api/Alias.java rename to src/api/openperipheral/api/Alias.java diff --git a/integration/openperipheral/api/Arg.java b/src/api/openperipheral/api/Arg.java similarity index 100% rename from integration/openperipheral/api/Arg.java rename to src/api/openperipheral/api/Arg.java diff --git a/integration/openperipheral/api/CallbackProperty.java b/src/api/openperipheral/api/CallbackProperty.java similarity index 100% rename from integration/openperipheral/api/CallbackProperty.java rename to src/api/openperipheral/api/CallbackProperty.java diff --git a/integration/openperipheral/api/Freeform.java b/src/api/openperipheral/api/Freeform.java similarity index 100% rename from integration/openperipheral/api/Freeform.java rename to src/api/openperipheral/api/Freeform.java diff --git a/integration/openperipheral/api/IAdapterBase.java b/src/api/openperipheral/api/IAdapterBase.java similarity index 100% rename from integration/openperipheral/api/IAdapterBase.java rename to src/api/openperipheral/api/IAdapterBase.java diff --git a/integration/openperipheral/api/IIntegrationModule.java b/src/api/openperipheral/api/IIntegrationModule.java similarity index 100% rename from integration/openperipheral/api/IIntegrationModule.java rename to src/api/openperipheral/api/IIntegrationModule.java diff --git a/integration/openperipheral/api/IMethodProxy.java b/src/api/openperipheral/api/IMethodProxy.java similarity index 100% rename from integration/openperipheral/api/IMethodProxy.java rename to src/api/openperipheral/api/IMethodProxy.java diff --git a/integration/openperipheral/api/IMultiReturn.java b/src/api/openperipheral/api/IMultiReturn.java similarity index 100% rename from integration/openperipheral/api/IMultiReturn.java rename to src/api/openperipheral/api/IMultiReturn.java diff --git a/integration/openperipheral/api/IObjectAdapter.java b/src/api/openperipheral/api/IObjectAdapter.java similarity index 100% rename from integration/openperipheral/api/IObjectAdapter.java rename to src/api/openperipheral/api/IObjectAdapter.java diff --git a/integration/openperipheral/api/IPeripheralAdapter.java b/src/api/openperipheral/api/IPeripheralAdapter.java similarity index 100% rename from integration/openperipheral/api/IPeripheralAdapter.java rename to src/api/openperipheral/api/IPeripheralAdapter.java diff --git a/integration/openperipheral/api/IPropertyCallback.java b/src/api/openperipheral/api/IPropertyCallback.java similarity index 100% rename from integration/openperipheral/api/IPropertyCallback.java rename to src/api/openperipheral/api/IPropertyCallback.java diff --git a/integration/openperipheral/api/ITypeConverter.java b/src/api/openperipheral/api/ITypeConverter.java similarity index 100% rename from integration/openperipheral/api/ITypeConverter.java rename to src/api/openperipheral/api/ITypeConverter.java diff --git a/integration/openperipheral/api/IUpdateHandler.java b/src/api/openperipheral/api/IUpdateHandler.java similarity index 100% rename from integration/openperipheral/api/IUpdateHandler.java rename to src/api/openperipheral/api/IUpdateHandler.java diff --git a/integration/openperipheral/api/IWorldProvider.java b/src/api/openperipheral/api/IWorldProvider.java similarity index 100% rename from integration/openperipheral/api/IWorldProvider.java rename to src/api/openperipheral/api/IWorldProvider.java diff --git a/integration/openperipheral/api/Ignore.java b/src/api/openperipheral/api/Ignore.java similarity index 100% rename from integration/openperipheral/api/Ignore.java rename to src/api/openperipheral/api/Ignore.java diff --git a/integration/openperipheral/api/Include.java b/src/api/openperipheral/api/Include.java similarity index 100% rename from integration/openperipheral/api/Include.java rename to src/api/openperipheral/api/Include.java diff --git a/integration/openperipheral/api/IntegrationRegistry.java b/src/api/openperipheral/api/IntegrationRegistry.java similarity index 100% rename from integration/openperipheral/api/IntegrationRegistry.java rename to src/api/openperipheral/api/IntegrationRegistry.java diff --git a/integration/openperipheral/api/LuaCallable.java b/src/api/openperipheral/api/LuaCallable.java similarity index 100% rename from integration/openperipheral/api/LuaCallable.java rename to src/api/openperipheral/api/LuaCallable.java diff --git a/integration/openperipheral/api/LuaMethod.java b/src/api/openperipheral/api/LuaMethod.java similarity index 100% rename from integration/openperipheral/api/LuaMethod.java rename to src/api/openperipheral/api/LuaMethod.java diff --git a/integration/openperipheral/api/LuaType.java b/src/api/openperipheral/api/LuaType.java similarity index 100% rename from integration/openperipheral/api/LuaType.java rename to src/api/openperipheral/api/LuaType.java diff --git a/integration/openperipheral/api/Named.java b/src/api/openperipheral/api/Named.java similarity index 100% rename from integration/openperipheral/api/Named.java rename to src/api/openperipheral/api/Named.java diff --git a/integration/openperipheral/api/OnTick.java b/src/api/openperipheral/api/OnTick.java similarity index 100% rename from integration/openperipheral/api/OnTick.java rename to src/api/openperipheral/api/OnTick.java diff --git a/integration/openperipheral/api/OnTickSafe.java b/src/api/openperipheral/api/OnTickSafe.java similarity index 100% rename from integration/openperipheral/api/OnTickSafe.java rename to src/api/openperipheral/api/OnTickSafe.java diff --git a/integration/openperipheral/api/OpenPeripheralAPI.java b/src/api/openperipheral/api/OpenPeripheralAPI.java similarity index 100% rename from integration/openperipheral/api/OpenPeripheralAPI.java rename to src/api/openperipheral/api/OpenPeripheralAPI.java diff --git a/integration/openperipheral/api/Optionals.java b/src/api/openperipheral/api/Optionals.java similarity index 100% rename from integration/openperipheral/api/Optionals.java rename to src/api/openperipheral/api/Optionals.java diff --git a/integration/openperipheral/api/Prefixed.java b/src/api/openperipheral/api/Prefixed.java similarity index 100% rename from integration/openperipheral/api/Prefixed.java rename to src/api/openperipheral/api/Prefixed.java diff --git a/integration/openperipheral/api/Property.java b/src/api/openperipheral/api/Property.java similarity index 100% rename from integration/openperipheral/api/Property.java rename to src/api/openperipheral/api/Property.java diff --git a/integration/openperipheral/api/ProxyArg.java b/src/api/openperipheral/api/ProxyArg.java similarity index 100% rename from integration/openperipheral/api/ProxyArg.java rename to src/api/openperipheral/api/ProxyArg.java diff --git a/integration/openperipheral/api/ProxyArgs.java b/src/api/openperipheral/api/ProxyArgs.java similarity index 100% rename from integration/openperipheral/api/ProxyArgs.java rename to src/api/openperipheral/api/ProxyArgs.java diff --git a/integration/openperipheral/api/ProxyInterfaces.java b/src/api/openperipheral/api/ProxyInterfaces.java similarity index 100% rename from integration/openperipheral/api/ProxyInterfaces.java rename to src/api/openperipheral/api/ProxyInterfaces.java diff --git a/integration/openperipheral/api/Volatile.java b/src/api/openperipheral/api/Volatile.java similarity index 100% rename from integration/openperipheral/api/Volatile.java rename to src/api/openperipheral/api/Volatile.java diff --git a/integration/openperipheral/api/cc15x/ComputerCraftWrappers.java b/src/api/openperipheral/api/cc15x/ComputerCraftWrappers.java similarity index 100% rename from integration/openperipheral/api/cc15x/ComputerCraftWrappers.java rename to src/api/openperipheral/api/cc15x/ComputerCraftWrappers.java diff --git a/integration/openperipheral/api/cc15x/IAttachable.java b/src/api/openperipheral/api/cc15x/IAttachable.java similarity index 100% rename from integration/openperipheral/api/cc15x/IAttachable.java rename to src/api/openperipheral/api/cc15x/IAttachable.java diff --git a/integration/openperipheral/api/cc15x/IPeripheralProvider.java b/src/api/openperipheral/api/cc15x/IPeripheralProvider.java similarity index 100% rename from integration/openperipheral/api/cc15x/IPeripheralProvider.java rename to src/api/openperipheral/api/cc15x/IPeripheralProvider.java diff --git a/integration/openperipheral/api/cc16/ComputerCraftWrappers.java b/src/api/openperipheral/api/cc16/ComputerCraftWrappers.java similarity index 100% rename from integration/openperipheral/api/cc16/ComputerCraftWrappers.java rename to src/api/openperipheral/api/cc16/ComputerCraftWrappers.java diff --git a/integration/openperipheral/api/cc16/IAttachable.java b/src/api/openperipheral/api/cc16/IAttachable.java similarity index 100% rename from integration/openperipheral/api/cc16/IAttachable.java rename to src/api/openperipheral/api/cc16/IAttachable.java diff --git a/integration/openperipheral/api/cc16/ICustomPeripheralProvider.java b/src/api/openperipheral/api/cc16/ICustomPeripheralProvider.java similarity index 100% rename from integration/openperipheral/api/cc16/ICustomPeripheralProvider.java rename to src/api/openperipheral/api/cc16/ICustomPeripheralProvider.java diff --git a/integration/openperipheral/api/package-info.java b/src/api/openperipheral/api/package-info.java similarity index 100% rename from integration/openperipheral/api/package-info.java rename to src/api/openperipheral/api/package-info.java diff --git a/src/openblocks/Config.java b/src/main/java/openblocks/Config.java similarity index 100% rename from src/openblocks/Config.java rename to src/main/java/openblocks/Config.java diff --git a/src/openblocks/Hooks.java b/src/main/java/openblocks/Hooks.java similarity index 100% rename from src/openblocks/Hooks.java rename to src/main/java/openblocks/Hooks.java diff --git a/src/openblocks/IOpenBlocksProxy.java b/src/main/java/openblocks/IOpenBlocksProxy.java similarity index 100% rename from src/openblocks/IOpenBlocksProxy.java rename to src/main/java/openblocks/IOpenBlocksProxy.java diff --git a/src/openblocks/ModInfo.java b/src/main/java/openblocks/ModInfo.java similarity index 100% rename from src/openblocks/ModInfo.java rename to src/main/java/openblocks/ModInfo.java diff --git a/src/openblocks/NEIOpenBlocksConfig.java b/src/main/java/openblocks/NEIOpenBlocksConfig.java similarity index 100% rename from src/openblocks/NEIOpenBlocksConfig.java rename to src/main/java/openblocks/NEIOpenBlocksConfig.java diff --git a/src/openblocks/OpenBlocks.java b/src/main/java/openblocks/OpenBlocks.java similarity index 100% rename from src/openblocks/OpenBlocks.java rename to src/main/java/openblocks/OpenBlocks.java diff --git a/src/openblocks/OpenBlocksCorePlugin.java b/src/main/java/openblocks/OpenBlocksCorePlugin.java similarity index 100% rename from src/openblocks/OpenBlocksCorePlugin.java rename to src/main/java/openblocks/OpenBlocksCorePlugin.java diff --git a/src/openblocks/OpenBlocksGuiHandler.java b/src/main/java/openblocks/OpenBlocksGuiHandler.java similarity index 100% rename from src/openblocks/OpenBlocksGuiHandler.java rename to src/main/java/openblocks/OpenBlocksGuiHandler.java diff --git a/src/openblocks/api/FlimFlamRegistry.java b/src/main/java/openblocks/api/FlimFlamRegistry.java similarity index 100% rename from src/openblocks/api/FlimFlamRegistry.java rename to src/main/java/openblocks/api/FlimFlamRegistry.java diff --git a/src/openblocks/api/IFlimFlamAction.java b/src/main/java/openblocks/api/IFlimFlamAction.java similarity index 100% rename from src/openblocks/api/IFlimFlamAction.java rename to src/main/java/openblocks/api/IFlimFlamAction.java diff --git a/src/openblocks/api/IFlimFlamEffect.java b/src/main/java/openblocks/api/IFlimFlamEffect.java similarity index 100% rename from src/openblocks/api/IFlimFlamEffect.java rename to src/main/java/openblocks/api/IFlimFlamEffect.java diff --git a/src/openblocks/api/IMagnetAware.java b/src/main/java/openblocks/api/IMagnetAware.java similarity index 100% rename from src/openblocks/api/IMagnetAware.java rename to src/main/java/openblocks/api/IMagnetAware.java diff --git a/src/openblocks/api/IMutant.java b/src/main/java/openblocks/api/IMutant.java similarity index 100% rename from src/openblocks/api/IMutant.java rename to src/main/java/openblocks/api/IMutant.java diff --git a/src/openblocks/api/IMutantDefinition.java b/src/main/java/openblocks/api/IMutantDefinition.java similarity index 100% rename from src/openblocks/api/IMutantDefinition.java rename to src/main/java/openblocks/api/IMutantDefinition.java diff --git a/src/openblocks/api/IMutantRenderer.java b/src/main/java/openblocks/api/IMutantRenderer.java similarity index 100% rename from src/openblocks/api/IMutantRenderer.java rename to src/main/java/openblocks/api/IMutantRenderer.java diff --git a/src/openblocks/api/IPointable.java b/src/main/java/openblocks/api/IPointable.java similarity index 100% rename from src/openblocks/api/IPointable.java rename to src/main/java/openblocks/api/IPointable.java diff --git a/src/openblocks/api/IShapeProvider.java b/src/main/java/openblocks/api/IShapeProvider.java similarity index 100% rename from src/openblocks/api/IShapeProvider.java rename to src/main/java/openblocks/api/IShapeProvider.java diff --git a/src/openblocks/api/MutantRegistry.java b/src/main/java/openblocks/api/MutantRegistry.java similarity index 100% rename from src/openblocks/api/MutantRegistry.java rename to src/main/java/openblocks/api/MutantRegistry.java diff --git a/src/openblocks/asm/EntityPlayerVisitor.java b/src/main/java/openblocks/asm/EntityPlayerVisitor.java similarity index 100% rename from src/openblocks/asm/EntityPlayerVisitor.java rename to src/main/java/openblocks/asm/EntityPlayerVisitor.java diff --git a/src/openblocks/asm/OpenBlocksClassTransformer.java b/src/main/java/openblocks/asm/OpenBlocksClassTransformer.java similarity index 100% rename from src/openblocks/asm/OpenBlocksClassTransformer.java rename to src/main/java/openblocks/asm/OpenBlocksClassTransformer.java diff --git a/src/openblocks/client/ClientProxy.java b/src/main/java/openblocks/client/ClientProxy.java similarity index 100% rename from src/openblocks/client/ClientProxy.java rename to src/main/java/openblocks/client/ClientProxy.java diff --git a/src/openblocks/client/ClientTickHandler.java b/src/main/java/openblocks/client/ClientTickHandler.java similarity index 100% rename from src/openblocks/client/ClientTickHandler.java rename to src/main/java/openblocks/client/ClientTickHandler.java diff --git a/src/openblocks/client/ElevatorMovementHandler.java b/src/main/java/openblocks/client/ElevatorMovementHandler.java similarity index 100% rename from src/openblocks/client/ElevatorMovementHandler.java rename to src/main/java/openblocks/client/ElevatorMovementHandler.java diff --git a/src/openblocks/client/Icons.java b/src/main/java/openblocks/client/Icons.java similarity index 100% rename from src/openblocks/client/Icons.java rename to src/main/java/openblocks/client/Icons.java diff --git a/src/openblocks/client/PlayerRenderEventHandler.java b/src/main/java/openblocks/client/PlayerRenderEventHandler.java similarity index 100% rename from src/openblocks/client/PlayerRenderEventHandler.java rename to src/main/java/openblocks/client/PlayerRenderEventHandler.java diff --git a/src/openblocks/client/SoundEventsManager.java b/src/main/java/openblocks/client/SoundEventsManager.java similarity index 100% rename from src/openblocks/client/SoundEventsManager.java rename to src/main/java/openblocks/client/SoundEventsManager.java diff --git a/src/openblocks/client/SoundIconRegistry.java b/src/main/java/openblocks/client/SoundIconRegistry.java similarity index 100% rename from src/openblocks/client/SoundIconRegistry.java rename to src/main/java/openblocks/client/SoundIconRegistry.java diff --git a/src/openblocks/client/SoundLoader.java b/src/main/java/openblocks/client/SoundLoader.java similarity index 100% rename from src/openblocks/client/SoundLoader.java rename to src/main/java/openblocks/client/SoundLoader.java diff --git a/src/openblocks/client/StencilSkyRenderer.java b/src/main/java/openblocks/client/StencilSkyRenderer.java similarity index 100% rename from src/openblocks/client/StencilSkyRenderer.java rename to src/main/java/openblocks/client/StencilSkyRenderer.java diff --git a/src/openblocks/client/bindings/BrickBindings.java b/src/main/java/openblocks/client/bindings/BrickBindings.java similarity index 100% rename from src/openblocks/client/bindings/BrickBindings.java rename to src/main/java/openblocks/client/bindings/BrickBindings.java diff --git a/src/openblocks/client/entity/EntityViewportController.java b/src/main/java/openblocks/client/entity/EntityViewportController.java similarity index 100% rename from src/openblocks/client/entity/EntityViewportController.java rename to src/main/java/openblocks/client/entity/EntityViewportController.java diff --git a/src/openblocks/client/fx/FXLiquidSpray.java b/src/main/java/openblocks/client/fx/FXLiquidSpray.java similarity index 100% rename from src/openblocks/client/fx/FXLiquidSpray.java rename to src/main/java/openblocks/client/fx/FXLiquidSpray.java diff --git a/src/openblocks/client/gui/GuiAutoAnvil.java b/src/main/java/openblocks/client/gui/GuiAutoAnvil.java similarity index 100% rename from src/openblocks/client/gui/GuiAutoAnvil.java rename to src/main/java/openblocks/client/gui/GuiAutoAnvil.java diff --git a/src/openblocks/client/gui/GuiAutoEnchantmentTable.java b/src/main/java/openblocks/client/gui/GuiAutoEnchantmentTable.java similarity index 100% rename from src/openblocks/client/gui/GuiAutoEnchantmentTable.java rename to src/main/java/openblocks/client/gui/GuiAutoEnchantmentTable.java diff --git a/src/openblocks/client/gui/GuiBigButton.java b/src/main/java/openblocks/client/gui/GuiBigButton.java similarity index 100% rename from src/openblocks/client/gui/GuiBigButton.java rename to src/main/java/openblocks/client/gui/GuiBigButton.java diff --git a/src/openblocks/client/gui/GuiBlockPlacer.java b/src/main/java/openblocks/client/gui/GuiBlockPlacer.java similarity index 100% rename from src/openblocks/client/gui/GuiBlockPlacer.java rename to src/main/java/openblocks/client/gui/GuiBlockPlacer.java diff --git a/src/openblocks/client/gui/GuiDevNull.java b/src/main/java/openblocks/client/gui/GuiDevNull.java similarity index 100% rename from src/openblocks/client/gui/GuiDevNull.java rename to src/main/java/openblocks/client/gui/GuiDevNull.java diff --git a/src/openblocks/client/gui/GuiDigitalFuse.java b/src/main/java/openblocks/client/gui/GuiDigitalFuse.java similarity index 100% rename from src/openblocks/client/gui/GuiDigitalFuse.java rename to src/main/java/openblocks/client/gui/GuiDigitalFuse.java diff --git a/src/openblocks/client/gui/GuiDonationStation.java b/src/main/java/openblocks/client/gui/GuiDonationStation.java similarity index 100% rename from src/openblocks/client/gui/GuiDonationStation.java rename to src/main/java/openblocks/client/gui/GuiDonationStation.java diff --git a/src/openblocks/client/gui/GuiDrawingTable.java b/src/main/java/openblocks/client/gui/GuiDrawingTable.java similarity index 100% rename from src/openblocks/client/gui/GuiDrawingTable.java rename to src/main/java/openblocks/client/gui/GuiDrawingTable.java diff --git a/src/openblocks/client/gui/GuiInfoBook.java b/src/main/java/openblocks/client/gui/GuiInfoBook.java similarity index 100% rename from src/openblocks/client/gui/GuiInfoBook.java rename to src/main/java/openblocks/client/gui/GuiInfoBook.java diff --git a/src/openblocks/client/gui/GuiItemDropper.java b/src/main/java/openblocks/client/gui/GuiItemDropper.java similarity index 100% rename from src/openblocks/client/gui/GuiItemDropper.java rename to src/main/java/openblocks/client/gui/GuiItemDropper.java diff --git a/src/openblocks/client/gui/GuiLuggage.java b/src/main/java/openblocks/client/gui/GuiLuggage.java similarity index 100% rename from src/openblocks/client/gui/GuiLuggage.java rename to src/main/java/openblocks/client/gui/GuiLuggage.java diff --git a/src/openblocks/client/gui/GuiPaintMixer.java b/src/main/java/openblocks/client/gui/GuiPaintMixer.java similarity index 100% rename from src/openblocks/client/gui/GuiPaintMixer.java rename to src/main/java/openblocks/client/gui/GuiPaintMixer.java diff --git a/src/openblocks/client/gui/GuiProjector.java b/src/main/java/openblocks/client/gui/GuiProjector.java similarity index 100% rename from src/openblocks/client/gui/GuiProjector.java rename to src/main/java/openblocks/client/gui/GuiProjector.java diff --git a/src/openblocks/client/gui/GuiSprinkler.java b/src/main/java/openblocks/client/gui/GuiSprinkler.java similarity index 100% rename from src/openblocks/client/gui/GuiSprinkler.java rename to src/main/java/openblocks/client/gui/GuiSprinkler.java diff --git a/src/openblocks/client/gui/GuiVacuumHopper.java b/src/main/java/openblocks/client/gui/GuiVacuumHopper.java similarity index 100% rename from src/openblocks/client/gui/GuiVacuumHopper.java rename to src/main/java/openblocks/client/gui/GuiVacuumHopper.java diff --git a/src/openblocks/client/gui/GuiXPBottler.java b/src/main/java/openblocks/client/gui/GuiXPBottler.java similarity index 100% rename from src/openblocks/client/gui/GuiXPBottler.java rename to src/main/java/openblocks/client/gui/GuiXPBottler.java diff --git a/src/openblocks/client/gui/pages/BlankPage.java b/src/main/java/openblocks/client/gui/pages/BlankPage.java similarity index 100% rename from src/openblocks/client/gui/pages/BlankPage.java rename to src/main/java/openblocks/client/gui/pages/BlankPage.java diff --git a/src/openblocks/client/gui/pages/IntroPage.java b/src/main/java/openblocks/client/gui/pages/IntroPage.java similarity index 100% rename from src/openblocks/client/gui/pages/IntroPage.java rename to src/main/java/openblocks/client/gui/pages/IntroPage.java diff --git a/src/openblocks/client/gui/pages/SectionPage.java b/src/main/java/openblocks/client/gui/pages/SectionPage.java similarity index 100% rename from src/openblocks/client/gui/pages/SectionPage.java rename to src/main/java/openblocks/client/gui/pages/SectionPage.java diff --git a/src/openblocks/client/gui/pages/TitledPage.java b/src/main/java/openblocks/client/gui/pages/TitledPage.java similarity index 100% rename from src/openblocks/client/gui/pages/TitledPage.java rename to src/main/java/openblocks/client/gui/pages/TitledPage.java diff --git a/src/openblocks/client/model/ModelAutoAnvil.java b/src/main/java/openblocks/client/model/ModelAutoAnvil.java similarity index 100% rename from src/openblocks/client/model/ModelAutoAnvil.java rename to src/main/java/openblocks/client/model/ModelAutoAnvil.java diff --git a/src/openblocks/client/model/ModelBearTrap.java b/src/main/java/openblocks/client/model/ModelBearTrap.java similarity index 100% rename from src/openblocks/client/model/ModelBearTrap.java rename to src/main/java/openblocks/client/model/ModelBearTrap.java diff --git a/src/openblocks/client/model/ModelCannon.java b/src/main/java/openblocks/client/model/ModelCannon.java similarity index 100% rename from src/openblocks/client/model/ModelCannon.java rename to src/main/java/openblocks/client/model/ModelCannon.java diff --git a/src/openblocks/client/model/ModelCartographer.java b/src/main/java/openblocks/client/model/ModelCartographer.java similarity index 100% rename from src/openblocks/client/model/ModelCartographer.java rename to src/main/java/openblocks/client/model/ModelCartographer.java diff --git a/src/openblocks/client/model/ModelCraneBackpack.java b/src/main/java/openblocks/client/model/ModelCraneBackpack.java similarity index 100% rename from src/openblocks/client/model/ModelCraneBackpack.java rename to src/main/java/openblocks/client/model/ModelCraneBackpack.java diff --git a/src/openblocks/client/model/ModelEgg.java b/src/main/java/openblocks/client/model/ModelEgg.java similarity index 100% rename from src/openblocks/client/model/ModelEgg.java rename to src/main/java/openblocks/client/model/ModelEgg.java diff --git a/src/openblocks/client/model/ModelFan.java b/src/main/java/openblocks/client/model/ModelFan.java similarity index 100% rename from src/openblocks/client/model/ModelFan.java rename to src/main/java/openblocks/client/model/ModelFan.java diff --git a/src/openblocks/client/model/ModelFlag.java b/src/main/java/openblocks/client/model/ModelFlag.java similarity index 100% rename from src/openblocks/client/model/ModelFlag.java rename to src/main/java/openblocks/client/model/ModelFlag.java diff --git a/src/openblocks/client/model/ModelGrave.java b/src/main/java/openblocks/client/model/ModelGrave.java similarity index 100% rename from src/openblocks/client/model/ModelGrave.java rename to src/main/java/openblocks/client/model/ModelGrave.java diff --git a/src/openblocks/client/model/ModelLuggage.java b/src/main/java/openblocks/client/model/ModelLuggage.java similarity index 100% rename from src/openblocks/client/model/ModelLuggage.java rename to src/main/java/openblocks/client/model/ModelLuggage.java diff --git a/src/openblocks/client/model/ModelMiniMe.java b/src/main/java/openblocks/client/model/ModelMiniMe.java similarity index 100% rename from src/openblocks/client/model/ModelMiniMe.java rename to src/main/java/openblocks/client/model/ModelMiniMe.java diff --git a/src/openblocks/client/model/ModelMutant.java b/src/main/java/openblocks/client/model/ModelMutant.java similarity index 100% rename from src/openblocks/client/model/ModelMutant.java rename to src/main/java/openblocks/client/model/ModelMutant.java diff --git a/src/openblocks/client/model/ModelPaintMixer.java b/src/main/java/openblocks/client/model/ModelPaintMixer.java similarity index 100% rename from src/openblocks/client/model/ModelPaintMixer.java rename to src/main/java/openblocks/client/model/ModelPaintMixer.java diff --git a/src/openblocks/client/model/ModelPiggy.java b/src/main/java/openblocks/client/model/ModelPiggy.java similarity index 100% rename from src/openblocks/client/model/ModelPiggy.java rename to src/main/java/openblocks/client/model/ModelPiggy.java diff --git a/src/openblocks/client/model/ModelProjector.java b/src/main/java/openblocks/client/model/ModelProjector.java similarity index 100% rename from src/openblocks/client/model/ModelProjector.java rename to src/main/java/openblocks/client/model/ModelProjector.java diff --git a/src/openblocks/client/model/ModelSleepingBag.java b/src/main/java/openblocks/client/model/ModelSleepingBag.java similarity index 100% rename from src/openblocks/client/model/ModelSleepingBag.java rename to src/main/java/openblocks/client/model/ModelSleepingBag.java diff --git a/src/openblocks/client/model/ModelSonicGlasses.java b/src/main/java/openblocks/client/model/ModelSonicGlasses.java similarity index 100% rename from src/openblocks/client/model/ModelSonicGlasses.java rename to src/main/java/openblocks/client/model/ModelSonicGlasses.java diff --git a/src/openblocks/client/model/ModelSprinkler.java b/src/main/java/openblocks/client/model/ModelSprinkler.java similarity index 100% rename from src/openblocks/client/model/ModelSprinkler.java rename to src/main/java/openblocks/client/model/ModelSprinkler.java diff --git a/src/openblocks/client/model/ModelTarget.java b/src/main/java/openblocks/client/model/ModelTarget.java similarity index 100% rename from src/openblocks/client/model/ModelTarget.java rename to src/main/java/openblocks/client/model/ModelTarget.java diff --git a/src/openblocks/client/model/ModelVacuumHopper.java b/src/main/java/openblocks/client/model/ModelVacuumHopper.java similarity index 100% rename from src/openblocks/client/model/ModelVacuumHopper.java rename to src/main/java/openblocks/client/model/ModelVacuumHopper.java diff --git a/src/openblocks/client/model/ModelVillage.java b/src/main/java/openblocks/client/model/ModelVillage.java similarity index 100% rename from src/openblocks/client/model/ModelVillage.java rename to src/main/java/openblocks/client/model/ModelVillage.java diff --git a/src/openblocks/client/model/ModelXPShower.java b/src/main/java/openblocks/client/model/ModelXPShower.java similarity index 100% rename from src/openblocks/client/model/ModelXPShower.java rename to src/main/java/openblocks/client/model/ModelXPShower.java diff --git a/src/openblocks/client/radio/AutoConnectingStreamHandler.java b/src/main/java/openblocks/client/radio/AutoConnectingStreamHandler.java similarity index 100% rename from src/openblocks/client/radio/AutoConnectingStreamHandler.java rename to src/main/java/openblocks/client/radio/AutoConnectingStreamHandler.java diff --git a/src/openblocks/client/radio/IcyConnectionHandler.java b/src/main/java/openblocks/client/radio/IcyConnectionHandler.java similarity index 100% rename from src/openblocks/client/radio/IcyConnectionHandler.java rename to src/main/java/openblocks/client/radio/IcyConnectionHandler.java diff --git a/src/openblocks/client/radio/IcyURLConnection.java b/src/main/java/openblocks/client/radio/IcyURLConnection.java similarity index 100% rename from src/openblocks/client/radio/IcyURLConnection.java rename to src/main/java/openblocks/client/radio/IcyURLConnection.java diff --git a/src/openblocks/client/radio/RadioManager.java b/src/main/java/openblocks/client/radio/RadioManager.java similarity index 100% rename from src/openblocks/client/radio/RadioManager.java rename to src/main/java/openblocks/client/radio/RadioManager.java diff --git a/src/openblocks/client/radio/SafeInputStream.java b/src/main/java/openblocks/client/radio/SafeInputStream.java similarity index 100% rename from src/openblocks/client/radio/SafeInputStream.java rename to src/main/java/openblocks/client/radio/SafeInputStream.java diff --git a/src/openblocks/client/radio/UrlMeta.java b/src/main/java/openblocks/client/radio/UrlMeta.java similarity index 100% rename from src/openblocks/client/radio/UrlMeta.java rename to src/main/java/openblocks/client/radio/UrlMeta.java diff --git a/src/openblocks/client/renderer/BlockRenderingHandler.java b/src/main/java/openblocks/client/renderer/BlockRenderingHandler.java similarity index 100% rename from src/openblocks/client/renderer/BlockRenderingHandler.java rename to src/main/java/openblocks/client/renderer/BlockRenderingHandler.java diff --git a/src/openblocks/client/renderer/HeightMapRenderer.java b/src/main/java/openblocks/client/renderer/HeightMapRenderer.java similarity index 100% rename from src/openblocks/client/renderer/HeightMapRenderer.java rename to src/main/java/openblocks/client/renderer/HeightMapRenderer.java diff --git a/src/openblocks/client/renderer/block/BlockCanvasRenderer.java b/src/main/java/openblocks/client/renderer/block/BlockCanvasRenderer.java similarity index 100% rename from src/openblocks/client/renderer/block/BlockCanvasRenderer.java rename to src/main/java/openblocks/client/renderer/block/BlockCanvasRenderer.java diff --git a/src/openblocks/client/renderer/block/BlockPaintCanRenderer.java b/src/main/java/openblocks/client/renderer/block/BlockPaintCanRenderer.java similarity index 100% rename from src/openblocks/client/renderer/block/BlockPaintCanRenderer.java rename to src/main/java/openblocks/client/renderer/block/BlockPaintCanRenderer.java diff --git a/src/openblocks/client/renderer/block/BlockPathRenderer.java b/src/main/java/openblocks/client/renderer/block/BlockPathRenderer.java similarity index 100% rename from src/openblocks/client/renderer/block/BlockPathRenderer.java rename to src/main/java/openblocks/client/renderer/block/BlockPathRenderer.java diff --git a/src/openblocks/client/renderer/block/BlockRadioRenderer.java b/src/main/java/openblocks/client/renderer/block/BlockRadioRenderer.java similarity index 100% rename from src/openblocks/client/renderer/block/BlockRadioRenderer.java rename to src/main/java/openblocks/client/renderer/block/BlockRadioRenderer.java diff --git a/src/openblocks/client/renderer/block/BlockSkyRenderer.java b/src/main/java/openblocks/client/renderer/block/BlockSkyRenderer.java similarity index 100% rename from src/openblocks/client/renderer/block/BlockSkyRenderer.java rename to src/main/java/openblocks/client/renderer/block/BlockSkyRenderer.java diff --git a/src/openblocks/client/renderer/entity/EntityCartographerRenderer.java b/src/main/java/openblocks/client/renderer/entity/EntityCartographerRenderer.java similarity index 100% rename from src/openblocks/client/renderer/entity/EntityCartographerRenderer.java rename to src/main/java/openblocks/client/renderer/entity/EntityCartographerRenderer.java diff --git a/src/openblocks/client/renderer/entity/EntityGoldenEyeRenderer.java b/src/main/java/openblocks/client/renderer/entity/EntityGoldenEyeRenderer.java similarity index 100% rename from src/openblocks/client/renderer/entity/EntityGoldenEyeRenderer.java rename to src/main/java/openblocks/client/renderer/entity/EntityGoldenEyeRenderer.java diff --git a/src/openblocks/client/renderer/entity/EntityHangGliderRenderer.java b/src/main/java/openblocks/client/renderer/entity/EntityHangGliderRenderer.java similarity index 100% rename from src/openblocks/client/renderer/entity/EntityHangGliderRenderer.java rename to src/main/java/openblocks/client/renderer/entity/EntityHangGliderRenderer.java diff --git a/src/openblocks/client/renderer/entity/EntityLuggageRenderer.java b/src/main/java/openblocks/client/renderer/entity/EntityLuggageRenderer.java similarity index 100% rename from src/openblocks/client/renderer/entity/EntityLuggageRenderer.java rename to src/main/java/openblocks/client/renderer/entity/EntityLuggageRenderer.java diff --git a/src/openblocks/client/renderer/entity/EntityMagnetRenderer.java b/src/main/java/openblocks/client/renderer/entity/EntityMagnetRenderer.java similarity index 100% rename from src/openblocks/client/renderer/entity/EntityMagnetRenderer.java rename to src/main/java/openblocks/client/renderer/entity/EntityMagnetRenderer.java diff --git a/src/openblocks/client/renderer/entity/EntityMiniMeRenderer.java b/src/main/java/openblocks/client/renderer/entity/EntityMiniMeRenderer.java similarity index 100% rename from src/openblocks/client/renderer/entity/EntityMiniMeRenderer.java rename to src/main/java/openblocks/client/renderer/entity/EntityMiniMeRenderer.java diff --git a/src/openblocks/client/renderer/entity/EntityMutantRenderer.java b/src/main/java/openblocks/client/renderer/entity/EntityMutantRenderer.java similarity index 100% rename from src/openblocks/client/renderer/entity/EntityMutantRenderer.java rename to src/main/java/openblocks/client/renderer/entity/EntityMutantRenderer.java diff --git a/src/openblocks/client/renderer/entity/EntityPlayerRenderer.java b/src/main/java/openblocks/client/renderer/entity/EntityPlayerRenderer.java similarity index 100% rename from src/openblocks/client/renderer/entity/EntityPlayerRenderer.java rename to src/main/java/openblocks/client/renderer/entity/EntityPlayerRenderer.java diff --git a/src/openblocks/client/renderer/entity/EntitySelectionHandler.java b/src/main/java/openblocks/client/renderer/entity/EntitySelectionHandler.java similarity index 100% rename from src/openblocks/client/renderer/entity/EntitySelectionHandler.java rename to src/main/java/openblocks/client/renderer/entity/EntitySelectionHandler.java diff --git a/src/openblocks/client/renderer/item/ItemRendererDevNull.java b/src/main/java/openblocks/client/renderer/item/ItemRendererDevNull.java similarity index 100% rename from src/openblocks/client/renderer/item/ItemRendererDevNull.java rename to src/main/java/openblocks/client/renderer/item/ItemRendererDevNull.java diff --git a/src/openblocks/client/renderer/item/ItemRendererHangGlider.java b/src/main/java/openblocks/client/renderer/item/ItemRendererHangGlider.java similarity index 100% rename from src/openblocks/client/renderer/item/ItemRendererHangGlider.java rename to src/main/java/openblocks/client/renderer/item/ItemRendererHangGlider.java diff --git a/src/openblocks/client/renderer/item/ItemRendererLuggage.java b/src/main/java/openblocks/client/renderer/item/ItemRendererLuggage.java similarity index 100% rename from src/openblocks/client/renderer/item/ItemRendererLuggage.java rename to src/main/java/openblocks/client/renderer/item/ItemRendererLuggage.java diff --git a/src/openblocks/client/renderer/item/ItemRendererPaintCan.java b/src/main/java/openblocks/client/renderer/item/ItemRendererPaintCan.java similarity index 100% rename from src/openblocks/client/renderer/item/ItemRendererPaintCan.java rename to src/main/java/openblocks/client/renderer/item/ItemRendererPaintCan.java diff --git a/src/openblocks/client/renderer/item/ItemRendererTank.java b/src/main/java/openblocks/client/renderer/item/ItemRendererTank.java similarity index 100% rename from src/openblocks/client/renderer/item/ItemRendererTank.java rename to src/main/java/openblocks/client/renderer/item/ItemRendererTank.java diff --git a/src/openblocks/client/renderer/mutant/MutantRendererChicken.java b/src/main/java/openblocks/client/renderer/mutant/MutantRendererChicken.java similarity index 100% rename from src/openblocks/client/renderer/mutant/MutantRendererChicken.java rename to src/main/java/openblocks/client/renderer/mutant/MutantRendererChicken.java diff --git a/src/openblocks/client/renderer/mutant/MutantRendererCreeper.java b/src/main/java/openblocks/client/renderer/mutant/MutantRendererCreeper.java similarity index 100% rename from src/openblocks/client/renderer/mutant/MutantRendererCreeper.java rename to src/main/java/openblocks/client/renderer/mutant/MutantRendererCreeper.java diff --git a/src/openblocks/client/renderer/mutant/MutantRendererEnderman.java b/src/main/java/openblocks/client/renderer/mutant/MutantRendererEnderman.java similarity index 100% rename from src/openblocks/client/renderer/mutant/MutantRendererEnderman.java rename to src/main/java/openblocks/client/renderer/mutant/MutantRendererEnderman.java diff --git a/src/openblocks/client/renderer/mutant/MutantRendererOcelot.java b/src/main/java/openblocks/client/renderer/mutant/MutantRendererOcelot.java similarity index 100% rename from src/openblocks/client/renderer/mutant/MutantRendererOcelot.java rename to src/main/java/openblocks/client/renderer/mutant/MutantRendererOcelot.java diff --git a/src/openblocks/client/renderer/mutant/MutantRendererPig.java b/src/main/java/openblocks/client/renderer/mutant/MutantRendererPig.java similarity index 100% rename from src/openblocks/client/renderer/mutant/MutantRendererPig.java rename to src/main/java/openblocks/client/renderer/mutant/MutantRendererPig.java diff --git a/src/openblocks/client/renderer/mutant/MutantRendererSheep.java b/src/main/java/openblocks/client/renderer/mutant/MutantRendererSheep.java similarity index 100% rename from src/openblocks/client/renderer/mutant/MutantRendererSheep.java rename to src/main/java/openblocks/client/renderer/mutant/MutantRendererSheep.java diff --git a/src/openblocks/client/renderer/mutant/MutantRendererSpider.java b/src/main/java/openblocks/client/renderer/mutant/MutantRendererSpider.java similarity index 100% rename from src/openblocks/client/renderer/mutant/MutantRendererSpider.java rename to src/main/java/openblocks/client/renderer/mutant/MutantRendererSpider.java diff --git a/src/openblocks/client/renderer/mutant/MutantRendererZombie.java b/src/main/java/openblocks/client/renderer/mutant/MutantRendererZombie.java similarity index 100% rename from src/openblocks/client/renderer/mutant/MutantRendererZombie.java rename to src/main/java/openblocks/client/renderer/mutant/MutantRendererZombie.java diff --git a/src/openblocks/client/renderer/tileentity/TileEntityAutoAnvilRenderer.java b/src/main/java/openblocks/client/renderer/tileentity/TileEntityAutoAnvilRenderer.java similarity index 100% rename from src/openblocks/client/renderer/tileentity/TileEntityAutoAnvilRenderer.java rename to src/main/java/openblocks/client/renderer/tileentity/TileEntityAutoAnvilRenderer.java diff --git a/src/openblocks/client/renderer/tileentity/TileEntityAutoEnchantmentTableRenderer.java b/src/main/java/openblocks/client/renderer/tileentity/TileEntityAutoEnchantmentTableRenderer.java similarity index 100% rename from src/openblocks/client/renderer/tileentity/TileEntityAutoEnchantmentTableRenderer.java rename to src/main/java/openblocks/client/renderer/tileentity/TileEntityAutoEnchantmentTableRenderer.java diff --git a/src/openblocks/client/renderer/tileentity/TileEntityBearTrapRenderer.java b/src/main/java/openblocks/client/renderer/tileentity/TileEntityBearTrapRenderer.java similarity index 100% rename from src/openblocks/client/renderer/tileentity/TileEntityBearTrapRenderer.java rename to src/main/java/openblocks/client/renderer/tileentity/TileEntityBearTrapRenderer.java diff --git a/src/openblocks/client/renderer/tileentity/TileEntityCannonRenderer.java b/src/main/java/openblocks/client/renderer/tileentity/TileEntityCannonRenderer.java similarity index 100% rename from src/openblocks/client/renderer/tileentity/TileEntityCannonRenderer.java rename to src/main/java/openblocks/client/renderer/tileentity/TileEntityCannonRenderer.java diff --git a/src/openblocks/client/renderer/tileentity/TileEntityDigitalFuseRenderer.java b/src/main/java/openblocks/client/renderer/tileentity/TileEntityDigitalFuseRenderer.java similarity index 100% rename from src/openblocks/client/renderer/tileentity/TileEntityDigitalFuseRenderer.java rename to src/main/java/openblocks/client/renderer/tileentity/TileEntityDigitalFuseRenderer.java diff --git a/src/openblocks/client/renderer/tileentity/TileEntityDonationStationRenderer.java b/src/main/java/openblocks/client/renderer/tileentity/TileEntityDonationStationRenderer.java similarity index 100% rename from src/openblocks/client/renderer/tileentity/TileEntityDonationStationRenderer.java rename to src/main/java/openblocks/client/renderer/tileentity/TileEntityDonationStationRenderer.java diff --git a/src/openblocks/client/renderer/tileentity/TileEntityFanRenderer.java b/src/main/java/openblocks/client/renderer/tileentity/TileEntityFanRenderer.java similarity index 100% rename from src/openblocks/client/renderer/tileentity/TileEntityFanRenderer.java rename to src/main/java/openblocks/client/renderer/tileentity/TileEntityFanRenderer.java diff --git a/src/openblocks/client/renderer/tileentity/TileEntityFlagRenderer.java b/src/main/java/openblocks/client/renderer/tileentity/TileEntityFlagRenderer.java similarity index 100% rename from src/openblocks/client/renderer/tileentity/TileEntityFlagRenderer.java rename to src/main/java/openblocks/client/renderer/tileentity/TileEntityFlagRenderer.java diff --git a/src/openblocks/client/renderer/tileentity/TileEntityGoldenEggRenderer.java b/src/main/java/openblocks/client/renderer/tileentity/TileEntityGoldenEggRenderer.java similarity index 100% rename from src/openblocks/client/renderer/tileentity/TileEntityGoldenEggRenderer.java rename to src/main/java/openblocks/client/renderer/tileentity/TileEntityGoldenEggRenderer.java diff --git a/src/openblocks/client/renderer/tileentity/TileEntityGraveRenderer.java b/src/main/java/openblocks/client/renderer/tileentity/TileEntityGraveRenderer.java similarity index 100% rename from src/openblocks/client/renderer/tileentity/TileEntityGraveRenderer.java rename to src/main/java/openblocks/client/renderer/tileentity/TileEntityGraveRenderer.java diff --git a/src/openblocks/client/renderer/tileentity/TileEntityGuideRenderer.java b/src/main/java/openblocks/client/renderer/tileentity/TileEntityGuideRenderer.java similarity index 100% rename from src/openblocks/client/renderer/tileentity/TileEntityGuideRenderer.java rename to src/main/java/openblocks/client/renderer/tileentity/TileEntityGuideRenderer.java diff --git a/src/openblocks/client/renderer/tileentity/TileEntityImaginaryRenderer.java b/src/main/java/openblocks/client/renderer/tileentity/TileEntityImaginaryRenderer.java similarity index 100% rename from src/openblocks/client/renderer/tileentity/TileEntityImaginaryRenderer.java rename to src/main/java/openblocks/client/renderer/tileentity/TileEntityImaginaryRenderer.java diff --git a/src/openblocks/client/renderer/tileentity/TileEntityPaintMixerRenderer.java b/src/main/java/openblocks/client/renderer/tileentity/TileEntityPaintMixerRenderer.java similarity index 100% rename from src/openblocks/client/renderer/tileentity/TileEntityPaintMixerRenderer.java rename to src/main/java/openblocks/client/renderer/tileentity/TileEntityPaintMixerRenderer.java diff --git a/src/openblocks/client/renderer/tileentity/TileEntityProjectorRenderer.java b/src/main/java/openblocks/client/renderer/tileentity/TileEntityProjectorRenderer.java similarity index 100% rename from src/openblocks/client/renderer/tileentity/TileEntityProjectorRenderer.java rename to src/main/java/openblocks/client/renderer/tileentity/TileEntityProjectorRenderer.java diff --git a/src/openblocks/client/renderer/tileentity/TileEntityRopeLadderRenderer.java b/src/main/java/openblocks/client/renderer/tileentity/TileEntityRopeLadderRenderer.java similarity index 100% rename from src/openblocks/client/renderer/tileentity/TileEntityRopeLadderRenderer.java rename to src/main/java/openblocks/client/renderer/tileentity/TileEntityRopeLadderRenderer.java diff --git a/src/openblocks/client/renderer/tileentity/TileEntitySkyRenderer.java b/src/main/java/openblocks/client/renderer/tileentity/TileEntitySkyRenderer.java similarity index 100% rename from src/openblocks/client/renderer/tileentity/TileEntitySkyRenderer.java rename to src/main/java/openblocks/client/renderer/tileentity/TileEntitySkyRenderer.java diff --git a/src/openblocks/client/renderer/tileentity/TileEntitySprinklerRenderer.java b/src/main/java/openblocks/client/renderer/tileentity/TileEntitySprinklerRenderer.java similarity index 100% rename from src/openblocks/client/renderer/tileentity/TileEntitySprinklerRenderer.java rename to src/main/java/openblocks/client/renderer/tileentity/TileEntitySprinklerRenderer.java diff --git a/src/openblocks/client/renderer/tileentity/TileEntityTankRenderer.java b/src/main/java/openblocks/client/renderer/tileentity/TileEntityTankRenderer.java similarity index 100% rename from src/openblocks/client/renderer/tileentity/TileEntityTankRenderer.java rename to src/main/java/openblocks/client/renderer/tileentity/TileEntityTankRenderer.java diff --git a/src/openblocks/client/renderer/tileentity/TileEntityTargetRenderer.java b/src/main/java/openblocks/client/renderer/tileentity/TileEntityTargetRenderer.java similarity index 100% rename from src/openblocks/client/renderer/tileentity/TileEntityTargetRenderer.java rename to src/main/java/openblocks/client/renderer/tileentity/TileEntityTargetRenderer.java diff --git a/src/openblocks/client/renderer/tileentity/TileEntityTrophyRenderer.java b/src/main/java/openblocks/client/renderer/tileentity/TileEntityTrophyRenderer.java similarity index 100% rename from src/openblocks/client/renderer/tileentity/TileEntityTrophyRenderer.java rename to src/main/java/openblocks/client/renderer/tileentity/TileEntityTrophyRenderer.java diff --git a/src/openblocks/client/renderer/tileentity/TileEntityVacuumHopperRenderer.java b/src/main/java/openblocks/client/renderer/tileentity/TileEntityVacuumHopperRenderer.java similarity index 100% rename from src/openblocks/client/renderer/tileentity/TileEntityVacuumHopperRenderer.java rename to src/main/java/openblocks/client/renderer/tileentity/TileEntityVacuumHopperRenderer.java diff --git a/src/openblocks/client/renderer/tileentity/TileEntityVillageHighlighterRenderer.java b/src/main/java/openblocks/client/renderer/tileentity/TileEntityVillageHighlighterRenderer.java similarity index 100% rename from src/openblocks/client/renderer/tileentity/TileEntityVillageHighlighterRenderer.java rename to src/main/java/openblocks/client/renderer/tileentity/TileEntityVillageHighlighterRenderer.java diff --git a/src/openblocks/client/renderer/tileentity/TileEntityXPShowerRenderer.java b/src/main/java/openblocks/client/renderer/tileentity/TileEntityXPShowerRenderer.java similarity index 100% rename from src/openblocks/client/renderer/tileentity/TileEntityXPShowerRenderer.java rename to src/main/java/openblocks/client/renderer/tileentity/TileEntityXPShowerRenderer.java diff --git a/src/openblocks/common/BowEventHandler.java b/src/main/java/openblocks/common/BowEventHandler.java similarity index 100% rename from src/openblocks/common/BowEventHandler.java rename to src/main/java/openblocks/common/BowEventHandler.java diff --git a/src/openblocks/common/CraneRegistry.java b/src/main/java/openblocks/common/CraneRegistry.java similarity index 100% rename from src/openblocks/common/CraneRegistry.java rename to src/main/java/openblocks/common/CraneRegistry.java diff --git a/src/openblocks/common/DonationUrlManager.java b/src/main/java/openblocks/common/DonationUrlManager.java similarity index 100% rename from src/openblocks/common/DonationUrlManager.java rename to src/main/java/openblocks/common/DonationUrlManager.java diff --git a/src/openblocks/common/ElevatorBlockRules.java b/src/main/java/openblocks/common/ElevatorBlockRules.java similarity index 100% rename from src/openblocks/common/ElevatorBlockRules.java rename to src/main/java/openblocks/common/ElevatorBlockRules.java diff --git a/src/openblocks/common/EntityEventHandler.java b/src/main/java/openblocks/common/EntityEventHandler.java similarity index 100% rename from src/openblocks/common/EntityEventHandler.java rename to src/main/java/openblocks/common/EntityEventHandler.java diff --git a/src/openblocks/common/GuiOpenHandler.java b/src/main/java/openblocks/common/GuiOpenHandler.java similarity index 100% rename from src/openblocks/common/GuiOpenHandler.java rename to src/main/java/openblocks/common/GuiOpenHandler.java diff --git a/src/openblocks/common/HeightMapData.java b/src/main/java/openblocks/common/HeightMapData.java similarity index 100% rename from src/openblocks/common/HeightMapData.java rename to src/main/java/openblocks/common/HeightMapData.java diff --git a/src/openblocks/common/MagnetWhitelists.java b/src/main/java/openblocks/common/MagnetWhitelists.java similarity index 100% rename from src/openblocks/common/MagnetWhitelists.java rename to src/main/java/openblocks/common/MagnetWhitelists.java diff --git a/src/openblocks/common/MapDataBuilder.java b/src/main/java/openblocks/common/MapDataBuilder.java similarity index 100% rename from src/openblocks/common/MapDataBuilder.java rename to src/main/java/openblocks/common/MapDataBuilder.java diff --git a/src/openblocks/common/MapDataManager.java b/src/main/java/openblocks/common/MapDataManager.java similarity index 100% rename from src/openblocks/common/MapDataManager.java rename to src/main/java/openblocks/common/MapDataManager.java diff --git a/src/openblocks/common/PlayerDeathHandler.java b/src/main/java/openblocks/common/PlayerDeathHandler.java similarity index 100% rename from src/openblocks/common/PlayerDeathHandler.java rename to src/main/java/openblocks/common/PlayerDeathHandler.java diff --git a/src/openblocks/common/ServerProxy.java b/src/main/java/openblocks/common/ServerProxy.java similarity index 100% rename from src/openblocks/common/ServerProxy.java rename to src/main/java/openblocks/common/ServerProxy.java diff --git a/src/openblocks/common/ServerTickHandler.java b/src/main/java/openblocks/common/ServerTickHandler.java similarity index 100% rename from src/openblocks/common/ServerTickHandler.java rename to src/main/java/openblocks/common/ServerTickHandler.java diff --git a/src/openblocks/common/Stencil.java b/src/main/java/openblocks/common/Stencil.java similarity index 100% rename from src/openblocks/common/Stencil.java rename to src/main/java/openblocks/common/Stencil.java diff --git a/src/openblocks/common/TrophyHandler.java b/src/main/java/openblocks/common/TrophyHandler.java similarity index 100% rename from src/openblocks/common/TrophyHandler.java rename to src/main/java/openblocks/common/TrophyHandler.java diff --git a/src/openblocks/common/block/BlockAutoAnvil.java b/src/main/java/openblocks/common/block/BlockAutoAnvil.java similarity index 100% rename from src/openblocks/common/block/BlockAutoAnvil.java rename to src/main/java/openblocks/common/block/BlockAutoAnvil.java diff --git a/src/openblocks/common/block/BlockAutoEnchantmentTable.java b/src/main/java/openblocks/common/block/BlockAutoEnchantmentTable.java similarity index 100% rename from src/openblocks/common/block/BlockAutoEnchantmentTable.java rename to src/main/java/openblocks/common/block/BlockAutoEnchantmentTable.java diff --git a/src/openblocks/common/block/BlockBearTrap.java b/src/main/java/openblocks/common/block/BlockBearTrap.java similarity index 100% rename from src/openblocks/common/block/BlockBearTrap.java rename to src/main/java/openblocks/common/block/BlockBearTrap.java diff --git a/src/openblocks/common/block/BlockBigButton.java b/src/main/java/openblocks/common/block/BlockBigButton.java similarity index 100% rename from src/openblocks/common/block/BlockBigButton.java rename to src/main/java/openblocks/common/block/BlockBigButton.java diff --git a/src/openblocks/common/block/BlockBlockBreaker.java b/src/main/java/openblocks/common/block/BlockBlockBreaker.java similarity index 100% rename from src/openblocks/common/block/BlockBlockBreaker.java rename to src/main/java/openblocks/common/block/BlockBlockBreaker.java diff --git a/src/openblocks/common/block/BlockBlockPlacer.java b/src/main/java/openblocks/common/block/BlockBlockPlacer.java similarity index 100% rename from src/openblocks/common/block/BlockBlockPlacer.java rename to src/main/java/openblocks/common/block/BlockBlockPlacer.java diff --git a/src/openblocks/common/block/BlockCannon.java b/src/main/java/openblocks/common/block/BlockCannon.java similarity index 100% rename from src/openblocks/common/block/BlockCannon.java rename to src/main/java/openblocks/common/block/BlockCannon.java diff --git a/src/openblocks/common/block/BlockCanvas.java b/src/main/java/openblocks/common/block/BlockCanvas.java similarity index 100% rename from src/openblocks/common/block/BlockCanvas.java rename to src/main/java/openblocks/common/block/BlockCanvas.java diff --git a/src/openblocks/common/block/BlockCanvasGlass.java b/src/main/java/openblocks/common/block/BlockCanvasGlass.java similarity index 100% rename from src/openblocks/common/block/BlockCanvasGlass.java rename to src/main/java/openblocks/common/block/BlockCanvasGlass.java diff --git a/src/openblocks/common/block/BlockDigitalFuse.java b/src/main/java/openblocks/common/block/BlockDigitalFuse.java similarity index 100% rename from src/openblocks/common/block/BlockDigitalFuse.java rename to src/main/java/openblocks/common/block/BlockDigitalFuse.java diff --git a/src/openblocks/common/block/BlockDonationStation.java b/src/main/java/openblocks/common/block/BlockDonationStation.java similarity index 100% rename from src/openblocks/common/block/BlockDonationStation.java rename to src/main/java/openblocks/common/block/BlockDonationStation.java diff --git a/src/openblocks/common/block/BlockDrawingTable.java b/src/main/java/openblocks/common/block/BlockDrawingTable.java similarity index 100% rename from src/openblocks/common/block/BlockDrawingTable.java rename to src/main/java/openblocks/common/block/BlockDrawingTable.java diff --git a/src/openblocks/common/block/BlockElevator.java b/src/main/java/openblocks/common/block/BlockElevator.java similarity index 100% rename from src/openblocks/common/block/BlockElevator.java rename to src/main/java/openblocks/common/block/BlockElevator.java diff --git a/src/openblocks/common/block/BlockFan.java b/src/main/java/openblocks/common/block/BlockFan.java similarity index 100% rename from src/openblocks/common/block/BlockFan.java rename to src/main/java/openblocks/common/block/BlockFan.java diff --git a/src/openblocks/common/block/BlockFlag.java b/src/main/java/openblocks/common/block/BlockFlag.java similarity index 100% rename from src/openblocks/common/block/BlockFlag.java rename to src/main/java/openblocks/common/block/BlockFlag.java diff --git a/src/openblocks/common/block/BlockGoldenEgg.java b/src/main/java/openblocks/common/block/BlockGoldenEgg.java similarity index 100% rename from src/openblocks/common/block/BlockGoldenEgg.java rename to src/main/java/openblocks/common/block/BlockGoldenEgg.java diff --git a/src/openblocks/common/block/BlockGrave.java b/src/main/java/openblocks/common/block/BlockGrave.java similarity index 100% rename from src/openblocks/common/block/BlockGrave.java rename to src/main/java/openblocks/common/block/BlockGrave.java diff --git a/src/openblocks/common/block/BlockGuide.java b/src/main/java/openblocks/common/block/BlockGuide.java similarity index 100% rename from src/openblocks/common/block/BlockGuide.java rename to src/main/java/openblocks/common/block/BlockGuide.java diff --git a/src/openblocks/common/block/BlockHeal.java b/src/main/java/openblocks/common/block/BlockHeal.java similarity index 100% rename from src/openblocks/common/block/BlockHeal.java rename to src/main/java/openblocks/common/block/BlockHeal.java diff --git a/src/openblocks/common/block/BlockImaginary.java b/src/main/java/openblocks/common/block/BlockImaginary.java similarity index 100% rename from src/openblocks/common/block/BlockImaginary.java rename to src/main/java/openblocks/common/block/BlockImaginary.java diff --git a/src/openblocks/common/block/BlockItemDropper.java b/src/main/java/openblocks/common/block/BlockItemDropper.java similarity index 100% rename from src/openblocks/common/block/BlockItemDropper.java rename to src/main/java/openblocks/common/block/BlockItemDropper.java diff --git a/src/openblocks/common/block/BlockLadder.java b/src/main/java/openblocks/common/block/BlockLadder.java similarity index 100% rename from src/openblocks/common/block/BlockLadder.java rename to src/main/java/openblocks/common/block/BlockLadder.java diff --git a/src/openblocks/common/block/BlockPaintCan.java b/src/main/java/openblocks/common/block/BlockPaintCan.java similarity index 100% rename from src/openblocks/common/block/BlockPaintCan.java rename to src/main/java/openblocks/common/block/BlockPaintCan.java diff --git a/src/openblocks/common/block/BlockPaintMixer.java b/src/main/java/openblocks/common/block/BlockPaintMixer.java similarity index 100% rename from src/openblocks/common/block/BlockPaintMixer.java rename to src/main/java/openblocks/common/block/BlockPaintMixer.java diff --git a/src/openblocks/common/block/BlockPath.java b/src/main/java/openblocks/common/block/BlockPath.java similarity index 100% rename from src/openblocks/common/block/BlockPath.java rename to src/main/java/openblocks/common/block/BlockPath.java diff --git a/src/openblocks/common/block/BlockProjector.java b/src/main/java/openblocks/common/block/BlockProjector.java similarity index 100% rename from src/openblocks/common/block/BlockProjector.java rename to src/main/java/openblocks/common/block/BlockProjector.java diff --git a/src/openblocks/common/block/BlockRadio.java b/src/main/java/openblocks/common/block/BlockRadio.java similarity index 100% rename from src/openblocks/common/block/BlockRadio.java rename to src/main/java/openblocks/common/block/BlockRadio.java diff --git a/src/openblocks/common/block/BlockRopeLadder.java b/src/main/java/openblocks/common/block/BlockRopeLadder.java similarity index 100% rename from src/openblocks/common/block/BlockRopeLadder.java rename to src/main/java/openblocks/common/block/BlockRopeLadder.java diff --git a/src/openblocks/common/block/BlockSky.java b/src/main/java/openblocks/common/block/BlockSky.java similarity index 100% rename from src/openblocks/common/block/BlockSky.java rename to src/main/java/openblocks/common/block/BlockSky.java diff --git a/src/openblocks/common/block/BlockSponge.java b/src/main/java/openblocks/common/block/BlockSponge.java similarity index 100% rename from src/openblocks/common/block/BlockSponge.java rename to src/main/java/openblocks/common/block/BlockSponge.java diff --git a/src/openblocks/common/block/BlockSprinkler.java b/src/main/java/openblocks/common/block/BlockSprinkler.java similarity index 100% rename from src/openblocks/common/block/BlockSprinkler.java rename to src/main/java/openblocks/common/block/BlockSprinkler.java diff --git a/src/openblocks/common/block/BlockTank.java b/src/main/java/openblocks/common/block/BlockTank.java similarity index 100% rename from src/openblocks/common/block/BlockTank.java rename to src/main/java/openblocks/common/block/BlockTank.java diff --git a/src/openblocks/common/block/BlockTarget.java b/src/main/java/openblocks/common/block/BlockTarget.java similarity index 100% rename from src/openblocks/common/block/BlockTarget.java rename to src/main/java/openblocks/common/block/BlockTarget.java diff --git a/src/openblocks/common/block/BlockTrophy.java b/src/main/java/openblocks/common/block/BlockTrophy.java similarity index 100% rename from src/openblocks/common/block/BlockTrophy.java rename to src/main/java/openblocks/common/block/BlockTrophy.java diff --git a/src/openblocks/common/block/BlockVacuumHopper.java b/src/main/java/openblocks/common/block/BlockVacuumHopper.java similarity index 100% rename from src/openblocks/common/block/BlockVacuumHopper.java rename to src/main/java/openblocks/common/block/BlockVacuumHopper.java diff --git a/src/openblocks/common/block/BlockVillageHighlighter.java b/src/main/java/openblocks/common/block/BlockVillageHighlighter.java similarity index 100% rename from src/openblocks/common/block/BlockVillageHighlighter.java rename to src/main/java/openblocks/common/block/BlockVillageHighlighter.java diff --git a/src/openblocks/common/block/BlockXPBottler.java b/src/main/java/openblocks/common/block/BlockXPBottler.java similarity index 100% rename from src/openblocks/common/block/BlockXPBottler.java rename to src/main/java/openblocks/common/block/BlockXPBottler.java diff --git a/src/openblocks/common/block/BlockXPDrain.java b/src/main/java/openblocks/common/block/BlockXPDrain.java similarity index 100% rename from src/openblocks/common/block/BlockXPDrain.java rename to src/main/java/openblocks/common/block/BlockXPDrain.java diff --git a/src/openblocks/common/block/BlockXPShower.java b/src/main/java/openblocks/common/block/BlockXPShower.java similarity index 100% rename from src/openblocks/common/block/BlockXPShower.java rename to src/main/java/openblocks/common/block/BlockXPShower.java diff --git a/src/openblocks/common/block/OpenBlock.java b/src/main/java/openblocks/common/block/OpenBlock.java similarity index 100% rename from src/openblocks/common/block/OpenBlock.java rename to src/main/java/openblocks/common/block/OpenBlock.java diff --git a/src/openblocks/common/container/ContainerAutoAnvil.java b/src/main/java/openblocks/common/container/ContainerAutoAnvil.java similarity index 100% rename from src/openblocks/common/container/ContainerAutoAnvil.java rename to src/main/java/openblocks/common/container/ContainerAutoAnvil.java diff --git a/src/openblocks/common/container/ContainerAutoEnchantmentTable.java b/src/main/java/openblocks/common/container/ContainerAutoEnchantmentTable.java similarity index 100% rename from src/openblocks/common/container/ContainerAutoEnchantmentTable.java rename to src/main/java/openblocks/common/container/ContainerAutoEnchantmentTable.java diff --git a/src/openblocks/common/container/ContainerBigButton.java b/src/main/java/openblocks/common/container/ContainerBigButton.java similarity index 100% rename from src/openblocks/common/container/ContainerBigButton.java rename to src/main/java/openblocks/common/container/ContainerBigButton.java diff --git a/src/openblocks/common/container/ContainerBlockPlacer.java b/src/main/java/openblocks/common/container/ContainerBlockPlacer.java similarity index 100% rename from src/openblocks/common/container/ContainerBlockPlacer.java rename to src/main/java/openblocks/common/container/ContainerBlockPlacer.java diff --git a/src/openblocks/common/container/ContainerDevNull.java b/src/main/java/openblocks/common/container/ContainerDevNull.java similarity index 100% rename from src/openblocks/common/container/ContainerDevNull.java rename to src/main/java/openblocks/common/container/ContainerDevNull.java diff --git a/src/openblocks/common/container/ContainerDigitalFuse.java b/src/main/java/openblocks/common/container/ContainerDigitalFuse.java similarity index 100% rename from src/openblocks/common/container/ContainerDigitalFuse.java rename to src/main/java/openblocks/common/container/ContainerDigitalFuse.java diff --git a/src/openblocks/common/container/ContainerDonationStation.java b/src/main/java/openblocks/common/container/ContainerDonationStation.java similarity index 100% rename from src/openblocks/common/container/ContainerDonationStation.java rename to src/main/java/openblocks/common/container/ContainerDonationStation.java diff --git a/src/openblocks/common/container/ContainerDrawingTable.java b/src/main/java/openblocks/common/container/ContainerDrawingTable.java similarity index 100% rename from src/openblocks/common/container/ContainerDrawingTable.java rename to src/main/java/openblocks/common/container/ContainerDrawingTable.java diff --git a/src/openblocks/common/container/ContainerItemDropper.java b/src/main/java/openblocks/common/container/ContainerItemDropper.java similarity index 100% rename from src/openblocks/common/container/ContainerItemDropper.java rename to src/main/java/openblocks/common/container/ContainerItemDropper.java diff --git a/src/openblocks/common/container/ContainerLuggage.java b/src/main/java/openblocks/common/container/ContainerLuggage.java similarity index 100% rename from src/openblocks/common/container/ContainerLuggage.java rename to src/main/java/openblocks/common/container/ContainerLuggage.java diff --git a/src/openblocks/common/container/ContainerPaintMixer.java b/src/main/java/openblocks/common/container/ContainerPaintMixer.java similarity index 100% rename from src/openblocks/common/container/ContainerPaintMixer.java rename to src/main/java/openblocks/common/container/ContainerPaintMixer.java diff --git a/src/openblocks/common/container/ContainerProjector.java b/src/main/java/openblocks/common/container/ContainerProjector.java similarity index 100% rename from src/openblocks/common/container/ContainerProjector.java rename to src/main/java/openblocks/common/container/ContainerProjector.java diff --git a/src/openblocks/common/container/ContainerSprinkler.java b/src/main/java/openblocks/common/container/ContainerSprinkler.java similarity index 100% rename from src/openblocks/common/container/ContainerSprinkler.java rename to src/main/java/openblocks/common/container/ContainerSprinkler.java diff --git a/src/openblocks/common/container/ContainerVacuumHopper.java b/src/main/java/openblocks/common/container/ContainerVacuumHopper.java similarity index 100% rename from src/openblocks/common/container/ContainerVacuumHopper.java rename to src/main/java/openblocks/common/container/ContainerVacuumHopper.java diff --git a/src/openblocks/common/container/ContainerXPBottler.java b/src/main/java/openblocks/common/container/ContainerXPBottler.java similarity index 100% rename from src/openblocks/common/container/ContainerXPBottler.java rename to src/main/java/openblocks/common/container/ContainerXPBottler.java diff --git a/src/openblocks/common/entity/EntityAssistant.java b/src/main/java/openblocks/common/entity/EntityAssistant.java similarity index 100% rename from src/openblocks/common/entity/EntityAssistant.java rename to src/main/java/openblocks/common/entity/EntityAssistant.java diff --git a/src/openblocks/common/entity/EntityCartographer.java b/src/main/java/openblocks/common/entity/EntityCartographer.java similarity index 100% rename from src/openblocks/common/entity/EntityCartographer.java rename to src/main/java/openblocks/common/entity/EntityCartographer.java diff --git a/src/openblocks/common/entity/EntityGoldenEye.java b/src/main/java/openblocks/common/entity/EntityGoldenEye.java similarity index 100% rename from src/openblocks/common/entity/EntityGoldenEye.java rename to src/main/java/openblocks/common/entity/EntityGoldenEye.java diff --git a/src/openblocks/common/entity/EntityHangGlider.java b/src/main/java/openblocks/common/entity/EntityHangGlider.java similarity index 100% rename from src/openblocks/common/entity/EntityHangGlider.java rename to src/main/java/openblocks/common/entity/EntityHangGlider.java diff --git a/src/openblocks/common/entity/EntityItemProjectile.java b/src/main/java/openblocks/common/entity/EntityItemProjectile.java similarity index 100% rename from src/openblocks/common/entity/EntityItemProjectile.java rename to src/main/java/openblocks/common/entity/EntityItemProjectile.java diff --git a/src/openblocks/common/entity/EntityLuggage.java b/src/main/java/openblocks/common/entity/EntityLuggage.java similarity index 100% rename from src/openblocks/common/entity/EntityLuggage.java rename to src/main/java/openblocks/common/entity/EntityLuggage.java diff --git a/src/openblocks/common/entity/EntityMagnet.java b/src/main/java/openblocks/common/entity/EntityMagnet.java similarity index 100% rename from src/openblocks/common/entity/EntityMagnet.java rename to src/main/java/openblocks/common/entity/EntityMagnet.java diff --git a/src/openblocks/common/entity/EntityMiniMe.java b/src/main/java/openblocks/common/entity/EntityMiniMe.java similarity index 100% rename from src/openblocks/common/entity/EntityMiniMe.java rename to src/main/java/openblocks/common/entity/EntityMiniMe.java diff --git a/src/openblocks/common/entity/EntityMount.java b/src/main/java/openblocks/common/entity/EntityMount.java similarity index 100% rename from src/openblocks/common/entity/EntityMount.java rename to src/main/java/openblocks/common/entity/EntityMount.java diff --git a/src/openblocks/common/entity/EntityMountedBlock.java b/src/main/java/openblocks/common/entity/EntityMountedBlock.java similarity index 100% rename from src/openblocks/common/entity/EntityMountedBlock.java rename to src/main/java/openblocks/common/entity/EntityMountedBlock.java diff --git a/src/openblocks/common/entity/EntityMutant.java b/src/main/java/openblocks/common/entity/EntityMutant.java similarity index 100% rename from src/openblocks/common/entity/EntityMutant.java rename to src/main/java/openblocks/common/entity/EntityMutant.java diff --git a/src/openblocks/common/entity/EntitySmoothMove.java b/src/main/java/openblocks/common/entity/EntitySmoothMove.java similarity index 100% rename from src/openblocks/common/entity/EntitySmoothMove.java rename to src/main/java/openblocks/common/entity/EntitySmoothMove.java diff --git a/src/openblocks/common/entity/EntityTorchArrow.java b/src/main/java/openblocks/common/entity/EntityTorchArrow.java similarity index 100% rename from src/openblocks/common/entity/EntityTorchArrow.java rename to src/main/java/openblocks/common/entity/EntityTorchArrow.java diff --git a/src/openblocks/common/entity/EntityXPOrbNoFly.java b/src/main/java/openblocks/common/entity/EntityXPOrbNoFly.java similarity index 100% rename from src/openblocks/common/entity/EntityXPOrbNoFly.java rename to src/main/java/openblocks/common/entity/EntityXPOrbNoFly.java diff --git a/src/openblocks/common/entity/ai/EntityAIBreakBlock.java b/src/main/java/openblocks/common/entity/ai/EntityAIBreakBlock.java similarity index 100% rename from src/openblocks/common/entity/ai/EntityAIBreakBlock.java rename to src/main/java/openblocks/common/entity/ai/EntityAIBreakBlock.java diff --git a/src/openblocks/common/entity/ai/EntityAICollectItem.java b/src/main/java/openblocks/common/entity/ai/EntityAICollectItem.java similarity index 100% rename from src/openblocks/common/entity/ai/EntityAICollectItem.java rename to src/main/java/openblocks/common/entity/ai/EntityAICollectItem.java diff --git a/src/openblocks/common/entity/ai/EntityAIPickupPlayer.java b/src/main/java/openblocks/common/entity/ai/EntityAIPickupPlayer.java similarity index 100% rename from src/openblocks/common/entity/ai/EntityAIPickupPlayer.java rename to src/main/java/openblocks/common/entity/ai/EntityAIPickupPlayer.java diff --git a/src/openblocks/common/item/ItemCartographer.java b/src/main/java/openblocks/common/item/ItemCartographer.java similarity index 100% rename from src/openblocks/common/item/ItemCartographer.java rename to src/main/java/openblocks/common/item/ItemCartographer.java diff --git a/src/openblocks/common/item/ItemCraneBackpack.java b/src/main/java/openblocks/common/item/ItemCraneBackpack.java similarity index 100% rename from src/openblocks/common/item/ItemCraneBackpack.java rename to src/main/java/openblocks/common/item/ItemCraneBackpack.java diff --git a/src/openblocks/common/item/ItemCraneControl.java b/src/main/java/openblocks/common/item/ItemCraneControl.java similarity index 100% rename from src/openblocks/common/item/ItemCraneControl.java rename to src/main/java/openblocks/common/item/ItemCraneControl.java diff --git a/src/openblocks/common/item/ItemCursor.java b/src/main/java/openblocks/common/item/ItemCursor.java similarity index 100% rename from src/openblocks/common/item/ItemCursor.java rename to src/main/java/openblocks/common/item/ItemCursor.java diff --git a/src/openblocks/common/item/ItemDevNull.java b/src/main/java/openblocks/common/item/ItemDevNull.java similarity index 100% rename from src/openblocks/common/item/ItemDevNull.java rename to src/main/java/openblocks/common/item/ItemDevNull.java diff --git a/src/openblocks/common/item/ItemEmptyMap.java b/src/main/java/openblocks/common/item/ItemEmptyMap.java similarity index 100% rename from src/openblocks/common/item/ItemEmptyMap.java rename to src/main/java/openblocks/common/item/ItemEmptyMap.java diff --git a/src/openblocks/common/item/ItemFilledBucket.java b/src/main/java/openblocks/common/item/ItemFilledBucket.java similarity index 100% rename from src/openblocks/common/item/ItemFilledBucket.java rename to src/main/java/openblocks/common/item/ItemFilledBucket.java diff --git a/src/openblocks/common/item/ItemFlagBlock.java b/src/main/java/openblocks/common/item/ItemFlagBlock.java similarity index 100% rename from src/openblocks/common/item/ItemFlagBlock.java rename to src/main/java/openblocks/common/item/ItemFlagBlock.java diff --git a/src/openblocks/common/item/ItemGoldenEye.java b/src/main/java/openblocks/common/item/ItemGoldenEye.java similarity index 100% rename from src/openblocks/common/item/ItemGoldenEye.java rename to src/main/java/openblocks/common/item/ItemGoldenEye.java diff --git a/src/openblocks/common/item/ItemHangGlider.java b/src/main/java/openblocks/common/item/ItemHangGlider.java similarity index 100% rename from src/openblocks/common/item/ItemHangGlider.java rename to src/main/java/openblocks/common/item/ItemHangGlider.java diff --git a/src/openblocks/common/item/ItemHeightMap.java b/src/main/java/openblocks/common/item/ItemHeightMap.java similarity index 100% rename from src/openblocks/common/item/ItemHeightMap.java rename to src/main/java/openblocks/common/item/ItemHeightMap.java diff --git a/src/openblocks/common/item/ItemImaginary.java b/src/main/java/openblocks/common/item/ItemImaginary.java similarity index 100% rename from src/openblocks/common/item/ItemImaginary.java rename to src/main/java/openblocks/common/item/ItemImaginary.java diff --git a/src/openblocks/common/item/ItemImaginationGlasses.java b/src/main/java/openblocks/common/item/ItemImaginationGlasses.java similarity index 100% rename from src/openblocks/common/item/ItemImaginationGlasses.java rename to src/main/java/openblocks/common/item/ItemImaginationGlasses.java diff --git a/src/openblocks/common/item/ItemInfoBook.java b/src/main/java/openblocks/common/item/ItemInfoBook.java similarity index 100% rename from src/openblocks/common/item/ItemInfoBook.java rename to src/main/java/openblocks/common/item/ItemInfoBook.java diff --git a/src/openblocks/common/item/ItemLuggage.java b/src/main/java/openblocks/common/item/ItemLuggage.java similarity index 100% rename from src/openblocks/common/item/ItemLuggage.java rename to src/main/java/openblocks/common/item/ItemLuggage.java diff --git a/src/openblocks/common/item/ItemOBGeneric.java b/src/main/java/openblocks/common/item/ItemOBGeneric.java similarity index 100% rename from src/openblocks/common/item/ItemOBGeneric.java rename to src/main/java/openblocks/common/item/ItemOBGeneric.java diff --git a/src/openblocks/common/item/ItemOBGenericUnstackable.java b/src/main/java/openblocks/common/item/ItemOBGenericUnstackable.java similarity index 100% rename from src/openblocks/common/item/ItemOBGenericUnstackable.java rename to src/main/java/openblocks/common/item/ItemOBGenericUnstackable.java diff --git a/src/openblocks/common/item/ItemPaintBrush.java b/src/main/java/openblocks/common/item/ItemPaintBrush.java similarity index 100% rename from src/openblocks/common/item/ItemPaintBrush.java rename to src/main/java/openblocks/common/item/ItemPaintBrush.java diff --git a/src/openblocks/common/item/ItemPaintCan.java b/src/main/java/openblocks/common/item/ItemPaintCan.java similarity index 100% rename from src/openblocks/common/item/ItemPaintCan.java rename to src/main/java/openblocks/common/item/ItemPaintCan.java diff --git a/src/openblocks/common/item/ItemSkyBlock.java b/src/main/java/openblocks/common/item/ItemSkyBlock.java similarity index 100% rename from src/openblocks/common/item/ItemSkyBlock.java rename to src/main/java/openblocks/common/item/ItemSkyBlock.java diff --git a/src/openblocks/common/item/ItemSleepingBag.java b/src/main/java/openblocks/common/item/ItemSleepingBag.java similarity index 100% rename from src/openblocks/common/item/ItemSleepingBag.java rename to src/main/java/openblocks/common/item/ItemSleepingBag.java diff --git a/src/openblocks/common/item/ItemSlimalyzer.java b/src/main/java/openblocks/common/item/ItemSlimalyzer.java similarity index 100% rename from src/openblocks/common/item/ItemSlimalyzer.java rename to src/main/java/openblocks/common/item/ItemSlimalyzer.java diff --git a/src/openblocks/common/item/ItemSonicGlasses.java b/src/main/java/openblocks/common/item/ItemSonicGlasses.java similarity index 100% rename from src/openblocks/common/item/ItemSonicGlasses.java rename to src/main/java/openblocks/common/item/ItemSonicGlasses.java diff --git a/src/openblocks/common/item/ItemSpongeOnAStick.java b/src/main/java/openblocks/common/item/ItemSpongeOnAStick.java similarity index 100% rename from src/openblocks/common/item/ItemSpongeOnAStick.java rename to src/main/java/openblocks/common/item/ItemSpongeOnAStick.java diff --git a/src/openblocks/common/item/ItemSqueegee.java b/src/main/java/openblocks/common/item/ItemSqueegee.java similarity index 100% rename from src/openblocks/common/item/ItemSqueegee.java rename to src/main/java/openblocks/common/item/ItemSqueegee.java diff --git a/src/openblocks/common/item/ItemStencil.java b/src/main/java/openblocks/common/item/ItemStencil.java similarity index 100% rename from src/openblocks/common/item/ItemStencil.java rename to src/main/java/openblocks/common/item/ItemStencil.java diff --git a/src/openblocks/common/item/ItemTankBlock.java b/src/main/java/openblocks/common/item/ItemTankBlock.java similarity index 100% rename from src/openblocks/common/item/ItemTankBlock.java rename to src/main/java/openblocks/common/item/ItemTankBlock.java diff --git a/src/openblocks/common/item/ItemTastyClay.java b/src/main/java/openblocks/common/item/ItemTastyClay.java similarity index 100% rename from src/openblocks/common/item/ItemTastyClay.java rename to src/main/java/openblocks/common/item/ItemTastyClay.java diff --git a/src/openblocks/common/item/ItemTrophyBlock.java b/src/main/java/openblocks/common/item/ItemTrophyBlock.java similarity index 100% rename from src/openblocks/common/item/ItemTrophyBlock.java rename to src/main/java/openblocks/common/item/ItemTrophyBlock.java diff --git a/src/openblocks/common/item/ItemTunedCrystal.java b/src/main/java/openblocks/common/item/ItemTunedCrystal.java similarity index 100% rename from src/openblocks/common/item/ItemTunedCrystal.java rename to src/main/java/openblocks/common/item/ItemTunedCrystal.java diff --git a/src/openblocks/common/item/ItemWallpaper.java b/src/main/java/openblocks/common/item/ItemWallpaper.java similarity index 100% rename from src/openblocks/common/item/ItemWallpaper.java rename to src/main/java/openblocks/common/item/ItemWallpaper.java diff --git a/src/openblocks/common/item/MetaGeneric.java b/src/main/java/openblocks/common/item/MetaGeneric.java similarity index 100% rename from src/openblocks/common/item/MetaGeneric.java rename to src/main/java/openblocks/common/item/MetaGeneric.java diff --git a/src/openblocks/common/item/MetaMiracleMagnet.java b/src/main/java/openblocks/common/item/MetaMiracleMagnet.java similarity index 100% rename from src/openblocks/common/item/MetaMiracleMagnet.java rename to src/main/java/openblocks/common/item/MetaMiracleMagnet.java diff --git a/src/openblocks/common/item/MetaPointer.java b/src/main/java/openblocks/common/item/MetaPointer.java similarity index 100% rename from src/openblocks/common/item/MetaPointer.java rename to src/main/java/openblocks/common/item/MetaPointer.java diff --git a/src/openblocks/common/item/MetasBucket.java b/src/main/java/openblocks/common/item/MetasBucket.java similarity index 100% rename from src/openblocks/common/item/MetasBucket.java rename to src/main/java/openblocks/common/item/MetasBucket.java diff --git a/src/openblocks/common/item/MetasGeneric.java b/src/main/java/openblocks/common/item/MetasGeneric.java similarity index 100% rename from src/openblocks/common/item/MetasGeneric.java rename to src/main/java/openblocks/common/item/MetasGeneric.java diff --git a/src/openblocks/common/item/MetasGenericUnstackable.java b/src/main/java/openblocks/common/item/MetasGenericUnstackable.java similarity index 100% rename from src/openblocks/common/item/MetasGenericUnstackable.java rename to src/main/java/openblocks/common/item/MetasGenericUnstackable.java diff --git a/src/openblocks/common/recipe/CrayonGlassesRecipe.java b/src/main/java/openblocks/common/recipe/CrayonGlassesRecipe.java similarity index 100% rename from src/openblocks/common/recipe/CrayonGlassesRecipe.java rename to src/main/java/openblocks/common/recipe/CrayonGlassesRecipe.java diff --git a/src/openblocks/common/recipe/CrayonMixingRecipe.java b/src/main/java/openblocks/common/recipe/CrayonMixingRecipe.java similarity index 100% rename from src/openblocks/common/recipe/CrayonMixingRecipe.java rename to src/main/java/openblocks/common/recipe/CrayonMixingRecipe.java diff --git a/src/openblocks/common/recipe/GoldenEyeRechargeRecipe.java b/src/main/java/openblocks/common/recipe/GoldenEyeRechargeRecipe.java similarity index 100% rename from src/openblocks/common/recipe/GoldenEyeRechargeRecipe.java rename to src/main/java/openblocks/common/recipe/GoldenEyeRechargeRecipe.java diff --git a/src/openblocks/common/recipe/MapCloneRecipe.java b/src/main/java/openblocks/common/recipe/MapCloneRecipe.java similarity index 100% rename from src/openblocks/common/recipe/MapCloneRecipe.java rename to src/main/java/openblocks/common/recipe/MapCloneRecipe.java diff --git a/src/openblocks/common/recipe/MapResizeRecipe.java b/src/main/java/openblocks/common/recipe/MapResizeRecipe.java similarity index 100% rename from src/openblocks/common/recipe/MapResizeRecipe.java rename to src/main/java/openblocks/common/recipe/MapResizeRecipe.java diff --git a/src/openblocks/common/recipe/TorchBowRecipe.java b/src/main/java/openblocks/common/recipe/TorchBowRecipe.java similarity index 100% rename from src/openblocks/common/recipe/TorchBowRecipe.java rename to src/main/java/openblocks/common/recipe/TorchBowRecipe.java diff --git a/src/openblocks/common/sync/SyncableBlockLayers.java b/src/main/java/openblocks/common/sync/SyncableBlockLayers.java similarity index 100% rename from src/openblocks/common/sync/SyncableBlockLayers.java rename to src/main/java/openblocks/common/sync/SyncableBlockLayers.java diff --git a/src/openblocks/common/tileentity/Packet132TileEntity.java b/src/main/java/openblocks/common/tileentity/Packet132TileEntity.java similarity index 100% rename from src/openblocks/common/tileentity/Packet132TileEntity.java rename to src/main/java/openblocks/common/tileentity/Packet132TileEntity.java diff --git a/src/openblocks/common/tileentity/TileEntityAutoAnvil.java b/src/main/java/openblocks/common/tileentity/TileEntityAutoAnvil.java similarity index 100% rename from src/openblocks/common/tileentity/TileEntityAutoAnvil.java rename to src/main/java/openblocks/common/tileentity/TileEntityAutoAnvil.java diff --git a/src/openblocks/common/tileentity/TileEntityAutoEnchantmentTable.java b/src/main/java/openblocks/common/tileentity/TileEntityAutoEnchantmentTable.java similarity index 100% rename from src/openblocks/common/tileentity/TileEntityAutoEnchantmentTable.java rename to src/main/java/openblocks/common/tileentity/TileEntityAutoEnchantmentTable.java diff --git a/src/openblocks/common/tileentity/TileEntityBearTrap.java b/src/main/java/openblocks/common/tileentity/TileEntityBearTrap.java similarity index 100% rename from src/openblocks/common/tileentity/TileEntityBearTrap.java rename to src/main/java/openblocks/common/tileentity/TileEntityBearTrap.java diff --git a/src/openblocks/common/tileentity/TileEntityBigButton.java b/src/main/java/openblocks/common/tileentity/TileEntityBigButton.java similarity index 100% rename from src/openblocks/common/tileentity/TileEntityBigButton.java rename to src/main/java/openblocks/common/tileentity/TileEntityBigButton.java diff --git a/src/openblocks/common/tileentity/TileEntityBlockBreaker.java b/src/main/java/openblocks/common/tileentity/TileEntityBlockBreaker.java similarity index 100% rename from src/openblocks/common/tileentity/TileEntityBlockBreaker.java rename to src/main/java/openblocks/common/tileentity/TileEntityBlockBreaker.java diff --git a/src/openblocks/common/tileentity/TileEntityBlockPlacer.java b/src/main/java/openblocks/common/tileentity/TileEntityBlockPlacer.java similarity index 100% rename from src/openblocks/common/tileentity/TileEntityBlockPlacer.java rename to src/main/java/openblocks/common/tileentity/TileEntityBlockPlacer.java diff --git a/src/openblocks/common/tileentity/TileEntityCannon.java b/src/main/java/openblocks/common/tileentity/TileEntityCannon.java similarity index 100% rename from src/openblocks/common/tileentity/TileEntityCannon.java rename to src/main/java/openblocks/common/tileentity/TileEntityCannon.java diff --git a/src/openblocks/common/tileentity/TileEntityCanvas.java b/src/main/java/openblocks/common/tileentity/TileEntityCanvas.java similarity index 100% rename from src/openblocks/common/tileentity/TileEntityCanvas.java rename to src/main/java/openblocks/common/tileentity/TileEntityCanvas.java diff --git a/src/openblocks/common/tileentity/TileEntityDigitalFuse.java b/src/main/java/openblocks/common/tileentity/TileEntityDigitalFuse.java similarity index 100% rename from src/openblocks/common/tileentity/TileEntityDigitalFuse.java rename to src/main/java/openblocks/common/tileentity/TileEntityDigitalFuse.java diff --git a/src/openblocks/common/tileentity/TileEntityDonationStation.java b/src/main/java/openblocks/common/tileentity/TileEntityDonationStation.java similarity index 100% rename from src/openblocks/common/tileentity/TileEntityDonationStation.java rename to src/main/java/openblocks/common/tileentity/TileEntityDonationStation.java diff --git a/src/openblocks/common/tileentity/TileEntityDrawingTable.java b/src/main/java/openblocks/common/tileentity/TileEntityDrawingTable.java similarity index 100% rename from src/openblocks/common/tileentity/TileEntityDrawingTable.java rename to src/main/java/openblocks/common/tileentity/TileEntityDrawingTable.java diff --git a/src/openblocks/common/tileentity/TileEntityElevator.java b/src/main/java/openblocks/common/tileentity/TileEntityElevator.java similarity index 100% rename from src/openblocks/common/tileentity/TileEntityElevator.java rename to src/main/java/openblocks/common/tileentity/TileEntityElevator.java diff --git a/src/openblocks/common/tileentity/TileEntityFan.java b/src/main/java/openblocks/common/tileentity/TileEntityFan.java similarity index 100% rename from src/openblocks/common/tileentity/TileEntityFan.java rename to src/main/java/openblocks/common/tileentity/TileEntityFan.java diff --git a/src/openblocks/common/tileentity/TileEntityFlag.java b/src/main/java/openblocks/common/tileentity/TileEntityFlag.java similarity index 100% rename from src/openblocks/common/tileentity/TileEntityFlag.java rename to src/main/java/openblocks/common/tileentity/TileEntityFlag.java diff --git a/src/openblocks/common/tileentity/TileEntityGoldenEgg.java b/src/main/java/openblocks/common/tileentity/TileEntityGoldenEgg.java similarity index 100% rename from src/openblocks/common/tileentity/TileEntityGoldenEgg.java rename to src/main/java/openblocks/common/tileentity/TileEntityGoldenEgg.java diff --git a/src/openblocks/common/tileentity/TileEntityGrave.java b/src/main/java/openblocks/common/tileentity/TileEntityGrave.java similarity index 100% rename from src/openblocks/common/tileentity/TileEntityGrave.java rename to src/main/java/openblocks/common/tileentity/TileEntityGrave.java diff --git a/src/openblocks/common/tileentity/TileEntityGuide.java b/src/main/java/openblocks/common/tileentity/TileEntityGuide.java similarity index 100% rename from src/openblocks/common/tileentity/TileEntityGuide.java rename to src/main/java/openblocks/common/tileentity/TileEntityGuide.java diff --git a/src/openblocks/common/tileentity/TileEntityHealBlock.java b/src/main/java/openblocks/common/tileentity/TileEntityHealBlock.java similarity index 100% rename from src/openblocks/common/tileentity/TileEntityHealBlock.java rename to src/main/java/openblocks/common/tileentity/TileEntityHealBlock.java diff --git a/src/openblocks/common/tileentity/TileEntityImaginary.java b/src/main/java/openblocks/common/tileentity/TileEntityImaginary.java similarity index 100% rename from src/openblocks/common/tileentity/TileEntityImaginary.java rename to src/main/java/openblocks/common/tileentity/TileEntityImaginary.java diff --git a/src/openblocks/common/tileentity/TileEntityItemDropper.java b/src/main/java/openblocks/common/tileentity/TileEntityItemDropper.java similarity index 100% rename from src/openblocks/common/tileentity/TileEntityItemDropper.java rename to src/main/java/openblocks/common/tileentity/TileEntityItemDropper.java diff --git a/src/openblocks/common/tileentity/TileEntityPaintCan.java b/src/main/java/openblocks/common/tileentity/TileEntityPaintCan.java similarity index 100% rename from src/openblocks/common/tileentity/TileEntityPaintCan.java rename to src/main/java/openblocks/common/tileentity/TileEntityPaintCan.java diff --git a/src/openblocks/common/tileentity/TileEntityPaintMixer.java b/src/main/java/openblocks/common/tileentity/TileEntityPaintMixer.java similarity index 100% rename from src/openblocks/common/tileentity/TileEntityPaintMixer.java rename to src/main/java/openblocks/common/tileentity/TileEntityPaintMixer.java diff --git a/src/openblocks/common/tileentity/TileEntityProjector.java b/src/main/java/openblocks/common/tileentity/TileEntityProjector.java similarity index 100% rename from src/openblocks/common/tileentity/TileEntityProjector.java rename to src/main/java/openblocks/common/tileentity/TileEntityProjector.java diff --git a/src/openblocks/common/tileentity/TileEntityRadio.java b/src/main/java/openblocks/common/tileentity/TileEntityRadio.java similarity index 100% rename from src/openblocks/common/tileentity/TileEntityRadio.java rename to src/main/java/openblocks/common/tileentity/TileEntityRadio.java diff --git a/src/openblocks/common/tileentity/TileEntityRopeLadder.java b/src/main/java/openblocks/common/tileentity/TileEntityRopeLadder.java similarity index 100% rename from src/openblocks/common/tileentity/TileEntityRopeLadder.java rename to src/main/java/openblocks/common/tileentity/TileEntityRopeLadder.java diff --git a/src/openblocks/common/tileentity/TileEntitySky.java b/src/main/java/openblocks/common/tileentity/TileEntitySky.java similarity index 100% rename from src/openblocks/common/tileentity/TileEntitySky.java rename to src/main/java/openblocks/common/tileentity/TileEntitySky.java diff --git a/src/openblocks/common/tileentity/TileEntitySprinkler.java b/src/main/java/openblocks/common/tileentity/TileEntitySprinkler.java similarity index 100% rename from src/openblocks/common/tileentity/TileEntitySprinkler.java rename to src/main/java/openblocks/common/tileentity/TileEntitySprinkler.java diff --git a/src/openblocks/common/tileentity/TileEntityTank.java b/src/main/java/openblocks/common/tileentity/TileEntityTank.java similarity index 100% rename from src/openblocks/common/tileentity/TileEntityTank.java rename to src/main/java/openblocks/common/tileentity/TileEntityTank.java diff --git a/src/openblocks/common/tileentity/TileEntityTarget.java b/src/main/java/openblocks/common/tileentity/TileEntityTarget.java similarity index 100% rename from src/openblocks/common/tileentity/TileEntityTarget.java rename to src/main/java/openblocks/common/tileentity/TileEntityTarget.java diff --git a/src/openblocks/common/tileentity/TileEntityTrophy.java b/src/main/java/openblocks/common/tileentity/TileEntityTrophy.java similarity index 100% rename from src/openblocks/common/tileentity/TileEntityTrophy.java rename to src/main/java/openblocks/common/tileentity/TileEntityTrophy.java diff --git a/src/openblocks/common/tileentity/TileEntityVacuumHopper.java b/src/main/java/openblocks/common/tileentity/TileEntityVacuumHopper.java similarity index 100% rename from src/openblocks/common/tileentity/TileEntityVacuumHopper.java rename to src/main/java/openblocks/common/tileentity/TileEntityVacuumHopper.java diff --git a/src/openblocks/common/tileentity/TileEntityVillageHighlighter.java b/src/main/java/openblocks/common/tileentity/TileEntityVillageHighlighter.java similarity index 100% rename from src/openblocks/common/tileentity/TileEntityVillageHighlighter.java rename to src/main/java/openblocks/common/tileentity/TileEntityVillageHighlighter.java diff --git a/src/openblocks/common/tileentity/TileEntityXPBottler.java b/src/main/java/openblocks/common/tileentity/TileEntityXPBottler.java similarity index 100% rename from src/openblocks/common/tileentity/TileEntityXPBottler.java rename to src/main/java/openblocks/common/tileentity/TileEntityXPBottler.java diff --git a/src/openblocks/common/tileentity/TileEntityXPDrain.java b/src/main/java/openblocks/common/tileentity/TileEntityXPDrain.java similarity index 100% rename from src/openblocks/common/tileentity/TileEntityXPDrain.java rename to src/main/java/openblocks/common/tileentity/TileEntityXPDrain.java diff --git a/src/openblocks/common/tileentity/TileEntityXPShower.java b/src/main/java/openblocks/common/tileentity/TileEntityXPShower.java similarity index 100% rename from src/openblocks/common/tileentity/TileEntityXPShower.java rename to src/main/java/openblocks/common/tileentity/TileEntityXPShower.java diff --git a/src/openblocks/enchantments/EnchantmentExplosive.java b/src/main/java/openblocks/enchantments/EnchantmentExplosive.java similarity index 100% rename from src/openblocks/enchantments/EnchantmentExplosive.java rename to src/main/java/openblocks/enchantments/EnchantmentExplosive.java diff --git a/src/openblocks/enchantments/EnchantmentFlimFlam.java b/src/main/java/openblocks/enchantments/EnchantmentFlimFlam.java similarity index 100% rename from src/openblocks/enchantments/EnchantmentFlimFlam.java rename to src/main/java/openblocks/enchantments/EnchantmentFlimFlam.java diff --git a/src/openblocks/enchantments/EnchantmentLastStand.java b/src/main/java/openblocks/enchantments/EnchantmentLastStand.java similarity index 100% rename from src/openblocks/enchantments/EnchantmentLastStand.java rename to src/main/java/openblocks/enchantments/EnchantmentLastStand.java diff --git a/src/openblocks/enchantments/ExplosiveEnchantmentsHandler.java b/src/main/java/openblocks/enchantments/ExplosiveEnchantmentsHandler.java similarity index 100% rename from src/openblocks/enchantments/ExplosiveEnchantmentsHandler.java rename to src/main/java/openblocks/enchantments/ExplosiveEnchantmentsHandler.java diff --git a/src/openblocks/enchantments/FlimFlamEnchantmentsHandler.java b/src/main/java/openblocks/enchantments/FlimFlamEnchantmentsHandler.java similarity index 100% rename from src/openblocks/enchantments/FlimFlamEnchantmentsHandler.java rename to src/main/java/openblocks/enchantments/FlimFlamEnchantmentsHandler.java diff --git a/src/openblocks/enchantments/LastStandEnchantmentsHandler.java b/src/main/java/openblocks/enchantments/LastStandEnchantmentsHandler.java similarity index 100% rename from src/openblocks/enchantments/LastStandEnchantmentsHandler.java rename to src/main/java/openblocks/enchantments/LastStandEnchantmentsHandler.java diff --git a/src/openblocks/enchantments/flimflams/BaneFlimFlam.java b/src/main/java/openblocks/enchantments/flimflams/BaneFlimFlam.java similarity index 100% rename from src/openblocks/enchantments/flimflams/BaneFlimFlam.java rename to src/main/java/openblocks/enchantments/flimflams/BaneFlimFlam.java diff --git a/src/openblocks/enchantments/flimflams/DummyCreepersFlimFlam.java b/src/main/java/openblocks/enchantments/flimflams/DummyCreepersFlimFlam.java similarity index 100% rename from src/openblocks/enchantments/flimflams/DummyCreepersFlimFlam.java rename to src/main/java/openblocks/enchantments/flimflams/DummyCreepersFlimFlam.java diff --git a/src/openblocks/enchantments/flimflams/EffectFlimFlam.java b/src/main/java/openblocks/enchantments/flimflams/EffectFlimFlam.java similarity index 100% rename from src/openblocks/enchantments/flimflams/EffectFlimFlam.java rename to src/main/java/openblocks/enchantments/flimflams/EffectFlimFlam.java diff --git a/src/openblocks/enchantments/flimflams/EncaseFlimFlam.java b/src/main/java/openblocks/enchantments/flimflams/EncaseFlimFlam.java similarity index 100% rename from src/openblocks/enchantments/flimflams/EncaseFlimFlam.java rename to src/main/java/openblocks/enchantments/flimflams/EncaseFlimFlam.java diff --git a/src/openblocks/enchantments/flimflams/InventoryShuffleFlimFlam.java b/src/main/java/openblocks/enchantments/flimflams/InventoryShuffleFlimFlam.java similarity index 100% rename from src/openblocks/enchantments/flimflams/InventoryShuffleFlimFlam.java rename to src/main/java/openblocks/enchantments/flimflams/InventoryShuffleFlimFlam.java diff --git a/src/openblocks/enchantments/flimflams/InvisibleMobsFlimFlam.java b/src/main/java/openblocks/enchantments/flimflams/InvisibleMobsFlimFlam.java similarity index 100% rename from src/openblocks/enchantments/flimflams/InvisibleMobsFlimFlam.java rename to src/main/java/openblocks/enchantments/flimflams/InvisibleMobsFlimFlam.java diff --git a/src/openblocks/enchantments/flimflams/ItemDropFlimFlam.java b/src/main/java/openblocks/enchantments/flimflams/ItemDropFlimFlam.java similarity index 100% rename from src/openblocks/enchantments/flimflams/ItemDropFlimFlam.java rename to src/main/java/openblocks/enchantments/flimflams/ItemDropFlimFlam.java diff --git a/src/openblocks/enchantments/flimflams/LoreFlimFlam.java b/src/main/java/openblocks/enchantments/flimflams/LoreFlimFlam.java similarity index 100% rename from src/openblocks/enchantments/flimflams/LoreFlimFlam.java rename to src/main/java/openblocks/enchantments/flimflams/LoreFlimFlam.java diff --git a/src/openblocks/enchantments/flimflams/MountFlimFlam.java b/src/main/java/openblocks/enchantments/flimflams/MountFlimFlam.java similarity index 100% rename from src/openblocks/enchantments/flimflams/MountFlimFlam.java rename to src/main/java/openblocks/enchantments/flimflams/MountFlimFlam.java diff --git a/src/openblocks/enchantments/flimflams/RenameFlimFlam.java b/src/main/java/openblocks/enchantments/flimflams/RenameFlimFlam.java similarity index 100% rename from src/openblocks/enchantments/flimflams/RenameFlimFlam.java rename to src/main/java/openblocks/enchantments/flimflams/RenameFlimFlam.java diff --git a/src/openblocks/enchantments/flimflams/SheepDyeFlimFlam.java b/src/main/java/openblocks/enchantments/flimflams/SheepDyeFlimFlam.java similarity index 100% rename from src/openblocks/enchantments/flimflams/SheepDyeFlimFlam.java rename to src/main/java/openblocks/enchantments/flimflams/SheepDyeFlimFlam.java diff --git a/src/openblocks/enchantments/flimflams/SkyblockFlimFlam.java b/src/main/java/openblocks/enchantments/flimflams/SkyblockFlimFlam.java similarity index 100% rename from src/openblocks/enchantments/flimflams/SkyblockFlimFlam.java rename to src/main/java/openblocks/enchantments/flimflams/SkyblockFlimFlam.java diff --git a/src/openblocks/enchantments/flimflams/SnowballsFlimFlam.java b/src/main/java/openblocks/enchantments/flimflams/SnowballsFlimFlam.java similarity index 100% rename from src/openblocks/enchantments/flimflams/SnowballsFlimFlam.java rename to src/main/java/openblocks/enchantments/flimflams/SnowballsFlimFlam.java diff --git a/src/openblocks/enchantments/flimflams/SoundFlimFlam.java b/src/main/java/openblocks/enchantments/flimflams/SoundFlimFlam.java similarity index 100% rename from src/openblocks/enchantments/flimflams/SoundFlimFlam.java rename to src/main/java/openblocks/enchantments/flimflams/SoundFlimFlam.java diff --git a/src/openblocks/enchantments/flimflams/SquidFilmFlam.java b/src/main/java/openblocks/enchantments/flimflams/SquidFilmFlam.java similarity index 100% rename from src/openblocks/enchantments/flimflams/SquidFilmFlam.java rename to src/main/java/openblocks/enchantments/flimflams/SquidFilmFlam.java diff --git a/src/openblocks/enchantments/flimflams/TeleportFlimFlam.java b/src/main/java/openblocks/enchantments/flimflams/TeleportFlimFlam.java similarity index 100% rename from src/openblocks/enchantments/flimflams/TeleportFlimFlam.java rename to src/main/java/openblocks/enchantments/flimflams/TeleportFlimFlam.java diff --git a/src/openblocks/enchantments/flimflams/UselessToolFlimFlam.java b/src/main/java/openblocks/enchantments/flimflams/UselessToolFlimFlam.java similarity index 100% rename from src/openblocks/enchantments/flimflams/UselessToolFlimFlam.java rename to src/main/java/openblocks/enchantments/flimflams/UselessToolFlimFlam.java diff --git a/src/openblocks/events/ElevatorActionEvent.java b/src/main/java/openblocks/events/ElevatorActionEvent.java similarity index 100% rename from src/openblocks/events/ElevatorActionEvent.java rename to src/main/java/openblocks/events/ElevatorActionEvent.java diff --git a/src/openblocks/events/EventTypes.java b/src/main/java/openblocks/events/EventTypes.java similarity index 100% rename from src/openblocks/events/EventTypes.java rename to src/main/java/openblocks/events/EventTypes.java diff --git a/src/openblocks/events/PlayerActionEvent.java b/src/main/java/openblocks/events/PlayerActionEvent.java similarity index 100% rename from src/openblocks/events/PlayerActionEvent.java rename to src/main/java/openblocks/events/PlayerActionEvent.java diff --git a/src/openblocks/events/StencilCraftEvent.java b/src/main/java/openblocks/events/StencilCraftEvent.java similarity index 100% rename from src/openblocks/events/StencilCraftEvent.java rename to src/main/java/openblocks/events/StencilCraftEvent.java diff --git a/src/openblocks/integration/AdapterCannon.java b/src/main/java/openblocks/integration/AdapterCannon.java similarity index 100% rename from src/openblocks/integration/AdapterCannon.java rename to src/main/java/openblocks/integration/AdapterCannon.java diff --git a/src/openblocks/integration/AdapterDonationStation.java b/src/main/java/openblocks/integration/AdapterDonationStation.java similarity index 100% rename from src/openblocks/integration/AdapterDonationStation.java rename to src/main/java/openblocks/integration/AdapterDonationStation.java diff --git a/src/openblocks/integration/AdapterProjector.java b/src/main/java/openblocks/integration/AdapterProjector.java similarity index 100% rename from src/openblocks/integration/AdapterProjector.java rename to src/main/java/openblocks/integration/AdapterProjector.java diff --git a/src/openblocks/integration/AdapterVillageHighlighter.java b/src/main/java/openblocks/integration/AdapterVillageHighlighter.java similarity index 100% rename from src/openblocks/integration/AdapterVillageHighlighter.java rename to src/main/java/openblocks/integration/AdapterVillageHighlighter.java diff --git a/src/openblocks/integration/MagnetControlAdapterBase.java b/src/main/java/openblocks/integration/MagnetControlAdapterBase.java similarity index 100% rename from src/openblocks/integration/MagnetControlAdapterBase.java rename to src/main/java/openblocks/integration/MagnetControlAdapterBase.java diff --git a/src/openblocks/integration/ModuleAdapters.java b/src/main/java/openblocks/integration/ModuleAdapters.java similarity index 100% rename from src/openblocks/integration/ModuleAdapters.java rename to src/main/java/openblocks/integration/ModuleAdapters.java diff --git a/src/openblocks/integration/TurtleIds.java b/src/main/java/openblocks/integration/TurtleIds.java similarity index 100% rename from src/openblocks/integration/TurtleIds.java rename to src/main/java/openblocks/integration/TurtleIds.java diff --git a/src/openblocks/integration/TurtleUtils.java b/src/main/java/openblocks/integration/TurtleUtils.java similarity index 100% rename from src/openblocks/integration/TurtleUtils.java rename to src/main/java/openblocks/integration/TurtleUtils.java diff --git a/src/openblocks/integration/cc15/MagnetControlAdapter.java b/src/main/java/openblocks/integration/cc15/MagnetControlAdapter.java similarity index 100% rename from src/openblocks/integration/cc15/MagnetControlAdapter.java rename to src/main/java/openblocks/integration/cc15/MagnetControlAdapter.java diff --git a/src/openblocks/integration/cc15/MagnetTurtleUpgrade.java b/src/main/java/openblocks/integration/cc15/MagnetTurtleUpgrade.java similarity index 100% rename from src/openblocks/integration/cc15/MagnetTurtleUpgrade.java rename to src/main/java/openblocks/integration/cc15/MagnetTurtleUpgrade.java diff --git a/src/openblocks/integration/cc15/ModuleTurtlesCC15X.java b/src/main/java/openblocks/integration/cc15/ModuleTurtlesCC15X.java similarity index 100% rename from src/openblocks/integration/cc15/ModuleTurtlesCC15X.java rename to src/main/java/openblocks/integration/cc15/ModuleTurtlesCC15X.java diff --git a/src/openblocks/integration/cc16/MagnetControlAdapter.java b/src/main/java/openblocks/integration/cc16/MagnetControlAdapter.java similarity index 100% rename from src/openblocks/integration/cc16/MagnetControlAdapter.java rename to src/main/java/openblocks/integration/cc16/MagnetControlAdapter.java diff --git a/src/openblocks/integration/cc16/MagnetTurtleUpgrade.java b/src/main/java/openblocks/integration/cc16/MagnetTurtleUpgrade.java similarity index 100% rename from src/openblocks/integration/cc16/MagnetTurtleUpgrade.java rename to src/main/java/openblocks/integration/cc16/MagnetTurtleUpgrade.java diff --git a/src/openblocks/integration/cc16/ModuleTurtlesCC16.java b/src/main/java/openblocks/integration/cc16/ModuleTurtlesCC16.java similarity index 100% rename from src/openblocks/integration/cc16/ModuleTurtlesCC16.java rename to src/main/java/openblocks/integration/cc16/ModuleTurtlesCC16.java diff --git a/src/openblocks/integration/package-info.java b/src/main/java/openblocks/integration/package-info.java similarity index 100% rename from src/openblocks/integration/package-info.java rename to src/main/java/openblocks/integration/package-info.java diff --git a/src/openblocks/mutant/DefinitionChicken.java b/src/main/java/openblocks/mutant/DefinitionChicken.java similarity index 100% rename from src/openblocks/mutant/DefinitionChicken.java rename to src/main/java/openblocks/mutant/DefinitionChicken.java diff --git a/src/openblocks/mutant/DefinitionCreeper.java b/src/main/java/openblocks/mutant/DefinitionCreeper.java similarity index 100% rename from src/openblocks/mutant/DefinitionCreeper.java rename to src/main/java/openblocks/mutant/DefinitionCreeper.java diff --git a/src/openblocks/mutant/DefinitionEnderman.java b/src/main/java/openblocks/mutant/DefinitionEnderman.java similarity index 100% rename from src/openblocks/mutant/DefinitionEnderman.java rename to src/main/java/openblocks/mutant/DefinitionEnderman.java diff --git a/src/openblocks/mutant/DefinitionOcelot.java b/src/main/java/openblocks/mutant/DefinitionOcelot.java similarity index 100% rename from src/openblocks/mutant/DefinitionOcelot.java rename to src/main/java/openblocks/mutant/DefinitionOcelot.java diff --git a/src/openblocks/mutant/DefinitionPig.java b/src/main/java/openblocks/mutant/DefinitionPig.java similarity index 100% rename from src/openblocks/mutant/DefinitionPig.java rename to src/main/java/openblocks/mutant/DefinitionPig.java diff --git a/src/openblocks/mutant/DefinitionSheep.java b/src/main/java/openblocks/mutant/DefinitionSheep.java similarity index 100% rename from src/openblocks/mutant/DefinitionSheep.java rename to src/main/java/openblocks/mutant/DefinitionSheep.java diff --git a/src/openblocks/mutant/DefinitionSpider.java b/src/main/java/openblocks/mutant/DefinitionSpider.java similarity index 100% rename from src/openblocks/mutant/DefinitionSpider.java rename to src/main/java/openblocks/mutant/DefinitionSpider.java diff --git a/src/openblocks/mutant/DefinitionZombie.java b/src/main/java/openblocks/mutant/DefinitionZombie.java similarity index 100% rename from src/openblocks/mutant/DefinitionZombie.java rename to src/main/java/openblocks/mutant/DefinitionZombie.java diff --git a/src/openblocks/rubbish/BrickManager.java b/src/main/java/openblocks/rubbish/BrickManager.java similarity index 100% rename from src/openblocks/rubbish/BrickManager.java rename to src/main/java/openblocks/rubbish/BrickManager.java diff --git a/src/openblocks/rubbish/CommandFlimFlam.java b/src/main/java/openblocks/rubbish/CommandFlimFlam.java similarity index 100% rename from src/openblocks/rubbish/CommandFlimFlam.java rename to src/main/java/openblocks/rubbish/CommandFlimFlam.java diff --git a/src/openblocks/rubbish/CommandLuck.java b/src/main/java/openblocks/rubbish/CommandLuck.java similarity index 100% rename from src/openblocks/rubbish/CommandLuck.java rename to src/main/java/openblocks/rubbish/CommandLuck.java diff --git a/src/openblocks/rubbish/LoreGenerator.java b/src/main/java/openblocks/rubbish/LoreGenerator.java similarity index 100% rename from src/openblocks/rubbish/LoreGenerator.java rename to src/main/java/openblocks/rubbish/LoreGenerator.java diff --git a/src/openblocks/shapes/GuideShape.java b/src/main/java/openblocks/shapes/GuideShape.java similarity index 100% rename from src/openblocks/shapes/GuideShape.java rename to src/main/java/openblocks/shapes/GuideShape.java diff --git a/src/openblocks/trophy/BlazeBehavior.java b/src/main/java/openblocks/trophy/BlazeBehavior.java similarity index 100% rename from src/openblocks/trophy/BlazeBehavior.java rename to src/main/java/openblocks/trophy/BlazeBehavior.java diff --git a/src/openblocks/trophy/CaveSpiderBehavior.java b/src/main/java/openblocks/trophy/CaveSpiderBehavior.java similarity index 100% rename from src/openblocks/trophy/CaveSpiderBehavior.java rename to src/main/java/openblocks/trophy/CaveSpiderBehavior.java diff --git a/src/openblocks/trophy/CreeperBehavior.java b/src/main/java/openblocks/trophy/CreeperBehavior.java similarity index 100% rename from src/openblocks/trophy/CreeperBehavior.java rename to src/main/java/openblocks/trophy/CreeperBehavior.java diff --git a/src/openblocks/trophy/EndermanBehavior.java b/src/main/java/openblocks/trophy/EndermanBehavior.java similarity index 100% rename from src/openblocks/trophy/EndermanBehavior.java rename to src/main/java/openblocks/trophy/EndermanBehavior.java diff --git a/src/openblocks/trophy/ITrophyBehavior.java b/src/main/java/openblocks/trophy/ITrophyBehavior.java similarity index 100% rename from src/openblocks/trophy/ITrophyBehavior.java rename to src/main/java/openblocks/trophy/ITrophyBehavior.java diff --git a/src/openblocks/trophy/ItemDropBehavior.java b/src/main/java/openblocks/trophy/ItemDropBehavior.java similarity index 100% rename from src/openblocks/trophy/ItemDropBehavior.java rename to src/main/java/openblocks/trophy/ItemDropBehavior.java diff --git a/src/openblocks/trophy/MooshroomBehavior.java b/src/main/java/openblocks/trophy/MooshroomBehavior.java similarity index 100% rename from src/openblocks/trophy/MooshroomBehavior.java rename to src/main/java/openblocks/trophy/MooshroomBehavior.java diff --git a/src/openblocks/trophy/SkeletonBehavior.java b/src/main/java/openblocks/trophy/SkeletonBehavior.java similarity index 100% rename from src/openblocks/trophy/SkeletonBehavior.java rename to src/main/java/openblocks/trophy/SkeletonBehavior.java diff --git a/src/openblocks/trophy/SnowmanBehavior.java b/src/main/java/openblocks/trophy/SnowmanBehavior.java similarity index 100% rename from src/openblocks/trophy/SnowmanBehavior.java rename to src/main/java/openblocks/trophy/SnowmanBehavior.java diff --git a/src/openblocks/trophy/SquidBehavior.java b/src/main/java/openblocks/trophy/SquidBehavior.java similarity index 100% rename from src/openblocks/trophy/SquidBehavior.java rename to src/main/java/openblocks/trophy/SquidBehavior.java diff --git a/src/openblocks/trophy/WitchBehavior.java b/src/main/java/openblocks/trophy/WitchBehavior.java similarity index 100% rename from src/openblocks/trophy/WitchBehavior.java rename to src/main/java/openblocks/trophy/WitchBehavior.java diff --git a/src/openblocks/utils/ChangelogBuilder.java b/src/main/java/openblocks/utils/ChangelogBuilder.java similarity index 100% rename from src/openblocks/utils/ChangelogBuilder.java rename to src/main/java/openblocks/utils/ChangelogBuilder.java diff --git a/src/openblocks/utils/MutantUtils.java b/src/main/java/openblocks/utils/MutantUtils.java similarity index 100% rename from src/openblocks/utils/MutantUtils.java rename to src/main/java/openblocks/utils/MutantUtils.java diff --git a/assets/openblocks/lang/de_DE.lang b/src/main/resources/assets/openblocks/lang/de_DE.lang similarity index 100% rename from assets/openblocks/lang/de_DE.lang rename to src/main/resources/assets/openblocks/lang/de_DE.lang diff --git a/assets/openblocks/lang/en_US.lang b/src/main/resources/assets/openblocks/lang/en_US.lang similarity index 100% rename from assets/openblocks/lang/en_US.lang rename to src/main/resources/assets/openblocks/lang/en_US.lang diff --git a/assets/openblocks/lang/nl_NL.lang b/src/main/resources/assets/openblocks/lang/nl_NL.lang similarity index 100% rename from assets/openblocks/lang/nl_NL.lang rename to src/main/resources/assets/openblocks/lang/nl_NL.lang diff --git a/assets/openblocks/lang/pl_PL.lang b/src/main/resources/assets/openblocks/lang/pl_PL.lang similarity index 100% rename from assets/openblocks/lang/pl_PL.lang rename to src/main/resources/assets/openblocks/lang/pl_PL.lang diff --git a/assets/openblocks/lang/pt_BR.lang b/src/main/resources/assets/openblocks/lang/pt_BR.lang similarity index 100% rename from assets/openblocks/lang/pt_BR.lang rename to src/main/resources/assets/openblocks/lang/pt_BR.lang diff --git a/assets/openblocks/lang/ru_RU.lang b/src/main/resources/assets/openblocks/lang/ru_RU.lang similarity index 100% rename from assets/openblocks/lang/ru_RU.lang rename to src/main/resources/assets/openblocks/lang/ru_RU.lang diff --git a/assets/openblocks/lang/zh_CN.lang b/src/main/resources/assets/openblocks/lang/zh_CN.lang similarity index 100% rename from assets/openblocks/lang/zh_CN.lang rename to src/main/resources/assets/openblocks/lang/zh_CN.lang diff --git a/assets/openblocks/shaders/screen.frag b/src/main/resources/assets/openblocks/shaders/screen.frag similarity index 100% rename from assets/openblocks/shaders/screen.frag rename to src/main/resources/assets/openblocks/shaders/screen.frag diff --git a/assets/openblocks/shaders/screen.vert b/src/main/resources/assets/openblocks/shaders/screen.vert similarity index 100% rename from assets/openblocks/shaders/screen.vert rename to src/main/resources/assets/openblocks/shaders/screen.vert diff --git a/assets/openblocks/sound/alarmclock.ogg b/src/main/resources/assets/openblocks/sound/alarmclock.ogg similarity index 100% rename from assets/openblocks/sound/alarmclock.ogg rename to src/main/resources/assets/openblocks/sound/alarmclock.ogg diff --git a/assets/openblocks/sound/beartrapclose.ogg b/src/main/resources/assets/openblocks/sound/beartrapclose.ogg similarity index 100% rename from assets/openblocks/sound/beartrapclose.ogg rename to src/main/resources/assets/openblocks/sound/beartrapclose.ogg diff --git a/assets/openblocks/sound/beartrapcloseb.ogg b/src/main/resources/assets/openblocks/sound/beartrapcloseb.ogg similarity index 100% rename from assets/openblocks/sound/beartrapcloseb.ogg rename to src/main/resources/assets/openblocks/sound/beartrapcloseb.ogg diff --git a/assets/openblocks/sound/beartrapopen.ogg b/src/main/resources/assets/openblocks/sound/beartrapopen.ogg similarity index 100% rename from assets/openblocks/sound/beartrapopen.ogg rename to src/main/resources/assets/openblocks/sound/beartrapopen.ogg diff --git a/assets/openblocks/sound/beep.ogg b/src/main/resources/assets/openblocks/sound/beep.ogg similarity index 100% rename from assets/openblocks/sound/beep.ogg rename to src/main/resources/assets/openblocks/sound/beep.ogg diff --git a/assets/openblocks/sound/cannon.ogg b/src/main/resources/assets/openblocks/sound/cannon.ogg similarity index 100% rename from assets/openblocks/sound/cannon.ogg rename to src/main/resources/assets/openblocks/sound/cannon.ogg diff --git a/assets/openblocks/sound/chomp.ogg b/src/main/resources/assets/openblocks/sound/chomp.ogg similarity index 100% rename from assets/openblocks/sound/chomp.ogg rename to src/main/resources/assets/openblocks/sound/chomp.ogg diff --git a/assets/openblocks/sound/close.ogg b/src/main/resources/assets/openblocks/sound/close.ogg similarity index 100% rename from assets/openblocks/sound/close.ogg rename to src/main/resources/assets/openblocks/sound/close.ogg diff --git a/assets/openblocks/sound/draw1.ogg b/src/main/resources/assets/openblocks/sound/draw1.ogg similarity index 100% rename from assets/openblocks/sound/draw1.ogg rename to src/main/resources/assets/openblocks/sound/draw1.ogg diff --git a/assets/openblocks/sound/draw2.ogg b/src/main/resources/assets/openblocks/sound/draw2.ogg similarity index 100% rename from assets/openblocks/sound/draw2.ogg rename to src/main/resources/assets/openblocks/sound/draw2.ogg diff --git a/assets/openblocks/sound/draw3.ogg b/src/main/resources/assets/openblocks/sound/draw3.ogg similarity index 100% rename from assets/openblocks/sound/draw3.ogg rename to src/main/resources/assets/openblocks/sound/draw3.ogg diff --git a/assets/openblocks/sound/draw4.ogg b/src/main/resources/assets/openblocks/sound/draw4.ogg similarity index 100% rename from assets/openblocks/sound/draw4.ogg rename to src/main/resources/assets/openblocks/sound/draw4.ogg diff --git a/assets/openblocks/sound/fart1.ogg b/src/main/resources/assets/openblocks/sound/fart1.ogg similarity index 100% rename from assets/openblocks/sound/fart1.ogg rename to src/main/resources/assets/openblocks/sound/fart1.ogg diff --git a/assets/openblocks/sound/fart2.ogg b/src/main/resources/assets/openblocks/sound/fart2.ogg similarity index 100% rename from assets/openblocks/sound/fart2.ogg rename to src/main/resources/assets/openblocks/sound/fart2.ogg diff --git a/assets/openblocks/sound/fart3.ogg b/src/main/resources/assets/openblocks/sound/fart3.ogg similarity index 100% rename from assets/openblocks/sound/fart3.ogg rename to src/main/resources/assets/openblocks/sound/fart3.ogg diff --git a/assets/openblocks/sound/fart4.ogg b/src/main/resources/assets/openblocks/sound/fart4.ogg similarity index 100% rename from assets/openblocks/sound/fart4.ogg rename to src/main/resources/assets/openblocks/sound/fart4.ogg diff --git a/assets/openblocks/sound/feet.ogg b/src/main/resources/assets/openblocks/sound/feet.ogg similarity index 100% rename from assets/openblocks/sound/feet.ogg rename to src/main/resources/assets/openblocks/sound/feet.ogg diff --git a/assets/openblocks/sound/fill.ogg b/src/main/resources/assets/openblocks/sound/fill.ogg similarity index 100% rename from assets/openblocks/sound/fill.ogg rename to src/main/resources/assets/openblocks/sound/fill.ogg diff --git a/assets/openblocks/sound/mortar.ogg b/src/main/resources/assets/openblocks/sound/mortar.ogg similarity index 100% rename from assets/openblocks/sound/mortar.ogg rename to src/main/resources/assets/openblocks/sound/mortar.ogg diff --git a/assets/openblocks/sound/mosquito.ogg b/src/main/resources/assets/openblocks/sound/mosquito.ogg similarity index 100% rename from assets/openblocks/sound/mosquito.ogg rename to src/main/resources/assets/openblocks/sound/mosquito.ogg diff --git a/assets/openblocks/sound/open.ogg b/src/main/resources/assets/openblocks/sound/open.ogg similarity index 100% rename from assets/openblocks/sound/open.ogg rename to src/main/resources/assets/openblocks/sound/open.ogg diff --git a/assets/openblocks/sound/radio.ogg b/src/main/resources/assets/openblocks/sound/radio.ogg similarity index 100% rename from assets/openblocks/sound/radio.ogg rename to src/main/resources/assets/openblocks/sound/radio.ogg diff --git a/assets/openblocks/sound/scan.ogg b/src/main/resources/assets/openblocks/sound/scan.ogg similarity index 100% rename from assets/openblocks/sound/scan.ogg rename to src/main/resources/assets/openblocks/sound/scan.ogg diff --git a/assets/openblocks/sound/slowpokenom.ogg b/src/main/resources/assets/openblocks/sound/slowpokenom.ogg similarity index 100% rename from assets/openblocks/sound/slowpokenom.ogg rename to src/main/resources/assets/openblocks/sound/slowpokenom.ogg diff --git a/assets/openblocks/sound/teleport.ogg b/src/main/resources/assets/openblocks/sound/teleport.ogg similarity index 100% rename from assets/openblocks/sound/teleport.ogg rename to src/main/resources/assets/openblocks/sound/teleport.ogg diff --git a/assets/openblocks/sound/vibrate.ogg b/src/main/resources/assets/openblocks/sound/vibrate.ogg old mode 100755 new mode 100644 similarity index 100% rename from assets/openblocks/sound/vibrate.ogg rename to src/main/resources/assets/openblocks/sound/vibrate.ogg diff --git a/assets/openblocks/sound/wipe.ogg b/src/main/resources/assets/openblocks/sound/wipe.ogg similarity index 100% rename from assets/openblocks/sound/wipe.ogg rename to src/main/resources/assets/openblocks/sound/wipe.ogg diff --git a/assets/openblocks/textures/blocks/autoanvil.png b/src/main/resources/assets/openblocks/textures/blocks/autoanvil.png similarity index 100% rename from assets/openblocks/textures/blocks/autoanvil.png rename to src/main/resources/assets/openblocks/textures/blocks/autoanvil.png diff --git a/assets/openblocks/textures/blocks/autoenchantmenttable.png b/src/main/resources/assets/openblocks/textures/blocks/autoenchantmenttable.png similarity index 100% rename from assets/openblocks/textures/blocks/autoenchantmenttable.png rename to src/main/resources/assets/openblocks/textures/blocks/autoenchantmenttable.png diff --git a/assets/openblocks/textures/blocks/autoenchantmenttable_bottom.png b/src/main/resources/assets/openblocks/textures/blocks/autoenchantmenttable_bottom.png similarity index 100% rename from assets/openblocks/textures/blocks/autoenchantmenttable_bottom.png rename to src/main/resources/assets/openblocks/textures/blocks/autoenchantmenttable_bottom.png diff --git a/assets/openblocks/textures/blocks/autoenchantmenttable_top.png b/src/main/resources/assets/openblocks/textures/blocks/autoenchantmenttable_top.png similarity index 100% rename from assets/openblocks/textures/blocks/autoenchantmenttable_top.png rename to src/main/resources/assets/openblocks/textures/blocks/autoenchantmenttable_top.png diff --git a/assets/openblocks/textures/blocks/autoenchantmenttable_top.png.mcmeta b/src/main/resources/assets/openblocks/textures/blocks/autoenchantmenttable_top.png.mcmeta similarity index 100% rename from assets/openblocks/textures/blocks/autoenchantmenttable_top.png.mcmeta rename to src/main/resources/assets/openblocks/textures/blocks/autoenchantmenttable_top.png.mcmeta diff --git a/assets/openblocks/textures/blocks/beartrap.png b/src/main/resources/assets/openblocks/textures/blocks/beartrap.png similarity index 100% rename from assets/openblocks/textures/blocks/beartrap.png rename to src/main/resources/assets/openblocks/textures/blocks/beartrap.png diff --git a/assets/openblocks/textures/blocks/bigbutton.png b/src/main/resources/assets/openblocks/textures/blocks/bigbutton.png similarity index 100% rename from assets/openblocks/textures/blocks/bigbutton.png rename to src/main/resources/assets/openblocks/textures/blocks/bigbutton.png diff --git a/assets/openblocks/textures/blocks/blockBreaker.png b/src/main/resources/assets/openblocks/textures/blocks/blockBreaker.png similarity index 100% rename from assets/openblocks/textures/blocks/blockBreaker.png rename to src/main/resources/assets/openblocks/textures/blocks/blockBreaker.png diff --git a/assets/openblocks/textures/blocks/blockBreaker_active.png b/src/main/resources/assets/openblocks/textures/blocks/blockBreaker_active.png similarity index 100% rename from assets/openblocks/textures/blocks/blockBreaker_active.png rename to src/main/resources/assets/openblocks/textures/blocks/blockBreaker_active.png diff --git a/assets/openblocks/textures/blocks/blockBreaker_bottom.png b/src/main/resources/assets/openblocks/textures/blocks/blockBreaker_bottom.png similarity index 100% rename from assets/openblocks/textures/blocks/blockBreaker_bottom.png rename to src/main/resources/assets/openblocks/textures/blocks/blockBreaker_bottom.png diff --git a/assets/openblocks/textures/blocks/blockBreaker_side.png b/src/main/resources/assets/openblocks/textures/blocks/blockBreaker_side.png similarity index 100% rename from assets/openblocks/textures/blocks/blockBreaker_side.png rename to src/main/resources/assets/openblocks/textures/blocks/blockBreaker_side.png diff --git a/assets/openblocks/textures/blocks/blockPlacer.png b/src/main/resources/assets/openblocks/textures/blocks/blockPlacer.png similarity index 100% rename from assets/openblocks/textures/blocks/blockPlacer.png rename to src/main/resources/assets/openblocks/textures/blocks/blockPlacer.png diff --git a/assets/openblocks/textures/blocks/blockPlacer_bottom.png b/src/main/resources/assets/openblocks/textures/blocks/blockPlacer_bottom.png similarity index 100% rename from assets/openblocks/textures/blocks/blockPlacer_bottom.png rename to src/main/resources/assets/openblocks/textures/blocks/blockPlacer_bottom.png diff --git a/assets/openblocks/textures/blocks/blockPlacer_side.png b/src/main/resources/assets/openblocks/textures/blocks/blockPlacer_side.png similarity index 100% rename from assets/openblocks/textures/blocks/blockPlacer_side.png rename to src/main/resources/assets/openblocks/textures/blocks/blockPlacer_side.png diff --git a/assets/openblocks/textures/blocks/cannon.png b/src/main/resources/assets/openblocks/textures/blocks/cannon.png similarity index 100% rename from assets/openblocks/textures/blocks/cannon.png rename to src/main/resources/assets/openblocks/textures/blocks/cannon.png diff --git a/assets/openblocks/textures/blocks/canvas.png b/src/main/resources/assets/openblocks/textures/blocks/canvas.png similarity index 100% rename from assets/openblocks/textures/blocks/canvas.png rename to src/main/resources/assets/openblocks/textures/blocks/canvas.png diff --git a/assets/openblocks/textures/blocks/canvasglass.png b/src/main/resources/assets/openblocks/textures/blocks/canvasglass.png similarity index 100% rename from assets/openblocks/textures/blocks/canvasglass.png rename to src/main/resources/assets/openblocks/textures/blocks/canvasglass.png diff --git a/assets/openblocks/textures/blocks/crayonBlock.png b/src/main/resources/assets/openblocks/textures/blocks/crayonBlock.png similarity index 100% rename from assets/openblocks/textures/blocks/crayonBlock.png rename to src/main/resources/assets/openblocks/textures/blocks/crayonBlock.png diff --git a/assets/openblocks/textures/blocks/crayonHalfPanel.png b/src/main/resources/assets/openblocks/textures/blocks/crayonHalfPanel.png similarity index 100% rename from assets/openblocks/textures/blocks/crayonHalfPanel.png rename to src/main/resources/assets/openblocks/textures/blocks/crayonHalfPanel.png diff --git a/assets/openblocks/textures/blocks/crayonPanel.png b/src/main/resources/assets/openblocks/textures/blocks/crayonPanel.png similarity index 100% rename from assets/openblocks/textures/blocks/crayonPanel.png rename to src/main/resources/assets/openblocks/textures/blocks/crayonPanel.png diff --git a/assets/openblocks/textures/blocks/digitalfuse_0.png b/src/main/resources/assets/openblocks/textures/blocks/digitalfuse_0.png similarity index 100% rename from assets/openblocks/textures/blocks/digitalfuse_0.png rename to src/main/resources/assets/openblocks/textures/blocks/digitalfuse_0.png diff --git a/assets/openblocks/textures/blocks/digitalfuse_1.png b/src/main/resources/assets/openblocks/textures/blocks/digitalfuse_1.png similarity index 100% rename from assets/openblocks/textures/blocks/digitalfuse_1.png rename to src/main/resources/assets/openblocks/textures/blocks/digitalfuse_1.png diff --git a/assets/openblocks/textures/blocks/digitalfuse_2.png b/src/main/resources/assets/openblocks/textures/blocks/digitalfuse_2.png similarity index 100% rename from assets/openblocks/textures/blocks/digitalfuse_2.png rename to src/main/resources/assets/openblocks/textures/blocks/digitalfuse_2.png diff --git a/assets/openblocks/textures/blocks/digitalfuse_3.png b/src/main/resources/assets/openblocks/textures/blocks/digitalfuse_3.png similarity index 100% rename from assets/openblocks/textures/blocks/digitalfuse_3.png rename to src/main/resources/assets/openblocks/textures/blocks/digitalfuse_3.png diff --git a/assets/openblocks/textures/blocks/digitalfuse_4.png b/src/main/resources/assets/openblocks/textures/blocks/digitalfuse_4.png similarity index 100% rename from assets/openblocks/textures/blocks/digitalfuse_4.png rename to src/main/resources/assets/openblocks/textures/blocks/digitalfuse_4.png diff --git a/assets/openblocks/textures/blocks/digitalfuse_5.png b/src/main/resources/assets/openblocks/textures/blocks/digitalfuse_5.png similarity index 100% rename from assets/openblocks/textures/blocks/digitalfuse_5.png rename to src/main/resources/assets/openblocks/textures/blocks/digitalfuse_5.png diff --git a/assets/openblocks/textures/blocks/digitalfuse_6.png b/src/main/resources/assets/openblocks/textures/blocks/digitalfuse_6.png similarity index 100% rename from assets/openblocks/textures/blocks/digitalfuse_6.png rename to src/main/resources/assets/openblocks/textures/blocks/digitalfuse_6.png diff --git a/assets/openblocks/textures/blocks/digitalfuse_7.png b/src/main/resources/assets/openblocks/textures/blocks/digitalfuse_7.png similarity index 100% rename from assets/openblocks/textures/blocks/digitalfuse_7.png rename to src/main/resources/assets/openblocks/textures/blocks/digitalfuse_7.png diff --git a/assets/openblocks/textures/blocks/digitalfuse_side.png b/src/main/resources/assets/openblocks/textures/blocks/digitalfuse_side.png similarity index 100% rename from assets/openblocks/textures/blocks/digitalfuse_side.png rename to src/main/resources/assets/openblocks/textures/blocks/digitalfuse_side.png diff --git a/assets/openblocks/textures/blocks/donationstation.png b/src/main/resources/assets/openblocks/textures/blocks/donationstation.png similarity index 100% rename from assets/openblocks/textures/blocks/donationstation.png rename to src/main/resources/assets/openblocks/textures/blocks/donationstation.png diff --git a/assets/openblocks/textures/blocks/drawingtable.png b/src/main/resources/assets/openblocks/textures/blocks/drawingtable.png similarity index 100% rename from assets/openblocks/textures/blocks/drawingtable.png rename to src/main/resources/assets/openblocks/textures/blocks/drawingtable.png diff --git a/assets/openblocks/textures/blocks/drawingtable_front.png b/src/main/resources/assets/openblocks/textures/blocks/drawingtable_front.png similarity index 100% rename from assets/openblocks/textures/blocks/drawingtable_front.png rename to src/main/resources/assets/openblocks/textures/blocks/drawingtable_front.png diff --git a/assets/openblocks/textures/blocks/drawingtable_top.png b/src/main/resources/assets/openblocks/textures/blocks/drawingtable_top.png similarity index 100% rename from assets/openblocks/textures/blocks/drawingtable_top.png rename to src/main/resources/assets/openblocks/textures/blocks/drawingtable_top.png diff --git a/assets/openblocks/textures/blocks/drop_inverted.png b/src/main/resources/assets/openblocks/textures/blocks/drop_inverted.png similarity index 100% rename from assets/openblocks/textures/blocks/drop_inverted.png rename to src/main/resources/assets/openblocks/textures/blocks/drop_inverted.png diff --git a/assets/openblocks/textures/blocks/elevator.png b/src/main/resources/assets/openblocks/textures/blocks/elevator.png similarity index 100% rename from assets/openblocks/textures/blocks/elevator.png rename to src/main/resources/assets/openblocks/textures/blocks/elevator.png diff --git a/assets/openblocks/textures/blocks/fan.png b/src/main/resources/assets/openblocks/textures/blocks/fan.png similarity index 100% rename from assets/openblocks/textures/blocks/fan.png rename to src/main/resources/assets/openblocks/textures/blocks/fan.png diff --git a/assets/openblocks/textures/blocks/flag.png b/src/main/resources/assets/openblocks/textures/blocks/flag.png similarity index 100% rename from assets/openblocks/textures/blocks/flag.png rename to src/main/resources/assets/openblocks/textures/blocks/flag.png diff --git a/assets/openblocks/textures/blocks/grave.png b/src/main/resources/assets/openblocks/textures/blocks/grave.png similarity index 100% rename from assets/openblocks/textures/blocks/grave.png rename to src/main/resources/assets/openblocks/textures/blocks/grave.png diff --git a/assets/openblocks/textures/blocks/guide.png b/src/main/resources/assets/openblocks/textures/blocks/guide.png similarity index 100% rename from assets/openblocks/textures/blocks/guide.png rename to src/main/resources/assets/openblocks/textures/blocks/guide.png diff --git a/assets/openblocks/textures/blocks/guide2.png b/src/main/resources/assets/openblocks/textures/blocks/guide2.png similarity index 100% rename from assets/openblocks/textures/blocks/guide2.png rename to src/main/resources/assets/openblocks/textures/blocks/guide2.png diff --git a/assets/openblocks/textures/blocks/guide_side.png b/src/main/resources/assets/openblocks/textures/blocks/guide_side.png similarity index 100% rename from assets/openblocks/textures/blocks/guide_side.png rename to src/main/resources/assets/openblocks/textures/blocks/guide_side.png diff --git a/assets/openblocks/textures/blocks/heal.png b/src/main/resources/assets/openblocks/textures/blocks/heal.png similarity index 100% rename from assets/openblocks/textures/blocks/heal.png rename to src/main/resources/assets/openblocks/textures/blocks/heal.png diff --git a/assets/openblocks/textures/blocks/itemDropper.png b/src/main/resources/assets/openblocks/textures/blocks/itemDropper.png similarity index 100% rename from assets/openblocks/textures/blocks/itemDropper.png rename to src/main/resources/assets/openblocks/textures/blocks/itemDropper.png diff --git a/assets/openblocks/textures/blocks/itemDropper_down.png b/src/main/resources/assets/openblocks/textures/blocks/itemDropper_down.png similarity index 100% rename from assets/openblocks/textures/blocks/itemDropper_down.png rename to src/main/resources/assets/openblocks/textures/blocks/itemDropper_down.png diff --git a/assets/openblocks/textures/blocks/ladder.png b/src/main/resources/assets/openblocks/textures/blocks/ladder.png similarity index 100% rename from assets/openblocks/textures/blocks/ladder.png rename to src/main/resources/assets/openblocks/textures/blocks/ladder.png diff --git a/assets/openblocks/textures/blocks/lightbox.png b/src/main/resources/assets/openblocks/textures/blocks/lightbox.png similarity index 100% rename from assets/openblocks/textures/blocks/lightbox.png rename to src/main/resources/assets/openblocks/textures/blocks/lightbox.png diff --git a/assets/openblocks/textures/blocks/lightbox_back.png b/src/main/resources/assets/openblocks/textures/blocks/lightbox_back.png similarity index 100% rename from assets/openblocks/textures/blocks/lightbox_back.png rename to src/main/resources/assets/openblocks/textures/blocks/lightbox_back.png diff --git a/assets/openblocks/textures/blocks/magnet_upgrade.png b/src/main/resources/assets/openblocks/textures/blocks/magnet_upgrade.png similarity index 100% rename from assets/openblocks/textures/blocks/magnet_upgrade.png rename to src/main/resources/assets/openblocks/textures/blocks/magnet_upgrade.png diff --git a/assets/openblocks/textures/blocks/paintcan_bottom.png b/src/main/resources/assets/openblocks/textures/blocks/paintcan_bottom.png similarity index 100% rename from assets/openblocks/textures/blocks/paintcan_bottom.png rename to src/main/resources/assets/openblocks/textures/blocks/paintcan_bottom.png diff --git a/assets/openblocks/textures/blocks/paintcan_front.png b/src/main/resources/assets/openblocks/textures/blocks/paintcan_front.png similarity index 100% rename from assets/openblocks/textures/blocks/paintcan_front.png rename to src/main/resources/assets/openblocks/textures/blocks/paintcan_front.png diff --git a/assets/openblocks/textures/blocks/paintcan_left.png b/src/main/resources/assets/openblocks/textures/blocks/paintcan_left.png similarity index 100% rename from assets/openblocks/textures/blocks/paintcan_left.png rename to src/main/resources/assets/openblocks/textures/blocks/paintcan_left.png diff --git a/assets/openblocks/textures/blocks/paintcan_right.png b/src/main/resources/assets/openblocks/textures/blocks/paintcan_right.png similarity index 100% rename from assets/openblocks/textures/blocks/paintcan_right.png rename to src/main/resources/assets/openblocks/textures/blocks/paintcan_right.png diff --git a/assets/openblocks/textures/blocks/paintcan_side.png b/src/main/resources/assets/openblocks/textures/blocks/paintcan_side.png similarity index 100% rename from assets/openblocks/textures/blocks/paintcan_side.png rename to src/main/resources/assets/openblocks/textures/blocks/paintcan_side.png diff --git a/assets/openblocks/textures/blocks/paintcan_side2.png b/src/main/resources/assets/openblocks/textures/blocks/paintcan_side2.png similarity index 100% rename from assets/openblocks/textures/blocks/paintcan_side2.png rename to src/main/resources/assets/openblocks/textures/blocks/paintcan_side2.png diff --git a/assets/openblocks/textures/blocks/paintcan_top.png b/src/main/resources/assets/openblocks/textures/blocks/paintcan_top.png similarity index 100% rename from assets/openblocks/textures/blocks/paintcan_top.png rename to src/main/resources/assets/openblocks/textures/blocks/paintcan_top.png diff --git a/assets/openblocks/textures/blocks/paintmixer.png b/src/main/resources/assets/openblocks/textures/blocks/paintmixer.png similarity index 100% rename from assets/openblocks/textures/blocks/paintmixer.png rename to src/main/resources/assets/openblocks/textures/blocks/paintmixer.png diff --git a/assets/openblocks/textures/blocks/path.png b/src/main/resources/assets/openblocks/textures/blocks/path.png similarity index 100% rename from assets/openblocks/textures/blocks/path.png rename to src/main/resources/assets/openblocks/textures/blocks/path.png diff --git a/assets/openblocks/textures/blocks/pencilBlock.png b/src/main/resources/assets/openblocks/textures/blocks/pencilBlock.png similarity index 100% rename from assets/openblocks/textures/blocks/pencilBlock.png rename to src/main/resources/assets/openblocks/textures/blocks/pencilBlock.png diff --git a/assets/openblocks/textures/blocks/pencilHalfPanel.png b/src/main/resources/assets/openblocks/textures/blocks/pencilHalfPanel.png similarity index 100% rename from assets/openblocks/textures/blocks/pencilHalfPanel.png rename to src/main/resources/assets/openblocks/textures/blocks/pencilHalfPanel.png diff --git a/assets/openblocks/textures/blocks/pencilPanel.png b/src/main/resources/assets/openblocks/textures/blocks/pencilPanel.png similarity index 100% rename from assets/openblocks/textures/blocks/pencilPanel.png rename to src/main/resources/assets/openblocks/textures/blocks/pencilPanel.png diff --git a/assets/openblocks/textures/blocks/projector.png b/src/main/resources/assets/openblocks/textures/blocks/projector.png similarity index 100% rename from assets/openblocks/textures/blocks/projector.png rename to src/main/resources/assets/openblocks/textures/blocks/projector.png diff --git a/assets/openblocks/textures/blocks/radio_back.png b/src/main/resources/assets/openblocks/textures/blocks/radio_back.png similarity index 100% rename from assets/openblocks/textures/blocks/radio_back.png rename to src/main/resources/assets/openblocks/textures/blocks/radio_back.png diff --git a/assets/openblocks/textures/blocks/radio_bottom.png b/src/main/resources/assets/openblocks/textures/blocks/radio_bottom.png similarity index 100% rename from assets/openblocks/textures/blocks/radio_bottom.png rename to src/main/resources/assets/openblocks/textures/blocks/radio_bottom.png diff --git a/assets/openblocks/textures/blocks/radio_front.png b/src/main/resources/assets/openblocks/textures/blocks/radio_front.png similarity index 100% rename from assets/openblocks/textures/blocks/radio_front.png rename to src/main/resources/assets/openblocks/textures/blocks/radio_front.png diff --git a/assets/openblocks/textures/blocks/radio_inside.png b/src/main/resources/assets/openblocks/textures/blocks/radio_inside.png similarity index 100% rename from assets/openblocks/textures/blocks/radio_inside.png rename to src/main/resources/assets/openblocks/textures/blocks/radio_inside.png diff --git a/assets/openblocks/textures/blocks/radio_side.png b/src/main/resources/assets/openblocks/textures/blocks/radio_side.png similarity index 100% rename from assets/openblocks/textures/blocks/radio_side.png rename to src/main/resources/assets/openblocks/textures/blocks/radio_side.png diff --git a/assets/openblocks/textures/blocks/radio_top.png b/src/main/resources/assets/openblocks/textures/blocks/radio_top.png similarity index 100% rename from assets/openblocks/textures/blocks/radio_top.png rename to src/main/resources/assets/openblocks/textures/blocks/radio_top.png diff --git a/assets/openblocks/textures/blocks/ropeladder.png b/src/main/resources/assets/openblocks/textures/blocks/ropeladder.png similarity index 100% rename from assets/openblocks/textures/blocks/ropeladder.png rename to src/main/resources/assets/openblocks/textures/blocks/ropeladder.png diff --git a/assets/openblocks/textures/blocks/sky_inactive.png b/src/main/resources/assets/openblocks/textures/blocks/sky_inactive.png similarity index 100% rename from assets/openblocks/textures/blocks/sky_inactive.png rename to src/main/resources/assets/openblocks/textures/blocks/sky_inactive.png diff --git a/assets/openblocks/textures/blocks/sky_inactive.png.mcmeta b/src/main/resources/assets/openblocks/textures/blocks/sky_inactive.png.mcmeta similarity index 100% rename from assets/openblocks/textures/blocks/sky_inactive.png.mcmeta rename to src/main/resources/assets/openblocks/textures/blocks/sky_inactive.png.mcmeta diff --git a/assets/openblocks/textures/blocks/sponge.png b/src/main/resources/assets/openblocks/textures/blocks/sponge.png similarity index 100% rename from assets/openblocks/textures/blocks/sponge.png rename to src/main/resources/assets/openblocks/textures/blocks/sponge.png diff --git a/assets/openblocks/textures/blocks/sprinkler.png b/src/main/resources/assets/openblocks/textures/blocks/sprinkler.png similarity index 100% rename from assets/openblocks/textures/blocks/sprinkler.png rename to src/main/resources/assets/openblocks/textures/blocks/sprinkler.png diff --git a/assets/openblocks/textures/blocks/stencil_balloon.png b/src/main/resources/assets/openblocks/textures/blocks/stencil_balloon.png similarity index 100% rename from assets/openblocks/textures/blocks/stencil_balloon.png rename to src/main/resources/assets/openblocks/textures/blocks/stencil_balloon.png diff --git a/assets/openblocks/textures/blocks/stencil_border.png b/src/main/resources/assets/openblocks/textures/blocks/stencil_border.png similarity index 100% rename from assets/openblocks/textures/blocks/stencil_border.png rename to src/main/resources/assets/openblocks/textures/blocks/stencil_border.png diff --git a/assets/openblocks/textures/blocks/stencil_corner.png b/src/main/resources/assets/openblocks/textures/blocks/stencil_corner.png similarity index 100% rename from assets/openblocks/textures/blocks/stencil_corner.png rename to src/main/resources/assets/openblocks/textures/blocks/stencil_corner.png diff --git a/assets/openblocks/textures/blocks/stencil_corner2.png b/src/main/resources/assets/openblocks/textures/blocks/stencil_corner2.png similarity index 100% rename from assets/openblocks/textures/blocks/stencil_corner2.png rename to src/main/resources/assets/openblocks/textures/blocks/stencil_corner2.png diff --git a/assets/openblocks/textures/blocks/stencil_corner3.png b/src/main/resources/assets/openblocks/textures/blocks/stencil_corner3.png similarity index 100% rename from assets/openblocks/textures/blocks/stencil_corner3.png rename to src/main/resources/assets/openblocks/textures/blocks/stencil_corner3.png diff --git a/assets/openblocks/textures/blocks/stencil_creeperface.png b/src/main/resources/assets/openblocks/textures/blocks/stencil_creeperface.png similarity index 100% rename from assets/openblocks/textures/blocks/stencil_creeperface.png rename to src/main/resources/assets/openblocks/textures/blocks/stencil_creeperface.png diff --git a/assets/openblocks/textures/blocks/stencil_heart.png b/src/main/resources/assets/openblocks/textures/blocks/stencil_heart.png similarity index 100% rename from assets/openblocks/textures/blocks/stencil_heart.png rename to src/main/resources/assets/openblocks/textures/blocks/stencil_heart.png diff --git a/assets/openblocks/textures/blocks/stencil_heart2.png b/src/main/resources/assets/openblocks/textures/blocks/stencil_heart2.png similarity index 100% rename from assets/openblocks/textures/blocks/stencil_heart2.png rename to src/main/resources/assets/openblocks/textures/blocks/stencil_heart2.png diff --git a/assets/openblocks/textures/blocks/stencil_hole.png b/src/main/resources/assets/openblocks/textures/blocks/stencil_hole.png similarity index 100% rename from assets/openblocks/textures/blocks/stencil_hole.png rename to src/main/resources/assets/openblocks/textures/blocks/stencil_hole.png diff --git a/assets/openblocks/textures/blocks/stencil_music.png b/src/main/resources/assets/openblocks/textures/blocks/stencil_music.png similarity index 100% rename from assets/openblocks/textures/blocks/stencil_music.png rename to src/main/resources/assets/openblocks/textures/blocks/stencil_music.png diff --git a/assets/openblocks/textures/blocks/stencil_spiral.png b/src/main/resources/assets/openblocks/textures/blocks/stencil_spiral.png similarity index 100% rename from assets/openblocks/textures/blocks/stencil_spiral.png rename to src/main/resources/assets/openblocks/textures/blocks/stencil_spiral.png diff --git a/assets/openblocks/textures/blocks/stencil_splat.png b/src/main/resources/assets/openblocks/textures/blocks/stencil_splat.png similarity index 100% rename from assets/openblocks/textures/blocks/stencil_splat.png rename to src/main/resources/assets/openblocks/textures/blocks/stencil_splat.png diff --git a/assets/openblocks/textures/blocks/stencil_storage.png b/src/main/resources/assets/openblocks/textures/blocks/stencil_storage.png similarity index 100% rename from assets/openblocks/textures/blocks/stencil_storage.png rename to src/main/resources/assets/openblocks/textures/blocks/stencil_storage.png diff --git a/assets/openblocks/textures/blocks/stencil_stripes.png b/src/main/resources/assets/openblocks/textures/blocks/stencil_stripes.png similarity index 100% rename from assets/openblocks/textures/blocks/stencil_stripes.png rename to src/main/resources/assets/openblocks/textures/blocks/stencil_stripes.png diff --git a/assets/openblocks/textures/blocks/stencil_thickstripes.png b/src/main/resources/assets/openblocks/textures/blocks/stencil_thickstripes.png similarity index 100% rename from assets/openblocks/textures/blocks/stencil_thickstripes.png rename to src/main/resources/assets/openblocks/textures/blocks/stencil_thickstripes.png diff --git a/assets/openblocks/textures/blocks/stencilcover_balloon.png b/src/main/resources/assets/openblocks/textures/blocks/stencilcover_balloon.png similarity index 100% rename from assets/openblocks/textures/blocks/stencilcover_balloon.png rename to src/main/resources/assets/openblocks/textures/blocks/stencilcover_balloon.png diff --git a/assets/openblocks/textures/blocks/stencilcover_border.png b/src/main/resources/assets/openblocks/textures/blocks/stencilcover_border.png similarity index 100% rename from assets/openblocks/textures/blocks/stencilcover_border.png rename to src/main/resources/assets/openblocks/textures/blocks/stencilcover_border.png diff --git a/assets/openblocks/textures/blocks/stencilcover_corner.png b/src/main/resources/assets/openblocks/textures/blocks/stencilcover_corner.png similarity index 100% rename from assets/openblocks/textures/blocks/stencilcover_corner.png rename to src/main/resources/assets/openblocks/textures/blocks/stencilcover_corner.png diff --git a/assets/openblocks/textures/blocks/stencilcover_corner2.png b/src/main/resources/assets/openblocks/textures/blocks/stencilcover_corner2.png similarity index 100% rename from assets/openblocks/textures/blocks/stencilcover_corner2.png rename to src/main/resources/assets/openblocks/textures/blocks/stencilcover_corner2.png diff --git a/assets/openblocks/textures/blocks/stencilcover_corner3.png b/src/main/resources/assets/openblocks/textures/blocks/stencilcover_corner3.png similarity index 100% rename from assets/openblocks/textures/blocks/stencilcover_corner3.png rename to src/main/resources/assets/openblocks/textures/blocks/stencilcover_corner3.png diff --git a/assets/openblocks/textures/blocks/stencilcover_creeperface.png b/src/main/resources/assets/openblocks/textures/blocks/stencilcover_creeperface.png similarity index 100% rename from assets/openblocks/textures/blocks/stencilcover_creeperface.png rename to src/main/resources/assets/openblocks/textures/blocks/stencilcover_creeperface.png diff --git a/assets/openblocks/textures/blocks/stencilcover_heart.png b/src/main/resources/assets/openblocks/textures/blocks/stencilcover_heart.png similarity index 100% rename from assets/openblocks/textures/blocks/stencilcover_heart.png rename to src/main/resources/assets/openblocks/textures/blocks/stencilcover_heart.png diff --git a/assets/openblocks/textures/blocks/stencilcover_heart2.png b/src/main/resources/assets/openblocks/textures/blocks/stencilcover_heart2.png similarity index 100% rename from assets/openblocks/textures/blocks/stencilcover_heart2.png rename to src/main/resources/assets/openblocks/textures/blocks/stencilcover_heart2.png diff --git a/assets/openblocks/textures/blocks/stencilcover_hole.png b/src/main/resources/assets/openblocks/textures/blocks/stencilcover_hole.png similarity index 100% rename from assets/openblocks/textures/blocks/stencilcover_hole.png rename to src/main/resources/assets/openblocks/textures/blocks/stencilcover_hole.png diff --git a/assets/openblocks/textures/blocks/stencilcover_music.png b/src/main/resources/assets/openblocks/textures/blocks/stencilcover_music.png similarity index 100% rename from assets/openblocks/textures/blocks/stencilcover_music.png rename to src/main/resources/assets/openblocks/textures/blocks/stencilcover_music.png diff --git a/assets/openblocks/textures/blocks/stencilcover_spiral.png b/src/main/resources/assets/openblocks/textures/blocks/stencilcover_spiral.png similarity index 100% rename from assets/openblocks/textures/blocks/stencilcover_spiral.png rename to src/main/resources/assets/openblocks/textures/blocks/stencilcover_spiral.png diff --git a/assets/openblocks/textures/blocks/stencilcover_splat.png b/src/main/resources/assets/openblocks/textures/blocks/stencilcover_splat.png similarity index 100% rename from assets/openblocks/textures/blocks/stencilcover_splat.png rename to src/main/resources/assets/openblocks/textures/blocks/stencilcover_splat.png diff --git a/assets/openblocks/textures/blocks/stencilcover_storage.png b/src/main/resources/assets/openblocks/textures/blocks/stencilcover_storage.png similarity index 100% rename from assets/openblocks/textures/blocks/stencilcover_storage.png rename to src/main/resources/assets/openblocks/textures/blocks/stencilcover_storage.png diff --git a/assets/openblocks/textures/blocks/stencilcover_stripes.png b/src/main/resources/assets/openblocks/textures/blocks/stencilcover_stripes.png similarity index 100% rename from assets/openblocks/textures/blocks/stencilcover_stripes.png rename to src/main/resources/assets/openblocks/textures/blocks/stencilcover_stripes.png diff --git a/assets/openblocks/textures/blocks/stencilcover_thickstripes.png b/src/main/resources/assets/openblocks/textures/blocks/stencilcover_thickstripes.png similarity index 100% rename from assets/openblocks/textures/blocks/stencilcover_thickstripes.png rename to src/main/resources/assets/openblocks/textures/blocks/stencilcover_thickstripes.png diff --git a/assets/openblocks/textures/blocks/tank.png b/src/main/resources/assets/openblocks/textures/blocks/tank.png similarity index 100% rename from assets/openblocks/textures/blocks/tank.png rename to src/main/resources/assets/openblocks/textures/blocks/tank.png diff --git a/assets/openblocks/textures/blocks/target.png b/src/main/resources/assets/openblocks/textures/blocks/target.png similarity index 100% rename from assets/openblocks/textures/blocks/target.png rename to src/main/resources/assets/openblocks/textures/blocks/target.png diff --git a/assets/openblocks/textures/blocks/trophy.png b/src/main/resources/assets/openblocks/textures/blocks/trophy.png similarity index 100% rename from assets/openblocks/textures/blocks/trophy.png rename to src/main/resources/assets/openblocks/textures/blocks/trophy.png diff --git a/assets/openblocks/textures/blocks/vacuumhopper.png b/src/main/resources/assets/openblocks/textures/blocks/vacuumhopper.png similarity index 100% rename from assets/openblocks/textures/blocks/vacuumhopper.png rename to src/main/resources/assets/openblocks/textures/blocks/vacuumhopper.png diff --git a/assets/openblocks/textures/blocks/village_highlighter.png b/src/main/resources/assets/openblocks/textures/blocks/village_highlighter.png similarity index 100% rename from assets/openblocks/textures/blocks/village_highlighter.png rename to src/main/resources/assets/openblocks/textures/blocks/village_highlighter.png diff --git a/assets/openblocks/textures/blocks/wallpaper.png b/src/main/resources/assets/openblocks/textures/blocks/wallpaper.png similarity index 100% rename from assets/openblocks/textures/blocks/wallpaper.png rename to src/main/resources/assets/openblocks/textures/blocks/wallpaper.png diff --git a/assets/openblocks/textures/blocks/xpbottler_back.png b/src/main/resources/assets/openblocks/textures/blocks/xpbottler_back.png similarity index 100% rename from assets/openblocks/textures/blocks/xpbottler_back.png rename to src/main/resources/assets/openblocks/textures/blocks/xpbottler_back.png diff --git a/assets/openblocks/textures/blocks/xpbottler_bottom.png b/src/main/resources/assets/openblocks/textures/blocks/xpbottler_bottom.png similarity index 100% rename from assets/openblocks/textures/blocks/xpbottler_bottom.png rename to src/main/resources/assets/openblocks/textures/blocks/xpbottler_bottom.png diff --git a/assets/openblocks/textures/blocks/xpbottler_front.png b/src/main/resources/assets/openblocks/textures/blocks/xpbottler_front.png similarity index 100% rename from assets/openblocks/textures/blocks/xpbottler_front.png rename to src/main/resources/assets/openblocks/textures/blocks/xpbottler_front.png diff --git a/assets/openblocks/textures/blocks/xpbottler_sides.png b/src/main/resources/assets/openblocks/textures/blocks/xpbottler_sides.png similarity index 100% rename from assets/openblocks/textures/blocks/xpbottler_sides.png rename to src/main/resources/assets/openblocks/textures/blocks/xpbottler_sides.png diff --git a/assets/openblocks/textures/blocks/xpbottler_top.png b/src/main/resources/assets/openblocks/textures/blocks/xpbottler_top.png similarity index 100% rename from assets/openblocks/textures/blocks/xpbottler_top.png rename to src/main/resources/assets/openblocks/textures/blocks/xpbottler_top.png diff --git a/assets/openblocks/textures/blocks/xpdrain.png b/src/main/resources/assets/openblocks/textures/blocks/xpdrain.png similarity index 100% rename from assets/openblocks/textures/blocks/xpdrain.png rename to src/main/resources/assets/openblocks/textures/blocks/xpdrain.png diff --git a/assets/openblocks/textures/blocks/xpjuiceflowing.png b/src/main/resources/assets/openblocks/textures/blocks/xpjuiceflowing.png similarity index 100% rename from assets/openblocks/textures/blocks/xpjuiceflowing.png rename to src/main/resources/assets/openblocks/textures/blocks/xpjuiceflowing.png diff --git a/assets/openblocks/textures/blocks/xpjuiceflowing.png.mcmeta b/src/main/resources/assets/openblocks/textures/blocks/xpjuiceflowing.png.mcmeta similarity index 100% rename from assets/openblocks/textures/blocks/xpjuiceflowing.png.mcmeta rename to src/main/resources/assets/openblocks/textures/blocks/xpjuiceflowing.png.mcmeta diff --git a/assets/openblocks/textures/blocks/xpjuicestill.png b/src/main/resources/assets/openblocks/textures/blocks/xpjuicestill.png similarity index 100% rename from assets/openblocks/textures/blocks/xpjuicestill.png rename to src/main/resources/assets/openblocks/textures/blocks/xpjuicestill.png diff --git a/assets/openblocks/textures/blocks/xpjuicestill.png.mcmeta b/src/main/resources/assets/openblocks/textures/blocks/xpjuicestill.png.mcmeta similarity index 100% rename from assets/openblocks/textures/blocks/xpjuicestill.png.mcmeta rename to src/main/resources/assets/openblocks/textures/blocks/xpjuicestill.png.mcmeta diff --git a/assets/openblocks/textures/blocks/xpshower.png b/src/main/resources/assets/openblocks/textures/blocks/xpshower.png similarity index 100% rename from assets/openblocks/textures/blocks/xpshower.png rename to src/main/resources/assets/openblocks/textures/blocks/xpshower.png diff --git a/assets/openblocks/textures/gui/bookimage.png b/src/main/resources/assets/openblocks/textures/gui/bookimage.png similarity index 100% rename from assets/openblocks/textures/gui/bookimage.png rename to src/main/resources/assets/openblocks/textures/gui/bookimage.png diff --git a/assets/openblocks/textures/gui/projector.png b/src/main/resources/assets/openblocks/textures/gui/projector.png similarity index 100% rename from assets/openblocks/textures/gui/projector.png rename to src/main/resources/assets/openblocks/textures/gui/projector.png diff --git a/assets/openblocks/textures/items/assistant_base.png b/src/main/resources/assets/openblocks/textures/items/assistant_base.png similarity index 100% rename from assets/openblocks/textures/items/assistant_base.png rename to src/main/resources/assets/openblocks/textures/items/assistant_base.png diff --git a/assets/openblocks/textures/items/assistant_cartographer.png b/src/main/resources/assets/openblocks/textures/items/assistant_cartographer.png similarity index 100% rename from assets/openblocks/textures/items/assistant_cartographer.png rename to src/main/resources/assets/openblocks/textures/items/assistant_cartographer.png diff --git a/assets/openblocks/textures/items/beam.png b/src/main/resources/assets/openblocks/textures/items/beam.png similarity index 100% rename from assets/openblocks/textures/items/beam.png rename to src/main/resources/assets/openblocks/textures/items/beam.png diff --git a/assets/openblocks/textures/items/blood_sample.png b/src/main/resources/assets/openblocks/textures/items/blood_sample.png similarity index 100% rename from assets/openblocks/textures/items/blood_sample.png rename to src/main/resources/assets/openblocks/textures/items/blood_sample.png diff --git a/assets/openblocks/textures/items/crane_backpack.png b/src/main/resources/assets/openblocks/textures/items/crane_backpack.png similarity index 100% rename from assets/openblocks/textures/items/crane_backpack.png rename to src/main/resources/assets/openblocks/textures/items/crane_backpack.png diff --git a/assets/openblocks/textures/items/crane_engine.png b/src/main/resources/assets/openblocks/textures/items/crane_engine.png similarity index 100% rename from assets/openblocks/textures/items/crane_engine.png rename to src/main/resources/assets/openblocks/textures/items/crane_engine.png diff --git a/assets/openblocks/textures/items/crane_magnet.png b/src/main/resources/assets/openblocks/textures/items/crane_magnet.png similarity index 100% rename from assets/openblocks/textures/items/crane_magnet.png rename to src/main/resources/assets/openblocks/textures/items/crane_magnet.png diff --git a/assets/openblocks/textures/items/crayon_1.png b/src/main/resources/assets/openblocks/textures/items/crayon_1.png similarity index 100% rename from assets/openblocks/textures/items/crayon_1.png rename to src/main/resources/assets/openblocks/textures/items/crayon_1.png diff --git a/assets/openblocks/textures/items/crayon_2.png b/src/main/resources/assets/openblocks/textures/items/crayon_2.png similarity index 100% rename from assets/openblocks/textures/items/crayon_2.png rename to src/main/resources/assets/openblocks/textures/items/crayon_2.png diff --git a/assets/openblocks/textures/items/cursor.png b/src/main/resources/assets/openblocks/textures/items/cursor.png similarity index 100% rename from assets/openblocks/textures/items/cursor.png rename to src/main/resources/assets/openblocks/textures/items/cursor.png diff --git a/assets/openblocks/textures/items/devfull.png b/src/main/resources/assets/openblocks/textures/items/devfull.png old mode 100755 new mode 100644 similarity index 100% rename from assets/openblocks/textures/items/devfull.png rename to src/main/resources/assets/openblocks/textures/items/devfull.png diff --git a/assets/openblocks/textures/items/devnull.png b/src/main/resources/assets/openblocks/textures/items/devnull.png similarity index 100% rename from assets/openblocks/textures/items/devnull.png rename to src/main/resources/assets/openblocks/textures/items/devnull.png diff --git a/assets/openblocks/textures/items/empty_map.png b/src/main/resources/assets/openblocks/textures/items/empty_map.png similarity index 100% rename from assets/openblocks/textures/items/empty_map.png rename to src/main/resources/assets/openblocks/textures/items/empty_map.png diff --git a/assets/openblocks/textures/items/glasses_admin.png b/src/main/resources/assets/openblocks/textures/items/glasses_admin.png similarity index 100% rename from assets/openblocks/textures/items/glasses_admin.png rename to src/main/resources/assets/openblocks/textures/items/glasses_admin.png diff --git a/assets/openblocks/textures/items/glasses_crayon.png b/src/main/resources/assets/openblocks/textures/items/glasses_crayon.png similarity index 100% rename from assets/openblocks/textures/items/glasses_crayon.png rename to src/main/resources/assets/openblocks/textures/items/glasses_crayon.png diff --git a/assets/openblocks/textures/items/glasses_pencil.png b/src/main/resources/assets/openblocks/textures/items/glasses_pencil.png similarity index 100% rename from assets/openblocks/textures/items/glasses_pencil.png rename to src/main/resources/assets/openblocks/textures/items/glasses_pencil.png diff --git a/assets/openblocks/textures/items/glasses_technicolor.png b/src/main/resources/assets/openblocks/textures/items/glasses_technicolor.png similarity index 100% rename from assets/openblocks/textures/items/glasses_technicolor.png rename to src/main/resources/assets/openblocks/textures/items/glasses_technicolor.png diff --git a/assets/openblocks/textures/items/gliderwing.png b/src/main/resources/assets/openblocks/textures/items/gliderwing.png similarity index 100% rename from assets/openblocks/textures/items/gliderwing.png rename to src/main/resources/assets/openblocks/textures/items/gliderwing.png diff --git a/assets/openblocks/textures/items/golden_eye.png b/src/main/resources/assets/openblocks/textures/items/golden_eye.png similarity index 100% rename from assets/openblocks/textures/items/golden_eye.png rename to src/main/resources/assets/openblocks/textures/items/golden_eye.png diff --git a/assets/openblocks/textures/items/hangglider.png b/src/main/resources/assets/openblocks/textures/items/hangglider.png similarity index 100% rename from assets/openblocks/textures/items/hangglider.png rename to src/main/resources/assets/openblocks/textures/items/hangglider.png diff --git a/assets/openblocks/textures/items/height_map.png b/src/main/resources/assets/openblocks/textures/items/height_map.png similarity index 100% rename from assets/openblocks/textures/items/height_map.png rename to src/main/resources/assets/openblocks/textures/items/height_map.png diff --git a/assets/openblocks/textures/items/height_map.png.mcmeta b/src/main/resources/assets/openblocks/textures/items/height_map.png.mcmeta similarity index 100% rename from assets/openblocks/textures/items/height_map.png.mcmeta rename to src/main/resources/assets/openblocks/textures/items/height_map.png.mcmeta diff --git a/assets/openblocks/textures/items/info_book.png b/src/main/resources/assets/openblocks/textures/items/info_book.png similarity index 100% rename from assets/openblocks/textures/items/info_book.png rename to src/main/resources/assets/openblocks/textures/items/info_book.png diff --git a/assets/openblocks/textures/items/line.png b/src/main/resources/assets/openblocks/textures/items/line.png similarity index 100% rename from assets/openblocks/textures/items/line.png rename to src/main/resources/assets/openblocks/textures/items/line.png diff --git a/assets/openblocks/textures/items/luggage.png b/src/main/resources/assets/openblocks/textures/items/luggage.png similarity index 100% rename from assets/openblocks/textures/items/luggage.png rename to src/main/resources/assets/openblocks/textures/items/luggage.png diff --git a/assets/openblocks/textures/items/manipulator_detected.png b/src/main/resources/assets/openblocks/textures/items/manipulator_detected.png similarity index 100% rename from assets/openblocks/textures/items/manipulator_detected.png rename to src/main/resources/assets/openblocks/textures/items/manipulator_detected.png diff --git a/assets/openblocks/textures/items/manipulator_detected.png.mcmeta b/src/main/resources/assets/openblocks/textures/items/manipulator_detected.png.mcmeta similarity index 100% rename from assets/openblocks/textures/items/manipulator_detected.png.mcmeta rename to src/main/resources/assets/openblocks/textures/items/manipulator_detected.png.mcmeta diff --git a/assets/openblocks/textures/items/manipulator_down.png b/src/main/resources/assets/openblocks/textures/items/manipulator_down.png similarity index 100% rename from assets/openblocks/textures/items/manipulator_down.png rename to src/main/resources/assets/openblocks/textures/items/manipulator_down.png diff --git a/assets/openblocks/textures/items/manipulator_down.png.mcmeta b/src/main/resources/assets/openblocks/textures/items/manipulator_down.png.mcmeta similarity index 100% rename from assets/openblocks/textures/items/manipulator_down.png.mcmeta rename to src/main/resources/assets/openblocks/textures/items/manipulator_down.png.mcmeta diff --git a/assets/openblocks/textures/items/manipulator_idle.png b/src/main/resources/assets/openblocks/textures/items/manipulator_idle.png similarity index 100% rename from assets/openblocks/textures/items/manipulator_idle.png rename to src/main/resources/assets/openblocks/textures/items/manipulator_idle.png diff --git a/assets/openblocks/textures/items/manipulator_locked.png b/src/main/resources/assets/openblocks/textures/items/manipulator_locked.png similarity index 100% rename from assets/openblocks/textures/items/manipulator_locked.png rename to src/main/resources/assets/openblocks/textures/items/manipulator_locked.png diff --git a/assets/openblocks/textures/items/manipulator_up.png b/src/main/resources/assets/openblocks/textures/items/manipulator_up.png similarity index 100% rename from assets/openblocks/textures/items/manipulator_up.png rename to src/main/resources/assets/openblocks/textures/items/manipulator_up.png diff --git a/assets/openblocks/textures/items/manipulator_up.png.mcmeta b/src/main/resources/assets/openblocks/textures/items/manipulator_up.png.mcmeta similarity index 100% rename from assets/openblocks/textures/items/manipulator_up.png.mcmeta rename to src/main/resources/assets/openblocks/textures/items/manipulator_up.png.mcmeta diff --git a/assets/openblocks/textures/items/map_controller.png b/src/main/resources/assets/openblocks/textures/items/map_controller.png similarity index 100% rename from assets/openblocks/textures/items/map_controller.png rename to src/main/resources/assets/openblocks/textures/items/map_controller.png diff --git a/assets/openblocks/textures/items/map_memory.png b/src/main/resources/assets/openblocks/textures/items/map_memory.png similarity index 100% rename from assets/openblocks/textures/items/map_memory.png rename to src/main/resources/assets/openblocks/textures/items/map_memory.png diff --git a/assets/openblocks/textures/items/overlay_block.png b/src/main/resources/assets/openblocks/textures/items/overlay_block.png similarity index 100% rename from assets/openblocks/textures/items/overlay_block.png rename to src/main/resources/assets/openblocks/textures/items/overlay_block.png diff --git a/assets/openblocks/textures/items/overlay_half.png b/src/main/resources/assets/openblocks/textures/items/overlay_half.png similarity index 100% rename from assets/openblocks/textures/items/overlay_half.png rename to src/main/resources/assets/openblocks/textures/items/overlay_half.png diff --git a/assets/openblocks/textures/items/overlay_inverted_block.png b/src/main/resources/assets/openblocks/textures/items/overlay_inverted_block.png similarity index 100% rename from assets/openblocks/textures/items/overlay_inverted_block.png rename to src/main/resources/assets/openblocks/textures/items/overlay_inverted_block.png diff --git a/assets/openblocks/textures/items/overlay_inverted_half.png b/src/main/resources/assets/openblocks/textures/items/overlay_inverted_half.png similarity index 100% rename from assets/openblocks/textures/items/overlay_inverted_half.png rename to src/main/resources/assets/openblocks/textures/items/overlay_inverted_half.png diff --git a/assets/openblocks/textures/items/overlay_inverted_panel.png b/src/main/resources/assets/openblocks/textures/items/overlay_inverted_panel.png similarity index 100% rename from assets/openblocks/textures/items/overlay_inverted_panel.png rename to src/main/resources/assets/openblocks/textures/items/overlay_inverted_panel.png diff --git a/assets/openblocks/textures/items/overlay_inverted_stairs.png b/src/main/resources/assets/openblocks/textures/items/overlay_inverted_stairs.png similarity index 100% rename from assets/openblocks/textures/items/overlay_inverted_stairs.png rename to src/main/resources/assets/openblocks/textures/items/overlay_inverted_stairs.png diff --git a/assets/openblocks/textures/items/overlay_panel.png b/src/main/resources/assets/openblocks/textures/items/overlay_panel.png similarity index 100% rename from assets/openblocks/textures/items/overlay_panel.png rename to src/main/resources/assets/openblocks/textures/items/overlay_panel.png diff --git a/assets/openblocks/textures/items/overlay_stairs.png b/src/main/resources/assets/openblocks/textures/items/overlay_stairs.png similarity index 100% rename from assets/openblocks/textures/items/overlay_stairs.png rename to src/main/resources/assets/openblocks/textures/items/overlay_stairs.png diff --git a/assets/openblocks/textures/items/paintbrush.png b/src/main/resources/assets/openblocks/textures/items/paintbrush.png similarity index 100% rename from assets/openblocks/textures/items/paintbrush.png rename to src/main/resources/assets/openblocks/textures/items/paintbrush.png diff --git a/assets/openblocks/textures/items/paintbrush_paint.png b/src/main/resources/assets/openblocks/textures/items/paintbrush_paint.png similarity index 100% rename from assets/openblocks/textures/items/paintbrush_paint.png rename to src/main/resources/assets/openblocks/textures/items/paintbrush_paint.png diff --git a/assets/openblocks/textures/items/pencil.png b/src/main/resources/assets/openblocks/textures/items/pencil.png similarity index 100% rename from assets/openblocks/textures/items/pencil.png rename to src/main/resources/assets/openblocks/textures/items/pencil.png diff --git a/assets/openblocks/textures/items/pointer.png b/src/main/resources/assets/openblocks/textures/items/pointer.png similarity index 100% rename from assets/openblocks/textures/items/pointer.png rename to src/main/resources/assets/openblocks/textures/items/pointer.png diff --git a/assets/openblocks/textures/items/sketching_pencil.png b/src/main/resources/assets/openblocks/textures/items/sketching_pencil.png similarity index 100% rename from assets/openblocks/textures/items/sketching_pencil.png rename to src/main/resources/assets/openblocks/textures/items/sketching_pencil.png diff --git a/assets/openblocks/textures/items/sleepingbag.png b/src/main/resources/assets/openblocks/textures/items/sleepingbag.png similarity index 100% rename from assets/openblocks/textures/items/sleepingbag.png rename to src/main/resources/assets/openblocks/textures/items/sleepingbag.png diff --git a/assets/openblocks/textures/items/slimeoff.png b/src/main/resources/assets/openblocks/textures/items/slimeoff.png similarity index 100% rename from assets/openblocks/textures/items/slimeoff.png rename to src/main/resources/assets/openblocks/textures/items/slimeoff.png diff --git a/assets/openblocks/textures/items/slimeon.png b/src/main/resources/assets/openblocks/textures/items/slimeon.png similarity index 100% rename from assets/openblocks/textures/items/slimeon.png rename to src/main/resources/assets/openblocks/textures/items/slimeon.png diff --git a/assets/openblocks/textures/items/sonicglasses.png b/src/main/resources/assets/openblocks/textures/items/sonicglasses.png similarity index 100% rename from assets/openblocks/textures/items/sonicglasses.png rename to src/main/resources/assets/openblocks/textures/items/sonicglasses.png diff --git a/assets/openblocks/textures/items/sound_click.png b/src/main/resources/assets/openblocks/textures/items/sound_click.png similarity index 100% rename from assets/openblocks/textures/items/sound_click.png rename to src/main/resources/assets/openblocks/textures/items/sound_click.png diff --git a/assets/openblocks/textures/items/sound_fizz.png b/src/main/resources/assets/openblocks/textures/items/sound_fizz.png similarity index 100% rename from assets/openblocks/textures/items/sound_fizz.png rename to src/main/resources/assets/openblocks/textures/items/sound_fizz.png diff --git a/assets/openblocks/textures/items/sound_frame.png b/src/main/resources/assets/openblocks/textures/items/sound_frame.png similarity index 100% rename from assets/openblocks/textures/items/sound_frame.png rename to src/main/resources/assets/openblocks/textures/items/sound_frame.png diff --git a/assets/openblocks/textures/items/sound_generic.png b/src/main/resources/assets/openblocks/textures/items/sound_generic.png similarity index 100% rename from assets/openblocks/textures/items/sound_generic.png rename to src/main/resources/assets/openblocks/textures/items/sound_generic.png diff --git a/assets/openblocks/textures/items/sound_liquid.png b/src/main/resources/assets/openblocks/textures/items/sound_liquid.png similarity index 100% rename from assets/openblocks/textures/items/sound_liquid.png rename to src/main/resources/assets/openblocks/textures/items/sound_liquid.png diff --git a/assets/openblocks/textures/items/sound_mob_death.png b/src/main/resources/assets/openblocks/textures/items/sound_mob_death.png similarity index 100% rename from assets/openblocks/textures/items/sound_mob_death.png rename to src/main/resources/assets/openblocks/textures/items/sound_mob_death.png diff --git a/assets/openblocks/textures/items/sound_mob_friendly.png b/src/main/resources/assets/openblocks/textures/items/sound_mob_friendly.png similarity index 100% rename from assets/openblocks/textures/items/sound_mob_friendly.png rename to src/main/resources/assets/openblocks/textures/items/sound_mob_friendly.png diff --git a/assets/openblocks/textures/items/sound_mob_hostile.png b/src/main/resources/assets/openblocks/textures/items/sound_mob_hostile.png similarity index 100% rename from assets/openblocks/textures/items/sound_mob_hostile.png rename to src/main/resources/assets/openblocks/textures/items/sound_mob_hostile.png diff --git a/assets/openblocks/textures/items/sound_mob_hurt.png b/src/main/resources/assets/openblocks/textures/items/sound_mob_hurt.png similarity index 100% rename from assets/openblocks/textures/items/sound_mob_hurt.png rename to src/main/resources/assets/openblocks/textures/items/sound_mob_hurt.png diff --git a/assets/openblocks/textures/items/sound_mob_unknown.png b/src/main/resources/assets/openblocks/textures/items/sound_mob_unknown.png similarity index 100% rename from assets/openblocks/textures/items/sound_mob_unknown.png rename to src/main/resources/assets/openblocks/textures/items/sound_mob_unknown.png diff --git a/assets/openblocks/textures/items/sound_note.png b/src/main/resources/assets/openblocks/textures/items/sound_note.png similarity index 100% rename from assets/openblocks/textures/items/sound_note.png rename to src/main/resources/assets/openblocks/textures/items/sound_note.png diff --git a/assets/openblocks/textures/items/sound_portal.png b/src/main/resources/assets/openblocks/textures/items/sound_portal.png similarity index 100% rename from assets/openblocks/textures/items/sound_portal.png rename to src/main/resources/assets/openblocks/textures/items/sound_portal.png diff --git a/assets/openblocks/textures/items/sound_rain.png b/src/main/resources/assets/openblocks/textures/items/sound_rain.png similarity index 100% rename from assets/openblocks/textures/items/sound_rain.png rename to src/main/resources/assets/openblocks/textures/items/sound_rain.png diff --git a/assets/openblocks/textures/items/sound_unknown.png b/src/main/resources/assets/openblocks/textures/items/sound_unknown.png similarity index 100% rename from assets/openblocks/textures/items/sound_unknown.png rename to src/main/resources/assets/openblocks/textures/items/sound_unknown.png diff --git a/assets/openblocks/textures/items/spongeonastick.png b/src/main/resources/assets/openblocks/textures/items/spongeonastick.png similarity index 100% rename from assets/openblocks/textures/items/spongeonastick.png rename to src/main/resources/assets/openblocks/textures/items/spongeonastick.png diff --git a/assets/openblocks/textures/items/squeegee.png b/src/main/resources/assets/openblocks/textures/items/squeegee.png similarity index 100% rename from assets/openblocks/textures/items/squeegee.png rename to src/main/resources/assets/openblocks/textures/items/squeegee.png diff --git a/assets/openblocks/textures/items/syringe.png b/src/main/resources/assets/openblocks/textures/items/syringe.png similarity index 100% rename from assets/openblocks/textures/items/syringe.png rename to src/main/resources/assets/openblocks/textures/items/syringe.png diff --git a/assets/openblocks/textures/items/tuned_crystal_1.png b/src/main/resources/assets/openblocks/textures/items/tuned_crystal_1.png similarity index 100% rename from assets/openblocks/textures/items/tuned_crystal_1.png rename to src/main/resources/assets/openblocks/textures/items/tuned_crystal_1.png diff --git a/assets/openblocks/textures/items/tuned_crystal_2.png b/src/main/resources/assets/openblocks/textures/items/tuned_crystal_2.png similarity index 100% rename from assets/openblocks/textures/items/tuned_crystal_2.png rename to src/main/resources/assets/openblocks/textures/items/tuned_crystal_2.png diff --git a/assets/openblocks/textures/items/unprepared_stencil.png b/src/main/resources/assets/openblocks/textures/items/unprepared_stencil.png similarity index 100% rename from assets/openblocks/textures/items/unprepared_stencil.png rename to src/main/resources/assets/openblocks/textures/items/unprepared_stencil.png diff --git a/assets/openblocks/textures/items/wallpaper.png b/src/main/resources/assets/openblocks/textures/items/wallpaper.png similarity index 100% rename from assets/openblocks/textures/items/wallpaper.png rename to src/main/resources/assets/openblocks/textures/items/wallpaper.png diff --git a/assets/openblocks/textures/items/xpbucket.png b/src/main/resources/assets/openblocks/textures/items/xpbucket.png similarity index 100% rename from assets/openblocks/textures/items/xpbucket.png rename to src/main/resources/assets/openblocks/textures/items/xpbucket.png diff --git a/assets/openblocks/textures/items/yum_yum.png b/src/main/resources/assets/openblocks/textures/items/yum_yum.png similarity index 100% rename from assets/openblocks/textures/items/yum_yum.png rename to src/main/resources/assets/openblocks/textures/items/yum_yum.png diff --git a/assets/openblocks/textures/misc/glasses_obsidian.png b/src/main/resources/assets/openblocks/textures/misc/glasses_obsidian.png similarity index 100% rename from assets/openblocks/textures/misc/glasses_obsidian.png rename to src/main/resources/assets/openblocks/textures/misc/glasses_obsidian.png diff --git a/assets/openblocks/textures/models/autoanvil.png b/src/main/resources/assets/openblocks/textures/models/autoanvil.png similarity index 100% rename from assets/openblocks/textures/models/autoanvil.png rename to src/main/resources/assets/openblocks/textures/models/autoanvil.png diff --git a/assets/openblocks/textures/models/beartrap.png b/src/main/resources/assets/openblocks/textures/models/beartrap.png similarity index 100% rename from assets/openblocks/textures/models/beartrap.png rename to src/main/resources/assets/openblocks/textures/models/beartrap.png diff --git a/assets/openblocks/textures/models/bigbutton.png b/src/main/resources/assets/openblocks/textures/models/bigbutton.png similarity index 100% rename from assets/openblocks/textures/models/bigbutton.png rename to src/main/resources/assets/openblocks/textures/models/bigbutton.png diff --git a/assets/openblocks/textures/models/blockframe.png b/src/main/resources/assets/openblocks/textures/models/blockframe.png similarity index 100% rename from assets/openblocks/textures/models/blockframe.png rename to src/main/resources/assets/openblocks/textures/models/blockframe.png diff --git a/assets/openblocks/textures/models/cannon.png b/src/main/resources/assets/openblocks/textures/models/cannon.png similarity index 100% rename from assets/openblocks/textures/models/cannon.png rename to src/main/resources/assets/openblocks/textures/models/cannon.png diff --git a/assets/openblocks/textures/models/cartographer.png b/src/main/resources/assets/openblocks/textures/models/cartographer.png similarity index 100% rename from assets/openblocks/textures/models/cartographer.png rename to src/main/resources/assets/openblocks/textures/models/cartographer.png diff --git a/assets/openblocks/textures/models/crane.png b/src/main/resources/assets/openblocks/textures/models/crane.png similarity index 100% rename from assets/openblocks/textures/models/crane.png rename to src/main/resources/assets/openblocks/textures/models/crane.png diff --git a/assets/openblocks/textures/models/egg.png b/src/main/resources/assets/openblocks/textures/models/egg.png similarity index 100% rename from assets/openblocks/textures/models/egg.png rename to src/main/resources/assets/openblocks/textures/models/egg.png diff --git a/assets/openblocks/textures/models/fan.png b/src/main/resources/assets/openblocks/textures/models/fan.png similarity index 100% rename from assets/openblocks/textures/models/fan.png rename to src/main/resources/assets/openblocks/textures/models/fan.png diff --git a/assets/openblocks/textures/models/flag.png b/src/main/resources/assets/openblocks/textures/models/flag.png similarity index 100% rename from assets/openblocks/textures/models/flag.png rename to src/main/resources/assets/openblocks/textures/models/flag.png diff --git a/assets/openblocks/textures/models/flagpole.png b/src/main/resources/assets/openblocks/textures/models/flagpole.png similarity index 100% rename from assets/openblocks/textures/models/flagpole.png rename to src/main/resources/assets/openblocks/textures/models/flagpole.png diff --git a/assets/openblocks/textures/models/glasses.png b/src/main/resources/assets/openblocks/textures/models/glasses.png similarity index 100% rename from assets/openblocks/textures/models/glasses.png rename to src/main/resources/assets/openblocks/textures/models/glasses.png diff --git a/assets/openblocks/textures/models/glasses_admin.png b/src/main/resources/assets/openblocks/textures/models/glasses_admin.png similarity index 100% rename from assets/openblocks/textures/models/glasses_admin.png rename to src/main/resources/assets/openblocks/textures/models/glasses_admin.png diff --git a/assets/openblocks/textures/models/glasses_crayon.png b/src/main/resources/assets/openblocks/textures/models/glasses_crayon.png similarity index 100% rename from assets/openblocks/textures/models/glasses_crayon.png rename to src/main/resources/assets/openblocks/textures/models/glasses_crayon.png diff --git a/assets/openblocks/textures/models/glasses_crayon_overlay.png b/src/main/resources/assets/openblocks/textures/models/glasses_crayon_overlay.png similarity index 100% rename from assets/openblocks/textures/models/glasses_crayon_overlay.png rename to src/main/resources/assets/openblocks/textures/models/glasses_crayon_overlay.png diff --git a/assets/openblocks/textures/models/glasses_pencil.png b/src/main/resources/assets/openblocks/textures/models/glasses_pencil.png similarity index 100% rename from assets/openblocks/textures/models/glasses_pencil.png rename to src/main/resources/assets/openblocks/textures/models/glasses_pencil.png diff --git a/assets/openblocks/textures/models/glasses_technicolor.png b/src/main/resources/assets/openblocks/textures/models/glasses_technicolor.png similarity index 100% rename from assets/openblocks/textures/models/glasses_technicolor.png rename to src/main/resources/assets/openblocks/textures/models/glasses_technicolor.png diff --git a/assets/openblocks/textures/models/grave.png b/src/main/resources/assets/openblocks/textures/models/grave.png similarity index 100% rename from assets/openblocks/textures/models/grave.png rename to src/main/resources/assets/openblocks/textures/models/grave.png diff --git a/assets/openblocks/textures/models/hangglider.png b/src/main/resources/assets/openblocks/textures/models/hangglider.png similarity index 100% rename from assets/openblocks/textures/models/hangglider.png rename to src/main/resources/assets/openblocks/textures/models/hangglider.png diff --git a/assets/openblocks/textures/models/king-ish.png b/src/main/resources/assets/openblocks/textures/models/king-ish.png similarity index 100% rename from assets/openblocks/textures/models/king-ish.png rename to src/main/resources/assets/openblocks/textures/models/king-ish.png diff --git a/assets/openblocks/textures/models/luggage.png b/src/main/resources/assets/openblocks/textures/models/luggage.png similarity index 100% rename from assets/openblocks/textures/models/luggage.png rename to src/main/resources/assets/openblocks/textures/models/luggage.png diff --git a/assets/openblocks/textures/models/luggage_special.png b/src/main/resources/assets/openblocks/textures/models/luggage_special.png similarity index 100% rename from assets/openblocks/textures/models/luggage_special.png rename to src/main/resources/assets/openblocks/textures/models/luggage_special.png diff --git a/assets/openblocks/textures/models/magnet.png b/src/main/resources/assets/openblocks/textures/models/magnet.png similarity index 100% rename from assets/openblocks/textures/models/magnet.png rename to src/main/resources/assets/openblocks/textures/models/magnet.png diff --git a/assets/openblocks/textures/models/ore_crusher.png b/src/main/resources/assets/openblocks/textures/models/ore_crusher.png similarity index 100% rename from assets/openblocks/textures/models/ore_crusher.png rename to src/main/resources/assets/openblocks/textures/models/ore_crusher.png diff --git a/assets/openblocks/textures/models/paintmixer.png b/src/main/resources/assets/openblocks/textures/models/paintmixer.png similarity index 100% rename from assets/openblocks/textures/models/paintmixer.png rename to src/main/resources/assets/openblocks/textures/models/paintmixer.png diff --git a/assets/openblocks/textures/models/piggy.png b/src/main/resources/assets/openblocks/textures/models/piggy.png similarity index 100% rename from assets/openblocks/textures/models/piggy.png rename to src/main/resources/assets/openblocks/textures/models/piggy.png diff --git a/assets/openblocks/textures/models/projector.png b/src/main/resources/assets/openblocks/textures/models/projector.png similarity index 100% rename from assets/openblocks/textures/models/projector.png rename to src/main/resources/assets/openblocks/textures/models/projector.png diff --git a/assets/openblocks/textures/models/sleepingbag.png b/src/main/resources/assets/openblocks/textures/models/sleepingbag.png similarity index 100% rename from assets/openblocks/textures/models/sleepingbag.png rename to src/main/resources/assets/openblocks/textures/models/sleepingbag.png diff --git a/assets/openblocks/textures/models/sprinkler.png b/src/main/resources/assets/openblocks/textures/models/sprinkler.png similarity index 100% rename from assets/openblocks/textures/models/sprinkler.png rename to src/main/resources/assets/openblocks/textures/models/sprinkler.png diff --git a/assets/openblocks/textures/models/target.png b/src/main/resources/assets/openblocks/textures/models/target.png similarity index 100% rename from assets/openblocks/textures/models/target.png rename to src/main/resources/assets/openblocks/textures/models/target.png diff --git a/assets/openblocks/textures/models/vacuumhopper.png b/src/main/resources/assets/openblocks/textures/models/vacuumhopper.png similarity index 100% rename from assets/openblocks/textures/models/vacuumhopper.png rename to src/main/resources/assets/openblocks/textures/models/vacuumhopper.png diff --git a/assets/openblocks/textures/models/valve.png b/src/main/resources/assets/openblocks/textures/models/valve.png similarity index 100% rename from assets/openblocks/textures/models/valve.png rename to src/main/resources/assets/openblocks/textures/models/valve.png diff --git a/assets/openblocks/textures/models/village.png b/src/main/resources/assets/openblocks/textures/models/village.png similarity index 100% rename from assets/openblocks/textures/models/village.png rename to src/main/resources/assets/openblocks/textures/models/village.png diff --git a/assets/openblocks/textures/models/xpshower.png b/src/main/resources/assets/openblocks/textures/models/xpshower.png similarity index 100% rename from assets/openblocks/textures/models/xpshower.png rename to src/main/resources/assets/openblocks/textures/models/xpshower.png diff --git a/changelogs/openblocks/changelogs/1.2.5 b/src/main/resources/changelogs/openblocks/changelogs/1.2.5 similarity index 100% rename from changelogs/openblocks/changelogs/1.2.5 rename to src/main/resources/changelogs/openblocks/changelogs/1.2.5 diff --git a/changelogs/openblocks/changelogs/1.2.6 b/src/main/resources/changelogs/openblocks/changelogs/1.2.6 similarity index 100% rename from changelogs/openblocks/changelogs/1.2.6 rename to src/main/resources/changelogs/openblocks/changelogs/1.2.6 diff --git a/changelogs/openblocks/changelogs/1.2.7 b/src/main/resources/changelogs/openblocks/changelogs/1.2.7 similarity index 100% rename from changelogs/openblocks/changelogs/1.2.7 rename to src/main/resources/changelogs/openblocks/changelogs/1.2.7 diff --git a/mcmod.info b/src/main/resources/mcmod.info similarity index 100% rename from mcmod.info rename to src/main/resources/mcmod.info diff --git a/pack.mcmeta b/src/main/resources/pack.mcmeta similarity index 100% rename from pack.mcmeta rename to src/main/resources/pack.mcmeta