diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..66d25e7 --- /dev/null +++ b/.gitignore @@ -0,0 +1,21 @@ +#Gradle +.gradle/ +build/ +out/ +classes/ + +#IDEA +.idea/ +*.iml +*.ipr +*.iws + +#vscode +.settings/ +.vscode/ +bin/ +.classpath +.project + +#fabric +run/ \ No newline at end of file diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..d8fa74a --- /dev/null +++ b/LICENSE @@ -0,0 +1,21 @@ +The MIT License (MIT) + +Copyright (c) 2020 Linguardium + +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/build.gradle b/build.gradle new file mode 100644 index 0000000..37b0988 --- /dev/null +++ b/build.gradle @@ -0,0 +1,82 @@ +plugins { + id 'fabric-loom' version '0.4-SNAPSHOT' + id 'maven-publish' +} + +sourceCompatibility = JavaVersion.VERSION_1_8 +targetCompatibility = JavaVersion.VERSION_1_8 + +archivesBaseName = project.archives_base_name +version = project.mod_version +group = project.maven_group + +minecraft { +} +repositories { + //maven { url "https://jitpack.io"} +} +dependencies { + //to change the versions see the gradle.properties file + minecraft "com.mojang:minecraft:${project.minecraft_version}" + mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2" + modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" + + modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_api_version}" + //modRuntime "com.github.Linguardium:open2lan:+" +} + +processResources { + inputs.property "version", project.version + + from(sourceSets.main.resources.srcDirs) { + include "fabric.mod.json" + expand "version": project.version + } + + from(sourceSets.main.resources.srcDirs) { + exclude "fabric.mod.json" + } +} + +// ensure that the encoding is set to UTF-8, no matter what the system default is +// this fixes some edge cases with special characters not displaying correctly +// see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html +tasks.withType(JavaCompile) { + options.encoding = "UTF-8" +} + +// Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task +// if it is present. +// If you remove this task, sources will not be generated. +task sourcesJar(type: Jar, dependsOn: classes) { + classifier = "sources" + from sourceSets.main.allSource +} + +jar { + from "LICENSE" +} + +// configure the maven publication +publishing { + publications { + mavenJava(MavenPublication) { + // add all the jars that should be included when publishing to maven + artifact(jar) { + builtBy remapJar + } + artifact("${project.buildDir.absolutePath}/libs/${archivesBaseName}-${project.version}.jar"){ + builtBy remapJar + } + artifact(sourcesJar) { + builtBy remapSourcesJar + } + } + } + + // select the repositories you want to publish to + repositories { + // uncomment to publish to the local maven + // mavenLocal() + } +} \ No newline at end of file diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..f0deee9 --- /dev/null +++ b/gradle.properties @@ -0,0 +1,14 @@ +org.gradle.jvmargs = -Xmx1G + +#Fabric properties +minecraft_version = 1.16.1 +yarn_mappings = 1.16.1+build.21 +loader_version = 0.9.0+build.204 + +#Mod properties +mod_version = 0.0.1 +maven_group = mod.linguardium.mobcapped +archives_base_name = mobcapped + +#Dependencies +fabric_api_version = 0.15.1+build.380-1.16.1 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..5c2d1cf 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 0000000..d95da9b --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Fri Jul 24 00:22:36 PDT 2020 +distributionUrl=https\://services.gradle.org/distributions/gradle-5.5.1-all.zip +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStorePath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew new file mode 100644 index 0000000..8e25e6c --- /dev/null +++ b/gradlew @@ -0,0 +1,188 @@ +#!/usr/bin/env sh + +# +# Copyright 2015 the original author or authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# 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" -a "$nonstop" = "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"` + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + 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 + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=$(save "$@") + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong +if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then + cd "$(dirname "$0")" +fi + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..9618d8d --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,100 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +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 Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_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=%* + +: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/settings.gradle b/settings.gradle new file mode 100644 index 0000000..89fa615 --- /dev/null +++ b/settings.gradle @@ -0,0 +1,10 @@ +pluginManagement { + repositories { + jcenter() + maven { + name = 'Fabric' + url = 'https://maven.fabricmc.net/' + } + gradlePluginPortal() + } +} \ No newline at end of file diff --git a/src/main/java/mod/linguardium/mobcapped/Main.java b/src/main/java/mod/linguardium/mobcapped/Main.java new file mode 100644 index 0000000..cbf60e0 --- /dev/null +++ b/src/main/java/mod/linguardium/mobcapped/Main.java @@ -0,0 +1,27 @@ +package mod.linguardium.mobcapped; + +import net.fabricmc.api.ModInitializer; + +import org.apache.logging.log4j.Level; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +public class Main implements ModInitializer { + + public static Logger LOGGER = LogManager.getLogger(); + + public static final String MOD_ID = "mobcapped"; + public static final String MOD_NAME = "MobCapped"; + + @Override + public void onInitialize() { + NewGameRules.init(); + log(Level.INFO, "Initializing"); + //TODO: Initializer + } + + public static void log(Level level, String message){ + LOGGER.log(level, "["+MOD_NAME+"] " + message); + } + +} \ No newline at end of file diff --git a/src/main/java/mod/linguardium/mobcapped/NewGameRules.java b/src/main/java/mod/linguardium/mobcapped/NewGameRules.java new file mode 100644 index 0000000..91377bd --- /dev/null +++ b/src/main/java/mod/linguardium/mobcapped/NewGameRules.java @@ -0,0 +1,28 @@ +package mod.linguardium.mobcapped; + + +import net.minecraft.world.GameRules; + +public class NewGameRules { + public static String MOBCAP_MONSTERS = "mobCapMonsters"; + public static String MOBCAP_CREATURES = "mobCapCreatures"; + public static String MOBCAP_AMBIENT = "mobCapAmbient"; + public static String MOBCAP_MISC = "mobCapMisc"; + public static String MOBCAP_AQUATIC_CREATURE = "mobCapAquaticCreature"; + public static String MOBCAP_AQUATIC_AMBIENT = "mobCapAquaticAmbient"; + public static String PER_PLAYER_MOBCAP = "mobCapPerPlayer"; + + public static GameRules.Key MOBCAP_MONSTERS_KEY = new GameRules.Key(MOBCAP_MONSTERS, GameRules.Category.MOBS); + public static GameRules.Key MOBCAP_CREATURES_KEY = new GameRules.Key<>(MOBCAP_CREATURES, GameRules.Category.MOBS); + public static GameRules.Key MOBCAP_AMBIENT_KEY = new GameRules.Key(MOBCAP_AMBIENT, GameRules.Category.MOBS); + //public static GameRules.Key MOBCAP_MISC_KEY = new GameRules.Key(MOBCAP_MISC, GameRules.Category.MOBS); + public static GameRules.Key MOBCAP_AQUATIC_CREATURE_KEY = new GameRules.Key(MOBCAP_AQUATIC_CREATURE, GameRules.Category.MOBS); + public static GameRules.Key MOBCAP_AQUATIC_AMBIENT_KEY = new GameRules.Key(MOBCAP_AQUATIC_AMBIENT, GameRules.Category.MOBS); + public static GameRules.Key PER_PLAYER_MOBCAP_KEY = new GameRules.Key(PER_PLAYER_MOBCAP, GameRules.Category.MOBS); + + + public static void init() { + + } + +} diff --git a/src/main/java/mod/linguardium/mobcapped/helpers/SpawnHelperInfoInterface.java b/src/main/java/mod/linguardium/mobcapped/helpers/SpawnHelperInfoInterface.java new file mode 100644 index 0000000..09321d5 --- /dev/null +++ b/src/main/java/mod/linguardium/mobcapped/helpers/SpawnHelperInfoInterface.java @@ -0,0 +1,14 @@ +package mod.linguardium.mobcapped.helpers; + +import net.minecraft.entity.EntityType; +import net.minecraft.entity.SpawnGroup; +import net.minecraft.entity.mob.MobEntity; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.chunk.Chunk; + +public interface SpawnHelperInfoInterface { + public boolean MobCapped$checkBelowMobCap(SpawnGroup spawnGroup); + public boolean MobCapped$isBelowCap$CustomCapacity(SpawnGroup group, int capacity, int chunkArea); + public boolean PublicTest(EntityType type, BlockPos pos, Chunk chunk); + public void PublicRun(MobEntity entity, Chunk chunk); +} diff --git a/src/main/java/mod/linguardium/mobcapped/mixin/BooleanGameRuleAccessor.java b/src/main/java/mod/linguardium/mobcapped/mixin/BooleanGameRuleAccessor.java new file mode 100644 index 0000000..673ee1b --- /dev/null +++ b/src/main/java/mod/linguardium/mobcapped/mixin/BooleanGameRuleAccessor.java @@ -0,0 +1,17 @@ +package mod.linguardium.mobcapped.mixin; + +import net.minecraft.world.GameRules; +import org.apache.commons.lang3.NotImplementedException; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Unique; +import org.spongepowered.asm.mixin.gen.Invoker; + +@Mixin(GameRules.BooleanRule.class) +public interface BooleanGameRuleAccessor { + + @Invoker("create") + public static GameRules.Type MobCapped$create(boolean defaultValue) { + throw new NotImplementedException("Mixin failed"); + } + +} \ No newline at end of file diff --git a/src/main/java/mod/linguardium/mobcapped/mixin/IntegerGameRuleAccessor.java b/src/main/java/mod/linguardium/mobcapped/mixin/IntegerGameRuleAccessor.java new file mode 100644 index 0000000..42f228d --- /dev/null +++ b/src/main/java/mod/linguardium/mobcapped/mixin/IntegerGameRuleAccessor.java @@ -0,0 +1,18 @@ +package mod.linguardium.mobcapped.mixin; + +import org.apache.commons.lang3.NotImplementedException; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Unique; +import org.spongepowered.asm.mixin.gen.Invoker; + +import net.minecraft.world.GameRules; + +@Mixin(GameRules.IntRule.class) +public interface IntegerGameRuleAccessor { + + @Invoker("create") + public static GameRules.Type MobCapped$create(int defaultValue) { + throw new NotImplementedException("Mixin failed"); + } + +} \ No newline at end of file diff --git a/src/main/java/mod/linguardium/mobcapped/mixin/RegisterGameRule.java b/src/main/java/mod/linguardium/mobcapped/mixin/RegisterGameRule.java new file mode 100644 index 0000000..64a1ecf --- /dev/null +++ b/src/main/java/mod/linguardium/mobcapped/mixin/RegisterGameRule.java @@ -0,0 +1,29 @@ +package mod.linguardium.mobcapped.mixin; + +import net.minecraft.world.GameRules; +import org.apache.commons.lang3.NotImplementedException; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Unique; +import org.spongepowered.asm.mixin.gen.Invoker; + +import static mod.linguardium.mobcapped.NewGameRules.*; + + +@Mixin(GameRules.class) +public class RegisterGameRule{ + + @Invoker("register") + public static > GameRules.Key MobCapped$create(String key, GameRules.Category category, GameRules.Type type) { + throw new NotImplementedException("GameRules mixin failed"); + } + static { + MobCapped$create(MOBCAP_MONSTERS, GameRules.Category.MOBS, IntegerGameRuleAccessor.MobCapped$create(70)); + MobCapped$create(MOBCAP_CREATURES, GameRules.Category.MOBS, IntegerGameRuleAccessor.MobCapped$create(10)); + MobCapped$create(MOBCAP_AMBIENT, GameRules.Category.MOBS, IntegerGameRuleAccessor.MobCapped$create(15)); + MobCapped$create(MOBCAP_AQUATIC_CREATURE, GameRules.Category.MOBS, IntegerGameRuleAccessor.MobCapped$create(5)); + MobCapped$create(MOBCAP_AQUATIC_AMBIENT, GameRules.Category.MOBS, IntegerGameRuleAccessor.MobCapped$create(20)); + + MobCapped$create(PER_PLAYER_MOBCAP, GameRules.Category.MOBS, BooleanGameRuleAccessor.MobCapped$create(false)); + + } +} \ No newline at end of file diff --git a/src/main/java/mod/linguardium/mobcapped/mixin/SpawnHelperInfoMixin.java b/src/main/java/mod/linguardium/mobcapped/mixin/SpawnHelperInfoMixin.java new file mode 100644 index 0000000..4bf52d0 --- /dev/null +++ b/src/main/java/mod/linguardium/mobcapped/mixin/SpawnHelperInfoMixin.java @@ -0,0 +1,55 @@ +package mod.linguardium.mobcapped.mixin; + +import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap; +import mod.linguardium.mobcapped.helpers.SpawnHelperInfoInterface; +import net.minecraft.entity.EntityType; +import net.minecraft.entity.SpawnGroup; +import net.minecraft.entity.mob.MobEntity; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.SpawnHelper; +import net.minecraft.world.chunk.Chunk; +import org.spongepowered.asm.mixin.Final; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Redirect; + +@Mixin(SpawnHelper.Info.class) +public abstract class SpawnHelperInfoMixin implements SpawnHelperInfoInterface { + + @Shadow protected abstract boolean isBelowCap(SpawnGroup group); + + @Shadow + @Final + private int spawningChunkCount; + + @Shadow + @Final + private Object2IntOpenHashMap groupToCount; + + @Shadow + protected abstract boolean test(EntityType type, BlockPos pos, Chunk chunk); + @Shadow + protected abstract void run(MobEntity entity, Chunk chunk); + + @Override + public boolean MobCapped$checkBelowMobCap(SpawnGroup spawnGroup) { + return isBelowCap(spawnGroup); + } + + @Override + public boolean MobCapped$isBelowCap$CustomCapacity(SpawnGroup group, int capacity, int chunkArea) { + int i = capacity * this.spawningChunkCount / chunkArea; + return this.groupToCount.getInt(group) < i; + } + + @Override + public boolean PublicTest(EntityType type, BlockPos pos, Chunk chunk) { + return this.test(type,pos,chunk); + } + + @Override + public void PublicRun(MobEntity entity, Chunk chunk) { + this.run(entity,chunk); + } +} diff --git a/src/main/java/mod/linguardium/mobcapped/mixin/SpawnHelperMixin.java b/src/main/java/mod/linguardium/mobcapped/mixin/SpawnHelperMixin.java new file mode 100644 index 0000000..b870352 --- /dev/null +++ b/src/main/java/mod/linguardium/mobcapped/mixin/SpawnHelperMixin.java @@ -0,0 +1,113 @@ +package mod.linguardium.mobcapped.mixin; + +import mod.linguardium.mobcapped.helpers.SpawnHelperInfoInterface; +import net.minecraft.entity.Entity; +import net.minecraft.entity.SpawnGroup; +import net.minecraft.entity.mob.MobEntity; +import net.minecraft.server.network.ServerPlayerEntity; +import net.minecraft.server.world.ServerWorld; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Box; +import net.minecraft.world.GameRules; +import net.minecraft.world.SpawnHelper; +import net.minecraft.world.biome.Biome; +import net.minecraft.world.chunk.WorldChunk; +import net.minecraft.world.gen.StructureAccessor; +import net.minecraft.world.gen.chunk.ChunkGenerator; +import org.spongepowered.asm.mixin.Final; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.injection.*; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +import java.util.Random; + +import static mod.linguardium.mobcapped.NewGameRules.*; +import static net.minecraft.world.SpawnHelper.spawnEntitiesInChunk; + +@Mixin(SpawnHelper.class) +public abstract class SpawnHelperMixin { + + @Shadow + @Final + private static int CHUNK_AREA; + + @Shadow @Final private static SpawnGroup[] SPAWNABLE_GROUPS; + + @Shadow + private static Biome.SpawnEntry pickRandomSpawnEntry(ServerWorld serverWorld, StructureAccessor structureAccessor, ChunkGenerator chunkGenerator, SpawnGroup spawnGroup, Random random, BlockPos blockPos) { + return null; + } + @ModifyConstant(method="spawn",constant = @Constant(intValue = 0, ordinal = 0)) + private static int DisableVanillaMobSpawn(int zero) { + return SPAWNABLE_GROUPS.length; + } + + @Inject(at=@At(value="INVOKE",target="Lnet/minecraft/util/profiler/Profiler;pop()V"),method="spawn") + private static void spawngroups(ServerWorld world, WorldChunk chunk, SpawnHelper.Info helperInfo, boolean spawnAnimals, boolean spawnMonsters, boolean shouldSpawnAnimals, CallbackInfo info) { + boolean perPlayerMobCap = world.getGameRules().getBoolean(PER_PLAYER_MOBCAP_KEY); + for (SpawnGroup spawnGroup : SPAWNABLE_GROUPS) { + GameRules.Key capKey = null; + switch(spawnGroup) { + case MONSTER: + capKey=MOBCAP_MONSTERS_KEY; + break; + case CREATURE: + capKey=MOBCAP_CREATURES_KEY; + break; + case AMBIENT: + capKey=MOBCAP_AMBIENT_KEY; + break; + case WATER_CREATURE: + capKey=MOBCAP_AQUATIC_CREATURE_KEY; + break; + case WATER_AMBIENT: + capKey=MOBCAP_AQUATIC_AMBIENT_KEY; + break; + } + if (capKey == null) + continue; + int mobcap = world.getGameRules().getInt(capKey); + if ((spawnAnimals || !spawnGroup.isPeaceful()) && (spawnMonsters || spawnGroup.isPeaceful()) && (shouldSpawnAnimals || !spawnGroup.isAnimal()) && ( ((SpawnHelperInfoInterface)helperInfo).MobCapped$isBelowCap$CustomCapacity(spawnGroup,mobcap,CHUNK_AREA) || perPlayerMobCap)) { + spawnEntitiesInChunk(spawnGroup, world, chunk, ((SpawnHelperInfoInterface) helperInfo)::PublicTest, ((SpawnHelperInfoInterface) helperInfo)::PublicRun); + } + } + } + + @Redirect(at=@At(value="INVOKE",target="Lnet/minecraft/world/SpawnHelper;pickRandomSpawnEntry(Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/world/gen/StructureAccessor;Lnet/minecraft/world/gen/chunk/ChunkGenerator;Lnet/minecraft/entity/SpawnGroup;Ljava/util/Random;Lnet/minecraft/util/math/BlockPos;)Lnet/minecraft/world/biome/Biome$SpawnEntry;"),method="spawnEntitiesInChunk(Lnet/minecraft/entity/SpawnGroup;Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/world/chunk/Chunk;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/world/SpawnHelper$Checker;Lnet/minecraft/world/SpawnHelper$Runner;)V") + private static Biome.SpawnEntry playerCap(ServerWorld serverWorld, StructureAccessor structureAccessor, ChunkGenerator chunkGenerator, SpawnGroup spawnGroup, Random random, BlockPos blockPos) { + if (serverWorld.getGameRules().getBoolean(PER_PLAYER_MOBCAP_KEY)) { + GameRules.Key capKey = null; + switch(spawnGroup) { + case MONSTER: + capKey=MOBCAP_MONSTERS_KEY; + break; + case CREATURE: + capKey=MOBCAP_CREATURES_KEY; + break; + case AMBIENT: + capKey=MOBCAP_AMBIENT_KEY; + break; + case WATER_CREATURE: + capKey=MOBCAP_AQUATIC_CREATURE_KEY; + break; + case WATER_AMBIENT: + capKey=MOBCAP_AQUATIC_AMBIENT_KEY; + break; + } + if (capKey != null) { + int mobCap = serverWorld.getGameRules().getInt(capKey); + double despawnRange = spawnGroup.getImmediateDespawnRange(); + for (ServerPlayerEntity player : serverWorld.getPlayers(player -> player.squaredDistanceTo(blockPos.getX(), blockPos.getY(), blockPos.getZ()) < despawnRange*despawnRange)) { + Box searchBox = new Box(player.getBlockPos()).expand(spawnGroup.getImmediateDespawnRange()); + + + if (serverWorld.getEntities((Entity)null,searchBox, entity -> (entity instanceof MobEntity) && entity.getType().getSpawnGroup().equals(spawnGroup) && player.getBlockPos().getSquaredDistance(entity.getX(),entity.getY(),entity.getZ(),false) < despawnRange * despawnRange && !((MobEntity) entity).isPersistent()).size() >= mobCap) { + return null; + } + } + } + } + return pickRandomSpawnEntry(serverWorld, structureAccessor, chunkGenerator, spawnGroup, serverWorld.random, blockPos); + } +} diff --git a/src/main/resources/assets/minecraft/lang/en_us.json b/src/main/resources/assets/minecraft/lang/en_us.json new file mode 100644 index 0000000..4eab5d8 --- /dev/null +++ b/src/main/resources/assets/minecraft/lang/en_us.json @@ -0,0 +1,8 @@ +{ + "gamerule.mobCapAmbient": "Ambient Mob Cap", + "gamerule.mobCapAquaticAmbient": "Ambient Water Mob Cap", + "gamerule.mobCapAquaticCreature": "Water Creature Mob Cap", + "gamerule.mobCapCreatures": "Creature Mob Cap", + "gamerule.mobCapMonsters": "Monster Mob Cap", + "gamerule.mobCapPerPlayer": "Per Player Mob Cap" +} \ No newline at end of file diff --git a/src/main/resources/assets/mobcapped/icon.png b/src/main/resources/assets/mobcapped/icon.png new file mode 100644 index 0000000..4114fe3 Binary files /dev/null and b/src/main/resources/assets/mobcapped/icon.png differ diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json new file mode 100644 index 0000000..9aaf7dd --- /dev/null +++ b/src/main/resources/fabric.mod.json @@ -0,0 +1,29 @@ +{ + "schemaVersion": 1, + "id": "mobcapped", + "version": "${version}", + "name": "MobCapped", + "description": "modifiable mob caps", + "authors": [ + "Linguardium" + ], + "contributors": [], + "contact": {}, + "license": "MIT", + "icon": "assets/mobcapped/icon.png", + "environment": "*", + "entrypoints": { + "main": [ + "mod.linguardium.mobcapped.Main" + ], + "client": [], + "server": [] + }, + "mixins": [ + "mobcapped.mixins.json" + ], + "depends": { + "fabricloader": ">=0.8.0", + "fabric": ">=0.15" + } +} \ No newline at end of file diff --git a/src/main/resources/mobcapped.mixins.json b/src/main/resources/mobcapped.mixins.json new file mode 100644 index 0000000..f098ba0 --- /dev/null +++ b/src/main/resources/mobcapped.mixins.json @@ -0,0 +1,17 @@ +{ + "required": true, + "package": "mod.linguardium.mobcapped.mixin", + "compatibilityLevel": "JAVA_8", + "mixins": [ + "BooleanGameRuleAccessor", + "IntegerGameRuleAccessor", + "RegisterGameRule", + "SpawnHelperInfoMixin", + "SpawnHelperMixin" + ], + "client": [], + "server": [], + "injectors": { + "defaultRequire": 1 + } +} \ No newline at end of file