Skip to content

Commit ea6e6d3

Browse files
virustotalopvirustotalop
committed
Fix DynamicGui compatability
1 parent bda0d37 commit ea6e6d3

File tree

7 files changed

+60
-62
lines changed

7 files changed

+60
-62
lines changed

‎build.gradle‎

Lines changed: 24 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,41 @@ plugins {
22
id 'java-library'
33
id 'eclipse'
44
id 'idea'
5-
id 'com.github.johnrengelman.shadow' version '7.1.1'
5+
id("com.gradleup.shadow") version "9.1.0"
6+
}
7+
8+
allprojects {
9+
repositories {
10+
flatDir {
11+
dirs 'libs'
12+
}
13+
mavenCentral()
14+
maven { url = "https://oss.sonatype.org/content/repositories/snapshots" }
15+
maven { url = "https://hub.spigotmc.org/nexus/content/repositories/snapshots/" }
16+
maven { url = "https://jitpack.io" }
17+
maven { url = "https://repo.papermc.io/repository/maven-public/" }
18+
}
619
}
720

821
subprojects {
922
apply plugin: 'java-library'
10-
apply plugin: 'com.github.johnrengelman.shadow'
23+
apply plugin: 'com.gradleup.shadow'
1124

1225
group 'com.clubobsidian'
1326
version '5.0.0-SNAPSHOT'
1427

1528
tasks.withType(JavaCompile) {
16-
sourceCompatibility = JavaVersion.VERSION_17
17-
targetCompatibility = JavaVersion.VERSION_17
29+
sourceCompatibility = JavaVersion.VERSION_21
30+
targetCompatibility = JavaVersion.VERSION_21
1831
}
1932

33+
java {
34+
toolchain {
35+
languageVersion = JavaLanguageVersion.of(21)
36+
}
37+
}
38+
39+
2040
test {
2141
useJUnitPlatform()
2242
}
@@ -65,17 +85,6 @@ subprojects {
6585
relocate 'com.mongodb', 'com.clubobsidian.obbylang.mongodb'
6686
}
6787

68-
repositories {
69-
flatDir {
70-
dirs 'libs'
71-
}
72-
mavenCentral()
73-
maven { url = "https://oss.sonatype.org/content/repositories/snapshots" }
74-
maven { url = "https://hub.spigotmc.org/nexus/content/repositories/snapshots/" }
75-
maven { url 'https://jitpack.io' }
76-
maven { url = "https://nexus.velocitypowered.com/repository/maven-public/" }
77-
}
78-
7988
dependencies {
8089
compileOnly 'org.slf4j:slf4j-api:1.7.32'
8190
api 'com.zaxxer:HikariCP:5.0.1'

‎bukkit/build.gradle‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ tasks.shadowJar.dependsOn ':core:shadowJar'
2828

2929
dependencies {
3030
implementation project(path: ':core')
31-
compileOnly 'org.spigotmc:spigot-api:1.12.2-R0.1-SNAPSHOT'
32-
compileOnly 'com.github.ClubObsidian.DynamicGui:core:7ffd6dc8ff'
31+
compileOnly 'io.papermc.paper:paper-api:1.21.11-R0.1-SNAPSHOT'
32+
compileOnly 'com.github.ClubObsidian.DynamicGui:api:5cad257919'
33+
compileOnly 'com.github.ClubObsidian.DynamicGui:core:5cad257919'
3334
compileOnly name: 'ProtocolLib-4.4.0'
3435
}

‎bukkit/src/main/java/com/clubobsidian/obbylang/bukkit/manager/plugin/PluginManager.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public AddonManager getAddonManager() {
5656
}
5757

5858
private boolean resolveDynamicGui() {
59-
boolean classExists = this.classExists("com.clubobsidian.dynamicgui.core.function.Function");
59+
boolean classExists = this.classExists("com.clubobsidian.dynamicgui.api.function.Function");
6060
return Bukkit.getServer().getPluginManager().getPlugin("DynamicGui") != null && classExists;
6161
}
6262

‎bukkit/src/main/java/com/clubobsidian/obbylang/bukkit/manager/plugin/dynamicgui/GuiManager.java‎

Lines changed: 18 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -18,18 +18,14 @@
1818

1919
package com.clubobsidian.obbylang.bukkit.manager.plugin.dynamicgui;
2020

21-
import com.clubobsidian.dynamicgui.core.builder.EnchantmentBuilder;
22-
import com.clubobsidian.dynamicgui.core.builder.FunctionBuilder;
23-
import com.clubobsidian.dynamicgui.core.builder.FunctionTokenBuilder;
24-
import com.clubobsidian.dynamicgui.core.builder.GuiBuilder;
25-
import com.clubobsidian.dynamicgui.core.builder.SlotBuilder;
26-
import com.clubobsidian.dynamicgui.core.entity.PlayerWrapper;
27-
import com.clubobsidian.dynamicgui.core.function.Function;
28-
import com.clubobsidian.dynamicgui.core.gui.Gui;
29-
import com.clubobsidian.dynamicgui.core.manager.dynamicgui.FunctionManager;
30-
import com.clubobsidian.dynamicgui.core.registry.replacer.impl.DynamicGuiReplacerRegistry;
31-
import com.clubobsidian.dynamicgui.core.replacer.Replacer;
32-
import com.clubobsidian.dynamicgui.parser.function.tree.FunctionTree;
21+
import com.clubobsidian.dynamicgui.api.entity.PlayerWrapper;
22+
import com.clubobsidian.dynamicgui.api.gui.Gui;
23+
import com.clubobsidian.dynamicgui.api.gui.Slot;
24+
import com.clubobsidian.dynamicgui.api.manager.FunctionManager;
25+
import com.clubobsidian.dynamicgui.api.parser.function.FunctionToken;
26+
import com.clubobsidian.dynamicgui.api.parser.function.tree.FunctionTree;
27+
import com.clubobsidian.dynamicgui.api.registry.replacer.DynamicGuiReplacerRegistry;
28+
import com.clubobsidian.dynamicgui.api.replacer.Replacer;
3329
import com.clubobsidian.obbylang.manager.RegisteredManager;
3430
import com.clubobsidian.obbylang.manager.script.ScriptManager;
3531
import org.bukkit.entity.Player;
@@ -70,7 +66,7 @@ public void registerFunction(String declaringClass, String functionName, ScriptO
7066
this.functionStrings.get(declaringClass).add(functionName);
7167
this.functionScripts.put(functionName, script);
7268
this.functionScriptOwners.put(functionName, declaringClass);
73-
FunctionManager.get().addFunction(new ObbyLangDynamicGuiFunction(functionName));
69+
FunctionManager.get().registerFunction(new ObbyLangDynamicGuiFunction(functionName));
7470
}
7571

7672
public void registerReplacer(String declaringClass, String replacer, ScriptObjectMirror script) {
@@ -110,39 +106,31 @@ public CompiledScript getReplacerOwner(String replacerName) {
110106
return this.scriptManager.getScript(scriptName);
111107
}
112108

113-
public EnchantmentBuilder createEnchantmentBuilder() {
114-
return new EnchantmentBuilder();
109+
public FunctionToken.Builder createFunctionTokenBuilder() {
110+
return new FunctionToken.Builder();
115111
}
116112

117-
public FunctionBuilder createFunctionBuilder() {
118-
return new FunctionBuilder();
113+
public Gui.Builder createGuiBuilder() {
114+
return new Gui.Builder();
119115
}
120116

121-
public FunctionTokenBuilder createFunctionTokenBuilder() {
122-
return new FunctionTokenBuilder();
123-
}
124-
125-
public GuiBuilder createGuiBuilder() {
126-
return new GuiBuilder();
127-
}
128-
129-
public SlotBuilder createSlotBuilder() {
130-
return new SlotBuilder();
117+
public Slot.Builder createSlotBuilder() {
118+
return new Slot.Builder();
131119
}
132120

133121
public FunctionTree createFunctionTree() {
134-
return new FunctionTree();
122+
return new FunctionTree.Builder().build();
135123
}
136124

137125
public void openGui(Gui gui, Player player) {
138-
com.clubobsidian.dynamicgui.core.manager.dynamicgui.GuiManager.get().openGui(player, gui);
126+
com.clubobsidian.dynamicgui.api.manager.gui.GuiManager.get().openGui(player, gui);
139127
}
140128

141129
@Override
142130
public void unregister(String declaringClass) {
143131
this.init(declaringClass);
144132
for(String functionName : this.functionStrings.get(declaringClass)) {
145-
FunctionManager.get().removeFunctionByName(functionName);
133+
FunctionManager.get().unregisterFunction(functionName);
146134
this.functionScripts.keySet().remove(functionName);
147135
this.functionScriptOwners.remove(functionName);
148136
}

‎bukkit/src/main/java/com/clubobsidian/obbylang/bukkit/manager/plugin/dynamicgui/ObbyLangDynamicGuiFunction.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818

1919
package com.clubobsidian.obbylang.bukkit.manager.plugin.dynamicgui;
2020

21-
import com.clubobsidian.dynamicgui.core.entity.PlayerWrapper;
22-
import com.clubobsidian.dynamicgui.core.function.Function;
21+
import com.clubobsidian.dynamicgui.api.entity.PlayerWrapper;
22+
import com.clubobsidian.dynamicgui.api.function.Function;
2323
import com.clubobsidian.obbylang.bukkit.manager.plugin.PluginManager;
2424
import com.clubobsidian.obbylang.bukkit.plugin.BukkitObbyLangPlugin;
2525
import com.clubobsidian.obbylang.manager.addon.AddonManager;

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

‎velocity/build.gradle‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
plugins {
22
id 'java-library'
3-
id "net.kyori.blossom" version "1.3.0"
3+
id "net.kyori.blossom" version "2.2.0"
44
}
55

6-
def velocityVersion = '3.4.0-SNAPSHOT'
6+
def velocityVersion = '3.5.0-SNAPSHOT'
77

8-
blossom {
8+
/*blossom {
99
replaceTokenIn('com/clubobsidian/obbylang/velocity/plugin/VelocityObbyLangPlugin.java')
1010
replaceToken('${pluginVersion}', project.version)
11-
}
11+
}*/
1212

13-
tasks.withType(JavaCompile) {
14-
sourceCompatibility = JavaVersion.VERSION_17
15-
targetCompatibility = JavaVersion.VERSION_17
16-
}
1713

18-
java {
19-
toolchain {
20-
languageVersion = JavaLanguageVersion.of(17)
14+
sourceSets {
15+
main {
16+
blossom {
17+
resources {
18+
property('${pluginVersion}', project.version)
19+
}
20+
}
2121
}
2222
}
2323

0 commit comments

Comments
 (0)