add automatic reloading on file updates

Author: moehreag

1.21.4/build.gradle.kts

@@ -32,7 +32,7 @@ dependencies {
 		officialMojangMappings {
 			nameSyntheticMembers = true
 		}
-		parchment("org.parchmentmc.data:parchment-1.21.4:2024.12.22@zip")
+		parchment("org.parchmentmc.data:parchment-1.21.4:2024.12.29@zip")
 	})
 
 	modImplementation("net.fabricmc:fabric-loader:${project.property("fabric_loader")}")

1.21.4/src/main/java/io/github/axolotlclient/modules/screenshotUtils/GalleryScreen.java

@@ -32,8 +32,10 @@
 
 import com.mojang.blaze3d.vertex.VertexConsumer;
 import io.github.axolotlclient.AxolotlClientConfig.api.util.Colors;
+import io.github.axolotlclient.api.API;
 import io.github.axolotlclient.api.requests.FriendRequest;
 import io.github.axolotlclient.api.requests.UserRequest;
+import io.github.axolotlclient.util.Watcher;
 import net.fabricmc.loader.api.FabricLoader;
 import net.minecraft.Util;
 import net.minecraft.client.Minecraft;
@@ -59,7 +61,7 @@
 
 public class GalleryScreen extends Screen {
 
-	public static final Path SCREENSHOT_DIR = FabricLoader.getInstance().getGameDir().resolve(Screenshot.SCREENSHOT_DIR);
+	public static final Path SCREENSHOTS_DIR = FabricLoader.getInstance().getGameDir().resolve(Screenshot.SCREENSHOT_DIR);
 
 	private record Tab<T>(Component title, Callable<List<T>> list, Map<T, ImageInstance> loadingCache,
 						  GalleryScreen.Tab.Loader<T> loader) {
@@ -77,7 +79,7 @@ private static <T> Tab<T> of(Component title, Callable<List<T>> list, GalleryScr
 		}
 
 		private static final Tab<Path> LOCAL = of(Component.translatable("gallery.title.local"), () -> {
-			try (Stream<Path> screenshots = Files.list(SCREENSHOT_DIR)) {
+			try (Stream<Path> screenshots = Files.list(SCREENSHOTS_DIR)) {
 				return screenshots.sorted(Comparator.<Path>comparingLong(p -> {
 					try {
 						return Files.getLastModifiedTime(p).toMillis();
@@ -100,37 +102,46 @@ private static <T> Tab<T> of(Component title, Callable<List<T>> list, GalleryScr
 					})).join(), url -> ImageShare.getInstance().downloadImage(url).join());
 
 		interface Loader<T> {
-			 ImageInstance load(T obj) throws Exception;
+			ImageInstance load(T obj) throws Exception;
 		}
 	}
 
 	private Tab<?> current;
 
 	private final Screen parent;
+	private final Watcher watcher;
 
 	public GalleryScreen(Screen parent) {
 		super(Component.translatable("gallery.title"));
 		this.parent = parent;
 		this.current = Tab.LOCAL;
+		this.watcher = Watcher.createSelfTicking(SCREENSHOTS_DIR, () -> {
+			if (current == Tab.LOCAL) {
+				rebuildWidgets();
+			}
+		});
 	}
 
-	private static final int entrySpacing = 10,
+	private static final int entrySpacing = 4,
 		entryWidth = 100,
 		entryHeight = 75,
 		marginLeftRight = 10;
 
 	@Override
 	protected void init() {
+		boolean online = API.getInstance().isAuthenticated();
 		HeaderAndFooterLayout layout = new HeaderAndFooterLayout(this);
 		layout.setHeaderHeight(40);
 		LinearLayout header = layout.addToHeader(LinearLayout.vertical().spacing(4));
 		header.defaultCellSetting().alignHorizontallyCenter();
 		header.addChild(new StringWidget(title, font));
-		header.addChild(new StringWidget(current.title(), font));
+		if (online) {
+			header.addChild(new StringWidget(current.title(), font));
+		}
 
-		int columnCount = (width - (marginLeftRight * 2)) / (entryWidth + entrySpacing);
+		int columnCount = (width - (marginLeftRight * 2) + entrySpacing - 13) / (entryWidth + entrySpacing); // -13 to always have enough space for the scrollbar
 
-		final var area = new ImageList(minecraft, layout.getWidth(), layout.getContentHeight(), layout.getHeaderHeight(), entryHeight + entrySpacing, columnCount * (entryWidth + entrySpacing) + marginLeftRight);
+		final var area = new ImageList(minecraft, layout.getWidth(), layout.getContentHeight(), layout.getHeaderHeight(), entryHeight + entrySpacing, columnCount);
 
 		layout.addToContents(area, LayoutSettings::alignHorizontallyLeft);
 		setInitialFocus(area);
@@ -147,17 +158,21 @@ protected void init() {
 		});
 
 		var footer = layout.addToFooter(LinearLayout.horizontal()).spacing(4);
-		Button.Builder switchTab;
-		if (current == Tab.SHARED) {
-			switchTab = Button.builder(Component.translatable("gallery.tab.local"), b -> setTab(Tab.LOCAL));
-		} else {
-			switchTab = Button.builder(Component.translatable("gallery.tab.shared"), b -> setTab(Tab.SHARED));
+		footer.defaultCellSetting().alignHorizontallyCenter();
+		int buttonWidth = columnCount <= 5 && online ? 100 : 150;
+		if (online) {
+			Button.Builder switchTab;
+			if (current == Tab.SHARED) {
+				switchTab = Button.builder(Component.translatable("gallery.tab.local"), b -> setTab(Tab.LOCAL));
+			} else {
+				switchTab = Button.builder(Component.translatable("gallery.tab.shared"), b -> setTab(Tab.SHARED));
+			}
+			footer.addChild(switchTab.width(buttonWidth).build());
 		}
-		footer.addChild(switchTab.width(100).build());
 		footer.addChild(Button.builder(Component.translatable("gallery.download_external"), b -> minecraft.setScreen(new DownloadImageScreen(this)))
-			.width(100).build());
+			.width(buttonWidth).build());
 		footer.addChild(Button.builder(CommonComponents.GUI_BACK, b -> onClose())
-			.width(100).build());
+			.width(buttonWidth).build());
 
 		layout.arrangeElements();
 		layout.visitWidgets(this::addRenderableWidget);
@@ -169,6 +184,7 @@ public void onClose() {
 		Tab.LOCAL.loadingCache().clear();
 		Tab.SHARED.loadingCache().forEach((s, instance) -> minecraft.getTextureManager().release(instance.id()));
 		Tab.SHARED.loadingCache().clear();
+		Watcher.close(watcher);
 		minecraft.setScreen(parent);
 	}
 
@@ -359,9 +375,9 @@ private static class ImageList extends ContainerObjectSelectionList<ImageListEnt
 
 		private final int rowWidth;
 
-		public ImageList(Minecraft minecraft, int i, int j, int k, int l, int rowWidth) {
+		public ImageList(Minecraft minecraft, int i, int j, int k, int l, int columns) {
 			super(minecraft, i, j, k, l);
-			this.rowWidth = rowWidth;
+			this.rowWidth = columns * (entryWidth + entrySpacing) - entrySpacing;
 		}
 
 		@Override
@@ -374,6 +390,11 @@ public int getRowWidth() {
 			return rowWidth;
 		}
 
+		@Override
+		public int getRowLeft() {
+			return this.getX() + this.width / 2 - this.getRowWidth() / 2;
+		}
+
 		@Override
 		public boolean removeEntry(ImageListEntry entry) {
 			return super.removeEntry(entry);

1.21.4/src/main/java/io/github/axolotlclient/modules/screenshotUtils/ImageScreen.java

@@ -45,6 +45,7 @@
 import net.minecraft.client.gui.components.StringWidget;
 import net.minecraft.client.gui.layouts.HeaderAndFooterLayout;
 import net.minecraft.client.gui.layouts.LinearLayout;
+import net.minecraft.client.gui.layouts.SpacerElement;
 import net.minecraft.client.gui.narration.NarrationElementOutput;
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.client.renderer.RenderType;
@@ -61,7 +62,11 @@ static Screen create(Screen parent, CompletableFuture<ImageInstance> future, boo
 		if (future.isDone()) {
 			return new ImageScreen(parent, future.join(), freeOnClose);
 		}
-		return new LoadingImageScreen(parent, future.thenAccept(i -> Minecraft.getInstance().execute(() -> Minecraft.getInstance().setScreen(new ImageScreen(parent, i, freeOnClose)))), freeOnClose);
+		return new LoadingImageScreen(parent, future.thenAccept(i -> {
+			if (i != null) {
+				Minecraft.getInstance().execute(() -> Minecraft.getInstance().setScreen(new ImageScreen(parent, i, freeOnClose)));
+			}
+		}), freeOnClose);
 	}
 
 	private ImageScreen(Screen parent, ImageInstance instance, boolean freeOnClose) {
@@ -78,13 +83,20 @@ protected void init() {
 		header.defaultCellSetting().alignHorizontallyCenter();
 		header.addChild(new StringWidget(getTitle(), font));
 
+		if (image instanceof ImageInstance.Remote remote) {
+			layout.setHeaderHeight(38);
+			header.addChild(new StringWidget(Component.translatable("gallery.image.upload_details", UUIDHelper.getUsername(remote.uploader()), remote.sharedAt().atZone(ZoneId.systemDefault()).format(AxolotlClientCommon.getInstance().formatter)), font));
+		}
+
 		int buttonWidth = 75;
 		double imgAspectRatio = image.image().getWidth() / (double) image.image().getHeight();
 		int imageWidth = Math.min((int) (layout.getContentHeight() * imgAspectRatio), layout.getWidth() - buttonWidth - 4 - 10);
 		int imageHeight = (int) (imageWidth / imgAspectRatio);
-		layout.setHeaderHeight(height - layout.getFooterHeight() - imageHeight);
 
 		var contents = layout.addToContents(LinearLayout.horizontal().spacing(4));
+		if (width/2 > (imageWidth / 2) + buttonWidth+4) {
+			contents.addChild(new SpacerElement(buttonWidth + 4, imageHeight));
+		}
 		var footer = layout.addToFooter(LinearLayout.horizontal().spacing(4));
 		contents.addChild(new ImageElement(imageWidth, imageHeight));
 		var actions = contents.addChild(LinearLayout.vertical()).spacing(4);
@@ -107,7 +119,6 @@ protected void init() {
 			actions.addChild(Button.builder(Component.translatable("gallery.image.open.external"), b -> Util.getPlatform().openPath(local.location())).width(buttonWidth).build());
 		}
 		if (image instanceof ImageInstance.Remote remote) {
-			header.addChild(new StringWidget(Component.translatable("gallery.image.upload_details", UUIDHelper.getUsername(remote.uploader()), remote.sharedAt().atZone(ZoneId.systemDefault()).format(AxolotlClientCommon.getInstance().formatter)), font));
 			if (!(image instanceof ImageInstance.Local)) {
 				actions.addChild(Button.builder(Component.translatable("gallery.image.save"), b -> {
 					b.active = false;
@@ -147,7 +158,7 @@ public void onClose() {
 	}
 
 	private Path saveSharedImage(ImageInstance.Remote remote) throws IOException {
-		Path out = GalleryScreen.SCREENSHOT_DIR.resolve("shared")
+		Path out = GalleryScreen.SCREENSHOTS_DIR.resolve("shared")
 			.resolve(remote.uploader())
 			.resolve(remote.filename());
 		Path infoJson = out.resolveSibling(remote.filename() + ".json");

1.21.4/src/main/java/io/github/axolotlclient/modules/screenshotUtils/ImageShare.java

@@ -69,7 +69,7 @@ public CompletableFuture<ImageInstance> downloadImage(String url) {
 				try {
 					ImageInstance.Remote remote = new ImageInstance.RemoteImpl(NativeImage.read(new ByteArrayInputStream(data.data())), data.name(), data.uploader(), data.sharedAt(), ensureUrl(url).orElseThrow());
 					try {
-						Path local = GalleryScreen.SCREENSHOT_DIR.resolve(remote.filename());
+						Path local = GalleryScreen.SCREENSHOTS_DIR.resolve(remote.filename());
 						HashFunction hash = Hashing.goodFastHash(32);
 						if (Files.exists(local) && hash.hashBytes(data.data()).equals(hash.hashBytes(Files.readAllBytes(local)))) {
 							return remote.toShared(local);

1.21.4/src/main/java/io/github/axolotlclient/modules/screenshotUtils/ScreenshotUtils.java

@@ -29,6 +29,7 @@
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.CompletableFuture;
 import java.util.function.BooleanSupplier;
 
 import io.github.axolotlclient.AxolotlClient;
@@ -75,17 +76,20 @@ public class ScreenshotUtils extends AbstractModule {
 			"open_image",
 			new CustomClickEvent((file) -> Util.getPlatform().openUri(file.toUri()))));
 
-		actions.put(() -> API.getInstance().isAuthenticated(), new Action("uploadAction", ChatFormatting.LIGHT_PURPLE,
-			"upload_image",
+		actions.put(() -> true, new Action("viewInGalleryAction", ChatFormatting.LIGHT_PURPLE, "view_in_gallery",
 			new CustomClickEvent(file -> {
-				new Thread("Image Uploader") {
-					@Override
-					public void run() {
-						ImageShare.getInstance().uploadImage(file);
-					}
-				}.start();
+				try {
+					ImageInstance instance = new ImageInstance.LocalImpl(file);
+					Minecraft.getInstance().execute(() -> Minecraft.getInstance().setScreen(ImageScreen.create(null, CompletableFuture.completedFuture(instance), true)));
+				} catch (Exception ignored) {
+					io.github.axolotlclient.util.Util.sendChatMessage(Component.translatable("screenshot.gallery.view.error"));
+				}
 			})));
 
+		actions.put(() -> API.getInstance().isAuthenticated(), new Action("uploadAction", ChatFormatting.AQUA,
+			"upload_image",
+			new CustomClickEvent(ImageShare.getInstance()::uploadImage)));
+
 		// If you have further ideas to what actions could be added here, please let us know!
 
 		return actions;

common/src/main/java/io/github/axolotlclient/util/Watcher.java

@@ -0,0 +1,130 @@
+/*
+ * Copyright © 2024 moehreag <[email protected]> & Contributors
+ *
+ * This file is part of AxolotlClient.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ * For more information, see the LICENSE file.
+ */
+
+package io.github.axolotlclient.util;
+
+import java.io.IOException;
+import java.nio.file.*;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
+
+import io.github.axolotlclient.AxolotlClientCommon;
+import org.jetbrains.annotations.Nullable;
+
+
+public class Watcher implements AutoCloseable {
+	private static final ScheduledExecutorService thread = Executors.newSingleThreadScheduledExecutor();
+	private final WatchService watcher;
+	private final Path path;
+
+	public Watcher(Path root) throws IOException {
+		this.path = root;
+		this.watcher = path.getFileSystem().newWatchService();
+
+		try {
+			this.watchDir(path);
+			try (DirectoryStream<Path> directoryStream = Files.newDirectoryStream(path)) {
+
+				for (Path path : directoryStream) {
+					if (Files.isDirectory(path, LinkOption.NOFOLLOW_LINKS)) {
+						this.watchDir(path);
+					}
+				}
+			}
+		} catch (Exception e) {
+			this.watcher.close();
+			throw e;
+		}
+	}
+
+	@Nullable
+	public static Watcher create(Path path) {
+		try {
+			return new Watcher(path);
+		} catch (IOException var2) {
+			AxolotlClientCommon.getInstance().getLogger().warn("Failed to initialize directory {} monitoring", path, var2);
+			return null;
+		}
+	}
+
+	public static Watcher createSelfTicking(Path path, Runnable onUpdate) {
+		var watcher = create(path);
+		if (watcher != null) {
+			thread.scheduleAtFixedRate(() -> {
+				try {
+					if (watcher.pollForChanges()) {
+						onUpdate.run();
+					}
+				} catch (IOException e) {
+					try {
+						watcher.close();
+					} catch (IOException ignored) {
+					}
+				}
+			}, 100, 100, TimeUnit.MILLISECONDS);
+		}
+		return watcher;
+	}
+
+	private void watchDir(Path path) throws IOException {
+		path.register(this.watcher, StandardWatchEventKinds.ENTRY_CREATE, StandardWatchEventKinds.ENTRY_DELETE, StandardWatchEventKinds.ENTRY_MODIFY);
+	}
+
+	public boolean pollForChanges() throws IOException {
+		boolean bl = false;
+
+		WatchKey watchKey;
+		while ((watchKey = this.watcher.poll()) != null) {
+			for (WatchEvent<?> watchEvent : watchKey.pollEvents()) {
+				bl = true;
+				if (watchKey.watchable() == this.path && watchEvent.kind() == StandardWatchEventKinds.ENTRY_CREATE) {
+					Path path = this.path.resolve((Path) watchEvent.context());
+					if (Files.isDirectory(path, LinkOption.NOFOLLOW_LINKS)) {
+						this.watchDir(path);
+					}
+				}
+			}
+
+			watchKey.reset();
+		}
+
+		return bl;
+	}
+
+	public void close() throws IOException {
+		this.watcher.close();
+	}
+
+	public void safeClose() {
+		try {
+			close();
+		} catch (IOException ignored) {
+		}
+	}
+
+	public static void close(Watcher watcher) {
+		if (watcher != null) {
+			watcher.safeClose();
+		}
+	}
+}

common/src/main/resources/assets/axolotlclient/lang/en_us.json

@@ -624,5 +624,7 @@
 	"gallery.tab.shared": "View shared images",
 	"gallery.download_external": "View image from url",
 	"gallery.image.view": "View image",
-	"gallery.image.loading.title": "Loading image..."
+	"gallery.image.loading.title": "Loading image...",
+	"viewInGalleryAction": "[Gallery]",
+	"view_in_gallery": "View in Gallery"
 }