Bump MockBukkit (1.21.3) and MockSkript (2.9.5)

SkEditorTeam · Dec 20, 2024 · 1635009 · 1635009
1 parent 62e5679
commit 1635009
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 10 deletions.
diff --git a/MockSkript b/MockSkript
diff --git a/api/build.gradle.kts b/api/build.gradle.kts
@@ -6,7 +6,7 @@ plugins {
 dependencies {
     compileOnly("org.projectlombok:lombok:1.18.32")
     annotationProcessor("org.projectlombok:lombok:1.18.32")
-    api("com.github.seeseemelk:MockBukkit-v1.20:3.89.0")
+    api("org.mockbukkit.mockbukkit:mockbukkit-v1.21:4.20.1")
     api("org.apache.logging.log4j:log4j-core:3.0.0-alpha1")
     api("org.slf4j:slf4j-simple:2.0.9")
     api("commons-io:commons-io:2.14.0")

diff --git a/api/src/main/java/me/glicz/skanalyzer/SkAnalyzer.java b/api/src/main/java/me/glicz/skanalyzer/SkAnalyzer.java
@@ -1,6 +1,5 @@
 package me.glicz.skanalyzer;
 
-import be.seeseemelk.mockbukkit.MockBukkit;
 import com.google.common.base.Preconditions;
 import lombok.AccessLevel;
 import lombok.Data;
@@ -18,6 +17,7 @@
 import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Unmodifiable;
+import org.mockbukkit.mockbukkit.MockBukkit;
 
 import java.io.File;
 import java.io.IOException;

diff --git a/api/src/main/java/me/glicz/skanalyzer/mockbukkit/AnalyzerClassLoader.java b/api/src/main/java/me/glicz/skanalyzer/mockbukkit/AnalyzerClassLoader.java
@@ -1,6 +1,5 @@
 package me.glicz.skanalyzer.mockbukkit;
 
-import be.seeseemelk.mockbukkit.plugin.MockBukkitPluginClassLoaderGroup;
 import com.destroystokyo.paper.utils.PaperPluginLogger;
 import com.google.common.io.ByteStreams;
 import io.papermc.paper.plugin.configuration.PluginMeta;
@@ -12,6 +11,7 @@
 import org.bukkit.plugin.java.JavaPlugin;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+import org.mockbukkit.mockbukkit.plugin.MockBukkitPluginClassLoaderGroup;
 
 import java.io.File;
 import java.io.IOException;

diff --git a/api/src/main/java/me/glicz/skanalyzer/mockbukkit/AnalyzerScheduler.java b/api/src/main/java/me/glicz/skanalyzer/mockbukkit/AnalyzerScheduler.java
@@ -1,8 +1,8 @@
 package me.glicz.skanalyzer.mockbukkit;
 
-import be.seeseemelk.mockbukkit.scheduler.BukkitSchedulerMock;
 import org.bukkit.plugin.Plugin;
 import org.jetbrains.annotations.NotNull;
+import org.mockbukkit.mockbukkit.scheduler.BukkitSchedulerMock;
 
 import java.util.concurrent.Callable;
 import java.util.concurrent.CompletableFuture;

diff --git a/api/src/main/java/me/glicz/skanalyzer/mockbukkit/AnalyzerServer.java b/api/src/main/java/me/glicz/skanalyzer/mockbukkit/AnalyzerServer.java
@@ -1,8 +1,5 @@
 package me.glicz.skanalyzer.mockbukkit;
 
-import be.seeseemelk.mockbukkit.ServerMock;
-import be.seeseemelk.mockbukkit.scheduler.BukkitSchedulerMock;
-import be.seeseemelk.mockbukkit.scheduler.paper.FoliaAsyncScheduler;
 import lombok.Getter;
 import me.glicz.skanalyzer.SkAnalyzer;
 import me.glicz.skanalyzer.loader.AddonsLoader;
@@ -11,6 +8,9 @@
 import org.bukkit.Material;
 import org.bukkit.block.data.BlockData;
 import org.jetbrains.annotations.NotNull;
+import org.mockbukkit.mockbukkit.ServerMock;
+import org.mockbukkit.mockbukkit.scheduler.BukkitSchedulerMock;
+import org.mockbukkit.mockbukkit.scheduler.paper.FoliaAsyncScheduler;
 
 @Getter
 public class AnalyzerServer extends ServerMock {

diff --git a/api/src/main/java/me/glicz/skanalyzer/mockbukkit/AnalyzerUnsafeValues.java b/api/src/main/java/me/glicz/skanalyzer/mockbukkit/AnalyzerUnsafeValues.java
@@ -1,10 +1,10 @@
 package me.glicz.skanalyzer.mockbukkit;
 
-import be.seeseemelk.mockbukkit.MockUnsafeValues;
 import org.bukkit.inventory.ItemStack;
+import org.mockbukkit.mockbukkit.util.UnsafeValuesMock;
 
 @SuppressWarnings("deprecation")
-public class AnalyzerUnsafeValues extends MockUnsafeValues {
+public class AnalyzerUnsafeValues extends UnsafeValuesMock {
     @Override
     public ItemStack modifyItemStack(ItemStack stack, String arguments) {
         return stack;
+2 −2		build.gradle
+2 −2		gradle.properties
+11 −20		src/main/java/ch/njol/skript/bukkitutil/HealthUtils.java
+19 −1		src/main/java/ch/njol/skript/bukkitutil/ItemUtils.java
+40 −39		src/main/java/ch/njol/skript/classes/data/BukkitClasses.java
+37 −10		src/main/java/ch/njol/skript/classes/data/DefaultOperations.java
+16 −19		src/main/java/ch/njol/skript/effects/EffEnchant.java
+30 −45		src/main/java/ch/njol/skript/effects/EffEquip.java
+26 −5		src/main/java/ch/njol/skript/effects/EffPlaySound.java
+32 −19		src/main/java/ch/njol/skript/effects/EffReplace.java
+20 −2		src/main/java/ch/njol/skript/entity/BoatChestData.java
+30 −14		src/main/java/ch/njol/skript/entity/BoatData.java
+13 −128		src/main/java/ch/njol/skript/entity/SimpleEntityData.java
+3 −6		src/main/java/ch/njol/skript/events/SimpleEvents.java
+8 −2		src/main/java/ch/njol/skript/expressions/ExprBlocks.java
+49 −18		src/main/java/ch/njol/skript/expressions/ExprJoinSplit.java
+32 −48		src/main/java/ch/njol/skript/expressions/ExprTimeState.java
+28 −16		src/main/java/ch/njol/skript/expressions/ExprVectorLength.java
+31 −24		src/main/java/ch/njol/skript/expressions/ExprVectorXYZ.java
+51 −0		src/main/java/ch/njol/skript/lang/Expression.java
+33 −13		src/main/java/ch/njol/skript/lang/Variable.java
+7 −23		src/main/java/ch/njol/skript/util/BlockLineIterator.java
+0 −49		src/main/java/ch/njol/skript/util/SoundUtils.java
+2 −2		src/main/java/org/skriptlang/skript/lang/arithmetic/Arithmetics.java
+2 −1		src/main/java/org/skriptlang/skript/lang/entry/KeyValueEntryData.java
+44 −5		src/main/resources/lang/default.lang
+2 −2		src/main/resources/lang/turkish.lang
+17 −0		src/test/java/org/skriptlang/skript/test/tests/regression/MissingTreeSaplingMapEntriesTest.java
+2 −2		src/test/skript/environments/java21/paper-1.21.3.json
+12 −0		src/test/skript/tests/regressions/7140-leather horse armor unequipable.sk
+12 −0		src/test/skript/tests/regressions/7159-regex exceptions not handled.sk
+34 −0		src/test/skript/tests/regressions/7209-long overflow.sk
+31 −0		src/test/skript/tests/regressions/pull-7120-changes overwriting indices.sk
+4 −6		src/test/skript/tests/syntaxes/effects/EffHealth.sk
+3 −0		src/test/skript/tests/syntaxes/effects/EffPlaySound.sk
+18 −0		src/test/skript/tests/syntaxes/expressions/ExprBlocks.sk