diff --git a/src/main/java/com/projecturanus/betterp2p/client/gui/GuiAdvancedMemoryCard.kt b/src/main/java/com/projecturanus/betterp2p/client/gui/GuiAdvancedMemoryCard.kt index 86980ab..26c1fb6 100644 --- a/src/main/java/com/projecturanus/betterp2p/client/gui/GuiAdvancedMemoryCard.kt +++ b/src/main/java/com/projecturanus/betterp2p/client/gui/GuiAdvancedMemoryCard.kt @@ -1,5 +1,6 @@ package com.projecturanus.betterp2p.client.gui +import appeng.client.gui.widgets.MEGuiTextField import com.projecturanus.betterp2p.BetterP2P import com.projecturanus.betterp2p.MODID import com.projecturanus.betterp2p.capability.MemoryInfo @@ -35,6 +36,7 @@ class GuiAdvancedMemoryCard(msg: S2CListP2P) : GuiScreen(), TextureBound { private var selectedIndex = -1 private lateinit var scrollBar: WidgetScrollBar + private lateinit var searchBar: MEGuiTextField private val infos = msg.infos.map(::InfoWrapper).toMutableList() @@ -53,7 +55,7 @@ class GuiAdvancedMemoryCard(msg: S2CListP2P) : GuiScreen(), TextureBound { private var mode = msg.memoryInfo.mode private var modeString = getModeString() - private val modeButton by lazy { GuiButton(0, guiLeft + 8, guiTop + 140, 205, 20, modeString) } + private val modeButton by lazy { GuiButton(0, guiLeft + 8, guiTop + 154, 205, 20, modeString) } init { selectInfo(msg.memoryInfo.selectedIndex) @@ -61,7 +63,7 @@ class GuiAdvancedMemoryCard(msg: S2CListP2P) : GuiScreen(), TextureBound { infoOnScreen = sortedInfo.take(5) val list = mutableListOf() - for (i in 0..4) { + for (i in 0..3) { list += WidgetP2PDevice(::selectedInfo, ::mode, { sortedInfo.getOrNull(i + scrollBar.currentScroll) }, 0, 0) } widgetDevices = list.toList() @@ -71,14 +73,36 @@ class GuiAdvancedMemoryCard(msg: S2CListP2P) : GuiScreen(), TextureBound { super.initGui() checkInfo() scrollBar = WidgetScrollBar() + searchBar = MEGuiTextField(fontRendererObj, guiLeft + 148, guiTop + 3, 65, 10) + searchBar.maxStringLength = 25 + searchBar.setTextColor(0xFFFFFF) + searchBar.visible = true + searchBar.enableBackgroundDrawing = false scrollBar.displayX = guiLeft + 218 scrollBar.displayY = guiTop + 19 scrollBar.height = 114 - scrollBar.setRange(0, infos.size.coerceIn(0..(infos.size-5).coerceAtLeast(0)), 23) + scrollBar.setRange(0, infos.size.coerceIn(0..(infos.size - 4).coerceAtLeast(0)), 23) - for (i in 0..4) { + for (i in 0..3) { widgetDevices[i].x = guiLeft + tableX - widgetDevices[i].y = guiTop + tableY + 23 * i + widgetDevices[i].y = guiTop + tableY + 33 * i + } + } + + private fun reGenInfoFromText() { + var tmpInfo = infos.filter { it.frequency.toHexString().contains(searchBar.text) || it.frequency.toHexString().format4().contains(searchBar.text) || it.name.contains(searchBar.text) } + if (searchBar.text.isEmpty()) + tmpInfo = infos + sortedInfo = tmpInfo.sortedBy { + if (it.index == selectedIndex) { + -2 // Put the selected p2p in the front + } else if (it.frequency != 0.toLong() && it.frequency == selectedInfo?.frequency && !it.output) { + -3 // Put input in the beginning + } else if (it.frequency != 0.toLong() && it.frequency == selectedInfo?.frequency) { + -1 // Put same frequency in the front + } else { + it.frequency + Short.MAX_VALUE + } } } @@ -119,7 +143,7 @@ class GuiAdvancedMemoryCard(msg: S2CListP2P) : GuiScreen(), TextureBound { private fun drawInformation() { val x = 8 - var y = 170 + var y = 178 for (line in descriptionLines) { fontRendererObj.drawString(line, guiLeft + x, guiTop + y, 0) y += fontRendererObj.FONT_HEIGHT @@ -135,6 +159,7 @@ class GuiAdvancedMemoryCard(msg: S2CListP2P) : GuiScreen(), TextureBound { drawDefaultBackground() drawBackground() scrollBar.draw(this) + searchBar.drawTextBox() for (widget in widgetDevices) { widget.render(this, mouseX, mouseY, partialTicks) @@ -222,6 +247,11 @@ class GuiAdvancedMemoryCard(msg: S2CListP2P) : GuiScreen(), TextureBound { switchMode() } scrollBar.click(mouseX, mouseY) + searchBar.mouseClicked(mouseX, mouseY, mouseButton) + if (mouseButton == 1 && searchBar.isMouseIn(mouseX, mouseY)) { + this.searchBar.text = "" + reGenInfoFromText() + } super.mouseClicked(mouseX, mouseY, mouseButton) } @@ -255,4 +285,13 @@ class GuiAdvancedMemoryCard(msg: S2CListP2P) : GuiScreen(), TextureBound { override fun doesGuiPauseGame(): Boolean { return false } + + override fun keyTyped(char: Char, key: Int) { + if (char == ' ' && searchBar.text.isEmpty()) { + return + } + searchBar.textboxKeyTyped(char, key) + reGenInfoFromText() + super.keyTyped(char, key) + } } diff --git a/src/main/java/com/projecturanus/betterp2p/client/gui/InfoWrapper.kt b/src/main/java/com/projecturanus/betterp2p/client/gui/InfoWrapper.kt index 5b45d4e..31b6945 100644 --- a/src/main/java/com/projecturanus/betterp2p/client/gui/InfoWrapper.kt +++ b/src/main/java/com/projecturanus/betterp2p/client/gui/InfoWrapper.kt @@ -17,6 +17,7 @@ class InfoWrapper(info: P2PInfo) { val facing: EnumFacing = info.facing val description: String val output: Boolean = info.output + val name: String = info.name var error: Boolean = false // Widgets diff --git a/src/main/java/com/projecturanus/betterp2p/client/gui/widget/WidgetP2PDevice.kt b/src/main/java/com/projecturanus/betterp2p/client/gui/widget/WidgetP2PDevice.kt index 338d95a..16281e0 100644 --- a/src/main/java/com/projecturanus/betterp2p/client/gui/widget/WidgetP2PDevice.kt +++ b/src/main/java/com/projecturanus/betterp2p/client/gui/widget/WidgetP2PDevice.kt @@ -14,7 +14,7 @@ class WidgetP2PDevice(private val selectedInfoProperty: KMutableProperty0.hasChannel get() = isPowered && isActive fun PartP2PTunnel<*>.getInfo(index: Int) - = P2PInfo(index, frequency, location.x, location.y, location.z, EnumFacing.getFront(side.getEnumIndex()), isOutput, hasChannel) + = P2PInfo(index, frequency, location.x, location.y, location.z, EnumFacing.getFront(side.getEnumIndex()), customName, isOutput, hasChannel) diff --git a/src/main/resources/assets/betterp2p/lang/en_US.lang b/src/main/resources/assets/betterp2p/lang/en_US.lang index 99549e3..d5ab3bf 100644 --- a/src/main/resources/assets/betterp2p/lang/en_US.lang +++ b/src/main/resources/assets/betterp2p/lang/en_US.lang @@ -4,6 +4,7 @@ item.advanced_memory_card.not_selected=No Frequency gui.advanced_memory_card.select=Select gui.advanced_memory_card.bind=Bind gui.advanced_memory_card.pos=Pos: %d, %d, %d Side: %s +gui.advanced_memory_card.name=Name: %s gui.advanced_memory_card.mode.input=Mode: Bind Input gui.advanced_memory_card.mode.output=Mode: Bind Output gui.advanced_memory_card.mode.copy=Mode: Copy Output diff --git a/src/main/resources/assets/betterp2p/lang/zh_CN.lang b/src/main/resources/assets/betterp2p/lang/zh_CN.lang index 2bbcf85..5fb2778 100644 --- a/src/main/resources/assets/betterp2p/lang/zh_CN.lang +++ b/src/main/resources/assets/betterp2p/lang/zh_CN.lang @@ -4,6 +4,7 @@ item.advanced_memory_card.not_selected=无内容 gui.advanced_memory_card.select=选择 gui.advanced_memory_card.bind=绑定 gui.advanced_memory_card.pos=位置: %d, %d, %d 朝向: %s +gui.advanced_memory_card.name=名称: %s gui.advanced_memory_card.mode.input=模式:绑定输入 gui.advanced_memory_card.mode.output=模式:绑定输出 gui.advanced_memory_card.mode.copy=模式:复制输出 @@ -11,3 +12,4 @@ gui.advanced_memory_card.desc.mode=改变为%s gui.advanced_memory_card.desc.mode.input=输入 gui.advanced_memory_card.desc.mode.output=输出 gui.advanced_memory_card.desc.not_set=未配置 +gui.advanced_memory_card.desc.effect=效果: diff --git a/src/main/resources/assets/betterp2p/textures/gui/advanced_memory_card.png b/src/main/resources/assets/betterp2p/textures/gui/advanced_memory_card.png index 2e4c249..7c0803c 100644 Binary files a/src/main/resources/assets/betterp2p/textures/gui/advanced_memory_card.png and b/src/main/resources/assets/betterp2p/textures/gui/advanced_memory_card.png differ