diff --git a/RealTimeCTS/pom.xml b/RealTimeCTS/pom.xml index 350fc374ad0f567fbfee8bd963437c6674205825..15a47770c9c4ccfe82dfe6d5ec65041f677b4ffd 100644 --- a/RealTimeCTS/pom.xml +++ b/RealTimeCTS/pom.xml @@ -28,7 +28,7 @@ <dependency> <groupId>org.spigotmc</groupId> <artifactId>spigot-api</artifactId> - <version>1.12-R0.1-SNAPSHOT</version> + <version>1.14-R0.1-SNAPSHOT</version> <scope>provided</scope> </dependency> <dependency> diff --git a/RealTimeCTS/src/main/java/dev/spigot/RealTimeCTS/EventListener.java b/RealTimeCTS/src/main/java/dev/spigot/RealTimeCTS/EventListener.java index 816f27e8abbbbf28eb6e89daf90f763377766355..b1a4af86df8f66d64edbd0497113669039046fcb 100644 --- a/RealTimeCTS/src/main/java/dev/spigot/RealTimeCTS/EventListener.java +++ b/RealTimeCTS/src/main/java/dev/spigot/RealTimeCTS/EventListener.java @@ -25,9 +25,10 @@ public class EventListener implements Listener String IDSAE = ""; if(event.getLine(0).equalsIgnoreCase("[CTS]")){ IDSAE = event.getLine(1); + event.setLine(0, ChatColor.BLUE + "Temps d'attente"); if(event.getLine(1).isEmpty()){ - Bukkit.broadcastMessage("La seconde ligne doit contenir l'identifiant de l'arrêt CTS"); + Bukkit.broadcastMessage("La seconde ligne doit contenir l'identifiant de l'arret CTS"); } else { Bukkit.broadcastMessage(IDSAE); Bukkit.broadcastMessage(getStopName(event.getLine(1))); @@ -53,6 +54,8 @@ public class EventListener implements Listener public String getStopName(String IDSAE) throws Exception{ String chaine = getJson(IDSAE); + + plugin.getLogger().info(chaine); Gson gson = new Gson(); json info = gson.fromJson(chaine, json.class); diff --git a/RealTimeCTS/src/main/java/dev/spigot/RealTimeCTS/HttpRequest.java b/RealTimeCTS/src/main/java/dev/spigot/RealTimeCTS/HttpRequest.java index 8e9c53425644b2c3ac0b60215a95dbcbbe05d7f5..0e1f6f172c79d52ebe380ba2b2d3ad1a765a96f6 100644 --- a/RealTimeCTS/src/main/java/dev/spigot/RealTimeCTS/HttpRequest.java +++ b/RealTimeCTS/src/main/java/dev/spigot/RealTimeCTS/HttpRequest.java @@ -36,7 +36,7 @@ public class HttpRequest { URL url = new URL(urlString); String output = ""; - BufferedReader in = new BufferedReader(new InputStreamReader(url.openStream())); + BufferedReader in = new BufferedReader(new InputStreamReader(url.openStream(),"UTF8")); String str; while ((str = in.readLine()) != null) { //System.out.println(str); diff --git a/RealTimeCTS/target/RealTimeCTS-1.0-SNAPSHOT.jar b/RealTimeCTS/target/RealTimeCTS-1.0-SNAPSHOT.jar index 93b396927cdb484ed804e624e4aac1e8ac5efeb4..573b36257657e22eaade40ad92c47ab4fff16ee6 100644 Binary files a/RealTimeCTS/target/RealTimeCTS-1.0-SNAPSHOT.jar and b/RealTimeCTS/target/RealTimeCTS-1.0-SNAPSHOT.jar differ diff --git a/RealTimeCTS/target/classes/dev/spigot/RealTimeCTS/EventListener.class b/RealTimeCTS/target/classes/dev/spigot/RealTimeCTS/EventListener.class index 11ef16d486e3acfed64612f1df65d1f138e69af8..7746f92fd1d971cf993db8725927bee666ddefa4 100644 Binary files a/RealTimeCTS/target/classes/dev/spigot/RealTimeCTS/EventListener.class and b/RealTimeCTS/target/classes/dev/spigot/RealTimeCTS/EventListener.class differ diff --git a/RealTimeCTS/target/classes/dev/spigot/RealTimeCTS/HttpRequest.class b/RealTimeCTS/target/classes/dev/spigot/RealTimeCTS/HttpRequest.class index fef7079a0c4b2dc80a787aff3a34adfd036eae80..252305efda71a33143c195fc948f9fe8e9468e91 100644 Binary files a/RealTimeCTS/target/classes/dev/spigot/RealTimeCTS/HttpRequest.class and b/RealTimeCTS/target/classes/dev/spigot/RealTimeCTS/HttpRequest.class differ diff --git a/RealTimeCTS/target/surefire-reports/TEST-dev.spigot.RealTimeCTS.AppTest.xml b/RealTimeCTS/target/surefire-reports/TEST-dev.spigot.RealTimeCTS.AppTest.xml index 9346f066ddc267024ce09a7c4d068e88ae0808d2..93539ca518bc35953a21f6d3d388dc0c0f62fd15 100644 --- a/RealTimeCTS/target/surefire-reports/TEST-dev.spigot.RealTimeCTS.AppTest.xml +++ b/RealTimeCTS/target/surefire-reports/TEST-dev.spigot.RealTimeCTS.AppTest.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8" ?> -<testsuite tests="1" failures="0" name="dev.spigot.RealTimeCTS.AppTest" time="0.005" errors="0" skipped="0"> +<testsuite tests="0" failures="0" name="dev.spigot.RealTimeCTS.AppTest" time="0" errors="0" skipped="0"> <properties> <property name="java.runtime.name" value="Java(TM) SE Runtime Environment"/> <property name="java.vm.version" value="12.0.1+12"/> @@ -16,7 +16,7 @@ <property name="sun.java.launcher" value="SUN_STANDARD"/> <property name="java.vm.specification.name" value="Java Virtual Machine Specification"/> <property name="user.dir" value="C:\Users\Lucas\Desktop\RealTimeCTS"/> - <property name="java.vm.compressedOopsMode" value="Zero based"/> + <property name="java.vm.compressedOopsMode" value="32-bit"/> <property name="java.runtime.version" value="12.0.1+12"/> <property name="java.awt.graphicsenv" value="sun.awt.Win32GraphicsEnvironment"/> <property name="os.arch" value="amd64"/> @@ -28,7 +28,7 @@ <property name="os.name" value="Windows 10"/> <property name="classworlds.conf" value="C:\Users\Lucas\Documents\apache-maven-3.6.1\bin\..\bin\m2.conf"/> <property name="sun.jnu.encoding" value="Cp1252"/> - <property name="java.library.path" value="C:\Program Files\Java\jdk-12.0.1\bin;C:\WINDOWS\Sun\Java\bin;C:\WINDOWS\system32;C:\WINDOWS;C:\Program Files\AdoptOpenJDK\jdk-11.0.3.7-hotspot\bin;C:\Program Files (x86)\Common Files\Oracle\Java\javapath;C:\Program Files (x86)\Intel\iCLS Client\;C:\ProgramData\Oracle\Java\javapath;C:\Program Files\Intel\iCLS Client\;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem;C:\WINDOWS\System32\WindowsPowerShell\v1.0\;C:\Program Files\PuTTY\;C:\Program Files (x86)\Intel\Intel(R) Management Engine Components\DAL;C:\Program Files\Intel\Intel(R) Management Engine Components\DAL;C:\Program Files (x86)\Intel\Intel(R) Management Engine Components\IPT;C:\Program Files\Intel\Intel(R) Management Engine Components\IPT;C:\WINDOWS\System32\OpenSSH\;C:\Program Files\dotnet\;C:\Program Files\Microsoft SQL Server\130\Tools\Binn\;C:\Program Files (x86)\Microsoft SQL Server\110\DTS\Binn\;C:\Program Files (x86)\Microsoft SQL Server\120\DTS\Binn\;C:\Program Files (x86)\Microsoft SQL Server\130\DTS\Binn\;C:\Program Files (x86)\Microsoft SQL Server\140\DTS\Binn\;C:\Program Files\Microsoft SQL Server\Client SDK\ODBC\130\Tools\Binn\;C:\Program Files (x86)\Microsoft SQL Server\140\Tools\Binn\;C:\Program Files\Microsoft SQL Server\140\Tools\Binn\;C:\Program Files\Microsoft SQL Server\140\DTS\Binn\;C:\Program Files\Intel\WiFi\bin\;C:\Program Files\Common Files\Intel\WirelessCommon\;C:\WINDOWS\SysWow64;C:\Users\Lucas\AppData\Local\Microsoft\WindowsApps;C:\Users\Lucas\AppData\Local\Microsoft\WindowsApps;C:\Users\Lucas\AppData\Local\atom\bin;C:\Users\Lucas\AppData\Local\Pandoc\;C:\Users\Lucas\AppData\Local\Programs\MiKTeX 2.9\miktex\bin\x64\;C:\MinGW\libexec\mingw-get;C:\Users\Lucas\AppData\Local\Programs\Microsoft VS Code\bin;C:\Program Files\Java\jdk-12.0.1;;."/> + <property name="java.library.path" value="C:\Program Files\Java\jdk-12.0.1\bin;C:\WINDOWS\Sun\Java\bin;C:\WINDOWS\system32;C:\WINDOWS;C:\Program Files\AdoptOpenJDK\jdk-11.0.3.7-hotspot\bin;C:\ProgramData\Oracle\Java\javapath;C:\WINDOWS\system32;C:\WINDOWS;C:\WINDOWS\System32\Wbem;C:\WINDOWS\System32\WindowsPowerShell\v1.0\;C:\Program Files\PuTTY\;C:\WINDOWS\System32\OpenSSH\;C:\Program Files\dotnet\;C:\Program Files\Microsoft SQL Server\130\Tools\Binn\;C:\Program Files (x86)\Microsoft SQL Server\110\DTS\Binn\;C:\Program Files (x86)\Microsoft SQL Server\120\DTS\Binn\;C:\Program Files (x86)\Microsoft SQL Server\130\DTS\Binn\;C:\Program Files (x86)\Microsoft SQL Server\140\DTS\Binn\;C:\Program Files\Microsoft SQL Server\Client SDK\ODBC\130\Tools\Binn\;C:\Program Files (x86)\Microsoft SQL Server\140\Tools\Binn\;C:\Program Files\Microsoft SQL Server\140\Tools\Binn\;C:\Program Files\Microsoft SQL Server\140\DTS\Binn\;C:\Program Files\Intel\WiFi\bin\;C:\Program Files\Common Files\Intel\WirelessCommon\;C:\WINDOWS\SysWow64;C:\Program Files\TortoiseGit\bin;C:\Program Files\Git\cmd;C:\Program Files (x86)\Intel\Intel(R) Management Engine Components\DAL;C:\Program Files\Intel\Intel(R) Management Engine Components\DAL;C:\Users\Lucas\AppData\Local\Microsoft\WindowsApps;C:\Users\Lucas\AppData\Local\Microsoft\WindowsApps;C:\Users\Lucas\AppData\Local\atom\bin;C:\Users\Lucas\AppData\Local\Pandoc\;C:\Users\Lucas\AppData\Local\Programs\MiKTeX 2.9\miktex\bin\x64\;C:\MinGW\libexec\mingw-get;C:\Users\Lucas\AppData\Local\Programs\Microsoft VS Code\bin;C:\Program Files\Java\jdk-12.0.1;;."/> <property name="maven.conf" value="C:\Users\Lucas\Documents\apache-maven-3.6.1\bin\../conf"/> <property name="jdk.debug" value="release"/> <property name="java.class.version" value="56.0"/> @@ -63,5 +63,4 @@ <property name="sun.desktop" value="windows"/> <property name="sun.cpu.isalist" value="amd64"/> </properties> - <testcase classname="dev.spigot.RealTimeCTS.AppTest" name="shouldAnswerWithTrue" time="0.005"/> </testsuite> \ No newline at end of file diff --git a/RealTimeCTS/target/surefire-reports/dev.spigot.RealTimeCTS.AppTest.txt b/RealTimeCTS/target/surefire-reports/dev.spigot.RealTimeCTS.AppTest.txt index 1472ba7ad925b5349aecc98803500e44bcc81b31..e4112291de623c31da7587e5b244c7ee1af4c54c 100644 --- a/RealTimeCTS/target/surefire-reports/dev.spigot.RealTimeCTS.AppTest.txt +++ b/RealTimeCTS/target/surefire-reports/dev.spigot.RealTimeCTS.AppTest.txt @@ -1,4 +1,4 @@ ------------------------------------------------------------------------------- Test set: dev.spigot.RealTimeCTS.AppTest ------------------------------------------------------------------------------- -Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.137 sec +Tests run: 0, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.01 sec diff --git a/RealTimeCTS/target/test-classes/dev/spigot/RealTimeCTS/AppTest.class b/RealTimeCTS/target/test-classes/dev/spigot/RealTimeCTS/AppTest.class index 1ec45de9a200836579c0ea088978c55ed9cb4a64..74fc93349ac5ccc31cb827dd56f9068e0fddf635 100644 Binary files a/RealTimeCTS/target/test-classes/dev/spigot/RealTimeCTS/AppTest.class and b/RealTimeCTS/target/test-classes/dev/spigot/RealTimeCTS/AppTest.class differ