Skip to content

Commit

Permalink
Some bugfixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@Patbox
Patbox committed Jul 26, 2024
1 parent a94ea10 commit a5a3808
Show file tree
Hide file tree
Showing 3 changed files with 64 additions and 17 deletions.
3 changes: 3 additions & 0 deletions build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ group = project.maven_group
repositories{
maven { url "https://maven.shedaniel.me/" }
maven { url "https://maven.nucleoid.xyz/" }
maven { url 'https://oss.sonatype.org/content/repositories/snapshots' }
mavenCentral()
}

dependencies {
Expand All @@ -27,6 +29,7 @@ dependencies {

modImplementation include("eu.pb4:map-canvas-api:${project.mapcanvas_version}")
modImplementation include("eu.pb4:sgui:${project.sgui_version}")
modImplementation include("me.lucko:fabric-permissions-api:0.2-SNAPSHOT")
}

loom {
Expand Down
8 changes: 4 additions & 4 deletions gradle.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@ org.gradle.jvmargs=-Xmx1G

# Fabric Properties
# check these on https://fabricmc.net/versions.html
minecraft_version=1.21-rc1
yarn_mappings=1.21-rc1+build.1
minecraft_version=1.21
yarn_mappings=1.21+build.1
loader_version=0.15.11

# Mod Properties
mod_version = 0.7.0+1.21
mod_version = 0.7.1+1.21
maven_group = space.essem
archives_base_name = image2map

# Dependencies
fabric_version=0.100.1+1.21
mapcanvas_version=0.4.0+1.21
mapcanvas_version=0.4.1+1.21
sgui_version=1.6.0+1.21
70 changes: 57 additions & 13 deletions src/main/java/space/essem/image2map/Image2Map.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import com.mojang.brigadier.suggestion.SuggestionsBuilder;
import com.mojang.logging.LogUtils;
import eu.pb4.sgui.api.GuiHelpers;
import me.lucko.fabric.api.permissions.v0.Permissions;
import net.fabricmc.api.ModInitializer;
import net.fabricmc.fabric.api.command.v2.CommandRegistrationCallback;
import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents;
Expand All @@ -25,6 +26,8 @@
import net.minecraft.item.Items;
import net.minecraft.nbt.*;
import net.minecraft.server.command.ServerCommandSource;
import net.minecraft.text.HoverEvent;
import net.minecraft.text.Style;
import net.minecraft.text.Text;
import net.minecraft.util.Formatting;
import net.minecraft.util.Hand;
Expand All @@ -44,11 +47,18 @@
import javax.imageio.ImageIO;
import java.awt.image.BufferedImage;
import java.io.File;
import java.net.URI;
import java.net.URL;
import java.net.URLConnection;
import java.net.http.HttpClient;
import java.net.http.HttpRequest;
import java.net.http.HttpResponse;
import java.time.Duration;
import java.time.temporal.TemporalUnit;
import java.util.List;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;

import static net.minecraft.server.command.CommandManager.argument;
import static net.minecraft.server.command.CommandManager.literal;
Expand All @@ -63,8 +73,9 @@ public class Image2Map implements ModInitializer {
public void onInitialize() {
CommandRegistrationCallback.EVENT.register((dispatcher, registryAccess, environment) -> {
dispatcher.register(literal("image2map")
.requires(source -> source.hasPermissionLevel(CONFIG.minPermLevel))
.requires(Permissions.require("image2map.use", CONFIG.minPermLevel))
.then(literal("create")
.requires(Permissions.require("image2map.create", 0))
.then(argument("width", IntegerArgumentType.integer(1))
.then(argument("height", IntegerArgumentType.integer(1))
.then(argument("mode", StringArgumentType.word()).suggests(new DitherModeSuggestionProvider())
Expand All @@ -80,6 +91,7 @@ public void onInitialize() {
)
)
.then(literal("preview")
.requires(Permissions.require("image2map.preview", 0))
.then(argument("path", StringArgumentType.greedyString())
.executes(this::openPreview)
)
Expand All @@ -96,9 +108,24 @@ private int openPreview(CommandContext<ServerCommandSource> context) throws Comm

source.sendFeedback(() -> Text.literal("Getting image..."), false);

getImage(input).orTimeout(60, TimeUnit.SECONDS).handleAsync((image, ex) -> {
if (image == null || ex != null) {
source.sendFeedback(() -> Text.literal("That doesn't seem to be a valid image!"), false);
getImage(input).orTimeout(20, TimeUnit.SECONDS).handleAsync((image, ex) -> {
if (ex instanceof TimeoutException) {
source.sendFeedback(() -> Text.literal("Downloading or reading of the image took too long!"), false);
return null;
} else if (ex != null) {
if (ex instanceof RuntimeException ru && ru.getCause() != null) {
ex = ru.getCause();
}

Throwable finalEx = ex;
source.sendFeedback(() -> Text.literal("The image isn't valid (hover for more info)!")
.setStyle(Style.EMPTY.withColor(Formatting.RED).withHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, Text.literal(finalEx.getMessage())))), false);
return null;
}

if (image == null) {
source.sendFeedback(() -> Text.literal("That doesn't seem to be a valid image (unknown reason)!"), false);
return null;
}

if (GuiHelpers.getCurrentGui(source.getPlayer()) instanceof PreviewGui previewGui) {
Expand Down Expand Up @@ -141,19 +168,21 @@ private CompletableFuture<BufferedImage> getImage(String input) {
return CompletableFuture.supplyAsync(() -> {
try {
if (isValid(input)) {
URL url = new URL(input);
URLConnection connection = url.openConnection();
connection.setRequestProperty("User-Agent", "Image2Map mod");
connection.connect();
return ImageIO.read(connection.getInputStream());
try(var client = HttpClient.newHttpClient()) {
var req = HttpRequest.newBuilder().GET().uri(URI.create(input)).timeout(Duration.ofSeconds(30))
.setHeader("User-Agent", "Image2Map mod").build();

var stream = client.send(req, HttpResponse.BodyHandlers.ofInputStream());
return ImageIO.read(stream.body());
}
} else if (CONFIG.allowLocalFiles) {
File file = new File(input);
return ImageIO.read(file);
} else {
return null;
}
} catch (Throwable e) {
return null;
throw new RuntimeException(e);
}
});
}
Expand All @@ -174,9 +203,24 @@ private int createMap(CommandContext<ServerCommandSource> context) throws Comman

source.sendFeedback(() -> Text.literal("Getting image..."), false);

getImage(input).orTimeout(60, TimeUnit.SECONDS).handleAsync((image, ex) -> {
if (image == null || ex != null) {
source.sendFeedback(() -> Text.literal("That doesn't seem to be a valid image!"), false);
getImage(input).orTimeout(20, TimeUnit.SECONDS).handleAsync((image, ex) -> {
if (ex instanceof TimeoutException) {
source.sendFeedback(() -> Text.literal("Downloading or reading of the image took too long!"), false);
return null;
} else if (ex != null) {
if (ex instanceof RuntimeException ru && ru.getCause() != null) {
ex = ru.getCause();
}

Throwable finalEx = ex;
source.sendFeedback(() -> Text.literal("The image isn't valid (hover for more info)!")
.setStyle(Style.EMPTY.withColor(Formatting.RED).withHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, Text.literal(finalEx.getMessage())))), false);
return null;
}

if (image == null) {
source.sendFeedback(() -> Text.literal("That doesn't seem to be a valid image (unknown reason)!"), false);
return null;
}

int width;
Expand Down

0 comments on commit a5a3808

Please sign in to comment.