add 1.20.2 support

hCore-bukkit/api/src/main/java/com/hakan/core/protocol/ProtocolVersion.java

@@ -34,6 +34,7 @@ public enum ProtocolVersion {
     v1_19_R2("v1_19_R2"),
     v1_19_R3("v1_19_R3"),
     v1_20_R1("v1_20_R1"),
+    v1_20_R2("v1_20_R2"),
     ;
 
 

hCore-bukkit/build.gradle

@@ -23,6 +23,7 @@ dependencies {
     implementation project(':hCore-bukkit:nms:v1_19_R2')
     implementation project(':hCore-bukkit:nms:v1_19_R3')
     implementation project(':hCore-bukkit:nms:v1_20_R1')
+    implementation project(':hCore-bukkit:nms:v1_20_R2')
 }
 
 tasks.compileJava.dependsOn(
@@ -90,5 +91,8 @@ tasks.compileJava.dependsOn(
         ':hCore-bukkit:nms:v1_19_R3:shadowJar',
 
         ':hCore-bukkit:nms:v1_20_R1:jar',
-        ':hCore-bukkit:nms:v1_20_R1:shadowJar'
+        ':hCore-bukkit:nms:v1_20_R1:shadowJar',
+
+        ':hCore-bukkit:nms:v1_20_R2:jar',
+        ':hCore-bukkit:nms:v1_20_R2:shadowJar'
 )

hCore-bukkit/nms/v1_20_R1/build.gradle

@@ -2,7 +2,7 @@ sourceCompatibility = 17
 
 dependencies {
     compileOnly 'com.mojang:authlib:3.2.28'
-    compileOnly 'org.spigotmc:spigot:1.20-R0.1-SNAPSHOT'
+    compileOnly 'org.spigotmc:spigot:1.20.1-R0.1-SNAPSHOT'
     compileOnly project(':hCore-bukkit:api')
 }
 

hCore-bukkit/nms/v1_20_R2/build.gradle

@@ -0,0 +1,12 @@
+sourceCompatibility = 17
+
+dependencies {
+    compileOnly 'com.mojang:authlib:3.2.28'
+    compileOnly 'org.spigotmc:spigot:1.20.2-R0.1-SNAPSHOT'
+    compileOnly project(':hCore-bukkit:api')
+}
+
+tasks.compileJava.dependsOn(
+        ':hCore-bukkit:api:jar',
+        ':hCore-bukkit:api:shadowJar',
+)

hCore-bukkit/nms/v1_20_R2/src/main/java/com/hakan/core/border/versions/Border_v1_20_R2.java

@@ -0,0 +1,234 @@
+package com.hakan.core.border.versions;
+
+import com.hakan.core.HCore;
+import com.hakan.core.border.Border;
+import com.hakan.core.border.BorderHandler;
+import com.hakan.core.border.color.BorderColor;
+import com.hakan.core.scheduler.Scheduler;
+import com.hakan.core.utils.Validate;
+import net.minecraft.network.protocol.game.ClientboundInitializeBorderPacket;
+import net.minecraft.network.protocol.game.ClientboundSetBorderCenterPacket;
+import net.minecraft.network.protocol.game.ClientboundSetBorderLerpSizePacket;
+import net.minecraft.network.protocol.game.ClientboundSetBorderSizePacket;
+import net.minecraft.network.protocol.game.ClientboundSetBorderWarningDelayPacket;
+import net.minecraft.network.protocol.game.ClientboundSetBorderWarningDistancePacket;
+import net.minecraft.world.level.border.WorldBorder;
+import org.bukkit.Location;
+import org.bukkit.craftbukkit.v1_20_R2.CraftWorld;
+import org.bukkit.entity.Player;
+
+import javax.annotation.Nonnull;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * {@inheritDoc}
+ */
+public final class Border_v1_20_R2 implements Border {
+
+    private final Player viewer;
+    private final WorldBorder border;
+    private final Scheduler scheduler;
+
+    private BorderColor color;
+    private boolean transition;
+
+    /**
+     * {@inheritDoc}
+     */
+    private Border_v1_20_R2(@Nonnull Player viewer,
+                            @Nonnull Location location,
+                            @Nonnull BorderColor color,
+                            double size,
+                            double damageAmount,
+                            double damageBuffer,
+                            int warningDistance,
+                            int warningTime) {
+        this.scheduler = HCore.syncScheduler();
+        this.viewer = Validate.notNull(viewer, "viewer cannot be null!");
+        this.color = Validate.notNull(color, "border color cannot be null!");
+
+        this.border = new WorldBorder();
+        this.border.world = ((CraftWorld) location.getWorld()).getHandle();
+
+        this.setSize(size);
+        this.setCenter(location);
+        this.setWarningTime(warningTime);
+        this.setDamageAmount(damageAmount);
+        this.setDamageBuffer(damageBuffer);
+        this.setWarningDistance(warningDistance);
+        this.update();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Nonnull
+    @Override
+    public Player getViewer() {
+        return this.viewer;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Nonnull
+    @Override
+    public Location getCenter() {
+        return new Location(this.border.world.getWorld(), this.border.a(), 64, this.border.b());
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void setCenter(@Nonnull Location location) {
+        Validate.notNull(location, "location cannot be null!");
+        this.border.c(location.getX(), location.getZ());
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Nonnull
+    @Override
+    public BorderColor getColor() {
+        return this.color;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void setColor(@Nonnull BorderColor borderColor) {
+        this.color = Validate.notNull(borderColor, "border color cannot be null!");
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public double getDamageAmount() {
+        return this.border.o();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void setDamageAmount(double damageAmount) {
+        this.border.c(damageAmount);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public double getDamageBuffer() {
+        return this.border.n();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void setDamageBuffer(double damageBuffer) {
+        this.border.b(damageBuffer);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public int getWarningDistance() {
+        return this.border.r();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void setWarningDistance(int warningDistance) {
+        this.border.c(warningDistance);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public int getWarningTime() {
+        return this.border.q();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void setWarningTime(int warningTime) {
+        this.border.b(warningTime);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public double getSize() {
+        return this.border.i();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void setSize(double size, long time) {
+        if (this.transition)
+            this.scheduler.cancel();
+
+        this.scheduler.after(time, TimeUnit.MILLISECONDS)
+                .run(() -> this.transition = false);
+        this.transition = true;
+
+        this.border.a(this.getSize(), size, time);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void update() {
+        if (!this.transition)
+            if (this.color == BorderColor.BLUE)
+                this.border.a(this.getSize(), this.getSize(), Long.MAX_VALUE);
+            else if (this.color == BorderColor.GREEN)
+                this.border.a(this.getSize(), this.getSize() + 0.1, Long.MAX_VALUE);
+            else if (this.color == BorderColor.RED)
+                this.border.a(this.getSize(), this.getSize() - 0.1, Long.MAX_VALUE);
+
+        HCore.sendPacket(this.viewer, new ClientboundSetBorderLerpSizePacket(this.border));
+        HCore.sendPacket(this.viewer, new ClientboundSetBorderCenterPacket(this.border));
+        HCore.sendPacket(this.viewer, new ClientboundSetBorderSizePacket(this.border));
+        HCore.sendPacket(this.viewer, new ClientboundSetBorderWarningDistancePacket(this.border));
+        HCore.sendPacket(this.viewer, new ClientboundSetBorderWarningDelayPacket(this.border));
+        HCore.sendPacket(this.viewer, new ClientboundInitializeBorderPacket(this.border));
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void delete() {
+        this.setSize(6.0E7);
+        this.setWarningTime(15);
+        this.setDamageAmount(0.2);
+        this.setDamageBuffer(5.0);
+        this.setWarningDistance(5);
+        this.setCenter(new Location(this.border.world.getWorld(), 0, 64, 0));
+
+        HCore.sendPacket(this.viewer, new ClientboundSetBorderLerpSizePacket(this.border));
+        HCore.sendPacket(this.viewer, new ClientboundSetBorderCenterPacket(this.border));
+        HCore.sendPacket(this.viewer, new ClientboundSetBorderSizePacket(this.border));
+        HCore.sendPacket(this.viewer, new ClientboundSetBorderWarningDistancePacket(this.border));
+        HCore.sendPacket(this.viewer, new ClientboundSetBorderWarningDelayPacket(this.border));
+        HCore.sendPacket(this.viewer, new ClientboundInitializeBorderPacket(this.border));
+        BorderHandler.getContent().remove(this.viewer);
+    }
+}