Skip to content

Commit d21e46c

Browse files
committed
Remove ancient events which have been deprecated and marked for removal for a while now, pin events / base api to timestamped builds
1 parent 44fe404 commit d21e46c

13 files changed

Lines changed: 7 additions & 262 deletions

File tree

BREAKING_CHANGES.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
# Overview of breaking changes for THE MERGE
22

33
API
4+
- Removed ServerDefineCommandsEvent, which has been deprecated & marked for removal since 2023
5+
- Removed GeyserLoadResourcePacksEvent
46

57
Functionality
68
- geyser root commands now always have a permission attached to them, which is granted by default

api/src/main/java/org/geysermc/geyser/api/event/bedrock/ClientEmoteEvent.java

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -100,16 +100,4 @@ public boolean cancelled() {
100100
public void cancelled(boolean cancelled) {
101101
this.cancelled = cancelled;
102102
}
103-
104-
@Override
105-
@Deprecated
106-
public boolean isCancelled() {
107-
return cancelled();
108-
}
109-
110-
@Override
111-
@Deprecated
112-
public void setCancelled(boolean cancelled) {
113-
cancelled(cancelled);
114-
}
115103
}

api/src/main/java/org/geysermc/geyser/api/event/bedrock/SessionLoginEvent.java

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -89,18 +89,6 @@ public void cancelled(boolean cancelled, String disconnectReason) {
8989
this.disconnectReason = disconnectReason;
9090
}
9191

92-
@Override
93-
@Deprecated
94-
public boolean isCancelled() {
95-
return cancelled();
96-
}
97-
98-
@Override
99-
@Deprecated
100-
public void setCancelled(boolean cancelled) {
101-
cancelled(cancelled);
102-
}
103-
10492
@Deprecated
10593
public void setCancelled(boolean cancelled, String disconnectReason) {
10694
cancelled(cancelled, disconnectReason);

api/src/main/java/org/geysermc/geyser/api/event/connection/ConnectionRequestEvent.java

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -104,28 +104,4 @@ public boolean cancelled() {
104104
public void cancelled(boolean cancelled) {
105105
this.cancelled = cancelled;
106106
}
107-
108-
/**
109-
* The cancel status of this event. If this event is cancelled, the connection will be rejected.
110-
*
111-
* @return the cancel status of this event
112-
* @deprecated use {@link #cancelled()} instead
113-
*/
114-
@Override
115-
@Deprecated(forRemoval = true)
116-
public boolean isCancelled() {
117-
return cancelled;
118-
}
119-
120-
/**
121-
* Sets the cancel status of this event. If this event is canceled, the connection will be rejected.
122-
*
123-
* @param cancelled the cancel status of this event.
124-
* @deprecated use {@link #cancelled(boolean)} instead
125-
*/
126-
@Override
127-
@Deprecated(forRemoval = true)
128-
public void setCancelled(boolean cancelled) {
129-
this.cancelled = cancelled;
130-
}
131107
}

api/src/main/java/org/geysermc/geyser/api/event/downstream/ServerDefineCommandsEvent.java

Lines changed: 0 additions & 96 deletions
This file was deleted.

api/src/main/java/org/geysermc/geyser/api/event/downstream/package-info.java

Lines changed: 0 additions & 29 deletions
This file was deleted.

api/src/main/java/org/geysermc/geyser/api/event/java/ServerDefineCommandsEvent.java

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -65,18 +65,6 @@ public void cancelled(boolean cancelled) {
6565
this.cancelled = cancelled;
6666
}
6767

68-
@Override
69-
@Deprecated
70-
public boolean isCancelled() {
71-
return cancelled();
72-
}
73-
74-
@Override
75-
@Deprecated
76-
public void setCancelled(boolean cancelled) {
77-
cancelled(cancelled);
78-
}
79-
8068
public interface CommandInfo {
8169
/**
8270
* Gets the name of the command.

api/src/main/java/org/geysermc/geyser/api/event/lifecycle/GeyserLoadResourcePacksEvent.java

Lines changed: 0 additions & 38 deletions
This file was deleted.

core/src/main/java/org/geysermc/geyser/entity/spawn/EntitySpawnContext.java

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -116,16 +116,6 @@ public boolean callServerSpawnEvent() {
116116
ServerSpawnEntityEvent event = new ServerSpawnEntityEvent(session) {
117117
private boolean cancelled = false;
118118

119-
@Override
120-
public boolean isCancelled() {
121-
return cancelled();
122-
}
123-
124-
@Override
125-
public void setCancelled(boolean cancelled) {
126-
cancelled(cancelled);
127-
}
128-
129119
@Override
130120
public boolean cancelled() {
131121
return cancelled || bedrockEntityDefinition == null;
@@ -245,16 +235,6 @@ public void cancelled(boolean cancelled) {
245235
this.cancelled = cancelled;
246236
}
247237

248-
@Override
249-
public boolean isCancelled() {
250-
return cancelled();
251-
}
252-
253-
@Override
254-
public void setCancelled(boolean cancelled) {
255-
cancelled(cancelled);
256-
}
257-
258238
@Override
259239
public void preSpawnConsumer(@NonNull Consumer<@NonNull GeyserEntity> consumer) {
260240
Objects.requireNonNull(consumer, "consumer cannot be null!");

core/src/main/java/org/geysermc/geyser/registry/loader/ResourcePackLoader.java

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
3131
import org.checkerframework.checker.nullness.qual.NonNull;
3232
import org.geysermc.geyser.GeyserImpl;
33-
import org.geysermc.geyser.api.event.lifecycle.GeyserLoadResourcePacksEvent;
3433
import org.geysermc.geyser.api.pack.PathPackCodec;
3534
import org.geysermc.geyser.api.pack.ResourcePack;
3635
import org.geysermc.geyser.api.pack.ResourcePackManifest;
@@ -120,13 +119,8 @@ public Map<UUID, ResourcePackHolder> load(Path directory) {
120119
resourcePacks.add(skullResourcePack);
121120
}
122121

123-
//noinspection deprecation - we know
124-
GeyserLoadResourcePacksEvent event = new GeyserLoadResourcePacksEvent(resourcePacks);
125-
GeyserImpl.getInstance().eventBus().fire(event);
126-
127122
GeyserDefineResourcePacksEventImpl defineEvent = new GeyserDefineResourcePacksEventImpl(packMap);
128-
129-
for (Path path : event.resourcePacks()) {
123+
for (Path path : resourcePacks) {
130124
try {
131125
defineEvent.register(readPack(path).build());
132126
} catch (Exception e) {

0 commit comments

Comments
 (0)