Skip to content

Update dev branch #239

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lowercasebtw merged 3 commits into from
Jan 10, 2025
Merged

Update dev branch #239

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7d3f07f
Fix a few backwards-converter bugs in NameConverter & EnchantPathConv…
lowercasebtw Dec 22, 2024
ca0e28c
Use Logger.error
lowercasebtw Dec 22, 2024
7420534
Fix a few bugs in Backwards conversion (#238)
CoryBorek Jan 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 31 additions & 10 deletions ...wards/src/main/java/com/agentdid127/resourcepack/backwards/impl/EnchantPathConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,39 @@ public EnchantPathConverter(PackConverter packConverter) {
@Override
public void convert(Pack pack) throws IOException {
Path miscPath = pack.getWorkingPath().resolve("assets/minecraft/textures/misc".replace("/", File.separator));
if (miscPath.toFile().exists()) {
return;
}

if (miscPath.resolve("enchanted_glint_item.png").toFile().exists())
Files.move(miscPath.resolve("enchanted_glint_item.png"), miscPath.resolve("enchanted_item_glint.png"));
else if (miscPath.resolve("enchanted_glint_entity.png").toFile().exists())
Files.move(miscPath.resolve("enchanted_glint_entity.png"), miscPath.resolve("enchanted_item_glint.png"));
Path enchantGlintItemPath = miscPath.resolve("enchanted_glint_item.png");
Path enchantGlintEntityPath = miscPath.resolve("enchanted_glint_entity.png");
Path newEnchantGlintItemPath = miscPath.resolve("enchanted_item_glint.png");
if (enchantGlintItemPath.toFile().exists()) {
if (newEnchantGlintItemPath.toFile().exists()) {
newEnchantGlintItemPath.toFile().delete();
}
Files.move(enchantGlintItemPath, newEnchantGlintItemPath);
} else if (enchantGlintEntityPath.toFile().exists()) {
if (newEnchantGlintItemPath.toFile().exists()) {
newEnchantGlintItemPath.toFile().delete();
}
Files.move(enchantGlintEntityPath, newEnchantGlintItemPath);
}

if (miscPath.resolve("enchanted_glint_item.png.mcmeta").toFile().exists())
Files.move(miscPath.resolve("enchanted_glint_item.png.mcmeta"),
miscPath.resolve("enchanted_item_glint.png.mcmeta"));
else if (miscPath.resolve("enchanted_glint_entity.png.mcmeta").toFile().exists())
Files.move(miscPath.resolve("enchanted_glint_entity.png.mcmeta"),
miscPath.resolve("enchanted_item_glint.png.mcmeta"));
Path enchantGlintItemMetaPath = miscPath.resolve("enchanted_glint_item.png.mcmeta");
Path enchantGlintEntityMetaPath = miscPath.resolve("enchanted_glint_entity.png.mcmeta");
Path newEnchantGlintItemMetaPath = miscPath.resolve("enchanted_item_glint.png.mcmeta");
if (enchantGlintItemMetaPath.toFile().exists()) {
if (newEnchantGlintItemMetaPath.toFile().exists()) {
newEnchantGlintItemMetaPath.toFile().delete();
}
Files.move(enchantGlintItemMetaPath, newEnchantGlintItemMetaPath);
} else if (enchantGlintEntityMetaPath.toFile().exists()) {
if (newEnchantGlintItemMetaPath.toFile().exists()) {
newEnchantGlintItemMetaPath.toFile().delete();
}
Files.move(enchantGlintEntityMetaPath, newEnchantGlintItemMetaPath);
}

Files.deleteIfExists(miscPath.resolve("enchanted_glint_entity.png.mcmeta"));
Files.deleteIfExists(miscPath.resolve("enchanted_glint_item.png.mcmeta"));
Expand Down
Loading
Loading