Refacor Surf

.github/workflows/build.yml

@@ -10,20 +10,23 @@ jobs:
     runs-on: ubuntu-latest
     if: "github.actor != 'dependabot[bot]'"
     steps:
-      - uses: actions/checkout@main
+      - uses: actions/checkout@v6
+
       - name: Set up JDK 21
-        uses: actions/setup-java@main
+        uses: actions/setup-java@v5
         with:
-          java-version: 21
-          distribution: zulu
+          distribution: 'zulu'
+          java-version: '21'
+          cache: gradle
 
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
+
       - name: Build
-        run: ./gradlew clean build
+        run: ./gradlew build
 
       - name: Release Surf
-        uses: marvinpinto/action-automatic-releases@master
+        uses: marvinpinto/action-automatic-releases@v1.2.1
         with:
           title: "Surf v5.0.0"
           automatic_release_tag: "5.0.0"

README.md

@@ -16,7 +16,7 @@ Recommended use as a addition with AnarchyExploitFixes and Panilla to become 100
 
 ___
 
-## Features
+## Features (WIP - Redo this)
 
 - Prevent all crash exploits that I know of
 - Prevent ChunkBan
@@ -33,15 +33,6 @@ ___
 - Discord: [`https://discord.gg/8Bv5MTXFj5`](https://discord.gg/8Bv5MTXFj5)
 - QQ: `2682173972`
 
-## TODOS
-
-prefix
-modules
-    ChunkBan
-    NBTBAN
-Refactor notes;
-Move checks in item util into checks package
-split to general and various checks related to specific item.
-in the main check method under each listener, add checks for specific item type
-then in a for loop to loop all checks to snalitize the item.
-Add add credit for panilla
+## Credit
+
+- Panilla

build.gradle.kts

@@ -33,10 +33,10 @@ repositories {
         url = uri("https://repo.bsdevelopment.org/releases/")
     }
 
-    // JitPack
+    // FoliaLib
     maven {
-        name = "jitpack.io"
-        url = uri("https://jitpack.io/")
+        name = "tcoded-releases"
+        url = uri("https://repo.tcoded.com/releases")
     }
 }
 
@@ -46,8 +46,8 @@ dependencies {
         exclude(group = "org.yaml", module = "snakeyaml")
     }
     implementation("org.bstats:bstats-bukkit:3.2.1")
-    implementation("com.github.technicallycoded:FoliaLib:0.4.4")
-    implementation("com.github.cryptomorin:XSeries:v13.6.0")
+    implementation("com.tcoded:FoliaLib:0.5.2")
+    implementation("com.github.cryptomorin:XSeries:13.7.0")
     implementation("de.tr7zw:item-nbt-api:2.15.7")
     compileOnly(files("libs/RoseStacker-1.5.22.jar"))
 }
@@ -62,12 +62,12 @@ tasks {
         targetCompatibility = JavaVersion.VERSION_21
     }
 
-    build.configure {
+    build {
         dependsOn(shadowJar)
     }
 
     shadowJar {
-        archiveFileName = "${project.name}-${project.version}.${archiveExtension.get()}"
+        archiveFileName.set("${project.name}-${project.version}.${archiveExtension.get()}")
         exclude("META-INF/**") // Dreeam - Avoid to include META-INF/maven in Jar
         relocate("io.github.thatsmusic99.configurationmaster", "${project.group}.libs.configurationmaster")
         relocate("org.bstats", "${project.group}.libs.bstats")
@@ -79,9 +79,11 @@ tasks {
     processResources {
         filesMatching("**/plugin.yml") {
             expand(
-                "name" to project.name,
-                "version" to project.version,
-                "description" to project.description
+                mapOf(
+                    "name" to project.name,
+                    "version" to project.version,
+                    "description" to description
+                )
             )
         }
     }

gradle.properties

@@ -1,3 +1,3 @@
 org.gradle.caching=true
 org.gradle.parallel=true
-org.gradle.vfs.watch=false
+org.gradle.vfs.watch=false

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.0-rc-3-bin.zip
 networkTimeout=10000
 retries=0
 retryBackOffMs=500

settings.gradle.kts

@@ -1 +1 @@
-rootProject.name = "Surf"
+rootProject.name = "Surf"

src/main/java/cn/dreeam/surf/Surf.java

@@ -2,24 +2,21 @@
 
 import cn.dreeam.surf.command.CommandHandler;
 import cn.dreeam.surf.config.ConfigManager;
-import cn.dreeam.surf.modules.antiillegal.CheckIllegal;
-import cn.dreeam.surf.modules.antiillegal.CheckRoseStackerItem;
-import cn.dreeam.surf.modules.antiillegal.IllegalBlockCheck;
-import cn.dreeam.surf.modules.antiillegal.IllegalDamageAndPotionCheck;
-import cn.dreeam.surf.modules.antiillegal.StackedTotem;
-import cn.dreeam.surf.modules.antilag.BlockPhysics;
-import cn.dreeam.surf.modules.antilag.MinecartLag;
-import cn.dreeam.surf.modules.antilag.Offhand;
-import cn.dreeam.surf.modules.antilag.WitherSpawn;
+import cn.dreeam.surf.listener.*;
+import cn.dreeam.surf.listener.hook.*;
+import cn.dreeam.surf.modules.misc.antilag.BlockPhysics;
+import cn.dreeam.surf.modules.misc.antilag.MinecartLag;
+import cn.dreeam.surf.modules.misc.antilag.Offhand;
+import cn.dreeam.surf.modules.misc.antilag.WitherSpawn;
 import cn.dreeam.surf.modules.misc.ConnectionEvent;
 import cn.dreeam.surf.modules.misc.NetherCheck;
-import cn.dreeam.surf.modules.patch.BookBan;
-import cn.dreeam.surf.modules.patch.BucketEvent;
-import cn.dreeam.surf.modules.patch.ChunkBan;
-import cn.dreeam.surf.modules.patch.DispenserCrash;
-import cn.dreeam.surf.modules.patch.GateWay;
-import cn.dreeam.surf.modules.patch.NBTBan;
-import cn.dreeam.surf.modules.patch.PreventEnderPearlClip;
+import cn.dreeam.surf.modules.misc.patch.BookBan;
+import cn.dreeam.surf.modules.misc.patch.BucketEvent;
+import cn.dreeam.surf.modules.misc.patch.ChunkBan;
+import cn.dreeam.surf.modules.misc.patch.DispenserCrash;
+import cn.dreeam.surf.modules.misc.patch.GateWay;
+import cn.dreeam.surf.modules.misc.patch.NBTBan;
+import cn.dreeam.surf.modules.misc.patch.PreventEnderPearlClip;
 import com.tcoded.folialib.FoliaLib;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -69,10 +66,11 @@ public void onDisable() {
     public void registerEvents() {
         List<Listener> listeners = Arrays.asList(
                 // CheckIllegal
-                new CheckIllegal(),
-                new IllegalBlockCheck(),
-                new IllegalDamageAndPotionCheck(),
-                new StackedTotem(),
+                new ActionsBasic(),
+                new ActionsBlock(),
+                new ActionsDamage(),
+                new ActionsPotion(),
+                new ActionsStackedTotem(),
 
                 // AntiLag
                 new BlockPhysics(),
@@ -100,7 +98,7 @@ public void registerEvents() {
 
         if (getServer().getPluginManager().getPlugin("RoseStacker") != null) {
             isRoseStackerEnabled = true;
-            pluginManager.registerEvents(new CheckRoseStackerItem(), instance);
+            pluginManager.registerEvents(new ActionsRoseStackerItem(), instance);
         }
     }