From 7f152d46addcd98ec5ad4315c38282b316691207 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20Vo=C3=9F?= Date: Fri, 10 Dec 2021 21:06:43 +0100 Subject: [PATCH] - Update mod to Forge 1.16.5-36.2.20 (fix Log4J security issue) - Hitbox change allowed player to fall throw #13 --- CHANGELOG.md | 7 +++++++ gradle.properties | 4 ++-- .../solarcooker/block/AbstractSolarCookerBlock.java | 9 ++------- src/main/resources/META-INF/mods.toml | 4 ++-- 4 files changed, 13 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9e257aa..3190e48 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,13 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Forge Recommended Versioning](https://mcforge.readthedocs.io/en/latest/conventions/versioning/). +## [1.16.5-1.0.2.0] - 2021-12-10 +### Changed +- Update mod to Forge 1.16.5-36.2.20 (fix Log4J security issue) + +### Fixed +- Hitbox change allowed player to fall throw #13 + ## [1.16.5-1.0.0.2] - 2021-08-01 ### Added - Russian and Ukrainian translation (thanks to vstannumdum aka DMHYT) diff --git a/gradle.properties b/gradle.properties index 28e315d..ae5bd8a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,9 +4,9 @@ org.gradle.jvmargs=-Xmx3G org.gradle.daemon=false mod_id=solarcooker -mod_version=1.0.0.2 +mod_version=1.0.2.0 minecraft_version=1.16.5 -forge_version=36.1.0 +forge_version=36.2.20 # jei jei_version=1.16.5:7.6.1.75 diff --git a/src/main/java/cech12/solarcooker/block/AbstractSolarCookerBlock.java b/src/main/java/cech12/solarcooker/block/AbstractSolarCookerBlock.java index f2ab51a..bbec746 100644 --- a/src/main/java/cech12/solarcooker/block/AbstractSolarCookerBlock.java +++ b/src/main/java/cech12/solarcooker/block/AbstractSolarCookerBlock.java @@ -39,8 +39,7 @@ public abstract class AbstractSolarCookerBlock extends ContainerBlock { public static final BooleanProperty SUNLIT = BlockStateProperties.LIT; public static final BooleanProperty BURNING = BlockStateProperties.ENABLED; - protected static final VoxelShape SHAPE_OPEN = Block.box(1.0D, 0.0D, 1.0D, 15.0D, 10.0D, 15.0D); - protected static final VoxelShape SHAPE_CLOSED = Block.box(1.0D, 0.0D, 1.0D, 15.0D, 14.0D, 15.0D); + protected static final VoxelShape SHAPE = Block.box(1.0D, 0.0D, 1.0D, 15.0D, 14.0D, 15.0D); protected AbstractSolarCookerBlock(AbstractBlock.Properties properties) { super(properties); @@ -126,11 +125,7 @@ public BlockRenderType getRenderShape(@Nonnull BlockState state) { @Override @Nonnull public VoxelShape getShape(@Nonnull BlockState state, IBlockReader worldIn, @Nonnull BlockPos pos, @Nonnull ISelectionContext context) { - TileEntity tile = worldIn.getBlockEntity(pos); - if (tile instanceof AbstractSolarCookerTileEntity && ((AbstractSolarCookerTileEntity) tile).shouldLidBeOpen()) { - return SHAPE_OPEN; - } - return SHAPE_CLOSED; + return SHAPE; } /** diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index 74042d8..9c9349c 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -15,13 +15,13 @@ license="The MIT License (MIT)" [[dependencies.solarcooker]] modId="forge" mandatory=true - versionRange="[36.1.0,)" + versionRange="[36.2.20,37)" ordering="NONE" side="BOTH" [[dependencies.solarcooker]] modId="minecraft" mandatory=true - versionRange="[1.16.5,)" + versionRange="[1.16.5,1.17)" ordering="NONE" side="BOTH" [[dependencies.solarcooker]]