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

Commit a3ebd92

Browse files
NocolmNocolm
committed
fix bug + changements
1 parent ea2c972 commit a3ebd92

File tree

8 files changed

+52
-89
lines changed

8 files changed

+52
-89
lines changed

‎src/main/java/fr/communaywen/core/evenements/Data/DataTime.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ private void changeWeeklyItemType() {
5555
int itemTypeIndex = random.nextInt(WeeklyItemType.values().length);
5656

5757
currentWeeklyItemType = WeeklyItemType.values()[itemTypeIndex];
58-
//debug a retirer plus tard ou pas
58+
//A laisser au final
5959
Bukkit.getConsoleSender().sendMessage("Le WeeklyItemType a été changé en : " + currentWeeklyItemType.getItemName());
6060

6161
saveState(timeLeft);

‎src/main/java/fr/communaywen/core/evenements/EventsCommand.java‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
import fr.communaywen.core.credit.Credit;
66
import fr.communaywen.core.credit.Feature;
77
import fr.communaywen.core.evenements.menus.EventsMenus;
8+
import fr.communaywen.core.utils.constant.MessageManager;
9+
import fr.communaywen.core.utils.constant.MessageType;
10+
import fr.communaywen.core.utils.constant.Prefix;
811
import lombok.Getter;
912
import org.bukkit.Bukkit;
1013
import org.bukkit.ChatColor;
@@ -40,7 +43,7 @@ public EventsCommand(AywenCraftPlugin plugin) {
4043
@Description("active les évenements")
4144
public void StateOn(Player player){
4245
CommandState = 0;
43-
player.sendMessage(ChatColor.GREEN + "Evenement Activer");
46+
MessageManager.sendMessageType(player, ChatColor.GREEN + "Evenement Activer", Prefix.HALLOWEEN, MessageType.INFO, true);
4447
SaveState(CommandState);
4548
}
4649

@@ -49,7 +52,7 @@ public void StateOn(Player player){
4952
@Description("désactive les évenements")
5053
public void StateOff(Player player){
5154
CommandState = 1;
52-
player.sendMessage(ChatColor.GREEN + "Evenement Désactiver");
55+
MessageManager.sendMessageType(player, ChatColor.GREEN + "Evenement Désactiver", Prefix.HALLOWEEN, MessageType.INFO, true);
5356
SaveState(CommandState);
5457
}
5558

@@ -63,7 +66,7 @@ public void onCommand(Player player) {
6366

6467
} else {
6568

66-
player.sendMessage(ChatColor.RED + "Aucun évenement en cours revenez plus tard");
69+
MessageManager.sendMessageType(player, ChatColor.RED + "Aucun évenement en cours revenez plus tard", Prefix.HALLOWEEN, MessageType.ERROR, true);
6770

6871
}
6972

@@ -80,7 +83,7 @@ public void onCoammndMansion(Player player) {
8083

8184
} else {
8285

83-
player.sendMessage(ChatColor.RED + "Manoir indisponible en ce moment");
86+
MessageManager.sendMessageType(player, ChatColor.RED + "Le Manoir est indisponible pour le moment", Prefix.HALLOWEEN, MessageType.ERROR, true);
8487

8588
}
8689

‎src/main/java/fr/communaywen/core/evenements/listeners/InteractLootbox.java‎

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
import fr.communaywen.core.AywenCraftPlugin;
66
import fr.communaywen.core.evenements.LootboxCustomLoots;
77
import fr.communaywen.core.utils.Transaction;
8+
import fr.communaywen.core.utils.constant.MessageManager;
9+
import fr.communaywen.core.utils.constant.MessageType;
10+
import fr.communaywen.core.utils.constant.Prefix;
811
import fr.communaywen.core.utils.database.TransactionsManager;
912
import org.bukkit.ChatColor;
1013
import org.bukkit.Material;
@@ -36,7 +39,7 @@ private void onFurnitureInteractEvent(FurnitureInteractEvent furniture) {
3639

3740
if (player.getInventory().firstEmpty() == -1){
3841

39-
player.sendMessage(ChatColor.RED + "Votre inventaire est plein ! Veuillez libérer de l'espace pour utiliser cet objet.");
42+
MessageManager.sendMessageType(player,ChatColor.RED + "Votre inventaire est plein ! Veuillez libérer de l'espace pour utiliser la lootbox", Prefix.HALLOWEEN, MessageType.ERROR, true);
4043

4144
} else {
4245

@@ -91,7 +94,7 @@ private void onFurnitureInteractEvent(FurnitureInteractEvent furniture) {
9194
} else if (chance >=126 && chance <=150){
9295

9396
this.RewardType = 1;
94-
Items = Material.DIAMOND;
97+
Items = Material.EMERALD;
9598

9699
}else if (chance >=151 && chance <=175){
97100

@@ -130,18 +133,18 @@ private void onFurnitureInteractEvent(FurnitureInteractEvent furniture) {
130133

131134
}
132135

133-
int amount = customItems.getAmount();
134-
135136
if (RewardType == 0){
136137

138+
int amount = customItems.getAmount();
137139
ItemStack itemStack = customItems.getItemStack();
138140
player.getInventory().addItem(itemStack.asQuantity(amount));
139141
player.sendMessage(ChatColor.GREEN + "objet reçu :" + ChatColor.GREEN + itemStack.getDisplayName());
142+
MessageManager.sendMessageType(player,ChatColor.GREEN + "objet reçu :" + ChatColor.GREEN + itemStack.getDisplayName(), Prefix.HALLOWEEN, MessageType.SUCCESS, true);
140143

141144
} else if (RewardType == 1){
142145

143-
player.getInventory().addItem(ItemStack.of(Items).asQuantity(amount));
144-
player.sendMessage(ChatColor.GREEN + "objet reçu :" + Items);
146+
player.getInventory().addItem(ItemStack.of(Items));
147+
MessageManager.sendMessageType(player,ChatColor.GREEN + "objet reçu :" + Items, Prefix.HALLOWEEN, MessageType.SUCCESS, true);
145148

146149
} else if (RewardType == 2){
147150

@@ -153,21 +156,21 @@ private void onFurnitureInteractEvent(FurnitureInteractEvent furniture) {
153156
"Quest Reward"
154157
));
155158

156-
player.sendMessage(ChatColor.GREEN + " money reçu :" + Money);
159+
MessageManager.sendMessageType(player,ChatColor.GREEN + " money reçu :" + Money, Prefix.HALLOWEEN, MessageType.SUCCESS, true);
157160

158161
}
159162

160163
} else {
161164

162-
player.sendMessage(ChatColor.RED + "Vous devez tenir une clée halloween en main pour utiliser la lootbox");
165+
MessageManager.sendMessageType(player,ChatColor.RED + "Vous devez tenir une clée halloween en main pour utiliser la lootbox", Prefix.HALLOWEEN, MessageType.WARNING, true);
163166

164167
}
165168

166169
}
167170

168171
} else {
169172

170-
player.sendMessage(ChatColor.RED + "Vous devez tenir une clée halloween en main pour utiliser la lootbox");
173+
MessageManager.sendMessageType(player,ChatColor.RED + "Vous devez tenir une clée halloween en main pour utiliser la lootbox", Prefix.HALLOWEEN, MessageType.WARNING, true);
171174

172175
}
173176

‎src/main/java/fr/communaywen/core/evenements/menus/EventsBuyCandy.java‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
import dev.xernas.menulib.utils.InventorySize;
66
import dev.xernas.menulib.utils.ItemBuilder;
77
import fr.communaywen.core.evenements.CandyType;
8+
import fr.communaywen.core.utils.constant.MessageManager;
9+
import fr.communaywen.core.utils.constant.MessageType;
10+
import fr.communaywen.core.utils.constant.Prefix;
811
import lombok.Setter;
912
import me.clip.placeholderapi.PlaceholderAPI;
1013
import org.bukkit.ChatColor;
@@ -70,7 +73,7 @@ public void onInventoryClick(InventoryClickEvent event) {
7073
Player player = (Player) event.getWhoClicked();
7174
ItemStack clickedItem = event.getCurrentItem();
7275

73-
if (clickedItem != null && clickedItem.getType() == Material.PAPER && clickedItem.getItemMeta().getDisplayName().equals(ChatColor.GOLD + "buy")) {
76+
if (clickedItem != null && clickedItem.getType() == Material.PAPER && clickedItem.getItemMeta().getDisplayName().equals(ChatColor.GOLD + "buy") && player.getInventory().firstEmpty() != -1) {
7477

7578
String currencyItemName = selectedCandyType.getMoney();
7679
String currencyMoneyName = selectedCandyType.getMoneyName();
@@ -87,25 +90,30 @@ public void onInventoryClick(InventoryClickEvent event) {
8790
removeItems(player, currencyItemName, maxItemsToGive * requiredAmountPerItem);
8891
giveCustomItems(player, selectedCandyType.getItemName(), maxItemsToGive);
8992

90-
player.sendMessage(ChatColor.GREEN + "Tu as reçu " + ChatColor.GREEN + maxItemsToGive + " objets !");
93+
MessageManager.sendMessageType(player,ChatColor.GREEN + "Tu as reçu " + ChatColor.GREEN + maxItemsToGive + " objets !", Prefix.HALLOWEEN, MessageType.SUCCESS, true);
9194

9295
} else {
9396

9497
removeItems(player, currencyItemName, requiredAmountPerItem);
9598
giveCustomItems(player, selectedCandyType.getItemName(), 1);
9699

97-
player.sendMessage(ChatColor.GREEN + "Objet reçu !");
100+
MessageManager.sendMessageType(player,ChatColor.GREEN + "Objet reçu !", Prefix.HALLOWEEN, MessageType.SUCCESS, true);
98101

99102
}
100103

101104
} else {
102105

103-
player.sendMessage(ChatColor.RED + "Tu n'as pas assez de " + currencyMoneyName + " !");
106+
MessageManager.sendMessageType(player, ChatColor.RED + "Tu n'as pas assez de " + currencyMoneyName + " !", Prefix.HALLOWEEN, MessageType.ERROR, true);
104107
player.closeInventory();
105108

106109
}
107110

108111
event.setCancelled(true);
112+
113+
} else {
114+
115+
MessageManager.sendMessageType(player, ChatColor.RED + "Votre Inventaire est plein ou une erreur est survenu", Prefix.HALLOWEEN, MessageType.ERROR, true);
116+
109117
}
110118

111119
}

‎src/main/java/fr/communaywen/core/evenements/menus/EventsFloorMenu.java‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44
import dev.xernas.menulib.utils.InventorySize;
55
import dev.xernas.menulib.utils.ItemBuilder;
66
import fr.communaywen.core.evenements.EventsCommand;
7+
import fr.communaywen.core.utils.constant.MessageManager;
8+
import fr.communaywen.core.utils.constant.MessageType;
9+
import fr.communaywen.core.utils.constant.Prefix;
710
import me.clip.placeholderapi.PlaceholderAPI;
811
import org.bukkit.ChatColor;
912
import org.bukkit.Location;
@@ -102,35 +105,35 @@ public void onInventoryClick(InventoryClickEvent event) {
102105

103106
if (clickedItem.getDisplayName().equals(ChatColor.GREEN + "Etage 1 : l'entrée")){
104107

105-
player.sendMessage("tp au 1er étage");
108+
MessageManager.sendMessageType(player, "tp au 1er étage", Prefix.HALLOWEEN, MessageType.WARNING, true);
106109

107110
Location floor = new Location(player.getWorld(),26.5, 104, 6.5);
108111
player.teleport(floor);
109112

110113
} else if (clickedItem.getDisplayName().equals(ChatColor.GREEN + "Etage 2 : L'étage")){
111114

112-
player.sendMessage("tp au 2e étage");
115+
MessageManager.sendMessageType(player, "tp au 2e étage", Prefix.HALLOWEEN, MessageType.WARNING, true);
113116

114117
Location floor = new Location(player.getWorld(),30.5, 104, 200.5);
115118
player.teleport(floor);
116119

117120
} else if (clickedItem.getDisplayName().contains(ChatColor.GREEN + "Etage 3 : L'étage" )){
118121

119-
player.sendMessage("tp au 3e étage");
122+
MessageManager.sendMessageType(player, "tp au 3e étage", Prefix.HALLOWEEN, MessageType.WARNING, true);
120123

121124
Location floor = new Location(player.getWorld(),7.5, 104, 400.5);
122125
player.teleport(floor);
123126

124127
} else if (clickedItem.getDisplayName().equals(ChatColor.GREEN + "Etage 4 : L'étage de l'éffroi")){
125128

126-
player.sendMessage("tp au 4e étage");
129+
MessageManager.sendMessageType(player, "tp au 4e étage", Prefix.HALLOWEEN, MessageType.WARNING, true);
127130

128131
Location floor = new Location(player.getWorld(),7.5, 104, 600.5);
129132
player.teleport(floor);
130133

131134
} else if (clickedItem.getDisplayName().contains(ChatColor.GREEN + "Etage §kl§r" + ChatColor.GREEN + " : Le §kGrenier§r ")){
132135

133-
player.sendMessage("tp au §ke§re étage");
136+
MessageManager.sendMessageType(player, "tp au §ke§re étage", Prefix.HALLOWEEN, MessageType.WARNING, true);
134137

135138
Location floor = new Location(player.getWorld(),7.5, 104, 800.5);
136139
player.teleport(floor);

‎src/main/java/fr/communaywen/core/evenements/menus/EventsLootBoxMenu.java‎

Lines changed: 0 additions & 57 deletions
This file was deleted.

‎src/main/java/fr/communaywen/core/evenements/menus/EventsWeeklyShop.java‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
package fr.communaywen.core.evenements.menus;
22

3+
import fr.communaywen.core.utils.constant.MessageManager;
4+
import fr.communaywen.core.utils.constant.MessageType;
5+
import fr.communaywen.core.utils.constant.Prefix;
36
import org.bukkit.enchantments.Enchantment;
47
import dev.lone.itemsadder.api.CustomStack;
58
import dev.xernas.menulib.Menu;
@@ -79,12 +82,11 @@ public void onInventoryClick(InventoryClickEvent event) {
7982

8083
} else if (currencyItemType.equalsIgnoreCase("normal")){
8184

82-
GiveItems(player, ItemStack.of(Material.valueOf(Items), maxItemsToGive));
85+
giveItems(player, ItemStack.of(Material.valueOf(Items), maxItemsToGive));
8386

8487
}
8588

86-
87-
player.sendMessage(ChatColor.GREEN + "Tu as reçu " + ChatColor.GREEN + maxItemsToGive + " objets !");
89+
MessageManager.sendMessageType(player,ChatColor.GREEN + "Tu as reçu " + ChatColor.GREEN + maxItemsToGive + " objets !", Prefix.HALLOWEEN, MessageType.SUCCESS, true);
8890

8991
} else {
9092

@@ -96,7 +98,7 @@ public void onInventoryClick(InventoryClickEvent event) {
9698

9799
} else if (currencyItemType.equalsIgnoreCase("normal") || currencyItemType.equalsIgnoreCase("single")){
98100

99-
GiveItems(player, ItemStack.of(Material.valueOf(Items), 1));
101+
giveItems(player, ItemStack.of(Material.valueOf(Items), 1));
100102

101103
} else if (currencyItemType.equalsIgnoreCase("enchanted_book")){
102104

@@ -113,13 +115,13 @@ public void onInventoryClick(InventoryClickEvent event) {
113115

114116
}
115117

116-
player.sendMessage(ChatColor.GREEN + "Objet reçu !");
118+
MessageManager.sendMessageType(player,ChatColor.GREEN + "Objet reçu !", Prefix.HALLOWEEN, MessageType.SUCCESS, true);
117119

118120
}
119121

120122
} else {
121123

122-
player.sendMessage(ChatColor.RED + "Tu n'as pas assez de " + currencyMoneyName + " !");
124+
MessageManager.sendMessageType(player, ChatColor.RED + "Tu n'as pas assez de " + currencyMoneyName + " !", Prefix.HALLOWEEN, MessageType.ERROR, true);
123125
player.closeInventory();
124126

125127
}
@@ -128,7 +130,7 @@ public void onInventoryClick(InventoryClickEvent event) {
128130

129131
} else {
130132

131-
player.sendMessage(ChatColor.DARK_RED + "Inventaire plein !");
133+
MessageManager.sendMessageType(player, ChatColor.RED + "Votre Inventaire est plein", Prefix.HALLOWEEN, MessageType.ERROR, true);
132134

133135
}
134136

@@ -226,7 +228,7 @@ private void giveCustomItems(Player player, String itemName, int amount) {
226228

227229
}
228230

229-
private void GiveItems(Player player, ItemStack item){
231+
private void giveItems(Player player, ItemStack item){
230232

231233
int maxStackSize = 64;
232234
int amountToAdd = item.getAmount();
@@ -245,7 +247,7 @@ private void GiveItems(Player player, ItemStack item){
245247

246248
} else {
247249

248-
player.sendMessage("Votre inventaire est plein !");
250+
MessageManager.sendMessageType(player, ChatColor.RED + "Votre Inventaire est plein", Prefix.HALLOWEEN, MessageType.ERROR, true);
249251
break;
250252

251253
}

‎src/main/java/fr/communaywen/core/utils/constant/Prefix.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ public enum Prefix {
2828
JUMP("§x§0§0§7§D§0§AJ§x§0§0§7§D§0§Au§x§2§C§A§3§0§0m§x§2§C§A§3§0§0p"),
2929
STAFF("§x§8§0§1§4§1§4S§x§F§F§0§0§2§3t§x§F§F§0§0§2§3a§x§F§F§0§0§2§3f§x§F§F§0§0§2§3f"),
3030
TPA("§x§0§8§6§5§0§0T§x§0§5§7§0§0§7P§x§0§2§7§B§0§DA"),
31+
HALLOWEEN("§x§F§B§A§4§0§8H§x§F§C§9§9§1§0A§x§F§C§8§E§1§9l§x§F§D§8§2§2§1l§x§F§D§7§7§2§9o§x§F§E§6§C§3§1w§x§F§E§6§1§3§Ae§x§F§F§5§5§4§2e§x§F§F§4§A§4§An"),
3132

3233
// Lucky Block's prefixes
3334
LUCKYBLOCK("§x§F§C§4§5§8§2L§x§F§C§5§C§9§2u§x§F§D§7§4§A§1c§x§F§D§8§B§B§1k§x§F§E§A§2§C§1y§x§F§E§B§9§D§0B§x§F§E§D§1§E§0l§x§F§F§E§8§E§Fo§x§F§F§F§F§F§Fc§x§F§F§F§F§F§Fk"),

0 commit comments

Comments
 (0)