Merge branch 'release/0.0.1'

Author: Giacomello Nathan

README.md

@@ -1,13 +1,14 @@
-# FroxyGame
+# FroxyCore
 Partie coeur qui sera sur les serveurs Spigot pour le projet Froxy-Network
 
-Ce dépôt contient les sources et la documentation pour la partie FroxyGame.
+Ce dépôt contient les sources et la documentation pour la partie FroxyCore.
 
 ## Librairies
 - [slf4j](https://www.slf4j.org/)
 - [lombok](https://github.com/rzwitserloot/lombok)
 - [FroxyNetwork](https://github.com/froxynetwork/froxynetwork)
 - [FroxyGame](https://github.com/froxynetwork/froxygame)
+- [FroxyAPI](https://github.com/froxynetwork/froxyapi)
 
 ## License
 This software is available under the following licenses:

pom.xml

@@ -28,6 +28,11 @@
 
 	<!-- Configuration of repositories -->
 	<repositories>
+		<repository>
+			<id>spigot-repo</id>
+			<url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
+		</repository>
+
 		<repository>
 			<id>jitpack.io</id>
 			<url>https://jitpack.io</url>
@@ -70,5 +75,20 @@
 			<artifactId>froxygame</artifactId>
 			<version>0.0.1</version>
 		</dependency>
+    
+		<!-- API -->
+		<dependency>
+			<groupId>com.github.froxynetwork</groupId>
+			<artifactId>froxyapi</artifactId>
+			<version>0.0.1</version>
+		</dependency>
+
+		<!--Spigot API -->
+		<dependency>
+			<groupId>org.spigotmc</groupId>
+			<artifactId>spigot-api</artifactId>
+			<version>1.12.2-R0.1-SNAPSHOT</version>
+			<scope>provided</scope>
+		</dependency>
 	</dependencies>
 </project>

src/main/java/com/froxynetwork/froxycore/FroxyCore.java

@@ -1,6 +1,13 @@
 package com.froxynetwork.froxycore;
 
-import com.froxynetwork.froxynetwork.network.NetworkManager;
+import java.io.File;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.froxynetwork.froxyapi.Froxy;
+import com.froxynetwork.froxycore.api.APIImpl;
+import com.froxynetwork.froxycore.api.language.LanguageManagerImpl;
 
 /**
  * MIT License
@@ -28,10 +35,29 @@
  * @author 0ddlyoko
  */
 public class FroxyCore {
-	public static void main(String[] args) {
-		String clientId = "WEBSOCKET_045cfff18fe0ab8393178e7b7826f227";
-		String clientSecret = "SECRET_ecfdc21a8d5022e2db64b1315b087aaf";
-		NetworkManager nm = new NetworkManager("http://localhost/", clientId, clientSecret);
+
+	private Logger log = LoggerFactory.getLogger(getClass());
+
+	/**
+	 * TEST
+	 */
+	public FroxyCore() {
+//		String clientId = "WEBSOCKET_045cfff18fe0ab8393178e7b7826f227";
+//		String clientSecret = "SECRET_ecfdc21a8d5022e2db64b1315b087aaf";
+//		NetworkManager nm = new NetworkManager("http://localhost/", clientId, clientSecret);
+
+		APIImpl impl = new APIImpl(null, null, "0.0.3", log, new LanguageManagerImpl());
+		Froxy.setAPI(impl);
+		File lang = new File(getClass().getClassLoader().getResource("lang").getFile());
+		Froxy.register(lang);
+		// Show "0.0.3"
+		System.out.println(Froxy.getVersion());
+		// Show "english"
+		System.out.println(Froxy.$("test.test"));
 		// TODO
 	}
+
+	public static void main(String[] args) {
+		new FroxyCore();
+	}
 }

src/main/java/com/froxynetwork/froxycore/api/APIImpl.java

@@ -0,0 +1,60 @@
+/**
+ * Copyright (c) Smals
+ */
+package com.froxynetwork.froxycore.api;
+
+import org.bukkit.plugin.java.JavaPlugin;
+import org.slf4j.Logger;
+
+import com.froxynetwork.froxyapi.API;
+import com.froxynetwork.froxyapi.language.LanguageManager;
+
+/**
+ * @author Nathan Giacomello (nagi)
+ *
+ */
+public class APIImpl implements API {
+
+	private JavaPlugin corePlugin;
+
+	private JavaPlugin gamePlugin;
+
+	private String version;
+
+	private Logger logger;
+
+	private LanguageManager languageManager;
+
+	public APIImpl(JavaPlugin corePlugin, JavaPlugin gamePlugin, String version, Logger logger, LanguageManager languageManager) {
+		this.corePlugin = corePlugin;
+		this.gamePlugin = gamePlugin;
+		this.version = version;
+		this.logger = logger;
+		this.languageManager = languageManager;
+	}
+
+	@Override
+	public JavaPlugin getCorePlugin() {
+		return corePlugin;
+	}
+
+	@Override
+	public JavaPlugin getGamePlugin() {
+		return gamePlugin;
+	}
+
+	@Override
+	public String getVersion() {
+		return version;
+	}
+
+	@Override
+	public Logger getLogger() {
+		return logger;
+	}
+
+	@Override
+	public LanguageManager getLanguageManager() {
+		return languageManager;
+	}
+}

src/main/java/com/froxynetwork/froxycore/api/language/LanguageManagerImpl.java

@@ -0,0 +1,64 @@
+package com.froxynetwork.froxycore.api.language;
+
+import java.io.File;
+
+import com.froxynetwork.froxyapi.language.LanguageManager;
+import com.froxynetwork.froxyapi.language.Languages;
+
+/**
+ * MIT License
+ *
+ * Copyright (c) 2019 FroxyNetwork
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ * 
+ * @author 0ddlyoko
+ */
+/**
+ */
+public class LanguageManagerImpl implements LanguageManager {
+
+	@Override
+	public Languages getDefaultLanguage() {
+		return langGameToApi(com.froxynetwork.froxygame.languages.LanguageManager.DEFAULT);
+	}
+
+	@Override
+	public void register(File path) {
+		com.froxynetwork.froxygame.languages.LanguageManager.register(path);
+	}
+
+	@Override
+	public String $(String id, Languages lang, String... params) {
+		return com.froxynetwork.froxygame.languages.LanguageManager.$(id, langApiToGame(lang), params);
+	}
+
+	@Override
+	public String $_(String id, Languages lang, String... params) {
+		return com.froxynetwork.froxygame.languages.LanguageManager.$_(id, langApiToGame(lang), params);
+	}
+
+	private com.froxynetwork.froxygame.languages.Languages langApiToGame(Languages lang) {
+		return com.froxynetwork.froxygame.languages.Languages.fromLang(lang.getLang());
+	}
+
+	private Languages langGameToApi(com.froxynetwork.froxygame.languages.Languages lang) {
+		return Languages.fromLang(lang.getLang());
+	}
+}

src/main/resources/lang/en_US.lang

@@ -0,0 +1,3 @@
+test.test : english
+test.test3 : englishy
+test.test4 : Test {}, Hi {}

src/main/resources/lang/fr_FR.lang

@@ -0,0 +1,3 @@
+test.test : french
+test.test2 : frenchy
+test.test4 : Test {}, Salut {}