Skip to content

Commit d8591c0

Browse files
committed
feat: ✨ Updated with logic used in new Sophisticated Item Actions mod
1 parent f44a539 commit d8591c0

File tree

9 files changed

+5
-236
lines changed

9 files changed

+5
-236
lines changed

build.gradle

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@ idea {
1919
if (findProject(':SophisticatedCore') != null) {
2020
evaluationDependsOn(':SophisticatedCore')
2121
}
22+
if (findProject(':SophisticatedStorage') != null) {
23+
evaluationDependsOn(':SophisticatedStorage')
24+
}
2225

2326
repositories {
2427
mavenCentral()

gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ org.gradle.daemon=false
33

44
mod_id=sophisticatedstorageinmotion
55
mod_group_id=sophisticatedstorageinmotion
6-
mod_version=0.10.26
6+
mod_version=0.10.27
77
sonar_project_key=sophisticatedstorageinmotion:SophisticatedStorageInMotion
88
github_package_url=https://maven.pkg.github.com/P3pp3rF1y/SophisticatedStorageInMotion
99

@@ -28,6 +28,6 @@ emi_version=1.1.22+1.20.1
2828
rei_version=12.1.785
2929
cloth_config_version=11.1.136
3030
architectury_version=9.2.14
31-
sc_version=[1.20.1-1.2.116,1.20.4)
31+
sc_version=[1.20.1-1.2.118,1.20.4)
3232
ss_version=[1.20.1-1.4.9,1.20.4)
3333
parchment_version=2023.09.03-1.20.1

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@
55
import net.minecraftforge.client.gui.overlay.VanillaGuiOverlay;
66
import net.minecraftforge.common.MinecraftForge;
77
import net.minecraftforge.eventbus.api.IEventBus;
8-
import net.p3pp3rf1y.sophisticatedcore.client.ItemInteractionHandler;
9-
import net.p3pp3rf1y.sophisticatedcore.client.render.ItemInStorageHighlightRenderer;
108
import net.p3pp3rf1y.sophisticatedstorageinmotion.client.gui.PaintbrushMovingStorageOverlay;
119
import net.p3pp3rf1y.sophisticatedstorageinmotion.item.MovingStorageItem;
1210

@@ -20,9 +18,6 @@ public static void registerHandlers(IEventBus modBus) {
2018

2119
IEventBus eventBus = MinecraftForge.EVENT_BUS;
2220
eventBus.addListener(ClientMovingStorageContentsTooltip::onWorldLoad);
23-
24-
ItemInStorageHighlightRenderer.registerHighlightHandler(MovingStorageHighlightHandler.INSTANCE);
25-
ItemInteractionHandler.registerPayloadBuilder(MovingStorageItemActionPayloadBuilder.INSTANCE);
2621
}
2722

2823
private static void registerOverlay(RegisterGuiOverlaysEvent 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
@@ -14,7 +14,6 @@
1414
import net.minecraftforge.event.entity.player.PlayerEvent;
1515
import net.minecraftforge.event.entity.player.PlayerInteractEvent;
1616
import net.minecraftforge.eventbus.api.IEventBus;
17-
import net.p3pp3rf1y.sophisticatedcore.common.ItemActionHandlerRegistry;
1817
import net.p3pp3rf1y.sophisticatedcore.upgrades.UpgradeItemBase;
1918
import net.p3pp3rf1y.sophisticatedcore.util.NBTHelper;
2019
import net.p3pp3rf1y.sophisticatedstorage.Config;
@@ -47,12 +46,6 @@ public static void registerHandlers() {
4746
eventBus.addListener(CommonEventHandler::onPacked);
4847
eventBus.addListener(CommonEventHandler::onPaintbrushInteract);
4948
eventBus.addListener(CommonEventHandler::onStorageUpgradeInteract);
50-
51-
registerHighlightRequestPayloadHandler();
52-
}
53-
54-
private static void registerHighlightRequestPayloadHandler() {
55-
ItemActionHandlerRegistry.register(MovingStorageItemActionPayloadHandler.INSTANCE);
5649
}
5750

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

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

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

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

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

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,5 @@ public void registerMessages() {
1616
registerMessage(MovingStorageContentsMessage.class, MovingStorageContentsMessage::encode, MovingStorageContentsMessage::decode, MovingStorageContentsMessage::onMessage);
1717
registerMessage(RequestMovingStorageInventoryContentsMessage.class, RequestMovingStorageInventoryContentsMessage::encode, RequestMovingStorageInventoryContentsMessage::decode, RequestMovingStorageInventoryContentsMessage::onMessage);
1818
registerMessage(MovingStorageOpennessMessage.class, MovingStorageOpennessMessage::encode, MovingStorageOpennessMessage::decode, MovingStorageOpennessMessage::onMessage);
19-
registerMessage(MovingStorageSyncItemHighlightsMessage.class, MovingStorageSyncItemHighlightsMessage::encode, MovingStorageSyncItemHighlightsMessage::decode, MovingStorageSyncItemHighlightsMessage::onMessage);
2019
}
2120
}

0 commit comments

Comments
 (0)