From 867e5cf7e636150c8dd40cf786c62dec111d6582 Mon Sep 17 00:00:00 2001 From: Alejandro <25-alejandro@users.noreply.git.krews.org> Date: Thu, 6 Feb 2020 14:01:21 +0200 Subject: [PATCH] Organize pet-related item interactions --- src/main/java/com/eu/habbo/habbohotel/items/ItemManager.java | 1 + .../interactions/{ => pets}/InteractionMonsterPlantSeed.java | 2 +- .../items/interactions/{ => pets}/InteractionNest.java | 2 +- .../interactions/{ => pets}/InteractionPetBreedingNest.java | 2 +- .../items/interactions/{ => pets}/InteractionPetDrink.java | 3 ++- .../items/interactions/{ => pets}/InteractionPetFood.java | 3 ++- .../items/interactions/{ => pets}/InteractionPetToy.java | 3 ++- 7 files changed, 10 insertions(+), 6 deletions(-) rename src/main/java/com/eu/habbo/habbohotel/items/interactions/{ => pets}/InteractionMonsterPlantSeed.java (97%) rename src/main/java/com/eu/habbo/habbohotel/items/interactions/{ => pets}/InteractionNest.java (97%) rename src/main/java/com/eu/habbo/habbohotel/items/interactions/{ => pets}/InteractionPetBreedingNest.java (99%) rename src/main/java/com/eu/habbo/habbohotel/items/interactions/{ => pets}/InteractionPetDrink.java (94%) rename src/main/java/com/eu/habbo/habbohotel/items/interactions/{ => pets}/InteractionPetFood.java (94%) rename src/main/java/com/eu/habbo/habbohotel/items/interactions/{ => pets}/InteractionPetToy.java (95%) diff --git a/src/main/java/com/eu/habbo/habbohotel/items/ItemManager.java b/src/main/java/com/eu/habbo/habbohotel/items/ItemManager.java index 4e6969e2..dbfea5f1 100644 --- a/src/main/java/com/eu/habbo/habbohotel/items/ItemManager.java +++ b/src/main/java/com/eu/habbo/habbohotel/items/ItemManager.java @@ -38,6 +38,7 @@ import com.eu.habbo.habbohotel.items.interactions.games.tag.bunnyrun.Interaction import com.eu.habbo.habbohotel.items.interactions.games.tag.icetag.InteractionIceTagField; import com.eu.habbo.habbohotel.items.interactions.games.tag.icetag.InteractionIceTagPole; import com.eu.habbo.habbohotel.items.interactions.games.tag.rollerskate.InteractionRollerskateField; +import com.eu.habbo.habbohotel.items.interactions.pets.*; import com.eu.habbo.habbohotel.items.interactions.totems.InteractionTotemHead; import com.eu.habbo.habbohotel.items.interactions.totems.InteractionTotemLegs; import com.eu.habbo.habbohotel.items.interactions.totems.InteractionTotemPlanet; diff --git a/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionMonsterPlantSeed.java b/src/main/java/com/eu/habbo/habbohotel/items/interactions/pets/InteractionMonsterPlantSeed.java similarity index 97% rename from src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionMonsterPlantSeed.java rename to src/main/java/com/eu/habbo/habbohotel/items/interactions/pets/InteractionMonsterPlantSeed.java index f9ac09da..96e79004 100644 --- a/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionMonsterPlantSeed.java +++ b/src/main/java/com/eu/habbo/habbohotel/items/interactions/pets/InteractionMonsterPlantSeed.java @@ -1,4 +1,4 @@ -package com.eu.habbo.habbohotel.items.interactions; +package com.eu.habbo.habbohotel.items.interactions.pets; import com.eu.habbo.Emulator; import com.eu.habbo.habbohotel.gameclients.GameClient; diff --git a/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionNest.java b/src/main/java/com/eu/habbo/habbohotel/items/interactions/pets/InteractionNest.java similarity index 97% rename from src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionNest.java rename to src/main/java/com/eu/habbo/habbohotel/items/interactions/pets/InteractionNest.java index 36fb719a..d7293389 100644 --- a/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionNest.java +++ b/src/main/java/com/eu/habbo/habbohotel/items/interactions/pets/InteractionNest.java @@ -1,4 +1,4 @@ -package com.eu.habbo.habbohotel.items.interactions; +package com.eu.habbo.habbohotel.items.interactions.pets; import com.eu.habbo.habbohotel.gameclients.GameClient; import com.eu.habbo.habbohotel.items.Item; diff --git a/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionPetBreedingNest.java b/src/main/java/com/eu/habbo/habbohotel/items/interactions/pets/InteractionPetBreedingNest.java similarity index 99% rename from src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionPetBreedingNest.java rename to src/main/java/com/eu/habbo/habbohotel/items/interactions/pets/InteractionPetBreedingNest.java index 48049fee..16d219a9 100644 --- a/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionPetBreedingNest.java +++ b/src/main/java/com/eu/habbo/habbohotel/items/interactions/pets/InteractionPetBreedingNest.java @@ -1,4 +1,4 @@ -package com.eu.habbo.habbohotel.items.interactions; +package com.eu.habbo.habbohotel.items.interactions.pets; import com.eu.habbo.Emulator; import com.eu.habbo.habbohotel.achievements.AchievementManager; diff --git a/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionPetDrink.java b/src/main/java/com/eu/habbo/habbohotel/items/interactions/pets/InteractionPetDrink.java similarity index 94% rename from src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionPetDrink.java rename to src/main/java/com/eu/habbo/habbohotel/items/interactions/pets/InteractionPetDrink.java index b0a3131f..a18ada6b 100644 --- a/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionPetDrink.java +++ b/src/main/java/com/eu/habbo/habbohotel/items/interactions/pets/InteractionPetDrink.java @@ -1,8 +1,9 @@ -package com.eu.habbo.habbohotel.items.interactions; +package com.eu.habbo.habbohotel.items.interactions.pets; import com.eu.habbo.Emulator; import com.eu.habbo.habbohotel.achievements.AchievementManager; import com.eu.habbo.habbohotel.items.Item; +import com.eu.habbo.habbohotel.items.interactions.InteractionDefault; import com.eu.habbo.habbohotel.pets.Pet; import com.eu.habbo.habbohotel.pets.PetTasks; import com.eu.habbo.habbohotel.rooms.Room; diff --git a/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionPetFood.java b/src/main/java/com/eu/habbo/habbohotel/items/interactions/pets/InteractionPetFood.java similarity index 94% rename from src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionPetFood.java rename to src/main/java/com/eu/habbo/habbohotel/items/interactions/pets/InteractionPetFood.java index 07e3fd90..8f2dd02c 100644 --- a/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionPetFood.java +++ b/src/main/java/com/eu/habbo/habbohotel/items/interactions/pets/InteractionPetFood.java @@ -1,7 +1,8 @@ -package com.eu.habbo.habbohotel.items.interactions; +package com.eu.habbo.habbohotel.items.interactions.pets; import com.eu.habbo.Emulator; import com.eu.habbo.habbohotel.items.Item; +import com.eu.habbo.habbohotel.items.interactions.InteractionDefault; import com.eu.habbo.habbohotel.pets.Pet; import com.eu.habbo.habbohotel.pets.PetTasks; import com.eu.habbo.habbohotel.rooms.Room; diff --git a/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionPetToy.java b/src/main/java/com/eu/habbo/habbohotel/items/interactions/pets/InteractionPetToy.java similarity index 95% rename from src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionPetToy.java rename to src/main/java/com/eu/habbo/habbohotel/items/interactions/pets/InteractionPetToy.java index f70540b8..680bae5a 100644 --- a/src/main/java/com/eu/habbo/habbohotel/items/interactions/InteractionPetToy.java +++ b/src/main/java/com/eu/habbo/habbohotel/items/interactions/pets/InteractionPetToy.java @@ -1,7 +1,8 @@ -package com.eu.habbo.habbohotel.items.interactions; +package com.eu.habbo.habbohotel.items.interactions.pets; import com.eu.habbo.Emulator; import com.eu.habbo.habbohotel.items.Item; +import com.eu.habbo.habbohotel.items.interactions.InteractionDefault; import com.eu.habbo.habbohotel.pets.Pet; import com.eu.habbo.habbohotel.pets.PetTasks; import com.eu.habbo.habbohotel.rooms.Room;