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