Note: Requires Fabric API for Minecraft 1.19.2.
--
Changes:
-- Fixed a crash when running Mo Glass on a server.
--
v1.6 changes:
-- Added tinted glass slabs and stairs.
-- Slightly modified the lighting engine to make tinted glass slabs and stairs possible.
-- Added Italian (Italy) translations. (Thanks to XfedeX!)
-- Added French (France) translations. (Thanks to HanatakeYurii!)
-- Added various common item tags that other mods can use in their crafting recipes to specify what kind of glass they want.
-- Added a "mo_glass:glass_slabs" block tag containing all glass slabs and a "mo_glass:glass_stairs" block tag containing all glass stairs. This should be useful for vertical slabs mods.
-- Added a "mo_glass:opaque_for_lighting" block tag for blocks that need my lighting engine modification to render properly. This should be useful for mods that change how lighting works.
-- Reduced the file size of Mo Glass. (Thanks to RDKRACZ!)
-- Fixed glass stairs facing each other's front sides not being seamless. (before/after)
-- Fixed glass stairs and glass slabs dripping when placed under a liquid (unlike vanilla glass blocks).
-- Fixed glass stairs and glass slabs blocking the camera in 3rd person view (unlike vanilla glass blocks).
-- Fixed glass slabs not being included in the "minecraft:slabs" tags.
-- Fixed glass stairs not being included in the "minecraft:stairs" tags.
-- Removed support for old Fabric Loader versions without the Log4Shell patch (older than v0.12.10).
+A changelog can be found at: https://www.wimods.net/mo-glass/mo-glass-1-6-1/
+Note: This mod requires Fabric API for Minecraft 1.20.2.
diff --git a/gradle.properties b/gradle.properties index 761b76f..4bdfda0 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,18 +1,19 @@ # Done to increase the memory available to gradle. org.gradle.jvmargs=-Xmx1G +org.gradle.parallel=true # Fabric Properties # check these at https://fabricmc.net/develop/ and # https://www.curseforge.com/minecraft/mc-mods/fabric-api -minecraft_version=1.19.2 -yarn_mappings=1.19.2+build.1 -loader_version=0.14.9 +minecraft_version=1.20.2 +yarn_mappings=1.20.2+build.4 +loader_version=0.14.22 #Fabric api -fabric_version=0.58.6+1.19.2 +fabric_version=0.89.3+1.20.2 # Mod Properties -mod_version = 1.6.1-MC1.19.2 +mod_version = 1.6.1-MC1.20.2 maven_group = net.wurstclient.glass archives_base_name = Mo-Glass diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 7454180..c1962a7 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 e750102..ac72c34 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-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip +networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index a58591e..aeb74cb 100644 --- a/gradlew +++ b/gradlew @@ -55,7 +55,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# 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/. @@ -80,13 +80,10 @@ do esac done -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit - -APP_NAME="Gradle" +# This is normally unused +# shellcheck disable=SC2034 APP_BASE_NAME=${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"' +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -143,12 +140,16 @@ 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 @@ -193,6 +194,10 @@ if "$cygwin" || "$msys" ; then done fi + +# 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 $GRADLE_OPTS can contain fragments of # shell script including quotes and variable substitutions, so put them in @@ -205,6 +210,12 @@ set -- \ 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. @@ -231,4 +242,4 @@ eval "set -- $( tr '\n' ' ' )" '"$@"' -exec "$JAVACMD" "$@" \ No newline at end of file +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat index 9618d8d..6689b85 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -1,100 +1,92 @@ -@rem -@rem Copyright 2015 the original author or authors. -@rem -@rem Licensed under the Apache License, Version 2.0 (the "License"); -@rem you may not use this file except in compliance with the License. -@rem You may obtain a copy of the License at -@rem -@rem https://www.apache.org/licenses/LICENSE-2.0 -@rem -@rem Unless required by applicable law or agreed to in writing, software -@rem distributed under the License is distributed on an "AS IS" BASIS, -@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@rem See the License for the specific language governing permissions and -@rem limitations under the License. -@rem - -@if "%DEBUG%" == "" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto init - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:init -@rem Get command-line arguments, handling Windows variants - -if not "%OS%" == "Windows_NT" goto win9xME_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega +@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/net/wurstclient/glass/GlassSlabBlock.java b/src/main/java/net/wurstclient/glass/GlassSlabBlock.java index a5af76a..b3c4de3 100644 --- a/src/main/java/net/wurstclient/glass/GlassSlabBlock.java +++ b/src/main/java/net/wurstclient/glass/GlassSlabBlock.java @@ -136,7 +136,7 @@ public float getAmbientOcclusionLightLevel(BlockState blockState_1, } @Override - public boolean isTranslucent(BlockState blockState_1, BlockView blockView_1, + public boolean isTransparent(BlockState blockState_1, BlockView blockView_1, BlockPos blockPos_1) { return true; diff --git a/src/main/java/net/wurstclient/glass/GlassStairsBlock.java b/src/main/java/net/wurstclient/glass/GlassStairsBlock.java index a5833ed..a1ceec9 100644 --- a/src/main/java/net/wurstclient/glass/GlassStairsBlock.java +++ b/src/main/java/net/wurstclient/glass/GlassStairsBlock.java @@ -307,7 +307,7 @@ public float getAmbientOcclusionLightLevel(BlockState blockState_1, } @Override - public boolean isTranslucent(BlockState blockState_1, BlockView blockView_1, + public boolean isTransparent(BlockState blockState_1, BlockView blockView_1, BlockPos blockPos_1) { return true; diff --git a/src/main/java/net/wurstclient/glass/MoGlassBlocks.java b/src/main/java/net/wurstclient/glass/MoGlassBlocks.java index 3ed9df1..b3e65b9 100644 --- a/src/main/java/net/wurstclient/glass/MoGlassBlocks.java +++ b/src/main/java/net/wurstclient/glass/MoGlassBlocks.java @@ -8,39 +8,41 @@ package net.wurstclient.glass; import net.fabricmc.fabric.api.blockrenderlayer.v1.BlockRenderLayerMap; +import net.fabricmc.fabric.api.itemgroup.v1.ItemGroupEvents; import net.minecraft.block.AbstractBlock; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; import net.minecraft.block.MapColor; -import net.minecraft.block.Material; +import net.minecraft.block.enums.Instrument; import net.minecraft.client.render.RenderLayer; import net.minecraft.entity.EntityType; import net.minecraft.item.BlockItem; import net.minecraft.item.Item; import net.minecraft.item.Item.Settings; -import net.minecraft.item.ItemGroup; +import net.minecraft.item.ItemGroups; +import net.minecraft.registry.Registries; +import net.minecraft.registry.Registry; import net.minecraft.sound.BlockSoundGroup; import net.minecraft.util.DyeColor; import net.minecraft.util.Identifier; import net.minecraft.util.math.BlockPos; -import net.minecraft.util.registry.Registry; import net.minecraft.world.BlockView; public enum MoGlassBlocks { ; - public static final Block GLASS_SLAB = - new GlassSlabBlock(AbstractBlock.Settings.of(Material.GLASS) - .strength(0.3F).sounds(BlockSoundGroup.GLASS).nonOpaque() + public static final Block GLASS_SLAB = new GlassSlabBlock( + AbstractBlock.Settings.create().instrument(Instrument.HAT).strength(0.3F) + .sounds(BlockSoundGroup.GLASS).nonOpaque() .allowsSpawning(MoGlassBlocks::never) .solidBlock(MoGlassBlocks::never).suffocates(MoGlassBlocks::never) .blockVision(MoGlassBlocks::never)); - public static final Block GLASS_STAIRS = - new GlassStairsBlock(AbstractBlock.Settings.of(Material.GLASS) - .strength(0.3F).sounds(BlockSoundGroup.GLASS).nonOpaque() + public static final Block GLASS_STAIRS = new GlassStairsBlock( + AbstractBlock.Settings.create().instrument(Instrument.HAT).strength(0.3F) + .sounds(BlockSoundGroup.GLASS).nonOpaque() .allowsSpawning(MoGlassBlocks::never) .solidBlock(MoGlassBlocks::never).suffocates(MoGlassBlocks::never) .blockVision(MoGlassBlocks::never)); @@ -145,17 +147,11 @@ public enum MoGlassBlocks public static void initialize() { - registerBlockCutoutMipped(GLASS_SLAB, "glass_slab", - ItemGroup.BUILDING_BLOCKS); + registerBlockCutoutMipped(GLASS_SLAB, "glass_slab"); + registerBlockCutoutMipped(GLASS_STAIRS, "glass_stairs"); - registerBlockCutoutMipped(GLASS_STAIRS, "glass_stairs", - ItemGroup.BUILDING_BLOCKS); - - registerBlockTranslucent(TINTED_GLASS_SLAB, "tinted_glass_slab", - ItemGroup.BUILDING_BLOCKS); - - registerBlockTranslucent(TINTED_GLASS_STAIRS, "tinted_glass_stairs", - ItemGroup.BUILDING_BLOCKS); + registerBlockTranslucent(TINTED_GLASS_SLAB, "tinted_glass_slab"); + registerBlockTranslucent(TINTED_GLASS_STAIRS, "tinted_glass_stairs"); String[] colors = {"white", "orange", "magenta", "light_blue", "yellow", "lime", "pink", "gray", "light_gray", "cyan", "purple", "blue", @@ -163,65 +159,74 @@ public static void initialize() for(int i = 0; i < 16; i++) registerBlockTranslucent(STAINED_GLASS_SLABS[i], - colors[i] + "_stained_glass_slab", ItemGroup.BUILDING_BLOCKS); + colors[i] + "_stained_glass_slab"); for(int i = 0; i < 16; i++) registerBlockTranslucent(STAINED_GLASS_STAIRS[i], - colors[i] + "_stained_glass_stairs", ItemGroup.BUILDING_BLOCKS); + colors[i] + "_stained_glass_stairs"); + + ItemGroupEvents.modifyEntriesEvent(ItemGroups.COLORED_BLOCKS) + .register(content -> { + + // stairs + content.addBefore(Blocks.GLASS_PANE, GLASS_STAIRS, + TINTED_GLASS_STAIRS); + content.addBefore(Blocks.GLASS_PANE, STAINED_GLASS_STAIRS); + + // slabs + content.addBefore(Blocks.GLASS_PANE, GLASS_SLAB, + TINTED_GLASS_SLAB); + content.addBefore(Blocks.GLASS_PANE, STAINED_GLASS_SLABS); + }); } - private static void registerBlockTranslucent(Block block, String idPath, - ItemGroup itemGroup) + private static void registerBlockTranslucent(Block block, String idPath) { - registerBlock(block, idPath, itemGroup); + registerBlock(block, idPath); if(MoGlass.INSTANCE.isClient()) BlockRenderLayerMap.INSTANCE.putBlock(block, RenderLayer.getTranslucent()); } - private static void registerBlockCutoutMipped(Block block, String idPath, - ItemGroup itemGroup) + private static void registerBlockCutoutMipped(Block block, String idPath) { - registerBlock(block, idPath, itemGroup); + registerBlock(block, idPath); if(MoGlass.INSTANCE.isClient()) BlockRenderLayerMap.INSTANCE.putBlock(block, RenderLayer.getCutoutMipped()); } - private static void registerBlock(Block block, String idPath, - ItemGroup itemGroup) + private static void registerBlock(Block block, String idPath) { Identifier identifier = new Identifier("mo_glass", idPath); - Registry.register(Registry.BLOCK, identifier, block); + Registry.register(Registries.BLOCK, identifier, block); - Settings itemSettings = new Item.Settings().group(itemGroup); + Settings itemSettings = new Item.Settings(); BlockItem blockItem = new BlockItem(block, itemSettings); - Registry.register(Registry.ITEM, identifier, blockItem); + Registry.register(Registries.ITEM, identifier, blockItem); } private static StainedGlassSlabBlock createStainedGlassSlab(DyeColor color) { - return new StainedGlassSlabBlock(color, - AbstractBlock.Settings.of(Material.GLASS, color).strength(0.3F) - .sounds(BlockSoundGroup.GLASS).nonOpaque() - .allowsSpawning(MoGlassBlocks::never) - .solidBlock(MoGlassBlocks::never) - .suffocates(MoGlassBlocks::never) - .blockVision(MoGlassBlocks::never)); + return new StainedGlassSlabBlock(color, AbstractBlock.Settings.create() + .mapColor(color).instrument(Instrument.HAT).strength(0.3F) + .sounds(BlockSoundGroup.GLASS).nonOpaque() + .allowsSpawning(MoGlassBlocks::never) + .solidBlock(MoGlassBlocks::never).suffocates(MoGlassBlocks::never) + .blockVision(MoGlassBlocks::never)); } private static StainedGlassStairsBlock createStainedGlassStairs( DyeColor color) { - return new StainedGlassStairsBlock(color, - AbstractBlock.Settings.of(Material.GLASS, color).strength(0.3F) - .sounds(BlockSoundGroup.GLASS).nonOpaque() - .allowsSpawning(MoGlassBlocks::never) - .solidBlock(MoGlassBlocks::never) - .suffocates(MoGlassBlocks::never) - .blockVision(MoGlassBlocks::never)); + return new StainedGlassStairsBlock(color, AbstractBlock.Settings.create() + .mapColor(color).instrument(Instrument.HAT).strength(0.3F) + .sounds(BlockSoundGroup.GLASS).nonOpaque() + .allowsSpawning(MoGlassBlocks::never) + .solidBlock(MoGlassBlocks::never).suffocates(MoGlassBlocks::never) + .blockVision(MoGlassBlocks::never)); } // Copies of the Blocks.never() methods because the originals are not diff --git a/src/main/java/net/wurstclient/glass/MoGlassTags.java b/src/main/java/net/wurstclient/glass/MoGlassTags.java index 32f1943..a314d6e 100644 --- a/src/main/java/net/wurstclient/glass/MoGlassTags.java +++ b/src/main/java/net/wurstclient/glass/MoGlassTags.java @@ -8,9 +8,9 @@ package net.wurstclient.glass; import net.minecraft.block.Block; -import net.minecraft.tag.TagKey; +import net.minecraft.registry.RegistryKeys; +import net.minecraft.registry.tag.TagKey; import net.minecraft.util.Identifier; -import net.minecraft.util.registry.Registry; import net.wurstclient.glass.mixin.ChunkLightProviderMixin; public enum MoGlassTags @@ -46,7 +46,7 @@ public enum MoGlassTags private static TagKey