Skip to content

Commit 9da83b4

Browse files
committed
revert XSeries version to 13.1.0
1 parent bc9db85 commit 9da83b4

4 files changed

Lines changed: 23 additions & 8 deletions

File tree

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@
137137
<dependency>
138138
<groupId>com.github.cryptomorin</groupId>
139139
<artifactId>XSeries</artifactId>
140-
<version>13.2.0</version>
140+
<version>13.1.0</version>
141141
<scope>compile</scope>
142142
</dependency>
143143
<dependency>
@@ -239,7 +239,7 @@
239239
<dependency>
240240
<groupId>com.github.technicallycoded</groupId>
241241
<artifactId>FoliaLib</artifactId>
242-
<version>main-SNAPSHOT</version>
242+
<version>0.4.4</version>
243243
<scope>compile</scope>
244244
</dependency>
245245
<dependency>

src/main/java/me/refracdevelopment/simplegems/SimpleGems.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ public void onEnable() {
8787
foliaLib = new FoliaLib(this);
8888

8989
if (!XReflection.supports(18) || getFoliaLib().isSpigot()) {
90-
getLogger().info("This version and or software (" + Bukkit.getName() + ") is not supported.");
90+
getLogger().info("This version and or software (" + Bukkit.getName() + " v" + Bukkit.getMinecraftVersion() + ") is not supported.");
9191
getLogger().info("Please update to at least Paper 1.18.x or above.");
9292
getServer().getPluginManager().disablePlugin(this);
9393
return;

src/main/java/me/refracdevelopment/simplegems/utilities/Tasks.java

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,22 @@
99

1010
public class Tasks {
1111

12+
public static void executeConsole(Runnable runnable) {
13+
Consumer<WrappedTask> consumer = task -> runnable.run();
14+
SimpleGems.getInstance().getFoliaLib().getScheduler().runNextTick(consumer);
15+
}
16+
17+
public static void executeConsoleDelayed(Runnable runnable, long delay) {
18+
Consumer<WrappedTask> consumer = task -> runnable.run();
19+
SimpleGems.getInstance().getFoliaLib().getScheduler().runLater(consumer, delay);
20+
}
21+
1222
public static void executeAtEntity(Entity entity, Runnable runnable) {
1323
Consumer<WrappedTask> consumer = task -> runnable.run();
1424
SimpleGems.getInstance().getFoliaLib().getScheduler().runAtEntity(entity, consumer);
1525
}
1626

17-
public static void runAtEntityDelayed(Entity entity, Runnable runnable, long delay) {
27+
public static void executeAtEntityDelayed(Entity entity, Runnable runnable, long delay) {
1828
Consumer<WrappedTask> consumer = task -> runnable.run();
1929
SimpleGems.getInstance().getFoliaLib().getScheduler().runAtEntityLater(entity, consumer, runnable, delay);
2030
}
@@ -24,6 +34,11 @@ public static void runAsync(Runnable runnable) {
2434
SimpleGems.getInstance().getFoliaLib().getScheduler().runAsync(consumer);
2535
}
2636

37+
public static void runTimer(Runnable runnable, long delay, long period, TimeUnit unit) {
38+
Consumer<WrappedTask> consumer = task -> runnable.run();
39+
SimpleGems.getInstance().getFoliaLib().getScheduler().runTimer(consumer, delay, period, unit);
40+
}
41+
2742
public static void runAsyncTimer(Runnable runnable, long delay, long period, TimeUnit unit) {
2843
Consumer<WrappedTask> consumer = task -> runnable.run();
2944
SimpleGems.getInstance().getFoliaLib().getScheduler().runTimerAsync(consumer, delay, period, unit);

src/main/java/me/refracdevelopment/simplegems/utilities/chat/RyMessageUtils.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ public static void sendPlayer(@NotNull Player player, @NotNull String message) {
217217
public static void sendPlayer(@NotNull Player player, @NotNull String... messages) {
218218
for (String message : messages) {
219219
if (message.equalsIgnoreCase("%empty%") || message.contains("%empty%"))
220-
return;
220+
break;
221221

222222
player.sendMessage(adventureTranslate(player, getPrefix() + message));
223223
}
@@ -232,7 +232,7 @@ public static void sendPlayer(@NotNull Player player, @NotNull String... message
232232
public static void sendPlayer(Player player, @NotNull List<String> messages) {
233233
for (String message : messages) {
234234
if (message.equalsIgnoreCase("%empty%") || message.contains("%empty%"))
235-
return;
235+
break;
236236

237237
player.sendMessage(adventureTranslate(player, getPrefix() + message));
238238
}
@@ -262,7 +262,7 @@ public static void sendSender(@NotNull CommandSender sender, @NotNull String mes
262262
public static void sendSender(@NotNull CommandSender sender, @NotNull String... messages) {
263263
for (String message : messages) {
264264
if (message.equalsIgnoreCase("%empty%") || message.contains("%empty%"))
265-
return;
265+
break;
266266

267267
message = Placeholders.setPlaceholders(sender, message);
268268

@@ -279,7 +279,7 @@ public static void sendSender(@NotNull CommandSender sender, @NotNull String...
279279
public static void sendSender(@NotNull CommandSender sender, @NotNull List<String> messages) {
280280
for (String message : messages) {
281281
if (message.equalsIgnoreCase("%empty%") || message.contains("%empty%"))
282-
return;
282+
break;
283283

284284
message = Placeholders.setPlaceholders(sender, message);
285285

0 commit comments

Comments
 (0)