diff --git a/build.gradle b/build.gradle index 9a81573..aff0c3e 100644 --- a/build.gradle +++ b/build.gradle @@ -1,16 +1,13 @@ plugins { - id 'fabric-loom' version '0.10-SNAPSHOT' + id 'fabric-loom' version "${loom_version}" id 'maven-publish' } -sourceCompatibility = JavaVersion.VERSION_17 -targetCompatibility = JavaVersion.VERSION_17 - -archivesBaseName = project.archives_base_name version = project.version + "-" + project.minecraft_version group = 'dev.draylar' -minecraft { +base { + archivesName = project.archives_base_name } repositories { @@ -26,6 +23,7 @@ repositories { name = "TerraformersMC" url = "https://maven.terraformersmc.com/releases/" } + maven { url 'https://maven.draylar.dev/releases' } } dependencies { @@ -35,11 +33,11 @@ dependencies { modImplementation "net.fabricmc.fabric-api:fabric-api:${project.api_version}" // Omega Config & ModMenu for testing configuration screen - include("com.github.Draylar.omega-config:omega-config-base:${project.omega_config_version}") - include("com.github.Draylar.omega-config:omega-config-gui:${project.omega_config_version}") - modImplementation("com.github.Draylar.omega-config:omega-config-base:${project.omega_config_version}") - modImplementation("com.github.Draylar.omega-config:omega-config-gui:${project.omega_config_version}") - modRuntimeOnly ("com.terraformersmc:modmenu:${project.modmenu_version}") + //include("com.github.Draylar.omega-config:omega-config-base:${project.omega_config_version}") + //include("com.github.Draylar.omega-config:omega-config-gui:${project.omega_config_version}") + modImplementation include ("dev.draylar.omega-config:omega-config-base:${project.omega_config_version}") + //modImplementation("com.github.Draylar.omega-config:omega-config-gui:${project.omega_config_version}") + //modRuntimeOnly ("com.terraformersmc:modmenu:${project.modmenu_version}") } processResources { @@ -64,7 +62,7 @@ java { jar { from("LICENSE") { - rename { "${it}_${project.archivesBaseName}" } + rename { "${it}_${project.archives_base_name}" } } } diff --git a/gradle.properties b/gradle.properties index d799007..0163f72 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,16 +2,17 @@ org.gradle.jvmargs=-Xmx1G # External Dependency Versions -omega_config_version=1.2.1-1.18.1 +omega_config_version=1.4.0+1.20.1 modmenu_version=3.0.1 # Minecraft & Fabric -minecraft_version=1.18.1 -loader_version=0.12.12 -api_version=0.44.0+1.18 -yarn_build=1.18.1+build.7 +minecraft_version=1.20.1 +loader_version=0.18.1 +api_version=0.92.6+1.20.1 +yarn_build=1.20.1+build.10 +loom_version=1.13-SNAPSHOT # Metadata -version=1.3.0 +version=1.4.0 modid=snowdrift archives_base_name=snowdrift diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 29953ea..8bdaf60 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index a33384a..2e11132 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip +networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists \ No newline at end of file +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index cccdd3d..adff685 100644 --- a/gradlew +++ b/gradlew @@ -1,78 +1,128 @@ -#!/usr/bin/env sh +#!/bin/sh + +# +# Copyright © 2015 the original 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. +# +# SPDX-License-Identifier: Apache-2.0 +# ############################################################################## -## -## Gradle start up script for UN*X -## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# ############################################################################## # 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 +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac 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="" +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # 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 - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | 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" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -81,92 +131,118 @@ 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. + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + 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 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 +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac 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 +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) -# 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\"" + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) fi - i=$((i+1)) + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg 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")" +# 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"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" fi +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat index f955316..c4bdd3a 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -1,4 +1,22 @@ -@if "%DEBUG%" == "" @echo off +@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 +@rem SPDX-License-Identifier: Apache-2.0 +@rem + +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -9,25 +27,29 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + @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 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 +if %ERRORLEVEL% equ 0 goto execute -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. +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail @@ -35,48 +57,35 @@ goto fail set JAVA_HOME=%JAVA_HOME:"=% set JAVA_EXE=%JAVA_HOME%/bin/java.exe -if exist "%JAVA_EXE%" goto init +if exist "%JAVA_EXE%" goto execute -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. +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 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% +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 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 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal diff --git a/settings.gradle b/settings.gradle index 5b60df3..75c4d72 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,10 +1,10 @@ pluginManagement { - repositories { - jcenter() - maven { - name = 'Fabric' - url = 'https://maven.fabricmc.net/' - } - gradlePluginPortal() - } -} + repositories { + maven { + name = 'Fabric' + url = 'https://maven.fabricmc.net/' + } + mavenCentral() + gradlePluginPortal() + } +} \ No newline at end of file diff --git a/src/main/java/draylar/snowdrift/Snowdrift.java b/src/main/java/draylar/snowdrift/Snowdrift.java index 8ec4ed9..6e4c001 100644 --- a/src/main/java/draylar/snowdrift/Snowdrift.java +++ b/src/main/java/draylar/snowdrift/Snowdrift.java @@ -4,7 +4,14 @@ import draylar.snowdrift.config.ModConfig; import draylar.snowdrift.logic.SnowTickEventHandler; import net.fabricmc.api.ModInitializer; +import net.fabricmc.fabric.api.biome.v1.BiomeModifications; +import net.fabricmc.fabric.api.biome.v1.ModificationPhase; +import net.minecraft.entity.EntityType; +import net.minecraft.entity.SpawnGroup; import net.minecraft.util.Identifier; +import net.minecraft.world.biome.Biome; +import net.minecraft.world.biome.SpawnSettings; +import net.minecraft.world.dimension.DimensionOptions; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -16,6 +23,19 @@ public class Snowdrift implements ModInitializer { @Override public void onInitialize() { + if (CONFIG.enableBlizzard) { + BiomeModifications.create(id("blizzard")) + .add(ModificationPhase.REPLACEMENTS, + biome -> biome.canGenerateIn(DimensionOptions.OVERWORLD), + biome -> { + biome.getWeather().setTemperature(0.0f); + biome.getWeather().setPrecipitation(true); + biome.getWeather().setTemperatureModifier(Biome.TemperatureModifier.NONE); + + biome.getSpawnSettings().addSpawn(SpawnGroup.CREATURE, new SpawnSettings.SpawnEntry(EntityType.POLAR_BEAR, 60, 1, 3)); + biome.getSpawnSettings().addSpawn(SpawnGroup.CREATURE, new SpawnSettings.SpawnEntry(EntityType.STRAY, 60, 1, 3)); + }); + } SnowTickEventHandler.init(); } diff --git a/src/main/java/draylar/snowdrift/SnowdriftClient.java b/src/main/java/draylar/snowdrift/SnowdriftClient.java index 1fd8607..561f2df 100644 --- a/src/main/java/draylar/snowdrift/SnowdriftClient.java +++ b/src/main/java/draylar/snowdrift/SnowdriftClient.java @@ -1,12 +1,11 @@ package draylar.snowdrift; -import draylar.omegaconfiggui.OmegaConfigGui; import net.fabricmc.api.ClientModInitializer; public class SnowdriftClient implements ClientModInitializer { @Override public void onInitializeClient() { - OmegaConfigGui.registerConfigScreen(Snowdrift.CONFIG); + //OmegaConfigGui.registerConfigScreen(Snowdrift.CONFIG); } } diff --git a/src/main/java/draylar/snowdrift/logic/SnowIncrementer.java b/src/main/java/draylar/snowdrift/logic/SnowIncrementer.java index 869a849..f0ad102 100644 --- a/src/main/java/draylar/snowdrift/logic/SnowIncrementer.java +++ b/src/main/java/draylar/snowdrift/logic/SnowIncrementer.java @@ -1,15 +1,16 @@ package draylar.snowdrift.logic; import draylar.snowdrift.Snowdrift; -import draylar.snowdrift.mixins.BiomeAccessor; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; import net.minecraft.block.SnowBlock; +import net.minecraft.registry.entry.RegistryEntry; import net.minecraft.server.world.ServerWorld; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.ChunkPos; import net.minecraft.util.math.Direction; import net.minecraft.world.Heightmap; +import net.minecraft.world.biome.Biome; import net.minecraft.world.chunk.Chunk; import java.util.ArrayList; @@ -36,7 +37,8 @@ private void tryIncrementSnowAt(ServerWorld world, BlockPos basePos) { BlockPos topPos = world.getTopPosition(Heightmap.Type.MOTION_BLOCKING, basePos); BlockState topState = world.getBlockState(topPos); - if (((BiomeAccessor) (Object) world.getBiomeAccess().getBiome(topPos)).callGetTemperature(topPos) > MAX_SNOW_TEMP) { + RegistryEntry be = world.getBiome(topPos); + if (be.value().getTemperature() > MAX_SNOW_TEMP) { return; } diff --git a/src/main/java/draylar/snowdrift/mixins/BiomeAccessor.java b/src/main/java/draylar/snowdrift/mixins/BiomeAccessor.java deleted file mode 100644 index 581b589..0000000 --- a/src/main/java/draylar/snowdrift/mixins/BiomeAccessor.java +++ /dev/null @@ -1,12 +0,0 @@ -package draylar.snowdrift.mixins; - -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.biome.Biome; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.gen.Invoker; - -@Mixin(Biome.class) -public interface BiomeAccessor { - @Invoker - float callGetTemperature(BlockPos blockPos); -} diff --git a/src/main/java/draylar/snowdrift/mixins/BlizzardBiomeMixin.java b/src/main/java/draylar/snowdrift/mixins/BlizzardBiomeMixin.java deleted file mode 100644 index 1cfacee..0000000 --- a/src/main/java/draylar/snowdrift/mixins/BlizzardBiomeMixin.java +++ /dev/null @@ -1,28 +0,0 @@ -package draylar.snowdrift.mixins; - -import net.minecraft.world.biome.Biome; -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.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; - -@Mixin(Biome.class) -public abstract class BlizzardBiomeMixin { - @Shadow - @Final - private Biome.Category category; - - @Inject(method = "getTemperature()F", at = @At("HEAD"), cancellable = true) - public void setTemperature(CallbackInfoReturnable ctx) { - if (this.category != Biome.Category.NETHER && this.category != Biome.Category.THEEND) - ctx.setReturnValue(0.0F); - } - - @Inject(method = "getPrecipitation", at = @At("HEAD"), cancellable = true) - public void setWeather(CallbackInfoReturnable ctx) { - if (this.category != Biome.Category.NETHER && this.category != Biome.Category.THEEND) - ctx.setReturnValue(Biome.Precipitation.SNOW); - } -} diff --git a/src/main/java/draylar/snowdrift/mixins/plugins/BlizzardMixinPlugin.java b/src/main/java/draylar/snowdrift/mixins/plugins/BlizzardMixinPlugin.java index d0e443f..a72f1fb 100644 --- a/src/main/java/draylar/snowdrift/mixins/plugins/BlizzardMixinPlugin.java +++ b/src/main/java/draylar/snowdrift/mixins/plugins/BlizzardMixinPlugin.java @@ -11,12 +11,12 @@ public class BlizzardMixinPlugin implements IMixinConfigPlugin { @Override public boolean shouldApplyMixin(String targetClassName, String mixinClassName) { - return Snowdrift.CONFIG.enableBlizzard; + return Snowdrift.CONFIG.constantSnow; } @Override public void postApply(String targetClassName, ClassNode targetClass, String mixinClassName, IMixinInfo mixinInfo) { - Snowdrift.LOGGER.info("[Snowdrift] \"Blizzard\" functionality enabled. Enjoy the Winter Wonderland!"); + Snowdrift.LOGGER.info("[Snowdrift] Blizzard's Eternal Snowfall functionality enabled. Enjoy the Winter Wonderland!"); } @Override diff --git a/src/main/java/draylar/snowdrift/mixins/plugins/BlizzardPrecipitationMixinPlugin.java b/src/main/java/draylar/snowdrift/mixins/plugins/BlizzardPrecipitationMixinPlugin.java deleted file mode 100644 index e51242d..0000000 --- a/src/main/java/draylar/snowdrift/mixins/plugins/BlizzardPrecipitationMixinPlugin.java +++ /dev/null @@ -1,17 +0,0 @@ -package draylar.snowdrift.mixins.plugins; - -import draylar.snowdrift.Snowdrift; -import org.objectweb.asm.tree.ClassNode; -import org.spongepowered.asm.mixin.extensibility.IMixinInfo; - -public class BlizzardPrecipitationMixinPlugin extends BlizzardMixinPlugin { - @Override - public boolean shouldApplyMixin(String targetClassName, String mixinClassName) { - return Snowdrift.CONFIG.enableBlizzard && Snowdrift.CONFIG.constantSnow; - } - - @Override - public void postApply(String targetClassName, ClassNode targetClass, String mixinClassName, IMixinInfo mixinInfo) { - Snowdrift.LOGGER.info("[Snowdrift] \"Blizzard: Eternal Snowfall\" functionality enabled. Let It Snow!"); - } -} diff --git a/src/main/resources/blizzard.mixins.json b/src/main/resources/blizzard.mixins.json index b6dc73f..f2d1395 100644 --- a/src/main/resources/blizzard.mixins.json +++ b/src/main/resources/blizzard.mixins.json @@ -4,7 +4,7 @@ "plugin": "draylar.snowdrift.mixins.plugins.BlizzardMixinPlugin", "compatibilityLevel": "JAVA_8", "mixins": [ - "BlizzardBiomeMixin" + "BlizzardLevelPropertiesMixin" ], "injectors": { "defaultRequire": 1 diff --git a/src/main/resources/blizzard.precipitation.mixins.json b/src/main/resources/blizzard.precipitation.mixins.json deleted file mode 100644 index c3f336f..0000000 --- a/src/main/resources/blizzard.precipitation.mixins.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "required": true, - "package": "draylar.snowdrift.mixins", - "plugin": "draylar.snowdrift.mixins.plugins.BlizzardPrecipitationMixinPlugin", - "compatibilityLevel": "JAVA_8", - "mixins": [ - "BlizzardLevelPropertiesMixin" - ], - "injectors": { - "defaultRequire": 1 - } -} diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index e76a19b..acaca88 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -27,7 +27,6 @@ }, "mixins": [ "blizzard.mixins.json", - "blizzard.precipitation.mixins.json", "snowdrift.mixins.json" ], "depends": { diff --git a/src/main/resources/snowdrift.mixins.json b/src/main/resources/snowdrift.mixins.json index a7fabdc..a9b4c2e 100644 --- a/src/main/resources/snowdrift.mixins.json +++ b/src/main/resources/snowdrift.mixins.json @@ -3,7 +3,6 @@ "package": "draylar.snowdrift.mixins", "compatibilityLevel": "JAVA_8", "mixins": [ - "BiomeAccessor" ], "injectors": { "defaultRequire": 1