Skip to content

Commit 222da0d

Browse files
committed
feat: Add debug UI for block types
1 parent 7070b07 commit 222da0d

File tree

3 files changed

+98
-0
lines changed

3 files changed

+98
-0
lines changed

src/main/kotlin/commands/rome.kt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import moe.nea.firmament.features.debug.PowerUserTools
1515
import moe.nea.firmament.features.inventory.buttons.InventoryButtons
1616
import moe.nea.firmament.features.inventory.storageoverlay.StorageOverlayScreen
1717
import moe.nea.firmament.features.inventory.storageoverlay.StorageOverviewScreen
18+
import moe.nea.firmament.features.mining.MiningBlockInfoUi
1819
import moe.nea.firmament.gui.config.AllConfigsGui
1920
import moe.nea.firmament.gui.config.BooleanHandler
2021
import moe.nea.firmament.gui.config.ManagedConfig
@@ -217,6 +218,11 @@ fun firmamentCommand() = literal("firmament") {
217218
}
218219
}
219220
}
221+
thenLiteral("blocks") {
222+
thenExecute {
223+
ScreenUtil.setScreenLater(MiningBlockInfoUi.makeScreen())
224+
}
225+
}
220226
thenLiteral("dumpchat") {
221227
thenExecute {
222228
MC.inGameHud.chatHud.messages.forEach {
Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
package moe.nea.firmament.features.mining
2+
3+
import io.github.notenoughupdates.moulconfig.observer.ObservableList
4+
import io.github.notenoughupdates.moulconfig.observer.Property
5+
import io.github.notenoughupdates.moulconfig.platform.ModernItemStack
6+
import io.github.notenoughupdates.moulconfig.xml.Bind
7+
import net.minecraft.client.gui.screen.Screen
8+
import net.minecraft.item.ItemStack
9+
import moe.nea.firmament.repo.MiningRepoData
10+
import moe.nea.firmament.repo.RepoManager
11+
import moe.nea.firmament.util.MoulConfigUtils
12+
import moe.nea.firmament.util.SkyBlockIsland
13+
14+
object MiningBlockInfoUi {
15+
class MiningInfo(miningData: MiningRepoData) {
16+
@field:Bind("search")
17+
@JvmField
18+
var search = ""
19+
20+
@get:Bind("ores")
21+
val blocks = miningData.customMiningBlocks.mapTo(ObservableList(mutableListOf())) { OreInfo(it, this) }
22+
}
23+
24+
class OreInfo(block: MiningRepoData.CustomMiningBlock, info: MiningInfo) {
25+
@get:Bind("oreName")
26+
val oreName = block.name ?: "No Name"
27+
28+
@get:Bind("blocks")
29+
val res = ObservableList(block.blocks189.map { BlockInfo(it, info) })
30+
}
31+
32+
class BlockInfo(val block: MiningRepoData.Block189, val info: MiningInfo) {
33+
@get:Bind("item")
34+
val item = ModernItemStack.of(block.block?.let { ItemStack(it) } ?: ItemStack.EMPTY)
35+
36+
@get:Bind("isSelected")
37+
val isSelected get() = info.search.let { block.isActiveIn(SkyBlockIsland.forMode(it)) }
38+
39+
@get:Bind("itemName")
40+
val itemName get() = item.getDisplayName()
41+
42+
@get:Bind("restrictions")
43+
val res = ObservableList(
44+
if (block.onlyIn != null)
45+
block.onlyIn.map { " §r- §a${it.userFriendlyName}" }
46+
else
47+
listOf("Everywhere")
48+
)
49+
}
50+
51+
fun makeScreen(): Screen {
52+
return MoulConfigUtils.loadScreen("mining_block_info/index", MiningInfo(RepoManager.miningData), null)
53+
}
54+
}
Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
<?xml version="1.0" encoding="UTF-8" ?>
2+
<Root xmlns="http://notenoughupdates.org/moulconfig"
3+
xmlns:firm="http://firmament.nea.moe/moulconfig"
4+
>
5+
<Gui>
6+
<Column>
7+
<Row>
8+
<Text text="Search: "/>
9+
<TextField value="@search"/>
10+
</Row>
11+
<ScrollPanel width="200" height="150">
12+
<Array data="@ores">
13+
<Column>
14+
<Text text="@oreName"/>
15+
<Array data="@blocks">
16+
<Row>
17+
<When condition="@isSelected">
18+
<Center>
19+
<Text text="§a+" textAlign="CENTER" width="10"/>
20+
</Center>
21+
<Spacer width="10" height="0"/>
22+
</When>
23+
<firm:Hover lines="@restrictions">
24+
<Row>
25+
<ItemStack value="@item"/>
26+
<Align horizontal="LEFT" vertical="CENTER">
27+
<Text text="@itemName"/>
28+
</Align>
29+
</Row>
30+
</firm:Hover>
31+
</Row>
32+
</Array>
33+
</Column>
34+
</Array>
35+
</ScrollPanel>
36+
</Column>
37+
</Gui>
38+
</Root>

0 commit comments

Comments
 (0)