Fixed the relative direction tooltip crashing with controllers, closes #445

Author: Buuz135

CHANGELOG.md

@@ -1,3 +1,7 @@
+# VERSION 1.5.3
+
+* Fixed the relative direction tooltip crashing with controllers, closes #445 
+
 # VERSION 1.5.2
 
 * Update zh_cn.json 1.21 - Mooncywin

gradle.properties

@@ -1,6 +1,6 @@
 org.gradle.jvmargs=-Xmx2048M
 modGroup=com.buuz135
-mod_version=1.5.2
+mod_version=1.5.3
 modBaseName=functionalstorage
 
 neo_version=21.1.40

src/main/java/com/buuz135/functionalstorage/client/ClientSetup.java

@@ -24,14 +24,17 @@ public static void init() {
             .process(event -> {
                 var sc = (BasicAddonScreen) Minecraft.getInstance().screen;
                 var blockstate = ((ControllableDrawerTile<?>) sc.getMenu().getObject()).getBlockState();
-                var direction = blockstate.getValue(Drawer.FACING_HORIZONTAL_CUSTOM);
-                if (blockstate.hasProperty(Drawer.FACING_ALL) && (direction == Direction.UP || direction == Direction.DOWN)) {
-                    var subdirection = blockstate.getValue(RotatableBlock.FACING_ALL);
-                    System.out.println(subdirection);
-                    event.getToolTip().add(3, Component.translatable("drawer_upgrade.functionalstorage.relative_direction", UpgradeItem.getRelativeDirectionVertical(direction, subdirection, UpgradeItem.getDirection(event.getItemStack()))).withStyle(ChatFormatting.YELLOW));
-                } else {
+                if (blockstate.hasProperty(Drawer.FACING_HORIZONTAL_CUSTOM)) {
+                    var direction = blockstate.getValue(Drawer.FACING_HORIZONTAL_CUSTOM);
+                    if (blockstate.hasProperty(Drawer.FACING_ALL) && (direction == Direction.UP || direction == Direction.DOWN)) {
+                        var subdirection = blockstate.getValue(RotatableBlock.FACING_ALL);
+                        event.getToolTip().add(3, Component.translatable("drawer_upgrade.functionalstorage.relative_direction", UpgradeItem.getRelativeDirectionVertical(direction, subdirection, UpgradeItem.getDirection(event.getItemStack()))).withStyle(ChatFormatting.YELLOW));
+                    } else {
+                        event.getToolTip().add(3, Component.translatable("drawer_upgrade.functionalstorage.relative_direction", UpgradeItem.getRelativeDirection(direction, UpgradeItem.getDirection(event.getItemStack()))).withStyle(ChatFormatting.YELLOW));
+                    }
+                } else if (blockstate.hasProperty(Drawer.FACING_HORIZONTAL)) {
+                    var direction = blockstate.getValue(Drawer.FACING_HORIZONTAL);
                     event.getToolTip().add(3, Component.translatable("drawer_upgrade.functionalstorage.relative_direction", UpgradeItem.getRelativeDirection(direction, UpgradeItem.getDirection(event.getItemStack()))).withStyle(ChatFormatting.YELLOW));
-
                 }
             }).subscribe();