Skip to content

Commit fffd92f

Browse files
committed
feat: 1.21.4
1 parent d2f7b99 commit fffd92f

File tree

11 files changed

+27
-37
lines changed

11 files changed

+27
-37
lines changed

.space.kts

Lines changed: 0 additions & 15 deletions
This file was deleted.

build.gradle.kts

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -38,23 +38,23 @@ repositories {
3838
}
3939

4040
dependencies {
41-
compileOnly("io.papermc.paper:paper-api:1.21.1-R0.1-SNAPSHOT")
41+
compileOnly("io.papermc.paper:paper-api:1.21.4-R0.1-SNAPSHOT")
4242
compileOnly("com.mojang:brigadier:1.0.18")
4343
compileOnly("net.coreprotect:coreprotect:22.4")
4444

45-
implementation("com.github.stefvanschie.inventoryframework:IF:0.10.17")
46-
implementation("dev.jorel:commandapi-bukkit-shade-mojang-mapped:9.5.3")
47-
implementation("com.github.retrooper:packetevents-spigot:2.4.1-SNAPSHOT")
45+
implementation("com.github.stefvanschie.inventoryframework:IF:0.10.19")
46+
implementation("dev.jorel:commandapi-bukkit-shade-mojang-mapped:9.7.0")
47+
implementation("com.github.retrooper:packetevents-spigot:2.7.0")
4848

49-
paperLibrary("org.apache.commons:commons-lang3:3.14.0")
50-
paperLibrary("net.kyori:adventure-nbt:4.17.0")
51-
paperLibrary("net.kyori:adventure-text-minimessage:4.17.0")
52-
paperLibrary("com.saicone.rtag:rtag:1.5.5")
53-
paperLibrary("com.saicone.rtag:rtag-entity:1.5.5")
49+
paperLibrary("org.apache.commons:commons-lang3:3.17.0")
50+
paperLibrary("net.kyori:adventure-nbt:4.18.0")
51+
paperLibrary("net.kyori:adventure-text-minimessage:4.18.0")
52+
paperLibrary("com.saicone.rtag:rtag:1.5.9")
53+
paperLibrary("com.saicone.rtag:rtag-entity:1.5.9")
5454
}
5555

5656
group = "dev.slne.surf.essentials"
57-
version = "1.21.1-3.0.0-SNAPSHOT"
57+
version = "1.21.4-3.0.0-SNAPSHOT"
5858
description = "SurfEssentials"
5959

6060
paper {

src/main/java/dev/slne/surf/essentials/commands/cheat/FoodCommand.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ private int feed(CommandSender source, Collection<Player> targetsUnchecked) thro
3838
successfulFeeds++;
3939

4040
target.playSound(Sound.sound(builder -> {
41-
builder.type(org.bukkit.Sound.ENTITY_STRIDER_EAT.key());
41+
builder.type(org.bukkit.Sound.ENTITY_STRIDER_EAT);
4242
builder.volume(1f);
4343
builder.pitch(0f);
4444
}));

src/main/java/dev/slne/surf/essentials/commands/cheat/HealCommand.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ private int heal(CommandSender source, Collection<Entity> targetsUnchecked) thro
3939
for (Entity target : targets) {
4040
if (!(target instanceof LivingEntity livingEntity)) continue;
4141

42-
EssentialsUtil.heal(livingEntity, Objects.requireNonNull(livingEntity.getAttribute(Attribute.GENERIC_MAX_HEALTH)).getValue(), EntityRegainHealthEvent.RegainReason.REGEN, true);
42+
EssentialsUtil.heal(livingEntity, Objects.requireNonNull(livingEntity.getAttribute(Attribute.MAX_HEALTH)).getValue(), EntityRegainHealthEvent.RegainReason.REGEN, true);
4343
successfulChanges++;
4444
EssentialsUtil.sendSuccess(target, Component.text("Du wurdest geheilt! ", Colors.GREEN));
4545
}

src/main/java/dev/slne/surf/essentials/commands/cheat/RepairCommand.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import dev.slne.surf.essentials.utils.permission.Permissions;
1010
import lombok.val;
1111
import net.kyori.adventure.text.Component;
12+
import org.bukkit.Bukkit;
1213
import org.bukkit.command.CommandSender;
1314
import org.bukkit.entity.Player;
1415
import org.bukkit.inventory.meta.Damageable;

src/main/java/dev/slne/surf/essentials/commands/general/AlertCommand.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ private static int alert(CommandSender source, String message){
2626
.append(EssentialsUtil.deserialize(message).colorIfAbsent(Colors.VARIABLE_VALUE)));
2727

2828
for (Audience audience : source.getServer().getOnlinePlayers()) {
29-
audience.playSound(Sound.sound(org.bukkit.Sound.BLOCK_NOTE_BLOCK_BELL.key(), Sound.Source.MASTER, 1f, 1f));
29+
audience.playSound(Sound.sound(org.bukkit.Sound.BLOCK_NOTE_BLOCK_BELL, Sound.Source.MASTER, 1f, 1f));
3030
}
3131
return 1;
3232
}

src/main/java/dev/slne/surf/essentials/commands/general/PlayerHeadCommand.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import net.kyori.adventure.text.Component;
1212
import net.kyori.adventure.text.format.TextDecoration;
1313
import org.bukkit.Material;
14+
import org.bukkit.Registry;
1415
import org.bukkit.Sound;
1516
import org.bukkit.entity.HumanEntity;
1617
import org.bukkit.entity.Player;
@@ -34,7 +35,7 @@ private int getPlayerHead(HumanEntity source, Player playerUnchecked) throws Wra
3435
skullStack.editMeta(SkullMeta.class, skullMeta -> {
3536
skullMeta.setOwningPlayer(playerTarget);
3637
skullMeta.setPlayerProfile(playerTarget.getPlayerProfile());
37-
skullMeta.setNoteBlockSound(Sound.ENTITY_PLAYER_HURT.getKey());
38+
skullMeta.setNoteBlockSound(Registry.SOUNDS.getKey(Sound.ENTITY_PLAYER_HURT));
3839
EssentialsUtil.changeName(skullMeta, EssentialsUtil.getDisplayName(playerTarget)
3940
.append(Component.text("´s Kopf", Colors.INFO))
4041
.decoration(TextDecoration.ITALIC, TextDecoration.State.FALSE));

src/main/java/dev/slne/surf/essentials/commands/general/other/TimerCommand.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -214,15 +214,15 @@ private void playSounds(Collection<? extends Audience> targets, int timeInSecond
214214
switch (timeInSeconds) {
215215
case 10, 9, 8, 7, 6, 5, 4, 3, 2, 1 -> {
216216
for (Audience target : targets) {
217-
target.playSound(Sound.sound(org.bukkit.Sound.BLOCK_NOTE_BLOCK_PLING.key(), Sound.Source.MASTER, 1f, 2f));
217+
target.playSound(Sound.sound(org.bukkit.Sound.BLOCK_NOTE_BLOCK_PLING, Sound.Source.MASTER, 1f, 2f));
218218
}
219219
}
220220
}
221221
}
222222

223223
private void playStartSound(Collection<? extends Audience> targets) {
224224
for (Audience target : targets) {
225-
target.playSound(Sound.sound(org.bukkit.Sound.ENTITY_PLAYER_LEVELUP.key(), Sound.Source.MASTER, 1f, 0.9f));
225+
target.playSound(Sound.sound(org.bukkit.Sound.ENTITY_PLAYER_LEVELUP, Sound.Source.MASTER, 1f, 0.9f));
226226
}
227227
}
228228

src/main/java/dev/slne/surf/essentials/commands/minecraft/ParticleCommand.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,8 @@ private int showParticles(CommandSender source, ParticleData<?> parameters, Loca
125125
val viewers = EssentialsUtil.checkPlayerSuggestion(source, new ArrayList<>(viewersUnchecked));
126126
val playerManager = PacketEvents.getAPI().getPlayerManager();
127127
val particleWrapper = new ParticleWrapper<>(parameters);
128+
129+
128130
val particle = particleWrapper.getPacketEventsParticle();
129131
val particlePacket = new WrapperPlayServerParticle(
130132
particle,

src/main/java/dev/slne/surf/essentials/commands/tp/TeleportCommand.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
import dev.slne.surf.essentials.utils.permission.Permissions;
1313
import io.papermc.paper.entity.LookAnchor;
1414
import io.papermc.paper.entity.TeleportFlag;
15+
import io.papermc.paper.entity.TeleportFlag.Relative;
1516
import lombok.val;
1617
import net.kyori.adventure.text.Component;
1718
import org.bukkit.Bukkit;
@@ -166,11 +167,10 @@ private int teleportToLoc(CommandSender sender, Collection<Entity> targets, Loca
166167
destination,
167168
facingLocation,
168169
lookAnchor,
169-
TeleportFlag.Relative.X,
170-
TeleportFlag.Relative.Y,
171-
TeleportFlag.Relative.Z,
172-
TeleportFlag.Relative.PITCH,
173-
TeleportFlag.Relative.YAW
170+
Relative.VELOCITY_X,
171+
Relative.VELOCITY_Y,
172+
Relative.VELOCITY_Z,
173+
Relative.VELOCITY_ROTATION
174174

175175
).thenAccept(entities -> {
176176
boolean single = entities.size() == 1;

0 commit comments

Comments
 (0)