nitro/Arcturus-Community
1
0
Fork 0
mirror of https://git.krews.org/morningstar/Arcturus-Community.git synced 2024-10-23 11:23:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Refactored all outgoing composer names beginning with A

Browse Source
This commit is contained in:
Harmonic 2022-04-16 10:54:16 -07:00 committed by Harmonic
parent 9f9bbf1a37
commit 3ca03f9d8f
31 changed files with 75 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/eu/habbo/habbohotel/items/interactions/totems/InteractionTotemPlanet.java
View File

@ -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;

6
src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/effects/WiredEffectBotTeleport.java
View File

@ -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()) {

5
src/main/java/com/eu/habbo/habbohotel/items/interactions/wired/effects/WiredEffectTeleport.java
View File

@ -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()) {

2
src/main/java/com/eu/habbo/habbohotel/rooms/Room.java
View File

@ -4138,7 +4138,7 @@ public class Room implements Comparable<Room>, ISerialize, Runnable {
if (this.allowEffects && !roomUnit.isSwimming) {
roomUnit.setEffectId(effectId, duration);
this.sendComposer(new RoomUserEffectComposer(roomUnit).compose());
this.sendComposer(new AvatarEffectMessageComposer(roomUnit).compose());
}
}
}

3
src/main/java/com/eu/habbo/habbohotel/rooms/RoomManager.java
View File

@ -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()) {

2
src/main/java/com/eu/habbo/habbohotel/users/Habbo.java
View File

@ -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()));
}

12
src/main/java/com/eu/habbo/habbohotel/users/inventory/EffectsComponent.java
View File

@ -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));
}
}

4
src/main/java/com/eu/habbo/messages/incoming/achievements/RequestAchievementsEvent.java
View File

@ -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()));
}
}

6
src/main/java/com/eu/habbo/messages/incoming/catalog/CatalogBuyClubDiscountEvent.java
View File

@ -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());

4
src/main/java/com/eu/habbo/messages/incoming/catalog/CatalogBuyItemEvent.java
View File

@ -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());

10
src/main/java/com/eu/habbo/messages/incoming/catalog/CheckPetNameEvent.java
View File

@ -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));
}
}
}

10
src/main/java/com/eu/habbo/messages/incoming/handshake/SecureLoginEvent.java
View File

@ -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<ServerMessage> 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());

4
src/main/java/com/eu/habbo/messages/incoming/rooms/items/RedeemItemEvent.java
View File

@ -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:

4
src/main/java/com/eu/habbo/messages/incoming/unknown/RequestResolutionEvent.java
View File

@ -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());
}
}
}

4
src/main/java/com/eu/habbo/messages/incoming/users/RequestUserCreditsEvent.java
View File

@ -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()));
}
}

6
src/main/java/com/eu/habbo/messages/outgoing/achievements/AchievementListComposer.java → src/main/java/com/eu/habbo/messages/outgoing/achievements/AchievementsComposer.java
View File

@ -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;
}

4
src/main/java/com/eu/habbo/messages/outgoing/catalog/PetNameErrorComposer.java → src/main/java/com/eu/habbo/messages/outgoing/catalog/ApproveNameMessageComposer.java
View File

@ -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;
}

2
src/main/java/com/eu/habbo/messages/outgoing/events/resolution/NewYearResolutionComposer.java → src/main/java/com/eu/habbo/messages/outgoing/events/resolution/AchievementResolutionsMessageComposer.java
View File

@ -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

2
src/main/java/com/eu/habbo/messages/outgoing/handshake/SecureLoginOKComposer.java → src/main/java/com/eu/habbo/messages/outgoing/handshake/AuthenticationOKMessageComposer.java
View File

@ -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);

4
src/main/java/com/eu/habbo/messages/outgoing/inventory/EffectsListEffectEnableComposer.java → src/main/java/com/eu/habbo/messages/outgoing/inventory/AvatarEffectActivatedMessageComposer.java
View File

@ -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;
}

5
src/main/java/com/eu/habbo/messages/outgoing/inventory/EffectsListAddComposer.java → src/main/java/com/eu/habbo/messages/outgoing/inventory/AvatarEffectAddedMessageComposer.java
View File

@ -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;
}

4
src/main/java/com/eu/habbo/messages/outgoing/inventory/EffectsListRemoveComposer.java → src/main/java/com/eu/habbo/messages/outgoing/inventory/AvatarEffectExpiredMessageComposer.java
View File

@ -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;
}

18
src/main/java/com/eu/habbo/messages/outgoing/inventory/UserEffectsListComposer.java → src/main/java/com/eu/habbo/messages/outgoing/inventory/AvatarEffectsMessageComposer.java
View File

@ -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<EffectsComponent.HabboEffect> effects;
public UserEffectsListComposer(Habbo habbo, Collection<EffectsComponent.HabboEffect> effects) {
public AvatarEffectsMessageComposer(Habbo habbo, Collection<EffectsComponent.HabboEffect> 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
}
}
}

6
src/main/java/com/eu/habbo/messages/outgoing/rooms/users/RoomUserEffectComposer.java → src/main/java/com/eu/habbo/messages/outgoing/rooms/users/AvatarEffectMessageComposer.java
View File

@ -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;
}

4
src/main/java/com/eu/habbo/messages/outgoing/unknown/UnknownAvatarEditorComposer.java → src/main/java/com/eu/habbo/messages/outgoing/unknown/AvatarEffectSelectedMessageComposer.java
View File

@ -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;
}

4
src/main/java/com/eu/habbo/messages/outgoing/users/UserAchievementScoreComposer.java → src/main/java/com/eu/habbo/messages/outgoing/users/AchievementsScoreComposer.java
View File

@ -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;
}

6
src/main/java/com/eu/habbo/messages/outgoing/users/UserCurrencyComposer.java → src/main/java/com/eu/habbo/messages/outgoing/users/ActivityPointsMessageComposer.java
View File

@ -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;
}

4
src/main/java/com/eu/habbo/threading/runnables/RoomUnitRidePet.java
View File

@ -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());

4
src/main/java/com/eu/habbo/threading/runnables/SendRoomUnitEffectComposer.java
View File

@ -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());
}
}
}

4
src/main/java/com/eu/habbo/threading/runnables/TeleportInteraction.java
View File

@ -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);

4
src/main/java/com/eu/habbo/threading/runnables/freeze/FreezeClearEffects.java
View File

@ -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());
}
}
}