Skip to content

Commit 6482392

Browse files
committed
support skript 2.7
Since Skript 2.7.0-beta1 , getCurrentScript return Script instead of Config SkriptLang/Skript#4108
1 parent 4dc159a commit 6482392

File tree

3 files changed

+36
-15
lines changed

3 files changed

+36
-15
lines changed

build.gradle

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
import org.gradle.api.JavaVersion
2-
import org.gradle.api.tasks.compile.JavaCompile
3-
import org.gradle.jvm.toolchain.JavaLanguageVersion
4-
51
plugins {
62
id 'java'
73
}
@@ -23,15 +19,15 @@ repositories {
2319
}
2420

2521
group = 'Skript-Packet'
26-
version = '2.1.1'
22+
version = '2.1.2'
2723

2824
def mcVersion = '1.19'
2925
def subVersion = ''
3026

3127
def targetJavaVersion = 17
3228

3329
dependencies {
34-
compileOnly (group: 'com.github.SkriptLang', name: 'Skript', version: '2.6.3') {
30+
compileOnly (group: 'com.github.SkriptLang', name: 'Skript', version: '2.7.0-beta2') {
3531
exclude group: 'com.sk89q.worldguard', module: 'worldguard-legacy'
3632
exclude group: 'net.milkbowl.vault', module: 'Vault'
3733
}
@@ -81,25 +77,23 @@ processResources {
8177
}
8278
}
8379

80+
[compileJava, compileTestJava]*.options*.encoding = 'UTF-8'
81+
8482
task export() {
8583
group = "SP"
8684
description = "build gradle into external folder"
8785
doLast {
8886
copy {
8987
from jar // here it automatically reads jar file produced from jar task
90-
into "C:/Users/aeim/Documents/minecraft/eclipse1.17/plugins"
91-
}
92-
copy {
93-
from jar // here it automatically reads jar file produced from jar task
94-
into "C:/Users/aeim/Documents/minecraft/eclipse1.18/plugins"
88+
into "C:/Users/aeim/Documents/minecraft/SkriptPacket/eclipse1.17/plugins"
9589
}
9690
copy {
9791
from jar // here it automatically reads jar file produced from jar task
98-
into "C:/Users/aeim/Documents/minecraft/btooom/server/plugins"
92+
into "C:/Users/aeim/Documents/minecraft/SkriptPacket/eclipse1.18/plugins"
9993
}
10094
copy {
10195
from jar // here it automatically reads jar file produced from jar task
102-
into "C:/Users/aeim/Documents/minecraft/law/server/survie/plugins"
96+
into "C:/Users/aeim/Documents/minecraft/SkriptPacket/eclipse1.19/plugins"
10397
}
10498
}
10599
}

src/main/java/fr/anarchick/skriptpacket/elements/events/EvtPacket.java

Lines changed: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
package fr.anarchick.skriptpacket.elements.events;
22

3+
import ch.njol.skript.config.Config;
4+
import ch.njol.skript.lang.parser.ParserInstance;
5+
import ch.njol.skript.util.Version;
6+
import fr.anarchick.skriptpacket.SkriptPacket;
37
import org.bukkit.World;
48
import org.bukkit.entity.Player;
59
import org.bukkit.event.Event;
@@ -20,6 +24,9 @@
2024
import fr.anarchick.skriptpacket.packets.PacketManager.Mode;
2125
import fr.anarchick.skriptpacket.packets.SkriptPacketEventListener;
2226

27+
import java.lang.reflect.InvocationTargetException;
28+
import java.lang.reflect.Method;
29+
2330
public class EvtPacket extends SkriptEvent {
2431

2532
private int mark;
@@ -95,11 +102,31 @@ public boolean init(Literal<?>[] literal, int matchedPattern, ParseResult parser
95102
Skript.error("The packettype '"+PacketManager.getPacketName(packetType)+"' is not supported by your server");
96103
return false;
97104
}
98-
String scriptName = getParser().getCurrentScript().getFileName();
105+
String scriptName = getScriptName();
99106
SkriptPacketEventListener.addPacketTypes(packetTypeExpr.getAll(), priority, mode, scriptName);
100107
return true;
101108
}
102109

110+
/**
111+
* Since Skript 2.7.0-beta1 , getCurrentScript return Script instead of Config
112+
* https://github.com/SkriptLang/Skript/pull/4108
113+
*/
114+
private String getScriptName() {
115+
if (SkriptPacket.SKRIPT_VERSION.isSmallerThan(new Version("2.6.5"))) {
116+
Config config = null;
117+
try {
118+
Method configMethod = ParserInstance.class.getDeclaredMethod("getCurrentScript");
119+
config = (Config) configMethod.invoke(getParser());
120+
return config.getFileName();
121+
} catch (Exception e) {
122+
e.printStackTrace();
123+
}
124+
return "UNKNOWN";
125+
} else {
126+
return getParser().getCurrentScript().getConfig().getFileName();
127+
}
128+
}
129+
103130
@Override
104131
public boolean check(Event event) {
105132
if (event instanceof BukkitPacketEvent e) {

src/main/java/fr/anarchick/skriptpacket/util/SkriptReflection.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -436,7 +436,7 @@ public static Config getCurrentScript() {
436436
if (CURRENT_SCRIPT != null) {
437437
return (Config) CURRENT_SCRIPT.get(null);
438438
} else {
439-
return ParserInstance.get().getCurrentScript();
439+
return ParserInstance.get().getCurrentScript().getConfig();
440440
}
441441
} catch (IllegalAccessException e) {
442442
throw new RuntimeException(e);

0 commit comments

Comments
 (0)