fix: sleeping issue and fabric version limits

FTBTeam · Jun 16, 2024 · d8ad9f4 · d8ad9f4
1 parent a4182c3
commit d8ad9f4
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## [20.4.2]
+
+### Fixed
+
+- Neoforge version having issues with sleeping in beds due to a bad mixin config
+- Fabric version not wanting to load due to version restrictions
+
 ## [20.4.1]
 
 ### Fixed

diff --git a/build.gradle b/build.gradle
@@ -1,7 +1,7 @@
 plugins {
     id "architectury-plugin" version "3.4-SNAPSHOT"
     id "dev.architectury.loom" version "1.6-SNAPSHOT" apply false
-    id "me.modmuss50.mod-publish-plugin" version "0.4.5"
+    id "me.modmuss50.mod-publish-plugin" version "0.5.1"
 }
 
 architectury {
@@ -13,8 +13,6 @@ allprojects {
     apply plugin: "architectury-plugin"
     apply plugin: "maven-publish"
 
-    def ENV = System.getenv()
-
     archivesBaseName = rootProject.archives_base_name
     version = "${mod_version}+mc${minecraft_version}"
     group = rootProject.maven_group

diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json
@@ -31,7 +31,7 @@
   ],
   "depends": {
     "fabric": "*",
-    "minecraft": ">=1.20.4,<1.20.5",
+    "minecraft": ">=1.20.4",
     "architectury": ">=11.1.17"
   }
 }
diff --git a/gradle.properties b/gradle.properties
@@ -6,7 +6,7 @@ enabled_platforms=fabric,neoforge
 archives_base_name=ftb-pack-companion
 readable_name=FTB Pack Companion
 # neo style version number
-mod_version=20.4.1
+mod_version=20.4.2
 maven_group=dev.ftb.mods
 
 architectury_version=11.1.17

diff --git a/...rc/main/java/dev/ftb/packcompanion/neoforge/mixin/features/bedtime/ServerPlayerMixin.java b/...rc/main/java/dev/ftb/packcompanion/neoforge/mixin/features/bedtime/ServerPlayerMixin.java
@@ -43,7 +43,7 @@ public ServerPlayerMixin(Level arg, BlockPos arg2, float f, GameProfile gameProf
 
     @Shadow public abstract ServerLevel serverLevel();
 
-    @Inject(method = "startSleepInBed", at = @At(value = "RETURN"))
+    @Inject(method = "startSleepInBed", at = @At(value = "RETURN"), cancellable = true)
     public void startSleepInBed(BlockPos blockPos, CallbackInfoReturnable<Either<BedSleepingProblem, Unit>> callback) {
         Either<Player.BedSleepingProblem, Unit> returnValue = callback.getReturnValue();
         Optional<BlockPos> optAt = Optional.of(blockPos);