From 2b435c2600b72adc61a20fd1ed3ec3e74bb8aa9f Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Wed, 14 Oct 2020 09:13:29 -0400
Subject: [PATCH] UnitType serializer set

---
 core/src/mindustry/io/JsonIO.java | 12 ++++++++++++
 settings.gradle                   |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/core/src/mindustry/io/JsonIO.java b/core/src/mindustry/io/JsonIO.java
index 39c3a1a821..eb3815ba76 100644
--- a/core/src/mindustry/io/JsonIO.java
+++ b/core/src/mindustry/io/JsonIO.java
@@ -165,6 +165,18 @@ public class JsonIO{
             }
         });
 
+        json.setSerializer(UnitType.class, new Serializer<>(){
+            @Override
+            public void write(Json json, UnitType object, Class knownType){
+                json.writeValue(object.name);
+            }
+
+            @Override
+            public UnitType read(Json json, JsonValue jsonData, Class type){
+                return Vars.content.getByName(ContentType.unit, jsonData.asString());
+            }
+        });
+
         json.setSerializer(ItemStack.class, new Serializer<>(){
             @Override
             public void write(Json json, ItemStack object, Class knownType){
diff --git a/settings.gradle b/settings.gradle
index 265a6a5024..52b0980311 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,4 +1,4 @@
-if(JavaVersion.current().ordinal() < JavaVersion.VERSION_14.ordinal() && System.getenv("JITPACK") != "true"){
+if(JavaVersion.current().ordinal() < JavaVersion.VERSION_14.ordinal()){
     throw new GradleException("!!! YOU MUST USE JAVA 14 OR ABOVE TO COMPILE AND RUN MINDUSTRY !!! Read the README. Your version: ${System.properties["java.version"]}")
 }