Skip to content

Commit cd09bec

Browse files
committed
Revert groovy compatible
1 parent 9ca11b9 commit cd09bec

File tree

4 files changed

+2
-57
lines changed

4 files changed

+2
-57
lines changed

pom.xml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -65,12 +65,6 @@
6565
<version>1.18.10</version>
6666
<scope>provided</scope>
6767
</dependency>
68-
<dependency>
69-
<groupId>com.github.caoli5288</groupId>
70-
<artifactId>bukkitgroovy</artifactId>
71-
<version>1.0-SNAPSHOT</version>
72-
<scope>provided</scope>
73-
</dependency>
7468
</dependencies>
7569

7670

src/main/java/com/mengcraft/script/EventMapping.java

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,6 @@ public boolean initialized(String name) {
5050

5151
@SneakyThrows
5252
public EventListener getListener(String name) {
53-
if (GroovyIntegration.isIntegrated()) {
54-
return GroovyIntegration.getListener(name);
55-
}
5653
name = name.toLowerCase();
5754
if (mapping.containsKey(name)) {
5855
return mapping.get(name).getListener();
@@ -70,10 +67,8 @@ public EventListener getListener(String name) {
7067
}
7168

7269
protected void loadClasses() {
73-
if (!GroovyIntegration.isIntegrated()) {
74-
URL path = Bukkit.class.getProtectionDomain().getCodeSource().getLocation();
75-
loadClasses(null, Bukkit.class.getClassLoader(), path, "org/bukkit/event/(.*)/(.*)\\.class");
76-
}
70+
URL path = Bukkit.class.getProtectionDomain().getCodeSource().getLocation();
71+
loadClasses(null, Bukkit.class.getClassLoader(), path, "org/bukkit/event/(.*)/(.*)\\.class");
7772
}
7873

7974
protected void loadClasses(Plugin plugin, ClassLoader loader, URL path, String regex) {
@@ -118,9 +113,6 @@ public void init(String name) {
118113

119114
@SneakyThrows
120115
public void init(Plugin plugin) {
121-
if (GroovyIntegration.isIntegrated()) {
122-
GroovyIntegration.loadClasses(plugin);
123-
}
124116
if (plugins.add(plugin.getName().toLowerCase())) {
125117
Class<?> pluginClass = plugin.getClass();
126118
URL path = pluginClass.getProtectionDomain().getCodeSource().getLocation();

src/main/java/com/mengcraft/script/GroovyIntegration.java

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

src/main/java/com/mengcraft/script/ScriptBootstrap.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,9 +93,6 @@ public void onLoad() {
9393

9494
@Override
9595
public void onEnable() {
96-
if (getServer().getPluginManager().isPluginEnabled("BukkitGroovy")) {
97-
GroovyIntegration.integrate();
98-
}
9996
scriptLoader = new ScriptLoader();
10097
getServer().getConsoleSender().sendMessage(ChatColor.GREEN + "梦梦家高性能服务器出租店");
10198
getServer().getConsoleSender().sendMessage(ChatColor.GREEN + "shop105595113.taobao.com");

0 commit comments

Comments
 (0)