From 2df2ee1f18a26755e6fc4d9f1752338aa48cd3e9 Mon Sep 17 00:00:00 2001 From: nea Date: Sun, 11 Jun 2023 00:25:15 +0200 Subject: Remove vanilla items from the item list --- src/main/kotlin/moe/nea/firmament/commands/rome.kt | 1 - src/main/kotlin/moe/nea/firmament/rei/FirmamentReiPlugin.kt | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) (limited to 'src/main/kotlin/moe/nea/firmament') diff --git a/src/main/kotlin/moe/nea/firmament/commands/rome.kt b/src/main/kotlin/moe/nea/firmament/commands/rome.kt index 18599d5..df5bc80 100644 --- a/src/main/kotlin/moe/nea/firmament/commands/rome.kt +++ b/src/main/kotlin/moe/nea/firmament/commands/rome.kt @@ -138,7 +138,6 @@ fun firmamentCommand() = literal("firmament") { source.sendFeedback(Text.translatable("firmament.sbinfo.mode", locrawInfo.mode)) source.sendFeedback(Text.translatable("firmament.sbinfo.map", locrawInfo.map)) } - } } } diff --git a/src/main/kotlin/moe/nea/firmament/rei/FirmamentReiPlugin.kt b/src/main/kotlin/moe/nea/firmament/rei/FirmamentReiPlugin.kt index 8b8383a..def73fe 100644 --- a/src/main/kotlin/moe/nea/firmament/rei/FirmamentReiPlugin.kt +++ b/src/main/kotlin/moe/nea/firmament/rei/FirmamentReiPlugin.kt @@ -83,9 +83,9 @@ class FirmamentReiPlugin : REIClientPlugin { } override fun registerEntries(registry: EntryRegistry) { - RepoManager.neuRepo.items?.items?.values?.forEach { - if (!it.isVanilla) - registry.addEntry(SBItemEntryDefinition.getEntry(it.skyblockId)) + registry.removeEntryIf { true } + RepoManager.neuRepo.items?.items?.values?.forEach { neuItem -> + registry.addEntry(SBItemEntryDefinition.getEntry(neuItem.skyblockId)) } } } -- cgit