Merge branch 'cryo' of https://github.com/Roelymole/Galacticraft

Roelymole · Dec 19, 2024 · 39cc52d · 39cc52d
2 parents b7eb6b4 + 197f77e
commit 39cc52d
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 8 deletions.
diff --git a/src/main/java/dev/galacticraft/mod/accessor/CryogenicAccessor.java b/src/main/java/dev/galacticraft/mod/accessor/CryogenicAccessor.java
@@ -24,11 +24,11 @@
 
 public interface CryogenicAccessor {
 
-    default void beginCyroSleep() {
+    default void beginCryoSleep() {
         throw new RuntimeException("This should be overridden by mixin!");
     }
 
-    default void endCyroSleep() {
+    default void endCryoSleep() {
         throw new RuntimeException("This should be overridden by mixin!");
     }
 

diff --git a/src/main/java/dev/galacticraft/mod/content/block/special/CryogenicChamberBlock.java b/src/main/java/dev/galacticraft/mod/content/block/special/CryogenicChamberBlock.java
@@ -185,12 +185,12 @@ public InteractionResult multiBlockUseWithoutItem(BlockState baseState, Level le
         if (level.isClientSide()) return InteractionResult.CONSUME;
 
         if(player.getCryogenicChamberCooldown() == 0) {
-            player.beginCyroSleep();
+            player.beginCryoSleep();
 
             player.startSleepInBed(basePos).ifLeft(problem -> {
                 if (problem.getMessage() != null) player.displayClientMessage(problem.getMessage(), true);
 
-                player.endCyroSleep();
+                player.endCryoSleep();
             });
         } else {
             player.displayClientMessage(Component.literal("The chamber is way to hot right now! It needs " + player.getCryogenicChamberCooldown() + " seconds to cool down before I sleep again."), false);

diff --git a/src/main/java/dev/galacticraft/mod/events/GCEventHandlers.java b/src/main/java/dev/galacticraft/mod/events/GCEventHandlers.java
@@ -95,7 +95,7 @@ public static InteractionResult canCryoSleep(Player player, BlockPos sleepingPos
 
     public static void onWakeFromCryoSleep(LivingEntity entity, BlockPos sleepingPos) {
         if (!entity.level().isClientSide() && entity.isInCryoSleep()) {
-            entity.endCyroSleep();
+            entity.endCryoSleep();
         }
     }
 

diff --git a/src/main/java/dev/galacticraft/mod/mixin/LivingEntityMixin.java b/src/main/java/dev/galacticraft/mod/mixin/LivingEntityMixin.java
@@ -33,6 +33,7 @@
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.level.Level;
+import net.minecraft.world.phys.Vec3;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.Unique;
@@ -57,12 +58,12 @@ public LivingEntityMixin(EntityType<?> entityType, Level level) {
     }
 
     @Override
-    public void beginCyroSleep() {
+    public void beginCryoSleep() {
         this.entityData.set(IS_IN_CRYO_SLEEP_ID, true);
     }
 
     @Override
-    public void endCyroSleep() {
+    public void endCryoSleep() {
         this.entityData.set(IS_IN_CRYO_SLEEP_ID, false);
     }
 
@@ -106,7 +107,8 @@ public void setCryogenicChamberCooldown(int cryogenicChamberCooldown) {
     @Inject(method = "setPosToBed", at = @At("HEAD"), cancellable = true)
     private void gc$setCryoSleepPos(BlockPos blockPos, CallbackInfo ci) {
         if (isInCryoSleep()) {
-            this.setPos(blockPos.getX(), blockPos.getY() + 1F, blockPos.getZ());
+            Vec3 pos = blockPos.getBottomCenter();
+            this.setPos(pos.x, pos.y + 1F, pos.z);
             ci.cancel();
         }
     }