Merge branch '1.21' into 1.21

Author: HamaIndustries

README.md

@@ -11,7 +11,7 @@ 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.
 
-Type `/shards` or use a *Shard Tablet* any time to view which shards you've collected, and which ones are left! There is also a keybind to open the tablet;
+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:**
@@ -21,7 +21,6 @@ it is not bound by default, so you may want to create a default setting for your
   - Shard types can have custom names, textures, and collection sounds (resource-driven)
 - Shards are arranged into "sets" which can have one shard of each type
 	- Suggested as **installed mod IDs** by default, but can be completely arbitrary (locations, skillsets, etc)
-- Tracks global collection statistics, displayed to players when holding shift in the shards screen
 
 ![shards screen preview](https://cdn.modrinth.com/data/DB9GU3tx/images/ba00e12bef9b8d90d096a71bba11d71c14f6e01f.png)
 

build.gradle

@@ -32,6 +32,10 @@ dependencies {
 	include libs.fpapi
 }
 
+loom {
+	accessWidenerPath = file("src/main/resources/${modId}.accesswidener")
+}
+
 processResources {
 	final Map<String, String> meta = [
 		version       : version,

gradle.properties

@@ -17,7 +17,7 @@ authors=Falkreon, acikek
 contributors=Trudle, Tomate0613, afamiliarquiet, FoundationGames, TheEpicBlock, hama
 license=MIT
 # Mod Version
-baseVersion=1.8.0
+baseVersion=1.8.1
 # Branch Metadata
 branch=1.21
 tagBranch=1.21

src/main/java/net/modfest/scatteredshards/ScatteredShardsContent.java

@@ -5,6 +5,7 @@
 import net.minecraft.block.Block;
 import net.minecraft.block.entity.BlockEntityType;
 import net.minecraft.client.render.block.entity.BlockEntityRendererFactories;
+import net.minecraft.component.ComponentType;
 import net.minecraft.item.BlockItem;
 import net.minecraft.item.Item;
 import net.minecraft.registry.Registries;
@@ -13,24 +14,34 @@
 import net.modfest.scatteredshards.block.ShardBlock;
 import net.modfest.scatteredshards.block.ShardBlockEntity;
 import net.modfest.scatteredshards.client.render.ShardBlockEntityRenderer;
+import net.modfest.scatteredshards.item.ShardItem;
 import net.modfest.scatteredshards.item.ShardTablet;
 
 public class ScatteredShardsContent {
 	public static final Identifier SHARD_BLOCK_ID = ScatteredShards.id("shard_block");
 	public static final Identifier SHARD_TABLET_ID = ScatteredShards.id("shard_tablet");
+	public static final Identifier SHARD_ITEM_ID = ScatteredShards.id("shard_item");
 
 	public static final Block SHARD_BLOCK = new ShardBlock();
 	public static final Item SHARD_BLOCK_ITEM = new BlockItem(SHARD_BLOCK, new Item.Settings());
 
 	public static final Item SHARD_TABLET = new ShardTablet(new Item.Settings());
+	public static final Item SHARD_ITEM = new ShardItem(new Item.Settings());
 
 	public static final BlockEntityType<ShardBlockEntity> SHARD_BLOCKENTITY = BlockEntityType.Builder.create(ShardBlockEntity::new, SHARD_BLOCK).build();
 
+	public static final ComponentType<Identifier> SHARD_ID_COMPONENT = Registry.register(
+		Registries.DATA_COMPONENT_TYPE,
+		ScatteredShards.id("shard_id"),
+		ComponentType.<Identifier>builder().codec(Identifier.CODEC).build()
+	);
+
 	public static void register() {
 		Registry.register(Registries.BLOCK, SHARD_BLOCK_ID, SHARD_BLOCK);
 		Registry.register(Registries.ITEM, SHARD_BLOCK_ID, SHARD_BLOCK_ITEM);
 		Registry.register(Registries.BLOCK_ENTITY_TYPE, SHARD_BLOCK_ID, SHARD_BLOCKENTITY);
 		Registry.register(Registries.ITEM, SHARD_TABLET_ID, SHARD_TABLET);
+		Registry.register(Registries.ITEM, SHARD_ITEM_ID, SHARD_ITEM);
 	}
 
 	@Environment(EnvType.CLIENT)

src/main/java/net/modfest/scatteredshards/api/GlobalCollection.java

@@ -6,6 +6,7 @@
 import net.minecraft.util.Identifier;
 
 import java.util.HashMap;
+import java.util.Objects;
 
 public class GlobalCollection {
 	int totalPlayers;
@@ -31,8 +32,7 @@ public HashMap<Identifier, Integer> collectionTracker() {
 	);
 
 	public int getCount(Identifier shard) {
-		var count = collectionTracker.get(shard);
-		return count != null ? count : 0;
+		return Objects.requireNonNullElse(collectionTracker.get(shard), 0);
 	}
 
 	public void update(Identifier shard, int change, int playerCount) {

src/main/java/net/modfest/scatteredshards/api/MiniRegistry.java

@@ -99,7 +99,7 @@ public void syncFromJson(JsonObject obj) {
 	public static <T> PacketCodec<RegistryByteBuf, MiniRegistry<T>> createPacketCodec(Codec<T> valueCodec) {
 		return PacketCodecs.map(HashMap::new, Identifier.PACKET_CODEC, PacketCodecs.codec(valueCodec)).xmap(
 			map -> {
-				var registry = new MiniRegistry<>(valueCodec);
+				MiniRegistry<T> registry = new MiniRegistry<>(valueCodec);
 				registry.putAll(map);
 				return registry;
 			},

src/main/java/net/modfest/scatteredshards/api/ScatteredShardsAPI.java

@@ -55,7 +55,7 @@ public static void updateClientShardLibrary(ShardLibrary library) {
 	}
 
 	public static ShardCollection getServerCollection(UUID uuid) {
-		var collection = serverCollections.get(uuid);
+		ShardCollection collection = serverCollections.get(uuid);
 		if (collection == null) {
 			collection = new ShardCollectionImpl();
 			serverCollections.put(uuid, collection);
@@ -74,8 +74,8 @@ public static GlobalCollection getServerGlobalCollection() {
 
 	public static void calculateShardProgress() {
 		if (serverGlobalCollection != null) return;
-		var shardCountMap = new HashMap<Identifier, Integer>();
-		var totalCount = serverCollections.size();
+		HashMap<Identifier, Integer> shardCountMap = new HashMap<>();
+		int totalCount = serverCollections.size();
 
 		serverCollections.forEach(((uuid, identifiers) -> identifiers.forEach(identifier -> shardCountMap.compute(identifier, (k, count) -> count != null ? 1 + count : 1))));
 
@@ -117,7 +117,7 @@ public static void updateClientGlobalCollection(GlobalCollection collection) {
 	}
 
 	public static boolean triggerShardCollection(ServerPlayerEntity player, Identifier shardId) {
-		var collection = getServerCollection(player);
+		ShardCollection collection = getServerCollection(player);
 		if (collection.add(shardId)) {
 			if (player.getServer() != null) collectionPersistentState.markDirty();
 
@@ -130,7 +130,7 @@ public static boolean triggerShardCollection(ServerPlayerEntity player, Identifi
 	}
 
 	public static boolean triggerShardUncollection(ServerPlayerEntity player, Identifier shardId) {
-		var collection = getServerCollection(player);
+		ShardCollection collection = getServerCollection(player);
 		if (collection.remove(shardId)) {
 			if (player.getServer() != null) collectionPersistentState.markDirty();
 

src/main/java/net/modfest/scatteredshards/api/ShardLibrary.java

@@ -11,7 +11,9 @@
 import net.modfest.scatteredshards.api.shard.ShardType;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.HashMap;
+import java.util.Map;
 import java.util.stream.Stream;
 
 /**
@@ -41,14 +43,14 @@ public interface ShardLibrary {
 		PacketCodecs.map(HashMap::new, Identifier.PACKET_CODEC, PacketCodecs.collection(ArrayList::new, Identifier.PACKET_CODEC)).xmap(
 			map -> {
 				SetMultimap<Identifier, Identifier> multimap = MultimapBuilder.hashKeys().hashSetValues(3).build();
-				for (var entry : map.entrySet()) {
+				for (Map.Entry<Identifier, ArrayList<Identifier>> entry : map.entrySet()) {
 					multimap.putAll(entry.getKey(), entry.getValue());
 				}
 				return multimap;
 			},
 			multimap -> {
 				HashMap<Identifier, ArrayList<Identifier>> map = new HashMap<>();
-				for (var entry : multimap.asMap().entrySet()) {
+				for (Map.Entry<Identifier, Collection<Identifier>> entry : multimap.asMap().entrySet()) {
 					map.put(entry.getKey(), new ArrayList<>(entry.getValue()));
 				}
 				return map;

src/main/java/net/modfest/scatteredshards/api/impl/ShardCollectionPersistentState.java

@@ -24,7 +24,7 @@ public class ShardCollectionPersistentState extends PersistentState {
 	);
 
 	public static ShardCollectionPersistentState get(MinecraftServer server) {
-		var result = server.getOverworld().getPersistentStateManager().getOrCreate(TYPE, ScatteredShards.ID + "_collections");
+		ShardCollectionPersistentState result = server.getOverworld().getPersistentStateManager().getOrCreate(TYPE, ScatteredShards.ID + "_collections");
 		ScatteredShardsAPI.register(result);
 		return result;
 	}

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

@@ -15,6 +15,8 @@
 import net.modfest.scatteredshards.ScatteredShards;
 import net.modfest.scatteredshards.ScatteredShardsContent;
 import net.modfest.scatteredshards.api.ScatteredShardsAPI;
+import net.modfest.scatteredshards.api.ShardCollection;
+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.command.ClientShardCommand;
@@ -76,13 +78,12 @@ public static void triggerShardModificationToast(Identifier shardId, boolean suc
 	}
 
 	public static void openShardTablet() {
-		final var client = MinecraftClient.getInstance();
-		client.send(() -> {
-			final var library = ScatteredShardsAPI.getClientLibrary();
-			final var collection = ScatteredShardsAPI.getClientCollection();
+		MinecraftClient.getInstance().send(() -> {
+			final ShardLibrary library = ScatteredShardsAPI.getClientLibrary();
+			final ShardCollection collection = ScatteredShardsAPI.getClientCollection();
 
-			client.setScreen(new ShardTabletGuiDescription.Screen(collection, library));
-			client.getSoundManager().play(PositionedSoundInstance.master(SoundEvents.ITEM_BOOK_PAGE_TURN, 1.0f, 1.0f));
+			MinecraftClient.getInstance().setScreen(new ShardTabletGuiDescription.Screen(collection, library));
+			MinecraftClient.getInstance().getSoundManager().play(PositionedSoundInstance.master(SoundEvents.ITEM_BOOK_PAGE_TURN, 1.0f, 1.0f));
 		});
 	}