Skip to content

Commit e21b441

Browse files
PascalpexPascalpex
committed
Updated for 1.21
1 parent 858bf06 commit e21b441

File tree

6 files changed

+27
-22
lines changed

6 files changed

+27
-22
lines changed

‎pom.xml‎

Lines changed: 8 additions & 8 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.21</version>
9+
<version>1.22</version>
1010
<packaging>jar</packaging>
1111

1212
<name>PexNPC</name>
@@ -30,7 +30,7 @@
3030
<plugin>
3131
<groupId>org.apache.maven.plugins</groupId>
3232
<artifactId>maven-shade-plugin</artifactId>
33-
<version>3.5.3</version>
33+
<version>3.6.0</version>
3434
<executions>
3535
<execution>
3636
<phase>package</phase>
@@ -55,9 +55,9 @@
5555
</goals>
5656
<id>remap-obf</id>
5757
<configuration>
58-
<srgIn>org.spigotmc:minecraft-server:1.20.6-R0.1-SNAPSHOT:txt:maps-mojang</srgIn>
58+
<srgIn>org.spigotmc:minecraft-server:1.21-R0.1-SNAPSHOT:txt:maps-mojang</srgIn>
5959
<reverse>true</reverse>
60-
<remappedDependencies>org.spigotmc:spigot:1.20.6-R0.1-SNAPSHOT:jar:remapped-mojang</remappedDependencies>
60+
<remappedDependencies>org.spigotmc:spigot:1.21-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.20.6-R0.1-SNAPSHOT:csrg:maps-spigot</srgIn>
74-
<remappedDependencies>org.spigotmc:spigot:1.20.6-R0.1-SNAPSHOT:jar:remapped-obf</remappedDependencies>
73+
<srgIn>org.spigotmc:minecraft-server:1.21-R0.1-SNAPSHOT:csrg:maps-spigot</srgIn>
74+
<remappedDependencies>org.spigotmc:spigot:1.21-R0.1-SNAPSHOT:jar:remapped-obf</remappedDependencies>
7575
</configuration>
7676
</execution>
7777
</executions>
@@ -105,13 +105,13 @@
105105
<groupId>org.spigotmc</groupId>
106106
<artifactId>spigot</artifactId>
107107
<classifier>remapped-mojang</classifier>
108-
<version>1.20.6-R0.1-SNAPSHOT</version>
108+
<version>1.21-R0.1-SNAPSHOT</version>
109109
<scope>provided</scope>
110110
</dependency>
111111
<dependency>
112112
<groupId>me.clip</groupId>
113113
<artifactId>placeholderapi</artifactId>
114-
<version>2.11.5</version>
114+
<version>2.11.6</version>
115115
<scope>provided</scope>
116116
</dependency>
117117
</dependencies>

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

Lines changed: 5 additions & 5 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.21 von Pascalpex Aktiviert.");
98+
Bukkit.getConsoleSender().sendMessage(ChatColor.GREEN + "PexNPC 1.22 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.21 von Pascalpex Deaktiviert.");
134+
Bukkit.getConsoleSender().sendMessage(ChatColor.RED + "PexNPC 1.22 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.21 von Pascalpex");
145+
player.sendMessage(prefix + "PexNPC 1.22 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.21 von Pascalpex");
162+
player.sendMessage(prefix + "PexNPC 1.22 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");
@@ -213,7 +213,7 @@ public boolean onCommand(CommandSender sender, Command cmd, String label, String
213213
for (int i = 1; i <= NpcData.getNPCs(); i++) {
214214
String name = NpcData.getName(i);
215215
Location loc = NpcData.getLocation(i);
216-
player.sendMessage(ChatColor.AQUA + "-" + " ID:" + i + ChatColor.GOLD + " Name: " + ChatColor.WHITE + name + ChatColor.AQUA + ChatColor.RED + " Welt: " + loc.getWorld().getName() + ChatColor.GREEN + " X: " + loc.getBlockX() + " Y: " + loc.getBlockY() + " Z: " + loc.getBlockZ());
216+
player.sendMessage(ChatColor.AQUA + "-" + " ID:" + i + ChatColor.GOLD + " Name: " + ChatColor.WHITE + name + ChatColor.AQUA + ChatColor.RED + " Welt: " + (loc.getWorld() == null ? "INVALID" : loc.getWorld().getName()) + ChatColor.GREEN + " X: " + loc.getBlockX() + " Y: " + loc.getBlockY() + " Z: " + loc.getBlockZ());
217217
}
218218
}
219219
}

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,10 @@ public static void loadNPCs() {
189189
float yaw = (float) config.getDouble("npcs" + "." + npc + ".location" + ".yaw");
190190
Location loc = new Location(world, x, y, z, yaw, pitch);
191191

192+
if(world == null) {
193+
return;
194+
}
195+
192196
String cmd = config.getString("npcs" + "." + npc + ".command");
193197
String msg = config.getString("npcs" + "." + npc + ".message");
194198

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

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
import net.minecraft.network.syncher.SynchedEntityData;
1616
import net.minecraft.server.MinecraftServer;
1717
import net.minecraft.server.level.ClientInformation;
18+
import net.minecraft.server.level.ServerEntity;
1819
import net.minecraft.server.level.ServerLevel;
1920
import net.minecraft.server.level.ServerPlayer;
2021
import net.minecraft.server.network.ServerGamePacketListenerImpl;
@@ -26,10 +27,10 @@
2627
import net.pascalpex.npc.NpcData;
2728
import org.apache.commons.lang.Validate;
2829
import org.bukkit.*;
29-
import org.bukkit.craftbukkit.v1_20_R4.CraftServer;
30-
import org.bukkit.craftbukkit.v1_20_R4.CraftWorld;
31-
import org.bukkit.craftbukkit.v1_20_R4.entity.CraftPlayer;
32-
import org.bukkit.craftbukkit.v1_20_R4.inventory.CraftItemStack;
30+
import org.bukkit.craftbukkit.v1_21_R1.CraftServer;
31+
import org.bukkit.craftbukkit.v1_21_R1.CraftWorld;
32+
import org.bukkit.craftbukkit.v1_21_R1.entity.CraftPlayer;
33+
import org.bukkit.craftbukkit.v1_21_R1.inventory.CraftItemStack;
3334
import org.bukkit.entity.Player;
3435
import org.bukkit.inventory.ItemStack;
3536
import org.bukkit.scheduler.BukkitRunnable;
@@ -230,7 +231,7 @@ public static void addNPCPacket(ServerPlayer npc, String suffix) {
230231
if (player.getWorld().equals(worldMap.get(npc.getId()))) {
231232
ServerGamePacketListenerImpl connection = ((CraftPlayer) player).getHandle().connection;
232233
connection.send(createInitPacket(npc));
233-
connection.send(new ClientboundAddEntityPacket(npc));
234+
connection.send(new ClientboundAddEntityPacket(npc, 0, npc.blockPosition()));
234235
connection.send(new ClientboundRotateHeadPacket(npc, (byte) (NpcData.getLocation(getID(npc)).getYaw() * 256f / 360f)));
235236
Scoreboard scoreboard = new Scoreboard();
236237
PlayerTeam team = new PlayerTeam(scoreboard, npc.getUUID().toString());
@@ -265,7 +266,7 @@ public static void addJoinPacket(Player player) {
265266
ServerGamePacketListenerImpl connection = ((CraftPlayer) player).getHandle().connection;
266267
connection.send(createInitPacket(npc));
267268
connection.send(new ClientboundEntityEventPacket(npc, (byte) 1));
268-
connection.send(new ClientboundAddEntityPacket(npc));
269+
connection.send(new ClientboundAddEntityPacket(npc, 0, npc.blockPosition()));
269270
connection.send(new ClientboundRotateHeadPacket(npc, (byte) (NpcData.getLocation(getID(npc)).getYaw() * 256f / 360f)));
270271
Scoreboard scoreboard = new Scoreboard();
271272
PlayerTeam team = new PlayerTeam(scoreboard, npc.getUUID().toString());

‎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_20_R4.entity.CraftPlayer;
15+
import org.bukkit.craftbukkit.v1_21_R1.entity.CraftPlayer;
1616
import org.bukkit.entity.Player;
1717

1818
import java.lang.reflect.Field;

‎src/main/resources/plugin.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
main: net.pascalpex.npc.Main
22
name: PexNPC
3-
version: 1.21
3+
version: 1.22
44
author: Pascalpex
55
prefix: PexNPC
66
softdepend:
77
- Multiverse-Core
88
- PlaceholderAPI
9-
api-version: '1.20'
9+
api-version: '1.21'
1010

1111
commands:
1212
PexNPC:

0 commit comments

Comments
 (0)