From 5c85ba84dbbf817d9c3754704958ac534e47388b Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Fri, 5 Mar 2021 23:20:19 -0500
Subject: [PATCH] Actual JSON weather (?)

---
 core/src/mindustry/mod/ContentParser.java | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/core/src/mindustry/mod/ContentParser.java b/core/src/mindustry/mod/ContentParser.java
index b46227e662..b81190aa7c 100644
--- a/core/src/mindustry/mod/ContentParser.java
+++ b/core/src/mindustry/mod/ContentParser.java
@@ -92,16 +92,6 @@ public class ContentParser{
             readFields(result, data);
             return result;
         });
-        put(Weather.class, (type, data) -> {
-            if(data.isString()){
-                return field(Weathers.class, data);
-            }
-            var bc = resolve(data.getString("type", ""), ParticleWeather.class);
-            data.remove("type");
-            Weather result = make(bc);
-            readFields(result, data);
-            return result;
-        });
         put(DrawBlock.class, (type, data) -> {
             if(data.isString()){
                 //try to instantiate
@@ -327,7 +317,7 @@ public class ContentParser{
                 readBundle(ContentType.weather, name, value);
             }else{
                 readBundle(ContentType.weather, name, value);
-                item = make(resolve(getType(value), ParticleWeather.class));
+                item = make(resolve(getType(value), ParticleWeather.class), name);
             }
             currentContent = item;
             read(() -> readFields(item, value));