From da6e3c6559546405b8303690bb301897b33abbbd Mon Sep 17 00:00:00 2001 From: Frank Date: Fri, 9 Dec 2022 17:02:44 +0100 Subject: [PATCH] [Changes] BCLBiome's equals recognizes Keys and Locations as well --- .../api/v2/levelgen/biomes/BCLBiome.java | 25 +++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/betterx/bclib/api/v2/levelgen/biomes/BCLBiome.java b/src/main/java/org/betterx/bclib/api/v2/levelgen/biomes/BCLBiome.java index 8840ea0d..8873d44b 100644 --- a/src/main/java/org/betterx/bclib/api/v2/levelgen/biomes/BCLBiome.java +++ b/src/main/java/org/betterx/bclib/api/v2/levelgen/biomes/BCLBiome.java @@ -395,13 +395,34 @@ public class BCLBiome implements BiomeData { } + public boolean is(ResourceKey key) { + return biomeID.equals(key.location()); + } + + public boolean is(ResourceLocation loc) { + return biomeID.equals(loc); + } + + public boolean is(BCLBiome biome) { + if (biome == null) return false; + return biomeID.equals(biome.biomeID); + } + @Override public boolean equals(Object obj) { if (obj == this) { return true; } - BCLBiome biome = (BCLBiome) obj; - return biome != null && biomeID.equals(biome.biomeID); + if (obj instanceof BCLBiome biome) { + return is(biome); + } + if (obj instanceof ResourceKey key) { + return is(key); + } + if (obj instanceof ResourceLocation loc) { + return is(loc); + } + return super.equals(obj); } @Override