feat: ✨ Added linked storage to SB Create integration

Author: P3pp3rF1y

gradle.properties

@@ -7,7 +7,7 @@ mod_id=sophisticatedcore
 mod_name=Sophisticated Core
 mod_license=All Rights Reserved
 mod_group_id=net.p3pp3rf1y
-mod_version=1.5.0
+mod_version=1.5.1
 sonar_project_key=sophisticatedcore:SophisticatedCore
 github_package_url=https://maven.pkg.github.com/P3pp3rF1y/SophisticatedCore
 

src/main/java/net/p3pp3rf1y/sophisticatedcore/compat/create/MountedStorageBase.java

@@ -97,4 +97,8 @@ protected void onOpen(ServerLevel level, Vec3 pos) {
 	public void onContraptionDestroyed() {
 
 	}
+
+	public void onContraptionRemoved() {
+
+	}
 }

src/main/java/net/p3pp3rf1y/sophisticatedcore/compat/create/MountedStorageSettingsContainerMenuBase.java

@@ -39,7 +39,7 @@ public int getContraptionEntityId() {
 		return contraptionEntityId;
 	}
 
-	private void sendStorageSettingsToClient() {
+	protected void sendStorageSettingsToClient() {
 		if (player.level().isClientSide) {
 			return;
 		}

src/main/java/net/p3pp3rf1y/sophisticatedcore/linkedstorage/EnderLinkerItem.java

@@ -5,6 +5,7 @@
 import net.minecraft.core.particles.ParticleTypes;
 import net.minecraft.network.chat.Component;
 import net.minecraft.server.level.ServerLevel;
+import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.sounds.SoundEvents;
 import net.minecraft.sounds.SoundSource;
 import net.minecraft.world.InteractionResult;
@@ -27,6 +28,8 @@
 import javax.annotation.Nullable;
 
 import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
 import java.util.function.BiFunction;
 
 public class EnderLinkerItem extends ItemBase {
@@ -44,12 +47,12 @@ public int getMaxStackSize(ItemStack stack) {
 
 	@Override
 	public boolean overrideStackedOnOther(ItemStack linker, Slot slot, ClickAction action, Player player) {
-		return action == ClickAction.SECONDARY && tryLinkStack(player, linker, slot.getItem());
+		return action == ClickAction.SECONDARY && tryLinkItemInteractionTarget(player, linker, () -> slot.getItem(), null).isPresent();
 	}
 
 	@Override
 	public boolean overrideOtherStackedOnMe(ItemStack linker, ItemStack endpoint, Slot slot, ClickAction action, Player player, SlotAccess carriedAccess) {
-		return action == ClickAction.SECONDARY && tryLinkStack(player, linker, endpoint);
+		return action == ClickAction.SECONDARY && tryLinkItemInteractionTarget(player, linker, () -> endpoint, null).isPresent();
 	}
 
 	@Override
@@ -73,20 +76,31 @@ private static LinkAttempt tryLinkBlock(Player player, ItemStack linker, Level l
 		if (level.isClientSide) {
 			return LinkAttempt.SUCCESS;
 		}
-		return level instanceof ServerLevel && linkBlock(player, linker, endpoint, pos) ? LinkAttempt.SUCCESS : LinkAttempt.FAILURE;
+		Optional<LinkedStorageService.LinkResult> result = tryLinkInteractionTarget(player, linker, endpoint, pos);
+		return result.isPresent() && result.get() == LinkedStorageService.LinkResult.SUCCESS ? LinkAttempt.SUCCESS : LinkAttempt.FAILURE;
 	}
 
-	private static boolean tryLinkStack(Player player, ItemStack linker, ItemStack endpoint) {
-		if (!LinkedStorageService.isLinkCandidate(endpoint)) {
-			return false;
-		}
-		linkWithFeedback(player, linker, null, (level, linkerToBind) -> LinkedStorageService.linkWithResult(level, player.getUUID(), linkerToBind, endpoint));
-		return true;
+	public static Optional<LinkedStorageService.LinkResult> tryLinkItemInteractionTarget(Player player, ItemStack linker,
+			ILinkedStorageItemInteractionTarget target, @Nullable BlockPos feedbackPos) {
+		return tryLinkInteractionTarget(player, linker, target, feedbackPos);
 	}
 
-	private static boolean linkBlock(Player player, ItemStack linker, ILinkedStorageBlockEndpoint endpoint, BlockPos blockPos) {
-		return linkWithFeedback(player, linker, blockPos, (level, linkerToBind) -> LinkedStorageService.linkWithResult(level, player.getUUID(), linkerToBind,
-				endpoint)) == LinkedStorageService.LinkResult.SUCCESS;
+	public static Optional<LinkedStorageService.LinkResult> tryLinkInteractionTarget(Player player, ItemStack linker, ILinkedStorageInteractionTarget target,
+			@Nullable BlockPos feedbackPos) {
+		if (!target.isLinkedStorageLinkCandidate()) {
+			return Optional.empty();
+		}
+
+		LinkedStorageEndpointData previousEndpoint = target.getLinkedStorageEndpointData();
+		LinkedStorageService.LinkResult result = linkWithFeedback(player, linker, feedbackPos,
+				(level, linkerToBind) -> target.link(level, player.getUUID(), linkerToBind));
+		if (result == LinkedStorageService.LinkResult.SUCCESS && player instanceof ServerPlayer serverPlayer) {
+			LinkedStorageEndpointData currentEndpoint = target.getLinkedStorageEndpointData();
+			if (!Objects.equals(previousEndpoint, currentEndpoint)) {
+				target.onLinkedStorageEndpointChanged(serverPlayer, previousEndpoint, currentEndpoint);
+			}
+		}
+		return Optional.of(result);
 	}
 
 	private static LinkedStorageService.LinkResult linkWithFeedback(Player player, ItemStack linker, @Nullable BlockPos blockPos,

src/main/java/net/p3pp3rf1y/sophisticatedcore/linkedstorage/ILinkedStorageBlockEndpoint.java

@@ -1,10 +1,26 @@
 package net.p3pp3rf1y.sophisticatedcore.linkedstorage;
 
+import net.minecraft.server.level.ServerLevel;
+import net.minecraft.world.item.ItemStack;
+
 import javax.annotation.Nullable;
 
-public interface ILinkedStorageBlockEndpoint {
+import java.util.UUID;
+
+public interface ILinkedStorageBlockEndpoint extends ILinkedStorageInteractionTarget {
+	@Override
+	default boolean isLinkedStorageLinkCandidate() {
+		return true;
+	}
+
 	@Nullable
+	@Override
 	LinkedStorageEndpointData getLinkedStorageEndpointData();
 
 	ILinkedStorageEndpointAdapter<ILinkedStorageBlockEndpoint> getLinkedStorageBlockEndpointAdapter();
+
+	@Override
+	default LinkedStorageService.LinkResult link(ServerLevel level, UUID playerId, ItemStack linker) {
+		return LinkedStorageService.linkWithResult(level, playerId, linker, this);
+	}
 }

src/main/java/net/p3pp3rf1y/sophisticatedcore/linkedstorage/ILinkedStorageInteractionTarget.java

@@ -0,0 +1,22 @@
+package net.p3pp3rf1y.sophisticatedcore.linkedstorage;
+
+import net.minecraft.server.level.ServerLevel;
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.world.item.ItemStack;
+
+import javax.annotation.Nullable;
+
+import java.util.UUID;
+
+public interface ILinkedStorageInteractionTarget {
+	boolean isLinkedStorageLinkCandidate();
+
+	@Nullable
+	LinkedStorageEndpointData getLinkedStorageEndpointData();
+
+	LinkedStorageService.LinkResult link(ServerLevel level, UUID playerId, ItemStack linker);
+
+	default void onLinkedStorageEndpointChanged(ServerPlayer player, @Nullable LinkedStorageEndpointData previousEndpoint,
+			@Nullable LinkedStorageEndpointData currentEndpoint) {
+	}
+}

src/main/java/net/p3pp3rf1y/sophisticatedcore/linkedstorage/ILinkedStorageItemInteractionTarget.java

@@ -0,0 +1,25 @@
+package net.p3pp3rf1y.sophisticatedcore.linkedstorage;
+
+import net.minecraft.server.level.ServerLevel;
+import net.minecraft.world.item.ItemStack;
+
+import java.util.UUID;
+
+public interface ILinkedStorageItemInteractionTarget extends ILinkedStorageInteractionTarget {
+	ItemStack getLinkedStorageItem();
+
+	@Override
+	default boolean isLinkedStorageLinkCandidate() {
+		return LinkedStorageService.isLinkCandidate(getLinkedStorageItem());
+	}
+
+	@Override
+	default LinkedStorageEndpointData getLinkedStorageEndpointData() {
+		return LinkedStorageStackData.getEndpoint(getLinkedStorageItem());
+	}
+
+	@Override
+	default LinkedStorageService.LinkResult link(ServerLevel level, UUID playerId, ItemStack linker) {
+		return LinkedStorageService.linkWithResult(level, playerId, linker, getLinkedStorageItem());
+	}
+}

src/main/java/net/p3pp3rf1y/sophisticatedcore/mixin/create/MixinAbstractContraptionEntity.java

@@ -18,7 +18,17 @@ public class MixinAbstractContraptionEntity {
 	@Inject(method = "remove", at = @At("HEAD"))
 	private void cleanupMountedStoragesOnDestroy(Entity.RemovalReason removalReason, CallbackInfo ci) {
 		AbstractContraptionEntity contraptionEntity = (AbstractContraptionEntity) (Object) this;
-		if (contraptionEntity.level().isClientSide() || contraption == null || contraption.disassembled || removalReason != Entity.RemovalReason.KILLED) {
+		if (contraptionEntity.level().isClientSide || contraption == null) {
+			return;
+		}
+
+		contraption.getStorage().getAllItemStorages().values().forEach(storage -> {
+			if (storage instanceof MountedStorageBase mountedStorage) {
+				mountedStorage.onContraptionRemoved();
+			}
+		});
+
+		if (contraption.disassembled || removalReason != Entity.RemovalReason.KILLED) {
 			return;
 		}