From e115ca1707e62f015d65a4d669eb5a360d494eba Mon Sep 17 00:00:00 2001
From: Sen <sen@sen.gay>
Date: Mon, 4 Aug 2025 00:50:14 +0200
Subject: [PATCH] add item descriptions

---
 .../src/main/java/client/gui/container/GuiContainer.java  | 8 ++++++--
 common/src/main/java/common/block/Block.java              | 6 +++---
 common/src/main/java/common/init/ItemRegistry.java        | 4 ++--
 common/src/main/java/common/item/Item.java                | 6 +++---
 common/src/main/java/common/item/material/ItemBucket.java | 2 +-
 5 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/client/src/main/java/client/gui/container/GuiContainer.java b/client/src/main/java/client/gui/container/GuiContainer.java
index 7137dd05..4ed0d9c4 100755
--- a/client/src/main/java/client/gui/container/GuiContainer.java
+++ b/client/src/main/java/client/gui/container/GuiContainer.java
@@ -1,6 +1,7 @@
 package client.gui.container;
 
 import java.text.DecimalFormat;
+import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
@@ -126,8 +127,11 @@ public abstract class GuiContainer extends Gui
 			s = Color.YELLOW + "" + stack.getSize() + " " + Color.RESET + s;
 		s = s + Color.RESET;
 		list.add(s);
-		if(stack.getItem().getDescription() != null)
-			list.add(stack.getItem().getDescription());
+		if(stack.getItem().getDescription() != null) {
+			for(String line : stack.getItem().getDescription()) {
+				list.add(Color.GRAY + line);
+			}
+		}
 		stack.getItem().addInformation(stack, this.gm.player, list);
 		if(stack.getItem().isAdminItem())
 			list.add(Color.RED + "Admin-Gegenstand");
diff --git a/common/src/main/java/common/block/Block.java b/common/src/main/java/common/block/Block.java
index 9e58a583..cc878c5d 100755
--- a/common/src/main/java/common/block/Block.java
+++ b/common/src/main/java/common/block/Block.java
@@ -192,7 +192,7 @@ public class Block {
 	protected double maxZ;
 	private State defaultState;
 	private String display;
-	private String description;
+	private String[] description;
 	private CheatTab tab;
 	private SoundType sound;
 	private Equipment miningTool;
@@ -420,7 +420,7 @@ public class Block {
 		return this;
 	}
 
-	public final Block setDisplay(String name, String desc) {
+	public final Block setDisplay(String name, String ... desc) {
 		this.display = name;
 		this.description = desc;
 		return this;
@@ -617,7 +617,7 @@ public class Block {
 		return this.display;
 	}
 
-	public final String getDescription() {
+	public final String[] getDescription() {
 		return this.description;
 	}
 	
diff --git a/common/src/main/java/common/init/ItemRegistry.java b/common/src/main/java/common/init/ItemRegistry.java
index 29842d96..571521db 100755
--- a/common/src/main/java/common/init/ItemRegistry.java
+++ b/common/src/main/java/common/init/ItemRegistry.java
@@ -159,8 +159,8 @@ public abstract class ItemRegistry {
 			"_bucket", new ItemBucket(liquid.second(), true));
 		}
 
-		register("boat", (new ItemBoat()).setDisplay("Boot").setFuelAmount(800));
-		register("minecart", (new ItemMinecart()).setDisplay("Lore"));
+		register("boat", (new ItemBoat()).setDisplay("Boot", "Keine Lust mehr auf Schwimmen oder Tauchen?", "Ist dir Wasser einfach zu Nass und Säure zu scharf?", "Damit ist jetzt Schluss, mit diesem hochwertigen Kahn!").setFuelAmount(800));
+		register("minecart", (new ItemMinecart()).setDisplay("Lore", "Füße zu träge? Keine Kraft mehr in den Beinen?", "Diese Lore wird dich garantiert mühelos an dein Ziel bringen!", "Hinweis: Keine Haftung bei Schäden oder spontanem Tod durch", "ungünstig platzierte Schienen oder darüber laufende Kreaturen"));
         for(EntityInfo egg : EntityRegistry.DNA.values()) {
         	register("dna_sample_" + egg.id().toLowerCase(), (new ItemMobTemplate(egg.id()))
 			.setMaxAmount(StackSize.L));
diff --git a/common/src/main/java/common/item/Item.java b/common/src/main/java/common/item/Item.java
index cab5c2ce..22bb3e7c 100755
--- a/common/src/main/java/common/item/Item.java
+++ b/common/src/main/java/common/item/Item.java
@@ -32,7 +32,7 @@ public class Item {
 	private int maxDamage = 0;
 	private Item containerItem;
 	private String display;
-	private String description;
+	private String[] description;
 	private CheatTab tab;
 	private Color color = null;
 	private int defColor = 0xffffffff;
@@ -85,7 +85,7 @@ public class Item {
 		return this;
 	}
 
-	public final Item setDisplay(String name, String desc) {
+	public final Item setDisplay(String name, String ... desc) {
 		this.display = name;
 		this.description = desc;
 		return this;
@@ -160,7 +160,7 @@ public class Item {
 		return this.display;
 	}
 
-	public final String getDescription() {
+	public final String[] getDescription() {
 		return this.description;
 	}
 
diff --git a/common/src/main/java/common/item/material/ItemBucket.java b/common/src/main/java/common/item/material/ItemBucket.java
index a1a3bb0b..43030333 100755
--- a/common/src/main/java/common/item/material/ItemBucket.java
+++ b/common/src/main/java/common/item/material/ItemBucket.java
@@ -116,7 +116,7 @@ public class ItemBucket extends Item
     {
     	if(liquid != null) {
     		this.setUnstackable();
-    		this.setDisplay((recursive ? "Flutender" : "") + "Eimer mit " + liquid.getDisplay());
+    		this.setDisplay((recursive ? "Flutender" : "") + "Eimer mit " + liquid.getDisplay(), liquid.getDescription());
     	}
     	else {
     		this.setDisplay((recursive ? "Unendlicher" : "") + "Eimer");