Fixed RC2's crash on load if using certain mods (RAT)

Author: wispborne

jars/MagicLib-Kotlin.jar

@@ -8,6 +8,6 @@
     {
       "major": "1",
       "minor": "4",
-      "patch": "6"
+      "patch": "7"
     }
 }

jars/MagicLib.jar

@@ -24,10 +24,6 @@
  * Master ModPlugin for MagicLib. Handles all the loading of data and scripts.
  */
 public class Magic_modPlugin extends BaseModPlugin {
-    /**
-     * DO NOT USE. Meant to be used internally as a hacky way to compare arbitrary objects by serializing them to XML.
-     */
-    public static XStream magiclibXStream;
 
     ////////////////////////////////////////
     //                                    //
@@ -191,7 +187,6 @@ public void afterGameSave() {
     @Override
     public void configureXStream(XStream x) {
         super.configureXStream(x);
-        magiclibXStream = x;
         data.scripts.Magic_modPlugin.configureXStream(x);
 
         x.alias("MagicBountyBarEvent", MagicBountyBarEvent.class);

magiclib.version

@@ -10,12 +10,23 @@
 import com.fs.starfarer.api.ui.TooltipMakerAPI;
 import com.fs.starfarer.api.util.IntervalUtil;
 import com.fs.starfarer.api.util.Misc;
+import com.sun.xml.internal.txw2.output.IndentingXMLStreamWriter;
+import com.thoughtworks.xstream.XStream;
+import com.thoughtworks.xstream.io.HierarchicalStreamReader;
+import com.thoughtworks.xstream.io.HierarchicalStreamWriter;
+import com.thoughtworks.xstream.io.StreamException;
+import com.thoughtworks.xstream.io.xml.StaxDriver;
+import com.thoughtworks.xstream.io.xml.StaxWriter;
+import com.thoughtworks.xstream.mapper.MapperWrapper;
 import org.apache.log4j.Logger;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.json.JSONObject;
 
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamWriter;
 import java.awt.*;
+import java.io.*;
 import java.util.List;
 import java.util.*;
 
@@ -64,6 +75,55 @@ public class MagicAchievement {
      * Put your initialization code in {@link #onApplicationLoaded(boolean)} or {@link #onSaveGameLoaded(boolean)} instead.
      */
     public MagicAchievement() {
+        if (xStream == null) {
+            try {
+                xStream = buildXStream();
+            } catch (Exception e) {
+                logger.error(e);
+            }
+        }
+    }
+
+    private static XStream buildXStream() {
+        // From obf vanilla code
+        XStream xStream = new XStream(new StaxDriver() {
+            public HierarchicalStreamWriter createWriter(OutputStream outputStream) {
+                System.gc();
+                long l2 = Runtime.getRuntime().totalMemory() - Runtime.getRuntime().freeMemory();
+                try {
+                    OutputStreamWriter outputStreamWriter = new OutputStreamWriter(outputStream, "UTF-8");
+                    IndentingXMLStreamWriter indentingXMLStreamWriter = new IndentingXMLStreamWriter(this.getOutputFactory().createXMLStreamWriter(outputStreamWriter));
+                    indentingXMLStreamWriter.setIndentStep("");
+                    return new StaxWriter(this.getQnameMap(), (XMLStreamWriter) indentingXMLStreamWriter, true, this.isRepairingNamespace());
+                } catch (XMLStreamException xMLStreamException) {
+                    throw new StreamException(xMLStreamException);
+                } catch (UnsupportedEncodingException unsupportedEncodingException) {
+                    throw new StreamException(unsupportedEncodingException);
+                }
+            }
+
+            public HierarchicalStreamReader createReader(InputStream inputStream) {
+                try {
+                    return super.createReader(new InputStreamReader(inputStream, "UTF-8"));
+                } catch (UnsupportedEncodingException unsupportedEncodingException) {
+                    throw new RuntimeException(unsupportedEncodingException);
+                }
+            }
+        }) {
+            protected MapperWrapper wrapMapper(MapperWrapper mapperWrapper) {
+                return new MapperWrapper(mapperWrapper) {
+
+                    public boolean shouldSerializeMember(Class clazz, String string2) {
+                        if (clazz == Object.class) {
+                            return false;
+                        }
+                        return super.shouldSerializeMember(clazz, string2);
+                    }
+                };
+            }
+        };
+
+        return xStream;
     }
 
     /**
@@ -598,9 +658,14 @@ public void setCompletedByUserName(@Nullable String completedByUserName) {
         return memory;
     }
 
+    private static XStream xStream;
 
     private int toHashcode(Object obj) {
-        return org.magiclib.Magic_modPlugin.magiclibXStream.toXML(obj).hashCode();
+        if (xStream != null) {
+            return xStream.toXML(obj).hashCode();
+        }
+
+        return obj.hashCode(); // Not correct but better than nothing
     }
 
     /**