diff --git a/.idea/artifacts/Menoria.xml b/.idea/artifacts/Menoria.xml
new file mode 100644
index 0000000..408768a
--- /dev/null
+++ b/.idea/artifacts/Menoria.xml
@@ -0,0 +1,10 @@
+
+
+ $PROJECT_DIR$/out/artifacts/Menoria
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
new file mode 100644
index 0000000..96cc43e
--- /dev/null
+++ b/.idea/compiler.xml
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
new file mode 100644
index 0000000..e7bedf3
--- /dev/null
+++ b/.idea/copyright/profiles_settings.xml
@@ -0,0 +1,3 @@
+
+
+
\ No newline at end of file
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
new file mode 100644
index 0000000..7d1288d
--- /dev/null
+++ b/.idea/encodings.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/Jobs3_6_3Experimental.xml b/.idea/libraries/Jobs3_6_3Experimental.xml
new file mode 100644
index 0000000..9f0f7be
--- /dev/null
+++ b/.idea/libraries/Jobs3_6_3Experimental.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
new file mode 100644
index 0000000..ffee7fe
--- /dev/null
+++ b/.idea/misc.xml
@@ -0,0 +1,57 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 0000000..d6952d5
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml
new file mode 100644
index 0000000..e96534f
--- /dev/null
+++ b/.idea/uiDesigner.xml
@@ -0,0 +1,124 @@
+
+
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+
+
+
+ -
+
+
+
+
+
+ -
+
+
+
+
+
+ -
+
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+
+
+ -
+
+
+ -
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..35eb1dd
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Menoria/Menoria.iml b/Menoria/Menoria.iml
new file mode 100644
index 0000000..1188ecd
--- /dev/null
+++ b/Menoria/Menoria.iml
@@ -0,0 +1,34 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Menoria/config.yml b/Menoria/config.yml
index c7c2f51..960f5ec 100644
--- a/Menoria/config.yml
+++ b/Menoria/config.yml
@@ -4,5 +4,6 @@ teleporteurs:
x: 0
y: 0
z: 0
+ command: bs
list:
- default
\ No newline at end of file
diff --git a/Menoria/src/net/DeltaWings/Nemoria/API/Files.java b/Menoria/src/net/DeltaWings/Nemoria/API/Files.java
index 84fe84f..205cf0e 100644
--- a/Menoria/src/net/DeltaWings/Nemoria/API/Files.java
+++ b/Menoria/src/net/DeltaWings/Nemoria/API/Files.java
@@ -6,16 +6,14 @@ import net.DeltaWings.Nemoria.Main;
public class Files {
+ private static Main main = Main.getInstance();
public static FileConfiguration getConfig(){
- return Main.getInstance().getConfig();
+ return main.getConfig();
}
-
- public static void saveFiles(){
- Main.getInstance().saveConfig();
- }
-
- public void yolo(){
-
+
+ public static void saveConfig() {
+ main.saveConfig();
}
+
}
\ No newline at end of file
diff --git a/Menoria/src/net/DeltaWings/Nemoria/Commands/DelTP.java b/Menoria/src/net/DeltaWings/Nemoria/Commands/DelTP.java
index fcbd7ab..6d34d9b 100644
--- a/Menoria/src/net/DeltaWings/Nemoria/Commands/DelTP.java
+++ b/Menoria/src/net/DeltaWings/Nemoria/Commands/DelTP.java
@@ -29,12 +29,13 @@ public class DelTP implements CommandExecutor {
Files.getConfig().set("teleporteurs."+args[0]+".x", "");
Files.getConfig().set("teleporteurs."+args[0]+".y", "");
Files.getConfig().set("teleporteurs."+args[0]+".z", "");
+ Files.getConfig().set("teleporteurs."+args[0]+".command", "");
Files.getConfig().set("teleporteurs."+args[0], "");
p.sendMessage("teleporteur detruis !");
}
}
}
- Main.getInstance().saveConfig();
+ Files.saveConfig();
return false;
}
diff --git a/Menoria/src/net/DeltaWings/Nemoria/Commands/SetTP.java b/Menoria/src/net/DeltaWings/Nemoria/Commands/SetTP.java
index ed8eac0..59f6b8f 100644
--- a/Menoria/src/net/DeltaWings/Nemoria/Commands/SetTP.java
+++ b/Menoria/src/net/DeltaWings/Nemoria/Commands/SetTP.java
@@ -1,36 +1,37 @@
-package net.DeltaWings.Nemoria.Commands;
-
-import java.util.List;
-
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-import net.DeltaWings.Nemoria.Main;
-import net.DeltaWings.Nemoria.API.Files;
-
-public class SetTP implements CommandExecutor {
-
- @Override
- public boolean onCommand(CommandSender sender, Command cmd, String label, String[] args) {
- if(sender instanceof Player){
- Player p = (Player)sender;
- if(p.hasPermission("menoria.cmd.settp")){
- if(args.length==1){
- List list = Files.getConfig().getStringList("list");
- list.add(args[0]);
- Files.getConfig().set("list", list);
- Files.getConfig().set("teleporteurs."+args[0]+".world", p.getLocation().getWorld().getName());
- Files.getConfig().set("teleporteurs."+args[0]+".x", p.getLocation().getBlockX());
- Files.getConfig().set("teleporteurs."+args[0]+".y", p.getLocation().getBlockY());
- Files.getConfig().set("teleporteurs."+args[0]+".z", p.getLocation().getBlockZ());
- p.sendMessage("Teleporteur crée");
- }
- }
- }
- Main.getInstance().saveConfig();
- return false;
- }
-
-}
+package net.DeltaWings.Nemoria.Commands;
+
+import java.util.List;
+
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import net.DeltaWings.Nemoria.Main;
+import net.DeltaWings.Nemoria.API.Files;
+
+public class SetTP implements CommandExecutor {
+
+ @Override
+ public boolean onCommand(CommandSender sender, Command cmd, String label, String[] args) {
+ if(sender instanceof Player){
+ Player p = (Player)sender;
+ if(p.hasPermission("menoria.cmd.settp")){
+ if(args.length==1){
+ List list = Files.getConfig().getStringList("list");
+ list.add(args[0]);
+ Files.getConfig().set("list", list);
+ Files.getConfig().set("teleporteurs."+args[0]+".world", p.getLocation().getWorld().getName());
+ Files.getConfig().set("teleporteurs."+args[0]+".x", p.getLocation().getBlockX());
+ Files.getConfig().set("teleporteurs."+args[0]+".y", p.getLocation().getBlockY());
+ Files.getConfig().set("teleporteurs."+args[0]+".z", p.getLocation().getBlockZ());
+ Files.getConfig().set("teleporteurs."+args[0]+".command", "bs");
+ p.sendMessage("§bMenoria §> §cTeleporteur crée");
+ }
+ }
+ }
+ Files.saveConfig();
+ return false;
+ }
+
+}
diff --git a/Menoria/src/net/DeltaWings/Nemoria/Listeners/ChatListener.java b/Menoria/src/net/DeltaWings/Nemoria/Listeners/ChatListener.java
index 175b67e..d453532 100644
--- a/Menoria/src/net/DeltaWings/Nemoria/Listeners/ChatListener.java
+++ b/Menoria/src/net/DeltaWings/Nemoria/Listeners/ChatListener.java
@@ -14,7 +14,8 @@ import net.minecraft.server.v1_10_R1.PacketPlayOutChat;
public class ChatListener implements Listener {
- @EventHandler(priority=EventPriority.HIGHEST)
+ //reste chat
+ /**@EventHandler(priority=EventPriority.HIGHEST)
public void onPlayerChat(AsyncPlayerChatEvent e){
String msg = MinecraftToJSON.main(e.getMessage(), e.getPlayer());
e.setCancelled(true);
@@ -22,5 +23,5 @@ public class ChatListener implements Listener {
PacketPlayOutChat packet = new PacketPlayOutChat(link);
((CraftPlayer) e.getPlayer()).getHandle().playerConnection.sendPacket(packet);
System.out.println(e.getPlayer().getName()+" > "+e.getMessage());
- }
+ }**/
}
\ No newline at end of file
diff --git a/Menoria/src/net/DeltaWings/Nemoria/Listeners/PlayerPositionListener.java b/Menoria/src/net/DeltaWings/Nemoria/Listeners/PlayerPositionListener.java
index edc77de..64af65d 100644
--- a/Menoria/src/net/DeltaWings/Nemoria/Listeners/PlayerPositionListener.java
+++ b/Menoria/src/net/DeltaWings/Nemoria/Listeners/PlayerPositionListener.java
@@ -1,76 +1,79 @@
-package net.DeltaWings.Nemoria.Listeners;
-
-import org.bukkit.Bukkit;
-import org.bukkit.entity.Player;
-import org.bukkit.scheduler.BukkitRunnable;
-
-import net.DeltaWings.Nemoria.Main;
-import net.DeltaWings.Nemoria.API.Files;
-
-public class PlayerPositionListener extends BukkitRunnable {
- @Override
- public void run() {
- for(int a = 0; a economyProvider = getServer().getServicesManager().getRegistration(net.milkbowl.vault.economy.Economy.class);
if (economyProvider != null) {
@@ -54,7 +53,7 @@ public class Main extends JavaPlugin implements Listener{
}
return (eco != null);
- }
+ }**/
}