modmenu icon impl, fix migrate, don't save shardsets or source, scroll speed 1

sisby-folk · sisby-folk · commit 8d862f3f801e · 2024-11-26T17:33:46.000+11:00
diff --git a/gradle.properties b/gradle.properties
@@ -17,7 +17,7 @@ authors=Falkreon, acikek
 contributors=Trudle, Tomate0613, afamiliarquiet, FoundationGames, TheEpicBlock, hama
 license=MIT
 # Mod Version
-baseVersion=1.7.0
+baseVersion=1.7.1
 # Branch Metadata
 branch=1.21
 tagBranch=1.21
diff --git a/libs.versions.toml b/libs.versions.toml
@@ -2,10 +2,10 @@
 loom = "1.7.+"
 minotaur = "2.+"
 
-mc = "1.21"
-fl = "0.15.11"
-yarn = "1.21+build.9"
-fapi = "0.100.7+1.21"
+mc = "1.21.1"
+fl = "0.16.7"
+yarn = "1.21.1+build.3"
+fapi = "0.104.0+1.21.1"
 
 fpapi = "0.3.1"
 libgui = "11.0.0+1.21"
diff --git a/src/main/java/net/modfest/scatteredshards/api/impl/ShardLibraryPersistentState.java b/src/main/java/net/modfest/scatteredshards/api/impl/ShardLibraryPersistentState.java
@@ -1,9 +1,6 @@
 package net.modfest.scatteredshards.api.impl;
 
 import net.minecraft.nbt.NbtCompound;
-import net.minecraft.nbt.NbtElement;
-import net.minecraft.nbt.NbtList;
-import net.minecraft.nbt.NbtString;
 import net.minecraft.registry.RegistryWrapper;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.util.Identifier;
@@ -21,7 +18,6 @@ public class ShardLibraryPersistentState extends PersistentState {
 	);
 
 	public static final String SHARDS_KEY = "Shards";
-	public static final String SHARD_SETS_KEY = "ShardSets";
 
 	public static ShardLibraryPersistentState get(MinecraftServer server) {
 		return server.getOverworld().getPersistentStateManager().getOrCreate(TYPE, ScatteredShards.ID + "_library");
@@ -53,21 +49,6 @@ public static ShardLibraryPersistentState createFromNbt(NbtCompound tag, Registr
 			}
 		}
 
-		NbtCompound shardSets = tag.getCompound(SHARD_SETS_KEY);
-		for (String id : shardSets.getKeys()) {
-			try {
-				Identifier setId = Identifier.of(id);
-				NbtList ids = shardSets.getList(id, NbtElement.STRING_TYPE);
-				for (NbtElement elem : ids) {
-					if (elem instanceof NbtString str) {
-						library.shardSets().put(setId, Identifier.of(str.asString()));
-					}
-				}
-			} catch (Throwable t) {
-				ScatteredShards.LOGGER.error("Could not load shardSet \"{}\": {}", id, t.getMessage());
-			}
-		}
-
 		ScatteredShards.LOGGER.info("Loaded {} shards and {} shardSets.", library.shards().size(), library.shardSets().size());
 
 		return state;
@@ -80,18 +61,8 @@ public NbtCompound writeNbt(NbtCompound tag, RegistryWrapper.WrapperLookup regis
 
 		tag.put(SHARDS_KEY, library.shards().toNbt());
 
-		NbtCompound shardSets = new NbtCompound();
-		library.shardSets().asMap().forEach((id, set) -> {
-			NbtList list = new NbtList();
-			for (Identifier i : set) {
-				list.add(NbtString.of(i.toString()));
-			}
-			shardSets.put(id.toString(), list);
-		});
-		tag.put(SHARD_SETS_KEY, shardSets);
-
 		ScatteredShards.LOGGER.info("ShardLibrary saved.");
 
 		return tag;
 	}
-}
+}
diff --git a/src/main/java/net/modfest/scatteredshards/api/shard/Shard.java b/src/main/java/net/modfest/scatteredshards/api/shard/Shard.java
@@ -30,7 +30,6 @@ public class Shard {
 		TextCodecs.CODEC.fieldOf("name").forGetter(Shard::name),
 		TextCodecs.CODEC.fieldOf("lore").forGetter(Shard::lore),
 		TextCodecs.CODEC.fieldOf("hint").forGetter(Shard::hint),
-		TextCodecs.CODEC.fieldOf("source").forGetter(Shard::source),
 		Identifier.CODEC.fieldOf("source_id").forGetter(Shard::sourceId),
 		ICON_CODEC.fieldOf("icon").forGetter(Shard::icon)
 	).apply(instance, Shard::new));
@@ -40,23 +39,21 @@ public class Shard {
 	public static final Identifier MISSING_ICON_ID = ScatteredShards.id("textures/gui/shards/missing_icon.png");
 	public static final Either<ItemStack, Identifier> MISSING_ICON = Either.right(MISSING_ICON_ID);
 	public static final Identifier MISSING_SHARD_SOURCE = ScatteredShards.id("missing");
-	public static final Shard MISSING_SHARD = new Shard(ShardType.MISSING_ID, Text.of("Missing"), Text.of(""), Text.of(""), Text.of("None"), MISSING_SHARD_SOURCE, MISSING_ICON);
+	public static final Shard MISSING_SHARD = new Shard(ShardType.MISSING_ID, Text.of("Missing"), Text.of(""), Text.of(""), MISSING_SHARD_SOURCE, MISSING_ICON);
 
 	protected Identifier shardTypeId;
 	protected Text name;
 	protected Text lore;
 	protected Text hint;
-	protected Text source;
 	protected Identifier sourceId;
 	protected Either<ItemStack, Identifier> icon;
 
-	public Shard(Identifier shardTypeId, Text name, Text lore, Text hint, Text source, Identifier sourceId, Either<ItemStack, Identifier> icon) {
-		Stream.of(name, lore, hint, source, icon).forEach(Objects::requireNonNull);
+	public Shard(Identifier shardTypeId, Text name, Text lore, Text hint, Identifier sourceId, Either<ItemStack, Identifier> icon) {
+		Stream.of(name, lore, hint, icon).forEach(Objects::requireNonNull);
 		this.shardTypeId = shardTypeId;
 		this.name = name;
 		this.lore = lore;
 		this.hint = hint;
-		this.source = source;
 		this.sourceId = sourceId;
 		this.icon = icon;
 	}
@@ -77,10 +74,6 @@ public Text hint() {
 		return hint;
 	}
 
-	public Text source() {
-		return source;
-	}
-
 	public Identifier sourceId() {
 		return sourceId;
 	}
@@ -124,11 +117,6 @@ public Shard setIcon(Identifier textureValue) {
 		return this;
 	}
 
-	public Shard setSource(Text source) {
-		this.source = source;
-		return this;
-	}
-
 	public Shard setSourceId(Identifier id) {
 		this.sourceId = id;
 		return this;
@@ -148,7 +136,7 @@ public JsonObject toJson() {
 
 	public Shard copy() {
 		Either<ItemStack, Identifier> icon = icon().mapBoth(stack -> stack, id -> id);
-		return new Shard(shardTypeId, name.copy(), lore.copy(), hint.copy(), source.copy(), sourceId, icon);
+		return new Shard(shardTypeId, name.copy(), lore.copy(), hint.copy(), sourceId, icon);
 	}
 
 	@Override
@@ -157,11 +145,7 @@ public String toString() {
 	}
 
 	public static Shard emptyOfType(Identifier id) {
-		return MISSING_SHARD.copy().setShardType(id);
-	}
-
-	public static Text getSourceForNamespace(String namespace) {
-		return Text.translatable("shard_pack." + namespace + ".name");
+		return MISSING_SHARD.copy().setShardType(id).setName(Text.of(""));
 	}
 
 	public static Text getSourceForMod(ModContainer mod) {
@@ -180,8 +164,4 @@ public static Text getSourceForSourceId(Identifier id) {
 		return getSourceForModId(id.getNamespace())
 			.orElse(Text.translatable("shard_pack." + id.getNamespace() + ".name"));
 	}
-
-	public static Identifier getSourceIdForNamespace(String namespace) {
-		return Identifier.of(namespace, "shard_pack");
-	}
 }
diff --git a/src/main/java/net/modfest/scatteredshards/client/render/ShardBlockEntityRenderer.java b/src/main/java/net/modfest/scatteredshards/client/render/ShardBlockEntityRenderer.java
@@ -18,6 +18,7 @@
 import net.modfest.scatteredshards.api.shard.Shard;
 import net.modfest.scatteredshards.api.shard.ShardType;
 import net.modfest.scatteredshards.block.ShardBlockEntity;
+import net.modfest.scatteredshards.util.ModMetaUtil;
 import org.joml.AxisAngle4f;
 import org.joml.Quaternionf;
 import org.joml.Vector3f;
@@ -43,6 +44,7 @@ public void render(ShardBlockEntity entity, float tickDelta, MatrixStack matrice
 			shard = Shard.MISSING_SHARD;
 		}
 
+		shard.icon().ifRight(ModMetaUtil::touchIconTexture);
 		ShardType shardType = ScatteredShardsAPI.getClientLibrary().shardTypes().get(shard.shardTypeId()).orElse(ShardType.MISSING);
 
 		float angle = entity.getAnimations().getAngle(tickDelta);
diff --git a/src/main/java/net/modfest/scatteredshards/client/screen/ShardCreatorGuiDescription.java b/src/main/java/net/modfest/scatteredshards/client/screen/ShardCreatorGuiDescription.java
@@ -15,7 +15,6 @@
 import io.github.cottonmc.cotton.gui.widget.data.HorizontalAlignment;
 import io.github.cottonmc.cotton.gui.widget.data.Insets;
 import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking;
-import net.fabricmc.loader.api.FabricLoader;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.component.ComponentChanges;
 import net.minecraft.component.ComponentMap;
@@ -32,6 +31,7 @@
 import net.modfest.scatteredshards.client.screen.widget.WProtectableField;
 import net.modfest.scatteredshards.client.screen.widget.WShardPanel;
 import net.modfest.scatteredshards.networking.C2SModifyShard;
+import net.modfest.scatteredshards.util.ModMetaUtil;
 
 import java.util.Objects;
 
@@ -163,19 +163,7 @@ public ShardCreatorGuiDescription(Identifier shardId, Shard shard, String modId)
 		this(shardId);
 		this.shard = shard;
 
-		this.modIcon = FabricLoader.getInstance().getModContainer(modId)
-			.flatMap(it -> it.getMetadata().getIconPath(16))
-			.filter(it -> it.startsWith("assets/"))
-			.map(it -> it.substring("assets/".length()))
-			.map(it -> {
-				int firstSlash = it.indexOf("/");
-				String namespace = it.substring(0, firstSlash);
-				String path = it.substring(firstSlash + 1);
-
-				return Identifier.of(namespace, path);
-			})
-			.orElse(Shard.MISSING_ICON.right().get()); //TODO: Deal with non-resource icons here.
-		Shard.getSourceForModId(modId).ifPresent(shard::setSource);
+		this.modIcon = ModMetaUtil.touchModIcon(modId);
 		shard.setSourceId(Identifier.of(modId, "shard_pack"));
 
 		// Initialize field values
diff --git a/src/main/java/net/modfest/scatteredshards/client/screen/ShardTabletGuiDescription.java b/src/main/java/net/modfest/scatteredshards/client/screen/ShardTabletGuiDescription.java
@@ -46,6 +46,7 @@ public ShardTabletGuiDescription(ShardCollection collection, ShardLibrary librar
 		ids.sort(Comparator.comparing(Identifier::getNamespace));
 
 		shardSelector = new WListPanel<>(ids, WShardSetPanel::new, this::configurePanel);
+		shardSelector.getScrollBar().setScrollingSpeed(1);
 		selectorPanel.setInsets(Insets.ROOT_PANEL);
 
 		WLeftRightPanel root = new WLeftRightPanel(selectorPanel, shardPanel);
diff --git a/src/main/java/net/modfest/scatteredshards/client/screen/widget/WMiniShard.java b/src/main/java/net/modfest/scatteredshards/client/screen/widget/WMiniShard.java
@@ -17,6 +17,7 @@
 import net.modfest.scatteredshards.api.shard.ShardIconOffsets;
 import net.modfest.scatteredshards.api.shard.ShardType;
 import net.modfest.scatteredshards.client.ScatteredShardsClient;
+import net.modfest.scatteredshards.util.ModMetaUtil;
 
 import java.util.function.Consumer;
 
@@ -35,6 +36,7 @@ public WMiniShard() {
 	}
 
 	public WMiniShard setShard(Shard shard, boolean collected, Identifier shardId) {
+		shard.icon().ifRight(ModMetaUtil::touchIconTexture);
 		this.shard = shard;
 		this.shardType = ScatteredShardsAPI.getClientLibrary().shardTypes().get(shard.shardTypeId()).orElse(ShardType.MISSING);
 		this.isCollected = collected;
diff --git a/src/main/java/net/modfest/scatteredshards/client/screen/widget/WShardPanel.java b/src/main/java/net/modfest/scatteredshards/client/screen/widget/WShardPanel.java
@@ -26,6 +26,7 @@
 import net.modfest.scatteredshards.client.screen.widget.scalable.WScaledLabel;
 import net.modfest.scatteredshards.client.screen.widget.scalable.WScaledText;
 import net.modfest.scatteredshards.client.screen.widget.scalable.WShardIcon;
+import net.modfest.scatteredshards.util.ModMetaUtil;
 
 import java.util.List;
 import java.util.function.IntSupplier;
@@ -50,7 +51,7 @@ public class WShardPanel extends WPlainPanel {
 		.setShadow(true)
 		.setHorizontalAlignment(HorizontalAlignment.CENTER)
 		.setColor(() -> shardType.textColor());
-	private final WScaledLabel source = new WScaledLabel(shard::source, 0.9f)
+	private final WScaledLabel source = new WScaledLabel(() -> Shard.getSourceForSourceId(shard.sourceId()), 0.9f)
 		.setShadow(true)
 		.setHorizontalAlignment(HorizontalAlignment.CENTER);
 	private final WScaledText lore = new WScaledText(shard::lore, 0.8f)
@@ -111,13 +112,14 @@ public WShardPanel setHint(Supplier<Text> text, IntSupplier color) {
 	}
 
 	public WShardPanel setShard(Shard shard) {
+		shard.icon().ifRight(ModMetaUtil::touchIconTexture);
 		this.shard = shard;
 		this.isHidden = false;
 
 		setType(shard.shardTypeId(), ScatteredShardsAPI.getClientLibrary().shardTypes().get(shard.shardTypeId()).orElse(ShardType.MISSING));
 		icon.setIcon(shard::icon);
 		setName(shard::name, WHITE);
-		setSource(shard::source, WHITE);
+		setSource(() -> Shard.getSourceForSourceId(shard.sourceId()), WHITE);
 		setLore(shard::lore, WHITE);
 		setHint(shard::hint, WHITE);
 
diff --git a/src/main/java/net/modfest/scatteredshards/command/LibraryCommand.java b/src/main/java/net/modfest/scatteredshards/command/LibraryCommand.java
@@ -72,6 +72,7 @@ public static int migrate(CommandContext<ServerCommandSource> ctx) throws Comman
 		Shard shard = library.shards().get(shardId).orElseThrow(() -> ShardCommand.INVALID_SHARD.create(shardId));
 
 		library.shards().remove(shardId);
+		library.shardSets().values().removeIf(i -> i.equals(shardId));
 		shard.setShardType(shardTypeId);
 		library.shards().put(newShardId, shard);
 
diff --git a/src/main/java/net/modfest/scatteredshards/util/ModMetaUtil.java b/src/main/java/net/modfest/scatteredshards/util/ModMetaUtil.java
@@ -0,0 +1,99 @@
+package net.modfest.scatteredshards.util;
+
+import net.fabricmc.loader.api.FabricLoader;
+import net.fabricmc.loader.api.ModContainer;
+import net.fabricmc.loader.api.metadata.ModMetadata;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.texture.NativeImage;
+import net.minecraft.client.texture.NativeImageBackedTexture;
+import net.minecraft.util.Identifier;
+import net.modfest.scatteredshards.ScatteredShards;
+import org.apache.commons.lang3.Validate;
+
+import java.io.InputStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Map;
+import java.util.Objects;
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ * Liberally stolen from ModMenu. Thanks ModMenu!
+ */
+public class ModMetaUtil {
+	private static final Map<String, Identifier> iconTextures = new ConcurrentHashMap<>();
+	private static final Map<Path, NativeImageBackedTexture> modIconCache = new ConcurrentHashMap<>();
+
+	public static NativeImageBackedTexture createIcon(ModContainer iconSource, String iconPath) {
+		try {
+			Path path = iconSource.getPath(iconPath);
+			NativeImageBackedTexture cachedIcon = modIconCache.get(path);
+			if (cachedIcon != null) {
+				return cachedIcon;
+			}
+			cachedIcon = modIconCache.get(path);
+			if (cachedIcon != null) {
+				return cachedIcon;
+			}
+			try (InputStream inputStream = Files.newInputStream(path)) {
+				NativeImage image = NativeImage.read(Objects.requireNonNull(inputStream));
+				Validate.validState(image.getHeight() == image.getWidth(), "Must be square icon");
+				NativeImageBackedTexture tex = new NativeImageBackedTexture(image);
+				modIconCache.put(path, tex);
+				return tex;
+			}
+
+		} catch (IllegalStateException e) {
+			if (e.getMessage().equals("Must be square icon")) {
+				ScatteredShards.LOGGER.error("Mod icon must be a square for icon source {}: {}",
+					iconSource.getMetadata().getId(),
+					iconPath,
+					e
+				);
+			}
+
+			return null;
+		} catch (Throwable t) {
+			if (!iconPath.equals("assets/" + iconSource.getMetadata().getId() + "/icon.png")) {
+				ScatteredShards.LOGGER.error("Invalid mod icon for icon source {}: {}", iconSource.getMetadata().getId(), iconPath, t);
+			}
+			return null;
+		}
+	}
+
+	public static NativeImageBackedTexture getMissingIcon() {
+		return createIcon(
+			FabricLoader.getInstance()
+				.getModContainer(ScatteredShards.ID)
+				.orElseThrow(() -> new RuntimeException("Cannot get ModContainer for Fabric mod with id " + ScatteredShards.ID)),
+			"assets/" + ScatteredShards.ID + "/unknown_icon.png"
+		);
+	}
+
+	public static NativeImageBackedTexture getIcon(ModContainer mod, int preferredSize) {
+		if (mod == null) return getMissingIcon();
+		ModMetadata meta = mod.getMetadata();
+		String modId = meta.getId();
+		String iconPath = meta.getIconPath(preferredSize).orElse("assets/" + modId + "/icon.png");
+		final String finalIconSourceId = modId;
+		ModContainer iconSource = FabricLoader.getInstance()
+			.getModContainer(modId)
+			.orElseThrow(() -> new RuntimeException("Cannot get ModContainer for Fabric mod with id " + finalIconSourceId));
+		NativeImageBackedTexture icon = createIcon(iconSource, iconPath);
+		if (icon == null) return getMissingIcon();
+		return icon;
+	}
+
+	public static Identifier touchModIcon(String modId) {
+		return iconTextures.computeIfAbsent(modId, id -> {
+			Identifier iconTexture = Identifier.of(ScatteredShards.ID, modId + "_icon");
+			MinecraftClient.getInstance().getTextureManager().registerTexture(iconTexture, ModMetaUtil.getIcon(FabricLoader.getInstance().getModContainer(modId).orElse(null), 16));
+			return iconTexture;
+		});
+	}
+
+	public static void touchIconTexture(Identifier iconTexture) {
+		if (!iconTexture.getNamespace().equals(ScatteredShards.ID) || !iconTexture.getPath().endsWith("_icon")) return;
+		touchModIcon(iconTexture.getPath().substring(0, iconTexture.getPath().length() - "_icon".length()));
+	}
+}
diff --git a/src/main/resources/assets/scattered_shards/unknown_icon.png b/src/main/resources/assets/scattered_shards/unknown_icon.png
