ChomeNS/chomens-bot-java
3
1
Fork 3
Code Issues Pull requests Projects Releases Packages Wiki Activity

improve + fit to my needs

Browse source
This commit is contained in:
Chayapak 2023-08-27 11:19:14 +07:00
parent dc6c159db3
commit 08137109f4
3 changed files with 20 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/main/java/land/chipmunk/chayapak/chomens_bot/commands/ValidateCommand.java
View file

@ -25,15 +25,8 @@ public class ValidateCommand extends Command {
final String hash = fullArgs[0]; final String hash = fullArgs[0];
if ( if (bot.hashing.isCorrectHash(hash, context.splitInput[0], context.sender)) return Component.text("Valid hash").color(NamedTextColor.GREEN);
hash.equals(bot.hashing.getHash(context.splitInput[0], context.sender, true)) || else if (bot.hashing.isCorrectOwnerHash(hash, context.splitInput[0], context.sender)) return Component.text("Valid OwnerHash").color(NamedTextColor.GREEN);
hash.equals(bot.hashing.getHash(context.splitInput[0], context.sender, false))
) return Component.text("Valid hash").color(NamedTextColor.GREEN);
else if (
hash.equals(bot.hashing.getOwnerHash(context.splitInput[0], context.sender, true)) ||
hash.equals(bot.hashing.getOwnerHash(context.splitInput[0], context.sender, false))
) return Component.text("Valid OwnerHash").color(NamedTextColor.GREEN);
return null; return null;
} }

7
src/main/java/land/chipmunk/chayapak/chomens_bot/plugins/CommandHandlerPlugin.java
View file

@ -143,11 +143,8 @@ public class CommandHandlerPlugin {
} else { } else {
if ( if (
command.trustLevel == TrustLevel.TRUSTED && command.trustLevel == TrustLevel.TRUSTED &&
// mess? !bot.hashing.isCorrectHash(userHash, splitInput[0], context.sender) &&
!userHash.equals(bot.hashing.getHash(splitInput[0], context.sender, true)) && !bot.hashing.isCorrectOwnerHash(userHash, splitInput[0], context.sender)
!userHash.equals(bot.hashing.getOwnerHash(splitInput[0], context.sender, true)) &&
!userHash.equals(bot.hashing.getHash(splitInput[0], context.sender, false)) &&
!userHash.equals(bot.hashing.getOwnerHash(splitInput[0], context.sender, false))
) return Component.text("Invalid hash").color(NamedTextColor.RED); ) return Component.text("Invalid hash").color(NamedTextColor.RED);
if ( if (

16
src/main/java/land/chipmunk/chayapak/chomens_bot/plugins/HashingPlugin.java
View file

@ -55,4 +55,20 @@ public class HashingPlugin {
) : ) :
hash; hash;
} }
public boolean isCorrectHash (String hash, String prefix, PlayerEntry sender) {
// removes reset section sign
if (hash.length() == (16 * 2 /* <-- don't forget, we have the section signs */) + 2 && hash.endsWith("§r")) hash = hash.substring(0, hash.length() - 2);
return hash.equals(getHash(prefix, sender, true)) ||
hash.equals(getHash(prefix, sender, false));
}
public boolean isCorrectOwnerHash (String hash, String prefix, PlayerEntry sender) {
// removes reset section sign
if (hash.length() == (16 * 2 /* <-- don't forget, we have the section signs */) + 2 && hash.endsWith("§r")) hash = hash.substring(0, hash.length() - 2);
return hash.equals(getOwnerHash(prefix, sender, true)) ||
hash.equals(getOwnerHash(prefix, sender, false));
}
} }