GeyserMC-Mirror/Thunder
1
0
Fork 0
mirror of https://github.com/GeyserMC/PackConverter.git synced 2026-01-04 15:31:36 +00:00
Code Issues Releases Activity

Fix the converter empty check being done after other expensive operations

Browse Source
This commit is contained in:
Aurora
2025-07-21 22:46:21 +01:00
parent 42259e4360
commit 6a7eb92e4c
2 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
converter/src/main/java/org/geysermc/pack/converter/PackConverter.java
View File

@@ -260,6 +260,10 @@ public final class PackConverter {
throw new NullPointerException("Vanilla Pack Path cannot be null");
}
if (this.converters.isEmpty()) {
throw new IllegalStateException("No converters have been added");
}
// Load any image plugins
ImageIO.scanForPlugins();
@@ -271,10 +275,6 @@ public final class PackConverter {
ZipUtils.openFileSystem(this.input, this.compressed, input -> {
this.tmpDir = this.output.toAbsolutePath().getParent().resolve(this.output.getFileName() + "_mcpack/");
if (this.converters.isEmpty()) {
throw new IllegalStateException("No converters have been added");
}
ResourcePack javaResourcePack = this.compressed ? MinecraftResourcePackReader.minecraft().readFromZipFile(this.input) : MinecraftResourcePackReader.minecraft().read(NioDirectoryFileTreeReader.read(this.input));
ResourcePack vanillaResourcePack = MinecraftResourcePackReader.minecraft().readFromZipFile(vanillaPackPath);
BedrockResourcePack bedrockResourcePack = new BedrockResourcePack(this.tmpDir);
@@ -325,9 +325,9 @@ public final class PackConverter {
this.logListener.info("Packaging pack...");
this.packageHandler.pack(this, this.tmpDir, this.output, this.logListener);
this.cleanup();
this.logListener.info("Packaged pack! Cleaning up...");
this.logListener.info("Packaged pack!");
this.cleanup();
return this;
}

5
converter/src/main/java/org/geysermc/pack/converter/converter/texture/transformer/type/ui/FontTransformer.java
View File

@@ -140,11 +140,6 @@ public class FontTransformer implements TextureTransformer {
int desX = position % 16;
int desY = position / 16;
if (fontData.character == 'ʏ') {
context.info(String.valueOf(desX));
context.info(String.valueOf(desY));
}
g.drawImage(
ImageUtil.scale(
ImageUtil.crop(