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

exosuit -> exopack

Browse Source
This commit is contained in:
DBotThePony 2022-11-27 00:31:09 +07:00
parent 2e55e256d6
commit 2c7bb69b71
Signed by: DBot
GPG Key ID: DCC23B5715498507
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,7 +18,7 @@ import ru.dbotthepony.mc.otm.capability.MatteryPlayerCapability
import ru.dbotthepony.mc.otm.capability.matteryPlayer import ru.dbotthepony.mc.otm.capability.matteryPlayer
import ru.dbotthepony.mc.otm.client.render.UVWindingOrder import ru.dbotthepony.mc.otm.client.render.UVWindingOrder
import ru.dbotthepony.mc.otm.client.render.Widgets18 import ru.dbotthepony.mc.otm.client.render.Widgets18
import ru.dbotthepony.mc.otm.client.screen.ExoSuitInventoryScreen import ru.dbotthepony.mc.otm.client.screen.ExoPackInventoryScreen
import ru.dbotthepony.mc.otm.client.screen.MatteryScreen import ru.dbotthepony.mc.otm.client.screen.MatteryScreen
import ru.dbotthepony.mc.otm.client.screen.panels.AbstractSlotPanel import ru.dbotthepony.mc.otm.client.screen.panels.AbstractSlotPanel
import ru.dbotthepony.mc.otm.client.screen.panels.DiscreteScrollBarPanel import ru.dbotthepony.mc.otm.client.screen.panels.DiscreteScrollBarPanel
@ -95,7 +95,7 @@ private fun inventoryLogic(event: ScreenEvent.Init.Post) {
val mouseY = minecraft.mouseHandler.ypos() val mouseY = minecraft.mouseHandler.ypos()
event.screen.onClose() event.screen.onClose()
minecraft.setScreen(ExoSuitInventoryScreen(player.exoPackMenu)) minecraft.setScreen(ExoPackInventoryScreen(player.exoPackMenu))
InputConstants.grabOrReleaseMouse(minecraft.window.window, 212993, mouseX, mouseY) InputConstants.grabOrReleaseMouse(minecraft.window.window, 212993, mouseX, mouseY)
}).also { it.tooltip = TranslatableComponent("otm.gui.exosuit.go_in") }) }).also { it.tooltip = TranslatableComponent("otm.gui.exosuit.go_in") })
@ -250,6 +250,6 @@ fun onScreenOpen(event: ScreenEvent.Opening) {
val player = minecraft.player?.matteryPlayer ?: return val player = minecraft.player?.matteryPlayer ?: return
if (player.hasExoPack && event.newScreen is InventoryScreen) { if (player.hasExoPack && event.newScreen is InventoryScreen) {
event.newScreen = ExoSuitInventoryScreen(player.exoPackMenu) event.newScreen = ExoPackInventoryScreen(player.exoPackMenu)
} }
} }

12
src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/ExoSuitInventoryScreen.kt → src/main/kotlin/ru/dbotthepony/mc/otm/client/screen/ExoPackInventoryScreen.kt
View File

@ -18,9 +18,9 @@ import ru.dbotthepony.mc.otm.network.MatteryPlayerNetworkChannel
import yalter.mousetweaks.api.MouseTweaksDisableWheelTweak import yalter.mousetweaks.api.MouseTweaksDisableWheelTweak
@MouseTweaksDisableWheelTweak @MouseTweaksDisableWheelTweak
class ExoSuitInventoryScreen(menu: ExoPackInventoryMenu) : MatteryScreen<ExoPackInventoryMenu>(menu, TranslatableComponent("otm.gui.exosuit")) { class ExoPackInventoryScreen(menu: ExoPackInventoryMenu) : MatteryScreen<ExoPackInventoryMenu>(menu, TranslatableComponent("otm.gui.exopack")) {
private lateinit var mainInventoryLine: EditablePanel<ExoSuitInventoryScreen> private lateinit var mainInventoryLine: EditablePanel<ExoPackInventoryScreen>
private lateinit var scrollPanel: DiscreteScrollBarPanel<ExoSuitInventoryScreen> private lateinit var scrollPanel: DiscreteScrollBarPanel<ExoPackInventoryScreen>
override fun updateInventoryRows(old: Int) { override fun updateInventoryRows(old: Int) {
mainFrame!!.height = FRAME_BASE_HEIGHT + inventoryRows * AbstractSlotPanel.SIZE mainFrame!!.height = FRAME_BASE_HEIGHT + inventoryRows * AbstractSlotPanel.SIZE
@ -67,7 +67,7 @@ class ExoSuitInventoryScreen(menu: ExoPackInventoryMenu) : MatteryScreen<ExoPack
lastScroll = new lastScroll = new
}) })
mainInventoryLine = object : EditablePanel<ExoSuitInventoryScreen>(this@ExoSuitInventoryScreen, frame, height = AbstractSlotPanel.SIZE * inventoryRows) { mainInventoryLine = object : EditablePanel<ExoPackInventoryScreen>(this@ExoPackInventoryScreen, frame, height = AbstractSlotPanel.SIZE * inventoryRows) {
override fun mouseScrolledInner(x: Double, y: Double, scroll: Double): Boolean { override fun mouseScrolledInner(x: Double, y: Double, scroll: Double): Boolean {
return scrollPanel.mouseScrolledInner(x, y, scroll) return scrollPanel.mouseScrolledInner(x, y, scroll)
} }
@ -132,8 +132,8 @@ class ExoSuitInventoryScreen(menu: ExoPackInventoryMenu) : MatteryScreen<ExoPack
val resultPanel = SlotPanel(this, craftingCanvas, menu.craftingResultSlot, x = craftingCanvas.width - 18f, y = topLine.height / 2f - 9f) val resultPanel = SlotPanel(this, craftingCanvas, menu.craftingResultSlot, x = craftingCanvas.width - 18f, y = topLine.height / 2f - 9f)
object : EditablePanel<ExoSuitInventoryScreen>( object : EditablePanel<ExoPackInventoryScreen>(
this@ExoSuitInventoryScreen, this@ExoPackInventoryScreen,
craftingCanvas, craftingCanvas,
x = craftingSlotsCanvas.width, x = craftingSlotsCanvas.width,
width = craftingCanvas.width - resultPanel.width - craftingSlotsCanvas.width, width = craftingCanvas.width - resultPanel.width - craftingSlotsCanvas.width,

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

@ -9,7 +9,7 @@ import net.minecraft.world.entity.player.Player
import ru.dbotthepony.mc.otm.capability.matteryPlayer import ru.dbotthepony.mc.otm.capability.matteryPlayer
import ru.dbotthepony.mc.otm.client.render.Widgets8 import ru.dbotthepony.mc.otm.client.render.Widgets8
import ru.dbotthepony.mc.otm.client.render.element import ru.dbotthepony.mc.otm.client.render.element
import ru.dbotthepony.mc.otm.client.screen.ExoSuitInventoryScreen import ru.dbotthepony.mc.otm.client.screen.ExoPackInventoryScreen
import ru.dbotthepony.mc.otm.client.screen.panels.buttons.SmallBooleanRectangleButtonPanel import ru.dbotthepony.mc.otm.client.screen.panels.buttons.SmallBooleanRectangleButtonPanel
import ru.dbotthepony.mc.otm.compat.cos.CosmeticToggleRenderButton import ru.dbotthepony.mc.otm.compat.cos.CosmeticToggleRenderButton
import ru.dbotthepony.mc.otm.compat.cos.isCosmeticArmorLoaded import ru.dbotthepony.mc.otm.compat.cos.isCosmeticArmorLoaded
@ -123,7 +123,7 @@ class EntityRendererPanel<out S : Screen> @JvmOverloads constructor(
} }
override fun innerRender(stack: PoseStack, mouseX: Float, mouseY: Float, partialTick: Float) { override fun innerRender(stack: PoseStack, mouseX: Float, mouseY: Float, partialTick: Float) {
ExoSuitInventoryScreen.ENTITY_RECTANGLE.render(stack) ExoPackInventoryScreen.ENTITY_RECTANGLE.render(stack)
} }
companion object { companion object {