Skip to content

Commit c998971

Browse files
PascalpexPascalpex
committed
Update for 1.21.4
1 parent 020c25f commit c998971

File tree

5 files changed

+18
-17
lines changed

5 files changed

+18
-17
lines changed

‎pom.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>net.pascalpex</groupId>
88
<artifactId>PexNPC</artifactId>
9-
<version>1.24</version>
9+
<version>1.25</version>
1010
<packaging>jar</packaging>
1111

1212
<name>PexNPC</name>
@@ -55,9 +55,9 @@
5555
</goals>
5656
<id>remap-obf</id>
5757
<configuration>
58-
<srgIn>org.spigotmc:minecraft-server:1.21.2-R0.1-SNAPSHOT:txt:maps-mojang</srgIn>
58+
<srgIn>org.spigotmc:minecraft-server:1.21.4-R0.1-SNAPSHOT:txt:maps-mojang</srgIn>
5959
<reverse>true</reverse>
60-
<remappedDependencies>org.spigotmc:spigot:1.21.2-R0.1-SNAPSHOT:jar:remapped-mojang</remappedDependencies>
60+
<remappedDependencies>org.spigotmc:spigot:1.21.4-R0.1-SNAPSHOT:jar:remapped-mojang</remappedDependencies>
6161
<remappedArtifactAttached>true</remappedArtifactAttached>
6262
<remappedClassifierName>remapped-obf</remappedClassifierName>
6363
</configuration>
@@ -70,8 +70,8 @@
7070
<id>remap-spigot</id>
7171
<configuration>
7272
<inputFile>${project.build.directory}/${project.artifactId}-${project.version}-remapped-obf.jar</inputFile>
73-
<srgIn>org.spigotmc:minecraft-server:1.21.2-R0.1-SNAPSHOT:csrg:maps-spigot</srgIn>
74-
<remappedDependencies>org.spigotmc:spigot:1.21.2-R0.1-SNAPSHOT:jar:remapped-obf</remappedDependencies>
73+
<srgIn>org.spigotmc:minecraft-server:1.21.4-R0.1-SNAPSHOT:csrg:maps-spigot</srgIn>
74+
<remappedDependencies>org.spigotmc:spigot:1.21.4-R0.1-SNAPSHOT:jar:remapped-obf</remappedDependencies>
7575
</configuration>
7676
</execution>
7777
</executions>
@@ -105,7 +105,7 @@
105105
<groupId>org.spigotmc</groupId>
106106
<artifactId>spigot</artifactId>
107107
<classifier>remapped-mojang</classifier>
108-
<version>1.21.2-R0.1-SNAPSHOT</version>
108+
<version>1.21.4-R0.1-SNAPSHOT</version>
109109
<scope>provided</scope>
110110
</dependency>
111111
<dependency>

‎src/main/java/net/pascalpex/npc/Main.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ public void onEnable() {
9595
NPC.addJoinPacket(player);
9696
}
9797
}
98-
Bukkit.getConsoleSender().sendMessage(ChatColor.GREEN + "PexNPC 1.24 von Pascalpex Aktiviert.");
98+
Bukkit.getConsoleSender().sendMessage(ChatColor.GREEN + "PexNPC 1.25 von Pascalpex Aktiviert.");
9999
}
100100

101101
private void fetchNewestVersion() {
@@ -131,7 +131,7 @@ public void onDisable() {
131131
}
132132
}
133133
this.getServer().getMessenger().unregisterOutgoingPluginChannel(this);
134-
Bukkit.getConsoleSender().sendMessage(ChatColor.RED + "PexNPC 1.24 von Pascalpex Deaktiviert.");
134+
Bukkit.getConsoleSender().sendMessage(ChatColor.RED + "PexNPC 1.25 von Pascalpex Deaktiviert.");
135135
}
136136

137137
@Override
@@ -142,7 +142,7 @@ public boolean onCommand(CommandSender sender, Command cmd, String label, String
142142
if (player.hasPermission("pexnpc.command")) {
143143

144144
if (args.length == 0) {
145-
player.sendMessage(prefix + "PexNPC 1.24 von Pascalpex");
145+
player.sendMessage(prefix + "PexNPC 1.25 von Pascalpex");
146146
player.sendMessage(prefix + "Verfügbare Befehle:");
147147
player.sendMessage(prefix + "/pexnpc help " + ChatColor.DARK_GRAY + "| " + ChatColor.GOLD + "Zeigt diese Seite an");
148148
player.sendMessage(prefix + "/pexnpc reload " + ChatColor.DARK_GRAY + "| " + ChatColor.GOLD + "Lädt die NPCs und Dateien neu");
@@ -159,7 +159,7 @@ public boolean onCommand(CommandSender sender, Command cmd, String label, String
159159
}
160160
if (args.length == 1) {
161161
if (args[0].equalsIgnoreCase("help")) {
162-
player.sendMessage(prefix + "PexNPC 1.24 von Pascalpex");
162+
player.sendMessage(prefix + "PexNPC 1.25 von Pascalpex");
163163
player.sendMessage(prefix + "Verfügbare Befehle:");
164164
player.sendMessage(prefix + "/pexnpc help " + ChatColor.DARK_GRAY + "| " + ChatColor.GOLD + "Zeigt diese Seite an");
165165
player.sendMessage(prefix + "/pexnpc reload " + ChatColor.DARK_GRAY + "| " + ChatColor.GOLD + "Lädt die NPCs und Dateien neu");

‎src/main/java/net/pascalpex/npc/util/NPC.java‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import net.minecraft.server.level.ServerPlayer;
2020
import net.minecraft.server.network.ServerGamePacketListenerImpl;
2121
import net.minecraft.world.entity.EquipmentSlot;
22+
import net.minecraft.world.entity.player.PlayerModelPart;
2223
import net.minecraft.world.phys.Vec3;
2324
import net.minecraft.world.scores.PlayerTeam;
2425
import net.minecraft.world.scores.Scoreboard;
@@ -27,10 +28,10 @@
2728
import net.pascalpex.npc.NpcData;
2829
import org.apache.commons.lang.Validate;
2930
import org.bukkit.*;
30-
import org.bukkit.craftbukkit.v1_21_R2.CraftServer;
31-
import org.bukkit.craftbukkit.v1_21_R2.CraftWorld;
32-
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftPlayer;
33-
import org.bukkit.craftbukkit.v1_21_R2.inventory.CraftItemStack;
31+
import org.bukkit.craftbukkit.v1_21_R3.CraftServer;
32+
import org.bukkit.craftbukkit.v1_21_R3.CraftWorld;
33+
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftPlayer;
34+
import org.bukkit.craftbukkit.v1_21_R3.inventory.CraftItemStack;
3435
import org.bukkit.entity.Player;
3536
import org.bukkit.inventory.ItemStack;
3637
import org.bukkit.scheduler.BukkitRunnable;
@@ -339,7 +340,7 @@ private static ClientboundPlayerInfoUpdatePacket createInitPacket(ServerPlayer v
339340
ClientboundPlayerInfoUpdatePacket packet = (ClientboundPlayerInfoUpdatePacket) unsafe.allocateInstance(ClientboundPlayerInfoUpdatePacket.class);
340341
EnumSet<ClientboundPlayerInfoUpdatePacket.Action> actions = EnumSet.of(ClientboundPlayerInfoUpdatePacket.Action.ADD_PLAYER);
341342
setField(packet, "b", actions);
342-
ClientboundPlayerInfoUpdatePacket.Entry entry = new ClientboundPlayerInfoUpdatePacket.Entry(var0.getUUID(), var0.getGameProfile(), true, 0, var0.gameMode.getGameModeForPlayer(), var0.getTabListDisplayName(), 0, Optionull.map(var0.getChatSession(), RemoteChatSession::asData));
343+
ClientboundPlayerInfoUpdatePacket.Entry entry = new ClientboundPlayerInfoUpdatePacket.Entry(var0.getUUID(), var0.getGameProfile(), true, 0, var0.gameMode.getGameModeForPlayer(), var0.getTabListDisplayName(), var0.isModelPartShown(PlayerModelPart.HAT), 0, Optionull.map(var0.getChatSession(), RemoteChatSession::asData));
343344
List<ClientboundPlayerInfoUpdatePacket.Entry> entries = new ArrayList<>();
344345
entries.add(entry);
345346
setField(packet, "c", entries);

‎src/main/java/net/pascalpex/npc/util/PacketReader.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import net.pascalpex.npc.Main;
1313
import net.pascalpex.npc.events.RightClickNPC;
1414
import org.bukkit.Bukkit;
15-
import org.bukkit.craftbukkit.v1_21_R2.entity.CraftPlayer;
15+
import org.bukkit.craftbukkit.v1_21_R3.entity.CraftPlayer;
1616
import org.bukkit.entity.Player;
1717

1818
import java.lang.reflect.Field;

‎src/main/resources/plugin.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
main: net.pascalpex.npc.Main
22
name: PexNPC
3-
version: 1.24
3+
version: 1.25
44
author: Pascalpex
55
prefix: PexNPC
66
softdepend:

0 commit comments

Comments
 (0)