upstream/Angelica
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/Angelica.git synced 2026-11-13 17:04:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Quick fix PBR Resourcepack loader error (#1043)

Browse Source
This commit is contained in:
ABKQPO authored and GitHub committed 2025-10-29 08:01:52 -07:00
1 parent c9d59c3b90
commit 5b67eaa474
2 files changed
+39 -12
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/net/coderbot/iris/texture/pbr/PBRType.java
+34 -11
View File
@@ -4,6 +4,9 @@ import net.minecraft.util.ResourceLocation;
import org.apache.commons.io.FilenameUtils;
import org.jetbrains.annotations.Nullable;
import java.net.URI;
import java.net.URISyntaxException;
public enum PBRType {
NORMAL("_n", 0x7F7FFFFF),
SPECULAR("_s", 0x00000000);
@@ -26,17 +29,37 @@ public enum PBRType {
return defaultValue;
}
public ResourceLocation appendToFileLocation(ResourceLocation location) {
String path = location.getResourcePath();
String newPath;
int extensionIndex = FilenameUtils.indexOfExtension(path);
if (extensionIndex != -1) {
newPath = path.substring(0, extensionIndex) + suffix + path.substring(extensionIndex);
} else {
newPath = path + suffix;
}
return new ResourceLocation(location.getResourceDomain(), newPath);
}
public ResourceLocation appendToFileLocation(ResourceLocation location) {
String domain = location.getResourceDomain();
String path = location.getResourcePath();
String newPath;
try {
URI uri = new URI(null, null, path, null);
String cleanPath = uri.getPath();
int extensionIndex = FilenameUtils.indexOfExtension(cleanPath);
if (extensionIndex != -1) {
newPath = cleanPath.substring(0, extensionIndex) + suffix + cleanPath.substring(extensionIndex);
} else {
newPath = cleanPath + suffix;
}
URI newUri = new URI(null, null, newPath, null);
newPath = newUri.getPath();
} catch (URISyntaxException e) {
String fallback = path.replace(':', '/');
int extensionIndex = FilenameUtils.indexOfExtension(fallback);
if (extensionIndex != -1) {
newPath = fallback.substring(0, extensionIndex) + suffix + fallback.substring(extensionIndex);
} else {
newPath = fallback + suffix;
}
}
return new ResourceLocation(domain, newPath);
}
/**
* Returns the PBR type corresponding to the suffix of the given file location.
src/main/java/net/coderbot/iris/texture/pbr/loader/AtlasPBRLoader.java
+5 -1
View File
@@ -103,7 +103,11 @@ public class AtlasPBRLoader implements PBRTextureLoader<TextureMap> {
NativeImage nativeImage = NativeImage.read(resource.getInputStream());
AnimationMetadataSection animationMetadata = (AnimationMetadataSection) resource.getMetadata("animation");
if (animationMetadata == null) {
animationMetadata = new AnimationMetadataSection(Lists.newArrayList(), -1, -1, -1);
final IResource resourceOriginal = resourceManager.getResource(imageLocation);
animationMetadata = (AnimationMetadataSection) resourceOriginal.getMetadata("animation");
if (animationMetadata == null) {
animationMetadata = new AnimationMetadataSection(Lists.newArrayList(), -1, -1, -1);
}
}
final Pair<Integer, Integer> frameSize = this.getFrameSize(nativeImage.getWidth(), nativeImage.getHeight(), animationMetadata);