Fix and rareness customisation

+Fixed bug with Tieredz (Relics can still be combined with Tieredz items and keep both Tieredz and RelicEx attributes).

+Added resourcepack customisation of rareness text colours.

*Incremented version.

Author: CleverNucleus

gradle.properties

@@ -4,7 +4,7 @@ minecraft_version=1.18.2
 yarn_mappings=1.18.2+build.4
 loader_version=0.14.14
 
-mod_version = 3.3.0+1.18.2
+mod_version = 3.3.1+1.18.2
 maven_group = com.github.clevernucleus
 archives_base_name = relicex
 

src/main/java/com/github/clevernucleus/relicex/RelicExClient.java

@@ -1,25 +1,50 @@
 package com.github.clevernucleus.relicex;
 
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.Reader;
+import java.nio.charset.StandardCharsets;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.Executor;
 import java.util.function.Function;
 
+import org.slf4j.Logger;
+
 import com.github.clevernucleus.armorrenderlib.api.ArmorRenderLib;
 import com.github.clevernucleus.armorrenderlib.api.ArmorRenderProvider;
 import com.github.clevernucleus.dataattributes.api.event.AttributesReloadedEvent;
 import com.github.clevernucleus.relicex.impl.EntityAttributeCollection;
 import com.github.clevernucleus.relicex.impl.Rareness;
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.annotations.Expose;
+import com.mojang.logging.LogUtils;
 
 import net.fabricmc.api.ClientModInitializer;
+import net.fabricmc.fabric.api.resource.ResourceManagerHelper;
+import net.fabricmc.fabric.api.resource.SimpleResourceReloadListener;
 import net.fabricmc.fabric.api.util.NbtType;
 import net.minecraft.client.item.ModelPredicateProviderRegistry;
 import net.minecraft.client.world.ClientWorld;
 import net.minecraft.entity.EquipmentSlot;
 import net.minecraft.entity.LivingEntity;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NbtCompound;
+import net.minecraft.resource.Resource;
+import net.minecraft.resource.ResourceManager;
+import net.minecraft.resource.ResourceType;
+import net.minecraft.util.Formatting;
 import net.minecraft.util.Identifier;
+import net.minecraft.util.JsonHelper;
+import net.minecraft.util.profiler.Profiler;
 
 public class RelicExClient implements ClientModInitializer {
 	private static final Identifier RARENESS = new Identifier(RelicEx.MODID, "rareness");
+	private static final RarenessColor RARENESS_COLOR = new RarenessColor();
 
 	private static float predicate(ItemStack itemStack, ClientWorld world, LivingEntity livingEntity, int i) {
 		NbtCompound tag = itemStack.getNbt();
@@ -37,10 +62,82 @@ private static ArmorRenderProvider render(final ItemStack itemStack, final Livin
 		return s -> s.accept(texture.apply(Rareness.fromKey(tag.getString(EntityAttributeCollection.KEY_RARENESS))), 0xFFFFFF, false);
 	}
 
+	public static Formatting getColor(final Rareness rareness, final Formatting fallback) {
+		return RelicExClient.RARENESS_COLOR.data.getOrDefault(rareness, fallback);
+	}
+	
 	@Override
 	public void onInitializeClient() {
 		RelicEx.RELICS.forEach(item -> ModelPredicateProviderRegistry.register(item, RARENESS, RelicExClient::predicate));
 		ArmorRenderLib.register(RelicExClient::render, RelicEx.HEAD_RELIC, RelicEx.CHEST_RELIC);
 		AttributesReloadedEvent.EVENT.register(RelicEx.RARITY_MANAGER::onPropertiesLoaded);
+		ResourceManagerHelper.get(ResourceType.CLIENT_RESOURCES).registerReloadListener(RARENESS_COLOR);
+	}
+	
+
+	private static final class RarenessFormatting {
+		@Expose protected Map<Rareness, Formatting> values;
+	}
+	
+	private static final class RarenessColor implements SimpleResourceReloadListener<Map<Rareness, Formatting>> {
+		private static final Gson GSON = (new GsonBuilder()).excludeFieldsWithoutExposeAnnotation().create();
+		private static final int PATH_SUFFIX_LENGTH = ".json".length();
+		private static final Logger LOGGER = LogUtils.getLogger();
+		private static final String DIRECTORY = "rareness";
+		private static final Identifier ID = new Identifier(RelicEx.MODID, DIRECTORY);
+		
+		protected Map<Rareness, Formatting> data = new HashMap<Rareness, Formatting>();
+		
+		protected RarenessColor() {}
+		
+		@Override
+		public CompletableFuture<Map<Rareness, Formatting>> load(ResourceManager manager, Profiler profiler, Executor executor) {
+			return CompletableFuture.supplyAsync(() -> {
+				Map<Identifier, RarenessFormatting> cache = new HashMap<Identifier, RarenessFormatting>();
+				int length = DIRECTORY.length() + 1;
+				
+				for(Identifier resource : manager.findResources(DIRECTORY, file -> file.endsWith("colors.json"))) {
+					String path = resource.getPath();
+					Identifier identifier = new Identifier(resource.getNamespace(), path.substring(length, path.length() - PATH_SUFFIX_LENGTH));
+					
+					try (
+						Resource resourceStream = manager.getResource(resource);
+						InputStream inputStream = resourceStream.getInputStream();
+						Reader readerStream = new BufferedReader(new InputStreamReader(inputStream, StandardCharsets.UTF_8));
+					) {
+						RarenessFormatting json = JsonHelper.deserialize(GSON, readerStream, RarenessFormatting.class);
+						
+						if(json != null) {
+							RarenessFormatting object = cache.put(identifier, json);
+							
+							if(object != null) throw new IllegalStateException("Duplicate asset file ignored with ID " + identifier);
+						} else {
+							LOGGER.error("Couldn't load asset file {} from {} as it's null or empty", identifier, resource);
+						}
+						
+						resourceStream.close();
+					} catch(IOException exception) {
+						LOGGER.error("Couldn't parse asset file {} from {}", identifier, resource, exception);
+					}
+				}
+				
+				Map<Rareness, Formatting> data = new HashMap<Rareness, Formatting>();
+				cache.forEach((id, json) -> json.values.forEach(data::put));
+				
+				return data;
+			}, executor);
+		}
+		
+		@Override
+		public CompletableFuture<Void> apply(Map<Rareness, Formatting> data, ResourceManager manager, Profiler profiler, Executor executor) {
+			return CompletableFuture.runAsync(() -> {
+				this.data = data;
+			}, executor);
+		}
+		
+		@Override
+		public Identifier getFabricId() {
+			return ID;
+		}
 	}
 }

src/main/java/com/github/clevernucleus/relicex/impl/Rareness.java

@@ -4,6 +4,7 @@
 
 import com.github.clevernucleus.dataattributes.api.util.Maths;
 import com.github.clevernucleus.relicex.RelicEx;
+import com.github.clevernucleus.relicex.RelicExClient;
 
 import net.minecraft.sound.SoundEvent;
 import net.minecraft.sound.SoundEvents;
@@ -72,7 +73,7 @@ public SoundEvent equipSound() {
 	}
 
 	public Text formatted() {
-		return (new TranslatableText("rareness." + RelicEx.MODID + "." + this.key)).formatted(this.formatting);
+		return (new TranslatableText("rareness." + RelicEx.MODID + "." + this.key)).formatted(RelicExClient.getColor(this, this.formatting));
 	}
 
 	@Override

src/main/resources/data/autotag/tags/items/prevent/c/chestplates.json

@@ -0,0 +1,6 @@
+{
+    "replace": false,
+    "values": [
+        "relicex:chest_relic"
+    ]
+}

src/main/resources/data/autotag/tags/items/prevent/c/helmets.json

@@ -0,0 +1,6 @@
+{
+    "replace": false,
+    "values": [
+        "relicex:head_relic"
+    ]
+}