- Enhancement: Players can now sleep in the TARDIS (No spawnpoint setting)

- Added Interior: Hartnell
- Added Interior: Pertwee

Author: Jeryn99

changelog.md

@@ -2,5 +2,10 @@
 
 ![TARDIS Refined](https://wiki.tardisrefined.net/TARDIS-Refined-Wiki/tardis_refined_v2_1.png)
 
+#### Interiors
+- Added Interior: Hartnell 
+- Added Interior: Pertwee 
+
 #### Enhancements
 - Enhancement: Added tooltips to various screens to indicate which mod added content
+- Enhancement: Players can now sleep in the TARDIS (No spawnpoint setting)

common/src/main/java/whocraft/tardis_refined/common/tardis/TardisDesktops.java

@@ -59,7 +59,6 @@ public static DesktopTheme getDesktopById(ResourceLocation location) {
      * Creates and adds the Tardis Refined default list of DesktopThemes to a standalone map.
      * Can be used for datagenerators or as a fallback registry
      *
-     * @return
      */
     public static Map<ResourceLocation, DesktopTheme> registerDefaultDesktops() {
         DEFAULT_DESKTOPS.clear();
@@ -86,6 +85,8 @@ public static Map<ResourceLocation, DesktopTheme> registerDefaultDesktops() {
         addDefaultDesktop(new DesktopTheme("classic", "desktop/classic"));
         addDefaultDesktop(new DesktopTheme("terraformed", "desktop/terraformed_useable"));
         addDefaultDesktop(new DesktopTheme("panamax", "desktop/panamax"));
+        addDefaultDesktop(new DesktopTheme("hartnell", "desktop/hartnell"));
+        addDefaultDesktop(new DesktopTheme("pertwee", "desktop/pertwee"));
 
         return DEFAULT_DESKTOPS;
     }

common/src/main/java/whocraft/tardis_refined/constants/ModMessages.java

@@ -73,6 +73,7 @@ public class ModMessages {
     public static final String VILLAGER_CAN_FLY = ui("villager_can_pilot");
     public static final String DEMANDS_PAYMENT = message("demands_payment");
     public static final String PILOT_TIME = message("pilot_time");
+    public static final String TARDIS_SLEEP_END = message("tardis_sleep_end");
     public static String GITHUB_RELEASE_PAGE = "https://github.com/WhoCraft/TardisRefined/releases";
 
     /*Item Special cases*/

common/src/main/java/whocraft/tardis_refined/mixin/ServerPlayerMixin.java

@@ -0,0 +1,33 @@
+package whocraft.tardis_refined.mixin;
+
+import net.minecraft.core.BlockPos;
+import net.minecraft.resources.ResourceKey;
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.world.level.Level;
+import org.jetbrains.annotations.Nullable;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import whocraft.tardis_refined.common.util.PlayerUtil;
+import whocraft.tardis_refined.constants.ModMessages;
+import whocraft.tardis_refined.registry.TRDimensionTypes;
+
+@Mixin(ServerPlayer.class)
+public class ServerPlayerMixin {
+
+    @Inject(method = "stopSleepInBed(ZZ)V", at = @At("HEAD"))
+    private void stopSleepInBed(boolean bl, boolean bl2, CallbackInfo ci) {
+        ServerPlayer serverPlayer = (ServerPlayer) (Object) this;
+        PlayerUtil.sendMessage(serverPlayer, ModMessages.TARDIS_SLEEP_END, true);
+    }
+
+    @Inject(method = "setRespawnPosition(Lnet/minecraft/resources/ResourceKey;Lnet/minecraft/core/BlockPos;FZZ)V", at = @At("HEAD"), cancellable = true)
+    public void setRespawnPosition(ResourceKey<Level> resourceKey, BlockPos blockPos, float f, boolean bl, boolean bl2, CallbackInfo ci) {
+        ServerPlayer serverPlayer = (ServerPlayer) (Object) this;
+        if(serverPlayer.level().dimensionTypeId() == TRDimensionTypes.TARDIS){
+            ci.cancel();
+        }
+    }
+
+}

common/src/main/resources/assets/tardis_refined/textures/gui/desktops/hartnell.png

@@ -3,11 +3,10 @@
   "natural": true,
   "piglin_safe": true,
   "respawn_anchor_works": true,
-  "bed_works": false,
+  "bed_works": true,
   "has_raids": false,
-  "has_skylight": false,
+  "has_skylight": true,
   "has_ceiling": true,
-  "__COMMENT": "Skyline and bed works need to be enabled for beds to work, see https://github.com/WhoCraft/TardisRefined/issues/198",
   "coordinate_scale": 1,
   "ambient_light": 0,
   "logical_height": 384,

common/src/main/resources/assets/tardis_refined/textures/gui/desktops/pertwee.png

@@ -9,6 +9,7 @@
     "MinecraftServerStorageAccessor",
     "PistonBaseBlockMixin",
     "PlayerEntityMixin",
+    "ServerPlayerMixin",
     "VillagerGoalPackagesMixin",
     "VillagerMixin"
   ],