Skip to content

Commit

Permalink
1.5.2
Browse files Browse the repository at this point in the history
  • Loading branch information
ToxicStoxm committed May 3, 2023
1 parent 8f3584c commit afd4159
Show file tree
Hide file tree
Showing 14 changed files with 1,028 additions and 11 deletions.
24 changes: 22 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>com.x_tornado10</groupId>
<artifactId>craftiservi</artifactId>
<version>1.5.1</version>
<version>1.5.2</version>
<packaging>jar</packaging>

<name>Craftiservi</name>
Expand Down Expand Up @@ -41,7 +41,7 @@
</goals>
<configuration>
<createDependencyReducedPom>false</createDependencyReducedPom>
<outputFile>F:\PVP-Server\plugins\${project.artifactId}-Bukkit-${project.version}.jar</outputFile>
<outputFile>F:\Minecraft-Test-Servers\PVP-Server\plugins\${project.artifactId}-Bukkit-${project.version}.jar</outputFile>
</configuration>
</execution>
</executions>
Expand Down Expand Up @@ -73,5 +73,25 @@
<version>1.19.2-R0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>net.kyori</groupId>
<artifactId>text-api</artifactId>
<version>3.0.4</version>
</dependency>
<dependency>
<groupId>net.kyori</groupId>
<artifactId>text-adapter-bukkit</artifactId>
<version>3.0.6</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
<version>2.20.0</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.20.0</version>
</dependency>
</dependencies>
</project>
51 changes: 51 additions & 0 deletions src/main/java/com/x_tornado10/chat/filters/CustomFilter.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
package com.x_tornado10.chat.filters;

import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.Marker;
import org.apache.logging.log4j.core.LogEvent;
import org.apache.logging.log4j.core.Logger;
import org.apache.logging.log4j.core.filter.AbstractFilter;
import org.apache.logging.log4j.message.Message;

//https://github.com/4drian3d/LogFilter/blob/main/common/src/main/java/me/adrianed/logfilter/common/filter/CustomFilter.java
public abstract class CustomFilter extends AbstractFilter {
protected CustomFilter() {}

@Override
public Result filter(final LogEvent event){
return event == null ? Result.NEUTRAL : logResult(event.getMessage().getFormattedMessage());
}

@Override
public Result filter(final Logger logger, final Level level, final Marker marker, final Message msg,
final Throwable t) {
Result result = t != null ? logResult(t.getMessage()) : Result.NEUTRAL;
if (msg != null) {
if (result == Result.DENY) return result;
return logResult(msg.getFormattedMessage());
}
return Result.NEUTRAL;
}

@Override
public Result filter(final Logger logger, final Level level, final Marker marker, final String msg,
final Object... params) {
return logResult(msg);
}

@Override
public Result filter(final Logger logger, final Level level, final Marker marker, final Object msg,
final Throwable t) {
Result result = t != null ? logResult(t.getMessage()) : Result.NEUTRAL;
if (msg != null) {
if(result == Result.DENY) return result;
return logResult(msg.toString());
}
return Result.NEUTRAL;
}

protected abstract Result logResult(String string);

public abstract String getName();

}
39 changes: 39 additions & 0 deletions src/main/java/com/x_tornado10/chat/filters/MsgFilter.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
package com.x_tornado10.chat.filters;


import com.x_tornado10.craftiservi;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.core.Logger;

import java.util.List;

public final class MsgFilter extends CustomFilter {

private final craftiservi plugin = craftiservi.getInstance();
private final List<String> blockedStrings = plugin.getBlockedStrings();

public void registerFilter() {
Logger rootLogger = (Logger) LogManager.getRootLogger();
rootLogger.addFilter(this);
}

@Override
protected Result logResult(String string) {

for (String str : blockedStrings) {

if (string.contains(str)) {

return Result.DENY;
}

}

return Result.NEUTRAL;
}

@Override
public String getName() {
return null;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
restore_meta.setDisplayName("§aRestore Inventory");

List<String> restore_lore = new ArrayList<>();
restore_lore.add(7Restors the saved Inventory and drops the items of your current inventory!");
restore_lore.add(7Restores the saved Inventory and drops the items of your current inventory!");
restore_meta.setLore(restore_lore);
restore.setItemMeta(restore_meta);

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,151 @@
package com.x_tornado10.commands.open_gui_command;

import com.x_tornado10.craftiservi;
import com.x_tornado10.logger.Logger;
import com.x_tornado10.messages.PlayerMessages;
import org.bukkit.Material;
import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.ItemMeta;

import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;

public class OpenGUICommand implements CommandExecutor {

private final craftiservi plugin = craftiservi.getInstance();
private final Logger logger = plugin.getCustomLogger();
private final PlayerMessages plmsg = plugin.getPlayerMessages();

@Override
public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {

if (!(sender instanceof Player)) {

logger.info("Only Players can run this command!");

return true;
}

Player p = (Player) sender;

if (args.length == 1) {

String args0 = args[0];
String[] parts = args0.split("_");

if (parts.length != 2) {

sendUsage(p);
return true;

}

String key = parts[0].trim();
String sid = parts[1].trim();

switch (key) {
case "GUI" -> {
if (isStringInt(sid)) {

int id = Integer.parseInt(sid);

HashMap<Integer, Inventory> invs_review = plugin.getInvs_review();

if (!invs_review.containsKey(id)) {

plmsg.msg(p, "Invalid GUI_ID! (GUI_" + id + ")");
break;

}

Inventory inv = invs_review.get(id);

ItemStack approve = new ItemStack(Material.GREEN_CONCRETE);
ItemStack deny = new ItemStack(Material.RED_CONCRETE);
ItemStack gui_id = new ItemStack(Material.BOOK);

ItemMeta approve_meta = approve.getItemMeta();
ItemMeta deny_meta = deny.getItemMeta();
ItemMeta gui_id_meta = gui_id.getItemMeta();

String approve_displayname = "§aApprove request";
String deny_displayname = "§cDeny request";
String gui_id_dispalyname = "§bGUI_ID";

List<String> approve_lore = new ArrayList<>();
List<String> deny_lore = new ArrayList<>();
List<String> gui_id_lore = new ArrayList<>();

approve_lore.add("§7Approve the request and close this inventory");
deny_lore.add("§7Deny the request and close this inventory");
gui_id_lore.add("§7ID: " + id);

approve_meta.setDisplayName(approve_displayname);
approve_meta.setLore(approve_lore);

deny_meta.setDisplayName(deny_displayname);
deny_meta.setLore(deny_lore);

gui_id_meta.setDisplayName(gui_id_dispalyname);
gui_id_meta.setLore(gui_id_lore);

approve.setItemMeta(approve_meta);
deny.setItemMeta(deny_meta);
gui_id.setItemMeta(gui_id_meta);


inv.setItem(53, deny);
inv.setItem(52, approve);
inv.setItem(51, gui_id);

p.openInventory(inv);

invs_review.remove(id);

} else {

sendUsage(p);

}
}
case "Placeholder" -> {}
default -> sendUsage(p);
}

} else {

sendUsage(p);

}

return true;
}

private void sendUsage(Player p) {

plmsg.msg(p,"Usage: /opengui GUI_ID");

}


public boolean isStringInt(String s)
{
try {

Integer.parseInt(s);
return true;

} catch (NumberFormatException ex) {

return false;

}
}

}
Loading

0 comments on commit afd4159

Please sign in to comment.