Skip to content

Commit 190eb2c

Browse files
committed
small refactoring
1 parent f5e0110 commit 190eb2c

File tree

7 files changed

+17
-31
lines changed

7 files changed

+17
-31
lines changed

src/main/java/altherneum/fr/commands/api/test.java

Lines changed: 6 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,10 @@
11
package altherneum.fr.commands.api;
22

3-
import org.bukkit.Bukkit;
4-
import org.bukkit.Material;
5-
import org.bukkit.NamespacedKey;
6-
import org.bukkit.World;
7-
import org.bukkit.WorldType;
8-
import org.bukkit.block.Block;
93
import org.bukkit.command.Command;
104
import org.bukkit.command.CommandExecutor;
115
import org.bukkit.command.CommandSender;
126
import org.bukkit.command.TabCompleter;
13-
import org.bukkit.configuration.file.FileConfiguration;
14-
import org.bukkit.configuration.file.YamlConfiguration;
15-
import org.bukkit.enchantments.Enchantment;
16-
import org.bukkit.entity.Player;
17-
import org.bukkit.plugin.Plugin;
18-
import org.bukkit.plugin.java.JavaPlugin;
19-
import org.bukkit.scheduler.BukkitRunnable;
20-
import org.bukkit.scheduler.BukkitTask;
217

22-
import altherneum.fr.enchantements.instantmine;
23-
import altherneum.fr.main.main;
24-
import altherneum.fr.system.getDataStorage;
25-
import altherneum.fr.world.api.structure;
26-
import altherneum.fr.world.api.worldManager;
27-
28-
import java.io.File;
298
import java.util.ArrayList;
309
import java.util.List;
3110

@@ -34,14 +13,18 @@ public class test implements CommandExecutor, TabCompleter {
3413
public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
3514
try {
3615
if (isAdmin.isAdmin(sender)) {
16+
/*
17+
3718
Player player = (Player) sender;
3819
Plugin plugin = JavaPlugin.getPlugin(main.class);
39-
/* instantmine instantmine = new instantmine("instantmine");
20+
instantmine instantmine = new instantmine("instantmine");
4021
player.getItemInHand().addUnsafeEnchantment(instantmine, 0);
4122
player.sendMessage("OK");
4223
for (Enchantment enchant : player.getItemInHand().getEnchantments().keySet()) {
4324
player.sendMessage("enchant : " + enchant.getName());
44-
} */
25+
}
26+
27+
*/
4528
}
4629
return true;
4730
} catch (Exception e) {

src/main/java/altherneum/fr/discord/eventsDiscord.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public static void ChatLinker() {
3939

4040
public static TextComponent TextPlayerHover(MessageAuthor messageAuthor, Server server) throws IOException, ParseException {
4141
TextComponent PlayerComponent = new TextComponent();
42-
PlayerComponent.setText("[ §r §6" + messageAuthor.getDisplayName() + " §r]");
42+
PlayerComponent.setText("[ §r §6" + messageAuthor.displayName() + " §r]");
4343
String hover = "";
4444
hover = hover.concat("\n");
4545
hover = hover.concat("§6§lUUID§r: " + messageAuthor.getIdAsString());

src/main/java/altherneum/fr/discord/eventsMinecraft.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public void onAchievement(PlayerAdvancementDoneEvent event)
2121
throws IOException, ParseException, ExecutionException, InterruptedException {
2222
String achievement = event.getAdvancement().getKey().getKey();
2323
if (!achievement.contains("recipes")) {
24-
String playerName = prefixTag.prefixTagDiscord(event.getPlayer()) + event.getPlayer().getDisplayName();
24+
String playerName = prefixTag.prefixTagDiscord(event.getPlayer()) + event.getPlayer().displayName();
2525
ArrayList<String> messages = new ArrayList<>();
2626
messages.add("```");
2727
messages.add(playerName);
@@ -34,7 +34,7 @@ public void onAchievement(PlayerAdvancementDoneEvent event)
3434
@EventHandler
3535
public void onChat(AsyncPlayerChatEvent e)
3636
throws IOException, ParseException, ExecutionException, InterruptedException {
37-
String playerName = prefixTag.prefixTagDiscord(e.getPlayer()) + e.getPlayer().getDisplayName();
37+
String playerName = prefixTag.prefixTagDiscord(e.getPlayer()) + e.getPlayer().displayName();
3838
ArrayList<String> messages = new ArrayList<>();
3939
messages.add("```");
4040
messages.add(playerName + " \uD83D\uDCAC");
@@ -46,7 +46,7 @@ public void onChat(AsyncPlayerChatEvent e)
4646
@EventHandler
4747
public void onPlayerJoin(PlayerJoinEvent e)
4848
throws IOException, ParseException, ExecutionException, InterruptedException {
49-
String playerName = prefixTag.prefixTagDiscord(e.getPlayer()) + e.getPlayer().getDisplayName();
49+
String playerName = prefixTag.prefixTagDiscord(e.getPlayer()) + e.getPlayer().displayName();
5050
ArrayList<String> messages = new ArrayList<>();
5151
messages.add("```");
5252
messages.add("✋ Connecté à " + ServerBootFile.getServerType() + ".altherneum.fr");
@@ -58,7 +58,7 @@ public void onPlayerJoin(PlayerJoinEvent e)
5858
@EventHandler
5959
public void onPlayerLeave(PlayerQuitEvent e)
6060
throws IOException, ParseException, ExecutionException, InterruptedException {
61-
String playerName = prefixTag.prefixTagDiscord(e.getPlayer()) + e.getPlayer().getDisplayName();
61+
String playerName = prefixTag.prefixTagDiscord(e.getPlayer()) + e.getPlayer().displayName();
6262
ArrayList<String> messages = new ArrayList<>();
6363
messages.add("```");
6464
messages.add("⛔ Déconnecté de " + ServerBootFile.getServerType() + ".altherneum.fr");

src/main/java/altherneum/fr/enchantements/instantmine.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package altherneum.fr.enchantements;
22

3+
/*
34
import java.util.Set;
45
56
import org.bukkit.enchantments.Enchantment;

src/main/java/altherneum/fr/menu/island/bonus/bonusPlayerFile.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,8 @@ public static void updateIslandBonus(persistentData.customKey key, World world,
101101
case bonustickspeed:
102102
world.setGameRule(GameRule.RANDOM_TICK_SPEED,
103103
3 + (getLvlIsland(offlinePlayer, persistentData.customKey.bonustickspeed) / 10));
104+
default:
105+
break;
104106
}
105107
}
106108
}

src/main/java/altherneum/fr/player/playerFirstJoin.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,13 +54,13 @@ public void onFirstJoin(PlayerJoinEvent e) throws IOException {
5454
public void welcomeMessageEverybody(Player player) throws IOException {
5555
for (Player players : Bukkit.getOnlinePlayers()) {
5656
lang.languages lang = playerLang.getPlayerLang(player);
57-
players.sendMessage(textTranslation.Welcome(lang, player.getDisplayName()));
57+
players.sendMessage(textTranslation.Welcome(lang, player.displayName()));
5858
}
5959
}
6060

6161
public void welcomeMessageToPlayer(Player player) throws IOException {
6262
lang.languages lang = playerLang.getPlayerLang(player);
63-
player.sendMessage(textTranslation.WelcomeBack(lang, player.getDisplayName()));
63+
player.sendMessage(textTranslation.WelcomeBack(lang, player.displayName()));
6464
}
6565

6666
public void setPlayerBeta(Player player) throws IOException {

src/main/java/altherneum/fr/system/Tab.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ public static String footer(long maxMemory, long usedMemory, long allocatedMemor
123123
}
124124

125125
public static void setTabName(Player player) throws IOException, ParseException {
126-
player.setPlayerListName(prefixTag.prefixTag(player) + " " + player.getDisplayName() + " " + df.format(player.getHealth()) + "");
126+
player.setPlayerListName(prefixTag.prefixTag(player) + " " + player.displayName() + " " + df.format(player.getHealth()) + "");
127127
}
128128

129129
@SuppressWarnings("deprecation")

0 commit comments

Comments
 (0)