Revert "Fix #104"

This reverts commit b01c455.
Layers-of-Railways · Nov 2, 2024 · 54e8f8d · 54e8f8d
1 parent e8810f4
commit 54e8f8d
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 0 deletions.
diff --git a/common/src/main/java/dev/ithundxr/createnumismatics/events/CommonEvents.java b/common/src/main/java/dev/ithundxr/createnumismatics/events/CommonEvents.java
@@ -90,4 +90,20 @@ public static void onPlayerJoin(ServerPlayer player) {
             }
         }
     }
+
+    @MultiLoaderEvent
+    public static InteractionResult onUseBlock(Player player, Level level, InteractionHand hand, BlockHitResult hitResult) {
+        BlockPos pos = hitResult.getBlockPos();
+        BlockState state = level.getBlockState(pos);
+
+        boolean offhandFix = !level.isClientSide()
+            && !player.getOffhandItem().isEmpty()
+            && !(player.getOffhandItem().getItem() instanceof BlockItem) &&
+            hand.equals(InteractionHand.MAIN_HAND);
+        if ((offhandFix || player.isShiftKeyDown()) && state.getBlock() instanceof VendorBlock vb) {
+            return vb.use(state, level, pos, player, hand, hitResult);
+        }
+
+        return InteractionResult.PASS;
+    }
 }
diff --git a/common/src/main/java/dev/ithundxr/createnumismatics/registry/NumismaticsBlockEntities.java b/common/src/main/java/dev/ithundxr/createnumismatics/registry/NumismaticsBlockEntities.java
@@ -32,6 +32,11 @@
 public class NumismaticsBlockEntities {
     private static final CreateRegistrate REGISTRATE = Numismatics.registrate();
 
+/*    public static final BlockEntityEntry<SemaphoreBlockEntity> SEMAPHORE = REGISTRATE.blockEntity("semaphore", SemaphoreBlockEntity::new)
+        .validBlocks(CRBlocks.SEMAPHORE)
+        .renderer(() -> SemaphoreRenderer::new)
+        .register();*/
+
     public static final BlockEntityEntry<AndesiteDepositorBlockEntity> ANDESITE_DEPOSITOR = REGISTRATE.blockEntity("andesite_depositor", AndesiteDepositorBlockEntity::new)
         .validBlocks(NumismaticsBlocks.ANDESITE_DEPOSITOR)
         .register();

diff --git a/fabric/src/main/java/dev/ithundxr/createnumismatics/events/fabric/CommonEventsFabric.java b/fabric/src/main/java/dev/ithundxr/createnumismatics/events/fabric/CommonEventsFabric.java
@@ -33,5 +33,6 @@ public static void init() {
         ServerWorldEvents.LOAD.register((server, level) -> CommonEvents.onLoadWorld(level));
         PlayerBlockBreakEvents.BEFORE.register((level, player, pos, state, entity) -> CommonEvents.onBlockBreak(level, pos, state, player));
         ServerPlayConnectionEvents.JOIN.register((connection, packetSender, server) -> CommonEvents.onPlayerJoin(connection.player));
+        UseBlockCallback.EVENT.register((player, world, hand, hitResult) -> CommonEvents.onUseBlock(player, world, hand, hitResult));
     }
 }
diff --git a/forge/src/main/java/dev/ithundxr/createnumismatics/events/forge/CommonEventsForge.java b/forge/src/main/java/dev/ithundxr/createnumismatics/events/forge/CommonEventsForge.java
@@ -47,4 +47,9 @@ public static void onPlayerJoin(PlayerEvent.PlayerLoggedInEvent event) {
         if (event.getEntity() instanceof ServerPlayer serverPlayer)
             CommonEvents.onPlayerJoin(serverPlayer);
     }
+
+    @SubscribeEvent
+    public static void onRightClickBlock(PlayerInteractEvent.RightClickBlock event) {
+        CommonEvents.onUseBlock(event.getEntity(), event.getLevel(), event.getHand(), event.getHitVec());
+    }
 }