From 833284db6f1f9fe5381ef069dc2d6c8691016e94 Mon Sep 17 00:00:00 2001
From: DBotThePony <dbotthepony@yandex.ru>
Date: Thu, 16 Mar 2023 21:44:04 +0700
Subject: [PATCH] Fix wrong translation strings involving exopack

---
 .../mc/otm/client/screen/ExoPackInventoryScreen.kt          | 6 +++---
 .../mc/otm/client/screen/panels/EntityRendererPanel.kt      | 2 +-
 .../mc/otm/network/MatteryPlayerNetworkChannel.kt           | 5 ++---
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/ExoPackInventoryScreen.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/ExoPackInventoryScreen.kt
index 739edf842..c47c6e232 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/ExoPackInventoryScreen.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/ExoPackInventoryScreen.kt
@@ -17,7 +17,7 @@ import ru.dbotthepony.mc.otm.client.setMousePos
 import ru.dbotthepony.mc.otm.client.shouldOpenVanillaInventory
 import ru.dbotthepony.mc.otm.core.math.integerDivisionDown
 import ru.dbotthepony.mc.otm.menu.ExoPackInventoryMenu
-import ru.dbotthepony.mc.otm.network.ExoSuitMenuOpen
+import ru.dbotthepony.mc.otm.network.ExoPackMenuOpen
 import ru.dbotthepony.mc.otm.network.MatteryPlayerNetworkChannel
 import yalter.mousetweaks.api.MouseTweaksDisableWheelTweak
 
@@ -157,7 +157,7 @@ class ExoPackInventoryScreen(menu: ExoPackInventoryMenu) : MatteryScreen<ExoPack
 			minecraft.setScreen(InventoryScreen(minecraft.player!!))
 
 			setMousePos(mouseX, mouseY)
-		}).also { it.tooltip = TranslatableComponent("otm.gui.exosuit.go_back") }
+		}).also { it.tooltip = TranslatableComponent("otm.gui.exopack.go_back") }
 
 		makeInventoryRowsControls(frame, frame.width + 2f, frame.height.coerceAtMost(95f)) { movePixels ->
 			frame.y += movePixels
@@ -179,7 +179,7 @@ class ExoPackInventoryScreen(menu: ExoPackInventoryMenu) : MatteryScreen<ExoPack
 	}
 
 	init {
-		MatteryPlayerNetworkChannel.sendToServer(ExoSuitMenuOpen)
+		MatteryPlayerNetworkChannel.sendToServer(ExoPackMenuOpen)
 		ru.dbotthepony.mc.otm.client.minecraft.player?.containerMenu = menu
 	}
 
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/EntityRendererPanel.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/EntityRendererPanel.kt
index b6f3160f6..656606aee 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/EntityRendererPanel.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/EntityRendererPanel.kt
@@ -80,7 +80,7 @@ class EntityRendererPanel<out S : Screen> @JvmOverloads constructor(
 						}
 					)
 
-					exosuitButton.tooltip = TranslatableComponent("otm.gui.exosuit.toggle_visibility")
+					exosuitButton.tooltip = TranslatableComponent("otm.gui.exopack.toggle_visibility")
 				} else {
 					exosuitButton = null
 				}
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/network/MatteryPlayerNetworkChannel.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/network/MatteryPlayerNetworkChannel.kt
index 8445f9c01..8915ec7f1 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/network/MatteryPlayerNetworkChannel.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/network/MatteryPlayerNetworkChannel.kt
@@ -8,7 +8,6 @@ import net.minecraft.resources.ResourceLocation
 import net.minecraft.world.entity.player.Inventory
 import net.minecraft.world.item.Item
 import net.minecraft.world.item.ItemStack
-import net.minecraft.world.item.Items
 import net.minecraftforge.network.NetworkDirection.PLAY_TO_CLIENT
 import net.minecraftforge.network.NetworkDirection.PLAY_TO_SERVER
 import net.minecraftforge.network.NetworkEvent
@@ -334,7 +333,7 @@ class ExoSuitMenuInitPacket(val slots: List<ItemStack>, val carried: ItemStack,
 	}
 }
 
-object ExoSuitMenuOpen : MatteryPacket {
+object ExoPackMenuOpen : MatteryPacket {
 	override fun write(buff: FriendlyByteBuf) {}
 
 	override fun play(context: Supplier<NetworkEvent.Context>) {
@@ -576,7 +575,7 @@ object MatteryPlayerNetworkChannel : MatteryNetworkChannel(
 		add(ExoSuitSlotPacket::class, ExoSuitSlotPacket.Companion::read, PLAY_TO_CLIENT)
 		add(ExoSuitMenuInitPacket::class, ExoSuitMenuInitPacket.Companion::read, PLAY_TO_CLIENT)
 
-		add(ExoSuitMenuOpen::class, { ExoSuitMenuOpen }, PLAY_TO_SERVER)
+		add(ExoPackMenuOpen::class, { ExoPackMenuOpen }, PLAY_TO_SERVER)
 
 		add(SwitchAndroidFeaturePacket::class, SwitchAndroidFeaturePacket.Companion::read, PLAY_TO_SERVER)
 		add(ActivateAndroidFeaturePacket::class, ActivateAndroidFeaturePacket.Companion::read, PLAY_TO_SERVER)