From e45378fd6b61a5871c306ca8439c8ee3d7dec456 Mon Sep 17 00:00:00 2001 From: nea Date: Fri, 29 Jul 2022 23:09:36 +0200 Subject: repo reloading --- src/main/kotlin/moe/nea/notenoughupdates/rei/NEUReiPlugin.kt | 2 -- .../kotlin/moe/nea/notenoughupdates/rei/SBItemEntryDefinition.kt | 5 ++--- 2 files changed, 2 insertions(+), 5 deletions(-) (limited to 'src/main/kotlin/moe/nea/notenoughupdates/rei') diff --git a/src/main/kotlin/moe/nea/notenoughupdates/rei/NEUReiPlugin.kt b/src/main/kotlin/moe/nea/notenoughupdates/rei/NEUReiPlugin.kt index cc4b0f1..69cca41 100644 --- a/src/main/kotlin/moe/nea/notenoughupdates/rei/NEUReiPlugin.kt +++ b/src/main/kotlin/moe/nea/notenoughupdates/rei/NEUReiPlugin.kt @@ -20,10 +20,8 @@ class NEUReiPlugin : REIClientPlugin { return EntryStack.of(VanillaEntryTypes.ITEM, value.asItemStack()) } - val SKYBLOCK_ITEM_TYPE_ID = ResourceLocation("notenoughupdates", "skyblockitems") } - override fun registerEntryTypes(registry: EntryTypeRegistry) { registry.register(SKYBLOCK_ITEM_TYPE_ID, SBItemEntryDefinition) } diff --git a/src/main/kotlin/moe/nea/notenoughupdates/rei/SBItemEntryDefinition.kt b/src/main/kotlin/moe/nea/notenoughupdates/rei/SBItemEntryDefinition.kt index 6726b4f..5ae154d 100644 --- a/src/main/kotlin/moe/nea/notenoughupdates/rei/SBItemEntryDefinition.kt +++ b/src/main/kotlin/moe/nea/notenoughupdates/rei/SBItemEntryDefinition.kt @@ -2,7 +2,6 @@ package moe.nea.notenoughupdates.rei import com.mojang.blaze3d.vertex.PoseStack import io.github.moulberry.repo.data.NEUItem -import me.shedaniel.math.Point import me.shedaniel.math.Rectangle import me.shedaniel.rei.api.client.entry.renderer.EntryRenderer import me.shedaniel.rei.api.client.gui.widgets.Tooltip @@ -24,7 +23,7 @@ import java.util.stream.Stream object SBItemEntryDefinition : EntryDefinition { override fun equals(o1: NEUItem?, o2: NEUItem?, context: ComparisonContext?): Boolean { - return o1 == o2 + return o1 === o2 } override fun cheatsAs(entry: EntryStack?, value: NEUItem?): ItemStack? { @@ -71,7 +70,7 @@ object SBItemEntryDefinition : EntryDefinition { } override fun hash(entry: EntryStack, value: NEUItem, context: ComparisonContext): Long { - return value.skyblockItemId.hashCode().toLong() + return System.identityHashCode(value) * 31L } override fun wildcard(entry: EntryStack, value: NEUItem): NEUItem { -- cgit