Skip to content

Signature strip confirmation #26

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
V1nc3ntWasTaken merged 4 commits into from
Sep 19, 2022
Merged

Signature strip confirmation #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3ae2569
Added a dynamic config
V1nc3ntWasTaken Sep 19, 2022
48f5110
Removed some leftover test code
V1nc3ntWasTaken Sep 19, 2022
ff0d4dc
Added a report protection message on login option
V1nc3ntWasTaken Sep 19, 2022
aa435d3
Merge branch 'main' into signature_strip_confirmation
V1nc3ntWasTaken Sep 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions 1.19.1/src/main/java/me/doclic/noencryption/PlayerListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
import io.netty.channel.ChannelPipeline;
import io.netty.channel.ChannelPromise;
import me.doclic.noencryption.compatibility.Compatibility;
import me.doclic.noencryption.config.ConfigurationHandler;
import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
Expand Down Expand Up @@ -40,6 +42,14 @@ public void write(ChannelHandlerContext channelHandlerContext, Object packet, Ch

});

if (ConfigurationHandler.getLoginProtectionMessage() != null) {
if (!ConfigurationHandler.getLoginProtectionMessage().trim().equals("")) {
player.sendMessage(
LegacyComponentSerializer.legacy('&').deserialize(ConfigurationHandler.getLoginProtectionMessage())
);
}
}

}

@EventHandler(priority = EventPriority.LOWEST)
Expand Down
11 changes: 10 additions & 1 deletion 1.19.1/src/main/java/me/doclic/noencryption/config/ConfigNodes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,16 @@ public enum ConfigNodes {
"# Note: Doesn't actually do anything, just here",
"# for show, and example",
"# Added in v3.0",
"# Default: false");
"# Default: false"),

LOGIN_PROTECTION_MESSAGE(null, "login_protection_message", "",
" ",
"# Displays a message to users when they log in that their messages are protected",
"# ",
"# Note: Leave blank to disable",
"# ",
"# Added in v3.0",
"# Default: BLANK");


private final String Notice;
Expand Down
4 changes: 4 additions & 0 deletions 1.19.1/src/main/java/me/doclic/noencryption/config/ConfigurationHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,10 @@ private static int getInt(ConfigNodes node) {
}
}

public static String getLoginProtectionMessage() {
return getString(ConfigNodes.LOGIN_PROTECTION_MESSAGE);
}

/* public static String getDBTablePrefix() {
return getString(ConfigNodes.DATABASE_TABLE_PREFIX);
}
Expand Down
10 changes: 10 additions & 0 deletions 1.19.2/src/main/java/me/doclic/noencryption/PlayerListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
import io.netty.channel.ChannelPipeline;
import io.netty.channel.ChannelPromise;
import me.doclic.noencryption.compatibility.Compatibility;
import me.doclic.noencryption.config.ConfigurationHandler;
import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
Expand Down Expand Up @@ -40,6 +42,14 @@ public void write(ChannelHandlerContext channelHandlerContext, Object packet, Ch

});

if (ConfigurationHandler.getLoginProtectionMessage() != null) {
if (!ConfigurationHandler.getLoginProtectionMessage().trim().equals("")) {
player.sendMessage(
LegacyComponentSerializer.legacy('&').deserialize(ConfigurationHandler.getLoginProtectionMessage())
);
}
}

}

@EventHandler(priority = EventPriority.LOWEST)
Expand Down
11 changes: 10 additions & 1 deletion 1.19.2/src/main/java/me/doclic/noencryption/config/ConfigNodes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,16 @@ public enum ConfigNodes {
"# Note: Doesn't actually do anything, just here",
"# for show, and example",
"# Added in v3.0",
"# Default: false");
"# Default: false"),

LOGIN_PROTECTION_MESSAGE(null, "login_protection_message", "",
" ",
"# Displays a message to users when they log in that their messages are protected",
"# ",
"# Note: Leave blank to disable",
"# ",
"# Added in v3.0",
"# Default: BLANK");


private final String Notice;
Expand Down
4 changes: 4 additions & 0 deletions 1.19.2/src/main/java/me/doclic/noencryption/config/ConfigurationHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,10 @@ private static int getInt(ConfigNodes node) {
}
}

public static String getLoginProtectionMessage() {
return getString(ConfigNodes.LOGIN_PROTECTION_MESSAGE);
}

/* public static String getDBTablePrefix() {
return getString(ConfigNodes.DATABASE_TABLE_PREFIX);
}
Expand Down
10 changes: 10 additions & 0 deletions 1.19/src/main/java/me/doclic/noencryption/PlayerListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
import io.netty.channel.ChannelPipeline;
import io.netty.channel.ChannelPromise;
import me.doclic.noencryption.compatibility.Compatibility;
import me.doclic.noencryption.config.ConfigurationHandler;
import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
Expand Down Expand Up @@ -40,6 +42,14 @@ public void write(ChannelHandlerContext channelHandlerContext, Object packet, Ch

});

if (ConfigurationHandler.getLoginProtectionMessage() != null) {
if (!ConfigurationHandler.getLoginProtectionMessage().trim().equals("")) {
player.sendMessage(
LegacyComponentSerializer.legacy('&').deserialize(ConfigurationHandler.getLoginProtectionMessage())
);
}
}

}

@EventHandler(priority = EventPriority.LOWEST)
Expand Down
11 changes: 10 additions & 1 deletion 1.19/src/main/java/me/doclic/noencryption/config/ConfigNodes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,16 @@ public enum ConfigNodes {
"# Note: Doesn't actually do anything, just here",
"# for show, and example",
"# Added in v3.0",
"# Default: false");
"# Default: false"),

LOGIN_PROTECTION_MESSAGE(null, "login_protection_message", "",
" ",
"# Displays a message to users when they log in that their messages are protected",
"# ",
"# Note: Leave blank to disable",
"# ",
"# Added in v3.0",
"# Default: BLANK");


private final String Notice;
Expand Down
4 changes: 4 additions & 0 deletions 1.19/src/main/java/me/doclic/noencryption/config/ConfigurationHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,10 @@ private static int getInt(ConfigNodes node) {
}
}

public static String getLoginProtectionMessage() {
return getString(ConfigNodes.LOGIN_PROTECTION_MESSAGE);
}

/* public static String getDBTablePrefix() {
return getString(ConfigNodes.DATABASE_TABLE_PREFIX);
}
Expand Down