- Update mod to Forge 1.18-38.0.17 (fix Log4J security issue)

- Hitbox change allowed player to fall throw #13 (thanks to JadeCrystalCat for the report)
cech12 · Dec 10, 2021 · 2417992 · 2417992
1 parent a46f176
commit 2417992
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 12 deletions.
diff --git 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.18-1.0.2.0] - 2021-12-10
+### Changed
+- Update mod to Forge 1.18-38.0.17 (fix Log4J security issue)
+
+### Fixed
+- Hitbox change allowed player to fall throw #13 (thanks to JadeCrystalCat for the report)
+
 ## [1.18-1.0.1.2] - 2021-12-05
 ### Added
 - jei compatibility readded

diff --git a/gradle.properties b/gradle.properties
@@ -4,14 +4,14 @@ org.gradle.jvmargs=-Xmx3G
 org.gradle.daemon=false
 
 mod_id=solarcooker
-mod_version=1.0.1.2
+mod_version=1.0.2.0
 minecraft_version=1.18
-forge_version=38.0.14
+forge_version=38.0.17
 
 # jei
 jei_version=1.18:9.0.0.40
 
 #Curseforge
 curseforge_id=436874
-curseforge_release=beta
+curseforge_release=release
 curseforge_versions=1.18
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 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-7.3.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/src/main/java/cech12/solarcooker/block/AbstractSolarCookerBlock.java b/src/main/java/cech12/solarcooker/block/AbstractSolarCookerBlock.java
@@ -38,8 +38,7 @@ public abstract class AbstractSolarCookerBlock extends BaseEntityBlock {
     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(BlockBehaviour.Properties properties) {
         super(properties);
@@ -120,11 +119,7 @@ public RenderShape getRenderShape(@Nonnull BlockState state) {
     @Override
     @Nonnull
     public VoxelShape getShape(@Nonnull BlockState state, BlockGetter worldIn, @Nonnull BlockPos pos, @Nonnull CollisionContext context) {
-        BlockEntity tile = worldIn.getBlockEntity(pos);
-        if (tile instanceof AbstractSolarCookerBlockEntity && ((AbstractSolarCookerBlockEntity) 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
@@ -15,7 +15,7 @@ license="The MIT License (MIT)"
 [[dependencies.solarcooker]]
     modId="forge"
     mandatory=true
-    versionRange="[38.0.14,)"
+    versionRange="[38.0.17,)"
     ordering="NONE"
     side="BOTH"
 [[dependencies.solarcooker]]