From 50fe36edf0517a6ed6cb200a79e14c382c60f8ca Mon Sep 17 00:00:00 2001
From: rtm516 <ryantmilner@hotmail.co.uk>
Date: Tue, 28 Apr 2020 21:17:29 +0100
Subject: [PATCH] Updated mappings and added .mcpack support

---
 .../org/geysermc/connector/utils/ResourcePack.java    | 11 +----------
 connector/src/main/resources/mappings                 |  2 +-
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/connector/src/main/java/org/geysermc/connector/utils/ResourcePack.java b/connector/src/main/java/org/geysermc/connector/utils/ResourcePack.java
index f3653b15d..fb94c0517 100644
--- a/connector/src/main/java/org/geysermc/connector/utils/ResourcePack.java
+++ b/connector/src/main/java/org/geysermc/connector/utils/ResourcePack.java
@@ -1,23 +1,14 @@
 package org.geysermc.connector.utils;
 
-import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.JsonNode;
 import com.voxelwind.server.jni.hash.JavaHash;
 import com.voxelwind.server.jni.hash.NativeHash;
 import com.voxelwind.server.jni.hash.VoxelwindHash;
-import io.netty.buffer.ByteBuf;
-import io.netty.buffer.PooledByteBufAllocator;
 import net.md_5.bungee.jni.NativeCode;
 import org.geysermc.connector.GeyserConnector;
-import org.geysermc.floodgate.util.EncryptionUtil;
 
 import java.io.File;
-import java.io.InputStream;
 import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 import java.util.zip.ZipFile;
 
@@ -43,7 +34,7 @@ public class ResourcePack {
         File directory = new File("packs");
 
         for(File file : directory.listFiles()) {
-            if(file.getName().endsWith(".zip")) {
+            if(file.getName().endsWith(".zip") || file.getName().endsWith(".mcpack")) {
                 ResourcePack pack = new ResourcePack();
 
                 pack.sha256 = getBytes(hashes.get(file.getName()));
diff --git a/connector/src/main/resources/mappings b/connector/src/main/resources/mappings
index 278c73449..56e490143 160000
--- a/connector/src/main/resources/mappings
+++ b/connector/src/main/resources/mappings
@@ -1 +1 @@
-Subproject commit 278c73449aeeb4064c7513a68f98a49a5f463f0a
+Subproject commit 56e4901437dde12458020e81ea76f6087aac7de8