always show stats

Author: sisby-folk

gradle.properties

@@ -16,7 +16,7 @@ authors=Falkreon, acikek
 contributors=Trudle, Tomate0613, afamiliarquiet, FoundationGames, TheEpicBlock, hama
 license=MIT
 # Mod Version
-baseVersion=1.9.2
+baseVersion=1.9.3
 # Branch Metadata
 branch=1.21.7
 tagBranch=1.21.7

src/main/java/net/modfest/scatteredshards/client/screen/ShardTabletGuiDescription.java

@@ -16,7 +16,6 @@
 import net.modfest.scatteredshards.api.ShardLibrary;
 import net.modfest.scatteredshards.api.shard.Shard;
 import net.modfest.scatteredshards.api.shard.ShardType;
-import net.modfest.scatteredshards.client.ScatteredShardsClient;
 import net.modfest.scatteredshards.client.screen.widget.WLeftRightPanel;
 import net.modfest.scatteredshards.client.screen.widget.WShardPanel;
 import net.modfest.scatteredshards.client.screen.widget.WShardSetPanel;
@@ -58,7 +57,6 @@ public ShardTabletGuiDescription(ShardCollection collection, ShardLibrary librar
 		int panelHeight = selectorPanel.getHeight();
 
 		WScaledLabel progressVisited = new WScaledLabel(() -> {
-			if (!ScatteredShardsClient.hasShiftDown()) return Text.empty();
 			int visitedSets = 0;
 			for (Collection<Identifier> set : library.shardSets().asMap().values()) {
 				for (Identifier identifier : set) {
@@ -74,10 +72,7 @@ public ShardTabletGuiDescription(ShardCollection collection, ShardLibrary librar
 		progressVisited.setSize(80, 10);
 		progressVisited.setLocation(13, panelHeight - 20);
 
-		WScaledLabel progressTotal = new WScaledLabel(() -> {
-			if (!ScatteredShardsClient.hasShiftDown()) return Text.empty();
-			return Text.translatable("gui.scattered_shards.tablet.label.progress.total", "%.0f%%".formatted(100 * collection.size() / (float) library.shards().size()));
-		}, 1.0f).setColor(Colors.LIGHT_GRAY);
+		WScaledLabel progressTotal = new WScaledLabel(() -> Text.translatable("gui.scattered_shards.tablet.label.progress.total", "%.0f%%".formatted(100 * collection.size() / (float) library.shards().size())), 1.0f).setColor(Colors.LIGHT_GRAY);
 		selectorPanel.add(progressTotal, 0, 0);
 		progressTotal.setSize(80, 10);
 		progressTotal.setLocation(selectorPanel.getWidth() - 72, panelHeight - 20);
@@ -123,7 +118,7 @@ public void addPainters() {
 
 	public static class Screen extends CottonClientScreen {
 		public Screen(ShardCollection collection, ShardLibrary library) {
-			super(new ShardTabletGuiDescription(collection, library));
+			super(Text.translatable("menu.scattered_shards.collection"), new ShardTabletGuiDescription(collection, library));
 		}
 
 		@Override

src/main/java/net/modfest/scatteredshards/client/screen/widget/WMiniShard.java

@@ -1,6 +1,5 @@
 package net.modfest.scatteredshards.client.screen.widget;
 
-import com.mojang.blaze3d.systems.RenderSystem;
 import io.github.cottonmc.cotton.gui.client.ScreenDrawing;
 import io.github.cottonmc.cotton.gui.widget.TooltipBuilder;
 import io.github.cottonmc.cotton.gui.widget.WWidget;
@@ -21,7 +20,6 @@
 import net.modfest.scatteredshards.api.shard.ShardIconOffsets;
 import net.modfest.scatteredshards.api.shard.ShardTextureSettings;
 import net.modfest.scatteredshards.api.shard.ShardType;
-import net.modfest.scatteredshards.client.ScatteredShardsClient;
 import net.modfest.scatteredshards.client.screen.ShardTabletGuiDescription;
 import net.modfest.scatteredshards.util.ModMetaUtil;
 
@@ -101,15 +99,13 @@ public void paint(DrawContext context, int x, int y, int mouseX, int mouseY) {
 	@Override
 	public void addTooltip(TooltipBuilder tooltip) {
 
-		if (ScatteredShardsClient.hasShiftDown() && !shard.name().getString().isBlank()) {
+		if (!shard.name().getString().isBlank()) {
 			tooltip.add(shard.name());
 		}
 		tooltip.add(ShardType.getDescription(shard.shardTypeId()).copy().withColor(0xFF_000000 | shardType.textColor()));
-		if (ScatteredShardsClient.hasShiftDown()) {
-			GlobalCollection globalCollection = ScatteredShardsAPI.getClientGlobalCollection();
-			if (globalCollection != null) {
-				tooltip.add(Text.translatable("gui.scattered_shards.tablet.tooltip.global_collection", "%.1f%%".formatted(100 * globalCollection.getCount(shardId) / (float) globalCollection.totalPlayers())).formatted(Formatting.GRAY));
-			}
+		GlobalCollection globalCollection = ScatteredShardsAPI.getClientGlobalCollection();
+		if (globalCollection != null) {
+			tooltip.add(Text.translatable("gui.scattered_shards.tablet.tooltip.global_collection", "%.1f%%".formatted(100 * globalCollection.getCount(shardId) / (float) globalCollection.totalPlayers())).formatted(Formatting.GRAY));
 		}
 
 		super.addTooltip(tooltip);

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

@@ -52,7 +52,7 @@
 	"gui.scattered_shards.tablet.click_on_a_shard": "Click on a Shard to the left",
 	"gui.scattered_shards.tablet.tooltip.global_collection": "%s of players have this shard",
 	"gui.scattered_shards.tablet.label.progress.started": "%s Started",
-	"gui.scattered_shards.tablet.label.progress.total": "%s Total",
+	"gui.scattered_shards.tablet.label.progress.total": "%s Overall",
 
 	"argument.scattered_shards.entity.options.has_shard.description": "Shard Identifier",
 	"argument.scattered_shards.entity.options.has_shard.invalid": "Unknown shard identifier '%s'"