From d216e5dfceafb952e5fbca484a8a16886d4513f4 Mon Sep 17 00:00:00 2001 From: xjboss Date: Wed, 2 Aug 2017 18:53:53 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=E7=B3=BB=E7=BB=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/kcauldronx/BMetrics.java | 1 + src/main/java/kcauldronx/YUMCStatistics.java | 11 ++++------- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/main/java/kcauldronx/BMetrics.java b/src/main/java/kcauldronx/BMetrics.java index 52f67ed..f9a3173 100644 --- a/src/main/java/kcauldronx/BMetrics.java +++ b/src/main/java/kcauldronx/BMetrics.java @@ -226,6 +226,7 @@ public class BMetrics { private void submitData() { final JSONObject data = getServerData(); JSONArray pluginData = new JSONArray(); + pluginData.add(getPluginData()); data.put("plugins", pluginData); // Create a new thread for the connection to the bStats server new Thread(new Runnable() { diff --git a/src/main/java/kcauldronx/YUMCStatistics.java b/src/main/java/kcauldronx/YUMCStatistics.java index f977d36..eededd3 100644 --- a/src/main/java/kcauldronx/YUMCStatistics.java +++ b/src/main/java/kcauldronx/YUMCStatistics.java @@ -14,10 +14,7 @@ import java.net.URL; import java.net.URLConnection; import java.net.URLEncoder; import java.nio.charset.Charset; -import java.util.HashMap; -import java.util.LinkedList; -import java.util.Map; -import java.util.UUID; +import java.util.*; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.eventhandler.EventPriority; @@ -77,7 +74,7 @@ public class YUMCStatistics { /** * 线程任务 */ - private volatile Thread task = null; + private volatile TimerTask task = null; /** * 插件使用数据统计 @@ -195,7 +192,7 @@ public class YUMCStatistics { // 开启TPS统计线程 //MinecraftForge.EVENT_BUS.register(timer); // 开启发送数据线程 - task = new Thread(new Runnable() { + task=(new TimerTask() { @Override public void run() { try { @@ -207,7 +204,7 @@ public class YUMCStatistics { } } }); - task.start(); + new Timer().scheduleAtFixedRate(task,1000*60*5,1000*60*30); return true; } /** From 9284fcfffe7c15ea5b46dc3e1d47db8cdcfdc941 Mon Sep 17 00:00:00 2001 From: xjboss Date: Wed, 2 Aug 2017 18:55:11 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=A0=E7=94=A8?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/kcauldronx/YUMCStatistics.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/main/java/kcauldronx/YUMCStatistics.java b/src/main/java/kcauldronx/YUMCStatistics.java index eededd3..3a8c2df 100644 --- a/src/main/java/kcauldronx/YUMCStatistics.java +++ b/src/main/java/kcauldronx/YUMCStatistics.java @@ -189,8 +189,6 @@ public class YUMCStatistics { if (task != null) { return true; } - // 开启TPS统计线程 - //MinecraftForge.EVENT_BUS.register(timer); // 开启发送数据线程 task=(new TimerTask() { @Override From f10d1f663b277f14d3f34797b0f5d40a1de7001b Mon Sep 17 00:00:00 2001 From: xjboss Date: Wed, 2 Aug 2017 19:17:46 +0800 Subject: [PATCH 3/6] [CI SKIP] update readme.md --- README.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index c15b1f4..9ae5243 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ **[加入KCauldronX交流群!](https://jq.qq.com/?_wv=1027&k=4BEK1SI)** # KCauldronX ### KCauldronX - continuation of KCauldron minecraft server -![Donate][donate_img] [![Download KCauldronX][download_img]][download_url] +![Donate][donate_img] [![Download KCauldronX][download_img]][download_url] [![Build Status](https://ci.xjboss.net/job/KCauldronX/badge/icon)](https://ci.xjboss.net/job/KCauldronX/) ## Building KCauldronX * Ensure you are using Java JDK 8u101 or higher. @@ -38,6 +38,7 @@ If you're once checkout source - you not need to do it again * Make sure that similar issue not exists already * Please fill [issue form](https://git.xjboss.net/KC-RELOADED/KCauldronX/issues/new) else -[donate_img]: https://prok.pw/donate.png +[donate_img]: https:// [download_url]: https://ci.xjboss.net/job/KCauldronX/ -[download_img]: https://prok.pw/download.png \ No newline at end of file +[download_img]: https:// +[build_status]: https://ci.xjboss.net/job/KCauldronX/badge/icon \ No newline at end of file From 412f4c40b0f825ddafd9d6f2936e0c67b5109da1 Mon Sep 17 00:00:00 2001 From: xjboss Date: Wed, 2 Aug 2017 22:49:20 +0800 Subject: [PATCH 4/6] modified: README.md --- README.md | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 9ae5243..ed874ad 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,11 @@ **[加入KCauldronX交流群!](https://jq.qq.com/?_wv=1027&k=4BEK1SI)** # KCauldronX ### KCauldronX - continuation of KCauldron minecraft server -![Donate][donate_img] [![Download KCauldronX][download_img]][download_url] [![Build Status](https://ci.xjboss.net/job/KCauldronX/badge/icon)](https://ci.xjboss.net/job/KCauldronX/) +[![Build Status][build_status]](https://ci.xjboss.net/job/KCauldronX/) [![Download KCauldronX][download_img]][download_url] +[![bStats][bStats]][bStats_link] [![yumc Stats][yumc_Stats]][yumc_Stats_link] + +![donate][donate_img] 1PFBV7gFBEqG1hcYhR9CvrvQhENczsRgHg ## Building KCauldronX * Ensure you are using Java JDK 8u101 or higher. * Checkout project @@ -38,7 +41,11 @@ If you're once checkout source - you not need to do it again * Make sure that similar issue not exists already * Please fill [issue form](https://git.xjboss.net/KC-RELOADED/KCauldronX/issues/new) else -[donate_img]: https:// +[donate_img]: https://git.xjboss.net/static/donate-Bitcoin.svg [download_url]: https://ci.xjboss.net/job/KCauldronX/ -[download_img]: https:// -[build_status]: https://ci.xjboss.net/job/KCauldronX/badge/icon \ No newline at end of file +[download_img]: https://git.xjboss.net/static/download-latest.svg +[build_status]: https://ci.xjboss.net/job/KCauldronX/badge/icon +[bStats]: https://git.xjboss.net/static/bStats-KCX.svg +[bStats_link]: https://bstats.org/plugin/bukkit/KCauldronX +[yumc_Stats]: https://git.xjboss.net/static/yumc-KCX.svg +[yumc_Stats_link]: http://www.yumc.pw/Home/Statistics/Plugin.html?name=KCauldronX \ No newline at end of file From e06ddf7c0304a0cda2d8c9483d1f2ed447e83700 Mon Sep 17 00:00:00 2001 From: xjboss Date: Wed, 2 Aug 2017 22:50:22 +0800 Subject: [PATCH 5/6] [CI SKIP] update readme.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ed874ad..affbe42 100644 --- a/README.md +++ b/README.md @@ -42,7 +42,7 @@ If you're once checkout source - you not need to do it again * Please fill [issue form](https://git.xjboss.net/KC-RELOADED/KCauldronX/issues/new) else [donate_img]: https://git.xjboss.net/static/donate-Bitcoin.svg -[download_url]: https://ci.xjboss.net/job/KCauldronX/ +[download_url]: https://pan.baidu.com/s/1i4DHUHR#list/path=/KCauldronX/%23lastSuccessfulBuild [download_img]: https://git.xjboss.net/static/download-latest.svg [build_status]: https://ci.xjboss.net/job/KCauldronX/badge/icon [bStats]: https://git.xjboss.net/static/bStats-KCX.svg From 9bfbd531b5223a4906ee04913d78ec8289a169af Mon Sep 17 00:00:00 2001 From: xjboss Date: Wed, 2 Aug 2017 22:52:35 +0800 Subject: [PATCH 6/6] [CI SKIP] update readme.md --- README.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/README.md b/README.md index affbe42..a37b186 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,7 @@ **[加入KCauldronX交流群!](https://jq.qq.com/?_wv=1027&k=4BEK1SI)** # KCauldronX ### KCauldronX - continuation of KCauldron minecraft server -[![Build Status][build_status]](https://ci.xjboss.net/job/KCauldronX/) [![Download KCauldronX][download_img]][download_url] - -[![bStats][bStats]][bStats_link] [![yumc Stats][yumc_Stats]][yumc_Stats_link] +[![Build Status][build_status]](https://ci.xjboss.net/job/KCauldronX/) [![Download KCauldronX][download_img]][download_url] [![bStats][bStats]][bStats_link] [![yumc Stats][yumc_Stats]][yumc_Stats_link] ![donate][donate_img] 1PFBV7gFBEqG1hcYhR9CvrvQhENczsRgHg ## Building KCauldronX