Merge branch 'develop'

Author: 0ddlyoko

pom.xml

@@ -88,41 +88,26 @@
 	</build>
 
 	<dependencies>
-		<!-- Logging -->
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-log4j12</artifactId>
-			<version>1.7.26</version>
-			<scope>compile</scope>
-		</dependency>
-
-		<!-- Lombok -->
-		<dependency>
-			<groupId>org.projectlombok</groupId>
-			<artifactId>lombok</artifactId>
-			<version>1.18.6</version>
-		</dependency>
 
 		<!-- Network -->
 		<dependency>
 			<groupId>com.github.froxynetwork</groupId>
 			<artifactId>froxynetwork</artifactId>
-			<version>0.1.2</version>
+			<version>0.1.3</version>
 		</dependency>
 
 		<!-- Game -->
 		<dependency>
 			<groupId>com.github.froxynetwork</groupId>
 			<artifactId>froxygame</artifactId>
-			<version>0.0.1</version>
+			<version>0.0.3</version>
 		</dependency>
 
 		<!-- API -->
 		<dependency>
 			<groupId>com.github.froxynetwork</groupId>
 			<artifactId>froxyapi</artifactId>
-			<version>0.0.2</version>
-			<scope>provided</scope>
+			<version>0.0.3</version>
 		</dependency>
 
 		<!--Spigot API -->

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

@@ -55,7 +55,8 @@ public void onEnable() {
 		Bukkit.getPluginManager().registerEvents(commandManager, this);
 		APIImpl impl = new APIImpl(null, null, Constants.VERSION, log, languageManager, commandManager);
 		Froxy.setAPI(impl);
-		File lang = new File(getClass().getClassLoader().getResource("lang").getFile());
+		// TODO EDIT HERE
+		File lang = new File("plugins" + File.separator + getDescription().getName() + File.separator + "lang");
 		Froxy.register(lang);
 		log.info("FroxyCore started !");
 	}

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

@@ -46,12 +46,12 @@ public void register(File path) {
 
 	@Override
 	public String $(String id, Languages lang, String... params) {
-		return com.froxynetwork.froxygame.languages.LanguageManager.$(id, langApiToGame(lang), params);
+		return com.froxynetwork.froxygame.languages.LanguageManager.$(id, langApiToGame(lang), params).replace("$", "§");
 	}
 
 	@Override
 	public String $_(String id, Languages lang, String... params) {
-		return com.froxynetwork.froxygame.languages.LanguageManager.$_(id, langApiToGame(lang), params);
+		return com.froxynetwork.froxygame.languages.LanguageManager.$_(id, langApiToGame(lang), params).replace("$", "§");
 	}
 
 	private com.froxynetwork.froxygame.languages.Languages langApiToGame(Languages lang) {

src/main/resources/lang/en_US.lang

@@ -1,2 +1,2 @@
-command.nopermission : §cYou don't have permission to execute this command
-command.syntaxerror : §cSyntax: {}
+command.nopermission : &cYou don't have permission to execute this command
+command.syntaxerror : &cSyntax: {}

src/main/resources/plugin.yml

@@ -0,0 +1,11 @@
+name: FroxyNetwork
+main: com.froxynetwork.froxycore.FroxyCore
+version: 0.0.3
+author: oddlyoko
+commands:
+  box:
+    description: help box
+permissions:
+  box.give:
+    default: op
+    description: Ajouter des clés à des joueurs