From 7b5ffcfe75ef5447830bfcfee2c92e878413b3a9 Mon Sep 17 00:00:00 2001
From: Yaruma3341 <unconfigured@null.spigotmc.org>
Date: Thu, 19 Dec 2019 18:05:40 +0100
Subject: [PATCH] cleanup

---
 Realtime.iml                           |  2 +-
 pom.xml                                |  2 +-
 src/de/steamwar/realtime/Realtime.java | 60 ++++++++++++++------------
 3 files changed, 35 insertions(+), 29 deletions(-)

diff --git a/Realtime.iml b/Realtime.iml
index f3c4b8a..96d8037 100644
--- a/Realtime.iml
+++ b/Realtime.iml
@@ -9,6 +9,6 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" scope="PROVIDED" name="Maven: steamwar:Spigot:1.0" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: steamwar:Spigot:1.12" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 6519705..38f1ac8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -46,7 +46,7 @@
         <dependency>
             <groupId>steamwar</groupId>
             <artifactId>Spigot</artifactId>
-            <version>1.0</version>
+            <version>1.12</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
diff --git a/src/de/steamwar/realtime/Realtime.java b/src/de/steamwar/realtime/Realtime.java
index ca036c4..b25cd6e 100644
--- a/src/de/steamwar/realtime/Realtime.java
+++ b/src/de/steamwar/realtime/Realtime.java
@@ -8,7 +8,6 @@ import org.bukkit.event.Listener;
 import org.bukkit.event.block.BlockFormEvent;
 import org.bukkit.plugin.PluginManager;
 import org.bukkit.plugin.java.JavaPlugin;
-import org.bukkit.scheduler.BukkitRunnable;
 import org.json.simple.JSONArray;
 import org.json.simple.JSONObject;
 import org.json.simple.JSONValue;
@@ -25,12 +24,14 @@ import java.util.Date;
 
 public class Realtime extends JavaPlugin implements Listener {
 
+    WeatherState oldWeatherState = null;
+    WeatherState weatherState = null;
+
     @Override
     public void onEnable() {
         PluginManager pluginManager = Bukkit.getPluginManager();
         pluginManager.registerEvents(this, this);
 
-        WeatherState oldWeatherState = null;
 
         DateFormat dateFormat = new SimpleDateFormat("HHmm");
 
@@ -46,7 +47,7 @@ public class Realtime extends JavaPlugin implements Listener {
             }
 
             //Wetter
-            WeatherState weatherState = getCurrentWeather();
+            updateCurrentWeather();
             if(oldWeatherState != null && oldWeatherState == weatherState)
                 return;
 
@@ -78,7 +79,7 @@ public class Realtime extends JavaPlugin implements Listener {
 
 
     private String jsonString = "";
-    public WeatherState getCurrentWeather() {
+    public void updateCurrentWeather() {
 
         /*
          * https://openweathermap.org/current
@@ -98,7 +99,7 @@ public class Realtime extends JavaPlugin implements Listener {
          * Thunderstorm: ID 2xx ^
          */
 
-        new BukkitRunnable() {
+        Bukkit.getScheduler().scheduleAsyncDelayedTask(this, new Runnable() {
             InputStream inputStream = null;
             DataInputStream dataInputStream;
 
@@ -124,29 +125,34 @@ public class Realtime extends JavaPlugin implements Listener {
                 } finally {
                     IOUtils.closeQuietly(inputStream);
                 }
+
+
+                JSONObject jsonObject = (JSONObject) JSONValue.parse(jsonString);
+
+                String weather;
+
+                JSONArray jsonArray = (JSONArray) jsonObject.get("weather");
+                JSONObject arrayObject = (JSONObject) jsonArray.get(0);
+                weather = String.valueOf((int) (long) arrayObject.get("id"));
+
+                oldWeatherState = weatherState;
+                String firstChar = Character.toString(weather.charAt(0));
+                switch (firstChar) {
+                    case "6":
+                        weatherState = WeatherState.SNOW;
+                        break;
+                    case "5": case "3": //3 = Drizzle
+                        weatherState = WeatherState.RAIN;
+                        break;
+                    case "2":
+                        weatherState = WeatherState.THUNDER_STORM;
+                        break;
+                    default:
+                        weatherState = WeatherState.CLEAR_SKY; //case 8 ebenfalls CLEAR_SKY
+                        break;
+                }
             }
-        }.runTaskAsynchronously(this);
-
-
-        JSONObject jsonObject = (JSONObject) JSONValue.parse(jsonString);
-
-        String weather;
-
-        JSONArray jsonArray = (JSONArray) jsonObject.get("weather");
-        JSONObject arrayObject = (JSONObject) jsonArray.get(0);
-        weather = String.valueOf((int) (long) arrayObject.get("id"));
-
-        String firstChar = Character.toString(weather.charAt(0));
-        switch (firstChar) {
-            case "6":
-                return WeatherState.SNOW;
-            case "5": case "3": //3 = Drizzle
-                return WeatherState.RAIN;
-            case "2":
-                return WeatherState.THUNDER_STORM;
-            default:
-                return WeatherState.CLEAR_SKY; //case 8 ebenfalls CLEAR_SKY
-        }
+        }, 0);
     }
 
     enum WeatherState {