diff --git a/ansible/files/paper-config/plugins/Citadel/config.yml b/ansible/files/paper-config/plugins/Citadel/config.yml index c98c1495a..62eb27b16 100644 --- a/ansible/files/paper-config/plugins/Citadel/config.yml +++ b/ansible/files/paper-config/plugins/Citadel/config.yml @@ -26,7 +26,6 @@ reinforcements: item: ==: org.bukkit.inventory.ItemStack type: STONE - v: 1 creation_effect: type: PORTAL speed: 0.8 diff --git a/ansible/src/paper-plugins/GSit-2.2.0.jar b/ansible/src/paper-plugins/GSit-2.2.0.jar new file mode 100644 index 000000000..3e3ec754d Binary files /dev/null and b/ansible/src/paper-plugins/GSit-2.2.0.jar differ diff --git a/ansible/src/paper-plugins/ViaBackwards-5.2.2-SNAPSHOT.jar b/ansible/src/paper-plugins/ViaBackwards-5.2.2-SNAPSHOT.jar new file mode 100644 index 000000000..3dcd386db Binary files /dev/null and b/ansible/src/paper-plugins/ViaBackwards-5.2.2-SNAPSHOT.jar differ diff --git a/ansible/src/paper-plugins/ViaVersion-5.2.2-SNAPSHOT.jar b/ansible/src/paper-plugins/ViaVersion-5.2.2-SNAPSHOT.jar new file mode 100644 index 000000000..c4a76efd7 Binary files /dev/null and b/ansible/src/paper-plugins/ViaVersion-5.2.2-SNAPSHOT.jar differ diff --git a/ansible/src/pvp-plugins/GSit-2.2.0.jar b/ansible/src/pvp-plugins/GSit-2.2.0.jar new file mode 120000 index 000000000..03994386c --- /dev/null +++ b/ansible/src/pvp-plugins/GSit-2.2.0.jar @@ -0,0 +1 @@ +../paper-plugins/GSit-2.2.0.jar \ No newline at end of file diff --git a/ansible/src/pvp-plugins/ViaBackwards-5.2.2-SNAPSHOT.jar b/ansible/src/pvp-plugins/ViaBackwards-5.2.2-SNAPSHOT.jar new file mode 120000 index 000000000..af9c9260f --- /dev/null +++ b/ansible/src/pvp-plugins/ViaBackwards-5.2.2-SNAPSHOT.jar @@ -0,0 +1 @@ +../paper-plugins/ViaBackwards-5.2.2-SNAPSHOT.jar \ No newline at end of file diff --git a/ansible/src/pvp-plugins/ViaVersion-5.2.2-SNAPSHOT.jar b/ansible/src/pvp-plugins/ViaVersion-5.2.2-SNAPSHOT.jar new file mode 120000 index 000000000..d4ed84a16 --- /dev/null +++ b/ansible/src/pvp-plugins/ViaVersion-5.2.2-SNAPSHOT.jar @@ -0,0 +1 @@ +../paper-plugins/ViaVersion-5.2.2-SNAPSHOT.jar \ No newline at end of file diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 60d1dd326..6628e214d 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -11,7 +11,7 @@ runpaper = { id = "xyz.jpenilla.run-paper", version = "2.3.1" } [libraries] paper-api = { group = "io.papermc.paper", name = "paper-api", version.ref = "paper" } -aikar-acf = { group = "co.aikar", name = "acf-paper", version = "0.5.1-SNAPSHOT" } +aikar-acf = { group = "co.aikar", name = "acf-bukkit", version = "0.5.1-SNAPSHOT" } aikar-taskchain = { group = "co.aikar", name = "taskchain-bukkit", version = "3.7.2" } commons-lang3 = { group = "org.apache.commons", name = "commons-lang3", version = "3.12.0" } diff --git a/plugins/bastion-paper/src/main/java/isaac/bastion/BastionBlock.java b/plugins/bastion-paper/src/main/java/isaac/bastion/BastionBlock.java index 78d2aab0a..e2b58c604 100644 --- a/plugins/bastion-paper/src/main/java/isaac/bastion/BastionBlock.java +++ b/plugins/bastion-paper/src/main/java/isaac/bastion/BastionBlock.java @@ -299,14 +299,6 @@ public class BastionBlock implements QTBox, Comparable { return placed; } - /** - * Sets how long the bastion has been in the world in ms - */ - public void setPlaced(long placed) { - this.placed = placed; - Bastion.getBastionStorage().updated(this); - } - /** * Sets the id of this bastion */ diff --git a/plugins/bastion-paper/src/main/java/isaac/bastion/listeners/CitadelListener.java b/plugins/bastion-paper/src/main/java/isaac/bastion/listeners/CitadelListener.java index 12f9fbc24..137cc3da6 100644 --- a/plugins/bastion-paper/src/main/java/isaac/bastion/listeners/CitadelListener.java +++ b/plugins/bastion-paper/src/main/java/isaac/bastion/listeners/CitadelListener.java @@ -8,12 +8,8 @@ import isaac.bastion.manager.BastionBlockManager; import java.util.Set; import org.bukkit.ChatColor; import org.bukkit.event.EventHandler; -import org.bukkit.event.EventPriority; import org.bukkit.event.Listener; -import vg.civcraft.mc.citadel.events.ReinforcementChangeTypeEvent; import vg.civcraft.mc.citadel.events.ReinforcementCreationEvent; -import vg.civcraft.mc.citadel.events.ReinforcementGroupChangeEvent; -import vg.civcraft.mc.citadel.events.ReinforcementRepairEvent; import vg.civcraft.mc.namelayer.permission.PermissionType; public class CitadelListener implements Listener { @@ -40,25 +36,4 @@ public class CitadelListener implements Listener { } } } - - @EventHandler(ignoreCancelled = true, priority = EventPriority.MONITOR) - public void onReinforcementRepair(ReinforcementRepairEvent event) { - BastionBlock bastionBlock = Bastion.getBastionStorage().getBastionBlock(event.getReinforcement().getLocation()); - if (bastionBlock == null) return; - bastionBlock.setPlaced(System.currentTimeMillis()); - } - - @EventHandler(ignoreCancelled = true, priority = EventPriority.MONITOR) - public void onReinforcementRepair(ReinforcementChangeTypeEvent event) { - BastionBlock bastionBlock = Bastion.getBastionStorage().getBastionBlock(event.getReinforcement().getLocation()); - if (bastionBlock == null) return; - bastionBlock.setPlaced(System.currentTimeMillis()); - } - - @EventHandler(ignoreCancelled = true, priority = EventPriority.MONITOR) - public void onReinforcementRepair(ReinforcementGroupChangeEvent event) { - BastionBlock bastionBlock = Bastion.getBastionStorage().getBastionBlock(event.getReinforcement().getLocation()); - if (bastionBlock == null) return; - bastionBlock.setPlaced(System.currentTimeMillis()); - } } diff --git a/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/CustomItem.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/CustomItem.java index fe0be53b1..ef95218b3 100644 --- a/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/CustomItem.java +++ b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/CustomItem.java @@ -47,11 +47,7 @@ public class CustomItem { public static String getCustomItemKey(ItemStack item) { if (isCustomItem(item)) { - String key = item.getPersistentDataContainer().get(CUSTOM_ITEM, PersistentDataType.STRING); - if (!customItems.containsKey(key)) { - return null; - } - return key; + return item.getPersistentDataContainer().get(CUSTOM_ITEM, PersistentDataType.STRING); } else { return null; } diff --git a/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/items/ItemMap.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/items/ItemMap.java index 44cf23fd9..fc9589929 100644 --- a/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/items/ItemMap.java +++ b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/inventory/items/ItemMap.java @@ -248,7 +248,7 @@ public class ItemMap { } for (String is : customItems.keySet()) { ItemStack item = CustomItem.getCustomItem(is); - if (item != null && item.getType() == m) { + if (item.getType() == m) { result.addItemAmount(item, customItems.get(is)); } } diff --git a/plugins/donum-paper/src/main/java/com/github/civcraft/donum/commands/DonumCommandHandler.java b/plugins/donum-paper/src/main/java/com/github/civcraft/donum/commands/DonumCommandHandler.java index 90ae2e848..7bab25d4b 100644 --- a/plugins/donum-paper/src/main/java/com/github/civcraft/donum/commands/DonumCommandHandler.java +++ b/plugins/donum-paper/src/main/java/com/github/civcraft/donum/commands/DonumCommandHandler.java @@ -3,7 +3,6 @@ package com.github.civcraft.donum.commands; import com.github.civcraft.donum.commands.commands.Deliver; import com.github.civcraft.donum.commands.commands.DeliverDeath; import com.github.civcraft.donum.commands.commands.OpenDeliveries; -import com.github.civcraft.donum.commands.commands.PendingDeliveries; import org.bukkit.plugin.Plugin; import org.jetbrains.annotations.NotNull; import vg.civcraft.mc.civmodcore.commands.CommandManager; @@ -25,6 +24,5 @@ public class DonumCommandHandler extends CommandManager { registerCommand(new OpenDeliveries()); registerCommand(new Deliver()); registerCommand(new DeliverDeath()); - registerCommand(new PendingDeliveries()); } } diff --git a/plugins/donum-paper/src/main/java/com/github/civcraft/donum/commands/commands/Deliver.java b/plugins/donum-paper/src/main/java/com/github/civcraft/donum/commands/commands/Deliver.java index 5f0d3dbac..0a307f6af 100644 --- a/plugins/donum-paper/src/main/java/com/github/civcraft/donum/commands/commands/Deliver.java +++ b/plugins/donum-paper/src/main/java/com/github/civcraft/donum/commands/commands/Deliver.java @@ -2,7 +2,6 @@ package com.github.civcraft.donum.commands.commands; import co.aikar.commands.BaseCommand; import co.aikar.commands.annotation.CommandAlias; -import co.aikar.commands.annotation.CommandCompletion; import co.aikar.commands.annotation.CommandPermission; import co.aikar.commands.annotation.Description; import co.aikar.commands.annotation.Syntax; @@ -17,7 +16,6 @@ public class Deliver extends BaseCommand { @CommandAlias("deliver") @Description("Opens an inventory to which you can add items to forward them to the players delivery inventory") @Syntax("") - @CommandCompletion("@players") @CommandPermission("donum.op") public void execute(Player player, String targetPlayer) { //TODO make namelayer soft dependency diff --git a/plugins/donum-paper/src/main/java/com/github/civcraft/donum/commands/commands/DeliverDeath.java b/plugins/donum-paper/src/main/java/com/github/civcraft/donum/commands/commands/DeliverDeath.java index 121a385c2..cdbb304b2 100644 --- a/plugins/donum-paper/src/main/java/com/github/civcraft/donum/commands/commands/DeliverDeath.java +++ b/plugins/donum-paper/src/main/java/com/github/civcraft/donum/commands/commands/DeliverDeath.java @@ -2,7 +2,6 @@ package com.github.civcraft.donum.commands.commands; import co.aikar.commands.BaseCommand; import co.aikar.commands.annotation.CommandAlias; -import co.aikar.commands.annotation.CommandCompletion; import co.aikar.commands.annotation.CommandPermission; import co.aikar.commands.annotation.Description; import co.aikar.commands.annotation.Optional; @@ -21,7 +20,6 @@ public class DeliverDeath extends BaseCommand { @CommandAlias("deliverdeath") @Syntax(" [inventoriesToGet]") @Description("Shows death inventories for a player, by default the last 25") - @CommandCompletion("@players") @CommandPermission("donum.op") public void execute(Player player, String targetPlayer, @Optional String inventoriesToGet) { UUID delUUID = NameAPI.getUUID(targetPlayer); diff --git a/plugins/donum-paper/src/main/java/com/github/civcraft/donum/gui/DeathInventoryGUI.java b/plugins/donum-paper/src/main/java/com/github/civcraft/donum/gui/DeathInventoryGUI.java index b99da3e2c..aee8425c5 100644 --- a/plugins/donum-paper/src/main/java/com/github/civcraft/donum/gui/DeathInventoryGUI.java +++ b/plugins/donum-paper/src/main/java/com/github/civcraft/donum/gui/DeathInventoryGUI.java @@ -37,7 +37,7 @@ public class DeathInventoryGUI { return; } ClickableInventory.forceCloseInventory(p); - ClickableInventory ci = new ClickableInventory(54, "DeathInventory"); + ClickableInventory ci = new ClickableInventory(54, "DeathInventory " + NameAPI.getCurrentName(viewer)); if (inventories.size() < 45 * currentPage) { // would show an empty page, so go to previous currentPage--; @@ -133,7 +133,7 @@ public class DeathInventoryGUI { @Override public void clicked(Player p) { Donum.getManager().returnDeathInventory(i); - Donum.getInstance().info(p.getName() + " returned inventory " + i.getID() + " to delivery inventory of " + NameAPI.getCurrentName(viewer)); + Donum.getInstance().info(p.getName() + " returned inventory " + i.getID()); p.sendMessage(ChatColor.GREEN + "Successfully returned inventory with id " + i.getID() + " with a total of " + i.getInventory().getTotalItemAmount() + " items"); showScreen(); diff --git a/plugins/donum-paper/src/main/java/com/github/civcraft/donum/listeners/AdminDeliveryListener.java b/plugins/donum-paper/src/main/java/com/github/civcraft/donum/listeners/AdminDeliveryListener.java index 0630790bb..fded21f83 100644 --- a/plugins/donum-paper/src/main/java/com/github/civcraft/donum/listeners/AdminDeliveryListener.java +++ b/plugins/donum-paper/src/main/java/com/github/civcraft/donum/listeners/AdminDeliveryListener.java @@ -19,16 +19,16 @@ public class AdminDeliveryListener implements Listener { public void closeInventory(InventoryCloseEvent e) { if (AdminDeliveryGUI.isEditingPlayerDeliveryInventory(e.getPlayer().getUniqueId())) { ItemMap im = new ItemMap(); - UUID beingViewed = AdminDeliveryGUI.getPlayerBeingViewed(e.getPlayer().getUniqueId()); for (ItemStack is : e.getInventory().getContents()) { if (is == null || is.getType() == Material.AIR) { continue; } im.addItemStack(is); - Donum.getInstance().info(e.getPlayer().getName() + " added " + is + " to delivery inventory of " + NameAPI.getCurrentName(beingViewed)); } + UUID beingViewed = AdminDeliveryGUI.getPlayerBeingViewed(e.getPlayer().getUniqueId()); AdminDeliveryGUI.closedInventory(e.getPlayer().getUniqueId()); DonumAPI.deliverItem(beingViewed, im); + Donum.getInstance().info(e.getPlayer().getName() + " added " + im.getTotalItemAmount() + " items to delivery inventory of " + NameAPI.getCurrentName(beingViewed)); e.getPlayer().sendMessage(ChatColor.GREEN + "Successfully added " + im.getTotalItemAmount() + " items to delivery inventory of " + NameAPI.getCurrentName(beingViewed)); } } diff --git a/plugins/factorymod-paper/src/main/java/com/github/igotyou/FactoryMod/recipes/PrintBookRecipe.java b/plugins/factorymod-paper/src/main/java/com/github/igotyou/FactoryMod/recipes/PrintBookRecipe.java index d36d79e07..edc34bea2 100644 --- a/plugins/factorymod-paper/src/main/java/com/github/igotyou/FactoryMod/recipes/PrintBookRecipe.java +++ b/plugins/factorymod-paper/src/main/java/com/github/igotyou/FactoryMod/recipes/PrintBookRecipe.java @@ -2,16 +2,13 @@ package com.github.igotyou.FactoryMod.recipes; import com.github.igotyou.FactoryMod.factories.FurnCraftChestFactory; import com.github.igotyou.FactoryMod.utility.MultiInventoryWrapper; + import java.util.ArrayList; import java.util.LinkedList; import java.util.List; -import io.papermc.paper.datacomponent.DataComponentTypes; -import net.kyori.adventure.text.Component; -import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer; + import net.minecraft.core.component.DataComponents; -import net.minecraft.nbt.CompoundTag; -import net.minecraft.nbt.IntTag; -import net.minecraft.nbt.ListTag; +import net.minecraft.world.item.component.WrittenBookContent; import org.bukkit.ChatColor; import org.bukkit.Material; import org.bukkit.craftbukkit.inventory.CraftItemStack; @@ -78,25 +75,13 @@ public class PrintBookRecipe extends PrintingPressRecipe { protected ItemStack createBook(ItemStack printingPlateStack, int amount) { net.minecraft.world.item.ItemStack book = CraftItemStack.asNMSCopy(printingPlateStack); - CompoundTag bookData = (CompoundTag) book.get(DataComponents.CUSTOM_DATA).copyTag().get("Book"); - ItemStack bookItem = new ItemStack(Material.WRITTEN_BOOK, amount); - if (printingPlateStack.hasData(DataComponentTypes.WRITTEN_BOOK_CONTENT)) { - bookItem.setData(DataComponentTypes.WRITTEN_BOOK_CONTENT, printingPlateStack.getData(DataComponentTypes.WRITTEN_BOOK_CONTENT)); - } else { // Handle legacy (pre-1.20.5) plates - bookItem.editMeta(BookMeta.class, meta -> { - meta.title(Component.text(bookData.get("title").getAsString())); - meta.author(Component.text(bookData.get("author").getAsString())); - meta.setGeneration(BookMeta.Generation.values()[((IntTag) bookData.get("generation")).getAsInt()]); + WrittenBookContent content = book.get(DataComponents.WRITTEN_BOOK_CONTENT); - List pages = new ArrayList<>(); - ((ListTag) bookData.get("pages")).forEach(page -> { - pages.add(GsonComponentSerializer.gson().deserialize(page.getAsString())); - }); - meta.pages(pages); - }); - } - - return bookItem; + ItemStack bookItem = new ItemStack(Material.WRITTEN_BOOK, amount); + net.minecraft.world.item.ItemStack newBook = CraftItemStack.asNMSCopy(bookItem); + newBook.set(DataComponents.WRITTEN_BOOK_CONTENT, content); + + return CraftItemStack.asBukkitCopy(newBook); } protected BookMeta.Generation getNextGeneration(@Nullable BookMeta.Generation generation) { diff --git a/plugins/factorymod-paper/src/main/java/com/github/igotyou/FactoryMod/recipes/PrintNoteRecipe.java b/plugins/factorymod-paper/src/main/java/com/github/igotyou/FactoryMod/recipes/PrintNoteRecipe.java index 17207fda2..94dc0c78c 100644 --- a/plugins/factorymod-paper/src/main/java/com/github/igotyou/FactoryMod/recipes/PrintNoteRecipe.java +++ b/plugins/factorymod-paper/src/main/java/com/github/igotyou/FactoryMod/recipes/PrintNoteRecipe.java @@ -103,6 +103,7 @@ public class PrintNoteRecipe extends PrintBookRecipe { for (String line : lines) { fixedLines.add(ChatColor.GRAY + line + .replaceAll("(? ProtocolLibrary.getProtocolManager().getAsynchronousManager().registerAsyncHandler(combatHandler = new AsyncPacketHandler(combatConfig)).start()); } public AsyncPacketHandler getCombatHandler() {