Refactor MessageChannelDeliver to use instance variables for serviceRegistry and playerManager; update NavigationHelper to correct item assignments

Author: TheMeinerLP

app/src/main/java/net/onelitefeather/titan/app/helper/NavigationHelper.java

@@ -61,8 +61,8 @@ private PersonalInventoryBuilder createPersonalInventoryBuilder(Player player) {
             finalLayout.setItems(LayoutCalculator.fillRow(InventoryType.CHEST_1_ROW), Items.NAVIGATOR_BLANK_ITEM_STACK);
             ThreadLocalUserProvider.bind(toUser(player));
             finalLayout.setItem(0, Items.NAVIGATOR_ELYTRA_ITEM_STACK, this::clickElytra);
-            finalLayout.setItem(4, Items.NAVIGATOR_SLENDER_ITEM_STACK, this::clickSlender);
-            finalLayout.setItem(5, Items.NAVIGATOR_SLENDER_ITEM_STACK, this::clickSurvival);
+            finalLayout.setItem(4, Items.NAVIGATOR_SURVIVAL_ITEM_STACK, this::clickSurvival);
+            finalLayout.setItem(5, Items.NAVIGATOR_SLENDER_ITEM_STACK, this::clickSlender);
             finalLayout.setItem(8, Items.NAVIGATOR_CREATIVE_ITEM_STACK, this::clickCreative);
             ThreadLocalUserProvider.release();
             return finalLayout;

common/src/main/java/net/onelitefeather/titan/common/deliver/MessageChannelDeliver.java

@@ -10,8 +10,13 @@
 
 public final class MessageChannelDeliver implements Deliver {
 
-    private static final ServiceRegistry serviceRegistry = InjectionLayer.ext().instance(ServiceRegistry.class);
-    private static final PlayerManager playerManager = serviceRegistry.firstProvider(PlayerManager.class);
+    private final ServiceRegistry serviceRegistry;
+    private final PlayerManager playerManager;
+
+    public MessageChannelDeliver() {
+        this.serviceRegistry = InjectionLayer.ext().instance(ServiceRegistry.class);
+        this.playerManager = this.serviceRegistry.firstProvider(PlayerManager.class);
+    }
 
     @Override
     public void sendPlayer(Player player, DeliverComponent component) {