Skip to content
This repository was archived by the owner on Nov 28, 2025. It is now read-only.

Commit 186853a

Browse files
committed
rename JOIN event
1 parent 3523510 commit 186853a

File tree

7 files changed

+7
-7
lines changed

7 files changed

+7
-7
lines changed

1.16_combat-6/src/main/java/io/github/axolotlclient/bridge/impl/Bridge.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public Identifier getFabricId() {
5353
});
5454

5555
ClientPlayConnectionEvents.INIT.register((handler, client) ->
56-
Events.JOIN.invoker().accept(new Events.ServerJoinInfo(handler.getConnection().getAddress().toString())));
56+
Events.BEGIN_JOIN_SERVER.invoker().accept(new Events.ServerJoinInfo(handler.getConnection().getAddress().toString())));
5757

5858
ClientPlayConnectionEvents.JOIN.register((clientPlayNetworkHandler, sender, minecraftClient) -> Events.CONNECTION_PLAY_READY.invoker().run());
5959
ClientPlayConnectionEvents.DISCONNECT.register((clientPlayNetworkHandler, minecraftClient) -> Events.DISCONNECT.invoker().run());

1.20/src/main/java/io/github/axolotlclient/bridge/impl/Bridge.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public Identifier getFabricId() {
5555
}
5656
});
5757
ClientPlayConnectionEvents.INIT.register((handler, client) ->
58-
Events.JOIN.invoker().accept(new Events.ServerJoinInfo(Objects.requireNonNull(handler.getServerInfo()).address)));
58+
Events.BEGIN_JOIN_SERVER.invoker().accept(new Events.ServerJoinInfo(Objects.requireNonNull(handler.getServerInfo()).address)));
5959
ClientPlayConnectionEvents.JOIN.register((clientPlayNetworkHandler, sender, minecraftClient) -> Events.CONNECTION_PLAY_READY.invoker().run());
6060
ClientPlayConnectionEvents.DISCONNECT.register((clientPlayNetworkHandler, minecraftClient) -> Events.DISCONNECT.invoker().run());
6161

1.21/src/main/java/io/github/axolotlclient/bridge/impl/Bridge.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public Identifier getFabricId() {
5656
});
5757

5858
ClientPlayConnectionEvents.INIT.register((handler, client) ->
59-
Events.JOIN.invoker().accept(new Events.ServerJoinInfo(Objects.requireNonNull(handler.getServerInfo()).address)));
59+
Events.BEGIN_JOIN_SERVER.invoker().accept(new Events.ServerJoinInfo(Objects.requireNonNull(handler.getServerInfo()).address)));
6060
ClientPlayConnectionEvents.JOIN.register((clientPlayNetworkHandler, sender, minecraftClient) -> Events.CONNECTION_PLAY_READY.invoker().run());
6161
ClientPlayConnectionEvents.DISCONNECT.register((clientPlayNetworkHandler, minecraftClient) -> Events.DISCONNECT.invoker().run());
6262

1.8.9/src/main/java/io/github/axolotlclient/mixin/ConnectScreenMixin.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,6 @@ public abstract class ConnectScreenMixin {
3535
@Inject(method = "connect", at = @At("HEAD"))
3636
private void axolotlclient$onServerJoin(String address, int port, CallbackInfo ci) {
3737
// TODO: the semantics for this event isn't super clear
38-
Events.JOIN.invoker().accept(new Events.ServerJoinInfo(address));
38+
Events.BEGIN_JOIN_SERVER.invoker().accept(new Events.ServerJoinInfo(address));
3939
}
4040
}

1.latest/src/main/java/io/github/axolotlclient/bridge/impl/Bridge.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public static void init() {
4545
(ResourceManagerReloadListener) resourceManager -> Events.END_RESOURCE_RELOAD.invoker().run());
4646

4747
ClientPlayConnectionEvents.INIT.register((handler, client) ->
48-
Events.JOIN.invoker().accept(new Events.ServerJoinInfo(Objects.requireNonNull(handler.getServerData()).ip)));
48+
Events.BEGIN_JOIN_SERVER.invoker().accept(new Events.ServerJoinInfo(Objects.requireNonNull(handler.getServerData()).ip)));
4949
ClientPlayConnectionEvents.JOIN.register((clientPlayNetworkHandler, sender, minecraftClient) -> Events.CONNECTION_PLAY_READY.invoker().run());
5050
ClientPlayConnectionEvents.DISCONNECT.register((clientPlayNetworkHandler, minecraftClient) -> Events.DISCONNECT.invoker().run());
5151

common/src/main/java/io/github/axolotlclient/bridge/events/Events.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public class Events {
5656
public record ServerJoinInfo(@Nullable String address) {
5757
}
5858

59-
public static final EventBus<Consumer<ServerJoinInfo>> JOIN = EventBus.broadcast1();
59+
public static final EventBus<Consumer<ServerJoinInfo>> BEGIN_JOIN_SERVER = EventBus.broadcast1();
6060
public static final EventBus<Runnable> DISCONNECT = EventBus.broadcast0();
6161

6262
public static final EventBus<Consumer<ReceiveChatMessageEvent>> RECEIVE_CHAT_MESSAGE = EventBus.broadcast1();

common/src/main/java/io/github/axolotlclient/util/FeatureDisablerCommon.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ public void init() {
6868
setServers(Freelook.getInstance().enabled, () -> Freelook.getInstance().needsDisabling(), "hypixel", "mineplex", "gommehd", "nucleoid", "mccisland");
6969
setServers(((ToggleSprintHud) HudManagerCommon.getInstance().get(ToggleSprintHud.ID)).toggleSneak, NONE, "hypixel");
7070

71-
Events.JOIN.register(info -> {
71+
Events.BEGIN_JOIN_SERVER.register(info -> {
7272
if (info.address() != null) {
7373
onServerJoin(info.address());
7474
}

0 commit comments

Comments
 (0)