diff --git a/build.gradle b/build.gradle index 0491cb6..530dd28 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'fabric-loom' version '0.10-SNAPSHOT' + id 'fabric-loom' version '1.1-SNAPSHOT' id 'maven-publish' } @@ -10,17 +10,12 @@ archivesBaseName = project.mod_name version = project.mod_version + "+" + project.version_meta group = project.maven_group -minecraft { -} - repositories { maven { url "https://maven.terraformersmc.com/"} maven { url "https://maven.shedaniel.me/" } } loom { - accessWidenerPath = file("src/main/resources/resourcemelons.accesswidener") - runs { datagenClient { client() diff --git a/gradle.properties b/gradle.properties index abaa960..9ed7604 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,29 +1,30 @@ # Done to increase the memory available to gradle. org.gradle.jvmargs=-Xmx1G + org.gradle.parallel=true # Fabric Properties # check these on https://modmuss50.me/fabric.html - minecraft_version=1.18 - yarn_mappings=1 + minecraft_version=1.18.2 + yarn_mappings=4 tiny_version=2 - loader_version=0.12.8 + loader_version=0.14.14 # Mod Properties - mod_version = 2.2.3 + mod_version = 2.2.4 maven_group = com.shnupbups mod_name = resource-melons - version_meta = fabric-mc1.18 + version_meta = fabric-mc1.18.2 # Dependencies # check on https://modmuss50.me/fabric.html - fapi_version=0.44.0+1.18 + fapi_version=0.75.1+1.18.2 # check on maven at https://maven.shedaniel.me/me/shedaniel/cloth/cloth-config-fabric/ - cloth_config_version = 6.0.45 + cloth_config_version = 6.1.48 # Other Stuff # check on maven at https://maven.shedaniel.me/me/shedaniel/RoughlyEnoughItems-fabric/ - rei_version = 7.0.346 - + rei_version = 8.3.590 + # check on maven at https://maven.terraformersmc.com/releases/com/terraformersmc/modmenu - modmenu_version = 3.0.0 \ No newline at end of file + modmenu_version = 3.0.1 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index e708b1c..943f0cb 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 ffed3a2..f398c33 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip +networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew old mode 100644 new mode 100755 index 8e25e6c..65dcd68 --- a/gradlew +++ b/gradlew @@ -1,7 +1,7 @@ -#!/usr/bin/env sh +#!/bin/sh # -# Copyright 2015 the original author or authors. +# Copyright © 2015-2021 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. @@ -17,78 +17,113 @@ # ############################################################################## -## -## 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/subprojects/plugins/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"` +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit # 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" +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 @@ -97,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" + 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 @@ -105,84 +140,105 @@ 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 +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=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=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" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + 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; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi -# 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" +# 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. +# -# 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 +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 9618d8d..93e3f59 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -14,7 +14,7 @@ @rem limitations under the License. @rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,10 +25,14 @@ 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="-Xmx64m" "-Xms64m" @@ -37,7 +41,7 @@ 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. @@ -51,7 +55,7 @@ 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% @@ -61,38 +65,26 @@ 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% +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* :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..b02216b 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,10 +1,10 @@ pluginManagement { repositories { - jcenter() maven { name = 'Fabric' url = 'https://maven.fabricmc.net/' } + mavenCentral() gradlePluginPortal() } } diff --git a/src/main/java/com/shnupbups/resourcemelons/block/ResourceMelonStemBlock.java b/src/main/java/com/shnupbups/resourcemelons/block/ResourceMelonStemBlock.java index db5164a..05799b2 100644 --- a/src/main/java/com/shnupbups/resourcemelons/block/ResourceMelonStemBlock.java +++ b/src/main/java/com/shnupbups/resourcemelons/block/ResourceMelonStemBlock.java @@ -1,20 +1,12 @@ package com.shnupbups.resourcemelons.block; -import java.util.Optional; -import java.util.Random; -import java.util.function.Supplier; - -import net.minecraft.block.Block; -import net.minecraft.block.BlockState; -import net.minecraft.block.Blocks; -import net.minecraft.block.FarmlandBlock; -import net.minecraft.block.GourdBlock; -import net.minecraft.block.HorizontalFacingBlock; -import net.minecraft.block.StemBlock; +import com.shnupbups.resourcemelons.RMCommon; +import com.shnupbups.resourcemelons.config.GrowthChanceModifiers; +import net.minecraft.block.*; import net.minecraft.item.Item; import net.minecraft.server.world.ServerWorld; import net.minecraft.tag.BlockTags; -import net.minecraft.tag.Tag; +import net.minecraft.tag.TagKey; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; import net.minecraft.util.math.Vec3i; @@ -22,14 +14,15 @@ import net.minecraft.world.LightType; import net.minecraft.world.World; -import com.shnupbups.resourcemelons.RMCommon; -import com.shnupbups.resourcemelons.config.GrowthChanceModifiers; +import java.util.Optional; +import java.util.Random; +import java.util.function.Supplier; public class ResourceMelonStemBlock extends StemBlock { - private final Tag catalyst; + private final TagKey catalyst; - public ResourceMelonStemBlock(GourdBlock melon, Supplier pickBlockItem, Tag catalyst, Settings settings) { + public ResourceMelonStemBlock(GourdBlock melon, Supplier pickBlockItem, TagKey catalyst, Settings settings) { super(melon, pickBlockItem, settings); this.catalyst = catalyst; } diff --git a/src/main/java/com/shnupbups/resourcemelons/core/DefaultMelonTypes.java b/src/main/java/com/shnupbups/resourcemelons/core/DefaultMelonTypes.java index 9a18fb9..8a7c68b 100644 --- a/src/main/java/com/shnupbups/resourcemelons/core/DefaultMelonTypes.java +++ b/src/main/java/com/shnupbups/resourcemelons/core/DefaultMelonTypes.java @@ -1,17 +1,15 @@ package com.shnupbups.resourcemelons.core; +import com.shnupbups.resourcemelons.RMCommon; +import com.shnupbups.resourcemelons.misc.RMTags; +import net.fabricmc.yarn.constants.MiningLevels; import net.minecraft.block.Block; import net.minecraft.block.Blocks; import net.minecraft.item.Item; import net.minecraft.item.Items; -import net.minecraft.tag.Tag; +import net.minecraft.tag.TagKey; import net.minecraft.util.Identifier; -import net.fabricmc.yarn.constants.MiningLevels; - -import com.shnupbups.resourcemelons.RMCommon; -import com.shnupbups.resourcemelons.misc.RMTags; - public enum DefaultMelonTypes implements MelonTypeBuilder { DIAMOND("diamond", Items.DIAMOND, Blocks.DIAMOND_BLOCK, 0x4AEDD9, RMTags.BlockTags.DIAMOND_MELON_CATALYSTS, MiningLevels.IRON), GOLD("gold", Items.GOLD_INGOT, Blocks.GOLD_BLOCK, 0xFDF55F, RMTags.BlockTags.GOLD_MELON_CATALYSTS, MiningLevels.IRON), @@ -29,47 +27,47 @@ public enum DefaultMelonTypes implements MelonTypeBuilder { final Info info; MelonType type; - DefaultMelonTypes(String id, Item resource, Block resourceBlock, int colour, Tag catalyst) { + DefaultMelonTypes(String id, Item resource, Block resourceBlock, int colour, TagKey catalyst) { this(RMCommon.id(id), resource, resourceBlock, colour, catalyst, 0); } - DefaultMelonTypes(String id, Item resource, Block resourceBlock, int colour, Tag catalyst, float chanceMultiplier) { + DefaultMelonTypes(String id, Item resource, Block resourceBlock, int colour, TagKey catalyst, float chanceMultiplier) { this(RMCommon.id(id), resource, resourceBlock, colour, catalyst, chanceMultiplier, chanceMultiplier, 0); } - DefaultMelonTypes(String id, Item resource, Block resourceBlock, int colour, Tag catalyst, float resourceChanceMultiplier, float seedsChanceMultiplier) { + DefaultMelonTypes(String id, Item resource, Block resourceBlock, int colour, TagKey catalyst, float resourceChanceMultiplier, float seedsChanceMultiplier) { this(RMCommon.id(id), resource, resourceBlock, colour, catalyst, resourceChanceMultiplier, seedsChanceMultiplier, 0); } - DefaultMelonTypes(Identifier id, Item resource, Block resourceBlock, int colour, Tag catalyst) { + DefaultMelonTypes(Identifier id, Item resource, Block resourceBlock, int colour, TagKey catalyst) { this(id, resource, resourceBlock, colour, catalyst, 1.0f, 0); } - DefaultMelonTypes(Identifier id, Item resource, Block resourceBlock, int colour, Tag catalyst, float chanceMultiplier) { + DefaultMelonTypes(Identifier id, Item resource, Block resourceBlock, int colour, TagKey catalyst, float chanceMultiplier) { this(id, resource, resourceBlock, colour, catalyst, chanceMultiplier, chanceMultiplier, 0); } - DefaultMelonTypes(String id, Item resource, Block resourceBlock, int colour, Tag catalyst, int miningLevel) { + DefaultMelonTypes(String id, Item resource, Block resourceBlock, int colour, TagKey catalyst, int miningLevel) { this(RMCommon.id(id), resource, resourceBlock, colour, catalyst, miningLevel); } - DefaultMelonTypes(String id, Item resource, Block resourceBlock, int colour, Tag catalyst, float chanceMultiplier, int miningLevel) { + DefaultMelonTypes(String id, Item resource, Block resourceBlock, int colour, TagKey catalyst, float chanceMultiplier, int miningLevel) { this(RMCommon.id(id), resource, resourceBlock, colour, catalyst, chanceMultiplier, chanceMultiplier, miningLevel); } - DefaultMelonTypes(String id, Item resource, Block resourceBlock, int colour, Tag catalyst, float resourceChanceMultiplier, float seedsChanceMultiplier, int miningLevel) { + DefaultMelonTypes(String id, Item resource, Block resourceBlock, int colour, TagKey catalyst, float resourceChanceMultiplier, float seedsChanceMultiplier, int miningLevel) { this(RMCommon.id(id), resource, resourceBlock, colour, catalyst, resourceChanceMultiplier, seedsChanceMultiplier, miningLevel); } - DefaultMelonTypes(Identifier id, Item resource, Block resourceBlock, int colour, Tag catalyst, int miningLevel) { + DefaultMelonTypes(Identifier id, Item resource, Block resourceBlock, int colour, TagKey catalyst, int miningLevel) { this(id, resource, resourceBlock, colour, catalyst, 1.0f, miningLevel); } - DefaultMelonTypes(Identifier id, Item resource, Block resourceBlock, int colour, Tag catalyst, float chanceMultiplier, int miningLevel) { + DefaultMelonTypes(Identifier id, Item resource, Block resourceBlock, int colour, TagKey catalyst, float chanceMultiplier, int miningLevel) { this(id, resource, resourceBlock, colour, catalyst, chanceMultiplier, chanceMultiplier, miningLevel); } - DefaultMelonTypes(Identifier id, Item resource, Block resourceBlock, int colour, Tag catalyst, float resourceChanceMultiplier, float seedsChanceMultiplier, int miningLevel) { + DefaultMelonTypes(Identifier id, Item resource, Block resourceBlock, int colour, TagKey catalyst, float resourceChanceMultiplier, float seedsChanceMultiplier, int miningLevel) { this.info = new Info(id, resource, resourceBlock, catalyst, colour, resourceChanceMultiplier, seedsChanceMultiplier, miningLevel); } diff --git a/src/main/java/com/shnupbups/resourcemelons/core/MelonType.java b/src/main/java/com/shnupbups/resourcemelons/core/MelonType.java index f0c1e69..4c0ac2c 100644 --- a/src/main/java/com/shnupbups/resourcemelons/core/MelonType.java +++ b/src/main/java/com/shnupbups/resourcemelons/core/MelonType.java @@ -1,23 +1,22 @@ package com.shnupbups.resourcemelons.core; -import net.minecraft.block.Block; -import net.minecraft.block.DispenserBlock; -import net.minecraft.item.BlockItem; -import net.minecraft.item.Item; -import net.minecraft.tag.Tag; -import net.minecraft.util.Identifier; -import net.minecraft.util.registry.Registry; - import com.shnupbups.resourcemelons.RMCommon; import com.shnupbups.resourcemelons.block.ResourceMelonAttachedStemBlock; import com.shnupbups.resourcemelons.block.ResourceMelonBlock; import com.shnupbups.resourcemelons.block.ResourceMelonStemBlock; import com.shnupbups.resourcemelons.item.ResourceMelonSliceItem; import com.shnupbups.resourcemelons.misc.ResourceMelonSliceDispenserBehavior; +import net.minecraft.block.Block; +import net.minecraft.block.DispenserBlock; +import net.minecraft.item.BlockItem; +import net.minecraft.item.Item; +import net.minecraft.tag.TagKey; +import net.minecraft.util.Identifier; +import net.minecraft.util.registry.Registry; public record MelonType(Identifier id, Item resource, Block resourceBlock, ResourceMelonStemBlock stem, ResourceMelonAttachedStemBlock attachedStem, - ResourceMelonBlock melon, Item seeds, ResourceMelonSliceItem slice, Tag catalyst, + ResourceMelonBlock melon, Item seeds, ResourceMelonSliceItem slice, TagKey catalyst, int colour, float resourceChanceMultiplier, float seedsChanceMultiplier, int miningLevel) { private static void createBlockItem(Block block, Identifier id) { BlockItem item = new BlockItem(block, new Item.Settings().group(RMCommon.getMelonBlockGroup())); diff --git a/src/main/java/com/shnupbups/resourcemelons/core/MelonTypeBuilder.java b/src/main/java/com/shnupbups/resourcemelons/core/MelonTypeBuilder.java index d590760..aebe50f 100644 --- a/src/main/java/com/shnupbups/resourcemelons/core/MelonTypeBuilder.java +++ b/src/main/java/com/shnupbups/resourcemelons/core/MelonTypeBuilder.java @@ -1,22 +1,20 @@ package com.shnupbups.resourcemelons.core; +import com.shnupbups.resourcemelons.RMCommon; +import com.shnupbups.resourcemelons.block.ResourceMelonAttachedStemBlock; +import com.shnupbups.resourcemelons.block.ResourceMelonBlock; +import com.shnupbups.resourcemelons.block.ResourceMelonStemBlock; +import com.shnupbups.resourcemelons.item.ResourceMelonSliceItem; +import net.fabricmc.fabric.api.item.v1.FabricItemSettings; +import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; import net.minecraft.block.Block; import net.minecraft.block.Material; import net.minecraft.item.AliasedBlockItem; import net.minecraft.item.Item; import net.minecraft.sound.BlockSoundGroup; -import net.minecraft.tag.Tag; +import net.minecraft.tag.TagKey; import net.minecraft.util.Identifier; -import net.fabricmc.fabric.api.item.v1.FabricItemSettings; -import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; - -import com.shnupbups.resourcemelons.RMCommon; -import com.shnupbups.resourcemelons.block.ResourceMelonAttachedStemBlock; -import com.shnupbups.resourcemelons.block.ResourceMelonBlock; -import com.shnupbups.resourcemelons.block.ResourceMelonStemBlock; -import com.shnupbups.resourcemelons.item.ResourceMelonSliceItem; - public interface MelonTypeBuilder { static FabricBlockSettings getMelonSettings() { return FabricBlockSettings.of(Material.GOURD).strength(1.0F).sounds(BlockSoundGroup.STONE).requiresTool(); @@ -57,7 +55,7 @@ default MelonType getType() { void setType(MelonType type); - record Info(Identifier id, Item resource, Block resourceBlock, Tag catalyst, int colour, + record Info(Identifier id, Item resource, Block resourceBlock, TagKey catalyst, int colour, float resourceChanceMultiplier, float seedsChanceMultiplier, int miningLevel) { } } diff --git a/src/main/java/com/shnupbups/resourcemelons/datagen/provider/RMBlockTagsProvider.java b/src/main/java/com/shnupbups/resourcemelons/datagen/provider/RMBlockTagsProvider.java index 95424d0..a813965 100644 --- a/src/main/java/com/shnupbups/resourcemelons/datagen/provider/RMBlockTagsProvider.java +++ b/src/main/java/com/shnupbups/resourcemelons/datagen/provider/RMBlockTagsProvider.java @@ -1,31 +1,29 @@ package com.shnupbups.resourcemelons.datagen.provider; +import com.shnupbups.resourcemelons.RMCommon; +import com.shnupbups.resourcemelons.core.MelonType; +import com.shnupbups.resourcemelons.misc.RMTags; +import net.fabricmc.fabric.api.datagen.v1.FabricDataGenerator; +import net.fabricmc.fabric.api.datagen.v1.provider.FabricTagProvider; import net.minecraft.block.Block; import net.minecraft.block.Blocks; import net.minecraft.tag.BlockTags; -import net.minecraft.tag.Tag; +import net.minecraft.tag.TagKey; import net.minecraft.util.Identifier; - -import net.fabricmc.fabric.api.datagen.v1.FabricDataGenerator; -import net.fabricmc.fabric.api.datagen.v1.provider.FabricTagProvider; -import net.fabricmc.fabric.api.tag.TagFactory; - -import com.shnupbups.resourcemelons.RMCommon; -import com.shnupbups.resourcemelons.core.MelonType; -import com.shnupbups.resourcemelons.misc.RMTags; +import net.minecraft.util.registry.Registry; public class RMBlockTagsProvider extends FabricTagProvider.BlockTagProvider { public RMBlockTagsProvider(FabricDataGenerator dataGenerator) { super(dataGenerator); } - public static Tag.Identified getMiningLevelTag(int miningLevel) { + public static TagKey getMiningLevelTag(int miningLevel) { if (miningLevel <= 0) return null; return switch (miningLevel) { case 1 -> BlockTags.NEEDS_STONE_TOOL; case 2 -> BlockTags.NEEDS_IRON_TOOL; case 3 -> BlockTags.NEEDS_DIAMOND_TOOL; - default -> TagFactory.BLOCK.create(new Identifier("fabric", "needs_tool_level_" + miningLevel)); + default -> TagKey.of(Registry.BLOCK_KEY, new Identifier("fabric", "needs_tool_level_" + miningLevel)); }; } @@ -43,7 +41,7 @@ protected void generateTags() { resourceMelons.add(melonType.melon()); resourceMelonUnattachedStems.add(melonType.stem()); resourceMelonAttachedStems.add(melonType.attachedStem()); - Tag.Identified miningLevelTag = getMiningLevelTag(melonType.miningLevel()); + TagKey miningLevelTag = getMiningLevelTag(melonType.miningLevel()); if (miningLevelTag != null) { getOrCreateTagBuilder(miningLevelTag).add(melonType.stem(), melonType.attachedStem(), melonType.melon()); } diff --git a/src/main/java/com/shnupbups/resourcemelons/datagen/provider/RMModelsProvider.java b/src/main/java/com/shnupbups/resourcemelons/datagen/provider/RMModelsProvider.java index 580914d..115ba02 100644 --- a/src/main/java/com/shnupbups/resourcemelons/datagen/provider/RMModelsProvider.java +++ b/src/main/java/com/shnupbups/resourcemelons/datagen/provider/RMModelsProvider.java @@ -1,16 +1,16 @@ package com.shnupbups.resourcemelons.datagen.provider; import net.minecraft.block.Blocks; +import net.minecraft.data.client.BlockStateModelGenerator; +import net.minecraft.data.client.BlockStateVariant; +import net.minecraft.data.client.BlockStateVariantMap; import net.minecraft.data.client.ItemModelGenerator; -import net.minecraft.data.client.model.BlockStateModelGenerator; -import net.minecraft.data.client.model.BlockStateVariant; -import net.minecraft.data.client.model.BlockStateVariantMap; -import net.minecraft.data.client.model.ModelIds; -import net.minecraft.data.client.model.Models; -import net.minecraft.data.client.model.Texture; -import net.minecraft.data.client.model.TexturedModel; -import net.minecraft.data.client.model.VariantSettings; -import net.minecraft.data.client.model.VariantsBlockStateSupplier; +import net.minecraft.data.client.ModelIds; +import net.minecraft.data.client.Models; +import net.minecraft.data.client.TextureMap; +import net.minecraft.data.client.TexturedModel; +import net.minecraft.data.client.VariantSettings; +import net.minecraft.data.client.VariantsBlockStateSupplier; import net.minecraft.state.property.Properties; import net.minecraft.util.Identifier; import net.minecraft.util.math.Direction; @@ -61,8 +61,8 @@ public static void registerResourceMelonBlockStateModels(BlockStateModelGenerato blockStateModelGenerator.registerSingleton(melonType.melon(), TexturedModel.CUBE_COLUMN); blockStateModelGenerator.registerParentedItemModel(melonType.melon(), ModelIds.getBlockModelId(melonType.melon())); blockStateModelGenerator.registerItemModel(melonType.stem().asItem()); - Texture texture = Texture.stem(Blocks.MELON_STEM); - Texture texture2 = Texture.stemAndUpper(Blocks.MELON_STEM, Blocks.ATTACHED_MELON_STEM); + TextureMap texture = TextureMap.stem(Blocks.MELON_STEM); + TextureMap texture2 = TextureMap.stemAndUpper(Blocks.MELON_STEM, Blocks.ATTACHED_MELON_STEM); Identifier identifier = Models.STEM_FRUIT.upload(melonType.attachedStem(), texture2, blockStateModelGenerator.modelCollector); blockStateModelGenerator.blockStateCollector.accept(VariantsBlockStateSupplier.create(melonType.attachedStem(), BlockStateVariant.create().put(VariantSettings.MODEL, identifier)).coordinate(BlockStateVariantMap.create(Properties.HORIZONTAL_FACING).register(Direction.WEST, BlockStateVariant.create()).register(Direction.SOUTH, BlockStateVariant.create().put(VariantSettings.Y, VariantSettings.Rotation.R270)).register(Direction.NORTH, BlockStateVariant.create().put(VariantSettings.Y, VariantSettings.Rotation.R90)).register(Direction.EAST, BlockStateVariant.create().put(VariantSettings.Y, VariantSettings.Rotation.R180)))); blockStateModelGenerator.blockStateCollector.accept(VariantsBlockStateSupplier.create(melonType.stem()).coordinate(BlockStateVariantMap.create(Properties.AGE_7).register(integer -> BlockStateVariant.create().put(VariantSettings.MODEL, Models.STEM_GROWTH_STAGES[integer].upload(melonType.stem(), texture, blockStateModelGenerator.modelCollector))))); diff --git a/src/main/java/com/shnupbups/resourcemelons/datagen/provider/RMRecipesProvider.java b/src/main/java/com/shnupbups/resourcemelons/datagen/provider/RMRecipesProvider.java index 558eaf0..8569c23 100644 --- a/src/main/java/com/shnupbups/resourcemelons/datagen/provider/RMRecipesProvider.java +++ b/src/main/java/com/shnupbups/resourcemelons/datagen/provider/RMRecipesProvider.java @@ -1,12 +1,11 @@ package com.shnupbups.resourcemelons.datagen.provider; import java.util.function.Consumer; - -import net.minecraft.data.server.RecipesProvider; -import net.minecraft.data.server.recipe.CraftingRecipeJsonFactory; +import net.minecraft.data.server.RecipeProvider; +import net.minecraft.data.server.recipe.CraftingRecipeJsonBuilder; import net.minecraft.data.server.recipe.RecipeJsonProvider; -import net.minecraft.data.server.recipe.ShapedRecipeJsonFactory; -import net.minecraft.data.server.recipe.ShapelessRecipeJsonFactory; +import net.minecraft.data.server.recipe.ShapedRecipeJsonBuilder; +import net.minecraft.data.server.recipe.ShapelessRecipeJsonBuilder; import net.minecraft.item.Items; import net.fabricmc.fabric.api.datagen.v1.FabricDataGenerator; @@ -21,26 +20,26 @@ public RMRecipesProvider(FabricDataGenerator dataGenerator) { } public static void offerRecipes(MelonType melonType, Consumer exporter) { - createSeedsRecipe(melonType).criterion(RecipesProvider.hasItem(melonType.resourceBlock()), RecipesProvider.conditionsFromItem(melonType.resourceBlock())).offerTo(exporter); - createAltSeedsRecipe(melonType).criterion(RecipesProvider.hasItem(melonType.resourceBlock()), RecipesProvider.conditionsFromItem(melonType.resourceBlock())).offerTo(exporter, CraftingRecipeJsonFactory.getItemId(melonType.seeds()) + "_alt"); - createSeedsFromMelonRecipe(melonType).criterion(RecipesProvider.hasItem(melonType.melon()), RecipesProvider.conditionsFromItem(melonType.melon())).offerTo(exporter, CraftingRecipeJsonFactory.getItemId(melonType.seeds()) + "_from_melon"); - createMelonRecipe(melonType).criterion(RecipesProvider.hasItem(melonType.slice()), RecipesProvider.conditionsFromItem(melonType.slice())).offerTo(exporter); + createSeedsRecipe(melonType).criterion(RecipeProvider.hasItem(melonType.resourceBlock()), RecipeProvider.conditionsFromItem(melonType.resourceBlock())).offerTo(exporter); + createAltSeedsRecipe(melonType).criterion(RecipeProvider.hasItem(melonType.resourceBlock()), RecipeProvider.conditionsFromItem(melonType.resourceBlock())).offerTo(exporter, CraftingRecipeJsonBuilder.getItemId(melonType.seeds()) + "_alt"); + createSeedsFromMelonRecipe(melonType).criterion(RecipeProvider.hasItem(melonType.melon()), RecipeProvider.conditionsFromItem(melonType.melon())).offerTo(exporter, CraftingRecipeJsonBuilder.getItemId(melonType.seeds()) + "_from_melon"); + createMelonRecipe(melonType).criterion(RecipeProvider.hasItem(melonType.slice()), RecipeProvider.conditionsFromItem(melonType.slice())).offerTo(exporter); } - public static CraftingRecipeJsonFactory createSeedsRecipe(MelonType melonType) { - return ShapedRecipeJsonFactory.create(melonType.seeds()).input('r', melonType.resource()).input('b', melonType.resourceBlock()).input('s', Items.MELON_SEEDS).pattern("rbr").pattern("bsb").pattern("rbr").group(CraftingRecipeJsonFactory.getItemId(melonType.seeds()).getPath()); + public static CraftingRecipeJsonBuilder createSeedsRecipe(MelonType melonType) { + return ShapedRecipeJsonBuilder.create(melonType.seeds()).input('r', melonType.resource()).input('b', melonType.resourceBlock()).input('s', Items.MELON_SEEDS).pattern("rbr").pattern("bsb").pattern("rbr").group(CraftingRecipeJsonBuilder.getItemId(melonType.seeds()).getPath()); } - public static CraftingRecipeJsonFactory createAltSeedsRecipe(MelonType melonType) { - return ShapedRecipeJsonFactory.create(melonType.seeds()).input('r', melonType.resource()).input('b', melonType.resourceBlock()).input('s', Items.MELON_SEEDS).pattern("brb").pattern("rsr").pattern("brb").group(CraftingRecipeJsonFactory.getItemId(melonType.seeds()).getPath()); + public static CraftingRecipeJsonBuilder createAltSeedsRecipe(MelonType melonType) { + return ShapedRecipeJsonBuilder.create(melonType.seeds()).input('r', melonType.resource()).input('b', melonType.resourceBlock()).input('s', Items.MELON_SEEDS).pattern("brb").pattern("rsr").pattern("brb").group(CraftingRecipeJsonBuilder.getItemId(melonType.seeds()).getPath()); } - public static CraftingRecipeJsonFactory createMelonRecipe(MelonType melonType) { - return ShapedRecipeJsonFactory.create(melonType.melon()).input('s', melonType.slice()).pattern("sss").pattern("sss").pattern("sss"); + public static CraftingRecipeJsonBuilder createMelonRecipe(MelonType melonType) { + return ShapedRecipeJsonBuilder.create(melonType.melon()).input('s', melonType.slice()).pattern("sss").pattern("sss").pattern("sss"); } - public static CraftingRecipeJsonFactory createSeedsFromMelonRecipe(MelonType melonType) { - return ShapelessRecipeJsonFactory.create(melonType.seeds()).input(melonType.melon()); + public static CraftingRecipeJsonBuilder createSeedsFromMelonRecipe(MelonType melonType) { + return ShapelessRecipeJsonBuilder.create(melonType.seeds()).input(melonType.melon()); } @Override diff --git a/src/main/java/com/shnupbups/resourcemelons/misc/RMTags.java b/src/main/java/com/shnupbups/resourcemelons/misc/RMTags.java index ddd5fd4..c42262b 100644 --- a/src/main/java/com/shnupbups/resourcemelons/misc/RMTags.java +++ b/src/main/java/com/shnupbups/resourcemelons/misc/RMTags.java @@ -1,61 +1,59 @@ package com.shnupbups.resourcemelons.misc; +import com.shnupbups.resourcemelons.RMCommon; import net.minecraft.block.Block; import net.minecraft.item.Item; -import net.minecraft.tag.Tag; - -import net.fabricmc.fabric.api.tag.TagFactory; - -import com.shnupbups.resourcemelons.RMCommon; +import net.minecraft.tag.TagKey; +import net.minecraft.util.registry.Registry; public class RMTags { public static class BlockTags { - public static final Tag.Identified UNWAXED_COPPER_BLOCKS = create("unwaxed_copper_blocks"); - public static final Tag.Identified WAXED_COPPER_BLOCKS = create("waxed_copper_blocks"); - public static final Tag.Identified COPPER_BLOCKS = create("copper_blocks"); - public static final Tag.Identified UNWAXED_CUT_COPPER = create("unwaxed_cut_copper"); - public static final Tag.Identified WAXED_CUT_COPPER = create("waxed_cut_copper"); - public static final Tag.Identified CUT_COPPER = create("cut_copper"); - public static final Tag.Identified QUARTZ_BLOCKS = create("quartz_blocks"); - - public static final Tag.Identified RESOURCE_MELONS = create("resource_melons"); - public static final Tag.Identified RESOURCE_MELON_ATTACHED_STEMS = create("resource_melon_attached_stems"); - public static final Tag.Identified RESOURCE_MELON_UNATTACHED_STEMS = create("resource_melon_unattached_stems"); - public static final Tag.Identified RESOURCE_MELON_STEMS = create("resource_melon_stems"); - - public static final Tag.Identified DIAMOND_MELON_CATALYSTS = create("diamond_melon_catalysts"); - public static final Tag.Identified GOLD_MELON_CATALYSTS = create("gold_melon_catalysts"); - public static final Tag.Identified EMERALD_MELON_CATALYSTS = create("emerald_melon_catalysts"); - public static final Tag.Identified IRON_MELON_CATALYSTS = create("iron_melon_catalysts"); - public static final Tag.Identified LAPIS_MELON_CATALYSTS = create("lapis_melon_catalysts"); - public static final Tag.Identified REDSTONE_MELON_CATALYSTS = create("redstone_melon_catalysts"); - public static final Tag.Identified COAL_MELON_CATALYSTS = create("coal_melon_catalysts"); - public static final Tag.Identified QUARTZ_MELON_CATALYSTS = create("quartz_melon_catalysts"); - public static final Tag.Identified GLOWSTONE_MELON_CATALYSTS = create("redstone_melon_catalysts"); - public static final Tag.Identified COPPER_MELON_CATALYSTS = create("copper_melon_catalysts"); - public static final Tag.Identified AMETHYST_MELON_CATALYSTS = create("amethyst_melon_catalysts"); - public static final Tag.Identified NETHERITE_MELON_CATALYSTS = create("netherite_melon_catalysts"); + public static final TagKey UNWAXED_COPPER_BLOCKS = create("unwaxed_copper_blocks"); + public static final TagKey WAXED_COPPER_BLOCKS = create("waxed_copper_blocks"); + public static final TagKey COPPER_BLOCKS = create("copper_blocks"); + public static final TagKey UNWAXED_CUT_COPPER = create("unwaxed_cut_copper"); + public static final TagKey WAXED_CUT_COPPER = create("waxed_cut_copper"); + public static final TagKey CUT_COPPER = create("cut_copper"); + public static final TagKey QUARTZ_BLOCKS = create("quartz_blocks"); + + public static final TagKey RESOURCE_MELONS = create("resource_melons"); + public static final TagKey RESOURCE_MELON_ATTACHED_STEMS = create("resource_melon_attached_stems"); + public static final TagKey RESOURCE_MELON_UNATTACHED_STEMS = create("resource_melon_unattached_stems"); + public static final TagKey RESOURCE_MELON_STEMS = create("resource_melon_stems"); + + public static final TagKey DIAMOND_MELON_CATALYSTS = create("diamond_melon_catalysts"); + public static final TagKey GOLD_MELON_CATALYSTS = create("gold_melon_catalysts"); + public static final TagKey EMERALD_MELON_CATALYSTS = create("emerald_melon_catalysts"); + public static final TagKey IRON_MELON_CATALYSTS = create("iron_melon_catalysts"); + public static final TagKey LAPIS_MELON_CATALYSTS = create("lapis_melon_catalysts"); + public static final TagKey REDSTONE_MELON_CATALYSTS = create("redstone_melon_catalysts"); + public static final TagKey COAL_MELON_CATALYSTS = create("coal_melon_catalysts"); + public static final TagKey QUARTZ_MELON_CATALYSTS = create("quartz_melon_catalysts"); + public static final TagKey GLOWSTONE_MELON_CATALYSTS = create("redstone_melon_catalysts"); + public static final TagKey COPPER_MELON_CATALYSTS = create("copper_melon_catalysts"); + public static final TagKey AMETHYST_MELON_CATALYSTS = create("amethyst_melon_catalysts"); + public static final TagKey NETHERITE_MELON_CATALYSTS = create("netherite_melon_catalysts"); public static void init() { } - public static Tag.Identified create(String id) { - return TagFactory.BLOCK.create(RMCommon.id(id)); + public static TagKey create(String id) { + return TagKey.of(Registry.BLOCK_KEY, RMCommon.id(id)); } } public static class ItemTags { - public static final Tag.Identified RESOURCE_MELON_SLICES = create("resource_melon_slices"); - public static final Tag.Identified RESOURCE_MELON_SEEDS = create("resource_melon_seeds"); - public static final Tag.Identified RESOURCE_MELONS = create("resource_melons"); + public static final TagKey RESOURCE_MELON_SLICES = create("resource_melon_slices"); + public static final TagKey RESOURCE_MELON_SEEDS = create("resource_melon_seeds"); + public static final TagKey RESOURCE_MELONS = create("resource_melons"); public static void init() { } - public static Tag.Identified create(String id) { - return TagFactory.ITEM.create(RMCommon.id(id)); + public static TagKey create(String id) { + return TagKey.of(Registry.ITEM_KEY, RMCommon.id(id)); } } } diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index ee3d5f3..717e2f0 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -38,11 +38,9 @@ ] }, - "accessWidener" : "resourcemelons.accesswidener", - "depends": { - "fabricloader": ">=0.6.1", + "fabricloader": ">=0.14.14", "fabric": "*", - "cloth-config": ">=6.0.45" + "cloth-config": ">=6.1.48" } } diff --git a/src/main/resources/resourcemelons.accesswidener b/src/main/resources/resourcemelons.accesswidener deleted file mode 100644 index 22c3d5e..0000000 --- a/src/main/resources/resourcemelons.accesswidener +++ /dev/null @@ -1,4 +0,0 @@ -accessWidener v2 named - -accessible field net/minecraft/data/client/model/BlockStateModelGenerator blockStateCollector Ljava/util/function/Consumer; -accessible field net/minecraft/data/client/model/BlockStateModelGenerator modelCollector Ljava/util/function/BiConsumer; \ No newline at end of file