From 3ca03f9d8f95e7af9025fb4a4d3cb1b688a6fcfe Mon Sep 17 00:00:00 2001 From: Harmonic Date: Sat, 16 Apr 2022 10:54:16 -0700 Subject: [PATCH] Refactored all outgoing composer names beginning with A --- .../totems/InteractionTotemPlanet.java | 1 - .../wired/effects/WiredEffectBotTeleport.java | 6 ++---- .../wired/effects/WiredEffectTeleport.java | 5 ++--- .../com/eu/habbo/habbohotel/rooms/Room.java | 2 +- .../eu/habbo/habbohotel/rooms/RoomManager.java | 3 +-- .../com/eu/habbo/habbohotel/users/Habbo.java | 2 +- .../users/inventory/EffectsComponent.java | 12 ++++++------ .../achievements/RequestAchievementsEvent.java | 4 ++-- .../catalog/CatalogBuyClubDiscountEvent.java | 6 ++---- .../incoming/catalog/CatalogBuyItemEvent.java | 4 ++-- .../incoming/catalog/CheckPetNameEvent.java | 10 +++++----- .../incoming/handshake/SecureLoginEvent.java | 10 +++++----- .../incoming/rooms/items/RedeemItemEvent.java | 4 ++-- .../unknown/RequestResolutionEvent.java | 4 ++-- .../users/RequestUserCreditsEvent.java | 4 ++-- ...Composer.java => AchievementsComposer.java} | 6 +++--- ...er.java => ApproveNameMessageComposer.java} | 4 ++-- ...AchievementResolutionsMessageComposer.java} | 2 +- ...va => AuthenticationOKMessageComposer.java} | 2 +- ... AvatarEffectActivatedMessageComposer.java} | 4 ++-- ...a => AvatarEffectAddedMessageComposer.java} | 5 ++--- ...=> AvatarEffectExpiredMessageComposer.java} | 4 ++-- ....java => AvatarEffectsMessageComposer.java} | 18 +++++++++--------- ...r.java => AvatarEffectMessageComposer.java} | 6 +++--- ...> AvatarEffectSelectedMessageComposer.java} | 4 ++-- ...ser.java => AchievementsScoreComposer.java} | 4 ++-- ...java => ActivityPointsMessageComposer.java} | 6 +++--- .../threading/runnables/RoomUnitRidePet.java | 4 ++-- .../runnables/SendRoomUnitEffectComposer.java | 4 ++-- .../runnables/TeleportInteraction.java | 4 ++-- .../runnables/freeze/FreezeClearEffects.java | 4 ++-- 31 files changed, 75 insertions(+), 83 deletions(-) rename src/main/java/com/eu/habbo/messages/outgoing/achievements/{AchievementListComposer.java => AchievementsComposer.java} (95%) rename src/main/java/com/eu/habbo/messages/outgoing/catalog/{PetNameErrorComposer.java => ApproveNameMessageComposer.java} (86%) rename src/main/java/com/eu/habbo/messages/outgoing/events/resolution/{NewYearResolutionComposer.java => AchievementResolutionsMessageComposer.java} (93%) rename src/main/java/com/eu/habbo/messages/outgoing/handshake/{SecureLoginOKComposer.java => AuthenticationOKMessageComposer.java} (83%) rename src/main/java/com/eu/habbo/messages/outgoing/inventory/{EffectsListEffectEnableComposer.java => AvatarEffectActivatedMessageComposer.java} (81%) rename src/main/java/com/eu/habbo/messages/outgoing/inventory/{EffectsListAddComposer.java => AvatarEffectAddedMessageComposer.java} (84%) rename src/main/java/com/eu/habbo/messages/outgoing/inventory/{EffectsListRemoveComposer.java => AvatarEffectExpiredMessageComposer.java} (78%) rename src/main/java/com/eu/habbo/messages/outgoing/inventory/{UserEffectsListComposer.java => AvatarEffectsMessageComposer.java} (57%) rename src/main/java/com/eu/habbo/messages/outgoing/rooms/users/{RoomUserEffectComposer.java => AvatarEffectMessageComposer.java} (80%) rename src/main/java/com/eu/habbo/messages/outgoing/unknown/{UnknownAvatarEditorComposer.java => AvatarEffectSelectedMessageComposer.java} (78%) rename src/main/java/com/eu/habbo/messages/outgoing/users/{UserAchievementScoreComposer.java => AchievementsScoreComposer.java} (81%) rename src/main/java/com/eu/habbo/messages/outgoing/users/{UserCurrencyComposer.java => ActivityPointsMessageComposer.java} (87%) diff --git a/src/main/java/com/eu/habbo/habbohotel/items/interactions/totems/InteractionTotemPlanet.java b/src/main/java/com/eu/habbo/habbohotel/items/interactions/totems/InteractionTotemPlanet.java index 2c49e91c..e12cb1ed 100644 --- a/src/main/java/com/eu/habbo/habbohotel/items/interactions/totems/InteractionTotemPlanet.java +++ b/src/main/java/com/eu/habbo/habbohotel/items/interactions/totems/InteractionTotemPlanet.java @@ -6,7 +6,6 @@ import com.eu.habbo.habbohotel.items.interactions.InteractionDefault; import com.eu.habbo.habbohotel.rooms.Room; import com.eu.habbo.habbohotel.users.HabboItem; import com.eu.habbo.habbohotel.users.inventory.EffectsComponent; -import com.eu.habbo.messages.outgoing.inventory.UserEffectsListComposer; import gnu.trove.set.hash.THashSet; import java.sql.ResultSet; diff --git a/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/effects/WiredEffectBotTeleport.java b/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/effects/WiredEffectBotTeleport.java index 822934a6..8087d3b3 100644 --- a/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/effects/WiredEffectBotTeleport.java +++ b/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/effects/WiredEffectBotTeleport.java @@ -13,10 +13,9 @@ import com.eu.habbo.habbohotel.rooms.RoomUnit; import com.eu.habbo.habbohotel.users.HabboItem; import com.eu.habbo.habbohotel.wired.WiredEffectType; import com.eu.habbo.habbohotel.wired.WiredHandler; -import com.eu.habbo.messages.ClientMessage; import com.eu.habbo.messages.ServerMessage; import com.eu.habbo.messages.incoming.wired.WiredSaveException; -import com.eu.habbo.messages.outgoing.rooms.users.RoomUserEffectComposer; +import com.eu.habbo.messages.outgoing.rooms.users.AvatarEffectMessageComposer; import com.eu.habbo.threading.runnables.RoomUnitTeleport; import com.eu.habbo.threading.runnables.SendRoomUnitEffectComposer; import gnu.trove.set.hash.THashSet; @@ -26,7 +25,6 @@ import java.sql.SQLException; import java.util.ArrayList; import java.util.Collections; import java.util.List; -import java.util.stream.Collectors; public class WiredEffectBotTeleport extends InteractionWiredEffect { public static final WiredEffectType type = WiredEffectType.BOT_TELEPORT; @@ -57,7 +55,7 @@ public class WiredEffectBotTeleport extends InteractionWiredEffect { // makes a temporary effect roomUnit.getRoom().unIdle(roomUnit.getRoom().getHabbo(roomUnit)); - room.sendComposer(new RoomUserEffectComposer(roomUnit, 4).compose()); + room.sendComposer(new AvatarEffectMessageComposer(roomUnit, 4).compose()); Emulator.getThreading().run(new SendRoomUnitEffectComposer(room, roomUnit), WiredHandler.TELEPORT_DELAY + 1000); if (tile == roomUnit.getCurrentLocation()) { diff --git a/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/effects/WiredEffectTeleport.java b/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/effects/WiredEffectTeleport.java index cf6197ad..f794e674 100644 --- a/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/effects/WiredEffectTeleport.java +++ b/src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/effects/WiredEffectTeleport.java @@ -13,10 +13,9 @@ import com.eu.habbo.habbohotel.rooms.RoomUnit; import com.eu.habbo.habbohotel.users.HabboItem; import com.eu.habbo.habbohotel.wired.WiredEffectType; import com.eu.habbo.habbohotel.wired.WiredHandler; -import com.eu.habbo.messages.ClientMessage; import com.eu.habbo.messages.ServerMessage; import com.eu.habbo.messages.incoming.wired.WiredSaveException; -import com.eu.habbo.messages.outgoing.rooms.users.RoomUserEffectComposer; +import com.eu.habbo.messages.outgoing.rooms.users.AvatarEffectMessageComposer; import com.eu.habbo.threading.runnables.RoomUnitTeleport; import com.eu.habbo.threading.runnables.SendRoomUnitEffectComposer; import gnu.trove.procedure.TObjectProcedure; @@ -57,7 +56,7 @@ public class WiredEffectTeleport extends InteractionWiredEffect { // makes a temporary effect roomUnit.getRoom().unIdle(roomUnit.getRoom().getHabbo(roomUnit)); - room.sendComposer(new RoomUserEffectComposer(roomUnit, 4).compose()); + room.sendComposer(new AvatarEffectMessageComposer(roomUnit, 4).compose()); Emulator.getThreading().run(new SendRoomUnitEffectComposer(room, roomUnit), WiredHandler.TELEPORT_DELAY + 1000); if (tile == roomUnit.getCurrentLocation()) { diff --git a/src/main/java/com/eu/habbo/habbohotel/rooms/Room.java b/src/main/java/com/eu/habbo/habbohotel/rooms/Room.java index 8695d78f..1705d42d 100644 --- a/src/main/java/com/eu/habbo/habbohotel/rooms/Room.java +++ b/src/main/java/com/eu/habbo/habbohotel/rooms/Room.java @@ -4138,7 +4138,7 @@ public class Room implements Comparable, ISerialize, Runnable { if (this.allowEffects && !roomUnit.isSwimming) { roomUnit.setEffectId(effectId, duration); - this.sendComposer(new RoomUserEffectComposer(roomUnit).compose()); + this.sendComposer(new AvatarEffectMessageComposer(roomUnit).compose()); } } } diff --git a/src/main/java/com/eu/habbo/habbohotel/rooms/RoomManager.java b/src/main/java/com/eu/habbo/habbohotel/rooms/RoomManager.java index ab507719..32778605 100644 --- a/src/main/java/com/eu/habbo/habbohotel/rooms/RoomManager.java +++ b/src/main/java/com/eu/habbo/habbohotel/rooms/RoomManager.java @@ -48,7 +48,6 @@ import com.eu.habbo.plugin.events.rooms.UserVoteRoomEvent; import com.eu.habbo.plugin.events.users.HabboAddedToRoomEvent; import com.eu.habbo.plugin.events.users.UserEnterRoomEvent; import com.eu.habbo.plugin.events.users.UserExitRoomEvent; -import com.eu.habbo.plugin.events.users.UsernameTalkEvent; import gnu.trove.iterator.TIntObjectIterator; import gnu.trove.map.hash.THashMap; import gnu.trove.procedure.TIntProcedure; @@ -848,7 +847,7 @@ public class RoomManager { } if (roomHabbo.getRoomUnit().getEffectId() > 0) { - habbo.getClient().sendResponse(new RoomUserEffectComposer(roomHabbo.getRoomUnit())); + habbo.getClient().sendResponse(new AvatarEffectMessageComposer(roomHabbo.getRoomUnit())); } if (roomHabbo.getRoomUnit().isIdle()) { diff --git a/src/main/java/com/eu/habbo/habbohotel/users/Habbo.java b/src/main/java/com/eu/habbo/habbohotel/users/Habbo.java index 204f8007..40efe63b 100644 --- a/src/main/java/com/eu/habbo/habbohotel/users/Habbo.java +++ b/src/main/java/com/eu/habbo/habbohotel/users/Habbo.java @@ -246,7 +246,7 @@ public class Habbo implements Runnable { return; this.getHabboInfo().addPixels(event.points); - if (this.client != null) this.client.sendResponse(new UserCurrencyComposer(this.client.getHabbo())); + if (this.client != null) this.client.sendResponse(new ActivityPointsMessageComposer(this.client.getHabbo())); } diff --git a/src/main/java/com/eu/habbo/habbohotel/users/inventory/EffectsComponent.java b/src/main/java/com/eu/habbo/habbohotel/users/inventory/EffectsComponent.java index 99bff77a..9931f348 100644 --- a/src/main/java/com/eu/habbo/habbohotel/users/inventory/EffectsComponent.java +++ b/src/main/java/com/eu/habbo/habbohotel/users/inventory/EffectsComponent.java @@ -2,9 +2,9 @@ package com.eu.habbo.habbohotel.users.inventory; import com.eu.habbo.Emulator; import com.eu.habbo.habbohotel.users.Habbo; -import com.eu.habbo.messages.outgoing.inventory.EffectsListAddComposer; -import com.eu.habbo.messages.outgoing.inventory.EffectsListEffectEnableComposer; -import com.eu.habbo.messages.outgoing.inventory.EffectsListRemoveComposer; +import com.eu.habbo.messages.outgoing.inventory.AvatarEffectAddedMessageComposer; +import com.eu.habbo.messages.outgoing.inventory.AvatarEffectActivatedMessageComposer; +import com.eu.habbo.messages.outgoing.inventory.AvatarEffectExpiredMessageComposer; import gnu.trove.map.hash.THashMap; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -76,7 +76,7 @@ public class EffectsComponent { public void addEffect(HabboEffect effect) { this.effects.put(effect.effect, effect); - this.habbo.getClient().sendResponse(new EffectsListAddComposer(effect)); + this.habbo.getClient().sendResponse(new AvatarEffectAddedMessageComposer(effect)); } public void dispose() { @@ -118,7 +118,7 @@ public class EffectsComponent { if (effect.isRemaining()) { effect.activationTimestamp = Emulator.getIntUnixTimestamp(); } else { - this.habbo.getClient().sendResponse(new EffectsListRemoveComposer(effect)); + this.habbo.getClient().sendResponse(new AvatarEffectExpiredMessageComposer(effect)); } } } @@ -137,7 +137,7 @@ public class EffectsComponent { this.habbo.getHabboInfo().getCurrentRoom().giveEffect(this.habbo, effectId, effect.remainingTime()); } - this.habbo.getClient().sendResponse(new EffectsListEffectEnableComposer(effect)); + this.habbo.getClient().sendResponse(new AvatarEffectActivatedMessageComposer(effect)); } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/achievements/RequestAchievementsEvent.java b/src/main/java/com/eu/habbo/messages/incoming/achievements/RequestAchievementsEvent.java index c4ec8b35..cf914c6e 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/achievements/RequestAchievementsEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/achievements/RequestAchievementsEvent.java @@ -1,11 +1,11 @@ package com.eu.habbo.messages.incoming.achievements; import com.eu.habbo.messages.incoming.MessageHandler; -import com.eu.habbo.messages.outgoing.achievements.AchievementListComposer; +import com.eu.habbo.messages.outgoing.achievements.AchievementsComposer; public class RequestAchievementsEvent extends MessageHandler { @Override public void handle() throws Exception { - this.client.sendResponse(new AchievementListComposer(this.client.getHabbo())); + this.client.sendResponse(new AchievementsComposer(this.client.getHabbo())); } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/catalog/CatalogBuyClubDiscountEvent.java b/src/main/java/com/eu/habbo/messages/incoming/catalog/CatalogBuyClubDiscountEvent.java index 45567242..63613b51 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/catalog/CatalogBuyClubDiscountEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/catalog/CatalogBuyClubDiscountEvent.java @@ -9,10 +9,8 @@ import com.eu.habbo.messages.incoming.MessageHandler; import com.eu.habbo.messages.outgoing.catalog.AlertPurchaseFailedComposer; import com.eu.habbo.messages.outgoing.catalog.PurchaseOKComposer; import com.eu.habbo.messages.outgoing.inventory.InventoryRefreshComposer; -import com.eu.habbo.messages.outgoing.unknown.ExtendClubMessageComposer; -import com.eu.habbo.messages.outgoing.users.UserClubComposer; import com.eu.habbo.messages.outgoing.users.UserCreditsComposer; -import com.eu.habbo.messages.outgoing.users.UserCurrencyComposer; +import com.eu.habbo.messages.outgoing.users.ActivityPointsMessageComposer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -73,7 +71,7 @@ public class CatalogBuyClubDiscountEvent extends MessageHandler { this.client.sendResponse(new UserCreditsComposer(this.client.getHabbo())); if (totalDuckets > 0) - this.client.sendResponse(new UserCurrencyComposer(this.client.getHabbo())); + this.client.sendResponse(new ActivityPointsMessageComposer(this.client.getHabbo())); this.client.sendResponse(new PurchaseOKComposer(null)); this.client.sendResponse(new InventoryRefreshComposer()); diff --git a/src/main/java/com/eu/habbo/messages/incoming/catalog/CatalogBuyItemEvent.java b/src/main/java/com/eu/habbo/messages/incoming/catalog/CatalogBuyItemEvent.java index 3587aa41..96ed760f 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/catalog/CatalogBuyItemEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/catalog/CatalogBuyItemEvent.java @@ -111,7 +111,7 @@ public class CatalogBuyItemEvent extends MessageHandler { } if (!this.client.getHabbo().hasPermission(Permission.ACC_INFINITE_POINTS)) { //if the player has this perm disabled this.client.getHabbo().getHabboInfo().addCurrencyAmount(roomBundleItem.getPointsType(), -roomBundleItem.getPoints()); // takes their points away - this.client.sendResponse(new UserCurrencyComposer(this.client.getHabbo())); // Sends the updated currency composer window + this.client.sendResponse(new ActivityPointsMessageComposer(this.client.getHabbo())); // Sends the updated currency composer window } this.client.sendResponse(new PurchaseOKComposer()); // Sends the composer to close the window. @@ -199,7 +199,7 @@ public class CatalogBuyItemEvent extends MessageHandler { this.client.sendResponse(new UserCreditsComposer(this.client.getHabbo())); if (totalDuckets > 0) - this.client.sendResponse(new UserCurrencyComposer(this.client.getHabbo())); + this.client.sendResponse(new ActivityPointsMessageComposer(this.client.getHabbo())); this.client.sendResponse(new PurchaseOKComposer(null)); this.client.sendResponse(new InventoryRefreshComposer()); diff --git a/src/main/java/com/eu/habbo/messages/incoming/catalog/CheckPetNameEvent.java b/src/main/java/com/eu/habbo/messages/incoming/catalog/CheckPetNameEvent.java index 6b1726b4..cea6712f 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/catalog/CheckPetNameEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/catalog/CheckPetNameEvent.java @@ -2,7 +2,7 @@ package com.eu.habbo.messages.incoming.catalog; import com.eu.habbo.Emulator; import com.eu.habbo.messages.incoming.MessageHandler; -import com.eu.habbo.messages.outgoing.catalog.PetNameErrorComposer; +import com.eu.habbo.messages.outgoing.catalog.ApproveNameMessageComposer; import org.apache.commons.lang3.StringUtils; public class CheckPetNameEvent extends MessageHandler { @@ -14,13 +14,13 @@ public class CheckPetNameEvent extends MessageHandler { String petName = this.packet.readString(); if (petName.length() < PET_NAME_LENGTH_MINIMUM) { - this.client.sendResponse(new PetNameErrorComposer(PetNameErrorComposer.NAME_TO_SHORT, PET_NAME_LENGTH_MINIMUM + "")); + this.client.sendResponse(new ApproveNameMessageComposer(ApproveNameMessageComposer.NAME_TO_SHORT, PET_NAME_LENGTH_MINIMUM + "")); } else if (petName.length() > PET_NAME_LENGTH_MAXIMUM) { - this.client.sendResponse(new PetNameErrorComposer(PetNameErrorComposer.NAME_TO_LONG, PET_NAME_LENGTH_MAXIMUM + "")); + this.client.sendResponse(new ApproveNameMessageComposer(ApproveNameMessageComposer.NAME_TO_LONG, PET_NAME_LENGTH_MAXIMUM + "")); } else if (!StringUtils.isAlphanumeric(petName)) { - this.client.sendResponse(new PetNameErrorComposer(PetNameErrorComposer.FORBIDDEN_CHAR, petName)); + this.client.sendResponse(new ApproveNameMessageComposer(ApproveNameMessageComposer.FORBIDDEN_CHAR, petName)); } else { - this.client.sendResponse(new PetNameErrorComposer(PetNameErrorComposer.NAME_OK, petName)); + this.client.sendResponse(new ApproveNameMessageComposer(ApproveNameMessageComposer.NAME_OK, petName)); } } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/handshake/SecureLoginEvent.java b/src/main/java/com/eu/habbo/messages/incoming/handshake/SecureLoginEvent.java index fcee1568..f0ef0c67 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/handshake/SecureLoginEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/handshake/SecureLoginEvent.java @@ -26,11 +26,11 @@ import com.eu.habbo.messages.outgoing.generic.alerts.MessagesForYouComposer; import com.eu.habbo.messages.outgoing.habboway.nux.NewUserIdentityComposer; import com.eu.habbo.messages.outgoing.habboway.nux.NuxAlertComposer; import com.eu.habbo.messages.outgoing.handshake.EnableNotificationsComposer; -import com.eu.habbo.messages.outgoing.handshake.SecureLoginOKComposer; +import com.eu.habbo.messages.outgoing.handshake.AuthenticationOKMessageComposer; import com.eu.habbo.messages.outgoing.handshake.AvailabilityStatusMessageComposer; import com.eu.habbo.messages.outgoing.handshake.PingComposer; import com.eu.habbo.messages.outgoing.inventory.BadgePointLimitsComposer; -import com.eu.habbo.messages.outgoing.inventory.UserEffectsListComposer; +import com.eu.habbo.messages.outgoing.inventory.AvatarEffectsMessageComposer; import com.eu.habbo.messages.outgoing.modtool.CfhTopicsMessageComposer; import com.eu.habbo.messages.outgoing.modtool.ModToolComposer; import com.eu.habbo.messages.outgoing.modtool.ModToolSanctionInfoComposer; @@ -127,7 +127,7 @@ public class SecureLoginEvent extends MessageHandler { ArrayList messages = new ArrayList<>(); - messages.add(new SecureLoginOKComposer().compose()); + messages.add(new AuthenticationOKMessageComposer().compose()); int roomIdToEnter = 0; @@ -201,14 +201,14 @@ public class SecureLoginEvent extends MessageHandler { } messages.add(new UserHomeRoomComposer(this.client.getHabbo().getHabboInfo().getHomeRoom(), roomIdToEnter).compose()); - messages.add(new UserEffectsListComposer(habbo, this.client.getHabbo().getInventory().getEffectsComponent().effects.values()).compose()); + messages.add(new AvatarEffectsMessageComposer(habbo, this.client.getHabbo().getInventory().getEffectsComponent().effects.values()).compose()); messages.add(new UserClothesComposer(this.client.getHabbo()).compose()); messages.add(new NewUserIdentityComposer(habbo).compose()); messages.add(new UserPermissionsComposer(this.client.getHabbo()).compose()); messages.add(new AvailabilityStatusMessageComposer(true, false, true).compose()); messages.add(new PingComposer().compose()); messages.add(new EnableNotificationsComposer(Emulator.getConfig().getBoolean("bubblealerts.enabled", true)).compose()); - messages.add(new UserAchievementScoreComposer(this.client.getHabbo()).compose()); + messages.add(new AchievementsScoreComposer(this.client.getHabbo()).compose()); messages.add(new IsFirstLoginOfDayComposer(true).compose()); messages.add(new MysteryBoxKeysComposer().compose()); messages.add(new BuildersClubExpiredComposer().compose()); diff --git a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/RedeemItemEvent.java b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/RedeemItemEvent.java index fa5ce66b..4c7bf265 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/rooms/items/RedeemItemEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/rooms/items/RedeemItemEvent.java @@ -8,7 +8,7 @@ import com.eu.habbo.messages.incoming.MessageHandler; import com.eu.habbo.messages.outgoing.rooms.UpdateStackHeightComposer; import com.eu.habbo.messages.outgoing.rooms.items.RemoveFloorItemComposer; import com.eu.habbo.messages.outgoing.users.UserCreditsComposer; -import com.eu.habbo.messages.outgoing.users.UserCurrencyComposer; +import com.eu.habbo.messages.outgoing.users.ActivityPointsMessageComposer; import com.eu.habbo.plugin.events.furniture.FurnitureRedeemedEvent; import com.eu.habbo.threading.runnables.QueryDeleteHabboItem; import org.slf4j.Logger; @@ -117,7 +117,7 @@ public class RedeemItemEvent extends MessageHandler { case FurnitureRedeemedEvent.PIXELS: this.client.getHabbo().getHabboInfo().addPixels(furniRedeemEvent.amount); - this.client.sendResponse(new UserCurrencyComposer(this.client.getHabbo())); + this.client.sendResponse(new ActivityPointsMessageComposer(this.client.getHabbo())); break; default: diff --git a/src/main/java/com/eu/habbo/messages/incoming/unknown/RequestResolutionEvent.java b/src/main/java/com/eu/habbo/messages/incoming/unknown/RequestResolutionEvent.java index a076e7c8..006ac62e 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/unknown/RequestResolutionEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/unknown/RequestResolutionEvent.java @@ -1,7 +1,7 @@ package com.eu.habbo.messages.incoming.unknown; import com.eu.habbo.messages.incoming.MessageHandler; -import com.eu.habbo.messages.outgoing.events.resolution.NewYearResolutionComposer; +import com.eu.habbo.messages.outgoing.events.resolution.AchievementResolutionsMessageComposer; public class RequestResolutionEvent extends MessageHandler { @Override @@ -10,7 +10,7 @@ public class RequestResolutionEvent extends MessageHandler { int viewAll = this.packet.readInt(); if (viewAll == 0) { - this.client.sendResponse(new NewYearResolutionComposer()); + this.client.sendResponse(new AchievementResolutionsMessageComposer()); } } } diff --git a/src/main/java/com/eu/habbo/messages/incoming/users/RequestUserCreditsEvent.java b/src/main/java/com/eu/habbo/messages/incoming/users/RequestUserCreditsEvent.java index e581fdb3..dc5ddd36 100644 --- a/src/main/java/com/eu/habbo/messages/incoming/users/RequestUserCreditsEvent.java +++ b/src/main/java/com/eu/habbo/messages/incoming/users/RequestUserCreditsEvent.java @@ -2,12 +2,12 @@ package com.eu.habbo.messages.incoming.users; import com.eu.habbo.messages.incoming.MessageHandler; import com.eu.habbo.messages.outgoing.users.UserCreditsComposer; -import com.eu.habbo.messages.outgoing.users.UserCurrencyComposer; +import com.eu.habbo.messages.outgoing.users.ActivityPointsMessageComposer; public class RequestUserCreditsEvent extends MessageHandler { @Override public void handle() { this.client.sendResponse(new UserCreditsComposer(this.client.getHabbo())); - this.client.sendResponse(new UserCurrencyComposer(this.client.getHabbo())); + this.client.sendResponse(new ActivityPointsMessageComposer(this.client.getHabbo())); } } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/achievements/AchievementListComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/achievements/AchievementsComposer.java similarity index 95% rename from src/main/java/com/eu/habbo/messages/outgoing/achievements/AchievementListComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/achievements/AchievementsComposer.java index cc925bed..93b52756 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/achievements/AchievementListComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/achievements/AchievementsComposer.java @@ -11,12 +11,12 @@ import com.eu.habbo.messages.outgoing.Outgoing; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class AchievementListComposer extends MessageComposer { - private static final Logger LOGGER = LoggerFactory.getLogger(AchievementListComposer.class); +public class AchievementsComposer extends MessageComposer { + private static final Logger LOGGER = LoggerFactory.getLogger(AchievementsComposer.class); private final Habbo habbo; - public AchievementListComposer(Habbo habbo) { + public AchievementsComposer(Habbo habbo) { this.habbo = habbo; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/catalog/PetNameErrorComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/catalog/ApproveNameMessageComposer.java similarity index 86% rename from src/main/java/com/eu/habbo/messages/outgoing/catalog/PetNameErrorComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/catalog/ApproveNameMessageComposer.java index 2e8e07a6..2ad21cd3 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/catalog/PetNameErrorComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/catalog/ApproveNameMessageComposer.java @@ -4,7 +4,7 @@ import com.eu.habbo.messages.ServerMessage; import com.eu.habbo.messages.outgoing.MessageComposer; import com.eu.habbo.messages.outgoing.Outgoing; -public class PetNameErrorComposer extends MessageComposer { +public class ApproveNameMessageComposer extends MessageComposer { public static final int NAME_OK = 0; public static final int NAME_TO_LONG = 1; public static final int NAME_TO_SHORT = 2; @@ -14,7 +14,7 @@ public class PetNameErrorComposer extends MessageComposer { private final int type; private final String value; - public PetNameErrorComposer(int type, String value) { + public ApproveNameMessageComposer(int type, String value) { this.type = type; this.value = value; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/events/resolution/NewYearResolutionComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/events/resolution/AchievementResolutionsMessageComposer.java similarity index 93% rename from src/main/java/com/eu/habbo/messages/outgoing/events/resolution/NewYearResolutionComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/events/resolution/AchievementResolutionsMessageComposer.java index 1affd7e8..ffa4b267 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/events/resolution/NewYearResolutionComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/events/resolution/AchievementResolutionsMessageComposer.java @@ -4,7 +4,7 @@ import com.eu.habbo.messages.ServerMessage; import com.eu.habbo.messages.outgoing.MessageComposer; import com.eu.habbo.messages.outgoing.Outgoing; -public class NewYearResolutionComposer extends MessageComposer { +public class AchievementResolutionsMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { //:test 817 i:230 i:1 i:1 i:1 s:NY2013RES i:3 i:0 i:60000000 diff --git a/src/main/java/com/eu/habbo/messages/outgoing/handshake/SecureLoginOKComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/handshake/AuthenticationOKMessageComposer.java similarity index 83% rename from src/main/java/com/eu/habbo/messages/outgoing/handshake/SecureLoginOKComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/handshake/AuthenticationOKMessageComposer.java index a4b6a51e..ad40e0ad 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/handshake/SecureLoginOKComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/handshake/AuthenticationOKMessageComposer.java @@ -4,7 +4,7 @@ import com.eu.habbo.messages.ServerMessage; import com.eu.habbo.messages.outgoing.MessageComposer; import com.eu.habbo.messages.outgoing.Outgoing; -public class SecureLoginOKComposer extends MessageComposer { +public class AuthenticationOKMessageComposer extends MessageComposer { @Override protected ServerMessage composeInternal() { this.response.init(Outgoing.AuthenticationOKMessageComposer); diff --git a/src/main/java/com/eu/habbo/messages/outgoing/inventory/EffectsListEffectEnableComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/inventory/AvatarEffectActivatedMessageComposer.java similarity index 81% rename from src/main/java/com/eu/habbo/messages/outgoing/inventory/EffectsListEffectEnableComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/inventory/AvatarEffectActivatedMessageComposer.java index 5dfcf05a..94d0aa55 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/inventory/EffectsListEffectEnableComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/inventory/AvatarEffectActivatedMessageComposer.java @@ -5,10 +5,10 @@ import com.eu.habbo.messages.ServerMessage; import com.eu.habbo.messages.outgoing.MessageComposer; import com.eu.habbo.messages.outgoing.Outgoing; -public class EffectsListEffectEnableComposer extends MessageComposer { +public class AvatarEffectActivatedMessageComposer extends MessageComposer { public final EffectsComponent.HabboEffect effect; - public EffectsListEffectEnableComposer(EffectsComponent.HabboEffect effect) { + public AvatarEffectActivatedMessageComposer(EffectsComponent.HabboEffect effect) { this.effect = effect; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/inventory/EffectsListAddComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/inventory/AvatarEffectAddedMessageComposer.java similarity index 84% rename from src/main/java/com/eu/habbo/messages/outgoing/inventory/EffectsListAddComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/inventory/AvatarEffectAddedMessageComposer.java index a548576a..b7281724 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/inventory/EffectsListAddComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/inventory/AvatarEffectAddedMessageComposer.java @@ -5,11 +5,10 @@ import com.eu.habbo.messages.ServerMessage; import com.eu.habbo.messages.outgoing.MessageComposer; import com.eu.habbo.messages.outgoing.Outgoing; -public class EffectsListAddComposer extends MessageComposer { +public class AvatarEffectAddedMessageComposer extends MessageComposer { public final EffectsComponent.HabboEffect effect; - public - EffectsListAddComposer(EffectsComponent.HabboEffect effect) { + public AvatarEffectAddedMessageComposer(EffectsComponent.HabboEffect effect) { this.effect = effect; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/inventory/EffectsListRemoveComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/inventory/AvatarEffectExpiredMessageComposer.java similarity index 78% rename from src/main/java/com/eu/habbo/messages/outgoing/inventory/EffectsListRemoveComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/inventory/AvatarEffectExpiredMessageComposer.java index 869a16ad..c47cb784 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/inventory/EffectsListRemoveComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/inventory/AvatarEffectExpiredMessageComposer.java @@ -5,10 +5,10 @@ import com.eu.habbo.messages.ServerMessage; import com.eu.habbo.messages.outgoing.MessageComposer; import com.eu.habbo.messages.outgoing.Outgoing; -public class EffectsListRemoveComposer extends MessageComposer { +public class AvatarEffectExpiredMessageComposer extends MessageComposer { public final EffectsComponent.HabboEffect effect; - public EffectsListRemoveComposer(EffectsComponent.HabboEffect effect) { + public AvatarEffectExpiredMessageComposer(EffectsComponent.HabboEffect effect) { this.effect = effect; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/inventory/UserEffectsListComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/inventory/AvatarEffectsMessageComposer.java similarity index 57% rename from src/main/java/com/eu/habbo/messages/outgoing/inventory/UserEffectsListComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/inventory/AvatarEffectsMessageComposer.java index f68e7d1b..998c3d30 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/inventory/UserEffectsListComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/inventory/AvatarEffectsMessageComposer.java @@ -10,11 +10,11 @@ import com.eu.habbo.messages.outgoing.Outgoing; import java.util.Collection; -public class UserEffectsListComposer extends MessageComposer { +public class AvatarEffectsMessageComposer extends MessageComposer { public final Habbo habbo; public final Collection effects; - public UserEffectsListComposer(Habbo habbo, Collection effects) { + public AvatarEffectsMessageComposer(Habbo habbo, Collection effects) { this.habbo = habbo; this.effects = effects; } @@ -31,18 +31,18 @@ public class UserEffectsListComposer extends MessageComposer { this.response.appendInt(this.effects.size()); for (EffectsComponent.HabboEffect effect : effects) { - UserEffectsListComposer.this.response.appendInt(effect.effect); - UserEffectsListComposer.this.response.appendInt(0); - UserEffectsListComposer.this.response.appendInt(effect.duration > 0 ? effect.duration : Integer.MAX_VALUE); - UserEffectsListComposer.this.response.appendInt((effect.duration > 0 ? (effect.total - (effect.isActivated() ? 1 : 0)) : 0)); + AvatarEffectsMessageComposer.this.response.appendInt(effect.effect); + AvatarEffectsMessageComposer.this.response.appendInt(0); + AvatarEffectsMessageComposer.this.response.appendInt(effect.duration > 0 ? effect.duration : Integer.MAX_VALUE); + AvatarEffectsMessageComposer.this.response.appendInt((effect.duration > 0 ? (effect.total - (effect.isActivated() ? 1 : 0)) : 0)); if(!effect.isActivated() && effect.duration > 0) { - UserEffectsListComposer.this.response.appendInt(0); + AvatarEffectsMessageComposer.this.response.appendInt(0); } else { - UserEffectsListComposer.this.response.appendInt(effect.duration > 0 ? (Emulator.getIntUnixTimestamp() - effect.activationTimestamp) + effect.duration : 0); + AvatarEffectsMessageComposer.this.response.appendInt(effect.duration > 0 ? (Emulator.getIntUnixTimestamp() - effect.activationTimestamp) + effect.duration : 0); } - UserEffectsListComposer.this.response.appendBoolean(effect.duration <= 0); // is perm + AvatarEffectsMessageComposer.this.response.appendBoolean(effect.duration <= 0); // is perm } } } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserEffectComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/AvatarEffectMessageComposer.java similarity index 80% rename from src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserEffectComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/rooms/users/AvatarEffectMessageComposer.java index 15b1ef54..799f39a3 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserEffectComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/rooms/users/AvatarEffectMessageComposer.java @@ -5,16 +5,16 @@ import com.eu.habbo.messages.ServerMessage; import com.eu.habbo.messages.outgoing.MessageComposer; import com.eu.habbo.messages.outgoing.Outgoing; -public class RoomUserEffectComposer extends MessageComposer { +public class AvatarEffectMessageComposer extends MessageComposer { private final RoomUnit roomUnit; private final int effectId; - public RoomUserEffectComposer(RoomUnit roomUnit) { + public AvatarEffectMessageComposer(RoomUnit roomUnit) { this.roomUnit = roomUnit; this.effectId = -1; } - public RoomUserEffectComposer(RoomUnit roomUnit, int effectId) { + public AvatarEffectMessageComposer(RoomUnit roomUnit, int effectId) { this.roomUnit = roomUnit; this.effectId = effectId; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownAvatarEditorComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/unknown/AvatarEffectSelectedMessageComposer.java similarity index 78% rename from src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownAvatarEditorComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/unknown/AvatarEffectSelectedMessageComposer.java index 64bba946..17c7f7fd 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownAvatarEditorComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/unknown/AvatarEffectSelectedMessageComposer.java @@ -4,10 +4,10 @@ import com.eu.habbo.messages.ServerMessage; import com.eu.habbo.messages.outgoing.MessageComposer; import com.eu.habbo.messages.outgoing.Outgoing; -public class UnknownAvatarEditorComposer extends MessageComposer { +public class AvatarEffectSelectedMessageComposer extends MessageComposer { private final int type; - public UnknownAvatarEditorComposer(int type) { + public AvatarEffectSelectedMessageComposer(int type) { this.type = type; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/users/UserAchievementScoreComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/users/AchievementsScoreComposer.java similarity index 81% rename from src/main/java/com/eu/habbo/messages/outgoing/users/UserAchievementScoreComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/users/AchievementsScoreComposer.java index c0ebfaf5..ab7f7a72 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/users/UserAchievementScoreComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/users/AchievementsScoreComposer.java @@ -5,10 +5,10 @@ import com.eu.habbo.messages.ServerMessage; import com.eu.habbo.messages.outgoing.MessageComposer; import com.eu.habbo.messages.outgoing.Outgoing; -public class UserAchievementScoreComposer extends MessageComposer { +public class AchievementsScoreComposer extends MessageComposer { private final Habbo habbo; - public UserAchievementScoreComposer(Habbo habbo) { + public AchievementsScoreComposer(Habbo habbo) { this.habbo = habbo; } diff --git a/src/main/java/com/eu/habbo/messages/outgoing/users/UserCurrencyComposer.java b/src/main/java/com/eu/habbo/messages/outgoing/users/ActivityPointsMessageComposer.java similarity index 87% rename from src/main/java/com/eu/habbo/messages/outgoing/users/UserCurrencyComposer.java rename to src/main/java/com/eu/habbo/messages/outgoing/users/ActivityPointsMessageComposer.java index 8dfeb378..8bd2be0f 100644 --- a/src/main/java/com/eu/habbo/messages/outgoing/users/UserCurrencyComposer.java +++ b/src/main/java/com/eu/habbo/messages/outgoing/users/ActivityPointsMessageComposer.java @@ -8,12 +8,12 @@ import com.eu.habbo.messages.outgoing.Outgoing; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class UserCurrencyComposer extends MessageComposer { - private static final Logger LOGGER = LoggerFactory.getLogger(UserCurrencyComposer.class); +public class ActivityPointsMessageComposer extends MessageComposer { + private static final Logger LOGGER = LoggerFactory.getLogger(ActivityPointsMessageComposer.class); private final Habbo habbo; - public UserCurrencyComposer(Habbo habbo) { + public ActivityPointsMessageComposer(Habbo habbo) { this.habbo = habbo; } diff --git a/src/main/java/com/eu/habbo/threading/runnables/RoomUnitRidePet.java b/src/main/java/com/eu/habbo/threading/runnables/RoomUnitRidePet.java index bcfd8ef2..2dfce42a 100644 --- a/src/main/java/com/eu/habbo/threading/runnables/RoomUnitRidePet.java +++ b/src/main/java/com/eu/habbo/threading/runnables/RoomUnitRidePet.java @@ -5,7 +5,7 @@ import com.eu.habbo.habbohotel.pets.PetTasks; import com.eu.habbo.habbohotel.pets.RideablePet; import com.eu.habbo.habbohotel.rooms.RoomTile; import com.eu.habbo.habbohotel.users.Habbo; -import com.eu.habbo.messages.outgoing.rooms.users.RoomUserEffectComposer; +import com.eu.habbo.messages.outgoing.rooms.users.AvatarEffectMessageComposer; import com.eu.habbo.messages.outgoing.rooms.users.RoomUserStatusComposer; public class RoomUnitRidePet implements Runnable { @@ -36,7 +36,7 @@ public class RoomUnitRidePet implements Runnable { habbo.getRoomUnit().statusUpdate(true); pet.setRider(habbo); habbo.getHabboInfo().getCurrentRoom().sendComposer(new RoomUserStatusComposer(habbo.getRoomUnit()).compose()); - habbo.getHabboInfo().getCurrentRoom().sendComposer(new RoomUserEffectComposer(habbo.getRoomUnit()).compose()); + habbo.getHabboInfo().getCurrentRoom().sendComposer(new AvatarEffectMessageComposer(habbo.getRoomUnit()).compose()); pet.setTask(PetTasks.RIDE); } else { pet.getRoomUnit().setWalkTimeOut(3 + Emulator.getIntUnixTimestamp()); diff --git a/src/main/java/com/eu/habbo/threading/runnables/SendRoomUnitEffectComposer.java b/src/main/java/com/eu/habbo/threading/runnables/SendRoomUnitEffectComposer.java index 9b24eaee..0f12ea12 100644 --- a/src/main/java/com/eu/habbo/threading/runnables/SendRoomUnitEffectComposer.java +++ b/src/main/java/com/eu/habbo/threading/runnables/SendRoomUnitEffectComposer.java @@ -2,7 +2,7 @@ package com.eu.habbo.threading.runnables; import com.eu.habbo.habbohotel.rooms.Room; import com.eu.habbo.habbohotel.rooms.RoomUnit; -import com.eu.habbo.messages.outgoing.rooms.users.RoomUserEffectComposer; +import com.eu.habbo.messages.outgoing.rooms.users.AvatarEffectMessageComposer; public class SendRoomUnitEffectComposer implements Runnable { private final Room room; @@ -16,7 +16,7 @@ public class SendRoomUnitEffectComposer implements Runnable { @Override public void run() { if (this.room != null && this.roomUnit != null) { - this.room.sendComposer(new RoomUserEffectComposer(roomUnit).compose()); + this.room.sendComposer(new AvatarEffectMessageComposer(roomUnit).compose()); } } } \ No newline at end of file diff --git a/src/main/java/com/eu/habbo/threading/runnables/TeleportInteraction.java b/src/main/java/com/eu/habbo/threading/runnables/TeleportInteraction.java index 83c6388d..daa19e2f 100644 --- a/src/main/java/com/eu/habbo/threading/runnables/TeleportInteraction.java +++ b/src/main/java/com/eu/habbo/threading/runnables/TeleportInteraction.java @@ -7,7 +7,7 @@ import com.eu.habbo.habbohotel.rooms.RoomTile; import com.eu.habbo.habbohotel.rooms.RoomUnitStatus; import com.eu.habbo.habbohotel.rooms.RoomUserRotation; import com.eu.habbo.habbohotel.users.HabboItem; -import com.eu.habbo.messages.outgoing.rooms.users.RoomUserEffectComposer; +import com.eu.habbo.messages.outgoing.rooms.users.AvatarEffectMessageComposer; import com.eu.habbo.messages.outgoing.rooms.users.RoomUserRemoveComposer; import com.eu.habbo.messages.outgoing.rooms.users.RoomUserStatusComposer; import com.eu.habbo.messages.outgoing.rooms.users.RoomUsersComposer; @@ -83,7 +83,7 @@ class TeleportInteraction extends Thread { this.targetRoom.sendComposer(new RoomUserRemoveComposer(this.client.getHabbo().getRoomUnit()).compose()); this.targetRoom.sendComposer(new RoomUsersComposer(this.client.getHabbo()).compose()); this.targetRoom.sendComposer(new RoomUserStatusComposer(this.client.getHabbo().getRoomUnit()).compose()); - this.targetRoom.sendComposer(new RoomUserEffectComposer(this.client.getHabbo().getRoomUnit()).compose()); + this.targetRoom.sendComposer(new AvatarEffectMessageComposer(this.client.getHabbo().getRoomUnit()).compose()); this.room.updateItem(this.teleportOne); this.targetRoom.updateItem(this.teleportTwo); diff --git a/src/main/java/com/eu/habbo/threading/runnables/freeze/FreezeClearEffects.java b/src/main/java/com/eu/habbo/threading/runnables/freeze/FreezeClearEffects.java index 27de5820..56db4c7e 100644 --- a/src/main/java/com/eu/habbo/threading/runnables/freeze/FreezeClearEffects.java +++ b/src/main/java/com/eu/habbo/threading/runnables/freeze/FreezeClearEffects.java @@ -1,7 +1,7 @@ package com.eu.habbo.threading.runnables.freeze; import com.eu.habbo.habbohotel.users.Habbo; -import com.eu.habbo.messages.outgoing.rooms.users.RoomUserEffectComposer; +import com.eu.habbo.messages.outgoing.rooms.users.AvatarEffectMessageComposer; public class FreezeClearEffects implements Runnable { private final Habbo habbo; @@ -15,7 +15,7 @@ public class FreezeClearEffects implements Runnable { this.habbo.getRoomUnit().setEffectId(0, 0); this.habbo.getRoomUnit().setCanWalk(true); if (this.habbo.getHabboInfo().getCurrentRoom() != null) { - this.habbo.getHabboInfo().getCurrentRoom().sendComposer(new RoomUserEffectComposer(this.habbo.getRoomUnit()).compose()); + this.habbo.getHabboInfo().getCurrentRoom().sendComposer(new AvatarEffectMessageComposer(this.habbo.getRoomUnit()).compose()); } } }