Skip to content

Commit 37fc2dc

Browse files
committed
Make it build
1 parent 8e9da7f commit 37fc2dc

File tree

3 files changed

+35
-4
lines changed

3 files changed

+35
-4
lines changed

bukkit/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,7 @@
312312
<dependency>
313313
<groupId>com.github.retrooper</groupId>
314314
<artifactId>packetevents-spigot</artifactId>
315-
<version>2.7.0</version>
315+
<version>2.8.0</version>
316316
<scope>provided</scope>
317317
</dependency>
318318

bukkit/src/main/java/io/wdsj/asw/bukkit/service/BukkitLibraryService.java

Lines changed: 33 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,43 @@
88

99
public class BukkitLibraryService {
1010
private final BukkitLibraryManager libraryManager;
11+
/* Ollama4j */
1112
private static final Library ollama4j = Library.builder()
1213
.groupId("com{}github{}HaHaWTH")
1314
.artifactId("ollama4j-j8")
14-
.resolveTransitiveDependencies(true) // TODO fix
15+
.resolveTransitiveDependencies(false)
1516
.version("8ce2ad8840")
1617
.build();
18+
private static final Library lombok = Library.builder()
19+
.groupId("org{}projectlombok")
20+
.artifactId("lombok")
21+
.resolveTransitiveDependencies(false)
22+
.version("1.18.30")
23+
.build();
24+
private static final Library slf4j = Library.builder()
25+
.groupId("org{}slf4j")
26+
.artifactId("slf4j-api")
27+
.resolveTransitiveDependencies(false)
28+
.version("2.0.9")
29+
.build();
30+
private static final Library jackson = Library.builder()
31+
.groupId("com{}fasterxml{}jackson{}core")
32+
.artifactId("jackson-databind")
33+
.resolveTransitiveDependencies(false)
34+
.version("2.17.1")
35+
.build();
36+
private static final Library jackson_jsr310 = Library.builder()
37+
.groupId("com{}fasterxml{}jackson{}datatype")
38+
.artifactId("jackson-datatype-jsr310")
39+
.resolveTransitiveDependencies(false)
40+
.version("2.17.1")
41+
.build();
42+
private static final Library logback = Library.builder()
43+
.groupId("ch{}qos{}logback")
44+
.artifactId("logback-classic")
45+
.resolveTransitiveDependencies(false)
46+
.version("1.4.12")
47+
.build();
1748

1849
private static final Library openai4j = Library.builder()
1950
.groupId("dev{}ai4j")
@@ -46,7 +77,7 @@ public void loadRequired() {
4677
libraryManager.loadLibraries(caffeine);
4778
}
4879
public void loadOllamaOptional() {
49-
libraryManager.loadLibrary(ollama4j);
80+
libraryManager.loadLibraries(ollama4j, lombok, slf4j, jackson, jackson_jsr310, logback);
5081
}
5182

5283
public void loadOpenAiOptional() {

bukkit/src/main/kotlin/io/wdsj/asw/bukkit/listener/packet/ASWBookPacketListener.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ class ASWBookPacketListener : PacketListenerAbstract(PacketListenerPriority.LOW)
4141
var shouldSendMessage = false
4242
val isCancelMode = settingsManager.getProperty(PluginSettings.BOOK_METHOD).equals("cancel", ignoreCase = true)
4343
val wrapper = WrapperPlayClientEditBook(event)
44-
val originalPages = wrapper.pages
44+
val originalPages = wrapper.pages?: return
4545

4646
// Book content check
4747
val processedPages: MutableList<String> = ArrayList()

0 commit comments

Comments
 (0)