Skip to content
This repository was archived by the owner on Oct 12, 2025. It is now read-only.

Commit 191c0ce

Browse files
gab4000gab4000
committed
Merge remote-tracking branch 'origin/main'
2 parents 6ace335 + 97e0e51 commit 191c0ce

File tree

24 files changed

+464
-373
lines changed

24 files changed

+464
-373
lines changed

‎.gitignore‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,6 @@ gradle-app.setting
138138
### Project ###
139139

140140
/builds/
141-
142141
bin/
143-
144-
/server/
142+
/server/
143+
!.idea/icon.png

‎.idea/icon.png‎

12.5 KB
Loading

‎src/main/java/fr/communaywen/core/AywenCraftPlugin.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -268,6 +268,7 @@ public void onEnable() {
268268
this.handler.getAutoCompleter().registerSuggestion("featureName", SuggestionProvider.of(managers.getWikiConfig().getKeys(false)));
269269
this.handler.getAutoCompleter().registerSuggestion("lbEventsId", SuggestionProvider.of(managers.getLuckyBlockManager().getLuckyBlocksIds()));
270270
this.handler.getAutoCompleter().registerSuggestion("colorContest", SuggestionProvider.of(managers.getContestManager().getColorContestList()));
271+
this.handler.getAutoCompleter().registerSuggestion("trade", SuggestionProvider.of(managers.getContestManager().getRessListFromConfig()));
271272
this.handler.getAutoCompleter().registerSuggestion("listLeaderboard", SuggestionProvider.of(managers.getLeaderboardManager().getLbList()));
272273
this.handler.getAutoCompleter().registerSuggestion("homeWorldsAdd", (args, sender, command) -> {
273274

‎src/main/java/fr/communaywen/core/Managers.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,7 @@ public void init(AywenCraftPlugin plugin) {
124124
}
125125
// Database
126126

127+
economyManager = new EconomyManager();
127128
jumpManager = new JumpManager(plugin);
128129
headManager = new HeadManager(plugin);
129130
leaderboardManager = new LeaderboardManager(plugin);
@@ -137,7 +138,6 @@ public void init(AywenCraftPlugin plugin) {
137138
dreamdimManager = new DimensionManager(plugin);
138139
homeManager = new HomeManager(plugin);
139140
quizManager = new QuizManager(plugin, quizzesConfig, contestManager);
140-
economyManager = new EconomyManager();
141141
friendsManager = new FriendsManager(databaseManager, plugin);
142142
corpseManager = new CorpseManager();
143143
fbeManager = new FallingBlocksExplosionManager();
@@ -169,6 +169,7 @@ public void init(AywenCraftPlugin plugin) {
169169
public void cleanup() {
170170
/* Besoin de la db */
171171
reportManager.saveReports();
172+
homesManagers.saveHomesLimits();
172173
DreamTabManager.close();
173174

174175
/* Plus besoin de la db */

‎src/main/java/fr/communaywen/core/QuizManager.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -102,11 +102,11 @@ public void onPlayerChat(AsyncPlayerChatEvent event) {
102102
"§8§m §r"
103103
);
104104

105-
106-
contestManager.addPointPlayer(points + contestManager.getPlayerPoints(event.getPlayer()).join(), event.getPlayer());
107-
String playerCamp = "points" + contestCache.getPlayerCampsCache(event.getPlayer());
108-
contestManager.updateColumnInt("contest", playerCamp, points + contestManager.getInt("contest", playerCamp).join());
109-
105+
Bukkit.getScheduler().runTaskAsynchronously(plugin, () -> {
106+
contestManager.addPointPlayer(points + contestManager.getPlayerPoints(event.getPlayer()), event.getPlayer());
107+
String playerCamp = "points" + contestCache.getPlayerCampsCache(event.getPlayer());
108+
contestManager.updateColumnInt("contest", playerCamp, points + contestManager.getInt("contest", playerCamp));
109+
});
110110
} else {
111111
Bukkit.broadcastMessage(
112112
"§8§m §r\n" +

‎src/main/java/fr/communaywen/core/commands/contest/ContestCommand.java‎

Lines changed: 30 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,9 @@
1717

1818
import java.time.DayOfWeek;
1919
import java.time.format.DateTimeFormatter;
20+
import java.util.List;
2021
import java.util.Locale;
22+
import java.util.Map;
2123

2224
@Feature("Contest")
2325
@Credit("iambibi_")
@@ -95,11 +97,38 @@ public void setcontest(Player player, String camp1, @Named("colorContest") Strin
9597
}
9698
}
9799

100+
@Subcommand("settrade")
101+
@Description("Permet de définir un Trade")
102+
@CommandPermission("ayw.command.contest.settrade")
103+
@AutoComplete("@trade")
104+
public void settrade(Player player, @Named("trade") String trade, int amount, int amount_shell) {
105+
FileConfiguration config = plugin.getConfig();
106+
List<Map<?, ?>> trades = config.getMapList("contest.contestTrades");
107+
108+
boolean tradeFound = false;
109+
110+
for (Map<?, ?> tradeEntry : trades) {
111+
if (tradeEntry.get("ress").equals(trade)) {
112+
((Map<String, Object>) tradeEntry).put("amount", amount);
113+
((Map<String, Object>) tradeEntry).put("amount_shell", amount_shell);
114+
tradeFound = true;
115+
break;
116+
}
117+
}
118+
119+
if (tradeFound) {
120+
plugin.saveConfig();
121+
MessageManager.sendMessageType(player, "Le trade de " + trade + " a été mis à jour avec " + amount + " pour " + amount_shell + " coquillages de contest.", Prefix.STAFF, MessageType.SUCCESS, true);
122+
} else {
123+
MessageManager.sendMessageType(player, "Le trade n'existe pas.\n/contest settrade <mat> <amount> <amount_shell>", Prefix.STAFF, MessageType.ERROR, true);
124+
}
125+
}
126+
98127
@Subcommand("addpoints")
99128
@Description("Permet d'ajouter des points a un membre")
100129
@CommandPermission("ayw.command.contest.addpoints")
101130
public void addpoints(Player player, Player target, Integer points) {
102-
contestManager.addPointPlayer(points + contestManager.getPlayerPoints(target).join(), target);
131+
contestManager.addPointPlayer(points + contestManager.getPlayerPoints(target), target);
103132

104133
MessageManager.sendMessageType(player, "§aVous avez ajouté " + points + " §apoint(s) à " + target.getName(), Prefix.STAFF, MessageType.SUCCESS, true);
105134
}

‎src/main/java/fr/communaywen/core/commands/spawn/jump/JumpCommand.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public void end(Player player) {
3838
if (jumpManager.isJumping(player)) {
3939
jumpManager.endJump(player);
4040

41-
Location spawn_jump = new Location(player.getServer().getWorld(plugin.getConfig().getString("jump.world")), plugin.getConfig().getDouble("jump.start.posX") - 2, plugin.getConfig().getDouble("jump.start.posY"), plugin.getConfig().getDouble("jump.start.posZ") - 2, 0, 0);
41+
Location spawn_jump = new Location(player.getServer().getWorld(plugin.getConfig().getString("jump.world")), plugin.getConfig().getDouble("jump.start.posX") + 2, plugin.getConfig().getDouble("jump.start.posY"), plugin.getConfig().getDouble("jump.start.posZ") - 2, 0, 0);
4242
player.teleport(spawn_jump);
4343

4444
MessageManager.sendMessageType(player, "§7Vous avez §carreter votre jump", Prefix.JUMP, MessageType.SUCCESS, true);

‎src/main/java/fr/communaywen/core/commands/spawn/leaderboard/LeaderboardCommand.java‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,4 +77,14 @@ public void movestart(Player player, @Named("listLeaderboard") String lb) throws
7777
MessageManager.sendMessageType(player, "§cVous devez mettre un nom de leaderboard valable", Prefix.STAFF, MessageType.ERROR, true);
7878
}
7979
}
80+
@Subcommand("updateall")
81+
@Description("Met a jour les leaderboard")
82+
@CommandPermission("ayw.command.leaderboard.updateall")
83+
public void update(Player player) throws IOException {
84+
LeaderboardManager.updateLeaderboardBalTop();
85+
LeaderboardManager.updateLeaderboardTeamTop();
86+
LeaderboardManager.updateLeaderboardContribution();
87+
LeaderboardManager.updateLeaderboardPlayTime();
88+
jumpManager.updateLeaderboardLeaderboardRecord();
89+
}
8090
}

‎src/main/java/fr/communaywen/core/contest/cache/ContestCache.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ public void initPlayerDataCache(Player player) {
148148
if (result.next()) {
149149
int points = result.getInt("point_dep");
150150
int camp = result.getInt("camps");
151-
String color = ContestManager.getString("contest","color" + camp).join();
151+
String color = ContestManager.getString("contest","color" + camp);
152152
ChatColor campColor = ChatColor.valueOf(color);
153153

154154
Bukkit.getScheduler().runTask(plugin, () -> {

‎src/main/java/fr/communaywen/core/contest/managers/ContestManager.java‎

Lines changed: 32 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -252,8 +252,8 @@ public void initPhase3(JavaPlugin plugin, FileConfiguration eventConfig) {
252252
int totalvote = vote1 + vote2;
253253
int vote1Taux = (int) (((double) vote1 / totalvote) * 100);
254254
int vote2Taux = (int) (((double) vote2 / totalvote) * 100);
255-
int points1 = getInt("contest", "points1").join();
256-
int points2 = getInt("contest", "points2").join();
255+
int points1 = getInt("contest", "points1");
256+
int points2 = getInt("contest", "points2");
257257

258258
int multiplicateurPoint = Math.abs(vote1Taux - vote2Taux)/16;
259259
multiplicateurPoint=Integer.valueOf(df.format(multiplicateurPoint));
@@ -464,8 +464,7 @@ public void initPhase3(JavaPlugin plugin, FileConfiguration eventConfig) {
464464
System.out.println("[CONTEST] Fermeture du Contest");
465465
}
466466

467-
public static CompletableFuture<String> getString(String table, String column) {
468-
return CompletableFuture.supplyAsync(() -> {
467+
public static String getString(String table, String column) {
469468
try {
470469
PreparedStatement statement = connection.prepareStatement("SELECT * FROM " + table);
471470
ResultSet rs = statement.executeQuery();
@@ -476,11 +475,9 @@ public static CompletableFuture<String> getString(String table, String column) {
476475
throw new RuntimeException(e);
477476
}
478477
return null;
479-
});
480478
}
481479

482-
public static CompletableFuture<Integer> getInt(String table, String column) {
483-
return CompletableFuture.supplyAsync(() -> {
480+
public static Integer getInt(String table, String column) {
484481
try {
485482
PreparedStatement statement = connection.prepareStatement("SELECT * FROM "+table);
486483
ResultSet rs = statement.executeQuery();
@@ -491,7 +488,6 @@ public static CompletableFuture<Integer> getInt(String table, String column) {
491488
throw new RuntimeException(e);
492489
}
493490
return -1;
494-
});
495491
}
496492

497493
public static String getTimeUntilNextMonday() {
@@ -508,8 +504,7 @@ public static String getTimeUntilNextMonday() {
508504
return String.format("%dd %dh %dm", days, hours, minutes);
509505
}
510506

511-
public CompletableFuture<Integer> getPlayerPoints(Player player) {
512-
return CompletableFuture.supplyAsync(() -> {
507+
public Integer getPlayerPoints(Player player) {
513508
UUID playerUUID = player.getUniqueId();
514509

515510
String sql = "SELECT * FROM camps WHERE minecraft_uuid = ?";
@@ -523,7 +518,6 @@ public CompletableFuture<Integer> getPlayerPoints(Player player) {
523518
throw new RuntimeException(e);
524519
}
525520
return -1;
526-
});
527521
}
528522

529523

@@ -564,17 +558,17 @@ public void updateColumnBooleanFromRandomTrades(Boolean bool, String ress) {
564558
}
565559

566560
public void insertChoicePlayer(Player player, Integer camp) {
567-
568-
String sql = "INSERT INTO camps (minecraft_uuid, name, camps, point_dep) VALUES (?, ?, ?, 0)";
569-
try (PreparedStatement states = connection.prepareStatement(sql)) {
570-
states.setString(1, player.getUniqueId().toString());
571-
states.setString(2, player.getName());
572-
states.setInt(3, camp);
573-
states.addBatch();
574-
states.executeBatch();
575-
} catch (SQLException e) {
576-
throw new RuntimeException(e);
577-
}
561+
Bukkit.getScheduler().runTaskAsynchronously(plugins, () -> {
562+
String sql = "INSERT INTO camps (minecraft_uuid, name, camps, point_dep) VALUES (?, ?, ?, 0)";
563+
try (PreparedStatement states = connection.prepareStatement(sql)) {
564+
states.setString(1, player.getUniqueId().toString());
565+
states.setString(2, player.getName());
566+
states.setInt(3, camp);
567+
states.executeUpdate();
568+
} catch (SQLException e) {
569+
throw new RuntimeException(e);
570+
}
571+
});
578572
}
579573

580574
public DayOfWeek getCurrentDayOfWeek() {
@@ -616,7 +610,7 @@ public ResultSet getAllPlayer() {
616610

617611
public String getPlayerCampName(Player player) {
618612
Integer campInteger = contestCache.getPlayerCampsCache(player);
619-
String campName = getString("contest","camp" + campInteger).join();
613+
String campName = getString("contest","camp" + campInteger);
620614
return campName;
621615
}
622616
public Integer getOfflinePlayerCamp(OfflinePlayer player) {
@@ -635,12 +629,12 @@ public Integer getOfflinePlayerCamp(OfflinePlayer player) {
635629

636630
public String getOfflinePlayerCampName(OfflinePlayer player) {
637631
Integer campInteger = getOfflinePlayerCamp(player);
638-
String campName = getString("contest","camp" + campInteger).join();;
632+
String campName = getString("contest","camp" + campInteger);;
639633
return campName;
640634
}
641635
public ChatColor getOfflinePlayerCampChatColor(OfflinePlayer player) {
642636
Integer campInteger = getOfflinePlayerCamp(player);
643-
String color = getString("contest","color" + campInteger).join();;
637+
String color = getString("contest","color" + campInteger);;
644638
ChatColor campColor = ChatColor.valueOf(color);
645639
return campColor;
646640
}
@@ -907,6 +901,19 @@ public double getMultiLuckyFromRang(int rang) {
907901

908902
//END CONTEST METHODE
909903

904+
public List<String> getRessListFromConfig() {
905+
FileConfiguration config = plugins.getConfig();
906+
List<Map<?, ?>> trades = config.getMapList("contest.contestTrades");
907+
List<String> ressList = new ArrayList<>();
908+
909+
for (Map<?, ?> tradeEntry : trades) {
910+
if (tradeEntry.containsKey("ress")) {
911+
ressList.add(tradeEntry.get("ress").toString());
912+
}
913+
}
914+
return ressList;
915+
}
916+
910917
private void updateSelected(String camp) {
911918
List<Map<?, ?>> contestList = config.getMapList("contest.contestList");
912919
List<Map<String, Object>> updatedContestList = new ArrayList<>();

0 commit comments

Comments
 (0)