Fixed NeoForge side

Author: Omnixerion

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

@@ -1,6 +1,7 @@
 package dev.ultreon.devices;
 
 import dev.ultreon.devices.api.ApplicationManager;
+import dev.ultreon.devices.event.InitializationEvent;
 import dev.ultreon.devices.programs.BoatRacersApp;
 import dev.ultreon.devices.programs.NoteStashApp;
 import dev.ultreon.devices.programs.PixelPainterApp;
@@ -14,7 +15,7 @@
 import net.minecraft.resources.ResourceLocation;
 
 public class BuiltinApps {
-    public static void registerBuiltinApps() {
+    public static void registerBuiltinApps(InitializationEvent.AppRegistrationEvent ignored) {
         ApplicationManager.registerApplication(ResourceLocation.fromNamespaceAndPath(Reference.MOD_ID, "diagnostics"), () -> DiagnosticsApp::new, true);
         ApplicationManager.registerApplication(ResourceLocation.fromNamespaceAndPath(Reference.MOD_ID, "settings"), () -> SettingsApp::new, true);
         ApplicationManager.registerApplication(ResourceLocation.fromNamespaceAndPath(Reference.MOD_ID, "file_browser"), () -> FileBrowserApp::new, true);

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

@@ -9,7 +9,6 @@
 import dev.ultreon.devices.api.print.PrintingManager;
 import dev.ultreon.devices.api.task.TaskManager;
 import dev.ultreon.devices.api.utils.OnlineRequest;
-import dev.ultreon.devices.block.PrinterBlock;
 import dev.ultreon.devices.core.ComputerScreen;
 import dev.ultreon.devices.client.ClientNotification;
 import dev.ultreon.devices.client.debug.ClientAppDebug;
@@ -20,6 +19,7 @@
 import dev.ultreon.devices.core.print.task.TaskPrint;
 import dev.ultreon.devices.core.task.TaskInstallApp;
 import dev.ultreon.devices.debug.DebugLog;
+import dev.ultreon.devices.event.InitializationEvent;
 import dev.ultreon.devices.event.WorldDataHandler;
 import dev.ultreon.devices.network.PacketHandler;
 import dev.ultreon.devices.network.task.SyncApplicationPacket;
@@ -52,22 +52,15 @@
 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;
 import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.item.Items;
 import net.minecraft.world.item.crafting.RecipeType;
-import net.minecraft.world.level.Level;
-import net.minecraft.world.level.block.Block;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Nullable;
 import org.slf4j.Logger;
@@ -144,7 +137,9 @@ public void init() {
 
         PacketHandler.init();
 
-        registerApplications();
+        if (XinexPlatform.getPlatformName().equals(ModPlatform.Fabric)) {
+            registerApplications();
+        }
 
         if (XinexPlatform.getPlatformName().equals(ModPlatform.Fabric)) {
             EnvExecutor.runInEnv(Env.CLIENT, () -> Devices::doClientInit);
@@ -159,7 +154,7 @@ public void init() {
         }
     }
 
-    protected static void doClientInit() {
+    public static void doClientInit() {
         ClientAppDebug.register();
         ClientModEvents.clientSetup(); //todo
         Devices.setupSiteRegistrations();
@@ -171,6 +166,7 @@ public static void preInit() {
             throw new LaunchException();
         }
 
+        EventSystem.MAIN.on(InitializationEvent.AppRegistrationEvent.class, BuiltinApps::registerBuiltinApps);
         DeviceConfig.init();
     }
 
@@ -196,48 +192,47 @@ public void loadComplete() {
     }
 
 
-    private void registerApplications() {
+    public void registerApplications() {
         // Applications (Both)
-        registerApplicationEvent();
-
+        EventSystem.MAIN.publish(new InitializationEvent.AppRegistrationEvent(this));
         // Core
-        TaskManager.registerTask(TaskUpdateApplicationData::new);
-        TaskManager.registerTask(TaskPrint::new);
-        TaskManager.registerTask(TaskUpdateSystemData::new);
-        TaskManager.registerTask(TaskConnect::new);
-        TaskManager.registerTask(TaskPing::new);
-        TaskManager.registerTask(TaskGetDevices::new);
+        TaskManager.registerTask("update_application_data", TaskUpdateApplicationData::new, TaskUpdateApplicationData.class);
+        TaskManager.registerTask("print", TaskPrint::new, TaskPrint.class);
+        TaskManager.registerTask("update_system_data", TaskUpdateSystemData::new, TaskUpdateSystemData.class);
+        TaskManager.registerTask("connect", TaskConnect::new, TaskConnect.class);
+        TaskManager.registerTask("ping", TaskPing::new, TaskPing.class);
+        TaskManager.registerTask("get_devices", TaskGetDevices::new, TaskGetDevices.class);
 
         // File browser
-        TaskManager.registerTask(TaskSendAction::new);
-        TaskManager.registerTask(TaskSetupFileBrowser::new);
-        TaskManager.registerTask(TaskGetFiles::new);
-        TaskManager.registerTask(TaskGetMainDrive::new);
+        TaskManager.registerTask("send_action", TaskSendAction::new, TaskSendAction.class);
+        TaskManager.registerTask("setup_file_browser", TaskSetupFileBrowser::new, TaskSetupFileBrowser.class);
+        TaskManager.registerTask("get_files", TaskGetFiles::new, TaskGetFiles.class);
+        TaskManager.registerTask("get_main_drive", TaskGetMainDrive::new, TaskGetMainDrive.class);
 
         // App Store
-        TaskManager.registerTask(TaskInstallApp::new);
+        TaskManager.registerTask("install_app", TaskInstallApp::new, TaskInstallApp.class);
 
         // Ender Mail
-        TaskManager.registerTask(TaskUpdateInbox::new);
-        TaskManager.registerTask(TaskSendEmail::new);
-        TaskManager.registerTask(TaskCheckEmailAccount::new);
-        TaskManager.registerTask(TaskRegisterEmailAccount::new);
-        TaskManager.registerTask(TaskDeleteEmail::new);
-        TaskManager.registerTask(TaskViewEmail::new);
+        TaskManager.registerTask("update_inbox", TaskUpdateInbox::new, TaskUpdateInbox.class);
+        TaskManager.registerTask("send_email", TaskSendEmail::new, TaskSendEmail.class);
+        TaskManager.registerTask("check_email_account", TaskCheckEmailAccount::new, TaskCheckEmailAccount.class);
+        TaskManager.registerTask("register_email_account", TaskRegisterEmailAccount::new, TaskRegisterEmailAccount.class);
+        TaskManager.registerTask("delete_email", TaskDeleteEmail::new, TaskDeleteEmail.class);
+        TaskManager.registerTask("view_email", TaskViewEmail::new, TaskViewEmail.class);
 
         if (XinexPlatform.isDevelopmentEnvironment() || Devices.EARLY_CONFIG.enableBetaApps) {
             // Auction
-            TaskManager.registerTask(TaskAddAuction::new);
-            TaskManager.registerTask(TaskGetAuctions::new);
-            TaskManager.registerTask(TaskBuyItem::new);
+            TaskManager.registerTask("add_auction", TaskAddAuction::new, TaskAddAuction.class);
+            TaskManager.registerTask("get_auctions", TaskGetAuctions::new, TaskGetAuctions.class);
+            TaskManager.registerTask("buy_item", TaskBuyItem::new, TaskBuyItem.class);
 
             // Bank
-            TaskManager.registerTask(TaskDeposit::new);
-            TaskManager.registerTask(TaskWithdraw::new);
-            TaskManager.registerTask(TaskGetBalance::new);
-            TaskManager.registerTask(TaskPay::new);
-            TaskManager.registerTask(TaskAdd::new);
-            TaskManager.registerTask(TaskRemove::new);
+            TaskManager.registerTask("deposit", TaskDeposit::new, TaskDeposit.class);
+            TaskManager.registerTask("withdraw", TaskWithdraw::new, TaskWithdraw.class);
+            TaskManager.registerTask("get_balance", TaskGetBalance::new, TaskGetBalance.class);
+            TaskManager.registerTask("pay", TaskPay::new, TaskPay.class);
+            TaskManager.registerTask("add", TaskAdd::new, TaskAdd.class);
+            TaskManager.registerTask("remove", TaskRemove::new, TaskRemove.class);
         }
 
         if (XinexPlatform.isDevelopmentEnvironment() || Devices.EARLY_CONFIG.enableDebugApps) {
@@ -247,16 +242,14 @@ private void registerApplications() {
             ApplicationManager.registerApplication(ResourceLocation.fromNamespaceAndPath(Reference.MOD_ID, "text_area"), () -> TextAreaApp::new, false);
             ApplicationManager.registerApplication(ResourceLocation.fromNamespaceAndPath(Reference.MOD_ID, "test"), () -> TestApp::new, false);
 
-            TaskManager.registerTask(TaskNotificationTest::new);
+            TaskManager.registerTask("notification_test", TaskNotificationTest::new, TaskNotificationTest.class);
         }
 
         EnvExecutor.runInEnv(Env.CLIENT, () -> () -> PrintingManager.registerPrint(ResourceLocation.fromNamespaceAndPath(Reference.MOD_ID, "picture"), PixelPainterApp.PicturePrint.class));
     }
 
     public abstract int getBurnTime(ItemStack stack, RecipeType<?> type);
 
-    protected abstract void registerApplicationEvent();
-
     protected List<Application> loadApps() {
         if (apps != null) {
             return apps;
@@ -303,7 +296,7 @@ public Application registerApplication(ResourceLocation identifier, ApplicationS
         AtomicReference<Application> application = new AtomicReference<>(null);
         EnvExecutor.runInEnv(Env.CLIENT, () -> () -> {
             Application theAppWeGot = app.get().get();
-            List<Application> apps = loadApps(); /*ObfuscationReflectionHelper.getPrivateValue(Laptop.class, null, "APPLICATIONS");*/
+            List<Application> apps = loadApps();
             assert apps != null;
             apps.add(theAppWeGot);
 

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

@@ -6,7 +6,7 @@
 /// Devices mod early configuration.
 /// This is used to configure devices mod early, when the NeoForge config isn't loaded yet.
 ///
-/// @author <a href="https://github.com/XyperCode">Qubilux</a>
+/// @author <a href="https://github.com/Qubilux">Qubix</a>
 public class DevicesEarlyConfig {
     private static final File FILE = Path.of("config").resolve("devices-early-config.json").toFile();
     public boolean enableBetaApps = false;

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

@@ -37,7 +37,7 @@ private ApplicationManager() {
     @Nullable
     public static Application registerApplication(ResourceLocation identifier, Supplier<Supplier<Application>> app, boolean isSystem) {
         Devices.LOGGER.debug(MARKER, "Registering application {}", identifier);
-        @SuppressWarnings("deprecation")
+
         Application application = Devices.getInstance().registerApplication(identifier, new Devices.ApplicationSupplier() {
             @Override
             public Supplier<Application> get() {

common/src/main/java/dev/ultreon/devices/api/print/IPrint.java

@@ -13,7 +13,7 @@
 /// Used for the printer.
 /// Uses ink sacks and paper.
 ///
-/// @author [MrCrayfish](https://github.com/MrCrayfish), [Qubilux](https://github.com/XyperCode)
+/// @author [MrCrayfish](https://github.com/MrCrayfish), [Qubix](https://github.com/Qubilux)
 public interface IPrint {
     static CompoundTag save(IPrint print) {
         CompoundTag tag = new CompoundTag();

common/src/main/java/dev/ultreon/devices/api/task/Task.java

@@ -23,12 +23,10 @@
  * @author MrCrayfish
  */
 public abstract class Task {
-    private String name;
     private Callback<CompoundTag> callback = null;
     private boolean success = false;
 
-    public Task(String name) {
-        this.name = name;
+    public Task() {
     }
 
     /**
@@ -61,24 +59,16 @@ public final void callback(CompoundTag tag) {
      */
     public final void setSuccessful() {
         if (this instanceof TaskInstallApp) DebugLog.log("Setting successful...");
-        this.success = true;
+        success = true;
     }
 
     /**
      * Gets if this Task produced the correct results.
      *
      * @return if this task was successful
      */
-    public final boolean isSucessful() {
-        return this.success;
-    }
-
-    /**
-     * Sets the task as complete and resets success to false.
-     * This is used for the core.
-     */
-    public final void complete() {
-        this.success = false;
+    public final boolean isSuccessful() {
+        return success;
     }
 
     /**
@@ -87,7 +77,7 @@ public final void complete() {
      * @return the Task name
      */
     public final String getName() {
-        return this.name;
+        return TaskManager.getTaskName(this);
     }
 
     /**
@@ -129,6 +119,6 @@ public final String getName() {
     public abstract void processResponse(HolderLookup.Provider provider, CompoundTag tag);
 
     public void setName(String name) {
-        this.name = name;
+
     }
 }

common/src/main/java/dev/ultreon/devices/api/task/TaskManager.java

@@ -7,13 +7,15 @@
 
 import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.Supplier;
 
 public final class TaskManager {
     private static TaskManager instance = null;
 
-    private final Map<String, Task> registeredRequests = new HashMap<>();
-    private final Map<Integer, Task> requests = new HashMap<>();
+    private final Map<Class<?>, String> taskTypeMap = new HashMap<>();
+    private final Map<String, Supplier<Task>> registeredRequests = new HashMap<>();
+    private final Map<Integer, Task> requests = new ConcurrentHashMap<>();
     private int currentId = 0;
 
     private TaskManager() {
@@ -26,33 +28,45 @@ private static TaskManager get() {
         return instance;
     }
 
-    public static void registerTask(Supplier<Task> clazz) {
-        var task = clazz.get();
+    public static void registerTask(String name, Supplier<Task> factory, Class<? extends Task> type) {
         try {
-            Devices.LOGGER.info("Registering task '{}'", task.getName());
-            get().registeredRequests.put(task.getName(), task);
+            if (get().registeredRequests.containsKey(name))
+                throw new RuntimeException("Task '" + name + "' is already registered!");
+
+            Devices.LOGGER.info("Registering task '{}'", name);
+            get().registeredRequests.put(name, factory);
+            get().taskTypeMap.put(type, name);
         } catch (Exception e) {
             Devices.LOGGER.error("Failed to register task:", e);
         }
     }
 
     public static void sendTask(Task task) {
         TaskManager manager = get();
-        if (!manager.registeredRequests.containsKey(task.getName())) {
+        String key = get().taskTypeMap.get(task.getClass());
+        if (key == null)
+            throw new RuntimeException("Unregistered Task: " + task.getClass().getName() + ". Use TaskManager#registerTask to register your task.");
+        if (!manager.registeredRequests.containsKey(key)) {
             throw new RuntimeException("Unregistered Task: " + task.getClass().getName() + ". Use TaskManager#requestRequest to register your task.");
         }
 
         int requestId = manager.currentId++;
+        if (manager.requests.containsKey(requestId))
+            Devices.LOGGER.warn("Request ID collision! Request ID: {}", requestId, new Throwable());
         manager.requests.put(requestId, task);
         if (Minecraft.getInstance().getConnection() != null)
             PacketHandler.sendToServer(new RequestPacket(requestId, task));
     }
 
-    public static Task getTask(String name) {
+    public static Supplier<Task> getTask(String name) {
         return get().registeredRequests.get(name);
     }
 
     public static Task getTaskAndRemove(int id) {
         return get().requests.remove(id);
     }
+
+    public static String getTaskName(Task task) {
+        return get().taskTypeMap.get(task.getClass());
+    }
 }

common/src/main/java/dev/ultreon/devices/block/RouterBlock.java

@@ -24,7 +24,7 @@
 /// # Router (Block)
 /// The block for the router device.
 ///
-/// @author [MrCrayfish](https://github.com/MrCrayfish), [Qubilux](https://github.com/XyperCode)
+/// @author [MrCrayfish](https://github.com/MrCrayfish), [Qubix](https://github.com/Qubilux)
 /// @see RouterBlockEntity
 public class RouterBlock extends DeviceBlock.Colored {
     public static final MapCodec<RouterBlock> CODEC = simpleCodec(RouterBlock::new);

common/src/main/java/dev/ultreon/devices/block/computer/MacMaxXBlock.java

@@ -32,7 +32,7 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-/// @author Qubilux
+/// @author Qubix
 public class MacMaxXBlock extends ComputerBlock {
     private static final MapCodec<MacMaxXBlock> CODEC = simpleCodec(MacMaxXBlock::new);
 

common/src/main/java/dev/ultreon/devices/block/computer/MacMaxXBlockPart.java

@@ -22,7 +22,7 @@
 import net.minecraft.world.phys.shapes.VoxelShape;
 import org.jetbrains.annotations.NotNull;
 
-/// @author Qubilux
+/// @author Qubix
 public class MacMaxXBlockPart extends HorizontalDirectionalBlock {
     public static final MapCodec<MacMaxXBlockPart> CODEC = simpleCodec(MacMaxXBlockPart::new);
     public static final EnumProperty<Part> PART = EnumProperty.create("part", Part.class);