Skip to content

Commit 505e007

Browse files
SelfMadeSystemSelfMadeSystem
committed
Cleanup and bump version.
1 parent 8033522 commit 505e007

File tree

18 files changed

+61
-130
lines changed

18 files changed

+61
-130
lines changed

‎.idea/compiler.xml

Lines changed: 22 additions & 22 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Base/src/main/java/uwu/smsgamer/serverscripter/shell/ShellManager.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ private ShellManager() {
1111
throw new AssertionError("No uwu.smsgamer.serverscripter.shell.ShellManager instances for you!");
1212
}
1313

14-
public static Map<UUID, PlayerShell> activeShells = new java.util.HashMap<>();
14+
public static final Map<UUID, PlayerShell> activeShells = new java.util.HashMap<>();
1515
public static BiConsumer<UUID, String> onPrint = (uuid, response) -> {
1616
};
1717
public static BiConsumer<UUID, String> onPrintError = (uuid, response) -> {

‎BungeeCord/build.gradle

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ plugins {
33
}
44

55
archivesBaseName = rootProject.name + "-" + project.name
6-
group 'uwu.smsgamer'
7-
version '0.2.0'
86

97
repositories {
108
mavenCentral()

‎BungeeCord/src/main/java/uwu/smsgamer/serverscripter/bungee/BungeeServerScripter.java

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,15 @@
11
package uwu.smsgamer.serverscripter.bungee;
22

3-
import net.md_5.bungee.api.ProxyServer;
43
import net.md_5.bungee.api.chat.TextComponent;
5-
import uwu.smsgamer.serverscripter.bungee.commands.BungeeCommandManager;
6-
import uwu.smsgamer.serverscripter.bungee.shell.ShellListener;
7-
import uwu.smsgamer.serverscripter.lilliputian.DependencyBuilder;
84
import net.md_5.bungee.api.plugin.Plugin;
95
import uwu.smsgamer.serverscripter.ScriptLoader;
106
import uwu.smsgamer.serverscripter.ScripterLoader;
11-
import uwu.smsgamer.serverscripter.bungee.commands.CommandScript;
7+
import uwu.smsgamer.serverscripter.bungee.commands.BungeeCommandManager;
8+
import uwu.smsgamer.serverscripter.bungee.shell.ShellListener;
9+
import uwu.smsgamer.serverscripter.lilliputian.DependencyBuilder;
1210
import uwu.smsgamer.serverscripter.senapi.utils.ChatColor;
1311
import uwu.smsgamer.serverscripter.shell.ShellManager;
1412

15-
import java.net.URLClassLoader;
1613
import java.util.Collections;
1714

1815
public class BungeeServerScripter extends Plugin implements ScriptLoader {

‎BungeeCord/src/main/java/uwu/smsgamer/serverscripter/bungee/commands/CommandScript.java

Lines changed: 0 additions & 53 deletions
This file was deleted.

‎BungeeCord/src/main/java/uwu/smsgamer/serverscripter/bungee/shell/ShellListener.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
import net.md_5.bungee.api.plugin.Listener;
66
import net.md_5.bungee.event.EventHandler;
77
import org.jetbrains.annotations.NotNull;
8-
import uwu.smsgamer.serverscripter.bungee.BungeeServerScripter;
98
import uwu.smsgamer.serverscripter.shell.PlayerShell;
109
import uwu.smsgamer.serverscripter.shell.ShellManager;
1110

‎BungeeCord/src/main/resources/bungee.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: ServerScripter
2-
version: '0.1'
2+
version: '0.3.0'
33
main: uwu.smsgamer.serverscripter.bungee.BungeeServerScripter
44
author: Sms_Gamer_3808
55
description: Scripting plugin for BungeeCord.

‎Groovy/build.gradle

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ plugins {
33
}
44

55
archivesBaseName = rootProject.name + "-" + project.name
6-
group 'uwu.smsgamer'
7-
version '0.2.0'
86

97
repositories {
108
mavenCentral()

‎JavaScript/build.gradle

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@ plugins {
44
}
55

66
archivesBaseName = rootProject.name + "-" + project.name
7-
group 'uwu.smsgamer'
8-
version '0.2.0'
97

108
repositories {
119
mavenCentral()

‎PacketEvents/build.gradle

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ plugins {
33
}
44

55
archivesBaseName = rootProject.name + "-" + project.name
6-
group 'uwu.smsgamer'
7-
version '0.2.0'
86

97
repositories {
108
mavenCentral()
@@ -25,9 +23,9 @@ dependencies {
2523
implementation 'com.github.retrooper:packetevents:v1.8-pre-13'
2624
compileOnly 'org.spigotmc:spigot-api:1.12.2-R0.1-SNAPSHOT'
2725

28-
compileOnly 'org.projectlombok:lombok:1.18.12'
29-
annotationProcessor 'org.projectlombok:lombok:1.18.12'
26+
compileOnly 'org.projectlombok:lombok:1.18.22'
27+
annotationProcessor 'org.projectlombok:lombok:1.18.22'
3028

31-
testCompileOnly 'org.projectlombok:lombok:1.18.12'
32-
testAnnotationProcessor 'org.projectlombok:lombok:1.18.12'
29+
testCompileOnly 'org.projectlombok:lombok:1.18.22'
30+
testAnnotationProcessor 'org.projectlombok:lombok:1.18.22'
3331
}

‎PacketEvents/src/main/java/uwu/smsgamer/serverscripter/packetevents/ScriptPacketListener.java

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,19 @@
99
public class ScriptPacketListener extends PacketListenerAbstract {
1010
private static ScriptPacketListener instance;
1111
// Not the cleanest way of doing it, but it works.
12-
public Set<Consumer<PacketStatusReceiveEvent>> packetStatusReceiveFuns = new HashSet<>();
13-
public Set<Consumer<PacketStatusSendEvent>> packetStatusSendFuns = new HashSet<>();
14-
public Set<Consumer<PacketLoginReceiveEvent>> packetLoginReceiveFuns = new HashSet<>();
15-
public Set<Consumer<PacketLoginSendEvent>> packetLoginSendFuns = new HashSet<>();
16-
public Set<Consumer<PacketPlayReceiveEvent>> packetPlayReceiveFuns = new HashSet<>();
17-
public Set<Consumer<PacketPlaySendEvent>> packetPlaySendFuns = new HashSet<>();
18-
public Set<Consumer<PostPacketPlayReceiveEvent>> postPacketPlayReceiveFuns = new HashSet<>();
19-
public Set<Consumer<PostPacketPlaySendEvent>> postPacketPlaySendFuns = new HashSet<>();
20-
public Set<Consumer<PostPlayerInjectEvent>> postPlayerInjectFuns = new HashSet<>();
21-
public Set<Consumer<PlayerInjectEvent>> playerInjectFuns = new HashSet<>();
22-
public Set<Consumer<PlayerEjectEvent>> playerEjectFuns = new HashSet<>();
23-
public Set<Consumer<PacketEvent>> packetEventExternalFuns = new HashSet<>();
24-
public Set<Consumer<PacketHandshakeReceiveEvent>> packetHandshakeReceiveFuns = new HashSet<>();
12+
public final Set<Consumer<PacketStatusReceiveEvent>> packetStatusReceiveFuns = new HashSet<>();
13+
public final Set<Consumer<PacketStatusSendEvent>> packetStatusSendFuns = new HashSet<>();
14+
public final Set<Consumer<PacketLoginReceiveEvent>> packetLoginReceiveFuns = new HashSet<>();
15+
public final Set<Consumer<PacketLoginSendEvent>> packetLoginSendFuns = new HashSet<>();
16+
public final Set<Consumer<PacketPlayReceiveEvent>> packetPlayReceiveFuns = new HashSet<>();
17+
public final Set<Consumer<PacketPlaySendEvent>> packetPlaySendFuns = new HashSet<>();
18+
public final Set<Consumer<PostPacketPlayReceiveEvent>> postPacketPlayReceiveFuns = new HashSet<>();
19+
public final Set<Consumer<PostPacketPlaySendEvent>> postPacketPlaySendFuns = new HashSet<>();
20+
public final Set<Consumer<PostPlayerInjectEvent>> postPlayerInjectFuns = new HashSet<>();
21+
public final Set<Consumer<PlayerInjectEvent>> playerInjectFuns = new HashSet<>();
22+
public final Set<Consumer<PlayerEjectEvent>> playerEjectFuns = new HashSet<>();
23+
public final Set<Consumer<PacketEvent>> packetEventExternalFuns = new HashSet<>();
24+
public final Set<Consumer<PacketHandshakeReceiveEvent>> packetHandshakeReceiveFuns = new HashSet<>();
2525

2626
public static ScriptPacketListener getInstance() {
2727
if (instance == null) instance = new ScriptPacketListener();

‎Python/build.gradle

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ plugins {
33
}
44

55
archivesBaseName = rootProject.name + "-" + project.name
6-
group 'uwu.smsgamer'
7-
version '0.2.0'
86

97
repositories {
108
mavenCentral()

‎Python/src/main/java/uwu/smsgamer/serverscripter/python/scripts/PyScript.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
import java.util.*;
99

1010
public class PyScript extends Script {
11-
public List<PyFunction> enableFuns = new ArrayList<>();
12-
public List<PyFunction> reloadFuns = new ArrayList<>();
13-
public List<PyFunction> disableFuns = new ArrayList<>();
11+
public final List<PyFunction> enableFuns = new ArrayList<>();
12+
public final List<PyFunction> reloadFuns = new ArrayList<>();
13+
public final List<PyFunction> disableFuns = new ArrayList<>();
1414
private final PythonInterpreter interpreter;
1515

1616
public PyScript(File scriptFile) {

‎Spigot/build.gradle

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ plugins {
33
}
44

55
archivesBaseName = rootProject.name + "-" + project.name
6-
group 'uwu.smsgamer'
7-
version '0.2.0'
86

97
repositories {
108
mavenCentral()
@@ -41,11 +39,11 @@ dependencies {
4139

4240
compileOnly 'com.github.simplix-softworks:SimplixStorage:3.2.2'
4341

44-
compileOnly 'org.projectlombok:lombok:1.18.12'
45-
annotationProcessor 'org.projectlombok:lombok:1.18.12'
42+
compileOnly 'org.projectlombok:lombok:1.18.22'
43+
annotationProcessor 'org.projectlombok:lombok:1.18.22'
4644

47-
testCompileOnly 'org.projectlombok:lombok:1.18.12'
48-
testAnnotationProcessor 'org.projectlombok:lombok:1.18.12'
45+
testCompileOnly 'org.projectlombok:lombok:1.18.22'
46+
testAnnotationProcessor 'org.projectlombok:lombok:1.18.22'
4947

5048
compileOnly 'org.spigotmc:plugin-annotations:1.2.3-SNAPSHOT'
5149
annotationProcessor 'org.spigotmc:plugin-annotations:1.2.3-SNAPSHOT'

‎Spigot/src/main/java/uwu/smsgamer/serverscripter/spigot/SpigotServerScripter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
import java.io.File;
2626
import java.util.Collections;
2727

28-
@Plugin(name = "ServerScripter", version = "0.2.0")
28+
@Plugin(name = "ServerScripter", version = "0.3.0")
2929
@Description("Scripting plugin for Spigot.")
3030
@Author("Sms_Gamer_3808")
3131
@SoftDependency("PacketEvents")

‎Velocity/build.gradle

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ plugins {
33
}
44

55
archivesBaseName = rootProject.name + "-" + project.name
6-
group 'uwu.smsgamer'
7-
version '0.2.0'
86

97
repositories {
108
mavenCentral()
@@ -31,8 +29,8 @@ configurations {
3129
dependencies {
3230
implementation project(":Base")
3331
extraLibs project(":Base")
34-
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.7.0'
35-
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.7.0'
32+
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.2'
33+
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.2'
3634

3735
compileOnly 'com.github.simplix-softworks:SimplixStorage:3.2.2'
3836

‎Velocity/src/main/java/uwu/smsgamer/serverscripter/velocity/VelocityServerScripter.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,11 @@
1212
import lombok.Getter;
1313
import net.kyori.adventure.text.Component;
1414
import net.kyori.adventure.text.format.NamedTextColor;
15-
import net.kyori.adventure.text.format.TextColor;
1615
import net.kyori.adventure.title.Title;
1716
import uwu.smsgamer.serverscripter.lilliputian.DependencyBuilder;
1817
import org.slf4j.Logger;
1918
import uwu.smsgamer.serverscripter.ScriptLoader;
2019
import uwu.smsgamer.serverscripter.ScripterLoader;
21-
import uwu.smsgamer.serverscripter.senapi.utils.ChatColor;
2220
import uwu.smsgamer.serverscripter.shell.ShellManager;
2321
import uwu.smsgamer.serverscripter.velocity.commands.VelocityCommandManager;
2422
import uwu.smsgamer.serverscripter.velocity.shell.ShellListener;
@@ -28,13 +26,12 @@
2826
import java.time.Duration;
2927
import java.util.Collections;
3028
import java.util.Optional;
31-
import java.util.Set;
3229
import java.util.logging.LogManager;
3330

3431
@Plugin(
3532
id = "server_scripter",
3633
name = "ServerScripter",
37-
version = "0.2.0",
34+
version = "0.3.0",
3835
description = "Scripting plugin for Velocity.",
3936
authors = {"Sms_Gamer_3808"}
4037
)

‎build.gradle

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,12 @@ plugins {
33
}
44

55
group 'uwu.smsgamer'
6-
version '0.2.0'
6+
version '0.3.0'
7+
8+
subprojects {
9+
group = parent.group
10+
version = parent.version
11+
}
712

813
repositories {
914
mavenCentral()

0 commit comments

Comments
 (0)