Merge remote-tracking branch 'origin/1.21' into 1.21

This commit is contained in:
GearShocky 2025-03-01 03:08:42 +05:00
commit d76ddfcd2b
3 changed files with 2 additions and 6 deletions

View File

@ -236,10 +236,6 @@ class ExopackInventoryScreen(menu: ExopackInventoryMenu) : MatteryScreen<Exopack
menu.enderChestSlots.forEach {
SlotPanel(this, grid, it)
}
if (menu.enderChestOpenState.get()) {
tab.activate()
}
}
makeChargePanels(frame)
@ -295,6 +291,7 @@ class ExopackInventoryScreen(menu: ExopackInventoryMenu) : MatteryScreen<Exopack
}
init {
menu.enderChestOpenState.value = false
PacketDistributor.sendToServer(ExopackMenuOpen)
ru.dbotthepony.mc.otm.client.minecraft.player?.containerMenu = menu
}

View File

@ -6,8 +6,6 @@ import java.util.function.BooleanSupplier
class InstantBooleanInput(menu: MatteryMenu) : Delegate<Boolean>, BooleanSupplier {
var value = false
private set
val input = menu.booleanInput(true) { value = it }
override fun get(): Boolean {

View File

@ -229,6 +229,7 @@ object ExopackMenuOpen : CustomPacketPayload {
if (mattery.hasExopack) {
player.containerMenu = mattery.exoPackMenu
mattery.exoPackMenu.enderChestOpenState.value = false
}
}