Ugh. Just Ugh.

ZombieHDGaming · ZombieHDGaming · commit d6390e43ee72 · 2018-11-19T17:32:38.000-05:00
Just pushing this since I've already released 1.0.10 but need to commit this anyway. Ugh.
diff --git a/src/main/java/org/dimdev/vanillafix/LoadingConfig.java b/src/main/java/org/dimdev/vanillafix/LoadingConfig.java
@@ -8,29 +8,17 @@ public class LoadingConfig {
 
     private Configuration config;
 
-    public boolean bugFixes;
-    public boolean crashFixes;
-    public boolean modSupport;
-    public boolean profiler;
-    public boolean textureFixes;
-
-
-    public void init(File file) {
-        if (!file.exists()) {
-            bugFixes = true;
-            crashFixes = true;
-            modSupport = true;
-            profiler = true;
-            textureFixes = true;
-            return;
-        }
-        if (config == null) {
-            config = new Configuration(file);
-            reload();
-        }
-    }
+    public boolean bugFixes = true;
+    public boolean crashFixes = true;
+    public boolean modSupport = true;
+    public boolean profiler = true;
+    public boolean textureFixes = true;
+
+
+    public LoadingConfig(File file) {
+        if (!file.exists()) { return; }
 
-    public void reload() {
+        config = new Configuration(file);
         bugFixes = config.get("fixes", "bugFixes", true).getBoolean();
         crashFixes = config.get("fixes", "crashFixes", true).getBoolean();
         modSupport = config.get("fixes", "modSupport", true).getBoolean();
diff --git a/src/main/java/org/dimdev/vanillafix/ModConfig.java b/src/main/java/org/dimdev/vanillafix/ModConfig.java
@@ -19,6 +19,7 @@ public enum ProblemAction {
 
     public static Fixes fixes = new Fixes();
     public static Crashes crashes = new Crashes();
+    //public static Options options = new Options();
 
     public static class Fixes {
         @Name("bugFixes")
@@ -69,6 +70,13 @@ public static class Crashes {
         public int errorNotificationDuration = 30000;
     }
 
+    /*public static class Options {
+        @Name("loginTimeout")
+        @LangKey("vanilafix.options.loginTimeout")
+        @RangeInt(min = 600)
+        public int loginTimeout = 600;
+    }*/
+
     @SubscribeEvent
     public static void onConfigChanged(ConfigChangedEvent.OnConfigChangedEvent event) {
         if (event.getModID().equals("vanillafix")) {
diff --git a/src/main/java/org/dimdev/vanillafix/VanillaFixLoadingPlugin.java b/src/main/java/org/dimdev/vanillafix/VanillaFixLoadingPlugin.java
@@ -22,45 +22,21 @@
 import java.util.Map;
 
 @IFMLLoadingPlugin.MCVersion(ForgeVersion.mcVersion)
-@IFMLLoadingPlugin.SortingIndex(-100000)
+@IFMLLoadingPlugin.SortingIndex(Integer.MIN_VALUE + 10000)
 public class VanillaFixLoadingPlugin implements IFMLLoadingPlugin {
-    private static final Logger log = LogManager.getLogger();
-    private static boolean initialized = false;
-
+    private static final Logger log = LogManager.getLogger("VanillaFix");
     public static LoadingConfig config;
 
-    public VanillaFixLoadingPlugin() {
-        initialize();
-
-        MixinBootstrap.init();
+    static {
+        log.info("Initializing VanillaFix");
+        config = new LoadingConfig(new File(Launch.minecraftHome, "config/vanillafix.cfg"));
 
-        // @formatter:off
-        if (config.bugFixes)      Mixins.addConfiguration("mixins.vanillafix.bugs.json");
-        if (config.crashFixes)    Mixins.addConfiguration("mixins.vanillafix.crashes.json");
-        if (config.profiler)      Mixins.addConfiguration("mixins.vanillafix.profiler.json");
-        if (config.textureFixes)  Mixins.addConfiguration("mixins.vanillafix.textures.json");
-        if (config.modSupport)    Mixins.addConfiguration("mixins.vanillafix.modsupport.json");
-        // @formatter:on
+        trustIdenTrust();
+        initStacktraceDeobfuscator();
+        initMixin();
     }
 
-    public static void initialize() {
-        if (initialized) return;
-        initialized = true;
-
-        config = new LoadingConfig();
-        config.init(new File(Launch.minecraftHome, "config/vanillafix.cfg"));
-
-        // Trust the "IdenTrust DST Root CA X3" certificate (used by Let's Encrypt, which is used by paste.dimdev.org)
-        // TODO: Trust two other certificates, use same alias: https://bugs.openjdk.java.net/browse/JDK-8161008
-        try (InputStream keyStoreInputStream = VanillaFixLoadingPlugin.class.getResourceAsStream("/dst_root_ca_x3.jks")) {
-            KeyStore keyStore = KeyStore.getInstance(KeyStore.getDefaultType());
-            keyStore.load(keyStoreInputStream, "password".toCharArray());
-            SSLUtils.trustCertificates(keyStore);
-        } catch (IOException | CertificateException | NoSuchAlgorithmException | KeyStoreException e) {
-            throw new RuntimeException();
-        }
-
-        // Initialize StacktraceDeobfuscator
+    private static void initStacktraceDeobfuscator() {
         File modDir = new File(Launch.minecraftHome, "config/vanillafix");
         modDir.mkdirs();
 
@@ -83,6 +59,42 @@ public static void initialize() {
         DeobfuscatingRewritePolicy.install();
     }
 
+    private static void initMixin() {
+        MixinBootstrap.init();
+
+        if (config.bugFixes) {
+            log.info("Initializing Bug Fix Mixins");
+            Mixins.addConfiguration("mixins.vanillafix.bugs.json");
+        }
+        if (config.crashFixes) {
+            log.info("Initializing Crash Fix Mixins");
+            Mixins.addConfiguration("mixins.vanillafix.crashes.json");
+        }
+        if (config.profiler) {
+            log.info("Initializing Profiler Improvement Mixins");
+            Mixins.addConfiguration("mixins.vanillafix.profiler.json");
+        }
+        if (config.textureFixes) {
+            log.info("Initializing Texture Fix Mixins");
+            Mixins.addConfiguration("mixins.vanillafix.textures.json");
+        }
+        if (config.modSupport) {
+            log.info("Initializing Mod Support Mixins");
+            Mixins.addConfiguration("mixins.vanillafix.modsupport.json");
+        }
+    }
+
+    private static void trustIdenTrust() {
+        // Trust the "IdenTrust DST Root CA X3" certificate (used by Let's Encrypt, which is used by paste.dimdev.org)
+        try (InputStream keyStoreInputStream = VanillaFixLoadingPlugin.class.getResourceAsStream("/dst_root_ca_x3.jks")) {
+            KeyStore keyStore = KeyStore.getInstance(KeyStore.getDefaultType());
+            keyStore.load(keyStoreInputStream, "password".toCharArray());
+            SSLUtils.trustCertificates(keyStore);
+        } catch (IOException | CertificateException | NoSuchAlgorithmException | KeyStoreException e) {
+            throw new RuntimeException();
+        }
+    }
+
     @Override public String[] getASMTransformerClass() {
         return new String[0];
     }
diff --git a/src/main/java/org/dimdev/vanillafix/bugs/IPatchedSPacketPong.java b/src/main/java/org/dimdev/vanillafix/bugs/IPatchedSPacketPong.java
diff --git a/src/main/java/org/dimdev/vanillafix/bugs/mixins/MixinChunk.java b/src/main/java/org/dimdev/vanillafix/bugs/mixins/MixinChunk.java
diff --git a/src/main/java/org/dimdev/vanillafix/bugs/mixins/MixinEntity.java b/src/main/java/org/dimdev/vanillafix/bugs/mixins/MixinEntity.java
@@ -10,10 +10,9 @@
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
-@Mixin(Entity.class)
+@Mixin(value = Entity.class, priority = 500)
 public abstract class MixinEntity {
     @Shadow public float fallDistance;
-    @Shadow public boolean onGround;
     @Shadow public World world;
 
     /**
diff --git a/src/main/java/org/dimdev/vanillafix/bugs/mixins/MixinEntityTrackerEntry.java b/src/main/java/org/dimdev/vanillafix/bugs/mixins/MixinEntityTrackerEntry.java
@@ -0,0 +1,27 @@
+package org.dimdev.vanillafix.bugs.mixins;
+
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLiving;
+import net.minecraft.entity.EntityTrackerEntry;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.network.play.server.SPacketEntityAttach;
+import org.spongepowered.asm.mixin.Final;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Mixin(EntityTrackerEntry.class)
+public class MixinEntityTrackerEntry {
+
+    @Shadow @Final private Entity trackedEntity;
+
+    @Inject(method = "updatePlayerEntity", at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/Entity;addTrackingPlayer(Lnet/minecraft/entity/player/EntityPlayerMP;)V"))
+    public void sendAttachPacketIfNecessary(EntityPlayerMP playerMP, CallbackInfo ci) {
+        if (trackedEntity instanceof EntityLiving) {
+            playerMP.connection.sendPacket(new SPacketEntityAttach(trackedEntity, ((EntityLiving) trackedEntity).getLeashHolder()));
+        }
+    }
+
+}
diff --git a/src/main/java/org/dimdev/vanillafix/bugs/mixins/MixinNetHandlerLoginServer.java b/src/main/java/org/dimdev/vanillafix/bugs/mixins/MixinNetHandlerLoginServer.java
@@ -0,0 +1,21 @@
+package org.dimdev.vanillafix.bugs.mixins;
+
+import net.minecraft.server.network.NetHandlerLoginServer;
+import org.dimdev.vanillafix.ModConfig;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.Constant;
+import org.spongepowered.asm.mixin.injection.ModifyConstant;
+
+@Mixin(NetHandlerLoginServer.class)
+public class MixinNetHandlerLoginServer {
+
+    /**
+     * Increases server timeout when connecting to prevent
+     * issues with logging in with mods installed
+     *
+     * @return Timeout limit increase
+     */
+    //@ModifyConstant(method = "update", constant = @Constant(intValue = 600, ordinal = 0))
+    //public int update(int value) { return ModConfig.options.loginTimeout; }
+
+}
diff --git a/src/main/java/org/dimdev/vanillafix/bugs/mixins/MixinSPacketPong.java b/src/main/java/org/dimdev/vanillafix/bugs/mixins/MixinSPacketPong.java
diff --git a/src/main/java/org/dimdev/vanillafix/bugs/mixins/client/MixinServerPinger$1.java b/src/main/java/org/dimdev/vanillafix/bugs/mixins/client/MixinServerPinger$1.java
diff --git a/src/main/java/org/dimdev/vanillafix/crashes/CrashUtils.java b/src/main/java/org/dimdev/vanillafix/crashes/CrashUtils.java
@@ -11,7 +11,7 @@
 import java.util.Date;
 
 public final class CrashUtils {
-    private static final Logger log = LogManager.getLogger("VF");
+    private static final Logger log = LogManager.getLogger("VanillaFix");
 
     public static void crash(CrashReport report) {
         throw new ReportedException(report);
diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info
@@ -9,7 +9,8 @@
       "mcversion": "${mcversion}",
       "url": "https://minecraft.curseforge.com/projects/vanillafix",
       "authorList": [
-        "Runemoro"
+        "Runemoro",
+        "ZombieHDGaming"
       ],
       "logoFile": "/assets/vanillafix/logo.png",
       "parent": "",
diff --git a/src/main/resources/mixins.vanillafix.bugs.json b/src/main/resources/mixins.vanillafix.bugs.json
@@ -11,18 +11,16 @@
     "MixinEntityPlayerMP",
     "MixinEntity",
     "MixinInventoryPlayer",
-    "MixinChunk",
     "MixinMinecraftServer",
-    "MixinSPacketPong",
-    "MixinBlockStateContainer"
+    "MixinBlockStateContainer",
+    "MixinEntityTrackerEntry"
   ],
   "client": [
     "client.MixinMinecraft",
     "client.MixinNetHandlerPlayClient",
     "client.MixinEntityPlayerSP",
     "client.MixinIntegratedServer",
-    "client.MixinEntityRenderer",
-    "client.MixinServerPinger$1"
+    "client.MixinEntityRenderer"
   ],
   "injectors": {
     "maxShiftBy": 10
