Merge pull request #44 from boiscljo/dev

1.5.12.2
boiscljo · Dec 27, 2023 · a893ba7 · a893ba7
2 parents b43a393 + 1cbcbd9
commit a893ba7
Show file tree

Hide file tree

Showing 118 changed files with 6,099 additions and 1,571 deletions.
diff --git a/.github/workflows/gradle-publish-1.5.7.yml b/.github/workflows/gradle-publish-1.5.7.yml
@@ -1,7 +1,7 @@
-name: Pre-Builds 1.5.7
+name: Pre-Builds dev versions
 on:
   push:
-    branches: [ 1.5.7 ]
+    branches: [ dev ]
 concurrency: sba_v157
 jobs:
   build:
@@ -47,7 +47,7 @@ jobs:
         with:
           tag_name: ${{ steps.read_property.outputs.value }}.${{ steps.vars.outputs.sha_short }}"
           release_name: Release ${{ steps.read_property.outputs.value }}
-          body: Pre-release of 1.5.7
+          body: Pre-release of dev version
           draft: false
           prerelease: true
       - name: Upload Release Asset

diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json
@@ -0,0 +1,36 @@
+{
+  "configurations": [
+    {
+      "browse": {
+        "databaseFilename": "${default}",
+        "limitSymbolsToIncludedHeaders": false
+      },
+      "includePath": [
+        "/home/boiscljo/ros2/install/zed_components/include/**",
+        "/home/boiscljo/ros2/install/zed_interfaces/include/**",
+        "/home/boiscljo/ros2/install/septentrio_gnss_driver/include/**",
+        "/home/boiscljo/ros2/install/rslidar_msg/include/**",
+        "/home/boiscljo/ros2/install/ros2socketcan_bridge/include/**",
+        "/home/boiscljo/ros2/install/radar_conti_ars408/include/**",
+        "/home/boiscljo/ros2/install/radar_conti_ars408_msgs/include/**",
+        "/home/boiscljo/ros2/install/imu_viz/include/**",
+        "/home/boiscljo/ros2/install/imu_tf/include/**",
+        "/home/boiscljo/ros2/install/imu_fusion_madgwick/include/**",
+        "/home/boiscljo/ros2/install/imu_filter_madgwick/include/**",
+        "/home/boiscljo/ros2/install/carla_waypoint_types/include/**",
+        "/home/boiscljo/ros2/install/carla_ros_scenario_runner_types/include/**",
+        "/home/boiscljo/ros2/install/carla_ackermann_msgs/include/**",
+        "/home/boiscljo/ros2/install/carla_msgs/include/**",
+        "/home/boiscljo/ros2uqtr/install/apollo_msgs/include/**",
+        "/opt/ros/foxy/include/**",
+        "/usr/include/**"
+      ],
+      "name": "ROS",
+      "intelliSenseMode": "gcc-x64",
+      "compilerPath": "/usr/bin/gcc",
+      "cStandard": "gnu11",
+      "cppStandard": "c++14"
+    }
+  ],
+  "version": 4
+}
diff --git a/api/build.gradle b/api/build.gradle
@@ -3,5 +3,6 @@ dependencies {
     compileOnly "org.screamingsandals.lib:shared-core:" + SCREAMINGLIB_VERSION
     compileOnly "org.screamingsandals.lib:core-bukkit:" + SCREAMINGLIB_VERSION
     compileOnly "org.screamingsandals.lib:npc-common:" + SCREAMINGLIB_VERSION
+    compileOnly 'me.clip:placeholderapi:' + PAPI_VERSION
     compileOnly "net.citizensnpcs:citizensapi:2.0.30-SNAPSHOT"
 }
diff --git a/api/src/main/java/io/github/pronze/sba/MessageKeys.java b/api/src/main/java/io/github/pronze/sba/MessageKeys.java
@@ -118,6 +118,7 @@ public class MessageKeys {
     public static final String[] RESPAWNED_TITLE = {"respawned-title"};
     public static final String[] CANNOT_PUT_ITEM_IN_CHEST = {"cannot-put-item-on-chest"};
     public static final String[] GREATEST_ENCHANTMENT = {"greatest-enchantment"};
+    public static final String[] GREATEST_SPAWNER = {"spawner-already-maxed"};
     public static final String[] WAIT_FOR_TRAP = {"wait-trap"};
     public static final String[] BLINDNESS_TRAP_PURCHASED_TITLE = {"blindness-trap-purchased-title"};
     public static final String[] MINER_TRAP_PURCHASED_TITLE = {"miner-trap-purchased-title"};

diff --git a/api/src/main/java/io/github/pronze/sba/events/SBAPlayerPartyChatEvent.java b/api/src/main/java/io/github/pronze/sba/events/SBAPlayerPartyChatEvent.java
@@ -4,7 +4,7 @@
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import lombok.Setter;
-import net.kyori.adventure.text.Component;
+import org.screamingsandals.lib.spectator.Component;
 import org.bukkit.event.Cancellable;
 import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;

diff --git a/api/src/main/java/io/github/pronze/sba/game/tasks/BaseGameTask.java b/api/src/main/java/io/github/pronze/sba/game/tasks/BaseGameTask.java
@@ -4,9 +4,10 @@
 import lombok.Data;
 import org.screamingsandals.bedwars.api.game.Game;
 import org.screamingsandals.bedwars.api.game.GameStatus;
+import org.screamingsandals.lib.tasker.DefaultThreads;
 import org.screamingsandals.lib.tasker.Tasker;
 import org.screamingsandals.lib.tasker.TaskerTime;
-import org.screamingsandals.lib.tasker.task.TaskerTask;
+import org.screamingsandals.lib.tasker.task.Task;
 
 import java.util.UUID;
 
@@ -17,7 +18,7 @@ public abstract class BaseGameTask {
     protected Game game;
     private long duration;
     private TaskerTime timeUnit;
-    private TaskerTask task;
+    private Task task;
     private boolean started;
 
     public BaseGameTask() {
@@ -32,7 +33,7 @@ public BaseGameTask start(IArena arena) {
         if (task != null) {
             task.cancel();
         }
-        task = Tasker.build(this::loopLogic).repeat(duration, timeUnit).start();
+        task = Tasker.runRepeatedly(DefaultThreads.GLOBAL_THREAD, this::loopLogic, duration, timeUnit);
         return this;
     }