diff --git a/runelite-api/src/main/java/net/runelite/api/events/WorldLoad.java b/runelite-api/src/main/java/net/runelite/api/events/WorldLoad.java new file mode 100644 index 0000000000..4739bfd0b0 --- /dev/null +++ b/runelite-api/src/main/java/net/runelite/api/events/WorldLoad.java @@ -0,0 +1,37 @@ +/* + * Copyright (c) 2018, Adam + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR + * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ +package net.runelite.api.events; + +import lombok.Value; +import net.runelite.api.World; + +/** + * Event when a world is loaded for the world switcher + */ +@Value +public class WorldLoad +{ + private final World world; +} diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSWorldMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSWorldMixin.java index ec576dcf06..939cb10ed6 100644 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSWorldMixin.java +++ b/runelite-mixins/src/main/java/net/runelite/mixins/RSWorldMixin.java @@ -26,13 +26,20 @@ package net.runelite.mixins; import java.util.EnumSet; import net.runelite.api.WorldType; +import net.runelite.api.events.WorldLoad; +import net.runelite.api.mixins.FieldHook; import net.runelite.api.mixins.Inject; import net.runelite.api.mixins.Mixin; +import net.runelite.api.mixins.Shadow; +import net.runelite.rs.api.RSClient; import net.runelite.rs.api.RSWorld; @Mixin(RSWorld.class) public abstract class RSWorldMixin implements RSWorld { + @Shadow("clientInstance") + private static RSClient client; + @Inject @Override public EnumSet getTypes() @@ -46,4 +53,13 @@ public abstract class RSWorldMixin implements RSWorld { setMask(WorldType.toMask(types)); } + + @Inject + @FieldHook("playerCount") + public void playerCountChanged(int idx) + { + // playerCount is the last field updated + WorldLoad worldLoad = new WorldLoad(this); + client.getCallbacks().post(worldLoad); + } }