Compare commits
4 Commits
d76ddfcd2b
...
8ffb2ce3b1
Author | SHA1 | Date | |
---|---|---|---|
8ffb2ce3b1 | |||
0f2c6f0e1e | |||
ffdb7f6f8f | |||
162a3757e4 |
@ -196,10 +196,6 @@ class ExopackInventoryScreen(menu: ExopackInventoryMenu) : MatteryScreen<Exopack
|
||||
it.dockResize = DockResizeMode.NONE
|
||||
}
|
||||
}
|
||||
|
||||
if (menu.furnaceMenuOpenState.get()) {
|
||||
tab.activate()
|
||||
}
|
||||
}
|
||||
|
||||
if (menu.capability.isExopackEnderAccessInstalled) {
|
||||
@ -292,6 +288,7 @@ class ExopackInventoryScreen(menu: ExopackInventoryMenu) : MatteryScreen<Exopack
|
||||
|
||||
init {
|
||||
menu.enderChestOpenState.value = false
|
||||
menu.furnaceMenuOpenState.value = false
|
||||
PacketDistributor.sendToServer(ExopackMenuOpen)
|
||||
ru.dbotthepony.mc.otm.client.minecraft.player?.containerMenu = menu
|
||||
}
|
||||
|
@ -323,7 +323,8 @@ class DeviceControls<out S : MatteryScreen<*>>(
|
||||
val fluidConfig: FluidConfigPlayerInput? = null,
|
||||
val balanceInputs: BooleanInputWithFeedback? = null,
|
||||
val upgrades: UpgradeSlots? = null,
|
||||
val experience: TakeExperienceWidget? = null
|
||||
val experience: TakeExperienceWidget? = null,
|
||||
var dockOnLeft: Boolean = false,
|
||||
) : EditablePanel<S>(screen, parent, x = parent.width + 3f, height = 0f, width = 0f) {
|
||||
val itemConfigButton: ButtonPanel<S>?
|
||||
val energyConfigButton: ButtonPanel<S>?
|
||||
@ -736,7 +737,12 @@ class DeviceControls<out S : MatteryScreen<*>>(
|
||||
|
||||
override fun preRender(graphics: MGUIGraphics, mouseX: Float, mouseY: Float, partialTick: Float) {
|
||||
if (parent is FramePanel<*>) {
|
||||
x = parent!!.width + 3f
|
||||
if (dockOnLeft) {
|
||||
x = -width - 3f
|
||||
} else {
|
||||
x = parent!!.width + 3f
|
||||
}
|
||||
|
||||
y = dockTop
|
||||
}
|
||||
}
|
||||
|
@ -137,7 +137,7 @@ abstract class MatteryMenu(
|
||||
private val filters = ArrayList<Predicate<Player>>()
|
||||
|
||||
init {
|
||||
filters.add { allowSpectators || !it.isSpectator }
|
||||
filters.add { this.allowSpectators || !it.isSpectator }
|
||||
}
|
||||
|
||||
fun filter(predicate: Predicate<Player>): PlayerInput<V> {
|
||||
|
@ -230,6 +230,7 @@ object ExopackMenuOpen : CustomPacketPayload {
|
||||
if (mattery.hasExopack) {
|
||||
player.containerMenu = mattery.exoPackMenu
|
||||
mattery.exoPackMenu.enderChestOpenState.value = false
|
||||
mattery.exoPackMenu.furnaceMenuOpenState.value = false
|
||||
}
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user