Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated to 1.21.3 #75

Merged
merged 5 commits into from
Jan 5, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 12 additions & 8 deletions buildSrc/src/main/kotlin/Properties.kt
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,19 @@ object Properties {

/* Paper */
const val paperApiVersion = "1.19"
const val paperMinecraftDevVersion = "1.21"
const val paperDevBundleVersion = "1.21-R0.1-SNAPSHOT"
const val paperMinecraftDevVersion = "1.21.3"
const val paperDevBundleVersion = "1.21.3-R0.1-SNAPSHOT"

/* Fabric (https://fabricmc.net/develop) */
const val fabricLoaderRequiredVersion = "0.14.22"
const val fabricMinecraftDevVersion = "1.21"
const val yarnMappingsDevVersion = "$fabricMinecraftDevVersion+build.7"
const val fabricLoaderDevVersion = "0.15.11"
const val fabricApiDevVersion = "0.100.4+$fabricMinecraftDevVersion"
const val fabricMinecraftDevVersion = "1.21.3"
const val yarnMappingsDevVersion = "$fabricMinecraftDevVersion+build.2"
const val fabricLoaderDevVersion = "0.16.9"
const val fabricApiDevVersion = "0.107.3+$fabricMinecraftDevVersion"

/* Dependencies */
const val voicechatApiVersion = "2.4.11"
const val voicechatModRuntimeVersion = "2.5.16"
const val voicechatModRuntimeVersion = "2.5.25"
const val yamlConfigurationVersion = "2.0.2"
const val javaSemverVersion = "0.10.2"
const val gsonVersion = "2.10.1"
Expand All @@ -42,7 +42,11 @@ object Properties {
"1.20.4",
"1.20.5",
"1.20.6",
"1.21"
"1.21",
"1.21.1",
"1.21.2",
"1.21.3",
"1.21.4"
)

/* Gradle Plugins */
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ else if (sender instanceof CommandContext<?> context) {
}

public void sendMessage(Player player, String message) {
((PlayerEntity) player.getPlayer()).sendMessage(toNative(mm(message)));
((ServerPlayerEntity) player.getPlayer()).sendMessage(toNative(mm(message)));
}

public String getName(Player player) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import de.maxhenkel.voicechat.api.Position;
import de.maxhenkel.voicechat.api.ServerLevel;
import de.maxhenkel.voicechat.api.ServerPlayer;
import org.bukkit.Bukkit;
import org.bukkit.World;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Entity;
Expand Down Expand Up @@ -56,7 +57,7 @@ public ServerPlayer commandContextToPlayer(CommandContext<?> context) {
}
}
if (nmsEntity == null) return null;
@SuppressWarnings("DataFlowIssue") Entity entity = (Entity) nmsEntity.getBukkitSender(null);
Entity entity = nmsEntity.getBukkitEntity();
return api.createPosition(
entity.getLocation().getX(),
entity.getLocation().getY(),
Expand Down