🎉 First Support 1.21

Euphillya · Jun 15, 2024 · c119d10 · c119d10
1 parent 8c78d10
commit c119d10
Show file tree

Hide file tree

Showing 11 changed files with 356 additions and 17 deletions.
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/api/build.gradle.kts b/api/build.gradle.kts
@@ -1,11 +1,11 @@
 plugins {
     id("java")
-    id("io.papermc.paperweight.userdev")
+    //id("io.papermc.paperweight.userdev")
 }
 
 
 dependencies {
-    paperweight.foliaDevBundle("1.20.4-R0.1-SNAPSHOT")
+    compileOnly("io.papermc.paper:paper-api:1.21-R0.1-SNAPSHOT")
     implementation("com.github.Euphillya:SGBD-MariaDB:3827fafa25")
 }
 
@@ -32,14 +32,14 @@ publishing {
 
 tasks {
     assemble {
-        dependsOn(reobfJar)
+        //dependsOn(reobfJar)
     }
     compileJava {
         options.encoding = "UTF-8"
     }
 }
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_17
+    sourceCompatibility = JavaVersion.VERSION_21
+    targetCompatibility = JavaVersion.VERSION_21
 }
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -20,6 +20,7 @@ dependencies {
     implementation(project(":nms:v1_20_R2", "reobf"))
     implementation(project(":nms:v1_20_R3", "reobf"))
     implementation(project(":nms:v1_20_R4", "reobf"))
+    implementation(project(":nms:v1_21_R1", "reobf"))
 }
 
 allprojects {

diff --git a/nms/v1_20_R1/build.gradle.kts b/nms/v1_20_R1/build.gradle.kts
@@ -6,7 +6,6 @@ plugins {
 dependencies {
     paperweight.foliaDevBundle("1.20.1-R0.1-SNAPSHOT")
     compileOnly(project(":api"))
-    compileOnly("com.github.Euphillya:Energie:1.2.0")
 }
 
 tasks {

diff --git a/nms/v1_20_R3/build.gradle.kts b/nms/v1_20_R3/build.gradle.kts
@@ -18,6 +18,6 @@ tasks {
 }
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_17
+    sourceCompatibility = JavaVersion.VERSION_21
+    targetCompatibility = JavaVersion.VERSION_21
 }
diff --git a/nms/v1_21_R1/build.gradle.kts b/nms/v1_21_R1/build.gradle.kts
@@ -0,0 +1,23 @@
+plugins {
+    id("java")
+    id("io.papermc.paperweight.userdev")
+}
+
+dependencies {
+    paperweight.paperDevBundle("1.21-R0.1-SNAPSHOT")
+    compileOnly(project(":api"))
+}
+
+tasks {
+    assemble {
+        dependsOn(reobfJar)
+    }
+    compileJava {
+        options.encoding = "UTF-8"
+    }
+}
+
+java {
+    sourceCompatibility = JavaVersion.VERSION_21
+    targetCompatibility = JavaVersion.VERSION_21
+}
diff --git a/nms/v1_21_R1/src/main/java/fr/euphyllia/skyllia/utils/nms/v1_20_R4/PlayerNMS.java b/nms/v1_21_R1/src/main/java/fr/euphyllia/skyllia/utils/nms/v1_20_R4/PlayerNMS.java
@@ -0,0 +1,25 @@
+package fr.euphyllia.skyllia.utils.nms.v1_20_R4;
+
+import org.bukkit.Location;
+import org.bukkit.entity.Player;
+import org.bukkit.plugin.java.JavaPlugin;
+import org.jetbrains.annotations.NotNull;
+
+public class PlayerNMS extends fr.euphyllia.skyllia.api.utils.nms.PlayerNMS {
+
+    public void setOwnWorldBorder(JavaPlugin main, Player player, @NotNull Location centerBorder, double borderSize, int warningBlocks, int warningTime) {
+        player.getScheduler().execute(main, () -> {
+            final net.minecraft.world.level.border.WorldBorder worldBorderPlayer = new net.minecraft.world.level.border.WorldBorder();
+            worldBorderPlayer.world = ((org.bukkit.craftbukkit.CraftWorld) centerBorder.getWorld()).getHandle();
+            worldBorderPlayer.setCenter(centerBorder.getBlockX(), centerBorder.getBlockZ());
+            worldBorderPlayer.setSize(borderSize);
+            worldBorderPlayer.setWarningBlocks(warningBlocks);
+            worldBorderPlayer.setWarningTime(warningTime);
+            final net.minecraft.network.protocol.game.ClientboundInitializeBorderPacket updateWorldBorderPacket = new net.minecraft.network.protocol.game.ClientboundInitializeBorderPacket(worldBorderPlayer);
+            org.bukkit.craftbukkit.entity.CraftPlayer craftPlayer = ((org.bukkit.craftbukkit.entity.CraftPlayer) player);
+            craftPlayer.getHandle().connection.send(updateWorldBorderPacket);
+        }, null, 0L);
+    }
+
+
+}