From 3d4266f80c9b0e2203fb1f3281c062d3c7c1fa94 Mon Sep 17 00:00:00 2001
From: Zrips <Zripas@gmail.com>
Date: Fri, 26 Nov 2021 14:02:57 +0200
Subject: [PATCH] Better blockinfo command with click suggestion option

---
 .../jobs/commands/list/blockinfo.java         | 37 +++++++++++++------
 .../jobs/config/LanguageManager.java          |  7 ++--
 2 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/src/main/java/com/gamingmesh/jobs/commands/list/blockinfo.java b/src/main/java/com/gamingmesh/jobs/commands/list/blockinfo.java
index 121c4a01..6037c1ba 100644
--- a/src/main/java/com/gamingmesh/jobs/commands/list/blockinfo.java
+++ b/src/main/java/com/gamingmesh/jobs/commands/list/blockinfo.java
@@ -9,6 +9,7 @@ import com.gamingmesh.jobs.commands.Cmd;
 import com.gamingmesh.jobs.stuff.Util;
 
 import net.Zrips.CMILib.Items.CMIMaterial;
+import net.Zrips.CMILib.RawMessages.RawMessage;
 import net.Zrips.CMILib.Version.Version;
 
 public class blockinfo implements Cmd {
@@ -27,24 +28,36 @@ public class blockinfo implements Cmd {
 	}
 
 	Block block = Util.getTargetBlock((Player) sender, 15);
-	if (block == null || CMIMaterial.isAir(block.getType()))
+	CMIMaterial cmat = CMIMaterial.get(block);
+
+	if (block == null || cmat.isAir())
 	    return true;
 
-	byte blockData = CMIMaterial.getBlockData(block);
+	short blockData = CMIMaterial.getBlockData(block);
 	String dataString = blockData == 0 ? "" : "-" + blockData;
 
-	sender.sendMessage(Jobs.getLanguage().getMessage("general.info.separator"));
-	sender.sendMessage(Jobs.getLanguage().getMessage("command.blockinfo.output.name", "%blockname%", block.getType().name()));
-	if (Version.isCurrentEqualOrLower(Version.v1_13_R2))
-	    sender.sendMessage(Jobs.getLanguage().getMessage("command.blockinfo.output.id", "%blockid%", block.getType().getId()));
-	sender.sendMessage(Jobs.getLanguage().getMessage("command.blockinfo.output.data", "%blockdata%", blockData));
+	RawMessage rm = new RawMessage();
+
+	rm.addText(Jobs.getLanguage().getMessage("general.info.separator") + "\n");
+	rm.addText(Jobs.getLanguage().getMessage("command.blockinfo.output.material", "%blockname%", block.getType().name()) + "\n");
+	rm.addSuggestion(block.getType().name());
+
+	if (Version.isCurrentEqualOrLower(Version.v1_13_R2)) {
+	    rm.addText(Jobs.getLanguage().getMessage("command.blockinfo.output.id", "%blockid%", block.getType().getId()) + "\n");
+	    rm.addSuggestion(String.valueOf(block.getType().getId()));
+	}
+	if (blockData != 0) {
+	    rm.addText(Jobs.getLanguage().getMessage("command.blockinfo.output.state", "%blockdata%", blockData) + "\n");
+	    rm.addSuggestion(String.valueOf(blockData));
+	}
 	if (Version.isCurrentEqualOrHigher(Version.v1_14_R1))
-	    sender.sendMessage(Jobs.getLanguage().getMessage("command.blockinfo.output.usage", "%first%", "",
-		"%second%", block.getType().name() + dataString));
+	    rm.addText(Jobs.getLanguage().getMessage("command.blockinfo.output.use", "%usage%", block.getType().name() + dataString) + "\n");
 	else
-	    sender.sendMessage(Jobs.getLanguage().getMessage("command.blockinfo.output.usage", "%first%", block.getType().getId() + dataString,
-		"%second%", block.getType().name() + dataString));
-	sender.sendMessage(Jobs.getLanguage().getMessage("general.info.separator"));
+	    rm.addText(Jobs.getLanguage().getMessage("command.blockinfo.output.deprecated", "%first%", block.getType().getId() + dataString, "%second%", block.getType().name() + dataString) + "\n");
+	rm.addSuggestion(block.getType().name() + dataString);
+
+	rm.addText(Jobs.getLanguage().getMessage("general.info.separator"));
+	rm.show(sender);
 
 	return true;
     }
diff --git a/src/main/java/com/gamingmesh/jobs/config/LanguageManager.java b/src/main/java/com/gamingmesh/jobs/config/LanguageManager.java
index 9eee4f14..9f30c6d5 100644
--- a/src/main/java/com/gamingmesh/jobs/config/LanguageManager.java
+++ b/src/main/java/com/gamingmesh/jobs/config/LanguageManager.java
@@ -271,10 +271,11 @@ public class LanguageManager {
 
 	    c.get("command.blockinfo.help.info", "Shows information for the block you are looking at.");
 	    c.get("command.blockinfo.help.args", "");
-	    c.get("command.blockinfo.output.name", " &eBlock name: &6%blockname%");
+	    c.get("command.blockinfo.output.material", " &eBlock material: &6%blockname%");
 	    c.get("command.blockinfo.output.id", " &eBlock id: &6%blockid%");
-	    c.get("command.blockinfo.output.data", " &eBlock data: &6%blockdata%");
-	    c.get("command.blockinfo.output.usage", " &eUsage: &6%first% &eor &6%second%");
+	    c.get("command.blockinfo.output.state", " &eBlock sate: &6%blockdata%");
+	    c.get("command.blockinfo.output.deprecated", " &eUsage: &6%first% &eor &6%second%");
+	    c.get("command.blockinfo.output.use", " &eConfig file usage: &6%usage%");
 
 	    c.get("command.iteminfo.help.info", "Shows information for the item you are holding.");
 	    c.get("command.iteminfo.help.args", "");