Skip to content

Commit 9fe32fe

Browse files
committed
[1.21.5] Port
1 parent db58421 commit 9fe32fe

File tree

4 files changed

+9
-5
lines changed

4 files changed

+9
-5
lines changed

common/src/main/java/dev/the_fireplace/audiobook/AudiobookLogic.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,11 @@
33
import com.google.common.collect.ImmutableList;
44
import com.google.common.collect.Lists;
55
import com.mojang.text2speech.Narrator;
6+
import net.minecraft.client.Minecraft;
67
import net.minecraft.client.gui.screens.inventory.BookViewScreen;
78
import net.minecraft.core.component.DataComponents;
89
import net.minecraft.network.chat.Component;
10+
import net.minecraft.sounds.SoundSource;
911
import net.minecraft.world.item.ItemStack;
1012
import net.minecraft.world.item.WritableBookItem;
1113
import net.minecraft.world.item.WrittenBookItem;
@@ -38,7 +40,9 @@ public static void playBook(@Nullable List<String> pages) {
3840
for (String page : pages) {
3941
output.append(" ").append(page);
4042
}
41-
Narrator.getNarrator().say(output.toString(), true);
43+
Minecraft minecraft = Minecraft.getInstance();
44+
float volume = minecraft.options.getSoundSourceVolume(SoundSource.VOICE) * minecraft.options.getSoundSourceVolume(SoundSource.MASTER);
45+
Narrator.getNarrator().say(output.toString(), true, volume);
4246
}
4347
}
4448

fabric/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ plugins {
99
archivesBaseName = "${archives_base_name}-Fabric"
1010
final def mainArtifactFile = layout.buildDirectory.file("libs/${archivesBaseName}-${version}.jar").get().asFile
1111
final def changelogFile = file('../changelog.txt')
12-
final def supportedMinecraftVersions = [project.minecraft_version, '1.21.3', '1.21.2', '1.21.1', '1.21']
12+
final def supportedMinecraftVersions = [project.minecraft_version]
1313

1414
dependencies {
1515
minecraft "com.mojang:minecraft:${minecraft_version}"

fabric/src/main/resources/fabric.mod.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
"depends": {
2929
"fabricloader": ">=0.12.0",
3030
"fabric": "*",
31-
"minecraft": ">=1.20.5 <1.21.5"
31+
"minecraft": ">=1.21.5"
3232
},
3333

3434
"custom": {

gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
org.gradle.jvmargs=-Xmx3G
44
org.gradle.daemon=false
55
# Common
6-
minecraft_version=1.21.4
6+
minecraft_version=1.21.5
77
# Fabric
88
fabric_loader_version=0.16.14
99
# Fabric Dependencies
10-
fabric_api_version=0.119.3+1.21.4
10+
fabric_api_version=0.126.0+1.21.5
1111
# Mod Properties
1212
maven_group=dev.the-fireplace
1313
archives_base_name=Audiobook

0 commit comments

Comments
 (0)