feat: ✨ Added linked storage support

Author: P3pp3rF1y

gradle.properties

@@ -15,7 +15,7 @@ loader_version_range=[4,)
 mod_id=sophisticatedcore
 mod_name=Sophisticated Core
 mod_license=All Rights Reserved
-mod_version=1.4.90
+mod_version=1.5.0
 mod_group_id=net.p3pp3rf1y
 mod_authors=P3pp3rF1y
 mod_description=A library / shared functionality mod for Sophisticated Storage and Backpacks

src/generated/resources/data/sophisticatedcore/advancement/recipes/misc/ender_linker.json

@@ -0,0 +1,51 @@
+{
+  "neoforge:conditions": [
+    {
+      "type": "sophisticatedcore:item_enabled",
+      "itemRegistryName": "sophisticatedcore:ender_linker"
+    },
+    {
+      "type": "neoforge:or",
+      "values": [
+        {
+          "type": "neoforge:mod_loaded",
+          "modid": "sophisticatedbackpacks"
+        },
+        {
+          "type": "neoforge:mod_loaded",
+          "modid": "sophisticatedstorage"
+        }
+      ]
+    }
+  ],
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_ender_pearl": {
+      "conditions": {
+        "items": [
+          {
+            "items": "minecraft:ender_pearl"
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "sophisticatedcore:ender_linker"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_the_recipe",
+      "has_ender_pearl"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "sophisticatedcore:ender_linker"
+    ]
+  }
+}

src/generated/resources/data/sophisticatedcore/recipe/ender_linker.json

@@ -0,0 +1,43 @@
+{
+  "neoforge:conditions": [
+    {
+      "type": "sophisticatedcore:item_enabled",
+      "itemRegistryName": "sophisticatedcore:ender_linker"
+    },
+    {
+      "type": "neoforge:or",
+      "values": [
+        {
+          "type": "neoforge:mod_loaded",
+          "modid": "sophisticatedbackpacks"
+        },
+        {
+          "type": "neoforge:mod_loaded",
+          "modid": "sophisticatedstorage"
+        }
+      ]
+    }
+  ],
+  "type": "minecraft:crafting_shaped",
+  "category": "misc",
+  "key": {
+    "B": {
+      "item": "minecraft:blaze_rod"
+    },
+    "E": {
+      "item": "minecraft:ender_pearl"
+    },
+    "O": {
+      "item": "minecraft:obsidian"
+    }
+  },
+  "pattern": [
+    "OEO",
+    "BOB",
+    "OEO"
+  ],
+  "result": {
+    "count": 1,
+    "id": "sophisticatedcore:ender_linker"
+  }
+}

src/generated/resources/data/sophisticatedcore/recipe/ender_linker_clear.json

@@ -0,0 +1,19 @@
+{
+  "neoforge:conditions": [
+    {
+      "type": "neoforge:or",
+      "values": [
+        {
+          "type": "neoforge:mod_loaded",
+          "modid": "sophisticatedbackpacks"
+        },
+        {
+          "type": "neoforge:mod_loaded",
+          "modid": "sophisticatedstorage"
+        }
+      ]
+    }
+  ],
+  "type": "sophisticatedcore:ender_linker_clear",
+  "category": "misc"
+}

src/generated/resources/data/sophisticatedcore/recipe/ender_linker_endpoint.json

@@ -0,0 +1,19 @@
+{
+  "neoforge:conditions": [
+    {
+      "type": "neoforge:or",
+      "values": [
+        {
+          "type": "neoforge:mod_loaded",
+          "modid": "sophisticatedbackpacks"
+        },
+        {
+          "type": "neoforge:mod_loaded",
+          "modid": "sophisticatedstorage"
+        }
+      ]
+    }
+  ],
+  "type": "sophisticatedcore:ender_linker_endpoint",
+  "category": "misc"
+}

src/main/java/net/p3pp3rf1y/sophisticatedcore/SophisticatedCore.java

@@ -24,6 +24,7 @@
 import net.p3pp3rf1y.sophisticatedcore.data.DataGenerators;
 import net.p3pp3rf1y.sophisticatedcore.init.ModCompat;
 import net.p3pp3rf1y.sophisticatedcore.init.ModCoreDataComponents;
+import net.p3pp3rf1y.sophisticatedcore.init.ModItems;
 import net.p3pp3rf1y.sophisticatedcore.inventory.StorageWrapperRepository;
 import net.p3pp3rf1y.sophisticatedcore.settings.DatapackSettingsTemplateManager;
 import net.p3pp3rf1y.sophisticatedcore.util.RecipeHelper;
@@ -52,6 +53,7 @@ public SophisticatedCore(IEventBus modBus, Dist dist, ModContainer container) {
 		}
 		Config.COMMON.initListeners(modBus);
 		ModCoreDataComponents.register(modBus);
+		ModItems.register(modBus);
 		modBus.addListener((FMLConstructModEvent event) -> construct(event, modBus));
 		modBus.addListener(SophisticatedCore::setup);
 		modBus.addListener(DataGenerators::gatherData);

src/main/java/net/p3pp3rf1y/sophisticatedcore/client/ClientEventHandler.java

@@ -10,13 +10,15 @@
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;
 import net.minecraft.client.gui.screens.inventory.CreativeModeInventoryScreen;
+import net.minecraft.client.renderer.item.ItemProperties;
 import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.inventory.AbstractContainerMenu;
 import net.minecraft.world.inventory.Slot;
 import net.minecraft.world.inventory.tooltip.TooltipComponent;
 import net.minecraft.world.item.ItemStack;
 import net.neoforged.bus.api.IEventBus;
+import net.neoforged.fml.event.lifecycle.FMLClientSetupEvent;
 import net.neoforged.neoforge.client.event.ClientTickEvent;
 import net.neoforged.neoforge.client.event.ContainerScreenEvent;
 import net.neoforged.neoforge.client.event.RegisterKeyMappingsEvent;
@@ -27,6 +29,7 @@
 import net.neoforged.neoforge.client.settings.IKeyConflictContext;
 import net.neoforged.neoforge.client.settings.KeyModifier;
 import net.neoforged.neoforge.common.NeoForge;
+import net.neoforged.neoforge.event.entity.player.ItemTooltipEvent;
 import net.p3pp3rf1y.sophisticatedcore.SophisticatedCore;
 import net.p3pp3rf1y.sophisticatedcore.api.IStashStorageItem;
 import net.p3pp3rf1y.sophisticatedcore.client.gui.StorageScreenBase;
@@ -36,7 +39,9 @@
 import net.p3pp3rf1y.sophisticatedcore.client.render.BlockHighlightRenderer;
 import net.p3pp3rf1y.sophisticatedcore.common.gui.StorageContainerMenuBase;
 import net.p3pp3rf1y.sophisticatedcore.init.ModFluids;
+import net.p3pp3rf1y.sophisticatedcore.init.ModItems;
 import net.p3pp3rf1y.sophisticatedcore.inventory.ItemStackKey;
+import net.p3pp3rf1y.sophisticatedcore.linkedstorage.EnderLinkerItem;
 import net.p3pp3rf1y.sophisticatedcore.upgrades.jukebox.StorageSoundHandler;
 import org.lwjgl.glfw.GLFW;
 
@@ -61,19 +66,26 @@ private ClientEventHandler() {
 
 	public static void registerHandlers(IEventBus modBus) {
 		modBus.addListener(ModParticles::registerFactories);
+		modBus.addListener(ClientEventHandler::setup);
 		modBus.addListener(ClientEventHandler::registerFluidClientExtension);
 		modBus.addListener(ClientEventHandler::registerKeyMappings);
 		IEventBus eventBus = NeoForge.EVENT_BUS;
 		eventBus.addListener(StorageSoundHandler::tick);
 		eventBus.addListener(StorageSoundHandler::onWorldUnload);
 		eventBus.addListener(ClientEventHandler::onDrawScreen);
 		eventBus.addListener(ClientEventHandler::onContainerScreenForeground);
+		eventBus.addListener(ClientEventHandler::onItemTooltip);
 		eventBus.addListener(ClientEventHandler::handleGuiKeyPress);
 		eventBus.addListener(ClientEventHandler::handleGuiMouseKeyPress);
 		eventBus.addListener(ClientEventHandler::renderLevelStage);
 		eventBus.addListener(ClientEventHandler::onTickEnd);
 	}
 
+	private static void setup(FMLClientSetupEvent event) {
+		event.enqueueWork(() -> ItemProperties.register(ModItems.ENDER_LINKER.get(), SophisticatedCore.getRL("bound"),
+				(stack, level, entity, seed) -> EnderLinkerItem.hasBoundPresentation(stack) ? 1.0F : 0.0F));
+	}
+
 	private static void onTickEnd(ClientTickEvent.Post event) {
 		ItemStackKey.clearCache();
 	}
@@ -180,6 +192,8 @@ private static void onContainerScreenForeground(ContainerScreenEvent.Render.Fore
 			return;
 		}
 		AbstractContainerMenu menu = containerGui.getMenu();
+		LinkerCraftingDiagnostics.requestIfChanged(menu);
+		renderLinkerCraftingDiagnostics(event.getGuiGraphics(), menu);
 		ItemStack held = menu.getCarried();
 		if (held.isEmpty()) {
 			return;
@@ -196,6 +210,35 @@ private static void onContainerScreenForeground(ContainerScreenEvent.Render.Fore
 		}
 	}
 
+	private static void renderLinkerCraftingDiagnostics(GuiGraphics guiGraphics, AbstractContainerMenu menu) {
+		for (Slot slot : menu.slots) {
+			renderLinkerCraftingDiagnostic(guiGraphics, slot);
+		}
+		if (menu instanceof StorageContainerMenuBase<?> storageContainer) {
+			storageContainer.upgradeSlots.forEach(slot -> renderLinkerCraftingDiagnostic(guiGraphics, slot));
+		}
+	}
+
+	private static void renderLinkerCraftingDiagnostic(GuiGraphics guiGraphics, Slot slot) {
+		if (LinkerCraftingDiagnostics.getStatusMessage(slot.index) != null) {
+			guiGraphics.fill(slot.x, slot.y, slot.x + 16, slot.y + 16, 0x80FF0000);
+		}
+	}
+
+	private static void onItemTooltip(ItemTooltipEvent event) {
+		if (!(Minecraft.getInstance().screen instanceof AbstractContainerScreen<?> screen)) {
+			return;
+		}
+		Slot slot = screen.getSlotUnderMouse();
+		if (slot == null || slot.getItem() != event.getItemStack()) {
+			return;
+		}
+		String statusMessage = LinkerCraftingDiagnostics.getStatusMessage(slot.index);
+		if (statusMessage != null) {
+			event.getToolTip().add(TranslationHelper.INSTANCE.translStatusMessage(statusMessage).withStyle(ChatFormatting.RED));
+		}
+	}
+
 	private static void renderStashSign(Minecraft mc, GuiGraphics guiGraphics, Slot s, ItemStack stack, IStashStorageItem.StashResult stashResult) {
 		int x = s.x;
 		int y = s.y;

src/main/java/net/p3pp3rf1y/sophisticatedcore/client/LinkerCraftingDiagnostics.java

@@ -0,0 +1,82 @@
+package net.p3pp3rf1y.sophisticatedcore.client;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;
+import net.minecraft.world.inventory.AbstractContainerMenu;
+import net.minecraft.world.inventory.CraftingContainer;
+import net.minecraft.world.inventory.Slot;
+import net.neoforged.neoforge.network.PacketDistributor;
+import net.p3pp3rf1y.sophisticatedcore.common.gui.ICraftingContainer;
+import net.p3pp3rf1y.sophisticatedcore.common.gui.StorageContainerMenuBase;
+import net.p3pp3rf1y.sophisticatedcore.common.gui.UpgradeContainerBase;
+import net.p3pp3rf1y.sophisticatedcore.network.RequestLinkerCraftingDiagnosticsPayload;
+import net.p3pp3rf1y.sophisticatedcore.network.SyncLinkerCraftingDiagnosticsPayload;
+
+import javax.annotation.Nullable;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public final class LinkerCraftingDiagnostics {
+	private static int lastRequestedContainerId = -1;
+	private static int lastRequestedSignature;
+	@Nullable
+	private static AbstractContainerMenu lastRequestedMenu;
+	private static final Map<Integer, String> diagnostics = new HashMap<>();
+
+	private LinkerCraftingDiagnostics() {
+	}
+
+	public static void requestIfChanged(AbstractContainerMenu menu) {
+		if (menu != lastRequestedMenu) {
+			lastRequestedMenu = menu;
+			lastRequestedContainerId = -1;
+			diagnostics.clear();
+		}
+		int signature = 1;
+		boolean hasCraftingGrid = false;
+		for (Slot slot : menu.slots) {
+			if (slot.container instanceof CraftingContainer) {
+				signature = 31 * signature + 31 * slot.index + slot.getItem().hashCode();
+				hasCraftingGrid = true;
+			}
+		}
+		if (menu instanceof StorageContainerMenuBase<?> storageContainer) {
+			for (UpgradeContainerBase<?, ?> upgradeContainer : storageContainer.getUpgradeContainers().values()) {
+				if (upgradeContainer instanceof ICraftingContainer craftingContainer) {
+					for (int slot = 0; slot < craftingContainer.getCraftMatrix().getContainerSize(); slot++) {
+						signature = 31 * signature + craftingContainer.getCraftMatrix().getItem(slot).hashCode();
+					}
+					hasCraftingGrid = true;
+				}
+			}
+		}
+		if (!hasCraftingGrid) {
+			diagnostics.clear();
+			lastRequestedMenu = null;
+			lastRequestedContainerId = -1;
+			return;
+		}
+		if (menu.containerId == lastRequestedContainerId && signature == lastRequestedSignature) {
+			return;
+		}
+		lastRequestedContainerId = menu.containerId;
+		lastRequestedSignature = signature;
+		diagnostics.clear();
+		PacketDistributor.sendToServer(new RequestLinkerCraftingDiagnosticsPayload(menu.containerId));
+	}
+
+	public static void update(int containerId, List<SyncLinkerCraftingDiagnosticsPayload.Diagnostic> updatedDiagnostics) {
+		if (!(Minecraft.getInstance().screen instanceof AbstractContainerScreen<?> screen) || screen.getMenu().containerId != containerId) {
+			return;
+		}
+		diagnostics.clear();
+		updatedDiagnostics.forEach(diagnostic -> diagnostics.put(diagnostic.slot(), diagnostic.statusMessageKey()));
+	}
+
+	@Nullable
+	public static String getStatusMessage(int slot) {
+		return diagnostics.get(slot);
+	}
+}