Merge branch 'master' of https://github.com/GeyserMC/Geyser into server-inventory

bootstrap/standalone/src/main/java/org/geysermc/platform/standalone/LoopbackUtil.java

@@ -55,7 +55,7 @@ public class LoopbackUtil {
 
                 if (!result.contains("minecraftuwp")) {
                     Files.write(Paths.get(System.getenv("temp") + "/loopback_minecraft.bat"), loopbackCommand.getBytes(), new OpenOption[0]);
-                    process = Runtime.getRuntime().exec(startScript);
+                    Runtime.getRuntime().exec(startScript);
 
                     geyserLogger.info(ChatColor.AQUA + LanguageUtils.getLocaleStringLog("geyser.bootstrap.loopback.added"));
                 }

connector/src/main/java/org/geysermc/connector/common/main/IGeyserMain.java

@@ -52,7 +52,7 @@ public class IGeyserMain {
      * @return The formatted message
      */
     private String createMessage() {
-        String message = "";
+        StringBuilder message = new StringBuilder();
 
         InputStream helpStream = IGeyserMain.class.getClassLoader().getResourceAsStream("languages/run-help/" + Locale.getDefault().toString() + ".txt");
 
@@ -68,10 +68,10 @@ public class IGeyserMain {
             line = line.replace("${plugin_type}", this.getPluginType());
             line = line.replace("${plugin_folder}", this.getPluginFolder());
 
-            message += line + "\n";
+            message.append(line).append("\n");
         }
 
-        return message;
+        return message.toString();
     }
 
     /**

connector/src/main/java/org/geysermc/connector/entity/living/monster/WitherEntity.java

@@ -46,7 +46,7 @@ public class WitherEntity extends MonsterEntity {
 
         if (entityMetadata.getId() >= 15 && entityMetadata.getId() <= 17) {
             Entity entity = session.getEntityCache().getEntityByJavaId((int) entityMetadata.getValue());
-            if (entity == null && session.getPlayerEntity().getEntityId() == (Integer) entityMetadata.getValue()) {
+            if (entity == null && session.getPlayerEntity().getEntityId() == (int) entityMetadata.getValue()) {
                 entity = session.getPlayerEntity();
             }
 
@@ -62,7 +62,7 @@ public class WitherEntity extends MonsterEntity {
         } else if (entityMetadata.getId() == 17) {
             metadata.put(EntityData.WITHER_TARGET_3, targetID);
         } else if (entityMetadata.getId() == 18) {
-            metadata.put(EntityData.WITHER_INVULNERABLE_TICKS, (int) entityMetadata.getValue());
+            metadata.put(EntityData.WITHER_INVULNERABLE_TICKS, entityMetadata.getValue());
 
             // Show the shield for the first few seconds of spawning (like Java)
             if ((int) entityMetadata.getValue() >= 165) {

connector/src/main/java/org/geysermc/connector/network/translators/EntityIdentifierRegistry.java

@@ -38,7 +38,7 @@ import java.io.InputStream;
  */
 public class EntityIdentifierRegistry {
 
-    public static NbtMap ENTITY_IDENTIFIERS;
+    public static final NbtMap ENTITY_IDENTIFIERS;
 
     private EntityIdentifierRegistry() {
     }

connector/src/main/java/org/geysermc/connector/network/translators/item/ItemTranslator.java

@@ -303,9 +303,8 @@ public abstract class ItemTranslator {
         CompoundTag javaTag = new CompoundTag(name);
         Map<String, Tag> javaValue = javaTag.getValue();
         if (tag != null && !tag.isEmpty()) {
-            for (String str : tag.keySet()) {
+            for (Map.Entry<String, Object> entry : tag.entrySet()) {
-                Object bedrockTag = tag.get(str);
+                Tag translatedTag = translateToJavaNBT(entry.getKey(), entry.getValue());
-                Tag translatedTag = translateToJavaNBT(str, bedrockTag);
                 if (translatedTag == null)
                     continue;
 

connector/src/main/java/org/geysermc/connector/network/translators/java/world/JavaUnloadChunkTranslator.java

@@ -44,7 +44,7 @@ public class JavaUnloadChunkTranslator extends PacketTranslator<ServerUnloadChun
         Iterator<Vector3i> iterator = session.getSkullCache().keySet().iterator();
         while (iterator.hasNext()) {
             Vector3i position = iterator.next();
-            if (Math.floor((double) position.getX() / 16) == packet.getX() && Math.floor((double) position.getZ() / 16) == packet.getZ()) {
+            if ((position.getX() >> 4) == packet.getX() && (position.getZ() >> 4) == packet.getZ()) {
                 session.getSkullCache().get(position).despawnEntity(session);
                 iterator.remove();
             }

connector/src/main/java/org/geysermc/connector/utils/FileUtils.java

@@ -90,12 +90,13 @@ public class FileUtils {
      */
     public static File fileOrCopiedFromResource(File file, String name, Function<String, String> format) throws IOException {
         if (!file.exists()) {
+            //noinspection ResultOfMethodCallIgnored
             file.createNewFile();
-            FileOutputStream fos = new FileOutputStream(file);
+            try (FileOutputStream fos = new FileOutputStream(file)) {
-            InputStream input = GeyserConnector.class.getResourceAsStream("/" + name); // resources need leading "/" prefix
+                try (InputStream input = GeyserConnector.class.getResourceAsStream("/" + name)) { // resources need leading "/" prefix
-
                     byte[] bytes = new byte[input.available()];
 
+                    //noinspection ResultOfMethodCallIgnored
                     input.read(bytes);
 
                     for(char c : format.apply(new String(bytes)).toCharArray()) {
@@ -103,8 +104,8 @@ public class FileUtils {
                     }
 
                     fos.flush();
-            input.close();
+                }
-            fos.close();
+            }
         }
 
         return file;
@@ -122,14 +123,13 @@ public class FileUtils {
             file.createNewFile();
         }
 
-        FileOutputStream fos = new FileOutputStream(file);
+        try (FileOutputStream fos = new FileOutputStream(file)) {
-
             for (char c : data) {
                 fos.write(c);
             }
 
             fos.flush();
-        fos.close();
+        }
     }
 
     /**
@@ -232,9 +232,10 @@ public class FileUtils {
         try {
             int size = stream.available();
             byte[] bytes = new byte[size];
-            BufferedInputStream buf = new BufferedInputStream(stream);
+            try (BufferedInputStream buf = new BufferedInputStream(stream)) {
+                //noinspection ResultOfMethodCallIgnored
                 buf.read(bytes, 0, bytes.length);
-            buf.close();
+            }
             return bytes;
         } catch (IOException e) {
             throw new RuntimeException("Error while trying to read input stream!");

connector/src/main/java/org/geysermc/connector/utils/LanguageUtils.java

@@ -67,8 +67,8 @@ public class LanguageUtils {
         // Load the locale
         if (localeStream != null) {
             Properties localeProp = new Properties();
-            try {
+            try (InputStreamReader reader = new InputStreamReader(localeStream, StandardCharsets.UTF_8)) {
-                localeProp.load(new InputStreamReader(localeStream, StandardCharsets.UTF_8));
+                localeProp.load(reader);
             } catch (Exception e) {
                 throw new AssertionError(getLocaleStringLog("geyser.language.load_failed", locale), e);
             }

connector/src/main/java/org/geysermc/connector/utils/LocaleUtils.java

@@ -236,9 +236,9 @@ public class LocaleUtils {
             WebUtils.downloadFile(clientJarInfo.getUrl(), tmpFilePath.toString());
 
             // Load in the JAR as a zip and extract the file
-            ZipFile localeJar = new ZipFile(tmpFilePath.toString());
+            try (ZipFile localeJar = new ZipFile(tmpFilePath.toString())) {
-            InputStream fileStream = localeJar.getInputStream(localeJar.getEntry("assets/minecraft/lang/en_us.json"));
+                try (InputStream fileStream = localeJar.getInputStream(localeJar.getEntry("assets/minecraft/lang/en_us.json"))) {
-            FileOutputStream outStream = new FileOutputStream(localeFile);
+                    try (FileOutputStream outStream = new FileOutputStream(localeFile)) {
 
                         // Write the file to the locale dir
                         byte[] buf = new byte[fileStream.available()];
@@ -249,10 +249,9 @@ public class LocaleUtils {
 
                         // Flush all changes to disk and cleanup
                         outStream.flush();
-            outStream.close();
+                    }
-
+                }
-            fileStream.close();
+            }
-            localeJar.close();
 
             // Store the latest jar hash
             FileUtils.writeFile(GeyserConnector.getInstance().getBootstrap().getConfigFolder().resolve("locales/en_us.hash").toString(), clientJarInfo.getSha1().toCharArray());

connector/src/main/java/org/geysermc/connector/utils/ResourcePack.java

@@ -30,6 +30,8 @@ import org.geysermc.connector.GeyserConnector;
 import java.io.File;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.stream.Stream;
+import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
 
 /**
@@ -70,10 +72,12 @@ public class ResourcePack {
 
                 pack.sha256 = FileUtils.calculateSHA256(file);
 
+                Stream<? extends ZipEntry> stream = null;
                 try {
                     ZipFile zip = new ZipFile(file);
 
-                    zip.stream().forEach((x) -> {
+                    stream = zip.stream();
+                    stream.forEach((x) -> {
                         if (x.getName().contains("manifest.json")) {
                             try {
                                 ResourcePackManifest manifest = FileUtils.loadJson(zip.getInputStream(x), ResourcePackManifest.class);
@@ -94,6 +98,10 @@ public class ResourcePack {
                 } catch (Exception e) {
                     GeyserConnector.getInstance().getLogger().error(LanguageUtils.getLocaleStringLog("geyser.resource_pack.broken", file.getName()));
                     e.printStackTrace();
+                } finally {
+                    if (stream != null) {
+                        stream.close();
+                    }
                 }
             }
         }

connector/src/main/java/org/geysermc/connector/utils/SettingsUtils.java

@@ -147,7 +147,7 @@ public class SettingsUtils {
                 }
 
                 if (Boolean.class.equals(gamerule.getType())) {
-                    Boolean value = settingsResponse.getToggleResponses().get(offset).booleanValue();
+                    boolean value = settingsResponse.getToggleResponses().get(offset);
                     if (value != session.getConnector().getWorldManager().getGameRuleBool(session, gamerule)) {
                         session.getConnector().getWorldManager().setGameRule(session, gamerule.getJavaID(), value);
                     }

connector/src/main/java/org/geysermc/connector/utils/WebUtils.java

@@ -112,7 +112,7 @@ public class WebUtils {
      */
     private static String connectionToString(HttpURLConnection con) throws IOException {
         // Send the request (we dont use this but its required for getErrorStream() to work)
-        int code = con.getResponseCode();
+        con.getResponseCode();
 
         // Read the error message if there is one if not just read normally
         InputStream inputStream = con.getErrorStream();
@@ -120,17 +120,17 @@ public class WebUtils {
             inputStream = con.getInputStream();
         }
 
-        BufferedReader in = new BufferedReader(new InputStreamReader(inputStream));
+        StringBuilder content = new StringBuilder();
+        try (BufferedReader in = new BufferedReader(new InputStreamReader(inputStream))) {
             String inputLine;
-        StringBuffer content = new StringBuffer();
 
             while ((inputLine = in.readLine()) != null) {
                 content.append(inputLine);
                 content.append("\n");
             }
 
-        in.close();
             con.disconnect();
+        }
 
         return content.toString();
     }