diff --git a/src/games/stendhal/client/entity/factory/EntityMap.java b/src/games/stendhal/client/entity/factory/EntityMap.java index fed4c152be2..e9a8c09a6f7 100644 --- a/src/games/stendhal/client/entity/factory/EntityMap.java +++ b/src/games/stendhal/client/entity/factory/EntityMap.java @@ -1,5 +1,5 @@ /*************************************************************************** - * (C) Copyright 2003-2023 - Marauroa * + * (C) Copyright 2003-2024 - Marauroa * *************************************************************************** *************************************************************************** * * @@ -17,7 +17,6 @@ import org.apache.log4j.Logger; -import games.stendhal.client.Triple; import games.stendhal.client.entity.Block; import games.stendhal.client.entity.Blood; import games.stendhal.client.entity.BossCreature; @@ -53,6 +52,7 @@ import games.stendhal.client.entity.UseableRing; import games.stendhal.client.entity.WalkBlocker; import games.stendhal.client.entity.Wall; +import games.stendhal.common.Triple; /** * Registers the relationship between Type, eclass and java class of entity diff --git a/src/games/stendhal/client/gui/j2d/entity/EntityViewFactory.java b/src/games/stendhal/client/gui/j2d/entity/EntityViewFactory.java index 758a1c02adf..f04686ae778 100644 --- a/src/games/stendhal/client/gui/j2d/entity/EntityViewFactory.java +++ b/src/games/stendhal/client/gui/j2d/entity/EntityViewFactory.java @@ -1,6 +1,6 @@ /* $Id$ */ /*************************************************************************** - * (C) Copyright 2003-2023 - Stendhal * + * (C) Copyright 2003-2024 - Stendhal * *************************************************************************** *************************************************************************** * * @@ -17,9 +17,9 @@ import org.apache.log4j.Logger; -import games.stendhal.client.Triple; import games.stendhal.client.entity.IEntity; import games.stendhal.client.gui.wt.core.WtWindowManager; +import games.stendhal.common.Triple; /* * The entity views are generic, but we don't simply have sufficient data to diff --git a/src/games/stendhal/client/Triple.java b/src/games/stendhal/common/Triple.java similarity index 96% rename from src/games/stendhal/client/Triple.java rename to src/games/stendhal/common/Triple.java index 3736ec76d4d..2bbd80e75e2 100644 --- a/src/games/stendhal/client/Triple.java +++ b/src/games/stendhal/common/Triple.java @@ -1,6 +1,6 @@ /* $Id$ */ /*************************************************************************** - * (C) Copyright 2003-2023 - Stendhal * + * (C) Copyright 2003-2024 - Stendhal * *************************************************************************** *************************************************************************** * * @@ -10,7 +10,7 @@ * (at your option) any later version. * * * ***************************************************************************/ -package games.stendhal.client; +package games.stendhal.common; import java.util.Objects; diff --git a/tests/games/stendhal/client/gui/j2d/entity/EntityViewFactoryTest.java b/tests/games/stendhal/client/gui/j2d/entity/EntityViewFactoryTest.java index 9c5229ecd2e..bc06ce68566 100644 --- a/tests/games/stendhal/client/gui/j2d/entity/EntityViewFactoryTest.java +++ b/tests/games/stendhal/client/gui/j2d/entity/EntityViewFactoryTest.java @@ -1,6 +1,6 @@ /* $Id$ */ /*************************************************************************** - * (C) Copyright 2003-2023 - Stendhal * + * (C) Copyright 2003-2024 - Stendhal * *************************************************************************** *************************************************************************** * * @@ -24,7 +24,7 @@ import org.junit.Before; import org.junit.Test; -import games.stendhal.client.Triple; +import games.stendhal.common.Triple; import marauroa.common.Log4J; public class EntityViewFactoryTest {