feat: ✨ Updated with logic used in new Sophisticated Item Actions mod

Author: P3pp3rF1y

build.gradle

@@ -15,6 +15,10 @@ idea {
     }
 }
 
+if (findProject(':SophisticatedStorage') != null) {
+    evaluationDependsOn(':SophisticatedStorage')
+}
+
 version = "${project.minecraft_version}-${project.mod_version}.${getBuildNumber()}${getStable()}"
 group = mod_group_id
 

gradle.properties

@@ -13,7 +13,7 @@ loader_version_range=[4,)
 mod_id=sophisticatedstorageinmotion
 mod_name=Sophisticated Storage In Motion
 mod_license=All Rights Reserved
-mod_version=0.10.24
+mod_version=0.10.25
 mod_group_id=sophisticatedstorageinmotion
 mod_authors=P3pp3rF1y
 mod_description=Sophisticated Storage on moving entities.
@@ -30,7 +30,7 @@ jei_version=21.3.0.18
 jei_version_range=[19.9.0,)
 emi_version=1.1.22+1.21.1
 rei_version=19.0.806
-sc_version=[1.21.5-1.3.81,1.21.6)
+sc_version=[1.21.5-1.3.101,1.21.6)
 ss_version=[1.21.5-1.5.9,1.21.6)
 
 #publish

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

@@ -13,8 +13,6 @@
 import net.neoforged.neoforge.client.gui.VanillaGuiLayers;
 import net.neoforged.neoforge.client.renderstate.RegisterRenderStateModifiersEvent;
 import net.neoforged.neoforge.common.NeoForge;
-import net.p3pp3rf1y.sophisticatedcore.client.ItemInteractionHandler;
-import net.p3pp3rf1y.sophisticatedcore.client.render.ItemInStorageHighlightRenderer;
 import net.p3pp3rf1y.sophisticatedstorageinmotion.SophisticatedStorageInMotion;
 import net.p3pp3rf1y.sophisticatedstorageinmotion.client.gui.PaintbrushMovingStorageOverlay;
 import net.p3pp3rf1y.sophisticatedstorageinmotion.entity.IMovingStorageEntity;
@@ -45,9 +43,6 @@ public static void registerHandlers(IEventBus modBus) {
 
 		IEventBus eventBus = NeoForge.EVENT_BUS;
 		eventBus.addListener(ClientMovingStorageContentsTooltip::onWorldLoad);
-
-		ItemInStorageHighlightRenderer.registerHighlightHandler(MovingStorageHighlightHandler.INSTANCE);
-		ItemInteractionHandler.registerPayloadBuilder(MovingStorageItemActionPayloadBuilder.INSTANCE);
 	}
 
 	private static void registerMovingStorageRenderStateModifiers(RegisterRenderStateModifiersEvent event) {

src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/client/MovingStorageHighlightHandler.java

@@ -16,7 +16,6 @@
 import net.neoforged.neoforge.common.NeoForge;
 import net.neoforged.neoforge.event.entity.player.PlayerEvent;
 import net.neoforged.neoforge.event.entity.player.PlayerInteractEvent;
-import net.p3pp3rf1y.sophisticatedcore.common.ItemActionHandlerRegistry;
 import net.p3pp3rf1y.sophisticatedcore.init.ModCoreDataComponents;
 import net.p3pp3rf1y.sophisticatedcore.upgrades.UpgradeItemBase;
 import net.p3pp3rf1y.sophisticatedstorage.Config;
@@ -47,12 +46,6 @@ public static void registerHandlers() {
 		eventBus.addListener(CommonEventHandler::onPacked);
 		eventBus.addListener(CommonEventHandler::onPaintbrushInteract);
 		eventBus.addListener(CommonEventHandler::onStorageUpgradeInteract);
-
-		registerHighlightRequestPayloadHandler();
-	}
-
-	private static void registerHighlightRequestPayloadHandler() {
-		ItemActionHandlerRegistry.register(MovingStorageItemActionPayloadHandler.INSTANCE);
 	}
 
 	private static void onStorageUpgradeInteract(PlayerInteractEvent.EntityInteract event) {

src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/client/MovingStorageItemActionPayloadBuilder.java

@@ -3,7 +3,10 @@
 import net.neoforged.neoforge.network.event.RegisterPayloadHandlersEvent;
 import net.neoforged.neoforge.network.registration.PayloadRegistrar;
 import net.p3pp3rf1y.sophisticatedstorageinmotion.SophisticatedStorageInMotion;
-import net.p3pp3rf1y.sophisticatedstorageinmotion.network.*;
+import net.p3pp3rf1y.sophisticatedstorageinmotion.network.MovingStorageContentsPayload;
+import net.p3pp3rf1y.sophisticatedstorageinmotion.network.MovingStorageOpennessPayload;
+import net.p3pp3rf1y.sophisticatedstorageinmotion.network.OpenMovingStorageInventoryPayload;
+import net.p3pp3rf1y.sophisticatedstorageinmotion.network.RequestMovingStorageInventoryContentsPayload;
 
 public class ModPayloads {
 	private ModPayloads() {
@@ -15,6 +18,5 @@ public static void registerPayloads(final RegisterPayloadHandlersEvent event) {
 		registrar.playToServer(RequestMovingStorageInventoryContentsPayload.TYPE, RequestMovingStorageInventoryContentsPayload.STREAM_CODEC, RequestMovingStorageInventoryContentsPayload::handlePayload);
 		registrar.playToClient(MovingStorageContentsPayload.TYPE, MovingStorageContentsPayload.STREAM_CODEC, MovingStorageContentsPayload::handlePayload);
 		registrar.playToClient(MovingStorageOpennessPayload.TYPE, MovingStorageOpennessPayload.STREAM_CODEC, MovingStorageOpennessPayload::handlePayload);
-		registrar.playToClient(MovingStorageSyncItemHighlightsPayload.TYPE, MovingStorageSyncItemHighlightsPayload.STREAM_CODEC, MovingStorageSyncItemHighlightsPayload::handlePayload);
 	}
 }