Remove support for invalid paths

Author: PepperCode1

src/main/java/me/pepperbell/continuity/client/mixin/IdentifierMixin.java

@@ -2,51 +2,41 @@
 
 import java.util.List;
 
-import org.jetbrains.annotations.Nullable;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.ModifyVariable;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
-import me.pepperbell.continuity.client.mixinterface.LifecycledResourceManagerImplExtension;
 import me.pepperbell.continuity.client.resource.ResourceRedirectHandler;
 import net.minecraft.resource.LifecycledResourceManagerImpl;
 import net.minecraft.resource.ResourcePack;
 import net.minecraft.resource.ResourceType;
 import net.minecraft.util.Identifier;
 
 @Mixin(LifecycledResourceManagerImpl.class)
-abstract class LifecycledResourceManagerImplMixin implements LifecycledResourceManagerImplExtension {
+abstract class LifecycledResourceManagerImplMixin {
 	@Unique
-	private ResourceRedirectHandler continuity$redirectHandler;
-
-	@Override
-	@Nullable
-	public ResourceRedirectHandler continuity$getRedirectHandler() {
-		return continuity$redirectHandler;
-	}
+	private boolean continuity$useRedirects = false;
 
 	@Inject(method = "<init>(Lnet/minecraft/resource/ResourceType;Ljava/util/List;)V", at = @At("TAIL"))
 	private void continuity$onTailInit(ResourceType type, List<ResourcePack> packs, CallbackInfo ci) {
-		if (type == ResourceType.CLIENT_RESOURCES) {
-			continuity$redirectHandler = new ResourceRedirectHandler();
-		}
+		continuity$useRedirects = type == ResourceType.CLIENT_RESOURCES;
 	}
 
 	@ModifyVariable(method = "getResource(Lnet/minecraft/util/Identifier;)Ljava/util/Optional;", at = @At("HEAD"), argsOnly = true)
 	private Identifier continuity$redirectGetResourceId(Identifier id) {
-		if (continuity$redirectHandler != null) {
-			return continuity$redirectHandler.redirect(id);
+		if (continuity$useRedirects) {
+			return ResourceRedirectHandler.redirect(id);
 		}
 		return id;
 	}
 
 	@ModifyVariable(method = "getAllResources(Lnet/minecraft/util/Identifier;)Ljava/util/List;", at = @At("HEAD"), argsOnly = true)
 	private Identifier continuity$redirectGetAllResourcesId(Identifier id) {
-		if (continuity$redirectHandler != null) {
-			return continuity$redirectHandler.redirect(id);
+		if (continuity$useRedirects) {
+			return ResourceRedirectHandler.redirect(id);
 		}
 		return id;
 	}

src/main/java/me/pepperbell/continuity/client/mixin/LifecycledResourceManagerImplMixin.java

@@ -135,7 +135,7 @@ public void init() {
 	}
 
 	protected void parseMatchTiles() {
-		matchTilesSet = PropertiesParsingHelper.parseMatchTiles(properties, "matchTiles", resourceId, packId, ResourceRedirectHandler.get(resourceManager));
+		matchTilesSet = PropertiesParsingHelper.parseMatchTiles(properties, "matchTiles", resourceId, packId);
 		if (matchTilesSet != null && matchTilesSet.isEmpty()) {
 			valid = false;
 		}
@@ -626,7 +626,6 @@ protected boolean isValid() {
 	protected void resolveTiles() {
 		textureDependencies = new ObjectOpenHashSet<>();
 		spriteIds = new ObjectArrayList<>();
-		ResourceRedirectHandler redirectHandler = ResourceRedirectHandler.get(resourceManager);
 
 		for (Identifier tile : tiles) {
 			SpriteIdentifier spriteId;
@@ -635,20 +634,22 @@ protected void resolveTiles() {
 			} else if (tile.equals(SPECIAL_DEFAULT_ID)) {
 				spriteId = SPECIAL_DEFAULT_SPRITE_ID;
 			} else {
-				String namespace = tile.getNamespace();
 				String path = tile.getPath();
 				if (path.startsWith("textures/")) {
 					path = path.substring(9);
 					if (path.endsWith(".png")) {
 						path = path.substring(0, path.length() - 4);
 					}
 
-					spriteId = TextureUtil.toSpriteId(Identifier.of(namespace, path));
+					spriteId = TextureUtil.toSpriteId(tile.withPath(path));
 					textureDependencies.add(spriteId);
-				} else if (redirectHandler != null) {
-					path = redirectHandler.getSourceSpritePath(path);
+				} else if (path.startsWith("optifine/")) {
+					path = ResourceRedirectHandler.SPRITE_PATH_START + path.substring(9);
+					if (path.endsWith(".png")) {
+						path = path.substring(0, path.length() - 4);
+					}
 
-					spriteId = TextureUtil.toSpriteId(Identifier.of(namespace, path));
+					spriteId = TextureUtil.toSpriteId(tile.withPath(path));
 					textureDependencies.add(spriteId);
 				} else {
 					spriteId = TextureUtil.MISSING_SPRITE_ID;

src/main/java/me/pepperbell/continuity/client/mixin/NamespaceResourceManagerMixin.java

@@ -33,7 +33,7 @@ public final class PropertiesParsingHelper {
 	public static final Predicate<BlockState> EMPTY_BLOCK_STATE_PREDICATE = state -> false;
 
 	@Nullable
-	public static Set<Identifier> parseMatchTiles(Properties properties, String propertyKey, Identifier fileLocation, String packId, @Nullable ResourceRedirectHandler redirectHandler) {
+	public static Set<Identifier> parseMatchTiles(Properties properties, String propertyKey, Identifier fileLocation, String packId) {
 		String matchTilesStr = properties.getProperty(propertyKey);
 		if (matchTilesStr == null) {
 			return null;
@@ -81,10 +81,7 @@ public static Set<Identifier> parseMatchTiles(Properties properties, String prop
 					if (path.startsWith("textures/")) {
 						path = path.substring(9);
 					} else if (path.startsWith("optifine/")) {
-						if (redirectHandler == null) {
-							continue;
-						}
-						path = redirectHandler.getSourceSpritePath(path + ".png");
+						path = ResourceRedirectHandler.SPRITE_PATH_START + path.substring(9);
 						if (namespace == null) {
 							namespace = fileLocation.getNamespace();
 						}

src/main/java/me/pepperbell/continuity/client/mixin/ReloadableResourceManagerImplAccessor.java

@@ -8,7 +8,6 @@
 
 import me.pepperbell.continuity.client.properties.BasicConnectingCtmProperties;
 import me.pepperbell.continuity.client.properties.PropertiesParsingHelper;
-import me.pepperbell.continuity.client.resource.ResourceRedirectHandler;
 import net.minecraft.block.BlockState;
 import net.minecraft.resource.ResourceManager;
 import net.minecraft.resource.ResourcePack;
@@ -40,7 +39,7 @@ public OverlayPropertiesSection getOverlayPropertiesSection() {
 	}
 
 	protected void parseConnectTiles() {
-		connectTilesSet = PropertiesParsingHelper.parseMatchTiles(properties, "connectTiles", resourceId, packId, ResourceRedirectHandler.get(resourceManager));
+		connectTilesSet = PropertiesParsingHelper.parseMatchTiles(properties, "connectTiles", resourceId, packId);
 	}
 
 	protected void parseConnectBlocks() {

src/main/java/me/pepperbell/continuity/client/mixinterface/LifecycledResourceManagerImplExtension.java

@@ -21,7 +21,6 @@
 import me.pepperbell.continuity.api.client.QuadProcessor;
 import me.pepperbell.continuity.client.ContinuityClient;
 import me.pepperbell.continuity.client.model.QuadProcessors;
-import me.pepperbell.continuity.client.util.BooleanState;
 import me.pepperbell.continuity.client.util.biome.BiomeHolderManager;
 import net.minecraft.client.texture.Sprite;
 import net.minecraft.client.util.SpriteIdentifier;
@@ -58,14 +57,11 @@ public static LoadingResult loadAll(ResourceManager resourceManager) {
 	private LoadingResult loadAll() {
 		int packPriority = 0;
 		Iterator<ResourcePack> iterator = resourceManager.streamResourcePacks().iterator();
-		BooleanState invalidIdentifierState = InvalidIdentifierStateHolder.get();
-		invalidIdentifierState.enable();
 		while (iterator.hasNext()) {
 			ResourcePack pack = iterator.next();
 			loadAll(pack, packPriority);
 			packPriority++;
 		}
-		invalidIdentifierState.disable();
 
 		containers.sort(Comparator.reverseOrder());