diff --git a/api/pom.xml b/api/pom.xml index a0cbdf87f..6d4e1c856 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -10,12 +10,6 @@ api - - org.projectlombok - lombok - 1.18.4 - compile - com.google.code.gson gson diff --git a/common/pom.xml b/common/pom.xml index 6a0a6ff04..cd96ad23a 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -9,50 +9,4 @@ 1.0-SNAPSHOT common - - - com.github.steveice10 - opennbt - 1.3-SNAPSHOT - compile - - - com.github.steveice10 - packetlib - 1.4-SNAPSHOT - compile - - - com.github.steveice10 - mcauthlib - 1.1-SNAPSHOT - compile - - - com.github.steveice10 - mcprotocollib - 1.14.4-SNAPSHOT - compile - - - com.github.steveice10 - opennbt - - - com.github.steveice10 - packetlib - - - com.github.steveice10 - mcauthlib - - - - - com.auth0 - java-jwt - 3.3.0 - compile - - \ No newline at end of file diff --git a/connector/pom.xml b/connector/pom.xml index 1674eb649..b7a97863e 100644 --- a/connector/pom.xml +++ b/connector/pom.xml @@ -44,7 +44,6 @@ net.minecrell terminalconsoleappender 1.0.0 - jar compile @@ -59,12 +58,6 @@ 1.6.4 compile - - org.projectlombok - lombok - 1.18.4 - provided - org.fusesource.jansi jansi @@ -129,7 +122,7 @@ - ${outputName}-noshade + ${project.parent.name}-noshade ../target @@ -147,7 +140,7 @@ org.apache.maven.plugins maven-javadoc-plugin - ${outputName} + ${project.parent.name} @@ -162,7 +155,7 @@ - ${outputName} + ${project.parent.name} true true diff --git a/connector/src/main/java/org/geysermc/connector/utils/SkinUtils.java b/connector/src/main/java/org/geysermc/connector/utils/SkinUtils.java index b4c9d7f63..91910c961 100644 --- a/connector/src/main/java/org/geysermc/connector/utils/SkinUtils.java +++ b/connector/src/main/java/org/geysermc/connector/utils/SkinUtils.java @@ -7,12 +7,12 @@ import com.nukkitx.protocol.bedrock.data.SerializedSkin; import com.nukkitx.protocol.bedrock.packet.PlayerListPacket; import lombok.AllArgsConstructor; import lombok.Getter; -import org.apache.commons.codec.Charsets; import org.geysermc.api.Geyser; import org.geysermc.connector.GeyserConnector; import org.geysermc.connector.entity.PlayerEntity; import org.geysermc.connector.network.session.GeyserSession; +import java.nio.charset.StandardCharsets; import java.util.Base64; import java.util.Collections; import java.util.UUID; @@ -80,7 +80,7 @@ public class SkinUtils { try { GameProfile.Property skinProperty = profile.getProperty("textures"); - JsonObject skinObject = SkinProvider.GSON.fromJson(new String(Base64.getDecoder().decode(skinProperty.getValue()), Charsets.UTF_8), JsonObject.class); + JsonObject skinObject = SkinProvider.GSON.fromJson(new String(Base64.getDecoder().decode(skinProperty.getValue()), StandardCharsets.UTF_8), JsonObject.class); JsonObject textures = skinObject.getAsJsonObject("textures"); JsonObject skinTexture = textures.getAsJsonObject("SKIN"); diff --git a/pom.xml b/pom.xml index 79b7b5a1a..2f394b5a9 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ geyser-parent 1.0-SNAPSHOT pom - GeyserMC + Geyser Allows for players from Minecraft Bedrock Edition to join Minecraft Java Edition servers. https://geysermc.org @@ -83,33 +83,16 @@ + + + org.projectlombok + lombok + 1.18.4 + provided + + + clean install - - - src/main/resources/ - false - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.7.0 - - 1.8 - 1.8 - - - - org.apache.maven.plugins - maven-shade-plugin - 3.1.0 - - false - true - - -