Skip to content

Commit 1292ab7

Browse files
renvinsrenvins
committed
Update dependencies and add RemapJarTask for server pulse
1 parent ec5dd62 commit 1292ab7

File tree

2 files changed

+99
-9
lines changed

2 files changed

+99
-9
lines changed

‎fabric/build.gradle.kts

Lines changed: 94 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import net.fabricmc.loom.task.RemapJarTask
2+
13
plugins {
24
id("java")
35
id("fabric-loom") version "1.10-SNAPSHOT"
@@ -29,29 +31,106 @@ repositories {
2931
maven { url = uri("https://jitpack.io") }
3032
}
3133

34+
3235
dependencies {
33-
minecraft("com.mojang:minecraft:1.21.5")
34-
mappings("net.fabricmc:yarn:1.21.5+build.1:v2")
35-
modImplementation("net.fabricmc:fabric-loader:0.16.10")
36+
minecraft("com.mojang:minecraft:1.21.4")
37+
mappings("net.fabricmc:yarn:1.21.4+build.8:v2")
38+
modImplementation("net.fabricmc:fabric-loader:0.16.14")
3639

37-
modImplementation("net.fabricmc.fabric-api:fabric-api:0.119.5+1.21.5")
40+
modImplementation("net.fabricmc.fabric-api:fabric-api:0.119.2+1.21.4")
3841

42+
// API and Common modules
3943
implementation(project(":api"))
4044
implementation(project(":common"))
45+
include(project(":api"))
46+
include(project(":common"))
47+
48+
// SimpleYAML
4149
implementation("com.github.Carleslc.Simple-YAML:Simple-Yaml:1.8.4")
50+
include("com.github.Carleslc.Simple-YAML:Simple-Yaml:1.8.4")
51+
52+
// --- InfluxDB Client and its verbose transitive dependencies ---
53+
// Main InfluxDB client API
54+
implementation("com.influxdb:influxdb-client-java:7.2.0")
55+
include("com.influxdb:influxdb-client-java:7.2.0")
56+
57+
// InfluxDB modules (explicitly include these as they are separate JARs)
58+
implementation("com.influxdb:influxdb-client-core:7.2.0")
59+
include("com.influxdb:influxdb-client-core:7.2.0")
60+
implementation("com.influxdb:influxdb-client-flux:7.2.0")
61+
include("com.influxdb:influxdb-client-flux:7.2.0")
62+
implementation("com.influxdb:influxdb-client-kotlin:7.2.0") // Add Kotlin module
63+
include("com.influxdb:influxdb-client-kotlin:7.2.0")
64+
implementation("com.influxdb:influxdb-client-reactive:7.2.0") // Add Reactive module (for RxJava)
65+
include("com.influxdb:influxdb-client-reactive:7.2.0")
66+
implementation("com.influxdb:influxdb-client-utils:7.2.0")
67+
include("com.influxdb:influxdb-client-utils:7.2.0")
68+
69+
// OkHttp (Dependency of InfluxDB)
70+
implementation("com.squareup.okhttp3:okhttp:4.11.0") // InfluxDB uses 4.11.0
71+
include("com.squareup.okhttp3:okhttp:4.11.0")
72+
implementation("com.squareup.okhttp3:logging-interceptor:4.11.0")
73+
include("com.squareup.okhttp3:logging-interceptor:4.11.0")
74+
implementation("com.squareup.okio:okio:3.4.0") // InfluxDB uses 3.4.0 for okio
75+
include("com.squareup.okio:okio-jvm:3.4.0") // Include the JVM specific JAR for okio
76+
77+
// Kotlin (Dependency of InfluxDB - version 1.9.22 used by InfluxDB 7.2.0)
78+
implementation("org.jetbrains.kotlin:kotlin-stdlib:1.9.22")
79+
include("org.jetbrains.kotlin:kotlin-stdlib:1.9.22")
80+
// kotlin-stdlib-common is usually a transitive dependency of kotlin-stdlib,
81+
// and kotlin-stdlib (for JVM) includes -jdk7 and -jdk8 extensions.
82+
// If you face issues, you can add them explicitly:
83+
// implementation("org.jetbrains.kotlin:kotlin-stdlib-common:1.9.22")
84+
// include("org.jetbrains.kotlin:kotlin-stdlib-common:1.9.22")
85+
// implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.22")
86+
// include("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.22")
87+
implementation("org.jetbrains.kotlin:kotlin-reflect:1.9.22") // Often needed for Kotlin libraries
88+
include("org.jetbrains.kotlin:kotlin-reflect:1.9.22")
89+
90+
// Retrofit (Dependency of InfluxDB - version 2.9.0)
91+
implementation("com.squareup.retrofit2:retrofit:2.9.0")
92+
include("com.squareup.retrofit2:retrofit:2.9.0")
93+
implementation("com.squareup.retrofit2:converter-moshi:2.9.0")
94+
include("com.squareup.retrofit2:converter-moshi:2.9.0")
95+
implementation("com.squareup.retrofit2:converter-scalars:2.9.0")
96+
include("com.squareup.retrofit2:converter-scalars:2.9.0")
97+
implementation("com.squareup.retrofit2:converter-gson:2.9.0") // For Gson support
98+
include("com.squareup.retrofit2:converter-gson:2.9.0")
99+
implementation("com.squareup.retrofit2:adapter-rxjava3:2.9.0") // <<-- THIS IS FOR THE NEW ERROR
100+
include("com.squareup.retrofit2:adapter-rxjava3:2.9.0") // <<-- THIS IS FOR THE NEW ERROR
101+
102+
// Moshi (Dependency of Retrofit & InfluxDB - version 1.15.0)
103+
implementation("com.squareup.moshi:moshi:1.15.0")
104+
include("com.squareup.moshi:moshi:1.15.0")
105+
implementation("com.squareup.moshi:moshi-kotlin:1.15.0") // InfluxDB uses Kotlin, Moshi-Kotlin likely needed
106+
include("com.squareup.moshi:moshi-kotlin:1.15.0")
107+
108+
// Gson (Dependency of Retrofit if using GsonConverter)
109+
implementation("com.google.code.gson:gson:2.10.1")
110+
include("com.google.code.gson:gson:2.10.1")
111+
112+
// RxJava3 & Reactive Streams (Dependency of Retrofit adapter-rxjava3 & InfluxDB reactive module)
113+
// InfluxDB 7.2.0 uses RxJava 3.1.8 and reactive-streams 1.0.4
114+
implementation("io.reactivex.rxjava3:rxjava:3.1.8")
115+
include("io.reactivex.rxjava3:rxjava:3.1.8")
116+
implementation("org.reactivestreams:reactive-streams:1.0.4")
117+
include("org.reactivestreams:reactive-streams:1.0.4")
118+
// --- End of InfluxDB client dependencies ---
119+
120+
// Fabric Permissions API
42121
modImplementation("me.lucko:fabric-permissions-api:0.3.1")
43-
include("me.lucko:fabric-permissions-api:0.3.1") // automatically include the dependency in the jar
122+
include("me.lucko:fabric-permissions-api:0.3.1")
44123
}
45124

46125
tasks.processResources {
47126
filteringCharset = "UTF-8"
48127

49128
filesMatching("fabric.mod.json") {
50129
expand(mapOf(
51-
"version" to rootProject.version,
52-
"minecraft_version" to "1.21.4",
53-
"loader_version" to "0.16.10"
54-
)
130+
"version" to rootProject.version,
131+
"minecraft_version" to "1.21.4",
132+
"loader_version" to "0.16.10"
133+
)
55134
)
56135
}
57136
}
@@ -62,4 +141,10 @@ java {
62141

63142
tasks.withType<JavaCompile>().configureEach {
64143
options.encoding = "UTF-8"
144+
}
145+
146+
tasks.withType<RemapJarTask>() {
147+
archiveBaseName = "serverpulse"
148+
archiveClassifier = "fabric"
149+
archiveVersion = "${rootProject.version}"
65150
}

‎fabric/src/main/java/it/renvins/serverpulse/fabric/platform/FabricPlatform.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,11 @@ public class FabricPlatform implements Platform {
1818

1919
private final ServerPulseFabric mod;
2020

21+
@Override
22+
public void disable() {
23+
mod.getServer().stop(false);
24+
}
25+
2126
@Override
2227
public boolean isEnabled() {
2328
return mod.getServer() != null && FabricLoader.getInstance().isModLoaded("serverpulse");

0 commit comments

Comments
 (0)