Merge branch 'forge-1.18' into forge-1.19.4

Author: DavidQF555

gradle.properties

@@ -11,6 +11,6 @@ mapping_version=2023.06.26-1.19.4
 mod_id=multiverse
 mod_name=Multiverse
 mod_license=GPLv3
-mod_version=1.19.4-4.1.0
+mod_version=1.19.4-4.1.1
 mod_group_id=io.github.davidqf555.minecraft.multiverse
 mod_authors=DavidQF555

src/main/java/io/github/davidqf555/minecraft/multiverse/common/world/RiftHelper.java

@@ -90,11 +90,13 @@ public static void placeRandomRift(ServerLevel world, boolean temporary, Vec3 ce
     public static void doRiftSpawnEffect(Level world, BlockPos pos, @Nullable ResourceKey<Level> target) {
         if (world.isClientSide()) {
             ClientHelper.addRiftExplosionParticles(Vec3.atCenterOf(pos), target);
+            world.playLocalSound(pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5, SoundEvents.END_GATEWAY_SPAWN, SoundSource.BLOCKS, 10, 0.7f + (world.random.nextFloat() - world.random.nextFloat()) * 0.14f, false);
+            world.playLocalSound(pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5, SoundEvents.GLASS_BREAK, SoundSource.BLOCKS, 6, 0.8f + (world.random.nextFloat() - world.random.nextFloat()) * 0.14f, false);
         } else {
             Multiverse.CHANNEL.send(PacketDistributor.TRACKING_CHUNK.with(() -> world.getChunkAt(pos)), new RiftExplosionParticlesPacket(Vec3.atCenterOf(pos), target));
+            world.playSound(null, pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5, SoundEvents.END_GATEWAY_SPAWN, SoundSource.BLOCKS, 10, 0.7f + (world.random.nextFloat() - world.random.nextFloat()) * 0.14f);
+            world.playSound(null, pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5, SoundEvents.GLASS_BREAK, SoundSource.BLOCKS, 6, 0.8f + (world.random.nextFloat() - world.random.nextFloat()) * 0.14f);
         }
-        world.playSound(null, pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5, SoundEvents.END_GATEWAY_SPAWN, SoundSource.BLOCKS, 10, 0.7f + (world.random.nextFloat() - world.random.nextFloat()) * 0.14f);
-        world.playSound(null, pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5, SoundEvents.GLASS_BREAK, SoundSource.BLOCKS, 6, 0.8f + (world.random.nextFloat() - world.random.nextFloat()) * 0.14f);
     }
 
     public static void destroyRift(Level world, BlockPos pos) {