Skip to content

Commit

Permalink
Start lightweight.mdx rewrite
Browse files Browse the repository at this point in the history
  • Loading branch information
@ItsNature
ItsNature committed Sep 18, 2024
1 parent f100606 commit 0ca8856
Show file tree
Hide file tree
Showing 3 changed files with 201 additions and 163 deletions.
34 changes: 17 additions & 17 deletions ...src/main/java/com/lunarclient/apollo/example/json/listeners/ApolloPlayerJsonListener.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,26 +48,26 @@ public class ApolloPlayerJsonListener implements Listener {
);

// Module Id -> Option key -> Object
private static final Table<String, String, Object> PROPERTIES = HashBasedTable.create();
private static final Table<String, String, Object> CONFIG_MODULE_PROPERTIES = HashBasedTable.create();

static {
// Module Options that the client needs to notified about, these properties are sent with the enable module packet
// While using the Apollo plugin this would be equivalent to modifying the config.yml
PROPERTIES.put("combat", "disable-miss-penalty", false);
PROPERTIES.put("server_rule", "competitive-game", false);
PROPERTIES.put("server_rule", "competitive-commands", Arrays.asList("/server", "/servers", "/hub"));
PROPERTIES.put("server_rule", "disable-shaders", false);
PROPERTIES.put("server_rule", "disable-chunk-reloading", false);
PROPERTIES.put("server_rule", "disable-broadcasting", false);
PROPERTIES.put("server_rule", "anti-portal-traps", true);
PROPERTIES.put("server_rule", "override-brightness", false);
PROPERTIES.put("server_rule", "brightness", 50);
PROPERTIES.put("server_rule", "override-nametag-render-distance", false);
PROPERTIES.put("server_rule", "nametag-render-distance", 64);
PROPERTIES.put("server_rule", "override-max-chat-length", false);
PROPERTIES.put("server_rule", "max-chat-length", 256);
PROPERTIES.put("tnt_countdown", "tnt-ticks", 80);
PROPERTIES.put("waypoint", "server-handles-waypoints", false);
CONFIG_MODULE_PROPERTIES.put("combat", "disable-miss-penalty", false);
CONFIG_MODULE_PROPERTIES.put("server_rule", "competitive-game", false);
CONFIG_MODULE_PROPERTIES.put("server_rule", "competitive-commands", Arrays.asList("/server", "/servers", "/hub"));
CONFIG_MODULE_PROPERTIES.put("server_rule", "disable-shaders", false);
CONFIG_MODULE_PROPERTIES.put("server_rule", "disable-chunk-reloading", false);
CONFIG_MODULE_PROPERTIES.put("server_rule", "disable-broadcasting", false);
CONFIG_MODULE_PROPERTIES.put("server_rule", "anti-portal-traps", true);
CONFIG_MODULE_PROPERTIES.put("server_rule", "override-brightness", false);
CONFIG_MODULE_PROPERTIES.put("server_rule", "brightness", 50);
CONFIG_MODULE_PROPERTIES.put("server_rule", "override-nametag-render-distance", false);
CONFIG_MODULE_PROPERTIES.put("server_rule", "nametag-render-distance", 64);
CONFIG_MODULE_PROPERTIES.put("server_rule", "override-max-chat-length", false);
CONFIG_MODULE_PROPERTIES.put("server_rule", "max-chat-length", 256);
CONFIG_MODULE_PROPERTIES.put("tnt_countdown", "tnt-ticks", 80);
CONFIG_MODULE_PROPERTIES.put("waypoint", "server-handles-waypoints", false);
}

private static final String REGISTER_CHANNEL = "lunar:apollo"; // Used for detecting whether the player supports Apollo
Expand Down Expand Up @@ -113,7 +113,7 @@ private boolean isPlayerRunningApollo(Player player) {
}

private void onApolloRegister(Player player) {
JsonPacketUtil.enableModules(player, APOLLO_MODULES, PROPERTIES);
JsonPacketUtil.enableModules(player, APOLLO_MODULES, CONFIG_MODULE_PROPERTIES);

this.playersRunningApollo.add(player.getUniqueId());
player.sendMessage("You are using LunarClient!");
Expand Down
48 changes: 23 additions & 25 deletions ...c/main/java/com/lunarclient/apollo/example/proto/listeners/ApolloPlayerProtoListener.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,36 +50,34 @@ public class ApolloPlayerProtoListener implements Listener {
);

// Module Id -> Option key -> Value
private static final Table<String, String, Value> PROPERTIES = HashBasedTable.create();
private static final Table<String, String, Value> CONFIG_MODULE_PROPERTIES = HashBasedTable.create();

static {
// Module Options that the client needs to notified about, these properties are sent with the enable module packet
// While using the Apollo plugin this would be equivalent to modifying the config.yml
PROPERTIES.put("combat", "disable-miss-penalty", Value.newBuilder().setBoolValue(false).build());
PROPERTIES.put("server_rule", "competitive-game", Value.newBuilder().setBoolValue(false).build());
PROPERTIES.put("server_rule", "competitive-commands", Value.newBuilder().setListValue(
CONFIG_MODULE_PROPERTIES.put("combat", "disable-miss-penalty", Value.newBuilder().setBoolValue(false).build());
CONFIG_MODULE_PROPERTIES.put("server_rule", "competitive-game", Value.newBuilder().setBoolValue(false).build());
CONFIG_MODULE_PROPERTIES.put("server_rule", "competitive-commands", Value.newBuilder().setListValue(
ListValue.newBuilder().addAllValues(Arrays.asList(
Value.newBuilder().setStringValue("/server").build(),
Value.newBuilder().setStringValue("/servers").build(),
Value.newBuilder().setStringValue("/hub").build()))
.build()
).build());
PROPERTIES.put("server_rule", "disable-shaders", Value.newBuilder().setBoolValue(false).build());
PROPERTIES.put("server_rule", "disable-chunk-reloading", Value.newBuilder().setBoolValue(false).build());
PROPERTIES.put("server_rule", "disable-broadcasting", Value.newBuilder().setBoolValue(false).build());
PROPERTIES.put("server_rule", "anti-portal-traps", Value.newBuilder().setBoolValue(true).build());
PROPERTIES.put("server_rule", "override-brightness", Value.newBuilder().setBoolValue(false).build());
PROPERTIES.put("server_rule", "brightness", Value.newBuilder().setNumberValue(50).build());
PROPERTIES.put("server_rule", "override-nametag-render-distance", Value.newBuilder().setBoolValue(false).build());
PROPERTIES.put("server_rule", "nametag-render-distance", Value.newBuilder().setNumberValue(64).build());
PROPERTIES.put("server_rule", "override-max-chat-length", Value.newBuilder().setBoolValue(false).build());
PROPERTIES.put("server_rule", "max-chat-length", Value.newBuilder().setNumberValue(256).build());
PROPERTIES.put("tnt_countdown", "tnt-ticks", Value.newBuilder().setNumberValue(80).build());
PROPERTIES.put("waypoint", "server-handles-waypoints", Value.newBuilder().setBoolValue(false).build());
CONFIG_MODULE_PROPERTIES.put("server_rule", "disable-shaders", Value.newBuilder().setBoolValue(false).build());
CONFIG_MODULE_PROPERTIES.put("server_rule", "disable-chunk-reloading", Value.newBuilder().setBoolValue(false).build());
CONFIG_MODULE_PROPERTIES.put("server_rule", "disable-broadcasting", Value.newBuilder().setBoolValue(false).build());
CONFIG_MODULE_PROPERTIES.put("server_rule", "anti-portal-traps", Value.newBuilder().setBoolValue(true).build());
CONFIG_MODULE_PROPERTIES.put("server_rule", "override-brightness", Value.newBuilder().setBoolValue(false).build());
CONFIG_MODULE_PROPERTIES.put("server_rule", "brightness", Value.newBuilder().setNumberValue(50).build());
CONFIG_MODULE_PROPERTIES.put("server_rule", "override-nametag-render-distance", Value.newBuilder().setBoolValue(false).build());
CONFIG_MODULE_PROPERTIES.put("server_rule", "nametag-render-distance", Value.newBuilder().setNumberValue(64).build());
CONFIG_MODULE_PROPERTIES.put("server_rule", "override-max-chat-length", Value.newBuilder().setBoolValue(false).build());
CONFIG_MODULE_PROPERTIES.put("server_rule", "max-chat-length", Value.newBuilder().setNumberValue(256).build());
CONFIG_MODULE_PROPERTIES.put("tnt_countdown", "tnt-ticks", Value.newBuilder().setNumberValue(80).build());
CONFIG_MODULE_PROPERTIES.put("waypoint", "server-handles-waypoints", Value.newBuilder().setBoolValue(false).build());
}

private static final String APOLLO_CHANNEL = "lunar:apollo"; // Used for detecting whether the player supports Apollo

private final ApolloExamplePlugin plugin;

private final Set<UUID> playersRunningApollo = new HashSet<>();
Expand All @@ -88,9 +86,9 @@ public ApolloPlayerProtoListener(ApolloExamplePlugin plugin) {
this.plugin = plugin;

Messenger messenger = Bukkit.getServer().getMessenger();
messenger.registerOutgoingPluginChannel(plugin, APOLLO_CHANNEL);
messenger.registerIncomingPluginChannel(plugin, APOLLO_CHANNEL, new ApolloRoundtripProtoListener());
messenger.registerIncomingPluginChannel(plugin, APOLLO_CHANNEL, new ApolloPacketReceiveProtoListener());
messenger.registerOutgoingPluginChannel(plugin, "lunar:apollo");
messenger.registerIncomingPluginChannel(plugin, "lunar:apollo", new ApolloRoundtripProtoListener());
messenger.registerIncomingPluginChannel(plugin, "lunar:apollo", new ApolloPacketReceiveProtoListener());

Bukkit.getPluginManager().registerEvents(this, plugin);
}
Expand All @@ -99,15 +97,15 @@ public void disable() {
this.playersRunningApollo.clear();

Messenger messenger = Bukkit.getServer().getMessenger();
messenger.unregisterOutgoingPluginChannel(this.plugin, APOLLO_CHANNEL);
messenger.unregisterIncomingPluginChannel(this.plugin, APOLLO_CHANNEL);
messenger.unregisterOutgoingPluginChannel(this.plugin, "lunar:apollo");
messenger.unregisterIncomingPluginChannel(this.plugin, "lunar:apollo");

HandlerList.unregisterAll(this);
}

@EventHandler
private void onRegisterChannel(PlayerRegisterChannelEvent event) {
if (!event.getChannel().equalsIgnoreCase(APOLLO_CHANNEL)) {
if (!event.getChannel().equalsIgnoreCase("lunar:apollo")) {
return;
}

Expand All @@ -119,7 +117,7 @@ private boolean isPlayerRunningApollo(Player player) {
}

private void onApolloRegister(Player player) {
ProtobufPacketUtil.enableModules(player, APOLLO_MODULES, PROPERTIES);
ProtobufPacketUtil.enableModules(player, APOLLO_MODULES, CONFIG_MODULE_PROPERTIES);

this.playersRunningApollo.add(player.getUniqueId());
player.sendMessage("You are using LunarClient!");
Expand Down
Loading

1 comment on commit 0ca8856

@LunarClientBot
Copy link
Collaborator

@LunarClientBot LunarClientBot commented on 0ca8856 Sep 18, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

📄 Documentation Deployment

Status:❌ Failed
Environment:preview
URL:Pending...

Please sign in to comment.