Merge pull request #32 from falkreon/1.21

Remove default tablet keybind

Author: HamaIndustries

README.md

@@ -11,9 +11,8 @@ Requires <a href="https://modrinth.com/mod/connector">Connector</a> and <a href=
 
 **Scattered Shards** adds a system of collectible "shards" that can be created via a UI and placed in-world.
 
-The *Shard Collection* shows obtained and missing shards. It can be accessed from the pause menu, or via hotkey (J).
-
-Hold shift while viewing your shard collection to see overall completion, as well as shard rarity.
+Type `/shards` or use a *Shard Tablet* any time to view shows obtained and missing shards. There is also a keybind to open the tablet;
+it is not bound by default, so you may want to create a default setting for your modpack!
 
 **Features:**
 - Shards can have titles, descriptions, and face art in the form of item stacks or arbitrary textures

src/main/java/net/modfest/scatteredshards/client/ScatteredShardsClient.java

@@ -26,7 +26,7 @@
 public class ScatteredShardsClient implements ClientModInitializer {
 	public static final KeyBinding VIEW_COLLECTION = KeyBindingHelper.registerKeyBinding(new KeyBinding(
 		"key.scattered_shards.collection",
-		InputUtil.GLFW_KEY_J,
+		InputUtil.UNKNOWN_KEY.getCode(),
 		"key.categories.scattered_shards"
 	));
 

src/main/java/net/modfest/scatteredshards/client/ShardCollectedToast.java

@@ -23,7 +23,6 @@
 public class ShardCollectedToast implements Toast {
 	public static final int TITLE_COLOR = 0xFF_FFFF00;
 	public static final Text TITLE = Text.translatable("toast.scattered_shards.collected");
-	public static final Text HINT = Text.translatable("toast.scattered_shards.collected.prompt", Text.keybind(ScatteredShardsClient.VIEW_COLLECTION.getTranslationKey()).formatted(Formatting.GOLD).formatted(Formatting.BOLD));
 	private static final Identifier TEXTURE = Identifier.ofVanilla("toast/advancement");
 	public static final int DURATION = 5000;
 
@@ -33,9 +32,24 @@ public class ShardCollectedToast implements Toast {
 	private final int height;
 
 	public ShardCollectedToast(Shard shard) {
+		
+		Text hint;
+		
+		if (ScatteredShardsClient.VIEW_COLLECTION.isUnbound()) {
+			hint = Text.translatable(
+					"toast.scattered_shards.collected.prompt_without_key",
+					Text.literal("/shards").formatted(Formatting.AQUA).formatted(Formatting.BOLD)
+					);
+		} else {
+			hint = Text.translatable(
+					"toast.scattered_shards.collected.prompt",
+					Text.keybind(ScatteredShardsClient.VIEW_COLLECTION.getTranslationKey()).formatted(Formatting.GOLD).formatted(Formatting.BOLD)
+					);
+		}
+		
 		this.icon = shard.icon();
 		this.descLines = wrap(List.of(shard.name().copy().withColor(ScatteredShardsAPI.getClientLibrary().shardTypes().get(shard.shardTypeId()).orElse(ShardType.MISSING).textColor())));
-		this.hintLines = wrap(List.of(HINT));
+		this.hintLines = wrap(List.of(hint));
 		this.height = 32 + Math.max(0, Math.max(this.descLines.size(), this.hintLines.size()) - 1) * 11;
 		icon.ifRight(ModMetaUtil::touchIconTexture);
 	}

src/main/resources/assets/scattered_shards/lang/en_us.json

@@ -34,6 +34,7 @@
 
 	"toast.scattered_shards.collected": "Shard Collected!",
 	"toast.scattered_shards.collected.prompt": "Press [%s] to view",
+	"toast.scattered_shards.collected.prompt_without_key": "Use %s to view",
 	"toast.scattered_shards.shard_mod.title": "Shard Modification",
 	"toast.scattered_shards.shard_mod.success": "Successfully modified '%s'",
 	"toast.scattered_shards.shard_mod.fail": "Failed to modify '%s'",