DBot/overdrive_that_matters
DBot/overdrive_that_matters
3
1
Fork 0
Code Issues 63 Pull Requests Packages Releases Wiki Activity

Fix wrong translation strings involving exopack

Browse Source
This commit is contained in:
DBotThePony 2023-03-16 21:44:04 +07:00
parent 9cfd1e2119
commit 833284db6f
Signed by: DBot
GPG Key ID: DCC23B5715498507
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/ExoPackInventoryScreen.kt
View File

@ -17,7 +17,7 @@ import ru.dbotthepony.mc.otm.client.setMousePos
import ru.dbotthepony.mc.otm.client.shouldOpenVanillaInventory import ru.dbotthepony.mc.otm.client.shouldOpenVanillaInventory
import ru.dbotthepony.mc.otm.core.math.integerDivisionDown import ru.dbotthepony.mc.otm.core.math.integerDivisionDown
import ru.dbotthepony.mc.otm.menu.ExoPackInventoryMenu 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 ru.dbotthepony.mc.otm.network.MatteryPlayerNetworkChannel
import yalter.mousetweaks.api.MouseTweaksDisableWheelTweak import yalter.mousetweaks.api.MouseTweaksDisableWheelTweak
@ -157,7 +157,7 @@ class ExoPackInventoryScreen(menu: ExoPackInventoryMenu) : MatteryScreen<ExoPack
minecraft.setScreen(InventoryScreen(minecraft.player!!)) minecraft.setScreen(InventoryScreen(minecraft.player!!))
setMousePos(mouseX, mouseY) 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 -> makeInventoryRowsControls(frame, frame.width + 2f, frame.height.coerceAtMost(95f)) { movePixels ->
frame.y += movePixels frame.y += movePixels
@ -179,7 +179,7 @@ class ExoPackInventoryScreen(menu: ExoPackInventoryMenu) : MatteryScreen<ExoPack
} }
init { init {
MatteryPlayerNetworkChannel.sendToServer(ExoSuitMenuOpen) MatteryPlayerNetworkChannel.sendToServer(ExoPackMenuOpen)
ru.dbotthepony.mc.otm.client.minecraft.player?.containerMenu = menu ru.dbotthepony.mc.otm.client.minecraft.player?.containerMenu = menu
} }

2
src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/panels/EntityRendererPanel.kt
View File

@ -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 { } else {
exosuitButton = null exosuitButton = null
} }

5
src/main/kotlin/ru/dbotthepony/mc/otm/network/MatteryPlayerNetworkChannel.kt
View File

@ -8,7 +8,6 @@ import net.minecraft.resources.ResourceLocation
import net.minecraft.world.entity.player.Inventory import net.minecraft.world.entity.player.Inventory
import net.minecraft.world.item.Item import net.minecraft.world.item.Item
import net.minecraft.world.item.ItemStack 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_CLIENT
import net.minecraftforge.network.NetworkDirection.PLAY_TO_SERVER import net.minecraftforge.network.NetworkDirection.PLAY_TO_SERVER
import net.minecraftforge.network.NetworkEvent 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 write(buff: FriendlyByteBuf) {}
override fun play(context: Supplier<NetworkEvent.Context>) { override fun play(context: Supplier<NetworkEvent.Context>) {
@ -576,7 +575,7 @@ object MatteryPlayerNetworkChannel : MatteryNetworkChannel(
add(ExoSuitSlotPacket::class, ExoSuitSlotPacket.Companion::read, PLAY_TO_CLIENT) add(ExoSuitSlotPacket::class, ExoSuitSlotPacket.Companion::read, PLAY_TO_CLIENT)
add(ExoSuitMenuInitPacket::class, ExoSuitMenuInitPacket.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(SwitchAndroidFeaturePacket::class, SwitchAndroidFeaturePacket.Companion::read, PLAY_TO_SERVER)
add(ActivateAndroidFeaturePacket::class, ActivateAndroidFeaturePacket.Companion::read, PLAY_TO_SERVER) add(ActivateAndroidFeaturePacket::class, ActivateAndroidFeaturePacket.Companion::read, PLAY_TO_SERVER)