From 1f88387cc8be4aae456f7335fa42b4e4aa4c955d Mon Sep 17 00:00:00 2001
From: Kolja <104643407+Thatguyello@users.noreply.github.com>
Date: Wed, 27 Aug 2025 00:12:02 +0200
Subject: [PATCH] Add the EnergyStorage capability to the Wireless Terminal so
 it can be charged outside the ae2 ecosystem

---
 .../compat/wtlib/WirelessTerminalCompat.java    | 17 +++++++++++++----
 .../merequester/core/Registration.java          |  2 +-
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/almostreliable/merequester/compat/wtlib/WirelessTerminalCompat.java b/src/main/java/com/almostreliable/merequester/compat/wtlib/WirelessTerminalCompat.java
index ecf18e5..dd82bc7 100644
--- a/src/main/java/com/almostreliable/merequester/compat/wtlib/WirelessTerminalCompat.java
+++ b/src/main/java/com/almostreliable/merequester/compat/wtlib/WirelessTerminalCompat.java
@@ -3,6 +3,8 @@
 import net.minecraft.world.inventory.MenuType;
 import net.minecraft.world.level.ItemLike;
 import net.neoforged.fml.ModList;
+import net.neoforged.neoforge.capabilities.Capabilities;
+import net.neoforged.neoforge.capabilities.RegisterCapabilitiesEvent;
 import net.neoforged.neoforge.client.event.RegisterMenuScreensEvent;
 import net.neoforged.neoforge.registries.DeferredHolder;
 import net.neoforged.neoforge.registries.DeferredItem;
@@ -10,6 +12,8 @@
 
 import appeng.api.features.GridLinkables;
 import appeng.init.client.InitScreens;
+import appeng.items.tools.powered.WirelessTerminalItem;
+import appeng.items.tools.powered.powersink.PoweredItemCapabilities;
 import de.mari_023.ae2wtlib.api.gui.Icon;
 import de.mari_023.ae2wtlib.api.registration.AddTerminalEvent;
 
@@ -35,9 +39,9 @@ public void initClient(RegisterMenuScreensEvent event) {
         }
     }
 
-    public void registerCapabilities() {
+    public void registerCapabilities(RegisterCapabilitiesEvent event) {
         if (isLoaded()) {
-            Guard.registerCapabilities();
+            Guard.registerCapabilities(event);
         }
     }
 
@@ -81,9 +85,14 @@ private static void init(DeferredRegister.Items itemRegistry, DeferredRegister<M
                 .addTerminal());
         }
 
-        private static void registerCapabilities() {
+        private static void registerCapabilities(RegisterCapabilitiesEvent event) {
             assert WIRELESS_REQUESTER_TERMINAL != null;
-            GridLinkables.register(WIRELESS_REQUESTER_TERMINAL, appeng.items.tools.powered.WirelessTerminalItem.LINKABLE_HANDLER);
+            GridLinkables.register(WIRELESS_REQUESTER_TERMINAL, WirelessTerminalItem.LINKABLE_HANDLER);
+            event.registerItem(
+                Capabilities.EnergyStorage.ITEM,
+                (stack, context) -> new PoweredItemCapabilities(stack, WIRELESS_REQUESTER_TERMINAL.get()),
+                WIRELESS_REQUESTER_TERMINAL
+            );
         }
 
         private static Iterable<ItemLike> collectItems() {
diff --git a/src/main/java/com/almostreliable/merequester/core/Registration.java b/src/main/java/com/almostreliable/merequester/core/Registration.java
index e349dde..bacdf63 100644
--- a/src/main/java/com/almostreliable/merequester/core/Registration.java
+++ b/src/main/java/com/almostreliable/merequester/core/Registration.java
@@ -140,7 +140,7 @@ private static void registerCapabilities(RegisterCapabilitiesEvent event) {
             (requester, ctx) -> requester
         );
 
-        WirelessTerminalCompat.INSTANCE.registerCapabilities();
+        WirelessTerminalCompat.INSTANCE.registerCapabilities(event);
     }
 
     public static final class Tab {