diff --git a/src/main/java/net/frozenblock/wilderwild/client/WilderEasterEggs.java b/src/main/java/net/frozenblock/wilderwild/client/WilderEasterEggs.java index 192ee5acad..834423beb1 100644 --- a/src/main/java/net/frozenblock/wilderwild/client/WilderEasterEggs.java +++ b/src/main/java/net/frozenblock/wilderwild/client/WilderEasterEggs.java @@ -23,7 +23,6 @@ import net.frozenblock.lib.entity.api.rendering.EntityTextureOverride; import net.frozenblock.wilderwild.WWConstants; import net.frozenblock.wilderwild.client.animation.definitions.impl.WilderWarden; -import net.frozenblock.wilderwild.registry.WWEntityTypes; import net.minecraft.world.entity.EntityType; @Environment(EnvType.CLIENT) diff --git a/src/main/java/net/frozenblock/wilderwild/entity/Penguin.java b/src/main/java/net/frozenblock/wilderwild/entity/Penguin.java index a76f1f423a..2d2674d41c 100644 --- a/src/main/java/net/frozenblock/wilderwild/entity/Penguin.java +++ b/src/main/java/net/frozenblock/wilderwild/entity/Penguin.java @@ -18,8 +18,10 @@ package net.frozenblock.wilderwild.entity; +import com.google.common.collect.ImmutableList; import com.mojang.serialization.Dynamic; import java.util.Arrays; +import java.util.stream.Stream; import net.frozenblock.wilderwild.config.WWEntityConfig; import net.frozenblock.wilderwild.entity.ai.penguin.PenguinAi; import net.frozenblock.wilderwild.registry.WWEntityTypes; @@ -68,6 +70,7 @@ import org.jetbrains.annotations.Nullable; public class Penguin extends Animal { + private static final Stream VALID_LINUX_NAMES = ImmutableList.of("Linux", "Tux", "Treetrain", "Treetrain1").stream(); public static final double BOAT_BOOST_SPEED = 1.7D; public AnimationState layDownAnimationState = new AnimationState(); public AnimationState standUpAnimationState = new AnimationState(); @@ -341,6 +344,6 @@ public void readAdditionalSaveData(CompoundTag compoundTag) { public boolean isLinux() { String string = ChatFormatting.stripFormatting(this.getName().getString()); - return string.equalsIgnoreCase("Linux") || string.equalsIgnoreCase("Tux") || string.equalsIgnoreCase("Treetrain1") || string.equalsIgnoreCase("Treetrain"); + return VALID_LINUX_NAMES.anyMatch(string::equalsIgnoreCase); } }