Update ReIndev to 2.9_02

Author: Fox2Code

build.gradle

@@ -245,8 +245,12 @@ static ZipEntry partialCopy(ZipEntry zipEntry) {
     return newZipEntry
 }
 
+static boolean existNotEmpty(File file) {
+    return file.exists() && file.length() != 0
+}
+
 String slimHash = project['reindev.slimSHA256Sum'] as String
-if (slimURL == "null" || (clientFile.exists() && serverFile.exists() && !slimFile.exists())) {
+if (slimURL == "null" || (clientFile.exists() && serverFile.exists() && !existNotEmpty(slimFile))) {
     if (slimFile.exists()) {
         byte[] fileData = Files.readAllBytes(slimFile.toPath())
         byte[] fileHash = MessageDigest.getInstance("SHA-256").digest(fileData)

gradle.properties

@@ -9,12 +9,12 @@ foxloader.version=2.0-alpha21
 # https://www.jitpack.io/#com.fox2code/FoxLoader
 
 # ReIndev properties
-reindev.slimUrl=https://cdn.fox2code.com/files/reindev-slim-2.9_01.jar
-reindev.slimJar=reindev-slim-2.9_01.jar
-reindev.patchedJar=reindev-foxloader-2.9_01.jar
-reindev.clientJar=reindev-client-2.9_01.jar
-reindev.serverJar=reindev-server-2.9_01.jar
-reindev.slimSHA256Sum=a179dd06b090a5296563b8a300de9bd6a63c2b6c226053ecd1baa37b3add3e9f
+reindev.slimUrl=https://cdn.fox2code.com/files/reindev-slim-2.9_02.jar
+reindev.slimJar=reindev-slim-2.9_02.jar
+reindev.patchedJar=reindev-foxloader-2.9_02.jar
+reindev.clientJar=reindev-client-2.9_02.jar
+reindev.serverJar=reindev-server-2.9_02.jar
+reindev.slimSHA256Sum=d8daab21cab94f06f6bfe56ef6b59787c213fb67b48cd32b3ed97355f1fe6bd7
 reindev.version=2.9
 reindev.version.allowFrom=2.9
 

loader/src/main/java/com/fox2code/foxloader/internal/InternalHotfixesHooks.java

@@ -23,16 +23,6 @@
  */
 package com.fox2code.foxloader.internal;
 
-import java.io.*;
-import java.nio.charset.StandardCharsets;
-import java.util.Properties;
-
-public class InternalHotfixesHooks {
-    public static void loadProperties(Properties properties, InputStream inputStream) throws IOException {
-        properties.load(new InputStreamReader(inputStream, StandardCharsets.UTF_8));
-    }
-
-    public static void storeProperties(Properties properties, OutputStream outputStream, String comment) throws IOException {
-        properties.store(new OutputStreamWriter(outputStream, StandardCharsets.UTF_8), comment);
-    }
+public final class InternalHotfixesHooks {
+    private InternalHotfixesHooks() {}
 }

patching/src/main/java/com/fox2code/foxloader/patching/game/HotfixesPatch.java

@@ -23,50 +23,21 @@
  */
 package com.fox2code.foxloader.patching.game;
 
-import org.objectweb.asm.Opcodes;
 import org.objectweb.asm.tree.*;
 
 /**
  * Theses are just hotfixes for the game, dedicated to fixing ReIndev bugs and crashes.
  */
 final class HotfixesPatch extends GamePatch {
-    private static final String PropertyManager = "net/minecraft/server/util/PropertyManager";
-    private static final String Properties = "java/util/Properties";
     private static final String InternalHotfixesHooks = "com/fox2code/foxloader/internal/InternalHotfixesHooks";
-    static final boolean USE_HOTFIXES = true;
+    static final boolean USE_HOTFIXES = false;
 
     HotfixesPatch() {
-        super(new String[]{PropertyManager});
+        super(new String[]{});
     }
 
     @Override
     public ClassNode transform(ClassNode classNode) {
-        if (PropertyManager.equals(classNode.name)) {
-            patchPropertyManager(classNode);
-        }
         return classNode;
     }
-
-    private static void patchPropertyManager(ClassNode classNode) {
-        for (MethodNode methodNode : classNode.methods) {
-            for (AbstractInsnNode abstractInsnNode : methodNode.instructions) {
-                if (abstractInsnNode.getOpcode() == Opcodes.INVOKEVIRTUAL) {
-                    MethodInsnNode methodInsnNode = (MethodInsnNode) abstractInsnNode;
-                    if (Properties.equals(methodInsnNode.owner)) {
-                        if ("load".equals(methodInsnNode.name) &&
-                                "(Ljava/io/InputStream;)V".equals(methodInsnNode.desc)) {
-                            methodNode.instructions.set(methodInsnNode, new MethodInsnNode(
-                                    Opcodes.INVOKESTATIC, InternalHotfixesHooks, "loadProperties",
-                                    "(L" + Properties + ";Ljava/io/InputStream;)V"));
-                        } else if ("store".equals(methodInsnNode.name) &&
-                                "(Ljava/io/OutputStream;Ljava/lang/String;)V".equals(methodInsnNode.desc)) {
-                            methodNode.instructions.set(methodInsnNode, new MethodInsnNode(
-                                    Opcodes.INVOKESTATIC, InternalHotfixesHooks, "storeProperties",
-                                    "(L" + Properties + ";Ljava/io/OutputStream;Ljava/lang/String;)V"));
-                        }
-                    }
-                }
-            }
-        }
-    }
 }