From aa1149a0e5f6427c3dd24c39aba48f7080cf2488 Mon Sep 17 00:00:00 2001 From: Henry Lin Date: Sat, 20 Jul 2024 13:11:03 +0800 Subject: [PATCH 1/4] Fix ladder occlusion --- .../copycats/content/copycat/ladder/CopycatLadderBlock.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/common/src/main/java/com/copycatsplus/copycats/content/copycat/ladder/CopycatLadderBlock.java b/common/src/main/java/com/copycatsplus/copycats/content/copycat/ladder/CopycatLadderBlock.java index ca3c1ed33..302c437b5 100644 --- a/common/src/main/java/com/copycatsplus/copycats/content/copycat/ladder/CopycatLadderBlock.java +++ b/common/src/main/java/com/copycatsplus/copycats/content/copycat/ladder/CopycatLadderBlock.java @@ -35,6 +35,7 @@ import net.minecraft.world.level.block.state.properties.BooleanProperty; import net.minecraft.world.phys.BlockHitResult; import net.minecraft.world.phys.shapes.CollisionContext; +import net.minecraft.world.phys.shapes.Shapes; import net.minecraft.world.phys.shapes.VoxelShape; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -74,6 +75,11 @@ public BlockState getStateForPlacement(@NotNull BlockPlaceContext pContext) { return super.getShape(pState, pLevel, pPos, pContext); } + @Override + public VoxelShape getOcclusionShape(BlockState state, BlockGetter level, BlockPos pos) { + return Shapes.empty(); + } + @Override public boolean canSurvive(BlockState state, LevelReader level, BlockPos pos) { return true; From 2a4879199cc88f5adabd46b09e6cb0e1d99ebc13 Mon Sep 17 00:00:00 2001 From: Henry Lin Date: Sat, 20 Jul 2024 13:33:41 +0800 Subject: [PATCH 2/4] Fix url of update.json --- forge/src/main/resources/META-INF/mods.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/forge/src/main/resources/META-INF/mods.toml b/forge/src/main/resources/META-INF/mods.toml index 790671df3..c044ab928 100644 --- a/forge/src/main/resources/META-INF/mods.toml +++ b/forge/src/main/resources/META-INF/mods.toml @@ -6,7 +6,7 @@ issueTrackerURL="https://github.com/copycats-plus/copycats/issues" modId="copycats" version="${version}" displayName="${mod_name}" - updateJSONURL="https://raw.githubusercontent.com/copycats-plus/copycats/main/update.json" + updateJSONURL="https://raw.githubusercontent.com/copycats-plus/copycats/multiloader/update.json" displayURL="https://github.com/copycats-plus/copycats" logoFile="copycats_icon.png" credits="The Create: Addon Hub Discord" From f1cd5f5c24ef2efde2a77de8386a2c97cd34f79d Mon Sep 17 00:00:00 2001 From: Henry Lin Date: Sat, 20 Jul 2024 15:19:09 +0800 Subject: [PATCH 3/4] Fix config safeGetter being unsafe --- .../copycats/foundation/copycat/MigrationManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/src/main/java/com/copycatsplus/copycats/foundation/copycat/MigrationManager.java b/common/src/main/java/com/copycatsplus/copycats/foundation/copycat/MigrationManager.java index 3058948c1..66fe42e09 100644 --- a/common/src/main/java/com/copycatsplus/copycats/foundation/copycat/MigrationManager.java +++ b/common/src/main/java/com/copycatsplus/copycats/foundation/copycat/MigrationManager.java @@ -25,7 +25,7 @@ public class MigrationManager { public static boolean migrationDisabled() { - return CCConfigs.safeGetter(CCConfigs.common().disableConversion::get, false).get(); + return CCConfigs.safeGetter(() -> CCConfigs.common().disableConversion.get(), false).get(); } public static StructureBlockInfo migrateStructure(StructureBlockInfo info) { From 3a8129cbe1cc9cabb1076fe1866945af0dc206e5 Mon Sep 17 00:00:00 2001 From: Henry Lin Date: Sat, 20 Jul 2024 15:23:32 +0800 Subject: [PATCH 4/4] Update changelog for 2.0.4 --- CHANGELOG.md | 8 ++++++++ update.json | 6 +++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 057019fd5..72aa404f1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,14 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## 2.0.4 - 2024-07-20 + +### Fixed + +- Incorrect face occlusion for Copycat Ladder +- Incorrect link for Forge's update checker +- Crash when Sinytra is installed due to late config initialization + ## 2.0.3 - 2024-07-20 ### Changed diff --git a/update.json b/update.json index 4d85599e1..60f7db5d9 100644 --- a/update.json +++ b/update.json @@ -1,8 +1,8 @@ { "homepage": "https://github.com/copycats-plus/copycats/", "promos": { - "1.20.1-recommended": "1.20.1-2.0.3", - "1.19.2-recommended": "1.19.2-2.0.3", - "1.18.2-recommended": "1.18.2-2.0.3" + "1.20.1-recommended": "1.20.1-2.0.4", + "1.19.2-recommended": "1.19.2-2.0.4", + "1.18.2-recommended": "1.18.2-2.0.4" } }