diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 827bf76..6ffedcc 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -48,8 +48,8 @@ jobs: files-primary: build/libs/!(*-@(dev|sources)).jar files-secondary: null - name: Release 4.2.0 for Minecraft 1.19.4 - version: 4.2.0+1.19.4 + name: Release 5.0.0 for Minecraft 1.20 + version: 5.0.0+1.20 version-type: release loaders: | @@ -59,7 +59,10 @@ jobs: fabric-api | depends | * game-versions: | - 1.19.4 + [1.20-rc1,1.20.1-rc1] + + game-version-filter: | + any java: | 17 diff --git a/gradle.properties b/gradle.properties index 2547fc5..af4d386 100755 --- a/gradle.properties +++ b/gradle.properties @@ -2,25 +2,27 @@ org.gradle.jvmargs = -Xmx2G # Gradle Plugins -fabric_loom_version = 1.1-SNAPSHOT +fabric_loom_version = 1.2-SNAPSHOT loom_quiltflower_version = 1.8.0 checkstyle_version = 10.5.0 # Mod Properties -mod_version = 4.2.0+1.19.4 +mod_version = 5.0.0+1.20 maven_group = com.github.reviversmc archives_base_name = modern-glass-doors # Mod Dependencies -minecraft_version = 1.19.4 -fabric_loader_version = 0.14.18 -fabric_api_version = 0.76.0+1.19.4 -yarn_mappings = 1.19.4+build.1 +minecraft_version = 1.20 +fabric_loader_version = 0.14.21 +fabric_api_version = 0.83.0+1.20 +yarn_mappings = 1.20+build.1 # If true, third-party mods will be loaded during runtime in the developer run configurations -use_third_party_mods = true +# To be disabled for the time being to protect from fractureiser +use_third_party_mods = false +# Everything is outdated modmenu_version = 6.1.0-rc.4 sodium_version = mc1.19.4-0.4.10 lithium_version = mc1.19.4-0.11.1 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 29953ea..943f0cb 100755 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 7e6199b..0c85a1f 100755 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -distributionBase = GRADLE_USER_HOME -distributionPath = wrapper/dists -distributionUrl = https\://services.gradle.org/distributions/gradle-7.6-bin.zip -networkTimeout = 10000 -zipStoreBase = GRADLE_USER_HOME -zipStorePath = wrapper/dists +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-bin.zip +networkTimeout=10000 +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index cccdd3d..65dcd68 100755 --- a/gradlew +++ b/gradlew @@ -1,78 +1,129 @@ -#!/usr/bin/env sh +#!/bin/sh + +# +# 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. +# 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 -## +# +# 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="" +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 @@ -81,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 @@ -89,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, 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")" +# 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 +# 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..6689b85 100755 --- a/gradlew.bat +++ b/gradlew.bat @@ -1,84 +1,92 @@ -@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= - -@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 +@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=. +@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" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +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. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +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. + +goto fail + +: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 %* + +:end +@rem End local scope for the variables with windows NT shell +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! +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 + +:omega diff --git a/src/main/java/com/github/reviversmc/modern_glass_doors/ModernGlassDoors.java b/src/main/java/com/github/reviversmc/modern_glass_doors/ModernGlassDoors.java index a4ffd37..26f3dfc 100644 --- a/src/main/java/com/github/reviversmc/modern_glass_doors/ModernGlassDoors.java +++ b/src/main/java/com/github/reviversmc/modern_glass_doors/ModernGlassDoors.java @@ -4,6 +4,11 @@ import net.fabricmc.fabric.api.itemgroup.v1.FabricItemGroup; import net.minecraft.item.ItemGroup; import net.minecraft.item.ItemStack; +import net.minecraft.registry.Registries; +import net.minecraft.registry.Registry; +import net.minecraft.registry.RegistryKey; +import net.minecraft.registry.RegistryKeys; +import net.minecraft.text.Text; import net.minecraft.util.Identifier; import com.github.reviversmc.modern_glass_doors.blocks.ModernGlassDoorsBlocks; @@ -13,11 +18,14 @@ public class ModernGlassDoors implements ModInitializer { public static final String MOD_ID = "modern_glass_doors"; // ItemGroup Declaration - public static final ItemGroup ITEM_GROUP = FabricItemGroup.builder(new Identifier(MOD_ID, "blocks")) - .icon(() -> new ItemStack(ModernGlassDoorsBlocks.OAK_GLASS_DOOR.asItem())) - .build(); + public static final RegistryKey ITEM_GROUP = RegistryKey.of(RegistryKeys.ITEM_GROUP, new Identifier(MOD_ID, "blocks")); @Override public void onInitialize() { + Registry.register(Registries.ITEM_GROUP, ITEM_GROUP, FabricItemGroup.builder() + .displayName(Text.translatable("itemGroup." + MOD_ID + ".blocks")) + .icon(() -> new ItemStack(ModernGlassDoorsBlocks.OAK_GLASS_DOOR.asItem())) + .build() + ); } } diff --git a/src/main/java/com/github/reviversmc/modern_glass_doors/blocks/GlassDoorBlock.java b/src/main/java/com/github/reviversmc/modern_glass_doors/blocks/GlassDoorBlock.java index 29daf61..1a46370 100644 --- a/src/main/java/com/github/reviversmc/modern_glass_doors/blocks/GlassDoorBlock.java +++ b/src/main/java/com/github/reviversmc/modern_glass_doors/blocks/GlassDoorBlock.java @@ -3,7 +3,6 @@ import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.DoorBlock; -import net.minecraft.block.Material; public class GlassDoorBlock extends DoorBlock { public static BlockState copyState(BlockState state) { @@ -23,17 +22,17 @@ public static BlockState copyState(BlockState state) { return state; } - public final Material materialCategory; + public final MaterialCategory materialCategory; public final DoorBlock parentDoorType; - GlassDoorBlock(Material materialCategory, DoorBlock parentDoorType) { + GlassDoorBlock(MaterialCategory materialCategory, DoorBlock parentDoorType) { super(Block.Settings.copy(parentDoorType), parentDoorType.blockSetType); this.materialCategory = materialCategory; this.parentDoorType = (DoorBlock) parentDoorType; } - public Material getMaterialCategory() { + public MaterialCategory getMaterialCategory() { return materialCategory; } diff --git a/src/main/java/com/github/reviversmc/modern_glass_doors/blocks/GlassTrapdoorBlock.java b/src/main/java/com/github/reviversmc/modern_glass_doors/blocks/GlassTrapdoorBlock.java index b1f3f80..34b85f8 100644 --- a/src/main/java/com/github/reviversmc/modern_glass_doors/blocks/GlassTrapdoorBlock.java +++ b/src/main/java/com/github/reviversmc/modern_glass_doors/blocks/GlassTrapdoorBlock.java @@ -2,7 +2,6 @@ import net.minecraft.block.Block; import net.minecraft.block.BlockState; -import net.minecraft.block.Material; import net.minecraft.block.TrapdoorBlock; public class GlassTrapdoorBlock extends TrapdoorBlock { @@ -25,17 +24,17 @@ public static BlockState copyState(BlockState state) { return state; } - private final Material materialCategory; + private final MaterialCategory materialCategory; private final TrapdoorBlock parentTrapdoorType; - GlassTrapdoorBlock(Material materialCategory, TrapdoorBlock parentTrapdoorType) { + GlassTrapdoorBlock(MaterialCategory materialCategory, TrapdoorBlock parentTrapdoorType) { super(Block.Settings.copy(parentTrapdoorType), parentTrapdoorType.blockSetType); this.materialCategory = materialCategory; this.parentTrapdoorType = (TrapdoorBlock) parentTrapdoorType; } - public Material getMaterialCategory() { + public MaterialCategory getMaterialCategory() { return materialCategory; } diff --git a/src/main/java/com/github/reviversmc/modern_glass_doors/blocks/MaterialCategory.java b/src/main/java/com/github/reviversmc/modern_glass_doors/blocks/MaterialCategory.java new file mode 100644 index 0000000..ce78eb8 --- /dev/null +++ b/src/main/java/com/github/reviversmc/modern_glass_doors/blocks/MaterialCategory.java @@ -0,0 +1,7 @@ +package com.github.reviversmc.modern_glass_doors.blocks; + +public enum MaterialCategory { + WOOD, + NETHER_WOOD, + METAL +} diff --git a/src/main/java/com/github/reviversmc/modern_glass_doors/blocks/ModernGlassDoorsBlocks.java b/src/main/java/com/github/reviversmc/modern_glass_doors/blocks/ModernGlassDoorsBlocks.java index 82f6025..078467c 100644 --- a/src/main/java/com/github/reviversmc/modern_glass_doors/blocks/ModernGlassDoorsBlocks.java +++ b/src/main/java/com/github/reviversmc/modern_glass_doors/blocks/ModernGlassDoorsBlocks.java @@ -7,7 +7,6 @@ import net.minecraft.block.Block; import net.minecraft.block.Blocks; import net.minecraft.block.DoorBlock; -import net.minecraft.block.Material; import net.minecraft.block.TrapdoorBlock; import net.minecraft.item.BlockItem; import net.minecraft.item.Item; @@ -23,32 +22,32 @@ public class ModernGlassDoorsBlocks { public static final List GLASS_TRAPDOORS = new ArrayList<>(); // Glass doors - public static final Block OAK_GLASS_DOOR = registerDoor("oak", Material.WOOD, Blocks.OAK_DOOR); - public static final Block SPRUCE_GLASS_DOOR = registerDoor("spruce", Material.WOOD, Blocks.SPRUCE_DOOR); - public static final Block BIRCH_GLASS_DOOR = registerDoor("birch", Material.WOOD, Blocks.BIRCH_DOOR); - public static final Block ACACIA_GLASS_DOOR = registerDoor("acacia", Material.WOOD, Blocks.ACACIA_DOOR); - public static final Block JUNGLE_GLASS_DOOR = registerDoor("jungle", Material.WOOD, Blocks.JUNGLE_DOOR); - public static final Block DARK_OAK_GLASS_DOOR = registerDoor("dark_oak", Material.WOOD, Blocks.DARK_OAK_DOOR); - public static final Block CRIMSON_GLASS_DOOR = registerDoor("crimson", Material.NETHER_WOOD, Blocks.CRIMSON_DOOR); - public static final Block WARPED_GLASS_DOOR = registerDoor("warped", Material.NETHER_WOOD, Blocks.WARPED_DOOR); - public static final Block IRON_GLASS_DOOR = registerDoor("iron", Material.METAL, Blocks.IRON_DOOR); - public static final Block MANGROVE_GLASS_DOOR = registerDoor("mangrove", Material.WOOD, Blocks.MANGROVE_DOOR); - public static final Block BAMBOO_GLASS_DOOR = registerDoor("bamboo", Material.WOOD, Blocks.BAMBOO_DOOR); + public static final Block OAK_GLASS_DOOR = registerDoor("oak", MaterialCategory.WOOD, Blocks.OAK_DOOR); + public static final Block SPRUCE_GLASS_DOOR = registerDoor("spruce", MaterialCategory.WOOD, Blocks.SPRUCE_DOOR); + public static final Block BIRCH_GLASS_DOOR = registerDoor("birch", MaterialCategory.WOOD, Blocks.BIRCH_DOOR); + public static final Block ACACIA_GLASS_DOOR = registerDoor("acacia", MaterialCategory.WOOD, Blocks.ACACIA_DOOR); + public static final Block JUNGLE_GLASS_DOOR = registerDoor("jungle", MaterialCategory.WOOD, Blocks.JUNGLE_DOOR); + public static final Block DARK_OAK_GLASS_DOOR = registerDoor("dark_oak", MaterialCategory.WOOD, Blocks.DARK_OAK_DOOR); + public static final Block CRIMSON_GLASS_DOOR = registerDoor("crimson", MaterialCategory.NETHER_WOOD, Blocks.CRIMSON_DOOR); + public static final Block WARPED_GLASS_DOOR = registerDoor("warped", MaterialCategory.NETHER_WOOD, Blocks.WARPED_DOOR); + public static final Block IRON_GLASS_DOOR = registerDoor("iron", MaterialCategory.METAL, Blocks.IRON_DOOR); + public static final Block MANGROVE_GLASS_DOOR = registerDoor("mangrove", MaterialCategory.WOOD, Blocks.MANGROVE_DOOR); + public static final Block BAMBOO_GLASS_DOOR = registerDoor("bamboo", MaterialCategory.WOOD, Blocks.BAMBOO_DOOR); // Glass trapdoors - public static final Block OAK_GLASS_TRAPDOOR = registerTrapdoor("oak", Material.WOOD, Blocks.OAK_TRAPDOOR); - public static final Block SPRUCE_GLASS_TRAPDOOR = registerTrapdoor("spruce", Material.WOOD, Blocks.SPRUCE_TRAPDOOR); - public static final Block BIRCH_GLASS_TRAPDOOR = registerTrapdoor("birch", Material.WOOD, Blocks.BIRCH_TRAPDOOR); - public static final Block ACACIA_GLASS_TRAPDOOR = registerTrapdoor("acacia", Material.WOOD, Blocks.ACACIA_TRAPDOOR); - public static final Block JUNGLE_GLASS_TRAPDOOR = registerTrapdoor("jungle", Material.WOOD, Blocks.JUNGLE_TRAPDOOR); - public static final Block DARK_OAK_GLASS_TRAPDOOR = registerTrapdoor("dark_oak", Material.WOOD, Blocks.DARK_OAK_TRAPDOOR); - public static final Block CRIMSON_GLASS_TRAPDOOR = registerTrapdoor("crimson", Material.NETHER_WOOD, Blocks.CRIMSON_TRAPDOOR); - public static final Block WARPED_GLASS_TRAPDOOR = registerTrapdoor("warped", Material.NETHER_WOOD, Blocks.WARPED_TRAPDOOR); - public static final Block IRON_GLASS_TRAPDOOR = registerTrapdoor("iron", Material.METAL, Blocks.IRON_TRAPDOOR); - public static final Block MANGROVE_GLASS_TRAPDOOR = registerTrapdoor("mangrove", Material.WOOD, Blocks.MANGROVE_TRAPDOOR); - public static final Block BAMBOO_GLASS_TRAPDOOR = registerTrapdoor("bamboo", Material.WOOD, Blocks.BAMBOO_TRAPDOOR); + public static final Block OAK_GLASS_TRAPDOOR = registerTrapdoor("oak", MaterialCategory.WOOD, Blocks.OAK_TRAPDOOR); + public static final Block SPRUCE_GLASS_TRAPDOOR = registerTrapdoor("spruce", MaterialCategory.WOOD, Blocks.SPRUCE_TRAPDOOR); + public static final Block BIRCH_GLASS_TRAPDOOR = registerTrapdoor("birch", MaterialCategory.WOOD, Blocks.BIRCH_TRAPDOOR); + public static final Block ACACIA_GLASS_TRAPDOOR = registerTrapdoor("acacia", MaterialCategory.WOOD, Blocks.ACACIA_TRAPDOOR); + public static final Block JUNGLE_GLASS_TRAPDOOR = registerTrapdoor("jungle", MaterialCategory.WOOD, Blocks.JUNGLE_TRAPDOOR); + public static final Block DARK_OAK_GLASS_TRAPDOOR = registerTrapdoor("dark_oak", MaterialCategory.WOOD, Blocks.DARK_OAK_TRAPDOOR); + public static final Block CRIMSON_GLASS_TRAPDOOR = registerTrapdoor("crimson", MaterialCategory.NETHER_WOOD, Blocks.CRIMSON_TRAPDOOR); + public static final Block WARPED_GLASS_TRAPDOOR = registerTrapdoor("warped", MaterialCategory.NETHER_WOOD, Blocks.WARPED_TRAPDOOR); + public static final Block IRON_GLASS_TRAPDOOR = registerTrapdoor("iron", MaterialCategory.METAL, Blocks.IRON_TRAPDOOR); + public static final Block MANGROVE_GLASS_TRAPDOOR = registerTrapdoor("mangrove", MaterialCategory.WOOD, Blocks.MANGROVE_TRAPDOOR); + public static final Block BAMBOO_GLASS_TRAPDOOR = registerTrapdoor("bamboo", MaterialCategory.WOOD, Blocks.BAMBOO_TRAPDOOR); - public static Block registerDoor(String material, Material materialCategory, Block parentDoorType) { + public static Block registerDoor(String material, MaterialCategory materialCategory, Block parentDoorType) { assert parentDoorType instanceof DoorBlock; GlassDoorBlock door = new GlassDoorBlock(materialCategory, (DoorBlock) parentDoorType); @@ -63,7 +62,7 @@ public static Block registerDoor(String material, Material materialCategory, Blo return door; } - public static Block registerTrapdoor(String material, Material materialCategory, Block parentTrapdoorType) { + public static Block registerTrapdoor(String material, MaterialCategory materialCategory, Block parentTrapdoorType) { assert parentTrapdoorType instanceof TrapdoorBlock; GlassTrapdoorBlock trapdoor = new GlassTrapdoorBlock(materialCategory, (TrapdoorBlock) parentTrapdoorType); diff --git a/src/main/java/com/github/reviversmc/modern_glass_doors/datagen/ModernGlassDoorsBlockTagProvider.java b/src/main/java/com/github/reviversmc/modern_glass_doors/datagen/ModernGlassDoorsBlockTagProvider.java index 9626796..797a435 100644 --- a/src/main/java/com/github/reviversmc/modern_glass_doors/datagen/ModernGlassDoorsBlockTagProvider.java +++ b/src/main/java/com/github/reviversmc/modern_glass_doors/datagen/ModernGlassDoorsBlockTagProvider.java @@ -4,11 +4,10 @@ import java.util.List; import java.util.concurrent.CompletableFuture; -import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; import net.fabricmc.fabric.api.datagen.v1.provider.FabricTagProvider; +import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; import net.minecraft.block.Block; import net.minecraft.block.Blocks; -import net.minecraft.block.Material; import net.minecraft.registry.RegistryKeys; import net.minecraft.registry.RegistryWrapper; import net.minecraft.registry.tag.BlockTags; @@ -18,6 +17,7 @@ import com.github.reviversmc.modern_glass_doors.ModernGlassDoors; import com.github.reviversmc.modern_glass_doors.blocks.GlassDoorBlock; import com.github.reviversmc.modern_glass_doors.blocks.GlassTrapdoorBlock; +import com.github.reviversmc.modern_glass_doors.blocks.MaterialCategory; import com.github.reviversmc.modern_glass_doors.blocks.ModernGlassDoorsBlocks; public class ModernGlassDoorsBlockTagProvider extends FabricTagProvider.BlockTagProvider { @@ -52,16 +52,16 @@ protected void configure(RegistryWrapper.WrapperLookup arg) { getOrCreateTagBuilder(BlockTags.PICKAXE_MINEABLE), getOrCreateTagBuilder(METAL_GLASS_TRAPDOORS)); - Material material; + MaterialCategory material; for (GlassDoorBlock door: ModernGlassDoorsBlocks.GLASS_DOORS) { material = door.getMaterialCategory(); - if (material == Material.NETHER_WOOD || material == Material.WOOD) { + if (material == MaterialCategory.NETHER_WOOD || material == MaterialCategory.WOOD) { for (FabricTagBuilder tagBuilder : woodenGlassDoorTagBuilders) { tagBuilder.add(door); } - } else if (material == Material.METAL) { + } else if (material == MaterialCategory.METAL) { for (FabricTagBuilder tagBuilder : metalGlassDoorTagBuilders) { tagBuilder.add(door); } @@ -71,11 +71,11 @@ protected void configure(RegistryWrapper.WrapperLookup arg) { for (GlassTrapdoorBlock trapdoor: ModernGlassDoorsBlocks.GLASS_TRAPDOORS) { material = trapdoor.getMaterialCategory(); - if (material == Material.NETHER_WOOD || material == Material.WOOD) { + if (material == MaterialCategory.NETHER_WOOD || material == MaterialCategory.WOOD) { for (FabricTagBuilder tagBuilder : woodenGlassTrapdoorTagBuilders) { tagBuilder.add(trapdoor); } - } else if (material == Material.METAL) { + } else if (material == MaterialCategory.METAL) { for (FabricTagBuilder tagBuilder : metalGlassTrapdoorTagBuilders) { tagBuilder.add(trapdoor); } diff --git a/src/main/java/com/github/reviversmc/modern_glass_doors/datagen/ModernGlassDoorsItemTagProvider.java b/src/main/java/com/github/reviversmc/modern_glass_doors/datagen/ModernGlassDoorsItemTagProvider.java index 1bd26d7..bdb24b3 100644 --- a/src/main/java/com/github/reviversmc/modern_glass_doors/datagen/ModernGlassDoorsItemTagProvider.java +++ b/src/main/java/com/github/reviversmc/modern_glass_doors/datagen/ModernGlassDoorsItemTagProvider.java @@ -2,14 +2,14 @@ import java.util.concurrent.CompletableFuture; -import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; import net.fabricmc.fabric.api.datagen.v1.provider.FabricTagProvider; -import net.minecraft.block.Material; +import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; import net.minecraft.registry.RegistryWrapper; import net.minecraft.registry.tag.ItemTags; import com.github.reviversmc.modern_glass_doors.blocks.GlassDoorBlock; import com.github.reviversmc.modern_glass_doors.blocks.GlassTrapdoorBlock; +import com.github.reviversmc.modern_glass_doors.blocks.MaterialCategory; import com.github.reviversmc.modern_glass_doors.blocks.ModernGlassDoorsBlocks; public class ModernGlassDoorsItemTagProvider extends FabricTagProvider.ItemTagProvider { @@ -20,13 +20,13 @@ public ModernGlassDoorsItemTagProvider(FabricDataOutput output, CompletableFutur @Override protected void configure(RegistryWrapper.WrapperLookup arg) { for (GlassDoorBlock door: ModernGlassDoorsBlocks.GLASS_DOORS) { - if (door.getMaterialCategory() == Material.NETHER_WOOD) { + if (door.getMaterialCategory() == MaterialCategory.NETHER_WOOD) { getOrCreateTagBuilder(ItemTags.NON_FLAMMABLE_WOOD).add(door.asItem()); } } for (GlassTrapdoorBlock trapdoor: ModernGlassDoorsBlocks.GLASS_TRAPDOORS) { - if (trapdoor.getMaterialCategory() == Material.NETHER_WOOD) { + if (trapdoor.getMaterialCategory() == MaterialCategory.NETHER_WOOD) { getOrCreateTagBuilder(ItemTags.NON_FLAMMABLE_WOOD).add(trapdoor.asItem()); } } diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index e41bae8..3e1bf14 100755 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -39,7 +39,7 @@ ] }, "depends": { - "minecraft": ">=1.19.4-rc.2", + "minecraft": ">=1.20-pre.2", "fabric-item-group-api-v1": "*", "fabric-blockrenderlayer-v1": "*" }