GeyserMC/Geyser
GeyserMC/Geyser
4
4
Fork 3
mirror of https://github.com/GeyserMC/Geyser.git synced 2024-08-14 23:57:35 +00:00
Code Issues 103 Projects Releases Wiki Activity

It compiles! :D

Browse source
This commit is contained in:
DoctorMacc 2020-10-07 18:35:35 -04:00
parent 7a91e0a80d
commit b293c3478a
2 changed files with 9 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
bootstrap/fabric/build.gradle
View file

@ -1,9 +1,13 @@
plugins { plugins {
id 'fabric-loom' version '0.5-SNAPSHOT' id 'fabric-loom' version '0.5-SNAPSHOT'
id 'maven-publish' id 'maven-publish'
id 'com.github.johnrengelman.shadow' version '6.0.0' id 'com.github.johnrengelman.shadow' version '6.1.0'
id 'java'
} }
apply plugin: 'com.github.johnrengelman.shadow'
apply plugin: 'java'
sourceCompatibility = JavaVersion.VERSION_1_8 sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8 targetCompatibility = JavaVersion.VERSION_1_8
@ -24,17 +28,15 @@ dependencies {
// You may need to force-disable transitiveness on them. // You may need to force-disable transitiveness on them.
implementation 'org.geysermc:connector:1.1.0' implementation 'org.geysermc:connector:1.1.0'
shadow('org.geysermc:connector:1.1.0') { shadow 'org.geysermc:connector:1.1.0'
// exclude group: 'org.w3c'
// exclude group: 'org.xml'
// exclude group: 'javax.xml'
}
compileOnly 'org.projectlombok:lombok:1.18.4' compileOnly 'org.projectlombok:lombok:1.18.4'
annotationProcessor 'org.projectlombok:lombok:1.18.4' annotationProcessor 'org.projectlombok:lombok:1.18.4'
} }
repositories { repositories {
mavenLocal()
maven { maven {
url = uri('https://repo.nukkitx.com/maven-releases/') url = uri('https://repo.nukkitx.com/maven-releases/')
} }
@ -82,12 +84,10 @@ task sourcesJar(type: Jar, dependsOn: classes) {
shadowJar { shadowJar {
configurations = [project.configurations.shadow] configurations = [project.configurations.shadow]
//relocate 'org.apache', 'geyser.org.apache'
relocate 'org.reflections', 'geyser.org.reflections' relocate 'org.reflections', 'geyser.org.reflections'
relocate 'org.dom4j', 'geyser.org.dom4j' relocate 'org.dom4j', 'geyser.org.dom4j'
relocate 'javax.xml', 'geyser.javaxxml' relocate 'javax.xml', 'geyser.javaxxml'
relocate 'org.xml', 'geyser.xml' relocate 'org.xml', 'geyser.xml'
//relocate 'org.w3c', 'geyser.w3c'
} }
jar { jar {
@ -98,15 +98,6 @@ remapJar {
dependsOn(shadowJar) dependsOn(shadowJar)
input.set shadowJar.archiveFile.get() input.set shadowJar.archiveFile.get()
} }
//
//import com.github.jengelman.gradle.plugins.shadow.tasks.ConfigureShadowRelocation
//
//task relocateShadowJar(type: ConfigureShadowRelocation) {
// target = tasks.shadowJar
// prefix = "org.geyser.platform.fabric.relocate"
//}
//
//tasks.shadowJar.dependsOn tasks.relocateShadowJar
// configure the maven publication // configure the maven publication
publishing { publishing {

2
bootstrap/fabric/src/main/java/org/geysermc/platform/fabric/GeyserFabricMod.java
View file

@ -109,7 +109,7 @@ public class GeyserFabricMod implements DedicatedServerModInitializer, GeyserBoo
geyserConfig.getBedrock().setPort(geyserConfig.getRemote().getPort()); geyserConfig.getBedrock().setPort(geyserConfig.getRemote().getPort());
} }
this.connector = GeyserConnector.start(PlatformType.ANDROID, this); this.connector = GeyserConnector.start(PlatformType.FABRIC, this);
this.geyserPingPassthrough = GeyserLegacyPingPassthrough.init(connector); this.geyserPingPassthrough = GeyserLegacyPingPassthrough.init(connector);