1.17.1

CombatTagPlus/pom.xml

@@ -5,15 +5,15 @@
     <parent>
         <artifactId>CombatTagPlusParent</artifactId>
         <groupId>net.minelink</groupId>
-        <version>1.3.3-SNAPSHOT</version>
+        <version>1.4.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>CombatTagPlus</artifactId>
 
     <properties>
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
+        <maven.compiler.source>16</maven.compiler.source>
+        <maven.compiler.target>16</maven.compiler.target>
     </properties>
 
     <build>
@@ -28,7 +28,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.2.1</version>
+                <version>3.3.0-SNAPSHOT</version>
                 <configuration>
                     <createDependencyReducedPom>false</createDependencyReducedPom>
                     <relocations>
@@ -53,7 +53,7 @@
     <repositories>
         <repository>
             <id>byteflux-repo</id>
-            <url>http://repo.byteflux.net/repository/maven-public/</url>
+            <url>https://repo.byteflux.net/repository/maven-public/</url>
         </repository>
         <repository>
             <id>spigot-repo</id>
@@ -63,51 +63,51 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.spigotmc</groupId>
-            <artifactId>spigot</artifactId>
-            <version>1.16.1-R0.1-SNAPSHOT</version>
+            <groupId>io.papermc.paper</groupId>
+            <artifactId>paper</artifactId>
+            <version>1.17.1-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>net.minelink</groupId>
             <artifactId>CombatTagPlusCompat-API</artifactId>
-            <version>1.3.3-SNAPSHOT</version>
+            <version>1.4.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
+<!--        <dependency>-->
+<!--            <groupId>net.minelink</groupId>-->
+<!--            <artifactId>CombatTagPlusCompat-v1_12_R1</artifactId>-->
+<!--            <version>1.3.3-SNAPSHOT</version>-->
+<!--            <scope>compile</scope>-->
+<!--        </dependency>-->
+<!--        <dependency>-->
+<!--            <groupId>net.minelink</groupId>-->
+<!--            <artifactId>CombatTagPlusCompat-v1_13_R2</artifactId>-->
+<!--            <version>1.3.3-SNAPSHOT</version>-->
+<!--            <scope>compile</scope>-->
+<!--        </dependency>-->
+<!--        <dependency>-->
+<!--        	<groupId>net.minelink</groupId>-->
+<!--        	<artifactId>CombatTagPlusCompat-v1_14_R1</artifactId>-->
+<!--        	<version>1.3.3-SNAPSHOT</version>-->
+<!--        	<scope>compile</scope>-->
+<!--        </dependency>-->
+<!--        <dependency>-->
+<!--        	<groupId>net.minelink</groupId>-->
+<!--        	<artifactId>CombatTagPlusCompat-v1_15_R1</artifactId>-->
+<!--        	<version>1.3.3-SNAPSHOT</version>-->
+<!--        	<scope>compile</scope>-->
+<!--        </dependency>-->
+<!--        <dependency>-->
+<!--        	<groupId>net.minelink</groupId>-->
+<!--        	<artifactId>CombatTagPlusCompat-v1_16_R1</artifactId>-->
+<!--        	<version>1.3.3-SNAPSHOT</version>-->
+<!--        	<scope>compile</scope>-->
+<!--        </dependency>-->
         <dependency>
             <groupId>net.minelink</groupId>
-            <artifactId>CombatTagPlusCompat-v1_12_R1</artifactId>
-            <version>1.3.3-SNAPSHOT</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>net.minelink</groupId>
-            <artifactId>CombatTagPlusCompat-v1_13_R2</artifactId>
-            <version>1.3.3-SNAPSHOT</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-        	<groupId>net.minelink</groupId>
-        	<artifactId>CombatTagPlusCompat-v1_14_R1</artifactId>
-        	<version>1.3.3-SNAPSHOT</version>
-        	<scope>compile</scope>
-        </dependency>
-        <dependency>
-        	<groupId>net.minelink</groupId>
-        	<artifactId>CombatTagPlusCompat-v1_15_R1</artifactId>
-        	<version>1.3.3-SNAPSHOT</version>
-        	<scope>compile</scope>
-        </dependency>
-        <dependency>
-        	<groupId>net.minelink</groupId>
-        	<artifactId>CombatTagPlusCompat-v1_16_R1</artifactId>
-        	<version>1.3.3-SNAPSHOT</version>
-        	<scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>net.minelink</groupId>
-            <artifactId>CombatTagPlusCompat-v1_16_R3</artifactId>
-            <version>1.3.3-SNAPSHOT</version>
+            <artifactId>CombatTagPlusCompat-v1_17_R1</artifactId>
+            <version>1.4.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
@@ -116,12 +116,12 @@
             <version>1.3.3-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
-        <dependency>
-            <groupId>net.minelink</groupId>
-            <artifactId>CombatTagPlusFactions-v2_7</artifactId>
-            <version>1.3.3-SNAPSHOT</version>
-            <scope>compile</scope>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>net.minelink</groupId>-->
+<!--            <artifactId>CombatTagPlusFactions-v2_7</artifactId>-->
+<!--            <version>1.3.3-SNAPSHOT</version>-->
+<!--            <scope>compile</scope>-->
+<!--        </dependency>-->
         <dependency>
             <groupId>net.minelink</groupId>
             <artifactId>CombatTagPlusWG-v7</artifactId>

CombatTagPlus/src/main/resources/plugin.yml

@@ -4,7 +4,7 @@ version: ${version}
 authors: [Byteflux, Sudzzy]
 main: net.minelink.ctplus.CombatTagPlus
 softdepend: [BarAPI, PlayerHeads, WorldGuard, Factions, Towny, BossBarAPI, ActionBarAPI, mcMMO]
-api-version: 1.14
+api-version: 1.17
 commands:
   combattagplus:
     aliases: [ctplus, ct, combattag]

CombatTagPlusCompat-API/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>CombatTagPlusParent</artifactId>
         <groupId>net.minelink</groupId>
-        <version>1.3.3-SNAPSHOT</version>
+        <version>1.4.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

CombatTagPlusCompat-v1_16_R3/pom.xml

@@ -15,7 +15,7 @@
         <dependency>
             <groupId>com.destroystokyo.paper</groupId>
             <artifactId>paper</artifactId>
-            <version>1.16.4-R0.1-SNAPSHOT</version>
+            <version>1.16.5-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

CombatTagPlusCompat-v1_17_R1/pom.xml

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>CombatTagPlusParent</artifactId>
+        <groupId>net.minelink</groupId>
+        <version>1.4.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>CombatTagPlusCompat-v1_17_R1</artifactId>
+
+    <dependencies>
+        <dependency>
+            <groupId>io.papermc.paper</groupId>
+            <artifactId>paper</artifactId>
+            <version>1.17.1-R0.1-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>net.minelink</groupId>
+            <artifactId>CombatTagPlusCompat-API</artifactId>
+            <version>1.4.0-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+</project>

CombatTagPlusCompat-v1_17_R1/src/main/java/net/minelink/ctplus/compat/v1_17_R1/NpcNetworkManager.java

@@ -0,0 +1,83 @@
+package net.minelink.ctplus.compat.v1_17_R1;
+
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.util.concurrent.GenericFutureListener;
+import java.net.SocketAddress;
+import net.minecraft.network.EnumProtocol;
+import net.minecraft.network.NetworkManager;
+import net.minecraft.network.PacketListener;
+import net.minecraft.network.protocol.EnumProtocolDirection;
+import net.minecraft.network.protocol.Packet;
+
+public final class NpcNetworkManager extends NetworkManager {
+
+    public NpcNetworkManager() {
+        super(EnumProtocolDirection.a);
+    }
+
+    @Override
+    public void channelActive(ChannelHandlerContext channelhandlercontext) throws Exception {
+
+    }
+
+    @Override
+    public void setProtocol(EnumProtocol enumprotocol) {
+
+    }
+
+    @Override
+    public void channelInactive(ChannelHandlerContext channelhandlercontext) {
+
+    }
+
+    @Override
+    public void exceptionCaught(ChannelHandlerContext channelhandlercontext, Throwable throwable) {
+
+    }
+
+    @Override
+    protected void channelRead0(ChannelHandlerContext channelhandlercontext, Packet packet) {
+
+    }
+
+    @Override
+    public void setPacketListener(PacketListener packetlistener) {
+
+    }
+
+    @Override
+    public void sendPacket(Packet packet) {
+
+    }
+
+    @Override
+    public void sendPacket(Packet packet, GenericFutureListener genericfuturelistener) {
+
+    }
+
+    @Override
+    public SocketAddress getSocketAddress() {
+        return new SocketAddress() {};
+    }
+
+    @Override
+    public boolean isLocal() {
+        return false;
+    }
+
+    @Override
+    public boolean isConnected() {
+        return true;
+    }
+
+    @Override
+    public void stopReading() {
+
+    }
+
+    @Override
+    public void handleDisconnection() {
+
+    }
+
+}

CombatTagPlusCompat-v1_17_R1/src/main/java/net/minelink/ctplus/compat/v1_17_R1/NpcPlayer.java

@@ -0,0 +1,45 @@
+package net.minelink.ctplus.compat.v1_17_R1;
+
+import com.mojang.authlib.GameProfile;
+import com.mojang.authlib.properties.Property;
+import java.util.Map;
+import java.util.UUID;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.server.level.EntityPlayer;
+import net.minecraft.server.level.WorldServer;
+import net.minelink.ctplus.compat.api.NpcIdentity;
+import net.minelink.ctplus.compat.api.NpcNameGeneratorFactory;
+import org.bukkit.craftbukkit.v1_17_R1.CraftWorld;
+import org.bukkit.craftbukkit.v1_17_R1.entity.CraftPlayer;
+import org.bukkit.entity.Player;
+
+public final class NpcPlayer extends EntityPlayer {
+
+    private NpcIdentity identity;
+
+    private NpcPlayer(MinecraftServer minecraftserver, WorldServer worldserver, GameProfile gameprofile) {
+        super(minecraftserver, worldserver, gameprofile);
+    }
+
+    public NpcIdentity getNpcIdentity() {
+        return identity;
+    }
+
+    public static NpcPlayer valueOf(Player player) {
+        MinecraftServer minecraftServer = MinecraftServer.getServer();
+        WorldServer worldServer = ((CraftWorld) player.getWorld()).getHandle();
+        GameProfile gameProfile = new GameProfile(UUID.randomUUID(), NpcNameGeneratorFactory.getNameGenerator().generate(player));
+
+        for (Map.Entry<String, Property> entry: ((CraftPlayer) player).getProfile().getProperties().entries()) {
+            gameProfile.getProperties().put(entry.getKey(), entry.getValue());
+        }
+
+        NpcPlayer npcPlayer = new NpcPlayer(minecraftServer, worldServer, gameProfile);
+        npcPlayer.identity = new NpcIdentity(player);
+
+        new NpcPlayerConnection(npcPlayer);
+
+        return npcPlayer;
+    }
+
+}