From d8347fb7ec001b5ce0b56c084f2a25950e25d84b Mon Sep 17 00:00:00 2001 From: XiaoMoMi Date: Thu, 11 Sep 2025 04:56:47 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E6=97=A0=E7=94=A8=E7=9A=84ha?= =?UTF-8?q?shcode?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/block/ImmutableBlockState.java | 18 +----------------- .../craftengine/core/util/Int2ObjectBiMap.java | 4 ++-- 2 files changed, 3 insertions(+), 19 deletions(-) diff --git a/core/src/main/java/net/momirealms/craftengine/core/block/ImmutableBlockState.java b/core/src/main/java/net/momirealms/craftengine/core/block/ImmutableBlockState.java index 95ea103ce..8eb70038f 100644 --- a/core/src/main/java/net/momirealms/craftengine/core/block/ImmutableBlockState.java +++ b/core/src/main/java/net/momirealms/craftengine/core/block/ImmutableBlockState.java @@ -29,7 +29,6 @@ public final class ImmutableBlockState extends BlockStateHolder { private BlockStateWrapper customBlockState; private BlockStateWrapper vanillaBlockState; private BlockBehavior behavior; - private Integer hashCode; private BlockSettings settings; private BlockEntityType blockEntityType; @Nullable @@ -78,27 +77,12 @@ public final class ImmutableBlockState extends BlockStateHolder { this.renderers = renderers; } - @Override - public boolean equals(Object o) { - if (this == o) return true; - if (!(o instanceof ImmutableBlockState state)) return false; - return state.owner == this.owner && state.tag.equals(this.tag); - } - - @Override - public int hashCode() { - if (this.hashCode == null) { - this.hashCode = getNbtToSave().hashCode(); - } - return this.hashCode; - } - public boolean hasBlockEntity() { return this.blockEntityType != null; } public boolean hasBlockEntityRenderer() { - return this.renderers != null; + return this.renderers != null ; } public BlockStateWrapper customBlockState() { diff --git a/core/src/main/java/net/momirealms/craftengine/core/util/Int2ObjectBiMap.java b/core/src/main/java/net/momirealms/craftengine/core/util/Int2ObjectBiMap.java index 297d49600..76cbad82e 100644 --- a/core/src/main/java/net/momirealms/craftengine/core/util/Int2ObjectBiMap.java +++ b/core/src/main/java/net/momirealms/craftengine/core/util/Int2ObjectBiMap.java @@ -126,7 +126,7 @@ public class Int2ObjectBiMap implements IndexedIterable { private int findIndex(@Nullable K value, int id) { int i; - for(i = id; i < this.values.length; ++i) { + for (i = id; i < this.values.length; ++i) { if (this.values[i] == value) { return i; } @@ -136,7 +136,7 @@ public class Int2ObjectBiMap implements IndexedIterable { } } - for(i = 0; i < id; ++i) { + for (i = 0; i < id; ++i) { if (this.values[i] == value) { return i; }