From 2b2683b22b4a152b4028d6f2d624d06ee34df2e9 Mon Sep 17 00:00:00 2001
From: Anthony Debucquoy <debucquoy.anthony@gmail.com>
Date: Fri, 26 Jan 2024 23:47:46 +0100
Subject: [PATCH] Discord Binding

---
 TODO.md                                            |  2 +-
 .../thevoidroad/Commands/VoidCommands.java         | 14 --------------
 .../ovh/herisson/thevoidroad/Entity/Merchand.java  |  8 +++++++-
 3 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/TODO.md b/TODO.md
index 6edd9b6..09c8ae1 100644
--- a/TODO.md
+++ b/TODO.md
@@ -4,9 +4,9 @@
 - [-] Make Discord Webhoook for item changes
 - [x] deathBan reset
 - [x] voids exchanges
+- [x] /void give négatives values
 - [ ] chest name
 - [ ] /void manage bring 
 - [ ] Dupe bug (respawn) -> Gamerule
-- [x] /void give négatives values
 - [ ] /void give afficher title
     - subtitle + chat
diff --git a/TheVoidRoad/src/main/java/ovh/herisson/thevoidroad/Commands/VoidCommands.java b/TheVoidRoad/src/main/java/ovh/herisson/thevoidroad/Commands/VoidCommands.java
index 9c82892..c81956b 100644
--- a/TheVoidRoad/src/main/java/ovh/herisson/thevoidroad/Commands/VoidCommands.java
+++ b/TheVoidRoad/src/main/java/ovh/herisson/thevoidroad/Commands/VoidCommands.java
@@ -15,7 +15,6 @@ import org.bukkit.entity.Player;
 
 import net.kyori.adventure.text.Component;
 import ovh.herisson.thevoidroad.DatabaseManager;
-import ovh.herisson.thevoidroad.DiscordWebhook;
 import ovh.herisson.thevoidroad.TheVoidRoad;
 import ovh.herisson.thevoidroad.Voids;
 import ovh.herisson.thevoidroad.Entity.Merchand;
@@ -69,19 +68,6 @@ public class VoidCommands implements CommandExecutor, TabCompleter{
 						return true;
 					case "skip":
 						//TODO(Merchand): Skip trade
-						break;
-					case "discord":
-							String link = DatabaseManager.getInstance().getConfig("discord-wh");
-							if(!link.equals("")){
-								DiscordWebhook discord = new DiscordWebhook(link);
-								discord.setContent("Item mis en vente pendant une heure: " + Merchand.current.x + " au prix de " + Merchand.current.y + TheVoidRoad.CoinGlyph);
-								try {
-									discord.execute();
-								} catch(Exception e){
-									e.printStackTrace();
-								}
-							}
-
 						break;
 					case "goto":
 						if(sender instanceof Player ply && m.getLocation() != null){
diff --git a/TheVoidRoad/src/main/java/ovh/herisson/thevoidroad/Entity/Merchand.java b/TheVoidRoad/src/main/java/ovh/herisson/thevoidroad/Entity/Merchand.java
index e267ca9..97f51f7 100644
--- a/TheVoidRoad/src/main/java/ovh/herisson/thevoidroad/Entity/Merchand.java
+++ b/TheVoidRoad/src/main/java/ovh/herisson/thevoidroad/Entity/Merchand.java
@@ -123,7 +123,13 @@ public class Merchand implements Listener{
 		String link = DatabaseManager.getInstance().getConfig("discord-wh");
 		if(!link.equals("")){
 			DiscordWebhook discord = new DiscordWebhook(link);
-			discord.setContent("Item mis en vente pendant une heure: " + current.x + " au prix de " + current.y + TheVoidRoad.CoinGlyph);
+			discord.setUsername(m.getName());
+			discord.setContent("Salut, Je vend actuellement `" + current.x + "` au prix de " + current.y + TheVoidRoad.CoinGlyph);
+			try {
+				discord.execute();
+			} catch(Exception ex){
+				ex.printStackTrace();
+			}
 		}
 		next = genTrade(e.unixhour + 1);
 		regenerate();