Merge remote-tracking branch 'origin/minecraft/1.20' into minecraft/1.20

# Conflicts: # common/src/main/java/whocraft/tardis_refined/client/model/blockentity/console/FactoryConsoleModel.java
WhoCraft · Mar 30, 2024 · e910bc1 · e910bc1
2 parents a6f83f5 + 4ecf614
commit e910bc1
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 5 deletions.
diff --git a/...in/java/whocraft/tardis_refined/client/model/blockentity/console/FactoryConsoleModel.java b/...in/java/whocraft/tardis_refined/client/model/blockentity/console/FactoryConsoleModel.java
@@ -2260,8 +2260,6 @@ public void renderConsole(GlobalConsoleBlockEntity globalConsoleBlock, Level lev
 		root().getAllParts().forEach(ModelPart::resetPose);
 		TardisClientData reactions = TardisClientData.getInstance(level.dimension());
 
-
-
 		if (globalConsoleBlock != null && globalConsoleBlock.getBlockState().getValue(GlobalConsoleBlock.POWERED)) {
 			if (reactions.isFlying()) {
 				this.animate(reactions.ROTOR_ANIMATION, FLIGHT, Minecraft.getInstance().player.tickCount);
@@ -2272,8 +2270,6 @@ public void renderConsole(GlobalConsoleBlockEntity globalConsoleBlock, Level lev
 			}
 		}
 
-
-
 		float rot = -125 - ( 30 * ((float) reactions.getThrottleStage() / TardisPilotingManager.MAX_THROTTLE_STAGE));
 		this.throttleLever.xRot = rot;
 

diff --git a/common/src/main/java/whocraft/tardis_refined/client/sounds/LoopingSound.java b/common/src/main/java/whocraft/tardis_refined/client/sounds/LoopingSound.java
@@ -111,6 +111,7 @@ public static boolean shouldMinecraftMusicStop(SoundManager soundManager){
     public static void setupSounds(){
         LoopingSound.ARS_HUMMING = new LoopingSound(SoundRegistry.ARS_HUM.get(), SoundSource.AMBIENT);
         LoopingSound.FLIGHT_LOOP = new LoopingSound(SoundRegistry.TARDIS_SINGLE_FLY.get(), SoundSource.AMBIENT);
+        LoopingSound.GRAVITY_LOOP = new LoopingSound(SoundRegistry.GRAVITY_TUNNEL.get(), SoundSource.AMBIENT);
     }
 
 }
diff --git a/common/src/main/java/whocraft/tardis_refined/common/GravityUtil.java b/common/src/main/java/whocraft/tardis_refined/common/GravityUtil.java
@@ -64,7 +64,7 @@ public static AABB createGravityBoxFromLevel(Level level, BlockPos blockPos, int
 
 
     public static boolean isInGravityShaft(Player player) {
-        return isInAntiGrav(player, player.getBoundingBox().inflate(20, MAX_Y, 20), player.level());
+        return isInAntiGrav(player, player.getBoundingBox().inflate(8, MAX_Y, 8), player.level());
     }
 
     @Environment(EnvType.CLIENT)