Skip to content

Commit 4dcafc9

Browse files
jonesdevelopmentjonesdevelopment
committed
Remove leftover mentions of Sonar's "Fallback"
1 parent 7f2e910 commit 4dcafc9

36 files changed

+138
-138
lines changed

‎api/src/main/java/xyz/jonesdev/sonar/api/Sonar.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -152,11 +152,11 @@ public interface Sonar {
152152
}
153153

154154
/**
155-
* Gets the anti-bot handler (called "Fallback") for Sonar.
155+
* Gets the anti-bot handler for Sonar.
156156
*
157157
* @return The {@link AntiBot} instance.
158158
*/
159-
@NotNull default AntiBot getFallback() {
159+
@NotNull default AntiBot getAntiBot() {
160160
return AntiBot.INSTANCE;
161161
}
162162

‎api/src/main/java/xyz/jonesdev/sonar/api/antibot/ChannelPipelines.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@
1818
package xyz.jonesdev.sonar.api.antibot;
1919

2020
public interface ChannelPipelines {
21-
String FALLBACK_INACTIVE_LISTENER = "sonar-inactive-listener";
22-
String FALLBACK_INBOUND_HANDLER = "sonar-inbound-handler";
23-
String FALLBACK_FRAME_DECODER = "sonar-frame-decoder";
24-
String FALLBACK_FRAME_ENCODER = "sonar-frame-encoder";
25-
String FALLBACK_TIMEOUT = "sonar-timeout";
26-
String FALLBACK_PACKET_HANDLER = "sonar-packet-handler";
27-
String FALLBACK_PACKET_ENCODER = "sonar-packet-encoder";
28-
String FALLBACK_PACKET_DECODER = "sonar-packet-decoder";
29-
String FALLBACK_TAIL_EXCEPTIONS = "sonar-exception-tail";
30-
String FALLBACK_BANDWIDTH = "sonar-bandwidth-counter";
21+
String SONAR_INACTIVE_LISTENER = "sonar-inactive-listener";
22+
String SONAR_INBOUND_HANDLER = "sonar-inbound-handler";
23+
String SONAR_FRAME_DECODER = "sonar-frame-decoder";
24+
String SONAR_FRAME_ENCODER = "sonar-frame-encoder";
25+
String SONAR_TIMEOUT = "sonar-timeout";
26+
String SONAR_PACKET_HANDLER = "sonar-packet-handler";
27+
String SONAR_PACKET_ENCODER = "sonar-packet-encoder";
28+
String SONAR_PACKET_DECODER = "sonar-packet-decoder";
29+
String SONAR_TAIL_EXCEPTIONS = "sonar-exception-tail";
30+
String SONAR_BANDWIDTH = "sonar-bandwidth-counter";
3131
}

‎api/src/main/java/xyz/jonesdev/sonar/api/notification/ActionBarNotificationHandler.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,9 @@ public void handleNotification() {
5656
Placeholder.unparsed("animation", nextAnimation()),
5757
Placeholder.unparsed("process-cpu", Sonar.DECIMAL_FORMAT.format(getProcessCPUUsage())),
5858
Placeholder.unparsed("system-cpu", Sonar.DECIMAL_FORMAT.format(getSystemCPUUsage())),
59-
Placeholder.unparsed("queued", DECIMAL_FORMAT.format(Sonar.get0().getFallback().getQueue().getPlayers().size())),
60-
Placeholder.unparsed("verifying", DECIMAL_FORMAT.format(Sonar.get0().getFallback().getConnected().size())),
61-
Placeholder.unparsed("blacklisted", DECIMAL_FORMAT.format(Sonar.get0().getFallback().getBlacklist().estimatedSize())),
59+
Placeholder.unparsed("queued", DECIMAL_FORMAT.format(Sonar.get0().getAntiBot().getQueue().getPlayers().size())),
60+
Placeholder.unparsed("verifying", DECIMAL_FORMAT.format(Sonar.get0().getAntiBot().getConnected().size())),
61+
Placeholder.unparsed("blacklisted", DECIMAL_FORMAT.format(Sonar.get0().getAntiBot().getBlacklist().estimatedSize())),
6262
Placeholder.unparsed("total-joins", DECIMAL_FORMAT.format(Sonar.get0().getStatistics().getTotalPlayersJoined())),
6363
Placeholder.unparsed("logins-per-second", DECIMAL_FORMAT.format(Sonar.get0().getStatistics().getLoginsPerSecond())),
6464
Placeholder.unparsed("connections-per-second", DECIMAL_FORMAT.format(Sonar.get0().getStatistics().getConnectionsPerSecond())),

‎api/src/main/java/xyz/jonesdev/sonar/api/notification/ChatNotificationHandler.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,9 @@ public void handleNotification() {
5454
for (int i = 0; i < chatNotificationComponents.length; i++) {
5555
chatNotificationComponents[i] = MiniMessage.miniMessage().deserialize(chatNotification.get(i),
5656
Placeholder.component("prefix", Sonar.get0().getConfig().getPrefix()),
57-
Placeholder.unparsed("queued", DECIMAL_FORMAT.format(Sonar.get0().getFallback().getQueue().getPlayers().size())),
58-
Placeholder.unparsed("verifying", DECIMAL_FORMAT.format(Sonar.get0().getFallback().getConnected().size())),
59-
Placeholder.unparsed("blacklisted", DECIMAL_FORMAT.format(Sonar.get0().getFallback().getBlacklist().estimatedSize())),
57+
Placeholder.unparsed("queued", DECIMAL_FORMAT.format(Sonar.get0().getAntiBot().getQueue().getPlayers().size())),
58+
Placeholder.unparsed("verifying", DECIMAL_FORMAT.format(Sonar.get0().getAntiBot().getConnected().size())),
59+
Placeholder.unparsed("blacklisted", DECIMAL_FORMAT.format(Sonar.get0().getAntiBot().getBlacklist().estimatedSize())),
6060
Placeholder.unparsed("total-joins", DECIMAL_FORMAT.format(Sonar.get0().getStatistics().getTotalPlayersJoined())),
6161
Placeholder.unparsed("logins-per-second", DECIMAL_FORMAT.format(Sonar.get0().getStatistics().getLoginsPerSecond())),
6262
Placeholder.unparsed("connections-per-second", DECIMAL_FORMAT.format(Sonar.get0().getStatistics().getConnectionsPerSecond())),

‎api/src/main/java/xyz/jonesdev/sonar/api/tracker/AttackTracker.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ public static final class AttackStatistics {
5353

5454
public void checkIfUnderAttack() {
5555
final long joinsPerSecond = Sonar.get0().getStatistics().getLoginsPerSecond();
56-
final int verifyingPlayers = Sonar.get0().getFallback().getConnected().size();
57-
final int queuedPlayers = Sonar.get0().getFallback().getQueue().getPlayers().size();
56+
final int verifyingPlayers = Sonar.get0().getAntiBot().getConnected().size();
57+
final int queuedPlayers = Sonar.get0().getAntiBot().getQueue().getPlayers().size();
5858
final int minPlayers = Sonar.get0().getConfig().getMinPlayersForAttack();
5959

6060
if (joinsPerSecond > minPlayers // Check the number of bots/joins per second.
@@ -116,7 +116,7 @@ public void checkIfUnderAttack() {
116116
final String formattedDuration = String.format("%d minutes, %.0f seconds", minutes, seconds);
117117
final String startTimestamp = String.valueOf(currentAttack.duration.getStart() / 1000L);
118118
final String endTimestamp = String.valueOf(System.currentTimeMillis() / 1000L);
119-
final long blacklisted = Sonar.get0().getFallback().getBlacklist().estimatedSize();
119+
final long blacklisted = Sonar.get0().getAntiBot().getBlacklist().estimatedSize();
120120
// Calculate during-attack-statistics using their deltas
121121
final long totalVerified = Sonar.get0().getVerifiedPlayerController().getCache().size();
122122
final long verified = Math.max(totalVerified - currentAttack.successfulVerifications, 0);

‎bukkit/src/main/java/xyz/jonesdev/sonar/bukkit/SonarBukkit.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828
import org.jetbrains.annotations.Nullable;
2929
import xyz.jonesdev.sonar.api.SonarPlatform;
3030
import xyz.jonesdev.sonar.api.logger.LoggerWrapper;
31+
import xyz.jonesdev.sonar.bukkit.antibot.BukkitInjector;
3132
import xyz.jonesdev.sonar.bukkit.command.BukkitSonarCommand;
32-
import xyz.jonesdev.sonar.bukkit.fallback.FallbackBukkitInjector;
3333
import xyz.jonesdev.sonar.bukkit.listener.BukkitJoinListener;
3434
import xyz.jonesdev.sonar.common.boot.SonarBootstrap;
3535

@@ -108,8 +108,8 @@ public void enable() {
108108
Objects.requireNonNull(getPlugin().getCommand("sonar")).setExecutor(new BukkitSonarCommand());
109109

110110
// Try to inject into the server
111-
if (FallbackBukkitInjector.isLateBindEnabled()) {
112-
getPlugin().getServer().getScheduler().runTask(getPlugin(), FallbackBukkitInjector::inject);
111+
if (BukkitInjector.isLateBindEnabled()) {
112+
getPlugin().getServer().getScheduler().runTask(getPlugin(), BukkitInjector::inject);
113113
} else {
114114
getPlugin().getServer().getPluginManager().registerEvents(new BukkitJoinListener(), getPlugin());
115115
}

‎bukkit/src/main/java/xyz/jonesdev/sonar/bukkit/SonarBukkitPlugin.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,16 @@
1818
package xyz.jonesdev.sonar.bukkit;
1919

2020
import org.bukkit.plugin.java.JavaPlugin;
21-
import xyz.jonesdev.sonar.bukkit.fallback.FallbackBukkitInjector;
21+
import xyz.jonesdev.sonar.bukkit.antibot.BukkitInjector;
2222

2323
public final class SonarBukkitPlugin extends JavaPlugin {
2424
private SonarBukkit bootstrap;
2525

2626
@Override
2727
public void onLoad() {
2828
// Inject early if late-bind is disabled
29-
if (!FallbackBukkitInjector.isLateBindEnabled()) {
30-
FallbackBukkitInjector.inject();
29+
if (!BukkitInjector.isLateBindEnabled()) {
30+
BukkitInjector.inject();
3131
}
3232
}
3333

bukkit/src/main/java/xyz/jonesdev/sonar/bukkit/fallback/BukkitInboundHandler.java renamed to bukkit/src/main/java/xyz/jonesdev/sonar/bukkit/antibot/BukkitInboundHandler.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* along with this program. If not, see <https://www.gnu.org/licenses/>.
1616
*/
1717

18-
package xyz.jonesdev.sonar.bukkit.fallback;
18+
package xyz.jonesdev.sonar.bukkit.antibot;
1919

2020
import io.netty.buffer.ByteBuf;
2121
import io.netty.channel.ChannelHandler;
@@ -34,7 +34,7 @@
3434
import java.net.InetSocketAddress;
3535
import java.util.Objects;
3636

37-
import static xyz.jonesdev.sonar.api.antibot.ChannelPipelines.FALLBACK_INBOUND_HANDLER;
37+
import static xyz.jonesdev.sonar.api.antibot.ChannelPipelines.SONAR_INBOUND_HANDLER;
3838
import static xyz.jonesdev.sonar.common.protocol.packets.handshake.HandshakePacket.*;
3939

4040
final class BukkitInboundHandler extends InboundHandlerAdapter {
@@ -136,9 +136,9 @@ public void channelRead(final @NotNull ChannelHandlerContext ctx, final Object m
136136
byteBuf.readerIndex(originalReaderIndex);
137137
ctx.fireChannelRead(byteBuf.retain());
138138
// TODO: recode this?
139-
final ChannelHandler inboundHandler = ctx.pipeline().remove(FALLBACK_INBOUND_HANDLER);
139+
final ChannelHandler inboundHandler = ctx.pipeline().remove(SONAR_INBOUND_HANDLER);
140140
if (inboundHandler != null && channelRemovalListener != null) {
141-
channelRemovalListener.accept(ctx.pipeline(), FALLBACK_INBOUND_HANDLER, inboundHandler);
141+
channelRemovalListener.accept(ctx.pipeline(), SONAR_INBOUND_HANDLER, inboundHandler);
142142
}
143143
}, loginStart.getUsername(), socketAddress);
144144
byteBuf.release();

bukkit/src/main/java/xyz/jonesdev/sonar/bukkit/fallback/FallbackBukkitInjector.java renamed to bukkit/src/main/java/xyz/jonesdev/sonar/bukkit/antibot/BukkitInjector.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* along with this program. If not, see <https://www.gnu.org/licenses/>.
1616
*/
1717

18-
package xyz.jonesdev.sonar.bukkit.fallback;
18+
package xyz.jonesdev.sonar.bukkit.antibot;
1919

2020
import io.netty.channel.Channel;
2121
import io.netty.channel.ChannelFuture;
@@ -26,24 +26,24 @@
2626
import org.bukkit.Bukkit;
2727
import org.jetbrains.annotations.NotNull;
2828
import xyz.jonesdev.sonar.api.Sonar;
29-
import xyz.jonesdev.sonar.common.netty.FallbackInjectedChannelInitializer;
29+
import xyz.jonesdev.sonar.common.netty.SonarInjectedChannelInitializer;
3030
import xyz.jonesdev.sonar.common.util.exception.ReflectiveOperationException;
3131

3232
import java.lang.reflect.Field;
3333
import java.lang.reflect.Method;
3434
import java.lang.reflect.Modifier;
3535
import java.util.List;
3636

37-
import static xyz.jonesdev.sonar.api.antibot.ChannelPipelines.FALLBACK_INACTIVE_LISTENER;
38-
import static xyz.jonesdev.sonar.api.antibot.ChannelPipelines.FALLBACK_PACKET_DECODER;
37+
import static xyz.jonesdev.sonar.api.antibot.ChannelPipelines.SONAR_INACTIVE_LISTENER;
38+
import static xyz.jonesdev.sonar.api.antibot.ChannelPipelines.SONAR_PACKET_DECODER;
3939
import static xyz.jonesdev.sonar.bukkit.SonarBukkit.INITIALIZE_LISTENER;
4040

4141
// Check out these links if you want to see some more magic
4242
// https://github.com/retrooper/packetevents/blob/2.0/spigot/src/main/java/io/github/retrooper/packetevents/util/SpigotReflectionUtil.java
4343
// https://github.com/dmulloy2/ProtocolLib/blob/master/TinyProtocol/src/main/java/com/comphenix/tinyprotocol/TinyProtocol.java
4444
// https://github.com/ViaVersion/ViaVersion/blob/master/bukkit/src/main/java/com/viaversion/viaversion/bukkit/handlers/BukkitChannelInitializer.java
4545
@UtilityClass
46-
public class FallbackBukkitInjector {
46+
public class BukkitInjector {
4747
private final String LEGACY_NMS_PACKAGE;
4848
private final String OBC_PACKAGE;
4949

@@ -253,10 +253,10 @@ protected void initChannel(final @NotNull Channel channel) {
253253

254254
INITIALIZE_LISTENER.thenAccept(__ -> {
255255
try {
256-
childHandlerField.set(_bootstrap, new FallbackInjectedChannelInitializer(originalInitializer,
256+
childHandlerField.set(_bootstrap, new SonarInjectedChannelInitializer(originalInitializer,
257257
pipeline -> {
258-
pipeline.addAfter("splitter", FALLBACK_PACKET_DECODER, new BukkitInboundHandler());
259-
pipeline.addFirst(FALLBACK_INACTIVE_LISTENER, new ChannelInactiveListener());
258+
pipeline.addAfter("splitter", SONAR_PACKET_DECODER, new BukkitInboundHandler());
259+
pipeline.addFirst(SONAR_INACTIVE_LISTENER, new ChannelInactiveListener());
260260
}
261261
));
262262
} catch (IllegalAccessException exception) {

bukkit/src/main/java/xyz/jonesdev/sonar/bukkit/fallback/BukkitServerVersion.java renamed to bukkit/src/main/java/xyz/jonesdev/sonar/bukkit/antibot/BukkitServerVersion.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* along with this program. If not, see <https://www.gnu.org/licenses/>.
1616
*/
1717

18-
package xyz.jonesdev.sonar.bukkit.fallback;
18+
package xyz.jonesdev.sonar.bukkit.antibot;
1919

2020
import lombok.Getter;
2121

0 commit comments

Comments
 (0)