Skip to content

Fix item export resolution not scaling with size parameter #36

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
rubensworks merged 3 commits into from
Apr 8, 2026
Merged

Fix item export resolution not scaling with size parameter #36

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ee8cf4f
Initial plan
Copilot Apr 8, 2026
f5ca039
Fix item export resolution not scaling with size parameter
Copilot Apr 8, 2026
5f82500
Address code review: rename newGuiScale to exportGuiScale, capture wi…
Copilot Apr 8, 2026
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
26 changes: 20 additions & 6 deletions loader-common/src/main/java/org/cyclops/iconexporter/client/gui/ScreenIconExporter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import net.minecraft.client.gui.GuiGraphicsExtractor;
import net.minecraft.client.gui.screens.Screen;
import net.minecraft.client.renderer.fog.FogRenderer;
import net.minecraft.client.renderer.state.WindowRenderState;
import net.minecraft.core.HolderLookup;
import net.minecraft.core.registries.BuiltInRegistries;
import net.minecraft.nbt.Tag;
Expand Down Expand Up @@ -98,8 +99,15 @@ protected boolean shouldExport(Identifier resourceLocation) {
}

public Queue<IExportTask> createExportTasks() {
float scaleModified = (float) (this.scaleImage / this.scaleGui);
int scaleModifiedRounded = (int) Math.ceil(scaleModified);
// Compute a guiScale that makes the item atlas render at scaleImage pixels per slot.
// GuiRenderer uses slotTextureSize = 16 * guiScale, so guiScale = scaleImage / 16 gives
// slotTextureSize = scaleImage. With this guiScale, items drawn at natural 16x16 GUI units
// will occupy exactly scaleImage x scaleImage physical pixels.
int exportGuiScale = Math.max(1, this.scaleImage / 16);
// Natural item slot size in GUI units (rendered at exportGuiScale px/unit = scaleImage px).
int drawSize = 16;
// Captured once; windowRenderState is a stable final field of the singleton GameRenderState.
WindowRenderState windowRenderState = Minecraft.getInstance().gameRenderer.getGameRenderState().windowRenderState;

// Initialize our output folder
File baseDir = new File(Minecraft.getInstance().gameDirectory, "icon-exports-x" + this.scaleImage);
Expand All @@ -118,9 +126,12 @@ public Queue<IExportTask> createExportTasks() {
exportTasks.add((guiGraphics) -> {
taskProcessed.set(taskProcessed.get() + 1);
signalStatus(tasks, taskProcessed);
guiGraphics.fill(0, 0, scaleModifiedRounded, scaleModifiedRounded, BACKGROUND_COLOR);
ItemRenderUtil.renderFluid(guiGraphics, fluidEntry.getValue(), scaleModified, this.helpers);
int originalGuiScale = windowRenderState.guiScale;
windowRenderState.guiScale = exportGuiScale;
guiGraphics.fill(0, 0, drawSize, drawSize, BACKGROUND_COLOR);
ItemRenderUtil.renderFluid(guiGraphics, fluidEntry.getValue(), drawSize, this.helpers);
flushRenderBuffer();
windowRenderState.guiScale = originalGuiScale;
ImageExportUtil.exportImageFromScreenshot(baseDir, baseFilename, this.scaleImage, BACKGROUND_COLOR, this.mod);
});
}
Expand All @@ -140,9 +151,12 @@ public Queue<IExportTask> createExportTasks() {
exportTasks.add((guiGraphics) -> {
taskProcessed.set(taskProcessed.get() + 1);
signalStatus(tasks, taskProcessed);
guiGraphics.fill(0, 0, scaleModifiedRounded, scaleModifiedRounded, BACKGROUND_COLOR);
ItemRenderUtil.renderItem(guiGraphics, itemStack, scaleModified);
int originalGuiScale = windowRenderState.guiScale;
windowRenderState.guiScale = exportGuiScale;
guiGraphics.fill(0, 0, drawSize, drawSize, BACKGROUND_COLOR);
ItemRenderUtil.renderItem(guiGraphics, itemStack, drawSize);
flushRenderBuffer();
windowRenderState.guiScale = originalGuiScale;
ImageExportUtil.exportImageFromScreenshot(baseDir, baseFilename, this.scaleImage, BACKGROUND_COLOR, this.mod);
if (!itemStack.getComponents().isEmpty() && GeneralConfig.fileNameHashComponents) {
ImageExportUtil.exportNbtFile(lookupProvider, baseDir, baseFilename, itemStack.getComponentsPatch(), this.mod, this.helpers);
Expand Down
Loading