code cleanup

This commit is contained in:
brenoepic 2022-04-30 01:27:25 -03:00
parent c5137177f3
commit 7862327b63
443 changed files with 965 additions and 977 deletions

View File

@ -216,12 +216,11 @@ public final class Emulator {
MessageDigest md = MessageDigest.getInstance("MD5");// MD5
FileInputStream fis = new FileInputStream(filepath);
byte[] dataBytes = new byte[1024];
int nread = 0;
int nread;
while ((nread = fis.read(dataBytes)) != -1)
md.update(dataBytes, 0, nread);
byte[] mdbytes = md.digest();
for (int i = 0; i < mdbytes.length; i++)
sb.append(Integer.toString((mdbytes[i] & 0xff) + 0x100, 16).substring(1));
for (byte mdbyte : mdbytes) sb.append(Integer.toString((mdbyte & 0xff) + 0x100, 16).substring(1));
} catch (Exception e) {
build = "4.0 Developer Preview Branch";
return;
@ -240,50 +239,50 @@ public final class Emulator {
try {
if (Emulator.getPluginManager() != null)
Emulator.getPluginManager().fireEvent(new EmulatorStartShutdownEvent());
} catch (Exception e) {
} catch (Exception ignored) {
}
try {
if (Emulator.cameraClient != null)
Emulator.cameraClient.disconnect();
} catch (Exception e) {
} catch (Exception ignored) {
}
try {
if (Emulator.rconServer != null)
Emulator.rconServer.stop();
} catch (Exception e) {
} catch (Exception ignored) {
}
try {
if (Emulator.gameEnvironment != null)
Emulator.gameEnvironment.dispose();
} catch (Exception e) {
} catch (Exception ignored) {
}
try {
if (Emulator.getPluginManager() != null)
Emulator.getPluginManager().fireEvent(new EmulatorStoppedEvent());
} catch (Exception e) {
} catch (Exception ignored) {
}
try {
if (Emulator.pluginManager != null)
Emulator.pluginManager.dispose();
} catch (Exception e) {
} catch (Exception ignored) {
}
try {
if (Emulator.config != null) {
Emulator.config.saveToDatabase();
}
} catch (Exception e) {
} catch (Exception ignored) {
}
try {
if (Emulator.gameServer != null)
Emulator.gameServer.stop();
} catch (Exception e) {
} catch (Exception ignored) {
}
LOGGER.info("Stopped Arcturus Morningstar {}", version);
@ -297,7 +296,7 @@ public final class Emulator {
if (Emulator.threading != null)
Emulator.threading.shutDown();
} catch (Exception e) {
} catch (Exception ignored) {
}
}

View File

@ -20,7 +20,7 @@ public class RoomUserPetComposer extends MessageComposer {
@Override
protected ServerMessage composeInternal() {
this.response.init(Outgoing.UsersComposer);
this.response.init(Outgoing.usersComposer);
this.response.appendInt(1);
this.response.appendInt(this.habbo.getHabboInfo().getId());
this.response.appendString(this.habbo.getHabboInfo().getUsername());

View File

@ -31,6 +31,6 @@ public class Scheduler implements Runnable {
if (this.disposed)
return;
Emulator.getThreading().run(this, this.interval * 1000);
Emulator.getThreading().run(this, this.interval * 1000L);
}
}

View File

@ -23,7 +23,7 @@ public class TextsManager {
LOGGER.info("Texts Manager -> Loaded! (" + (System.currentTimeMillis() - millis) + " MS)");
} catch (Exception e) {
e.printStackTrace();
LOGGER.error("Caught exception", e);
}
}

View File

@ -91,6 +91,7 @@ public class CatalogManager {
case recycler_info:
if (Emulator.getConfig().getBoolean("hotel.ecotron.enabled"))
this.put(layout.name().toLowerCase(), RecyclerInfoLayout.class);
break;
case recycler_prizes:
if (Emulator.getConfig().getBoolean("hotel.ecotron.enabled"))
this.put(layout.name().toLowerCase(), RecyclerPrizesLayout.class);

View File

@ -83,7 +83,7 @@ public class RequestFriendEvent extends MessageHandler {
}
if(targetHabbo.isOnline()) {
targetHabbo.getClient().sendResponse(new NewFriendRequestComposer(this.client.getHabbo()));
targetHabbo.getClient().sendResponse(new NewFriendRequestComposer(this.client.getHabbo().getHabboInfo()));
}
Messenger.makeFriendRequest(this.client.getHabbo().getHabboInfo().getId(), targetId);

View File

@ -25,10 +25,7 @@ import com.eu.habbo.messages.outgoing.generic.alerts.HabboBroadcastMessageCompos
import com.eu.habbo.messages.outgoing.generic.alerts.MOTDNotificationComposer;
import com.eu.habbo.messages.outgoing.habboway.nux.NoobnessLevelMessageComposer;
import com.eu.habbo.messages.outgoing.habboway.nux.InClientLinkMessageComposer;
import com.eu.habbo.messages.outgoing.handshake.EnableNotificationsComposer;
import com.eu.habbo.messages.outgoing.handshake.AuthenticationOKMessageComposer;
import com.eu.habbo.messages.outgoing.handshake.AvailabilityStatusMessageComposer;
import com.eu.habbo.messages.outgoing.handshake.PingMessageComposer;
import com.eu.habbo.messages.outgoing.handshake.*;
import com.eu.habbo.messages.outgoing.inventory.BadgePointLimitsComposer;
import com.eu.habbo.messages.outgoing.inventory.AvatarEffectsMessageComposer;
import com.eu.habbo.messages.outgoing.modtool.CfhTopicsInitComposer;

File diff suppressed because it is too large Load Diff

View File

@ -19,7 +19,7 @@ public class AchievementComposer extends MessageComposer {
@Override
protected ServerMessage composeInternal() {
this.response.init(Outgoing.AchievementComposer);
this.response.init(Outgoing.achievementComposer);
int achievementProgress;
AchievementLevel currentLevel;

View File

@ -18,7 +18,7 @@ public class AchievementUnlockedComposer extends MessageComposer {
@Override
protected ServerMessage composeInternal() {
this.response.init(Outgoing.HabboAchievementNotificationMessageComposer);
this.response.init(Outgoing.habboAchievementNotificationMessageComposer);
AchievementLevel level = this.achievement.getLevelForProgress(this.habbo.getHabboStats().getAchievementProgress(this.achievement));
this.response.appendInt(this.achievement.id);

View File

@ -22,7 +22,7 @@ public class AchievementsComposer extends MessageComposer {
@Override
protected ServerMessage composeInternal() {
this.response.init(Outgoing.AchievementsComposer);
this.response.init(Outgoing.achievementsComposer);
try {
this.response.appendInt(Emulator.getGameEnvironment().getAchievementManager().getAchievements().size());

View File

@ -18,7 +18,7 @@ public class TalentLevelUpComposer extends MessageComposer {
@Override
protected ServerMessage composeInternal() {
this.response.init(Outgoing.TalentLevelUpComposer);
this.response.init(Outgoing.talentLevelUpComposer);
this.response.appendString(this.talentTrackType.name());
this.response.appendInt(this.talentTrackLevel.level);

View File

@ -24,7 +24,7 @@ public class TalentTrackMessageComposer extends MessageComposer {
@Override
protected ServerMessage composeInternal() {
this.response.init(Outgoing.TalentTrackMessageComposer);
this.response.init(Outgoing.talentTrackMessageComposer);
this.response.appendString(this.type.name().toLowerCase());
LinkedHashMap<Integer, TalentTrackLevel> talentTrackLevels = Emulator.getGameEnvironment().getAchievementManager().getTalenTrackLevels(this.type);

View File

@ -17,7 +17,7 @@ public class CameraPriceComposer extends MessageComposer {
@Override
protected ServerMessage composeInternal() {
this.response.init(Outgoing.InitCameraMessageComposer);
this.response.init(Outgoing.initCameraMessageComposer);
this.response.appendInt(this.credits);
this.response.appendInt(this.points);
this.response.appendInt(this.pointsType);

View File

@ -17,7 +17,7 @@ public class CameraPublishStatusMessageComposer extends MessageComposer {
@Override
protected ServerMessage composeInternal() {
this.response.init(Outgoing.CameraPublishStatusMessageComposer);
this.response.init(Outgoing.cameraPublishStatusMessageComposer);
this.response.appendBoolean(this.isOk);
this.response.appendInt(this.cooldownSeconds);

View File

@ -7,7 +7,7 @@ import com.eu.habbo.messages.outgoing.Outgoing;
public class CameraPurchaseOKMessageComposer extends MessageComposer {
@Override
protected ServerMessage composeInternal() {
this.response.init(Outgoing.CameraPurchaseOKMessageComposer);
this.response.init(Outgoing.cameraPurchaseOKMessageComposer);
return this.response;
}
}

View File

@ -13,7 +13,7 @@ public class CameraStorageUrlMessageComposer extends MessageComposer {
@Override
protected ServerMessage composeInternal() {
this.response.init(Outgoing.CameraStorageUrlMessageComposer);
this.response.init(Outgoing.cameraStorageUrlMessageComposer);
this.response.appendString(this.URL);
return this.response;
}

View File

@ -15,7 +15,7 @@ public class CompetitionStatusMessageComposer extends MessageComposer {
@Override
protected ServerMessage composeInternal() {
this.response.init(Outgoing.CompetitionStatusMessageComposer);
this.response.init(Outgoing.competitionStatusMessageComposer);
this.response.appendBoolean(this.unknownBoolean);
this.response.appendString(this.unknownString);
return this.response;

View File

@ -7,7 +7,7 @@ import com.eu.habbo.messages.outgoing.Outgoing;
public class ThumbnailStatusMessageComposer extends MessageComposer {
@Override
protected ServerMessage composeInternal() {
this.response.init(Outgoing.ThumbnailStatusMessageComposer);
this.response.init(Outgoing.thumbnailStatusMessageComposer);
return this.response;
}
}

View File

@ -21,7 +21,7 @@ public class ApproveNameMessageComposer extends MessageComposer {
@Override
protected ServerMessage composeInternal() {
this.response.init(Outgoing.ApproveNameMessageComposer);
this.response.init(Outgoing.approveNameMessageComposer);
this.response.appendInt(this.type);
this.response.appendString(this.value);
return this.response;

View File

@ -13,7 +13,7 @@ public class BuildersClubFurniCountMessageComposer extends MessageComposer {
@Override
protected ServerMessage composeInternal() {
this.response.init(Outgoing.BuildersClubFurniCountMessageComposer);
this.response.init(Outgoing.buildersClubFurniCountMessageComposer);
this.response.appendInt(this.mode);
return this.response;
}

View File

@ -13,7 +13,7 @@ public class BundleDiscountRulesetMessageComposer extends MessageComposer {
@Override
protected ServerMessage composeInternal() {
this.response.init(Outgoing.BundleDiscountRulesetMessageComposer);
this.response.init(Outgoing.bundleDiscountRulesetMessageComposer);
this.response.appendInt(MAXIMUM_ALLOWED_ITEMS);
this.response.appendInt(DISCOUNT_BATCH_SIZE);

View File

@ -32,7 +32,7 @@ public class CatalogPageMessageComposer extends MessageComposer {
@Override
protected ServerMessage composeInternal() {
this.response.init(Outgoing.CatalogPageMessageComposer);
this.response.init(Outgoing.catalogPageMessageComposer);
this.response.appendInt(this.page.getId());
this.response.appendString(this.mode);
this.page.serialize(this.response);

View File

@ -30,7 +30,7 @@ public class CatalogPagesListComposer extends MessageComposer {
try {
List<CatalogPage> pages = Emulator.getGameEnvironment().getCatalogManager().getCatalogPages(-1, this.habbo);
this.response.init(Outgoing.CatalogPagesListComposer);
this.response.init(Outgoing.catalogPagesListComposer);
this.response.appendBoolean(true);
this.response.appendInt(0);

View File

@ -7,7 +7,7 @@ import com.eu.habbo.messages.outgoing.Outgoing;
public class CatalogPublishedMessageComposer extends MessageComposer {
@Override
protected ServerMessage composeInternal() {
this.response.init(Outgoing.CatalogPublishedMessageComposer);
this.response.init(Outgoing.catalogPublishedMessageComposer);
this.response.appendBoolean(false);
return this.response;
}

View File

@ -26,7 +26,7 @@ public class ClubGiftInfoComposer extends MessageComposer {
@Override
protected ServerMessage composeInternal() {
this.response.init(Outgoing.ClubGiftInfoComposer);
this.response.init(Outgoing.clubGiftInfoComposer);
this.response.appendInt(this.daysTillNextGift); //Days Until Next Gift
this.response.appendInt(this.availableGifts); //Gift Selectable

View File

@ -7,7 +7,7 @@ import com.eu.habbo.messages.outgoing.Outgoing;
public class GiftReceiverNotFoundComposer extends MessageComposer {
@Override
protected ServerMessage composeInternal() {
this.response.init(Outgoing.GiftReceiverNotFoundComposer);
this.response.init(Outgoing.giftReceiverNotFoundComposer);
return this.response;
}
}

View File

@ -15,7 +15,7 @@ public class GiftWrappingConfigurationComposer extends MessageComposer {
@Override
protected ServerMessage composeInternal() {
this.response.init(Outgoing.GiftWrappingConfigurationComposer);
this.response.init(Outgoing.giftWrappingConfigurationComposer);
this.response.appendBoolean(true);
this.response.appendInt(Emulator.getConfig().getInt("hotel.gifts.special.price", 2));

View File

@ -20,7 +20,7 @@ public class HabboClubOffersMessageComposer extends MessageComposer {
@Override
protected ServerMessage composeInternal() {
this.response.init(Outgoing.HabboClubOffersMessageComposer);
this.response.init(Outgoing.habboClubOffersMessageComposer);
List<ClubOffer> offers = Emulator.getGameEnvironment().getCatalogManager().getClubOffers();
this.response.appendInt(offers.size());

View File

@ -7,7 +7,7 @@ import com.eu.habbo.messages.outgoing.Outgoing;
public class LimitedEditionSoldOutComposer extends MessageComposer {
@Override
protected ServerMessage composeInternal() {
this.response.init(Outgoing.LimitedEditionSoldOutComposer);
this.response.init(Outgoing.limitedEditionSoldOutComposer);
return this.response;
}
}

View File

@ -17,7 +17,7 @@ public class NotEnoughBalanceMessageComposer extends MessageComposer {
@Override
protected ServerMessage composeInternal() {
this.response.init(Outgoing.NotEnoughBalanceMessageComposer);
this.response.init(Outgoing.notEnoughBalanceMessageComposer);
this.response.appendBoolean(this.isCredits);
this.response.appendBoolean(this.isPixels);
this.response.appendInt(this.pointsType);

View File

@ -16,7 +16,7 @@ public class PetReceivedMessageComposer extends MessageComposer {
@Override
protected ServerMessage composeInternal() {
this.response.init(Outgoing.PetReceivedMessageComposer);
this.response.init(Outgoing.petReceivedMessageComposer);
this.response.appendBoolean(this.gift);
this.pet.serialize(this.response);
return this.response;

View File

@ -14,7 +14,7 @@ public class ProductOfferComposer extends MessageComposer {
@Override
protected ServerMessage composeInternal() {
this.response.init(Outgoing.ProductOfferComposer);
this.response.init(Outgoing.productOfferComposer);
this.item.serialize(this.response);
return this.response;
}

View File

@ -16,7 +16,7 @@ public class PurchaseErrorMessageComposer extends MessageComposer {
@Override
protected ServerMessage composeInternal() {
this.response.init(Outgoing.PurchaseErrorMessageComposer);
this.response.init(Outgoing.purchaseErrorMessageComposer);
this.response.appendInt(this.error);
return this.response;
}

View File

@ -16,7 +16,7 @@ public class PurchaseNotAllowedMessageComposer extends MessageComposer {
@Override
protected ServerMessage composeInternal() {
this.response.init(Outgoing.PurchaseNotAllowedMessageComposer);
this.response.init(Outgoing.purchaseNotAllowedMessageComposer);
this.response.appendInt(this.code);
return this.response;
}

View File

@ -18,7 +18,7 @@ public class PurchaseOKMessageComposer extends MessageComposer {
@Override
protected ServerMessage composeInternal() {
this.response.init(Outgoing.PurchaseOKMessageComposer);
this.response.init(Outgoing.purchaseOKMessageComposer);
if (this.catalogItem != null) {
this.catalogItem.serialize(this.response);
} else {

View File

@ -16,7 +16,7 @@ public class RecyclerFinishedComposer extends MessageComposer {
@Override
protected ServerMessage composeInternal() {
this.response.init(Outgoing.RecyclerFinishedComposer);
this.response.init(Outgoing.recyclerFinishedComposer);
this.response.appendInt(this.code);
this.response.appendInt(0); //prize ID.
return this.response;

View File

@ -12,7 +12,7 @@ import java.util.Map;
public class RecyclerPrizesComposer extends MessageComposer {
@Override
protected ServerMessage composeInternal() {
this.response.init(Outgoing.RecyclerPrizesComposer);
this.response.init(Outgoing.recyclerPrizesComposer);
this.response.appendInt(Emulator.getGameEnvironment().getCatalogManager().prizes.size());
for (Map.Entry<Integer, THashSet<Item>> map : Emulator.getGameEnvironment().getCatalogManager().prizes.entrySet()) {
this.response.appendInt(map.getKey());

View File

@ -7,7 +7,7 @@ import com.eu.habbo.messages.outgoing.Outgoing;
public class RecyclerStatusComposer extends MessageComposer {
@Override
protected ServerMessage composeInternal() {
this.response.init(Outgoing.RecyclerStatusComposer);
this.response.init(Outgoing.recyclerStatusComposer);
this.response.appendInt(1);
this.response.appendInt(0);
return this.response;

View File

@ -29,7 +29,7 @@ public class ScrSendKickbackInfoMessageComposer extends MessageComposer {
@Override
protected ServerMessage composeInternal() {
this.response.init(Outgoing.ScrSendKickbackInfoMessageComposer);
this.response.init(Outgoing.scrSendKickbackInfoMessageComposer);
this.response.appendInt(this.currentHcStreak); // currentHcStreak (days)
this.response.appendString(this.firstSubDate); // firstSubscriptionDate (dd-mm-yyyy)
this.response.appendDouble(this.kickbackPercentage); // kickbackPercentage (e.g. 0.1 for 10%)

View File

@ -19,7 +19,7 @@ public class SellablePetPalettesMessageComposer extends MessageComposer {
protected ServerMessage composeInternal() {
if (this.petRaces == null)
return null;
this.response.init(Outgoing.SellablePetPalettesMessageComposer);
this.response.init(Outgoing.sellablePetPalettesMessageComposer);
this.response.appendString(this.petName);
this.response.appendInt(this.petRaces.size());
for (PetRace race : this.petRaces) {

View File

@ -18,7 +18,7 @@ public class TargetedOfferComposer extends MessageComposer {
@Override
protected ServerMessage composeInternal() {
this.response.init(Outgoing.TargetedOfferComposer);
this.response.init(Outgoing.targetedOfferComposer);
HabboOfferPurchase purchase = HabboOfferPurchase.getOrCreate(this.habbo, this.offer.getId());
this.offer.serialize(this.response, purchase);
return this.response;

View File

@ -16,7 +16,7 @@ public class VoucherRedeemErrorMessageComposer extends MessageComposer {
@Override
protected ServerMessage composeInternal() {
this.response.init(Outgoing.VoucherRedeemErrorMessageComposer);
this.response.init(Outgoing.voucherRedeemErrorMessageComposer);
this.response.appendString(this.code + "");
return this.response;
}

View File

@ -7,7 +7,7 @@ import com.eu.habbo.messages.outgoing.Outgoing;
public class VoucherRedeemOkMessageComposer extends MessageComposer {
@Override
protected ServerMessage composeInternal() {
this.response.init(Outgoing.VoucherRedeemOkMessageComposer);
this.response.init(Outgoing.voucherRedeemOkMessageComposer);
this.response.appendString("");
this.response.appendString("");
return this.response;

View File

@ -21,7 +21,7 @@ public class MarketPlaceOwnOffersComposer extends MessageComposer {
@Override
protected ServerMessage composeInternal() {
this.response.init(Outgoing.MarketPlaceOwnOffersComposer);
this.response.init(Outgoing.marketPlaceOwnOffersComposer);
this.response.appendInt(this.habbo.getInventory().getSoldPriceTotal());
this.response.appendInt(this.habbo.getInventory().getMarketplaceItems().size());

View File

@ -24,7 +24,7 @@ public class MarketplaceBuyOfferResultComposer extends MessageComposer {
@Override
protected ServerMessage composeInternal() {
this.response.init(Outgoing.MarketplaceBuyOfferResultComposer);
this.response.init(Outgoing.marketplaceBuyOfferResultComposer);
this.response.appendInt(this.errorCode); //result
this.response.appendInt(this.unknown); //newOfferId
this.response.appendInt(this.offerId); //newPrice

View File

@ -21,7 +21,7 @@ public class MarketplaceCanMakeOfferResult extends MessageComposer {
@Override
protected ServerMessage composeInternal() {
this.response.init(Outgoing.MarketplaceCanMakeOfferResult);
this.response.init(Outgoing.marketplaceCanMakeOfferResult);
this.response.appendInt(this.errorCode);
this.response.appendInt(this.valueA);
this.response.appendInt(this.valueB);

View File

@ -16,7 +16,7 @@ public class MarketplaceCancelOfferResultComposer extends MessageComposer {
@Override
protected ServerMessage composeInternal() {
this.response.init(Outgoing.MarketplaceCancelOfferResultComposer);
this.response.init(Outgoing.marketplaceCancelOfferResultComposer);
this.response.appendInt(this.offer.getOfferId());
this.response.appendBoolean(this.success);
return this.response;

View File

@ -7,7 +7,7 @@ import com.eu.habbo.messages.outgoing.Outgoing;
public class MarketplaceConfigurationComposer extends MessageComposer {
@Override
protected ServerMessage composeInternal() {
this.response.init(Outgoing.MarketplaceConfigurationComposer);
this.response.init(Outgoing.marketplaceConfigurationComposer);
this.response.appendBoolean(true);
this.response.appendInt(1); //Commision Percentage.
this.response.appendInt(10); //Credits

View File

@ -14,7 +14,7 @@ public class MarketplaceItemStatsComposer extends MessageComposer {
@Override
protected ServerMessage composeInternal() {
this.response.init(Outgoing.MarketplaceItemStatsComposer);
this.response.init(Outgoing.marketplaceItemStatsComposer);
MarketPlace.serializeItemInfo(this.itemId, this.response);
return this.response;
}

View File

@ -18,7 +18,7 @@ public class MarketplaceMakeOfferResult extends MessageComposer {
@Override
protected ServerMessage composeInternal() {
this.response.init(Outgoing.MarketplaceMakeOfferResult);
this.response.init(Outgoing.marketplaceMakeOfferResult);
this.response.appendInt(this.code);
return this.response;
}

View File

@ -17,7 +17,7 @@ public class MarketplaceOffersComposer extends MessageComposer {
@Override
protected ServerMessage composeInternal() {
this.response.init(Outgoing.MarketplaceOffersComposer);
this.response.init(Outgoing.marketplaceOffersComposer);
int total = 0;
this.response.appendInt(this.offers.size());

View File

@ -20,7 +20,7 @@ public class CraftableProductsComposer extends MessageComposer {
@Override
protected ServerMessage composeInternal() {
this.response.init(Outgoing.CraftableProductsComposer);
this.response.init(Outgoing.craftableProductsComposer);
this.response.appendInt(this.recipes.size());
for (CraftingRecipe recipe : this.recipes) {

View File

@ -17,7 +17,7 @@ public class CraftingRecipeComposer extends MessageComposer {
@Override
protected ServerMessage composeInternal() {
this.response.init(Outgoing.CraftingRecipeComposer);
this.response.init(Outgoing.craftingRecipeComposer);
this.response.appendInt(this.recipe.getIngredients().size());
for (Map.Entry<Item, Integer> ingredient : this.recipe.getIngredients().entrySet()) {

View File

@ -15,7 +15,7 @@ public class CraftingRecipesAvailableComposer extends MessageComposer {
@Override
protected ServerMessage composeInternal() {
this.response.init(Outgoing.CraftingRecipesAvailableComposer);
this.response.init(Outgoing.craftingRecipesAvailableComposer);
this.response.appendInt((this.found ? -1 : 0) + this.count);
this.response.appendBoolean(this.found);
return this.response;

View File

@ -21,7 +21,7 @@ public class CraftingResultComposer extends MessageComposer {
@Override
protected ServerMessage composeInternal() {
this.response.init(Outgoing.CraftingResultComposer);
this.response.init(Outgoing.craftingResultComposer);
this.response.appendBoolean(this.succes); //succes

View File

@ -27,7 +27,7 @@ public class CampaignCalendarDataMessageComposer extends MessageComposer {
@Override
protected ServerMessage composeInternal() {
this.response.init(Outgoing.CampaignCalendarDataMessageComposer);
this.response.init(Outgoing.campaignCalendarDataMessageComposer);
this.response.appendString(this.eventName);
this.response.appendString(this.campaignImage);
this.response.appendInt(this.currentDay);

View File

@ -20,7 +20,7 @@ public class CampaignCalendarDoorOpenedMessageComposer extends MessageComposer {
@Override
protected ServerMessage composeInternal() {
this.response.init(Outgoing.CampaignCalendarDoorOpenedMessageComposer);
this.response.init(Outgoing.campaignCalendarDoorOpenedMessageComposer);
this.response.appendBoolean(this.visible);
String className = "";

View File

@ -15,7 +15,7 @@ public class GotMysteryBoxPrizeMessageComposer extends MessageComposer {
@Override
protected ServerMessage composeInternal() {
this.response.init(Outgoing.GotMysteryBoxPrizeMessageComposer);
this.response.init(Outgoing.gotMysteryBoxPrizeMessageComposer);
this.response.appendString(this.type);
this.response.appendInt(this.itemId);
return this.response;

View File

@ -7,7 +7,7 @@ import com.eu.habbo.messages.outgoing.Outgoing;
public class MysteryBoxClosingComposer extends MessageComposer {
@Override
protected ServerMessage composeInternal() {
this.response.init(Outgoing.MysteryBoxClosingComposer);
this.response.init(Outgoing.mysteryBoxClosingComposer);
return this.response;
}
}

View File

@ -7,7 +7,7 @@ import com.eu.habbo.messages.outgoing.Outgoing;
public class MysteryBoxStartComposer extends MessageComposer {
@Override
protected ServerMessage composeInternal() {
this.response.init(Outgoing.MysteryBoxStartComposer);
this.response.init(Outgoing.mysteryBoxStartComposer);
return this.response;
}
}

View File

@ -13,7 +13,7 @@ public class AchievementResolutionCompletedMessageComposer extends MessageCompos
@Override
protected ServerMessage composeInternal() {
this.response.init(Outgoing.AchievementResolutionCompletedMessageComposer);
this.response.init(Outgoing.achievementResolutionCompletedMessageComposer);
this.response.appendString(this.badge);
this.response.appendString(this.badge);
return this.response;

View File

@ -23,7 +23,7 @@ public class AchievementResolutionProgressMessageComposer extends MessageCompose
@Override
protected ServerMessage composeInternal() {
this.response.init(Outgoing.AchievementResolutionProgressMessageComposer);
this.response.init(Outgoing.achievementResolutionProgressMessageComposer);
this.response.appendInt(this.stuffId);
this.response.appendInt(this.achievementId);
this.response.appendString(this.achievementName);

View File

@ -8,7 +8,7 @@ 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
this.response.init(Outgoing.AchievementResolutionsMessageComposer);
this.response.init(Outgoing.achievementResolutionsMessageComposer);
this.response.appendInt(230); //reward ID or item id? (stuffId)
this.response.appendInt(2); //count

View File

@ -14,7 +14,7 @@ public class RoomEntryTileMessageComposer extends MessageComposer {
@Override
protected ServerMessage composeInternal() {
this.response.init(Outgoing.RoomEntryTileMessageComposer);
this.response.init(Outgoing.roomEntryTileMessageComposer);
this.response.appendInt(this.room.getLayout().getDoorX());
this.response.appendInt(this.room.getLayout().getDoorY());
this.response.appendInt(this.room.getLayout().getDoorDirection());

View File

@ -16,7 +16,7 @@ public class RoomOccupiedTilesMessageComposer extends MessageComposer {
@Override
protected ServerMessage composeInternal() {
this.response.init(Outgoing.RoomOccupiedTilesMessageComposer);
this.response.init(Outgoing.roomOccupiedTilesMessageComposer);
THashSet<RoomTile> tileList = this.room.getLockedTiles();

View File

@ -16,7 +16,7 @@ public class FindFriendsProcessResultComposer extends MessageComposer {
@Override
protected ServerMessage composeInternal() {
this.response.init(Outgoing.FindFriendsProcessResultComposer);
this.response.init(Outgoing.findFriendsProcessResultComposer);
this.response.appendInt(this.errorCode);
return this.response;
}

View File

@ -18,7 +18,7 @@ public class FollowFriendFailedComposer extends MessageComposer {
@Override
protected ServerMessage composeInternal() {
this.response.init(Outgoing.FollowFriendFailedComposer);
this.response.init(Outgoing.followFriendFailedComposer);
this.response.appendInt(this.errorCode);
return this.response;
}

View File

@ -28,7 +28,7 @@ public class FriendListFragmentMessageComposer extends MessageComposer {
@Override
protected ServerMessage composeInternal() {
try {
this.response.init(Outgoing.FriendListFragmentMessageComposer);
this.response.init(Outgoing.friendListFragmentMessageComposer);
this.response.appendInt(this.totalPages);
this.response.appendInt(this.pageIndex);

View File

@ -25,7 +25,7 @@ public class FriendNotificationComposer extends MessageComposer {
@Override
protected ServerMessage composeInternal() {
this.response.init(Outgoing.FriendNotificationComposer);
this.response.init(Outgoing.friendNotificationComposer);
this.response.appendString(this.userId + "");
this.response.appendInt(this.type);
this.response.appendString(this.data);

View File

@ -15,7 +15,7 @@ public class FriendRequestsComposer extends MessageComposer {
@Override
protected ServerMessage composeInternal() {
this.response.init(Outgoing.FriendRequestsComposer);
this.response.init(Outgoing.friendRequestsComposer);
synchronized (this.habbo.getMessenger().getFriendRequests()) {
this.response.appendInt(this.habbo.getMessenger().getFriendRequests().size());

View File

@ -26,7 +26,7 @@ public class HabboSearchResultComposer extends MessageComposer {
@Override
protected ServerMessage composeInternal() {
this.response.init(Outgoing.HabboSearchResultComposer);
this.response.init(Outgoing.habboSearchResultComposer);
List<MessengerBuddy> u = new ArrayList<>();
for (MessengerBuddy buddy : this.users) {

View File

@ -18,7 +18,7 @@ public class MessengerErrorComposer extends MessageComposer {
@Override
protected ServerMessage composeInternal() {
this.response.init(Outgoing.MessengerErrorComposer);
this.response.init(Outgoing.messengerErrorComposer);
this.response.appendInt(0);
this.response.appendInt(this.errorCode);
return this.response;

View File

@ -20,7 +20,7 @@ public class MessengerInitComposer extends MessageComposer {
@Override
protected ServerMessage composeInternal() {
this.response.init(Outgoing.MessengerInitComposer);
this.response.init(Outgoing.messengerInitComposer);
if (this.habbo.hasPermission("acc_infinite_friends")) {
this.response.appendInt(Integer.MAX_VALUE);
this.response.appendInt(1337);

View File

@ -26,7 +26,7 @@ public class NewConsoleMessageComposer extends MessageComposer {
@Override
protected ServerMessage composeInternal() {
this.response.init(Outgoing.NewConsoleMessageComposer);
this.response.init(Outgoing.newConsoleMessageComposer);
this.response.appendInt(this.toId);
this.response.appendString(this.message.getMessage());
this.response.appendInt(Emulator.getIntUnixTimestamp() - this.message.getTimestamp());

View File

@ -1,24 +1,24 @@
package com.eu.habbo.messages.outgoing.friends;
import com.eu.habbo.habbohotel.users.Habbo;
import com.eu.habbo.habbohotel.users.HabboInfo;
import com.eu.habbo.messages.ServerMessage;
import com.eu.habbo.messages.outgoing.MessageComposer;
import com.eu.habbo.messages.outgoing.Outgoing;
public class NewFriendRequestComposer extends MessageComposer {
private final Habbo habbo;
private final HabboInfo habbo;
public NewFriendRequestComposer(Habbo habbo) {
public NewFriendRequestComposer(HabboInfo habbo) {
this.habbo = habbo;
}
@Override
protected ServerMessage composeInternal() {
this.response.init(Outgoing.NewFriendRequestComposer);
this.response.init(Outgoing.newFriendRequestComposer);
this.response.appendInt(this.habbo.getHabboInfo().getId());
this.response.appendString(this.habbo.getHabboInfo().getUsername());
this.response.appendString(this.habbo.getHabboInfo().getLook());
this.response.appendInt(this.habbo.getId());
this.response.appendString(this.habbo.getUsername());
this.response.appendString(this.habbo.getLook());
return this.response;
}

View File

@ -19,7 +19,7 @@ public class RemoveFriendComposer extends MessageComposer {
@Override
protected ServerMessage composeInternal() {
this.response.init(Outgoing.FriendListUpdateComposer);
this.response.init(Outgoing.friendListUpdateComposer);
this.response.appendInt(0);
this.response.appendInt(this.unfriendIds.size());

View File

@ -15,7 +15,7 @@ public class RoomInviteComposer extends MessageComposer {
@Override
protected ServerMessage composeInternal() {
this.response.init(Outgoing.RoomInviteComposer);
this.response.init(Outgoing.roomInviteComposer);
this.response.appendInt(this.userId);
this.response.appendString(this.message);
return this.response;

View File

@ -18,7 +18,7 @@ public class RoomInviteErrorComposer extends MessageComposer {
@Override
protected ServerMessage composeInternal() {
this.response.init(Outgoing.RoomInviteErrorComposer);
this.response.init(Outgoing.roomInviteErrorComposer);
this.response.appendInt(this.errorCode);
this.response.appendInt(this.buddies.size());
this.buddies.forEach(new TObjectProcedure<MessengerBuddy>() {

View File

@ -33,7 +33,7 @@ public class UpdateFriendComposer extends MessageComposer {
@Override
protected ServerMessage composeInternal() {
this.response.init(Outgoing.FriendListUpdateComposer);
this.response.init(Outgoing.friendListUpdateComposer);
if (this.habbo != null && !this.habbo.getHabboInfo().getMessengerCategories().isEmpty()) {
List<MessengerCategory> messengerCategories = this.habbo.getHabboInfo().getMessengerCategories();

View File

@ -15,7 +15,7 @@ public class Game2AccountGameStatusMessageComposer extends MessageComposer {
@Override
protected ServerMessage composeInternal() {
this.response.init(Outgoing.Game2AccountGameStatusMessageComposer);
this.response.init(Outgoing.game2AccountGameStatusMessageComposer);
this.response.appendInt(this.gameId);
this.response.appendInt(this.gamesLeft);
this.response.appendInt(1);

View File

@ -18,7 +18,7 @@ public class GameCenterGameComposer extends MessageComposer {
@Override
protected ServerMessage composeInternal() {
this.response.init(Outgoing.GameStatusMessageComposer);
this.response.init(Outgoing.gameStatusMessageComposer);
this.response.appendInt(this.gameId);
this.response.appendInt(this.status);
return this.response;

View File

@ -8,7 +8,7 @@ import com.eu.habbo.messages.outgoing.Outgoing;
public class GameListMessageComposer extends MessageComposer {
@Override
protected ServerMessage composeInternal() {
this.response.init(Outgoing.GameListMessageComposer);
this.response.init(Outgoing.gameListMessageComposer);
this.response.appendInt(2);//Count
this.response.appendInt(0);

View File

@ -13,7 +13,7 @@ public class JoinedQueueMessageComposer extends MessageComposer {
@Override
protected ServerMessage composeInternal() {
this.response.init(Outgoing.JoinedQueueMessageComposer);
this.response.init(Outgoing.joinedQueueMessageComposer);
this.response.appendInt(this.gameId);
return this.response;
}

View File

@ -7,7 +7,7 @@ import com.eu.habbo.messages.outgoing.Outgoing;
public class LeftQueueMessageComposer extends MessageComposer {
@Override
protected ServerMessage composeInternal() {
this.response.init(Outgoing.LeftQueueMessageComposer);
this.response.init(Outgoing.leftQueueMessageComposer);
this.response.appendInt(3);
return this.response;
}

View File

@ -19,7 +19,7 @@ public class LoadGameMessageComposer extends MessageComposer {
@Override
protected ServerMessage composeInternal() {
this.response.init(Outgoing.LoadGameMessageComposer);
this.response.init(Outgoing.loadGameMessageComposer);
if (this.game == 3) {
this.response.appendInt(3);

View File

@ -7,7 +7,7 @@ import com.eu.habbo.messages.outgoing.Outgoing;
public class LoadGameUrlMessageComposer extends MessageComposer {
@Override
protected ServerMessage composeInternal() {
this.response.init(Outgoing.LoadGameUrlMessageComposer);
this.response.init(Outgoing.loadGameUrlMessageComposer);
this.response.appendInt(4);
this.response.appendString("1351418858673");
this.response.appendString("http://images.habbo.com/speedway/200912/index.html?accessToken=ff5d09d1-ef22-4ee5-8b1b-8260d13d0d6f&gameServerHost=localhost&gameServerPort=30000&socketPolicyPort=30000");

View File

@ -7,7 +7,7 @@ import com.eu.habbo.messages.outgoing.Outgoing;
public class UnloadGameMessageComposer extends MessageComposer {
@Override
protected ServerMessage composeInternal() {
this.response.init(Outgoing.UnloadGameMessageComposer);
this.response.init(Outgoing.unloadGameMessageComposer);
this.response.appendInt(3);
this.response.appendString("basejump");
return this.response;

View File

@ -13,7 +13,7 @@ public class ClubGiftNotificationComposer extends MessageComposer {
@Override
protected ServerMessage composeInternal() {
this.response.init(Outgoing.ClubGiftNotificationComposer);
this.response.init(Outgoing.clubGiftNotificationComposer);
this.response.appendInt(this.count);
return this.response;
}

View File

@ -7,7 +7,7 @@ import com.eu.habbo.messages.outgoing.Outgoing;
public class MiniMailUnreadCountComposer extends MessageComposer {
@Override
protected ServerMessage composeInternal() {
this.response.init(Outgoing.MiniMailUnreadCountComposer);
this.response.init(Outgoing.miniMailUnreadCountComposer);
this.response.appendInt(0);
return this.response;
}

View File

@ -19,7 +19,7 @@ public class BotErrorComposer extends MessageComposer {
@Override
protected ServerMessage composeInternal() {
this.response.init(Outgoing.BotErrorComposer);
this.response.init(Outgoing.botErrorComposer);
this.response.appendInt(this.errorCode);
return this.response;
}

View File

@ -19,7 +19,7 @@ public class CustomUserNotificationMessageComposer extends MessageComposer {
@Override
protected ServerMessage composeInternal() {
this.response.init(Outgoing.CustomUserNotificationMessageComposer);
this.response.init(Outgoing.customUserNotificationMessageComposer);
this.response.appendInt(this.type);
return this.response;
}

View File

@ -21,7 +21,7 @@ public class GenericErrorComposer extends MessageComposer {
@Override
protected ServerMessage composeInternal() {
this.response.init(Outgoing.GenericErrorComposer);
this.response.init(Outgoing.genericErrorComposer);
this.response.appendInt(this.errorCode);
return this.response;
}

View File

@ -18,7 +18,7 @@ public class HabboBroadcastMessageComposer extends MessageComposer {
@Override
protected ServerMessage composeInternal() {
this.response.init(Outgoing.HabboBroadcastMessageComposer);
this.response.init(Outgoing.habboBroadcastMessageComposer);
this.response.appendString(this.message);

View File

@ -15,7 +15,7 @@ public class HotelClosedAndOpensComposer extends MessageComposer {
@Override
protected ServerMessage composeInternal() {
this.response.init(Outgoing.HotelClosedAndOpensComposer);
this.response.init(Outgoing.hotelClosedAndOpensComposer);
this.response.appendInt(this.hour);
this.response.appendInt(this.minute);
return this.response;

View File

@ -17,7 +17,7 @@ public class HotelClosesAndWillOpenAtComposer extends MessageComposer {
@Override
protected ServerMessage composeInternal() {
this.response.init(Outgoing.HotelClosesAndWillOpenAtComposer);
this.response.init(Outgoing.hotelClosesAndWillOpenAtComposer);
this.response.appendInt(this.hour);
this.response.appendInt(this.minute);
this.response.appendBoolean(this.disconnected);

View File

@ -13,7 +13,7 @@ public class HotelWillCloseInMinutesComposer extends MessageComposer {
@Override
protected ServerMessage composeInternal() {
this.response.init(Outgoing.HotelWillCloseInMinutesComposer);
this.response.init(Outgoing.hotelWillCloseInMinutesComposer);
this.response.appendInt(this.minutes);
return this.response;
}

View File

@ -23,7 +23,7 @@ public class MOTDNotificationComposer extends MessageComposer {
@Override
protected ServerMessage composeInternal() {
this.response.init(Outgoing.MOTDNotificationComposer);
this.response.init(Outgoing.mOTDNotificationComposer);
this.response.appendInt(this.messages.length + this.newMessages.size());
for (String s : this.messages) {

View File

@ -15,7 +15,7 @@ public class MaintenanceStatusMessageComposer extends MessageComposer {
@Override
protected ServerMessage composeInternal() {
this.response.init(Outgoing.MaintenanceStatusMessageComposer);
this.response.init(Outgoing.maintenanceStatusMessageComposer);
this.response.appendBoolean(true);
this.response.appendInt(this.closeInMinutes);
this.response.appendInt(this.reopenInMinutes);

View File

@ -15,7 +15,7 @@ public class ModeratorCautionComposer extends MessageComposer {
@Override
protected ServerMessage composeInternal() {
this.response.init(Outgoing.ModeratorCautionComposer);
this.response.init(Outgoing.moderatorCautionComposer);
this.response.appendString(this.message);
this.response.appendString(this.link);
return this.response;

Some files were not shown because too many files have changed in this diff Show More