diff --git a/.gitignore b/.gitignore new file mode 100755 index 0000000..a956e7a --- /dev/null +++ b/.gitignore @@ -0,0 +1,16 @@ +.gradle/ +.nb-gradle/ +.settings/ +build/ +eclipse/ +.classpath +.nb-gradle-properties +.project +*.launch +run/ +*.iml +*.ipr +*.iws +.idea/ +out/ +translation-diff.diff \ No newline at end of file diff --git a/LICENSE.md b/LICENSE.md new file mode 100755 index 0000000..f714ecc --- /dev/null +++ b/LICENSE.md @@ -0,0 +1,24 @@ +# The MIT License (MIT) + +Copyright © 2017 raoulvdberge + +Permission is hereby granted, free of charge, to any person +obtaining a copy of this software and associated documentation +files (the “Software”), to deal in the Software without +restriction, including without limitation the rights to use, +copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following +conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES +OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT +HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +OTHER DEALINGS IN THE SOFTWARE. diff --git a/README.md b/README.md new file mode 100755 index 0000000..af78ff3 --- /dev/null +++ b/README.md @@ -0,0 +1,2 @@ +# Spawner Imbuer +Allows mob spawners to run even if there are no players in range. \ No newline at end of file diff --git a/build.gradle b/build.gradle new file mode 100755 index 0000000..8a14625 --- /dev/null +++ b/build.gradle @@ -0,0 +1,34 @@ +buildscript { + repositories { + jcenter() + maven { url = "http://files.minecraftforge.net/maven" } + } + dependencies { + classpath 'net.minecraftforge.gradle:ForgeGradle:2.2-SNAPSHOT' + } +} +apply plugin: 'net.minecraftforge.gradle.forge' + +version = "0.1" +group = "spawnerimbuer" +archivesBaseName = "spawnerimbuer" + +sourceCompatibility = targetCompatibility = "1.6" +compileJava { + sourceCompatibility = targetCompatibility = "1.6" +} + +minecraft { + version = "1.11.2-13.20.0.2252" + runDir = "run" + mappings = "snapshot_20161220" +} + +jar { + manifest { + attributes 'FMLCorePlugin': 'com.raoulvdberge.spawnerimbuer.SpawnerImbuer' + } +} + +dependencies { +} \ No newline at end of file diff --git a/gradle.properties b/gradle.properties new file mode 100755 index 0000000..e9b9fd5 --- /dev/null +++ b/gradle.properties @@ -0,0 +1,3 @@ +# Sets default memory used for gradle commands. Can be overridden by user or command line properties. +# This is required to provide enough memory for the Minecraft decompilation process. +org.gradle.jvmargs=-Xmx3G diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100755 index 0000000..30d399d 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 100755 index 0000000..e18cba7 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Mon Sep 14 12:28:28 PDT 2015 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-2.14-bin.zip diff --git a/gradlew b/gradlew new file mode 100755 index 0000000..91a7e26 --- /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 "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100755 index 0000000..8a0b282 --- /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 diff --git a/logo.png b/logo.png new file mode 100755 index 0000000..47113d8 Binary files /dev/null and b/logo.png differ diff --git a/src/main/java/com/raoulvdberge/spawnerimbuer/SpawnerImbuer.java b/src/main/java/com/raoulvdberge/spawnerimbuer/SpawnerImbuer.java new file mode 100755 index 0000000..fcf13c4 --- /dev/null +++ b/src/main/java/com/raoulvdberge/spawnerimbuer/SpawnerImbuer.java @@ -0,0 +1,41 @@ +package com.raoulvdberge.spawnerimbuer; + +import net.minecraftforge.fml.relauncher.IFMLLoadingPlugin; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +import javax.annotation.Nullable; +import java.util.Map; + +@IFMLLoadingPlugin.Name("SpawnerImbuer Coremod") +public class SpawnerImbuer implements IFMLLoadingPlugin { + static final Logger LOGGER = LogManager.getLogger("SpawnerImbuer"); + + @Override + public String[] getASMTransformerClass() { + return new String[]{ + "com.raoulvdberge.spawnerimbuer.SpawnerImbuerTransformer" + }; + } + + @Override + public String getModContainerClass() { + return "com.raoulvdberge.spawnerimbuer.SpawnerImbuerContainer"; + } + + @Nullable + @Override + public String getSetupClass() { + return null; + } + + @Override + public void injectData(Map data) { + // NO OP + } + + @Override + public String getAccessTransformerClass() { + return null; + } +} diff --git a/src/main/java/com/raoulvdberge/spawnerimbuer/SpawnerImbuerContainer.java b/src/main/java/com/raoulvdberge/spawnerimbuer/SpawnerImbuerContainer.java new file mode 100755 index 0000000..d0200e5 --- /dev/null +++ b/src/main/java/com/raoulvdberge/spawnerimbuer/SpawnerImbuerContainer.java @@ -0,0 +1,36 @@ +package com.raoulvdberge.spawnerimbuer; + +import com.google.common.collect.ImmutableList; +import com.google.common.eventbus.EventBus; +import net.minecraftforge.fml.common.DummyModContainer; +import net.minecraftforge.fml.common.LoadController; +import net.minecraftforge.fml.common.ModMetadata; + +import java.util.List; + +public class SpawnerImbuerContainer extends DummyModContainer { + private static final ModMetadata metaData; + + public SpawnerImbuerContainer() { + super(metaData); + } + + @Override + public boolean registerBus(EventBus bus, LoadController controller) { + return true; + } + + @Override + public List getOwnedPackages() { + return ImmutableList.of("com.raoulvdberge.spawnerimbuer"); + } + + static { + metaData = new ModMetadata(); + metaData.modId = "spawnerimbuer"; + metaData.name = "Spawner Imbuer"; + metaData.description = "Allows mob spawners to run even if there are no players in range."; + metaData.authorList = ImmutableList.of("raoulvdberge"); + metaData.version = "0.1"; + } +} diff --git a/src/main/java/com/raoulvdberge/spawnerimbuer/SpawnerImbuerTransformer.java b/src/main/java/com/raoulvdberge/spawnerimbuer/SpawnerImbuerTransformer.java new file mode 100755 index 0000000..8d5bd73 --- /dev/null +++ b/src/main/java/com/raoulvdberge/spawnerimbuer/SpawnerImbuerTransformer.java @@ -0,0 +1,64 @@ +package com.raoulvdberge.spawnerimbuer; + +import net.minecraft.launchwrapper.IClassTransformer; +import org.objectweb.asm.*; + +public class SpawnerImbuerTransformer implements IClassTransformer { + private boolean hasInitialized; + + class SpawnerImbuerClassVisitor extends ClassVisitor { + public SpawnerImbuerClassVisitor(int api, ClassVisitor next) { + super(api, next); + } + + @Override + public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) { + if (name.equals("isActivated") || name.equals("h")) { + SpawnerImbuer.LOGGER.info("Found isActivated (h)"); + + return new SpawnerImbuerMethodVisitor(api, cv.visitMethod(access, name, desc, signature, exceptions)); + } else { + return cv.visitMethod(access, name, desc, signature, exceptions); + } + } + } + + class SpawnerImbuerMethodVisitor extends MethodVisitor { + public SpawnerImbuerMethodVisitor(int api, MethodVisitor next) { + super(api, next); + } + + @Override + public void visitInsn(int opcode) { + if (opcode == Opcodes.IRETURN) { + SpawnerImbuer.LOGGER.info("Patching IRETURN"); + + visitIntInsn(Opcodes.BIPUSH, 1); + } + + super.visitInsn(opcode); + } + } + + @Override + public byte[] transform(String name, String transformedName, byte[] data) { + if (!hasInitialized) { + hasInitialized = true; + + SpawnerImbuer.LOGGER.info("ACTIVATED!"); + } + + if (transformedName.equals("net.minecraft.tileentity.MobSpawnerBaseLogic")) { + SpawnerImbuer.LOGGER.info("Found net.minecraft.tileentity.MobSpawnerBaseLogic"); + + final ClassReader reader = new ClassReader(data); + final ClassWriter writer = new ClassWriter(8); + + reader.accept(new SpawnerImbuerClassVisitor(Opcodes.ASM5, writer), 8); + + return writer.toByteArray(); + } + + return data; + } +}