mirror of https://github.com/GeyserMC/Geyser.git
Relocate the rest of our dependencies (#1227)
- Relocate all of our dependencies. This does not include MCProtocolLib and Nukkit dependencies at this time as there are no other known plugins that use these dependencies. - Switch to a static commit for Adventure dependencies. Tested working on all versions.
This commit is contained in:
Camotoy
GitHub
parent
b97bf56d99
commit
81a48bf96d
|
|
@ -61,6 +61,10 @@
|
||||||
<pattern>net.md_5.bungee.jni</pattern>
|
<pattern>net.md_5.bungee.jni</pattern>
|
||||||
<shadedPattern>org.geysermc.platform.bungeecord.shaded.jni</shadedPattern>
|
<shadedPattern>org.geysermc.platform.bungeecord.shaded.jni</shadedPattern>
|
||||||
</relocation>
|
</relocation>
|
||||||
|
<relocation>
|
||||||
|
<pattern>com.fasterxml.jackson</pattern>
|
||||||
|
<shadedPattern>org.geysermc.platform.bungeecord.shaded.jackson</shadedPattern>
|
||||||
|
</relocation>
|
||||||
<relocation>
|
<relocation>
|
||||||
<pattern>io.netty</pattern>
|
<pattern>io.netty</pattern>
|
||||||
<shadedPattern>org.geysermc.platform.bungeecord.shaded.netty</shadedPattern>
|
<shadedPattern>org.geysermc.platform.bungeecord.shaded.netty</shadedPattern>
|
||||||
|
|
@ -69,6 +73,18 @@
|
||||||
<pattern>org.reflections</pattern>
|
<pattern>org.reflections</pattern>
|
||||||
<shadedPattern>org.geysermc.platform.bungeecord.shaded.reflections</shadedPattern>
|
<shadedPattern>org.geysermc.platform.bungeecord.shaded.reflections</shadedPattern>
|
||||||
</relocation>
|
</relocation>
|
||||||
|
<relocation>
|
||||||
|
<pattern>com.google.guava</pattern>
|
||||||
|
<shadedPattern>org.geysermc.platform.bungeecord.shaded.guava</shadedPattern>
|
||||||
|
</relocation>
|
||||||
|
<relocation>
|
||||||
|
<pattern>org.dom4j</pattern>
|
||||||
|
<shadedPattern>org.geysermc.platform.bungeecord.shaded.dom4j</shadedPattern>
|
||||||
|
</relocation>
|
||||||
|
<relocation>
|
||||||
|
<pattern>net.kyori.adventure</pattern>
|
||||||
|
<shadedPattern>org.geysermc.platform.bungeecord.shaded.adventure</shadedPattern>
|
||||||
|
</relocation>
|
||||||
</relocations>
|
</relocations>
|
||||||
</configuration>
|
</configuration>
|
||||||
</execution>
|
</execution>
|
||||||
|
|
|
||||||
|
|
@ -79,6 +79,18 @@
|
||||||
<pattern>org.reflections</pattern>
|
<pattern>org.reflections</pattern>
|
||||||
<shadedPattern>org.geysermc.platform.spigot.shaded.reflections</shadedPattern>
|
<shadedPattern>org.geysermc.platform.spigot.shaded.reflections</shadedPattern>
|
||||||
</relocation>
|
</relocation>
|
||||||
|
<relocation>
|
||||||
|
<pattern>com.google.guava</pattern>
|
||||||
|
<shadedPattern>org.geysermc.platform.spigot.shaded.guava</shadedPattern>
|
||||||
|
</relocation>
|
||||||
|
<relocation>
|
||||||
|
<pattern>org.dom4j</pattern>
|
||||||
|
<shadedPattern>org.geysermc.platform.spigot.shaded.dom4j</shadedPattern>
|
||||||
|
</relocation>
|
||||||
|
<relocation>
|
||||||
|
<pattern>net.kyori.adventure</pattern>
|
||||||
|
<shadedPattern>org.geysermc.platform.spigot.shaded.adventure</shadedPattern>
|
||||||
|
</relocation>
|
||||||
</relocations>
|
</relocations>
|
||||||
</configuration>
|
</configuration>
|
||||||
</execution>
|
</execution>
|
||||||
|
|
|
||||||
|
|
@ -73,6 +73,18 @@
|
||||||
<pattern>org.reflections</pattern>
|
<pattern>org.reflections</pattern>
|
||||||
<shadedPattern>org.geysermc.platform.sponge.shaded.reflections</shadedPattern>
|
<shadedPattern>org.geysermc.platform.sponge.shaded.reflections</shadedPattern>
|
||||||
</relocation>
|
</relocation>
|
||||||
|
<relocation>
|
||||||
|
<pattern>com.google.guava</pattern>
|
||||||
|
<shadedPattern>org.geysermc.platform.sponge.shaded.guava</shadedPattern>
|
||||||
|
</relocation>
|
||||||
|
<relocation>
|
||||||
|
<pattern>org.dom4j</pattern>
|
||||||
|
<shadedPattern>org.geysermc.platform.sponge.shaded.dom4j</shadedPattern>
|
||||||
|
</relocation>
|
||||||
|
<relocation>
|
||||||
|
<pattern>net.kyori.adventure</pattern>
|
||||||
|
<shadedPattern>org.geysermc.platform.sponge.shaded.adventure</shadedPattern>
|
||||||
|
</relocation>
|
||||||
</relocations>
|
</relocations>
|
||||||
</configuration>
|
</configuration>
|
||||||
</execution>
|
</execution>
|
||||||
|
|
|
||||||
|
|
@ -57,6 +57,10 @@
|
||||||
</goals>
|
</goals>
|
||||||
<configuration>
|
<configuration>
|
||||||
<relocations>
|
<relocations>
|
||||||
|
<relocation>
|
||||||
|
<pattern>com.fasterxml.jackson</pattern>
|
||||||
|
<shadedPattern>org.geysermc.platform.velocity.shaded.jackson</shadedPattern>
|
||||||
|
</relocation>
|
||||||
<relocation>
|
<relocation>
|
||||||
<pattern>it.unimi.dsi.fastutil</pattern>
|
<pattern>it.unimi.dsi.fastutil</pattern>
|
||||||
<shadedPattern>org.geysermc.platform.velocity.shaded.fastutil</shadedPattern>
|
<shadedPattern>org.geysermc.platform.velocity.shaded.fastutil</shadedPattern>
|
||||||
|
|
@ -65,6 +69,18 @@
|
||||||
<pattern>org.reflections</pattern>
|
<pattern>org.reflections</pattern>
|
||||||
<shadedPattern>org.geysermc.platform.velocity.shaded.reflections</shadedPattern>
|
<shadedPattern>org.geysermc.platform.velocity.shaded.reflections</shadedPattern>
|
||||||
</relocation>
|
</relocation>
|
||||||
|
<relocation>
|
||||||
|
<pattern>com.google.guava</pattern>
|
||||||
|
<shadedPattern>org.geysermc.platform.velocity.shaded.guava</shadedPattern>
|
||||||
|
</relocation>
|
||||||
|
<relocation>
|
||||||
|
<pattern>org.dom4j</pattern>
|
||||||
|
<shadedPattern>org.geysermc.platform.velocity.shaded.dom4j</shadedPattern>
|
||||||
|
</relocation>
|
||||||
|
<relocation>
|
||||||
|
<pattern>net.kyori.adventure</pattern>
|
||||||
|
<shadedPattern>org.geysermc.platform.velocity.shaded.adventure</shadedPattern>
|
||||||
|
</relocation>
|
||||||
</relocations>
|
</relocations>
|
||||||
</configuration>
|
</configuration>
|
||||||
</execution>
|
</execution>
|
||||||
|
|
|
||||||
|
|
@ -137,21 +137,21 @@
|
||||||
<version>2.1.3</version>
|
<version>2.1.3</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>net.kyori</groupId>
|
<groupId>com.github.kyoripowered.adventure</groupId>
|
||||||
<artifactId>adventure-api</artifactId>
|
<artifactId>adventure-api</artifactId>
|
||||||
<version>4.0.0-SNAPSHOT</version>
|
<version>557865caef</version>
|
||||||
<scope>compile</scope>
|
<scope>compile</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>net.kyori</groupId>
|
<groupId>com.github.kyoripowered.adventure</groupId>
|
||||||
<artifactId>adventure-text-serializer-gson</artifactId>
|
<artifactId>adventure-text-serializer-gson</artifactId>
|
||||||
<version>4.0.0-SNAPSHOT</version>
|
<version>557865caef</version>
|
||||||
<scope>compile</scope>
|
<scope>compile</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>net.kyori</groupId>
|
<groupId>com.github.kyoripowered.adventure</groupId>
|
||||||
<artifactId>adventure-text-serializer-legacy</artifactId>
|
<artifactId>adventure-text-serializer-legacy</artifactId>
|
||||||
<version>4.0.0-SNAPSHOT</version>
|
<version>557865caef</version>
|
||||||
<scope>compile</scope>
|
<scope>compile</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue