Skip to content

Commit 0b7c38c

Browse files
committed
feat: ✨ Updated with logic used in new Sophisticated Item Actions mod
1 parent e04fd0f commit 0b7c38c

File tree

9 files changed

+6
-230
lines changed

9 files changed

+6
-230
lines changed

build.gradle

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@ idea {
1515
}
1616
}
1717

18+
if (findProject(':SophisticatedStorage') != null) {
19+
evaluationDependsOn(':SophisticatedStorage')
20+
}
21+
1822
version = "${project.minecraft_version}-${project.mod_version}.${getBuildNumber()}${getStable()}"
1923
group = mod_group_id
2024

gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ loader_version_range=[4,)
1313
mod_id=sophisticatedstorageinmotion
1414
mod_name=Sophisticated Storage In Motion
1515
mod_license=All Rights Reserved
16-
mod_version=0.10.23
16+
mod_version=0.10.24
1717
mod_group_id=sophisticatedstorageinmotion
1818
mod_authors=P3pp3rF1y
1919
mod_description=Sophisticated Storage on moving entities.
@@ -29,7 +29,7 @@ jei_version=26.1.1.21
2929
jei_version_range=[25.0.0,)
3030
emi_version=1.1.22+1.21.1
3131
rei_version=20.0.810
32-
sc_version=[1.21.10-1.3.85,1.21.11)
32+
sc_version=[1.21.10-1.3.111,1.21.11)
3333
ss_version=[1.21.10-1.5.11,1.21.11)
3434

3535
#publish

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@
1313
import net.neoforged.neoforge.client.gui.VanillaGuiLayers;
1414
import net.neoforged.neoforge.client.renderstate.RegisterRenderStateModifiersEvent;
1515
import net.neoforged.neoforge.common.NeoForge;
16-
import net.p3pp3rf1y.sophisticatedcore.client.ItemInteractionHandler;
17-
import net.p3pp3rf1y.sophisticatedcore.client.render.ItemInStorageHighlightRenderer;
1816
import net.p3pp3rf1y.sophisticatedstorageinmotion.SophisticatedStorageInMotion;
1917
import net.p3pp3rf1y.sophisticatedstorageinmotion.client.gui.PaintbrushMovingStorageOverlay;
2018
import net.p3pp3rf1y.sophisticatedstorageinmotion.entity.IMovingStorageEntity;
@@ -45,9 +43,6 @@ public static void registerHandlers(IEventBus modBus) {
4543

4644
IEventBus eventBus = NeoForge.EVENT_BUS;
4745
eventBus.addListener(ClientMovingStorageContentsTooltip::onWorldLoad);
48-
49-
ItemInStorageHighlightRenderer.registerHighlightHandler(MovingStorageHighlightHandler.INSTANCE);
50-
ItemInteractionHandler.registerPayloadBuilder(MovingStorageItemActionPayloadBuilder.INSTANCE);
5146
}
5247

5348
private static void registerMovingStorageRenderStateModifiers(RegisterRenderStateModifiersEvent event) {

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

Lines changed: 0 additions & 84 deletions
This file was deleted.

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

Lines changed: 0 additions & 30 deletions
This file was deleted.

src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/common/CommonEventHandler.java

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
import net.neoforged.neoforge.common.NeoForge;
1919
import net.neoforged.neoforge.event.entity.player.PlayerEvent;
2020
import net.neoforged.neoforge.event.entity.player.PlayerInteractEvent;
21-
import net.p3pp3rf1y.sophisticatedcore.common.ItemActionHandlerRegistry;
2221
import net.p3pp3rf1y.sophisticatedcore.init.ModCoreDataComponents;
2322
import net.p3pp3rf1y.sophisticatedcore.inventory.ContainerContents;
2423
import net.p3pp3rf1y.sophisticatedcore.renderdata.RenderData;
@@ -51,12 +50,6 @@ public static void registerHandlers() {
5150
eventBus.addListener(CommonEventHandler::onPacked);
5251
eventBus.addListener(CommonEventHandler::onPaintbrushInteract);
5352
eventBus.addListener(CommonEventHandler::onStorageUpgradeInteract);
54-
55-
registerHighlightRequestPayloadHandler();
56-
}
57-
58-
private static void registerHighlightRequestPayloadHandler() {
59-
ItemActionHandlerRegistry.register(MovingStorageItemActionPayloadHandler.INSTANCE);
6053
}
6154

6255
private static void onStorageUpgradeInteract(PlayerInteractEvent.EntityInteract event) {

src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/common/MovingStorageItemActionPayloadHandler.java

Lines changed: 0 additions & 70 deletions
This file was deleted.

src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/init/ModPayloads.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,5 @@ public static void registerPayloads(final RegisterPayloadHandlersEvent event) {
1616
registrar.playToClient(MovingStorageContentsPayload.TYPE, MovingStorageContentsPayload.STREAM_CODEC, MovingStorageContentsPayload::handlePayload);
1717
registrar.playToClient(MovingStorageSettingsPayload.TYPE, MovingStorageSettingsPayload.STREAM_CODEC, MovingStorageSettingsPayload::handlePayload);
1818
registrar.playToClient(MovingStorageOpennessPayload.TYPE, MovingStorageOpennessPayload.STREAM_CODEC, MovingStorageOpennessPayload::handlePayload);
19-
registrar.playToClient(MovingStorageSyncItemHighlightsPayload.TYPE, MovingStorageSyncItemHighlightsPayload.STREAM_CODEC, MovingStorageSyncItemHighlightsPayload::handlePayload);
2019
}
2120
}

src/main/java/net/p3pp3rf1y/sophisticatedstorageinmotion/network/MovingStorageSyncItemHighlightsPayload.java

Lines changed: 0 additions & 31 deletions
This file was deleted.

0 commit comments

Comments
 (0)