mirror/Plan
2
0
Fork 0
mirror of https://github.com/plan-player-analytics/Plan.git synced 2025-01-06 15:44:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed plugin not enabling on Sponge or nukkit

Browse Source 
- Removed module-info.class that came from asm
- Don't relocate SQLite since the NativeDB class is not relocated properly
This commit is contained in:
Risto Lahtela 2021-03-15 18:24:40 +02:00
parent ac526e7542
commit 7e08ea8245
4 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Plan/build.gradle
View File

@ -66,7 +66,7 @@ subprojects {
ext.daggerVersion = "2.33" ext.daggerVersion = "2.33"
ext.daggerCompilerVersion = "2.33" ext.daggerCompilerVersion = "2.33"
ext.palVersion = "4.0.9" ext.palVersion = "4.0.10"
ext.bukkitVersion = "1.13.2-R0.1-SNAPSHOT" ext.bukkitVersion = "1.13.2-R0.1-SNAPSHOT"
ext.spigotVersion = "1.13.2-R0.1-SNAPSHOT" ext.spigotVersion = "1.13.2-R0.1-SNAPSHOT"

1
Plan/common/build.gradle
View File

@ -43,6 +43,7 @@ shadowJar {
exclude "**/*.psd" exclude "**/*.psd"
exclude "**/module-info.class" exclude "**/module-info.class"
exclude "module-info.class"
exclude 'META-INF/versions/' // Causes Sponge to crash exclude 'META-INF/versions/' // Causes Sponge to crash
exclude 'org/apache/http/**/*' // Unnecessary http client depended on by geolite2 implementation exclude 'org/apache/http/**/*' // Unnecessary http client depended on by geolite2 implementation
exclude 'mozilla/**/*' exclude 'mozilla/**/*'

12
Plan/common/src/main/java/com/djrapitops/plan/DependencyStartup.java
View File

@ -22,6 +22,7 @@ import net.playeranalytics.plugin.me.lucko.jarrelocator.Relocation;
import net.playeranalytics.plugin.server.PluginLogger; import net.playeranalytics.plugin.server.PluginLogger;
import java.io.IOException; import java.io.IOException;
import java.util.Collections;
public class DependencyStartup { public class DependencyStartup {
@ -54,11 +55,12 @@ public class DependencyStartup {
); );
dependencyLoader.addDependency(REPOSITORY_MAVEN_CENTRAL, dependencyLoader.addDependency(REPOSITORY_MAVEN_CENTRAL,
"org.xerial", "sqlite-jdbc", "3.34.0", "org.xerial", "sqlite-jdbc", "3.34.0",
Lists.builder(Relocation.class) Collections.emptyList()
.add(new Relocation( // Lists.builder(Relocation.class)
new String(new char[]{'o', 'r', 'g', '.', 's', 'q', 'l', 'i', 't', 'e'}), // .add(new Relocation(
"plan.org.sqlite" // new String(new char[]{'o', 'r', 'g', '.', 's', 'q', 'l', 'i', 't', 'e'}),
)).build() // "plan.org.sqlite"
// )).build()
); );
logger.info("Loading runtime dependencies.."); logger.info("Loading runtime dependencies..");
dependencyLoader.load(); dependencyLoader.load();

3
Plan/plugin/build.gradle
View File

@ -22,7 +22,8 @@ shadowJar {
relocate 'dagger', 'plan.dagger' relocate 'dagger', 'plan.dagger'
relocate 'com.mysql', 'plan.com.mysql' relocate 'com.mysql', 'plan.com.mysql'
relocate 'com.mysql', 'plan.com.mysql' relocate 'com.mysql', 'plan.com.mysql'
relocate 'org.sqlite', 'plan.org.sqlite' // Don't relocate SQLite since the org.sqlite.NativeDB class calls are not relocated properly
// relocate 'org.sqlite', 'plan.org.sqlite'
relocate 'javax.inject', 'plan.javax.inject' relocate 'javax.inject', 'plan.javax.inject'
relocate 'com.github.benmanes', 'plan.com.github.benmanes' relocate 'com.github.benmanes', 'plan.com.github.benmanes'