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.82
+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
@@ -47,6 +47,7 @@ trashslot_version=21.5.1+1.21.5
 reliquary_version=[1.21.5-2.0.76,1.21.6)
 ftb_chunks_version=2101.1.11
 ftb_library_version=2101.1.21
+accessories_version=1.1.0-beta.52+1.21.1
 openpartiesandclaims_cf_file_id=6999204
 #quark_cf_file_id=3919164
 #autoreglib_cf_file_id=3857246

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,37 @@
+{
+  "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": "minecraft:blaze_rod",
+    "E": "minecraft:ender_pearl",
+    "O": "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

@@ -17,19 +17,25 @@
 import net.minecraft.world.inventory.tooltip.TooltipComponent;
 import net.minecraft.world.item.ItemStack;
 import net.neoforged.bus.api.IEventBus;
-import net.neoforged.neoforge.client.event.*;
+import net.neoforged.neoforge.client.event.ClientTickEvent;
+import net.neoforged.neoforge.client.event.ContainerScreenEvent;
+import net.neoforged.neoforge.client.event.RecipesReceivedEvent;
+import net.neoforged.neoforge.client.event.RegisterConditionalItemModelPropertyEvent;
+import net.neoforged.neoforge.client.event.RegisterKeyMappingsEvent;
+import net.neoforged.neoforge.client.event.RenderLevelStageEvent;
+import net.neoforged.neoforge.client.event.ScreenEvent;
 import net.neoforged.neoforge.client.extensions.common.IClientFluidTypeExtensions;
 import net.neoforged.neoforge.client.extensions.common.RegisterClientExtensionsEvent;
 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;
 import net.p3pp3rf1y.sophisticatedcore.client.gui.utils.GuiSoundHelper;
 import net.p3pp3rf1y.sophisticatedcore.client.gui.utils.TranslationHelper;
 import net.p3pp3rf1y.sophisticatedcore.client.init.ModParticles;
-import net.p3pp3rf1y.sophisticatedcore.client.render.BlockHighlightRenderHelper;
 import net.p3pp3rf1y.sophisticatedcore.client.render.BlockHighlightRenderer;
 import net.p3pp3rf1y.sophisticatedcore.common.gui.StorageContainerMenuBase;
 import net.p3pp3rf1y.sophisticatedcore.init.ModFluids;
@@ -59,21 +65,30 @@ private ClientEventHandler() {
 
 	public static void registerHandlers(IEventBus modBus) {
 		modBus.addListener(ModParticles::registerFactories);
+		modBus.addListener(ClientEventHandler::registerConditionalItemModelProperties);
 		modBus.addListener(ClientEventHandler::registerFluidClientExtension);
 		modBus.addListener(ClientEventHandler::registerKeyMappings);
-		modBus.addListener(ClientEventHandler::registerRenderPipelines);
 		IEventBus eventBus = NeoForge.EVENT_BUS;
 		eventBus.addListener(StorageSoundHandler::tick);
 		eventBus.addListener(StorageSoundHandler::onWorldUnload);
 		eventBus.addListener(ClientEventHandler::onDrawScreen);
 		eventBus.addListener(ClientEventHandler::onContainerScreenForeground);
 		eventBus.addListener(ClientEventHandler::recipesReceived);
+		eventBus.addListener(ClientEventHandler::onItemTooltip);
 		eventBus.addListener(ClientEventHandler::handleGuiKeyPress);
 		eventBus.addListener(ClientEventHandler::handleGuiMouseKeyPress);
 		eventBus.addListener(ClientEventHandler::renderLevelStage);
 		eventBus.addListener(ClientEventHandler::onTickEnd);
 	}
 
+	private static void registerConditionalItemModelProperties(RegisterConditionalItemModelPropertyEvent event) {
+		event.register(SophisticatedCore.getRL("ender_linker_bound"), EnderLinkerBound.MAP_CODEC);
+	}
+
+	private static void recipesReceived(RecipesReceivedEvent event) {
+		RecipeHelper.setRecipes(event.getRecipeMap());
+	}
+
 	private static void onTickEnd(ClientTickEvent.Post event) {
 		ItemStackKey.clearCache();
 	}
@@ -86,10 +101,6 @@ private static void renderLevelStage(RenderLevelStageEvent event) {
 		BlockHighlightRenderer.render(event.getPoseStack(), partialTick, event.getCamera().getPosition());
 	}
 
-	private static void registerRenderPipelines(RegisterRenderPipelinesEvent event) {
-		event.registerPipeline(BlockHighlightRenderHelper.THICK_HIGHLIGHT_PIPELINE);
-	}
-
 	private static void registerKeyMappings(RegisterKeyMappingsEvent event) {
 		event.register(SORT_KEYBIND);
 		event.register(TRANSFER_TO_STORAGE_KEYBIND);
@@ -154,7 +165,7 @@ private static boolean tryCallSort(Screen gui) {
 			MouseHandler mh = mc.mouseHandler;
 			double mouseX = mh.xpos() * mc.getWindow().getGuiScaledWidth() / mc.getWindow().getScreenWidth();
 			double mouseY = mh.ypos() * mc.getWindow().getGuiScaledHeight() / mc.getWindow().getScreenHeight();
-			Slot selectedSlot = screen.getHoveredSlot(mouseX, mouseY);
+			Slot selectedSlot = screen.findSlot(mouseX, mouseY);
 			if (selectedSlot == null || container.isNotPlayersInventorySlot(selectedSlot.index)) {
 				container.sort();
 				return true;
@@ -163,10 +174,6 @@ private static boolean tryCallSort(Screen gui) {
 		return false;
 	}
 
-	private static void recipesReceived(RecipesReceivedEvent event) {
-		RecipeHelper.setRecipes(event.getRecipeMap());
-	}
-
 	private static void onDrawScreen(ScreenEvent.Render.Post event) {
 		Minecraft mc = Minecraft.getInstance();
 		Screen gui = mc.screen;
@@ -188,6 +195,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;
@@ -204,6 +213,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/EnderLinkerBound.java

@@ -0,0 +1,26 @@
+package net.p3pp3rf1y.sophisticatedcore.client;
+
+import com.mojang.serialization.MapCodec;
+import net.minecraft.client.multiplayer.ClientLevel;
+import net.minecraft.client.renderer.item.properties.conditional.ConditionalItemModelProperty;
+import net.minecraft.world.entity.LivingEntity;
+import net.minecraft.world.item.ItemDisplayContext;
+import net.minecraft.world.item.ItemStack;
+import net.p3pp3rf1y.sophisticatedcore.linkedstorage.EnderLinkerItem;
+
+import javax.annotation.Nullable;
+
+public record EnderLinkerBound() implements ConditionalItemModelProperty {
+	public static final MapCodec<EnderLinkerBound> MAP_CODEC = MapCodec.unit(new EnderLinkerBound());
+
+	@Override
+	public boolean get(ItemStack itemStack, @Nullable ClientLevel clientLevel, @Nullable LivingEntity livingEntity, int seed,
+			ItemDisplayContext itemDisplayContext) {
+		return EnderLinkerItem.hasBoundPresentation(itemStack);
+	}
+
+	@Override
+	public MapCodec<? extends ConditionalItemModelProperty> type() {
+		return MAP_CODEC;
+	}
+}