Skip to content

idk, it was long ago #2

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

Open
czmdav wants to merge 1 commit into
base: master
Choose a base branch
from
Open

idk, it was long ago #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 15 additions & 2 deletions src/main/java/com/teszvesz/remover/ChunkLoadEv.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,12 @@
import lombok.val;
import lombok.var;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.Chunk;
import org.bukkit.Material;
import org.bukkit.block.ShulkerBox;
import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.ItemFrame;
import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
Expand All @@ -17,9 +20,19 @@

public class ChunkLoadEv implements Listener {

private boolean enabled = false;

@EventHandler
public void onChunkLoad(ChunkLoadEvent e){
processChunk(e.getChunk());
if (enabled) {
processChunk(e.getChunk());
}
}

public boolean enable(CommandSender sender, Command cmd, String label, String[] args) {
enabled = !enabled;
sender.sendMessage("Chunk processing on ChunkLoadEvent is " + (enabled ? ChatColor.GREEN + "enabled" : ChatColor.RED + "disabled"));
return false;
}

public static void processChunk(Chunk c) {
Expand All @@ -43,7 +56,7 @@ public static void processChunk(Chunk c) {

for (val m : MainPlugin.itemsList) {
if (i.contains(m)) {
Bukkit.getLogger().info("Removed: " + m.toString());
Bukkit.getLogger().info("Removed: " + m);
i.remove(m);
}
}
Expand Down
69 changes: 0 additions & 69 deletions src/main/java/com/teszvesz/remover/EnderChestRemove.java
View file
Open in desktop

This file was deleted.

69 changes: 48 additions & 21 deletions src/main/java/com/teszvesz/remover/InvRemove.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,13 @@
import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor;
import org.bukkit.command.CommandSender;
import org.bukkit.command.ConsoleCommandSender;
import org.bukkit.inventory.meta.BlockStateMeta;

import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
import java.util.concurrent.atomic.AtomicLong;

public class InvRemove implements CommandExecutor {

Expand All @@ -35,96 +37,121 @@ void removeAll(CommandSender sender) {
val openinv = (OpenInv) plugin.getServer().getPluginManager().getPlugin("OpenInv");
val TIMEOUT = 30; // 30 sec

TaskUtility.runWithTimingsAsync("inventory removal", () -> {
for (val p : Bukkit.getOfflinePlayers()) {
TaskUtility.runWithTimingsAsync(plugin, "inventory removal", () -> {
var checkpoint = System.currentTimeMillis() + 15000;
AtomicLong processedPlayerCount = new AtomicLong(0);
val op = Bukkit.getOfflinePlayers();
sender.sendMessage("processing of " + op.length + " players started...");
for (val p : op) {
try {
TaskUtility.waitForBukkitTask(plugin, () -> {
val player = openinv.loadPlayer(p);
if (player != null) {
sender.sendMessage(">" + p.getName() + " playerdata loaded...");
plugin.getLogger().info("loaded data for " + p.getName());
plugin.getLogger().info("processing inventory...");
val inv = player.getInventory();

for(val m : MainPlugin.itemsList){
inv.remove(m);
}

//ShulkerDelete

for (var i = 0; i < inv.getSize(); i++) {
val item = inv.getItem(i);
if(item != null) {
if (item.getItemMeta() instanceof BlockStateMeta) {
val im = (BlockStateMeta) item.getItemMeta();
if (im.getBlockState() instanceof ShulkerBox) {

val shulker = (ShulkerBox) im.getBlockState();

for(val m : MainPlugin.itemsList){
shulker.getInventory().remove(m);
}

im.setBlockState(shulker);
shulker.update();
item.setItemMeta(im);
inv.setItem(i, item);

}
}
}
}

plugin.getLogger().info("processing enderchest...");
val ender = player.getEnderChest();
for(val m : MainPlugin.itemsList){
ender.remove(m);
}
for (var i = 0; i < ender.getSize(); i++) {
val item = ender.getItem(i);
if(item != null) {
if (item.getItemMeta() instanceof BlockStateMeta) {
val im = (BlockStateMeta) item.getItemMeta();
if (im.getBlockState() instanceof ShulkerBox) {
val shulker = (ShulkerBox) im.getBlockState();
for(val m : MainPlugin.itemsList){
shulker.getInventory().remove(m);
}
im.setBlockState(shulker);
shulker.update();
item.setItemMeta(im);
ender.setItem(i, item);
}
}
}
}
//playervaults

plugin.getLogger().info("processing playervault...");
for(var i = 1; i <= 100; i++){
if(VaultManager.getInstance().vaultExists(player.getUniqueId().toString(),i)){
val pv = VaultManager.getInstance().getVault(player.getUniqueId().toString(), i);
if(pv != null){

for(val m : MainPlugin.itemsList){
pv.remove(m);
}


for (var j = 0; j < pv.getSize(); j++) {
val item = pv.getItem(j);
if(item != null) {
if (item.getItemMeta() instanceof BlockStateMeta) {
val im = (BlockStateMeta) item.getItemMeta();
if (im.getBlockState() instanceof ShulkerBox) {

val shulker = (ShulkerBox) im.getBlockState();

for(val m : MainPlugin.itemsList){
shulker.getInventory().remove(m);
}

im.setBlockState(shulker);
shulker.update();
item.setItemMeta(im);
pv.setItem(j, item);

}
}
}

}

VaultManager.getInstance().saveVault(pv, player.getUniqueId().toString(), i);
}
}
}

player.saveData();
openinv.unload(p);
processedPlayerCount.incrementAndGet();
}
}, TIMEOUT, TimeUnit.SECONDS);
Thread.sleep(50);
} catch (InterruptedException e) {
Thread.currentThread().interrupt();
break;
} catch (TimeoutException e) {
plugin.getLogger().warning("failed to process inventory of " + p.getName() + " in " + TIMEOUT + "s");
} catch (ExecutionException e) {
throw new RuntimeException(e);
plugin.getLogger().warning("failed to process inventory of " + p.getName());
e.printStackTrace();
}
if (checkpoint <= System.currentTimeMillis()) {
checkpoint = System.currentTimeMillis() + 15_000;
sender.sendMessage("processed " + processedPlayerCount.get() + " players...");
}
}
val msg = "Processed " + processedPlayerCount.get() + " players of " + op.length + " (" + (op.length-processedPlayerCount.get()) + " missed)";
plugin.getLogger().info(msg);
if (!(sender instanceof ConsoleCommandSender)) {
sender.sendMessage(msg);
}
return true;
});
Expand Down
11 changes: 6 additions & 5 deletions src/main/java/com/teszvesz/remover/MainPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.teszvesz.remover;


import lombok.val;
import org.bukkit.Material;
import org.bukkit.plugin.java.JavaPlugin;

Expand Down Expand Up @@ -114,13 +115,13 @@ public class MainPlugin extends JavaPlugin {

@Override
public void onEnable() {
val cl = new ChunkLoadEv();

getServer().getPluginManager().registerEvents(new ChunkLoadEv(), this);

this.getCommand("removefromchunk").setExecutor(new RemoveChunk(this));
this.getCommand("removefromenderchest").setExecutor(new EnderChestRemove(this));
this.getCommand("removefrominv").setExecutor(new InvRemove(this));
getServer().getPluginManager().registerEvents(cl, this);

getCommand("enablechunkremove").setExecutor(cl::enable);
getCommand("removefromchunk").setExecutor(new RemoveChunk(this));
getCommand("removefrominv").setExecutor(new InvRemove(this));
}

}
8 changes: 3 additions & 5 deletions src/main/java/com/teszvesz/remover/TaskUtility.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,17 +29,15 @@ public static void waitForBukkitTask(Plugin plugin, Runnable runnable, long time
completableFuture.get(timeout, timeUnit);
}

public static <T> CompletableFuture<T> runWithTimingsAsync(final String name, final Supplier<T> task) {
public static <T> CompletableFuture<T> runWithTimingsAsync(Plugin plugin, String name, Supplier<T> task) {
CompletableFuture<T> completableFuture = new CompletableFuture<>();
Thread thread = new Thread(() -> withTimings(name, () -> {
plugin.getServer().getScheduler().runTaskAsynchronously(plugin, () -> withTimings(name, () -> {
try {
completableFuture.complete(task.get());
} catch (Throwable t) {
completableFuture.completeExceptionally(t);
}
}), name);
thread.setDaemon(true);
thread.start();
}));
return completableFuture;
}

Expand Down
6 changes: 2 additions & 4 deletions src/main/resources/plugin.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,12 @@ depend:
- OpenInv

commands:
enablechunkremove:
permission: asd.yes.lol
removefromchunk:
description: RemoveStuffFromPlayerChunk
usage: /removefromchunk
permission: asd.yes.lol
removefromenderchest:
description: RemoveStuffFromPlayersEC
usage: /removefromenderchest
permission: asd.yes.lol
removefrominv:
description: RemoveStuffFromPlayersinv
usage: /removefrominv
Expand Down