Reattempt porting 1.21.1

Author: Omnixerion

build.gradle

@@ -1,6 +1,6 @@
 plugins {
     // see https://fabricmc.net/develop/ for new versions
-    id 'fabric-loom' version '1.7-SNAPSHOT' apply false
+    id 'fabric-loom' version '1.9.+' apply false
     // see https://projects.neoforged.net/neoforged/moddevgradle for new versions
     id 'net.neoforged.moddev' version '0.1.110' apply false
 }

common/src/main/java/dev/ultreon/devices/ClientModEvents.java

@@ -88,7 +88,7 @@ public CompletableFuture<Void> reload(@NotNull PreparableReloadListener.Preparat
 
             return CompletableFuture.runAsync(() -> {
                 if (!ApplicationManager.getAllApplications().isEmpty()) {
-                    ApplicationManager.getAllApplications().forEach(AppInfo::reload);
+                    ApplicationManager.getAllApplications().forEach(appInfo -> appInfo.reload(resourceManager));
                     generateIconAtlas(resourceManager); // FIXME: Broken resource reloading, can't find image resource while definitely exists.
                 }
 

common/src/main/java/dev/ultreon/devices/Devices.java

@@ -1,7 +1,6 @@
 package dev.ultreon.devices;
 
 import com.google.common.base.Suppliers;
-import com.google.common.collect.ImmutableList;
 import com.google.gson.*;
 import com.mojang.serialization.Lifecycle;
 import dev.ultreon.devices.api.ApplicationManager;
@@ -12,8 +11,8 @@
 import dev.ultreon.devices.api.utils.OnlineRequest;
 import dev.ultreon.devices.block.PrinterBlock;
 import dev.ultreon.devices.core.ComputerScreen;
-import dev.ultreon.devices.core.client.ClientNotification;
-import dev.ultreon.devices.core.client.debug.ClientAppDebug;
+import dev.ultreon.devices.client.ClientNotification;
+import dev.ultreon.devices.client.debug.ClientAppDebug;
 import dev.ultreon.devices.core.io.task.*;
 import dev.ultreon.devices.core.network.task.TaskConnect;
 import dev.ultreon.devices.core.network.task.TaskGetDevices;
@@ -52,13 +51,15 @@
 import dev.ultreon.mods.xinexlib.event.system.EventSystem;
 import dev.ultreon.mods.xinexlib.platform.XinexPlatform;
 import dev.ultreon.mods.xinexlib.registrar.RegistrarManager;
+import net.minecraft.client.Minecraft;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.MappedRegistry;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.resources.ResourceKey;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.server.packs.resources.ResourceManager;
 import net.minecraft.world.InteractionHand;
 import net.minecraft.world.InteractionResult;
 import net.minecraft.world.entity.player.Player;
@@ -68,7 +69,6 @@
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.Block;
 import org.jetbrains.annotations.ApiStatus;
-import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -93,7 +93,6 @@ public abstract class Devices {
     private static final Pattern DEV_PREVIEW_PATTERN = Pattern.compile("\\d+\\.\\d+\\.\\d+-dev\\d+");
     private static final boolean IS_DEV_PREVIEW = DEV_PREVIEW_PATTERN.matcher(Reference.VERSION).matches();
     private static final String GITWEB_REGISTER_URL = "https://ultreon.gitlab.io/gitweb/site_register.json";
-    public static final String VULNERABILITIES_URL = "https://jab125.com/gitweb/vulnerabilities.php";
     @SuppressWarnings("MismatchedQueryAndUpdateOfCollection")
     private static final SiteRegisterStack SITE_REGISTER_STACK = new SiteRegisterStack();
 
@@ -206,7 +205,6 @@ private void registerApplications() {
         TaskManager.registerTask(TaskSendAction::new);
         TaskManager.registerTask(TaskSetupFileBrowser::new);
         TaskManager.registerTask(TaskGetFiles::new);
-        TaskManager.registerTask(TaskListDirectory::new);
         TaskManager.registerTask(TaskGetMainDrive::new);
 
         // App Store
@@ -303,23 +301,15 @@ public Application registerApplication(ResourceLocation identifier, ApplicationS
             apps.add(theAppWeGot);
 
             AppInfo info = new AppInfo(identifier, SystemApp.class.isAssignableFrom(theAppWeGot.getClass()));
-            info.reload();
+            ResourceManager resourceManager = Minecraft.getInstance().getResourceManager();
+
             theAppWeGot.setInfo(info);
 
             application.set(theAppWeGot);
         });
         return application.get();
     }
 
-    @NotNull
-    private static AppInfo generateAppInfo(ResourceLocation identifier, Class<? extends Application> clazz) {
-        LOGGER.debug("Generating app info for {}", identifier.toString());
-
-        AppInfo info = new AppInfo(identifier, SystemApp.class.isAssignableFrom(clazz));
-        info.reload();
-        return info;
-    }
-
     protected abstract Map<String, IPrint.Renderer> getRegisteredRenders();
 
     protected abstract void setRegisteredRenders(Map<String, IPrint.Renderer> map);
@@ -419,21 +409,7 @@ private static void setupSiteRegistrations() {
     }
 
     private static void checkForVulnerabilities() {
-        OnlineRequest.getInstance().make(VULNERABILITIES_URL, ((success, response) -> {
-            if (!success) {
-                LOGGER.error("Could not access vulnerabilities!");
-                vulnerabilities = ImmutableList.of();
-                return;
-            }
 
-            JsonArray array = JsonParser.parseString(new String(response)).getAsJsonArray();
-            vulnerabilities = Vulnerability.parseArray(array);
-            vulnerabilities.forEach(vul -> {
-                String s = vul.toPrettyString();
-                s.lines().toList().forEach(line -> LOGGER.debug("[VulChecker] {}", line));
-                LOGGER.debug("[VulChecker]");
-            });
-        }));
     }
 
     private static CompletableFuture<Void> setupSiteRegistration(String url) {
@@ -512,8 +488,12 @@ enum Type {
         return future;
     }
 
+    /**
+     * @deprecated Use {@link #res(String)} instead!
+     */
+    @Deprecated
     public static ResourceLocation id(String id) {
-        return ResourceLocation.fromNamespaceAndPath(MOD_ID, id);
+        return res(id);
     }
 
     private static class ProtectedArrayList<T> extends ArrayList<T> {

common/src/main/java/dev/ultreon/devices/DevicesModPlatform.java

@@ -1,9 +1,6 @@
 package dev.ultreon.devices;
 
-import dev.ultreon.devices.object.AppInfo;
-
 public interface DevicesModPlatform {
     String getVersion();
 
-    void updateIcon(AppInfo info, int iconU, int iconV);
 }

common/src/main/java/dev/ultreon/devices/Resources.java

@@ -8,6 +8,6 @@ private Resources() {
     }
 
 
-    public static final ResourceLocation ENDER_MAIL_ICONS = Devices.id("textures/gui/ender_mail.png");
-    public static final ResourceLocation ENDER_MAIL_BACKGROUND = Devices.id("textures/gui/ender_mail_background.png");
+    public static final ResourceLocation ENDER_MAIL_ICONS = Devices.res("textures/gui/ender_mail.png");
+    public static final ResourceLocation ENDER_MAIL_BACKGROUND = Devices.res("textures/gui/ender_mail_background.png");
 }

common/src/main/java/dev/ultreon/devices/api/ApplicationManager.java

@@ -80,4 +80,8 @@ public static List<AppInfo> getAllApplications() {
     public static AppInfo getApplication(ResourceLocation appId) {
         return APP_INFO.get(appId);
     }
+
+    public static AppInfo getApplicationForExtension(String upperCase) {
+        return APP_INFO.values().stream().filter(info -> info.getExtensions().contains(upperCase)).findFirst().orElse(null);
+    }
 }

common/src/main/java/dev/ultreon/devices/api/app/Alphabet.java

@@ -1,7 +1,7 @@
 package dev.ultreon.devices.api.app;
 
 import com.mojang.blaze3d.systems.RenderSystem;
-import com.mojang.blaze3d.vertex.PoseStack;
+import dev.ultreon.devices.Devices;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.resources.ResourceLocation;
@@ -14,7 +14,7 @@
 public enum Alphabet implements IIcon {
     EXCLAMATION_MARK, QUOTATION_MARK, NUMBER_SIGN, DOLLAR_SIGN, PERCENT_SIGN, AMPERSAND, APOSTROPHE, LEFT_PARENTHESIS, RIGHT_PARENTHESIS, ASTERISK, PLUS_SIGN, COMMA, HYPHEN_MINUS, FULL_STOP, SLASH, ZERO, ONE, TWO, THREE, FOUR, FIVE, SIX, SEVEN, EIGHT, NINE, COLON, SEMI_COLON, LESS_THAN, EQUALS, MORE_THAN, QUESTION_MARK, COMMERCIAL_AT, UPPERCASE_A, UPPERCASE_B, UPPERCASE_C, UPPERCASE_D, UPPERCASE_E, UPPERCASE_F, UPPERCASE_G, UPPERCASE_H, UPPERCASE_I, UPPERCASE_J, UPPERCASE_K, UPPERCASE_L, UPPERCASE_M, UPPERCASE_N, UPPERCASE_O, UPPERCASE_P, UPPERCASE_Q, UPPERCASE_R, UPPERCASE_S, UPPERCASE_T, UPPERCASE_U, UPPERCASE_V, UPPERCASE_W, UPPERCASE_X, UPPERCASE_Y, UPPERCASE_Z, LEFT_SQUARE_BRACKET, SLASH_REVERSE, RIGHT_SQUARE_BRACKET, CARET, UNDERSCORE, GRAVE_ACCENT, LEFT_CURLY_BRACKET, VERTICAL_LINE, RIGHT_CURLY_BRACKET, TILDE;
 
-    private static final ResourceLocation ALPHABET_ASSET = new ResourceLocation("devices:textures/gui/alphabet.png");
+    private static final ResourceLocation ALPHABET_ASSET = Devices.res("textures/gui/alphabet.png");
 
     private static final int ICON_SIZE = 10;
     private static final int GRID_SIZE = 20;

common/src/main/java/dev/ultreon/devices/api/app/Icons.java

@@ -1,6 +1,7 @@
 package dev.ultreon.devices.api.app;
 
 
+import dev.ultreon.devices.Devices;
 import net.minecraft.resources.ResourceLocation;
 
 /**
@@ -9,7 +10,7 @@
 public enum Icons implements IIcon {
     ARROW_RIGHT, ARROW_DOWN, ARROW_UP, ARROW_LEFT, CHECK, CROSS, PLUS, IMPORT, EXPORT, NEW_FILE, NEW_FOLDER, LOAD, COPY, CUT, CLIPBOARD, SAVE, TRASH, RENAME, EDIT, SEARCH, RELOAD, CHEESE, CHEVRON_RIGHT, CHEVRON_DOWN, CHEVRON_UP, CHEVRON_LEFT, MAIL, BELL, LOCK, UNLOCK, KEY, WIFI_HIGH, WIFI_MED, WIFI_LOW, WIFI_NONE, PLAY, STOP, PAUSE, PREVIOUS, NEXT, INFO, WARNING, ERROR, VOLUME_ON, VOLUME_OFF, STAR_OFF, STAR_HALF, STAR_ON, CHAT, EJECT, CLOCK, SHOPPING_CART, SHOPPING_CART_ADD, SHOPPING_CART_REMOVE, USER, USER_ADD, USER_REMOVE, COMMUNITY, SHARE, CONTACTS, COMPUTER, PRINTER, GAME_CONTROLLER, CAMERA, HEADPHONES, TELEVISION, SMART_PHONE, USB, INTERNAL_DRIVE, EXTERNAL_DRIVE, NETWORK_DRIVE, DATABASE, CD, BATTERY_FULL, BATTERY_HALF, BATTERY_LOW, BATTERY_EMPTY, POWER_ON, POWER_OFF, EARTH, PICTURE, SHOP, HOME, THUMBS_UP_OFF, THUMBS_UP_ON, THUMBS_DOWN_OFF, THUMBS_DOWN_ON, BOOKMARK_OFF, BOOKMARK_ON, UNDO, REDO, WRENCH, HAMMER, FORBIDDEN, MUSIC, EYE_DROPPER, DOTS_VERTICAL, DOTS_HORIZONTAL, EXPAND, SHRINK, SORT, FONT, ALIGN_LEFT, ALIGN_CENTER, ALIGN_RIGHT, ALIGN_JUSTIFY, COIN, CASH, VERIFIED, BOOK_CLOSED, BOOK_OPEN, VIDEO_ROLL, VIDEO_CAMERA, LIGHT_BULB_OFF, LIGHT_BULB_ON, LOCATION, SEND, LOGIN, LOGOUT, HELP, HEART_OFF, HEART_ON, MAP, BRIGHTNESS, GIFT_RED, GIFT_CYAN, GIFT_GREEN, GIFT_BLUE, CREDIT_CARD, PIN, VISIBILITY_OFF, VISIBILITY_ON, HOURGLASS, OFFLINE, LIVE, ONLINE, CONNECTING, MICROPHONE, MICROPHONE_MUTE, HEADPHONES_MUTE, ZOOM_IN, ZOOM_OUT, FILE, FOLDER, SAVE_AS, FLASHED_WARNING, WARNING_GRAY;
 
-    private static final ResourceLocation ICON_ASSET = new ResourceLocation("devices:textures/gui/icons.png");
+    private static final ResourceLocation ICON_ASSET = Devices.res("textures/gui/icons.png");
 
     private static final int ICON_SIZE = 10;
     private static final int GRID_SIZE = 20;

common/src/main/java/dev/ultreon/devices/api/app/Notification.java

@@ -1,7 +1,7 @@
 package dev.ultreon.devices.api.app;
 
 import dev.ultreon.devices.api.task.Task;
-import dev.ultreon.devices.core.client.ClientNotification;
+import dev.ultreon.devices.client.ClientNotification;
 import dev.ultreon.devices.network.PacketHandler;
 import dev.ultreon.devices.network.task.NotificationPacket;
 import net.minecraft.nbt.CompoundTag;

common/src/main/java/dev/ultreon/devices/api/app/System.java

@@ -86,4 +86,5 @@ default void launchApp(AppInfo info, FileInfo path, Consumer<LauncherResponse> c
     Collection<AppInfo> getInstalledApplications();
 
     void openDialog(Dialog message);
+
 }