Merge branch 'refs/heads/1.19.2/multiloader' into 1.18.2/multiloader

copycats-plus · Jul 20, 2024 · 2da03ea · 2da03ea
2 parents b8f14f4 + 214b259
commit 2da03ea
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 5 deletions.
diff --git 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/...on/src/main/java/com/copycatsplus/copycats/content/copycat/ladder/CopycatLadderBlock.java b/...on/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;

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
@@ -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) {

diff --git 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"

diff --git 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"
   }
 }