GeyserMC-Mirror/Thunder
1
0
Fork 0
mirror of https://github.com/GeyserMC/PackConverter.git synced 2025-12-30 20:29:24 +00:00
Code Issues Releases Activity

Fix up mappings

Browse Source
This commit is contained in:
Aurora
2025-06-21 22:08:02 +01:00
parent 04096a5795
commit 02f7df7021
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
converter/src/main/java/org/geysermc/pack/converter/converter/texture/TextureConverter.java
View File

@@ -84,9 +84,11 @@ public class TextureConverter implements Converter<TextureConversionData> {
String output = texture.key().value();
Path texturePath = context.outputDirectory().resolve(BEDROCK_TEXTURES_LOCATION);
Path outputPath = texturePath.resolve(output);
String relativePath = texturePath.relativize(outputPath).toString();
String relativePath = texturePath.relativize(outputPath).toString().replace(File.separatorChar, '/');
String rootPath = relativePath.substring(0, relativePath.indexOf(File.separator));
if (relativePath.endsWith(".png")) relativePath = relativePath.substring(0, relativePath.length() - 4);
String rootPath = relativePath.substring(0, relativePath.indexOf('/'));
Object mappingObject = mappings.textures(relativePath);
String input = null;
@@ -98,13 +100,13 @@ public class TextureConverter implements Converter<TextureConversionData> {
if (mappingObject instanceof Map<?,?> keyMappings) {
String sanitizedName = output.substring(output.indexOf(File.separator) + 1).replace(".png", "");
String bedrockPath = (String) keyMappings.get(sanitizedName);
String bedrockPath = (String) keyMappings.get(sanitizedName.substring(rootPath.length() + 1));
if (bedrockPath != null) {
output = output.replace(sanitizedName, bedrockPath);
output = output.replace(sanitizedName, rootPath + "/" + bedrockPath);
}
} else if (mappingObject instanceof String str) {
output = str;
input = output.substring(0, relativePath.indexOf(File.separator));
output = str + ".png";
input = output.substring(0, output.indexOf('/'));
}
if (input == null) {
@@ -115,7 +117,7 @@ public class TextureConverter implements Converter<TextureConversionData> {
if (context.data().textureSubdirectory() != null) {
bedrockDirectory = bedrockDirectory + "/" + context.data().textureSubdirectory();
}
outputPath = texturePath.resolve(bedrockDirectory + "/" + output.substring(input.length()));
outputPath = texturePath.resolve((bedrockDirectory + "/" + output.substring(input.length())).replace('/', File.separatorChar));
TransformedTexture transformedTexture = new TransformedTexture(texture, outputPath);