Merge branch 'refs/heads/1.20' into 1.21

# Conflicts:
#	src/main/java/folk/sisby/surveyor/SurveyorCommands.java
#	src/main/java/folk/sisby/surveyor/client/SurveyorClientCommands.java
#	src/main/java/folk/sisby/surveyor/landmark/SimplePointLandmark.java

gradle.properties

@@ -17,7 +17,7 @@ authors=Sisby folk
 contributors=Ampflower, falkreon, jaskarth, Garden System
 license=LGPL-3.0-or-later
 # Mod Version
-baseVersion=0.6.25
+baseVersion=0.6.26
 # Branch Metadata
 branch=1.21
 tagBranch=1.20

src/main/java/folk/sisby/surveyor/SurveyorCommands.java

@@ -290,7 +290,7 @@ private static int addLandmark(WorldSummary summary, ServerPlayerEntity player,
 			feedback.accept(Text.literal("[Surveyor] ").formatted(Formatting.DARK_RED).append(Text.literal("A landmark exists of that type and position!").formatted(Formatting.YELLOW)));
 			return 0;
 		}
-		summary.landmarks().put(world, new SimplePointLandmark(pos, global ? null : Surveyor.getUuid(player), color, Text.of(name), Identifier.tryParse("")));
+		summary.landmarks().put(world, new SimplePointLandmark(pos, global ? null : Surveyor.getUuid(player), color, Text.of(name.contains("\\n") ? name.substring(0, name.indexOf("\\n")) : name), name.contains("\\n") ? Text.of(name.substring(name.indexOf("\\n") + 2)) : null, null));
 		feedback.accept(Text.literal("[Surveyor] ").formatted(Formatting.DARK_RED).append(Text.literal("%s added successfully!".formatted(global ? "Landmark" : "Waypoint")).formatted(Formatting.GREEN)));
 		return 1;
 	}

src/main/java/folk/sisby/surveyor/client/SurveyorClientCommands.java

@@ -204,7 +204,7 @@ private static int addLandmark(WorldSummary summary, ClientWorld world, Consumer
 			feedback.accept(Text.literal("[Surveyor] ").formatted(Formatting.DARK_RED).append(Text.literal("A landmark exists of that type and position!").formatted(Formatting.YELLOW)));
 			return 0;
 		}
-		summary.landmarks().put(world, new SimplePointLandmark(pos, global ? null : SurveyorClient.getClientUuid(), color, Text.of(name), null));
+		summary.landmarks().put(world, new SimplePointLandmark(pos, global ? null : SurveyorClient.getClientUuid(), color, Text.of(name.contains("\\n") ? name.substring(0, name.indexOf("\\n")) : name), name.contains("\\n") ? Text.of(name.substring(name.indexOf("\\n") + 2)) : null, null));
 		feedback.accept(Text.literal("[Surveyor] ").formatted(Formatting.DARK_RED).append(Text.literal("%s added successfully!".formatted(global ? "Landmark" : "Waypoint")).formatted(Formatting.GREEN)));
 		return 1;
 	}

src/main/java/folk/sisby/surveyor/landmark/SimplePointLandmark.java

@@ -12,19 +12,20 @@
 import java.util.Optional;
 import java.util.UUID;
 
-public record SimplePointLandmark(BlockPos pos, Optional<UUID> optionalOwner, Optional<DyeColor> optionalColor, Optional<Text> optionalName, Optional<Identifier> optionalTexture) implements VariableLandmark<SimplePointLandmark> {
+public record SimplePointLandmark(BlockPos pos, Optional<UUID> optionalOwner, Optional<DyeColor> optionalColor, Optional<Text> optionalName, Optional<Text> optionalDescription, Optional<Identifier> optionalTexture) implements VariableLandmark<SimplePointLandmark> {
 	public static final LandmarkType<SimplePointLandmark> TYPE = new SimpleLandmarkType<>(
 		Identifier.of(Surveyor.ID, "point"),
 		pos -> RecordCodecBuilder.create(instance -> instance.group(
 			Uuids.CODEC.optionalFieldOf("owner").forGetter(VariableLandmark::optionalOwner),
 			DyeColor.CODEC.optionalFieldOf("color").orElse(null).forGetter(VariableLandmark::optionalColor),
 			TextCodecs.CODEC.optionalFieldOf("name").orElse(null).forGetter(VariableLandmark::optionalName),
+			TextCodecs.CODEC.optionalFieldOf("description").orElse(null).forGetter(VariableLandmark::optionalDescription),
 			Identifier.CODEC.optionalFieldOf("texture").orElse(null).forGetter(VariableLandmark::optionalTexture)
-		).apply(instance, (owner, color, name, texture) -> new SimplePointLandmark(pos, owner, color, name, texture)))
+		).apply(instance, (owner, color, name, description, texture) -> new SimplePointLandmark(pos, owner, color, name, description, texture)))
 	);
 
-	public SimplePointLandmark(BlockPos pos, UUID owner, DyeColor color, Text name, Identifier texture) {
-		this(pos, Optional.ofNullable(owner), Optional.ofNullable(color), Optional.ofNullable(name), Optional.ofNullable(texture));
+	public SimplePointLandmark(BlockPos pos, UUID owner, DyeColor color, Text name, Text description, Identifier texture) {
+		this(pos, Optional.ofNullable(owner), Optional.ofNullable(color), Optional.ofNullable(name), Optional.ofNullable(description), Optional.ofNullable(texture));
 	}
 
 	@Override

src/main/java/folk/sisby/surveyor/landmark/VariableLandmark.java

@@ -27,6 +27,12 @@ public interface VariableLandmark<T extends VariableLandmark<T>> extends Landmar
 
 	Optional<Text> optionalName();
 
+	default @Nullable Text description() {
+		return optionalDescription().orElse(null);
+	}
+
+	Optional<Text> optionalDescription();
+
 	default @Nullable Identifier texture() {
 		return optionalTexture().orElse(null);
 	}