From 7bd0cc86dfc625fdaf60a81671591d1dac1263c7 Mon Sep 17 00:00:00 2001 From: tastybento Date: Sun, 14 Dec 2025 12:35:26 -0800 Subject: [PATCH 01/21] WIP - cracked the way to do it using Paper API only. --- .../1.21.11/mappings_1.21.11.tiny.missing | 0 pom.xml | 78 +++++++------------ .../world/bentobox/bentobox/BentoBox.java | 2 +- .../addons/request/AddonRequestBuilder.java | 2 +- .../api/commands/DefaultHelpCommand.java | 2 +- .../bentobox/bentobox/api/user/User.java | 4 +- .../bentobox/nms/AbstractMetaData.java | 34 -------- .../v1_21_10_R0_1_SNAPSHOT/GetMetaData.java | 22 ------ .../PasteHandlerImpl.java | 74 ------------------ .../WorldRegeneratorImpl.java | 26 ------- .../v1_21_11_R0_1_SNAPSHOT/GetMetaData.java | 26 +++++++ .../v1_21_5_R0_1_SNAPSHOT/GetMetaData.java | 22 ------ .../PasteHandlerImpl.java | 74 ------------------ .../WorldRegeneratorImpl.java | 26 ------- .../v1_21_6_R0_1_SNAPSHOT/GetMetaData.java | 22 ------ .../PasteHandlerImpl.java | 74 ------------------ .../WorldRegeneratorImpl.java | 26 ------- .../v1_21_7_R0_1_SNAPSHOT/GetMetaData.java | 22 ------ .../PasteHandlerImpl.java | 74 ------------------ .../WorldRegeneratorImpl.java | 26 ------- .../v1_21_8_R0_1_SNAPSHOT/GetMetaData.java | 22 ------ .../PasteHandlerImpl.java | 74 ------------------ .../WorldRegeneratorImpl.java | 26 ------- .../bentobox/panels/CatalogPanel.java | 2 +- .../panels/customizable/LanguagePanel.java | 7 +- 25 files changed, 63 insertions(+), 704 deletions(-) create mode 100644 .paper-nms/1.21.11/mappings_1.21.11.tiny.missing delete mode 100644 src/main/java/world/bentobox/bentobox/nms/v1_21_10_R0_1_SNAPSHOT/GetMetaData.java delete mode 100644 src/main/java/world/bentobox/bentobox/nms/v1_21_10_R0_1_SNAPSHOT/PasteHandlerImpl.java delete mode 100644 src/main/java/world/bentobox/bentobox/nms/v1_21_10_R0_1_SNAPSHOT/WorldRegeneratorImpl.java create mode 100644 src/main/java/world/bentobox/bentobox/nms/v1_21_11_R0_1_SNAPSHOT/GetMetaData.java delete mode 100644 src/main/java/world/bentobox/bentobox/nms/v1_21_5_R0_1_SNAPSHOT/GetMetaData.java delete mode 100644 src/main/java/world/bentobox/bentobox/nms/v1_21_5_R0_1_SNAPSHOT/PasteHandlerImpl.java delete mode 100644 src/main/java/world/bentobox/bentobox/nms/v1_21_5_R0_1_SNAPSHOT/WorldRegeneratorImpl.java delete mode 100644 src/main/java/world/bentobox/bentobox/nms/v1_21_6_R0_1_SNAPSHOT/GetMetaData.java delete mode 100644 src/main/java/world/bentobox/bentobox/nms/v1_21_6_R0_1_SNAPSHOT/PasteHandlerImpl.java delete mode 100644 src/main/java/world/bentobox/bentobox/nms/v1_21_6_R0_1_SNAPSHOT/WorldRegeneratorImpl.java delete mode 100644 src/main/java/world/bentobox/bentobox/nms/v1_21_7_R0_1_SNAPSHOT/GetMetaData.java delete mode 100644 src/main/java/world/bentobox/bentobox/nms/v1_21_7_R0_1_SNAPSHOT/PasteHandlerImpl.java delete mode 100644 src/main/java/world/bentobox/bentobox/nms/v1_21_7_R0_1_SNAPSHOT/WorldRegeneratorImpl.java delete mode 100644 src/main/java/world/bentobox/bentobox/nms/v1_21_8_R0_1_SNAPSHOT/GetMetaData.java delete mode 100644 src/main/java/world/bentobox/bentobox/nms/v1_21_8_R0_1_SNAPSHOT/PasteHandlerImpl.java delete mode 100644 src/main/java/world/bentobox/bentobox/nms/v1_21_8_R0_1_SNAPSHOT/WorldRegeneratorImpl.java diff --git a/.paper-nms/1.21.11/mappings_1.21.11.tiny.missing b/.paper-nms/1.21.11/mappings_1.21.11.tiny.missing new file mode 100644 index 000000000..e69de29bb diff --git a/pom.xml b/pom.xml index dfc1caa5a..e6734e608 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ ${revision} BentoBox - Highly scalable and customizable Minecraft Spigot plugin that enables you to run island-type gamemodes. + Highly scalable and customizable Minecraft Paper plugin that enables you to run island-type gamemodes. https://github.com/BentoBoxWorld/BentoBox 2017 @@ -61,11 +61,8 @@ 8.0.27 42.2.18 5.0.1 - - 1.21.10-R0.1-SNAPSHOT - - 1.21.10-R0.1-SNAPSHOT + + 1.21.11-R0.1-SNAPSHOT 3.0.0 1.7.1 2.21.3 @@ -131,6 +128,10 @@ apache.snapshots https://repository.apache.org/snapshots/ + + bytecode.space + https://repo.bytecode.space/repository/maven-public/ + @@ -150,11 +151,6 @@ minecraft-repo https://libraries.minecraft.net/ - - - spigot-repo - https://hub.spigotmc.org/nexus/content/repositories/snapshots - nms-repo https://repo.codemc.io/repository/nms/ @@ -263,37 +259,6 @@ ${paper.version} provided - - - org.spigotmc - spigot-api - ${spigot.version} - provided - - - org.spigotmc. - spigot - 1.21.6-R0.1-SNAPSHOT - provided - - - org.spigotmc.. - spigot - 1.21.5-R0.1-SNAPSHOT - provided - - - org.spigotmc... - spigot - 1.21.4-R0.1-SNAPSHOT - provided - - - org.spigotmc.... - spigot - 1.21.3-R0.1-SNAPSHOT - provided - org.bstats @@ -387,13 +352,6 @@ 3.2.2 provided - - - org.spigotmc - spigot - ${spigot.version} - provided - com.github.Slimefun @@ -496,6 +454,12 @@ ${level.version} provided + + ca.bkaw + paper-nms + 1.21.11-SNAPSHOT + provided + @@ -522,6 +486,11 @@ + + ca.bkaw + paper-nms-maven-plugin + 1.4.10 + org.apache.maven.plugins maven-clean-plugin @@ -574,10 +543,17 @@ - + org.apache.maven.plugins maven-jar-plugin - 3.2.0 + 3.4.1 + + + + mojang + + + org.apache.maven.plugins diff --git a/src/main/java/world/bentobox/bentobox/BentoBox.java b/src/main/java/world/bentobox/bentobox/BentoBox.java index 25daaf263..ce2ce8e65 100644 --- a/src/main/java/world/bentobox/bentobox/BentoBox.java +++ b/src/main/java/world/bentobox/bentobox/BentoBox.java @@ -7,7 +7,7 @@ import java.util.UUID; import java.util.concurrent.TimeUnit; -import org.apache.commons.lang.exception.ExceptionUtils; +import org.apache.commons.lang3.exception.ExceptionUtils; import org.bukkit.Bukkit; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; diff --git a/src/main/java/world/bentobox/bentobox/api/addons/request/AddonRequestBuilder.java b/src/main/java/world/bentobox/bentobox/api/addons/request/AddonRequestBuilder.java index 13db8ff10..8cd9bea1d 100644 --- a/src/main/java/world/bentobox/bentobox/api/addons/request/AddonRequestBuilder.java +++ b/src/main/java/world/bentobox/bentobox/api/addons/request/AddonRequestBuilder.java @@ -4,7 +4,7 @@ import java.util.Map; import java.util.Optional; -import org.apache.commons.lang.Validate; +import org.apache.commons.lang3.Validate; import world.bentobox.bentobox.BentoBox; import world.bentobox.bentobox.api.addons.Addon; diff --git a/src/main/java/world/bentobox/bentobox/api/commands/DefaultHelpCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/DefaultHelpCommand.java index cf1c7d4dc..13e93a65c 100644 --- a/src/main/java/world/bentobox/bentobox/api/commands/DefaultHelpCommand.java +++ b/src/main/java/world/bentobox/bentobox/api/commands/DefaultHelpCommand.java @@ -4,7 +4,7 @@ import java.util.List; import java.util.Optional; -import org.apache.commons.lang.math.NumberUtils; +import org.apache.commons.lang3.math.NumberUtils; import world.bentobox.bentobox.api.localization.TextVariables; import world.bentobox.bentobox.api.user.User; diff --git a/src/main/java/world/bentobox/bentobox/api/user/User.java b/src/main/java/world/bentobox/bentobox/api/user/User.java index 66cfa1dde..cb6062e74 100644 --- a/src/main/java/world/bentobox/bentobox/api/user/User.java +++ b/src/main/java/world/bentobox/bentobox/api/user/User.java @@ -14,7 +14,7 @@ import java.util.regex.Pattern; import java.util.stream.Collectors; -import org.apache.commons.lang.math.NumberUtils; +import org.apache.commons.lang3.math.NumberUtils; import org.bukkit.Bukkit; import org.bukkit.Color; import org.bukkit.GameMode; @@ -438,7 +438,7 @@ private int iteratePerms(List permissions, String permPrefix, int defaul } else { String[] spl = permission.split(permPrefix); if (spl.length > 1) { - if (!NumberUtils.isNumber(spl[1])) { + if (!NumberUtils.isCreatable(spl[1])) { plugin.logError("Player " + player.getName() + " has permission: '" + permission + "' <-- the last part MUST be a number! Ignoring..."); } else { diff --git a/src/main/java/world/bentobox/bentobox/nms/AbstractMetaData.java b/src/main/java/world/bentobox/bentobox/nms/AbstractMetaData.java index 4c1da7dad..b231cfa22 100644 --- a/src/main/java/world/bentobox/bentobox/nms/AbstractMetaData.java +++ b/src/main/java/world/bentobox/bentobox/nms/AbstractMetaData.java @@ -1,43 +1,9 @@ package world.bentobox.bentobox.nms; -import java.lang.reflect.Field; -import java.lang.reflect.Method; - import org.bukkit.block.Block; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.network.protocol.game.PacketPlayOutTileEntityData; -import net.minecraft.world.level.block.entity.TileEntity; -import world.bentobox.bentobox.BentoBox; - public abstract class AbstractMetaData { public abstract String nmsData(Block block); - protected String getData(TileEntity te, String method, String field) { - try { - // Check if the method 'j' exists - Method updatePacketMethod = te.getClass().getDeclaredMethod(method); - // Invoke the method to get the PacketPlayOutTileEntityData object - updatePacketMethod.setAccessible(true); - Object object = updatePacketMethod.invoke(te); - PacketPlayOutTileEntityData packet = (PacketPlayOutTileEntityData) object; - //if (object instanceof PacketPlayOutTileEntityData packet) { - // Access the private field for the NBTTagCompound getter in PacketPlayOutTileEntityData - Field fieldC = packet.getClass().getDeclaredField(field); - fieldC.setAccessible(true); - NBTTagCompound nbtTag = (NBTTagCompound) fieldC.get(packet); - - return nbtTag.toString(); // This will show what you want - //} else { - // throw new ClassNotFoundException( - // object.getClass().getCanonicalName() + " is not a PacketPlayOutTileEntityData"); - //} - } catch (Exception e) { - BentoBox.getInstance().logError("The method '" + method + "' does not exist in the TileEntity class."); - e.printStackTrace(); - } - return ""; - - } } diff --git a/src/main/java/world/bentobox/bentobox/nms/v1_21_10_R0_1_SNAPSHOT/GetMetaData.java b/src/main/java/world/bentobox/bentobox/nms/v1_21_10_R0_1_SNAPSHOT/GetMetaData.java deleted file mode 100644 index 4fba5af69..000000000 --- a/src/main/java/world/bentobox/bentobox/nms/v1_21_10_R0_1_SNAPSHOT/GetMetaData.java +++ /dev/null @@ -1,22 +0,0 @@ -package world.bentobox.bentobox.nms.v1_21_10_R0_1_SNAPSHOT; - -import org.bukkit.Location; -import org.bukkit.block.Block; -import org.bukkit.craftbukkit.v1_21_R6.CraftWorld; - -import net.minecraft.core.BlockPosition; -import net.minecraft.world.level.block.entity.TileEntity; -import world.bentobox.bentobox.nms.AbstractMetaData; - -public class GetMetaData extends AbstractMetaData { - - @Override - public String nmsData(Block block) { - Location w = block.getLocation(); - CraftWorld cw = (CraftWorld) w.getWorld(); // CraftWorld is NMS one - // for 1.13+ (we have use WorldServer) - TileEntity te = cw.getHandle().c_(new BlockPosition(w.getBlockX(), w.getBlockY(), w.getBlockZ())); - return getData(te, "getUpdatePacket", "tag"); - } - -} \ No newline at end of file diff --git a/src/main/java/world/bentobox/bentobox/nms/v1_21_10_R0_1_SNAPSHOT/PasteHandlerImpl.java b/src/main/java/world/bentobox/bentobox/nms/v1_21_10_R0_1_SNAPSHOT/PasteHandlerImpl.java deleted file mode 100644 index 75f1d5369..000000000 --- a/src/main/java/world/bentobox/bentobox/nms/v1_21_10_R0_1_SNAPSHOT/PasteHandlerImpl.java +++ /dev/null @@ -1,74 +0,0 @@ -package world.bentobox.bentobox.nms.v1_21_10_R0_1_SNAPSHOT; - -import java.util.concurrent.CompletableFuture; - -import org.bukkit.Location; -import org.bukkit.block.Block; -import org.bukkit.block.data.BlockData; -import org.bukkit.craftbukkit.v1_21_R6.CraftWorld; -import org.bukkit.craftbukkit.v1_21_R6.block.data.CraftBlockData; - -import net.minecraft.core.BlockPosition; -import net.minecraft.world.level.block.state.IBlockData; -import net.minecraft.world.level.chunk.Chunk; -import world.bentobox.bentobox.blueprints.dataobjects.BlueprintBlock; -import world.bentobox.bentobox.database.objects.Island; -import world.bentobox.bentobox.nms.PasteHandler; -import world.bentobox.bentobox.util.DefaultPasteUtil; -import world.bentobox.bentobox.util.Util; - -public class PasteHandlerImpl implements PasteHandler { - - protected static final IBlockData AIR = ((CraftBlockData) AIR_BLOCKDATA).getState(); - - /** - * Set the block to the location - * - * @param island - island - * @param location - location - * @param bpBlock - blueprint block - */ - @Override - public CompletableFuture setBlock(Island island, Location location, BlueprintBlock bpBlock) { - return Util.getChunkAtAsync(location).thenRun(() -> { - Block block = setBlock(location, DefaultPasteUtil.createBlockData(bpBlock)); - DefaultPasteUtil.setBlockState(island, block, bpBlock); - // Set biome - if (bpBlock.getBiome() != null) { - block.setBiome(bpBlock.getBiome()); - } - }); - } - - @Override - public Block setBlock(Location location, BlockData bd) { - Block block = location.getBlock(); - // Set the block data - default is AIR - CraftBlockData craft = (CraftBlockData) bd; - net.minecraft.world.level.World nmsWorld = ((CraftWorld) location.getWorld()).getHandle(); - Chunk nmsChunk = nmsWorld.d(location.getBlockX() >> 4, location.getBlockZ() >> 4); - BlockPosition bp = new BlockPosition(location.getBlockX(), location.getBlockY(), location.getBlockZ()); - // Setting the block to air before setting to another state prevents some console errors - // If the block is a naturally generated tile entity that needs filling, e.g., a chest, then this kind of pasting can cause console errors due to race condition - // so the try's are there to try and catch the errors. - try { - nmsChunk.a(bp, AIR, 0); - } catch (Exception e) { - e.printStackTrace(); - // Ignore - } - try { - nmsChunk.a(bp, craft.getState(), 0); - } catch (Exception e) { - e.printStackTrace(); - // Ignore - } - try { - block.setBlockData(bd, false); - } catch (Exception e) { - e.printStackTrace(); - // Ignore - } - return block; - } -} diff --git a/src/main/java/world/bentobox/bentobox/nms/v1_21_10_R0_1_SNAPSHOT/WorldRegeneratorImpl.java b/src/main/java/world/bentobox/bentobox/nms/v1_21_10_R0_1_SNAPSHOT/WorldRegeneratorImpl.java deleted file mode 100644 index 2a4868f6b..000000000 --- a/src/main/java/world/bentobox/bentobox/nms/v1_21_10_R0_1_SNAPSHOT/WorldRegeneratorImpl.java +++ /dev/null @@ -1,26 +0,0 @@ -package world.bentobox.bentobox.nms.v1_21_10_R0_1_SNAPSHOT; - -import org.bukkit.block.data.BlockData; -import org.bukkit.craftbukkit.v1_21_R6.CraftWorld; -import org.bukkit.craftbukkit.v1_21_R6.block.data.CraftBlockData; - -import net.minecraft.core.BlockPosition; -import net.minecraft.world.level.World; -import net.minecraft.world.level.chunk.Chunk; -import world.bentobox.bentobox.nms.CopyWorldRegenerator; - -public class WorldRegeneratorImpl extends CopyWorldRegenerator { - - @Override - public void setBlockInNativeChunk(org.bukkit.Chunk chunk, int x, int y, int z, BlockData blockData, - boolean applyPhysics) { - CraftBlockData craft = (CraftBlockData) blockData; - World nmsWorld = ((CraftWorld) chunk.getWorld()).getHandle(); - Chunk nmsChunk = nmsWorld.d(chunk.getX(), chunk.getZ()); - BlockPosition bp = new BlockPosition((chunk.getX() << 4) + x, y, (chunk.getZ() << 4) + z); - // Setting the block to air before setting to another state prevents some console errors - nmsChunk.a(bp, PasteHandlerImpl.AIR, applyPhysics ? 1 : 0); - nmsChunk.a(bp, craft.getState(), applyPhysics ? 1 : 0); - } - -} \ No newline at end of file diff --git a/src/main/java/world/bentobox/bentobox/nms/v1_21_11_R0_1_SNAPSHOT/GetMetaData.java b/src/main/java/world/bentobox/bentobox/nms/v1_21_11_R0_1_SNAPSHOT/GetMetaData.java new file mode 100644 index 000000000..c5e413188 --- /dev/null +++ b/src/main/java/world/bentobox/bentobox/nms/v1_21_11_R0_1_SNAPSHOT/GetMetaData.java @@ -0,0 +1,26 @@ +package world.bentobox.bentobox.nms.v1_21_11_R0_1_SNAPSHOT; + +import org.bukkit.block.Block; +import org.bukkit.craftbukkit.CraftWorld; + +import net.minecraft.core.BlockPos; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.network.protocol.game.ClientboundBlockEntityDataPacket; +import net.minecraft.server.level.ServerLevel; +import net.minecraft.world.level.block.entity.BlockEntity; +import world.bentobox.bentobox.nms.AbstractMetaData; + + +public class GetMetaData extends AbstractMetaData { + + @Override + public String nmsData(Block block) { + ServerLevel sl = ((CraftWorld) block.getWorld()).getHandle(); + BlockEntity te = sl.getBlockEntity(new BlockPos(block.getX(), block.getY(), block.getZ())); + + ClientboundBlockEntityDataPacket packet = (ClientboundBlockEntityDataPacket) te.getUpdatePacket(); + CompoundTag nbtTag = packet.getTag(); + + return nbtTag.toString(); + } +} \ No newline at end of file diff --git a/src/main/java/world/bentobox/bentobox/nms/v1_21_5_R0_1_SNAPSHOT/GetMetaData.java b/src/main/java/world/bentobox/bentobox/nms/v1_21_5_R0_1_SNAPSHOT/GetMetaData.java deleted file mode 100644 index 530bc966e..000000000 --- a/src/main/java/world/bentobox/bentobox/nms/v1_21_5_R0_1_SNAPSHOT/GetMetaData.java +++ /dev/null @@ -1,22 +0,0 @@ -package world.bentobox.bentobox.nms.v1_21_5_R0_1_SNAPSHOT; - -import org.bukkit.Location; -import org.bukkit.block.Block; -import org.bukkit.craftbukkit.v1_21_R4.CraftWorld; - -import net.minecraft.core.BlockPosition; -import net.minecraft.world.level.block.entity.TileEntity; -import world.bentobox.bentobox.nms.AbstractMetaData; - -public class GetMetaData extends AbstractMetaData { - - @Override - public String nmsData(Block block) { - Location w = block.getLocation(); - CraftWorld cw = (CraftWorld) w.getWorld(); // CraftWorld is NMS one - // for 1.13+ (we have use WorldServer) - TileEntity te = cw.getHandle().c_(new BlockPosition(w.getBlockX(), w.getBlockY(), w.getBlockZ())); - return getData(te, "getUpdatePacket", "tag"); - } - -} \ No newline at end of file diff --git a/src/main/java/world/bentobox/bentobox/nms/v1_21_5_R0_1_SNAPSHOT/PasteHandlerImpl.java b/src/main/java/world/bentobox/bentobox/nms/v1_21_5_R0_1_SNAPSHOT/PasteHandlerImpl.java deleted file mode 100644 index 6dcdec507..000000000 --- a/src/main/java/world/bentobox/bentobox/nms/v1_21_5_R0_1_SNAPSHOT/PasteHandlerImpl.java +++ /dev/null @@ -1,74 +0,0 @@ -package world.bentobox.bentobox.nms.v1_21_5_R0_1_SNAPSHOT; - -import java.util.concurrent.CompletableFuture; - -import org.bukkit.Location; -import org.bukkit.block.Block; -import org.bukkit.block.data.BlockData; -import org.bukkit.craftbukkit.v1_21_R4.CraftWorld; -import org.bukkit.craftbukkit.v1_21_R4.block.data.CraftBlockData; - -import net.minecraft.core.BlockPosition; -import net.minecraft.world.level.block.state.IBlockData; -import net.minecraft.world.level.chunk.Chunk; -import world.bentobox.bentobox.blueprints.dataobjects.BlueprintBlock; -import world.bentobox.bentobox.database.objects.Island; -import world.bentobox.bentobox.nms.PasteHandler; -import world.bentobox.bentobox.util.DefaultPasteUtil; -import world.bentobox.bentobox.util.Util; - -public class PasteHandlerImpl implements PasteHandler { - - protected static final IBlockData AIR = ((CraftBlockData) AIR_BLOCKDATA).getState(); - - /** - * Set the block to the location - * - * @param island - island - * @param location - location - * @param bpBlock - blueprint block - */ - @Override - public CompletableFuture setBlock(Island island, Location location, BlueprintBlock bpBlock) { - return Util.getChunkAtAsync(location).thenRun(() -> { - Block block = setBlock(location, DefaultPasteUtil.createBlockData(bpBlock)); - DefaultPasteUtil.setBlockState(island, block, bpBlock); - // Set biome - if (bpBlock.getBiome() != null) { - block.setBiome(bpBlock.getBiome()); - } - }); - } - - @Override - public Block setBlock(Location location, BlockData bd) { - Block block = location.getBlock(); - // Set the block data - default is AIR - CraftBlockData craft = (CraftBlockData) bd; - net.minecraft.world.level.World nmsWorld = ((CraftWorld) location.getWorld()).getHandle(); - Chunk nmsChunk = nmsWorld.d(location.getBlockX() >> 4, location.getBlockZ() >> 4); - BlockPosition bp = new BlockPosition(location.getBlockX(), location.getBlockY(), location.getBlockZ()); - // Setting the block to air before setting to another state prevents some console errors - // If the block is a naturally generated tile entity that needs filling, e.g., a chest, then this kind of pasting can cause console errors due to race condition - // so the try's are there to try and catch the errors. - try { - nmsChunk.a(bp, AIR, 0); - } catch (Exception e) { - e.printStackTrace(); - // Ignore - } - try { - nmsChunk.a(bp, craft.getState(), 0); - } catch (Exception e) { - e.printStackTrace(); - // Ignore - } - try { - block.setBlockData(bd, false); - } catch (Exception e) { - e.printStackTrace(); - // Ignore - } - return block; - } -} diff --git a/src/main/java/world/bentobox/bentobox/nms/v1_21_5_R0_1_SNAPSHOT/WorldRegeneratorImpl.java b/src/main/java/world/bentobox/bentobox/nms/v1_21_5_R0_1_SNAPSHOT/WorldRegeneratorImpl.java deleted file mode 100644 index f50874659..000000000 --- a/src/main/java/world/bentobox/bentobox/nms/v1_21_5_R0_1_SNAPSHOT/WorldRegeneratorImpl.java +++ /dev/null @@ -1,26 +0,0 @@ -package world.bentobox.bentobox.nms.v1_21_5_R0_1_SNAPSHOT; - -import org.bukkit.block.data.BlockData; -import org.bukkit.craftbukkit.v1_21_R4.CraftWorld; -import org.bukkit.craftbukkit.v1_21_R4.block.data.CraftBlockData; - -import net.minecraft.core.BlockPosition; -import net.minecraft.world.level.World; -import net.minecraft.world.level.chunk.Chunk; -import world.bentobox.bentobox.nms.CopyWorldRegenerator; - -public class WorldRegeneratorImpl extends CopyWorldRegenerator { - - @Override - public void setBlockInNativeChunk(org.bukkit.Chunk chunk, int x, int y, int z, BlockData blockData, - boolean applyPhysics) { - CraftBlockData craft = (CraftBlockData) blockData; - World nmsWorld = ((CraftWorld) chunk.getWorld()).getHandle(); - Chunk nmsChunk = nmsWorld.d(chunk.getX(), chunk.getZ()); - BlockPosition bp = new BlockPosition((chunk.getX() << 4) + x, y, (chunk.getZ() << 4) + z); - // Setting the block to air before setting to another state prevents some console errors - nmsChunk.a(bp, PasteHandlerImpl.AIR, applyPhysics ? 1 : 0); - nmsChunk.a(bp, craft.getState(), applyPhysics ? 1 : 0); - } - -} \ No newline at end of file diff --git a/src/main/java/world/bentobox/bentobox/nms/v1_21_6_R0_1_SNAPSHOT/GetMetaData.java b/src/main/java/world/bentobox/bentobox/nms/v1_21_6_R0_1_SNAPSHOT/GetMetaData.java deleted file mode 100644 index c04dd8b72..000000000 --- a/src/main/java/world/bentobox/bentobox/nms/v1_21_6_R0_1_SNAPSHOT/GetMetaData.java +++ /dev/null @@ -1,22 +0,0 @@ -package world.bentobox.bentobox.nms.v1_21_6_R0_1_SNAPSHOT; - -import org.bukkit.Location; -import org.bukkit.block.Block; -import org.bukkit.craftbukkit.v1_21_R5.CraftWorld; - -import net.minecraft.core.BlockPosition; -import net.minecraft.world.level.block.entity.TileEntity; -import world.bentobox.bentobox.nms.AbstractMetaData; - -public class GetMetaData extends AbstractMetaData { - - @Override - public String nmsData(Block block) { - Location w = block.getLocation(); - CraftWorld cw = (CraftWorld) w.getWorld(); // CraftWorld is NMS one - // for 1.13+ (we have use WorldServer) - TileEntity te = cw.getHandle().c_(new BlockPosition(w.getBlockX(), w.getBlockY(), w.getBlockZ())); - return getData(te, "getUpdatePacket", "tag"); - } - -} \ No newline at end of file diff --git a/src/main/java/world/bentobox/bentobox/nms/v1_21_6_R0_1_SNAPSHOT/PasteHandlerImpl.java b/src/main/java/world/bentobox/bentobox/nms/v1_21_6_R0_1_SNAPSHOT/PasteHandlerImpl.java deleted file mode 100644 index b25795ee6..000000000 --- a/src/main/java/world/bentobox/bentobox/nms/v1_21_6_R0_1_SNAPSHOT/PasteHandlerImpl.java +++ /dev/null @@ -1,74 +0,0 @@ -package world.bentobox.bentobox.nms.v1_21_6_R0_1_SNAPSHOT; - -import java.util.concurrent.CompletableFuture; - -import org.bukkit.Location; -import org.bukkit.block.Block; -import org.bukkit.block.data.BlockData; -import org.bukkit.craftbukkit.v1_21_R5.CraftWorld; -import org.bukkit.craftbukkit.v1_21_R5.block.data.CraftBlockData; - -import net.minecraft.core.BlockPosition; -import net.minecraft.world.level.block.state.IBlockData; -import net.minecraft.world.level.chunk.Chunk; -import world.bentobox.bentobox.blueprints.dataobjects.BlueprintBlock; -import world.bentobox.bentobox.database.objects.Island; -import world.bentobox.bentobox.nms.PasteHandler; -import world.bentobox.bentobox.util.DefaultPasteUtil; -import world.bentobox.bentobox.util.Util; - -public class PasteHandlerImpl implements PasteHandler { - - protected static final IBlockData AIR = ((CraftBlockData) AIR_BLOCKDATA).getState(); - - /** - * Set the block to the location - * - * @param island - island - * @param location - location - * @param bpBlock - blueprint block - */ - @Override - public CompletableFuture setBlock(Island island, Location location, BlueprintBlock bpBlock) { - return Util.getChunkAtAsync(location).thenRun(() -> { - Block block = setBlock(location, DefaultPasteUtil.createBlockData(bpBlock)); - DefaultPasteUtil.setBlockState(island, block, bpBlock); - // Set biome - if (bpBlock.getBiome() != null) { - block.setBiome(bpBlock.getBiome()); - } - }); - } - - @Override - public Block setBlock(Location location, BlockData bd) { - Block block = location.getBlock(); - // Set the block data - default is AIR - CraftBlockData craft = (CraftBlockData) bd; - net.minecraft.world.level.World nmsWorld = ((CraftWorld) location.getWorld()).getHandle(); - Chunk nmsChunk = nmsWorld.d(location.getBlockX() >> 4, location.getBlockZ() >> 4); - BlockPosition bp = new BlockPosition(location.getBlockX(), location.getBlockY(), location.getBlockZ()); - // Setting the block to air before setting to another state prevents some console errors - // If the block is a naturally generated tile entity that needs filling, e.g., a chest, then this kind of pasting can cause console errors due to race condition - // so the try's are there to try and catch the errors. - try { - nmsChunk.a(bp, AIR, 0); - } catch (Exception e) { - e.printStackTrace(); - // Ignore - } - try { - nmsChunk.a(bp, craft.getState(), 0); - } catch (Exception e) { - e.printStackTrace(); - // Ignore - } - try { - block.setBlockData(bd, false); - } catch (Exception e) { - e.printStackTrace(); - // Ignore - } - return block; - } -} diff --git a/src/main/java/world/bentobox/bentobox/nms/v1_21_6_R0_1_SNAPSHOT/WorldRegeneratorImpl.java b/src/main/java/world/bentobox/bentobox/nms/v1_21_6_R0_1_SNAPSHOT/WorldRegeneratorImpl.java deleted file mode 100644 index 9b07595f3..000000000 --- a/src/main/java/world/bentobox/bentobox/nms/v1_21_6_R0_1_SNAPSHOT/WorldRegeneratorImpl.java +++ /dev/null @@ -1,26 +0,0 @@ -package world.bentobox.bentobox.nms.v1_21_6_R0_1_SNAPSHOT; - -import org.bukkit.block.data.BlockData; -import org.bukkit.craftbukkit.v1_21_R5.CraftWorld; -import org.bukkit.craftbukkit.v1_21_R5.block.data.CraftBlockData; - -import net.minecraft.core.BlockPosition; -import net.minecraft.world.level.World; -import net.minecraft.world.level.chunk.Chunk; -import world.bentobox.bentobox.nms.CopyWorldRegenerator; - -public class WorldRegeneratorImpl extends CopyWorldRegenerator { - - @Override - public void setBlockInNativeChunk(org.bukkit.Chunk chunk, int x, int y, int z, BlockData blockData, - boolean applyPhysics) { - CraftBlockData craft = (CraftBlockData) blockData; - World nmsWorld = ((CraftWorld) chunk.getWorld()).getHandle(); - Chunk nmsChunk = nmsWorld.d(chunk.getX(), chunk.getZ()); - BlockPosition bp = new BlockPosition((chunk.getX() << 4) + x, y, (chunk.getZ() << 4) + z); - // Setting the block to air before setting to another state prevents some console errors - nmsChunk.a(bp, PasteHandlerImpl.AIR, applyPhysics ? 1 : 0); - nmsChunk.a(bp, craft.getState(), applyPhysics ? 1 : 0); - } - -} \ No newline at end of file diff --git a/src/main/java/world/bentobox/bentobox/nms/v1_21_7_R0_1_SNAPSHOT/GetMetaData.java b/src/main/java/world/bentobox/bentobox/nms/v1_21_7_R0_1_SNAPSHOT/GetMetaData.java deleted file mode 100644 index 868925046..000000000 --- a/src/main/java/world/bentobox/bentobox/nms/v1_21_7_R0_1_SNAPSHOT/GetMetaData.java +++ /dev/null @@ -1,22 +0,0 @@ -package world.bentobox.bentobox.nms.v1_21_7_R0_1_SNAPSHOT; - -import org.bukkit.Location; -import org.bukkit.block.Block; -import org.bukkit.craftbukkit.v1_21_R5.CraftWorld; - -import net.minecraft.core.BlockPosition; -import net.minecraft.world.level.block.entity.TileEntity; -import world.bentobox.bentobox.nms.AbstractMetaData; - -public class GetMetaData extends AbstractMetaData { - - @Override - public String nmsData(Block block) { - Location w = block.getLocation(); - CraftWorld cw = (CraftWorld) w.getWorld(); // CraftWorld is NMS one - // for 1.13+ (we have use WorldServer) - TileEntity te = cw.getHandle().c_(new BlockPosition(w.getBlockX(), w.getBlockY(), w.getBlockZ())); - return getData(te, "getUpdatePacket", "tag"); - } - -} \ No newline at end of file diff --git a/src/main/java/world/bentobox/bentobox/nms/v1_21_7_R0_1_SNAPSHOT/PasteHandlerImpl.java b/src/main/java/world/bentobox/bentobox/nms/v1_21_7_R0_1_SNAPSHOT/PasteHandlerImpl.java deleted file mode 100644 index 6171b4edc..000000000 --- a/src/main/java/world/bentobox/bentobox/nms/v1_21_7_R0_1_SNAPSHOT/PasteHandlerImpl.java +++ /dev/null @@ -1,74 +0,0 @@ -package world.bentobox.bentobox.nms.v1_21_7_R0_1_SNAPSHOT; - -import java.util.concurrent.CompletableFuture; - -import org.bukkit.Location; -import org.bukkit.block.Block; -import org.bukkit.block.data.BlockData; -import org.bukkit.craftbukkit.v1_21_R5.CraftWorld; -import org.bukkit.craftbukkit.v1_21_R5.block.data.CraftBlockData; - -import net.minecraft.core.BlockPosition; -import net.minecraft.world.level.block.state.IBlockData; -import net.minecraft.world.level.chunk.Chunk; -import world.bentobox.bentobox.blueprints.dataobjects.BlueprintBlock; -import world.bentobox.bentobox.database.objects.Island; -import world.bentobox.bentobox.nms.PasteHandler; -import world.bentobox.bentobox.util.DefaultPasteUtil; -import world.bentobox.bentobox.util.Util; - -public class PasteHandlerImpl implements PasteHandler { - - protected static final IBlockData AIR = ((CraftBlockData) AIR_BLOCKDATA).getState(); - - /** - * Set the block to the location - * - * @param island - island - * @param location - location - * @param bpBlock - blueprint block - */ - @Override - public CompletableFuture setBlock(Island island, Location location, BlueprintBlock bpBlock) { - return Util.getChunkAtAsync(location).thenRun(() -> { - Block block = setBlock(location, DefaultPasteUtil.createBlockData(bpBlock)); - DefaultPasteUtil.setBlockState(island, block, bpBlock); - // Set biome - if (bpBlock.getBiome() != null) { - block.setBiome(bpBlock.getBiome()); - } - }); - } - - @Override - public Block setBlock(Location location, BlockData bd) { - Block block = location.getBlock(); - // Set the block data - default is AIR - CraftBlockData craft = (CraftBlockData) bd; - net.minecraft.world.level.World nmsWorld = ((CraftWorld) location.getWorld()).getHandle(); - Chunk nmsChunk = nmsWorld.d(location.getBlockX() >> 4, location.getBlockZ() >> 4); - BlockPosition bp = new BlockPosition(location.getBlockX(), location.getBlockY(), location.getBlockZ()); - // Setting the block to air before setting to another state prevents some console errors - // If the block is a naturally generated tile entity that needs filling, e.g., a chest, then this kind of pasting can cause console errors due to race condition - // so the try's are there to try and catch the errors. - try { - nmsChunk.a(bp, AIR, 0); - } catch (Exception e) { - e.printStackTrace(); - // Ignore - } - try { - nmsChunk.a(bp, craft.getState(), 0); - } catch (Exception e) { - e.printStackTrace(); - // Ignore - } - try { - block.setBlockData(bd, false); - } catch (Exception e) { - e.printStackTrace(); - // Ignore - } - return block; - } -} diff --git a/src/main/java/world/bentobox/bentobox/nms/v1_21_7_R0_1_SNAPSHOT/WorldRegeneratorImpl.java b/src/main/java/world/bentobox/bentobox/nms/v1_21_7_R0_1_SNAPSHOT/WorldRegeneratorImpl.java deleted file mode 100644 index 6f5585293..000000000 --- a/src/main/java/world/bentobox/bentobox/nms/v1_21_7_R0_1_SNAPSHOT/WorldRegeneratorImpl.java +++ /dev/null @@ -1,26 +0,0 @@ -package world.bentobox.bentobox.nms.v1_21_7_R0_1_SNAPSHOT; - -import org.bukkit.block.data.BlockData; -import org.bukkit.craftbukkit.v1_21_R5.CraftWorld; -import org.bukkit.craftbukkit.v1_21_R5.block.data.CraftBlockData; - -import net.minecraft.core.BlockPosition; -import net.minecraft.world.level.World; -import net.minecraft.world.level.chunk.Chunk; -import world.bentobox.bentobox.nms.CopyWorldRegenerator; - -public class WorldRegeneratorImpl extends CopyWorldRegenerator { - - @Override - public void setBlockInNativeChunk(org.bukkit.Chunk chunk, int x, int y, int z, BlockData blockData, - boolean applyPhysics) { - CraftBlockData craft = (CraftBlockData) blockData; - World nmsWorld = ((CraftWorld) chunk.getWorld()).getHandle(); - Chunk nmsChunk = nmsWorld.d(chunk.getX(), chunk.getZ()); - BlockPosition bp = new BlockPosition((chunk.getX() << 4) + x, y, (chunk.getZ() << 4) + z); - // Setting the block to air before setting to another state prevents some console errors - nmsChunk.a(bp, PasteHandlerImpl.AIR, applyPhysics ? 1 : 0); - nmsChunk.a(bp, craft.getState(), applyPhysics ? 1 : 0); - } - -} \ No newline at end of file diff --git a/src/main/java/world/bentobox/bentobox/nms/v1_21_8_R0_1_SNAPSHOT/GetMetaData.java b/src/main/java/world/bentobox/bentobox/nms/v1_21_8_R0_1_SNAPSHOT/GetMetaData.java deleted file mode 100644 index ca171de9c..000000000 --- a/src/main/java/world/bentobox/bentobox/nms/v1_21_8_R0_1_SNAPSHOT/GetMetaData.java +++ /dev/null @@ -1,22 +0,0 @@ -package world.bentobox.bentobox.nms.v1_21_8_R0_1_SNAPSHOT; - -import org.bukkit.Location; -import org.bukkit.block.Block; -import org.bukkit.craftbukkit.v1_21_R5.CraftWorld; - -import net.minecraft.core.BlockPosition; -import net.minecraft.world.level.block.entity.TileEntity; -import world.bentobox.bentobox.nms.AbstractMetaData; - -public class GetMetaData extends AbstractMetaData { - - @Override - public String nmsData(Block block) { - Location w = block.getLocation(); - CraftWorld cw = (CraftWorld) w.getWorld(); // CraftWorld is NMS one - // for 1.13+ (we have use WorldServer) - TileEntity te = cw.getHandle().c_(new BlockPosition(w.getBlockX(), w.getBlockY(), w.getBlockZ())); - return getData(te, "getUpdatePacket", "tag"); - } - -} \ No newline at end of file diff --git a/src/main/java/world/bentobox/bentobox/nms/v1_21_8_R0_1_SNAPSHOT/PasteHandlerImpl.java b/src/main/java/world/bentobox/bentobox/nms/v1_21_8_R0_1_SNAPSHOT/PasteHandlerImpl.java deleted file mode 100644 index f81385102..000000000 --- a/src/main/java/world/bentobox/bentobox/nms/v1_21_8_R0_1_SNAPSHOT/PasteHandlerImpl.java +++ /dev/null @@ -1,74 +0,0 @@ -package world.bentobox.bentobox.nms.v1_21_8_R0_1_SNAPSHOT; - -import java.util.concurrent.CompletableFuture; - -import org.bukkit.Location; -import org.bukkit.block.Block; -import org.bukkit.block.data.BlockData; -import org.bukkit.craftbukkit.v1_21_R5.CraftWorld; -import org.bukkit.craftbukkit.v1_21_R5.block.data.CraftBlockData; - -import net.minecraft.core.BlockPosition; -import net.minecraft.world.level.block.state.IBlockData; -import net.minecraft.world.level.chunk.Chunk; -import world.bentobox.bentobox.blueprints.dataobjects.BlueprintBlock; -import world.bentobox.bentobox.database.objects.Island; -import world.bentobox.bentobox.nms.PasteHandler; -import world.bentobox.bentobox.util.DefaultPasteUtil; -import world.bentobox.bentobox.util.Util; - -public class PasteHandlerImpl implements PasteHandler { - - protected static final IBlockData AIR = ((CraftBlockData) AIR_BLOCKDATA).getState(); - - /** - * Set the block to the location - * - * @param island - island - * @param location - location - * @param bpBlock - blueprint block - */ - @Override - public CompletableFuture setBlock(Island island, Location location, BlueprintBlock bpBlock) { - return Util.getChunkAtAsync(location).thenRun(() -> { - Block block = setBlock(location, DefaultPasteUtil.createBlockData(bpBlock)); - DefaultPasteUtil.setBlockState(island, block, bpBlock); - // Set biome - if (bpBlock.getBiome() != null) { - block.setBiome(bpBlock.getBiome()); - } - }); - } - - @Override - public Block setBlock(Location location, BlockData bd) { - Block block = location.getBlock(); - // Set the block data - default is AIR - CraftBlockData craft = (CraftBlockData) bd; - net.minecraft.world.level.World nmsWorld = ((CraftWorld) location.getWorld()).getHandle(); - Chunk nmsChunk = nmsWorld.d(location.getBlockX() >> 4, location.getBlockZ() >> 4); - BlockPosition bp = new BlockPosition(location.getBlockX(), location.getBlockY(), location.getBlockZ()); - // Setting the block to air before setting to another state prevents some console errors - // If the block is a naturally generated tile entity that needs filling, e.g., a chest, then this kind of pasting can cause console errors due to race condition - // so the try's are there to try and catch the errors. - try { - nmsChunk.a(bp, AIR, 0); - } catch (Exception e) { - e.printStackTrace(); - // Ignore - } - try { - nmsChunk.a(bp, craft.getState(), 0); - } catch (Exception e) { - e.printStackTrace(); - // Ignore - } - try { - block.setBlockData(bd, false); - } catch (Exception e) { - e.printStackTrace(); - // Ignore - } - return block; - } -} diff --git a/src/main/java/world/bentobox/bentobox/nms/v1_21_8_R0_1_SNAPSHOT/WorldRegeneratorImpl.java b/src/main/java/world/bentobox/bentobox/nms/v1_21_8_R0_1_SNAPSHOT/WorldRegeneratorImpl.java deleted file mode 100644 index ce53ff00a..000000000 --- a/src/main/java/world/bentobox/bentobox/nms/v1_21_8_R0_1_SNAPSHOT/WorldRegeneratorImpl.java +++ /dev/null @@ -1,26 +0,0 @@ -package world.bentobox.bentobox.nms.v1_21_8_R0_1_SNAPSHOT; - -import org.bukkit.block.data.BlockData; -import org.bukkit.craftbukkit.v1_21_R5.CraftWorld; -import org.bukkit.craftbukkit.v1_21_R5.block.data.CraftBlockData; - -import net.minecraft.core.BlockPosition; -import net.minecraft.world.level.World; -import net.minecraft.world.level.chunk.Chunk; -import world.bentobox.bentobox.nms.CopyWorldRegenerator; - -public class WorldRegeneratorImpl extends CopyWorldRegenerator { - - @Override - public void setBlockInNativeChunk(org.bukkit.Chunk chunk, int x, int y, int z, BlockData blockData, - boolean applyPhysics) { - CraftBlockData craft = (CraftBlockData) blockData; - World nmsWorld = ((CraftWorld) chunk.getWorld()).getHandle(); - Chunk nmsChunk = nmsWorld.d(chunk.getX(), chunk.getZ()); - BlockPosition bp = new BlockPosition((chunk.getX() << 4) + x, y, (chunk.getZ() << 4) + z); - // Setting the block to air before setting to another state prevents some console errors - nmsChunk.a(bp, PasteHandlerImpl.AIR, applyPhysics ? 1 : 0); - nmsChunk.a(bp, craft.getState(), applyPhysics ? 1 : 0); - } - -} \ No newline at end of file diff --git a/src/main/java/world/bentobox/bentobox/panels/CatalogPanel.java b/src/main/java/world/bentobox/bentobox/panels/CatalogPanel.java index b7bedb8f5..abdc2f9a3 100644 --- a/src/main/java/world/bentobox/bentobox/panels/CatalogPanel.java +++ b/src/main/java/world/bentobox/bentobox/panels/CatalogPanel.java @@ -2,7 +2,7 @@ import java.util.List; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.bukkit.Material; import org.eclipse.jdt.annotation.NonNull; diff --git a/src/main/java/world/bentobox/bentobox/panels/customizable/LanguagePanel.java b/src/main/java/world/bentobox/bentobox/panels/customizable/LanguagePanel.java index e4c51978a..799f2389e 100644 --- a/src/main/java/world/bentobox/bentobox/panels/customizable/LanguagePanel.java +++ b/src/main/java/world/bentobox/bentobox/panels/customizable/LanguagePanel.java @@ -17,7 +17,8 @@ import java.util.regex.Pattern; import java.util.stream.Collectors; -import org.apache.commons.lang.WordUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.text.WordUtils; import org.bukkit.Material; import org.bukkit.event.inventory.ClickType; import org.bukkit.inventory.ItemStack; @@ -382,12 +383,12 @@ private PanelItem createLocaleButton(ItemTemplateRecord template, Locale locale) if (template.title() != null) { builder.name(this.user.getTranslation(this.command.getWorld(), template.title(), - TextVariables.NAME, WordUtils.capitalize(locale.getDisplayName(this.user.getLocale())))); + TextVariables.NAME, StringUtils.capitalize(locale.getDisplayName(this.user.getLocale())))); } else { builder.name(this.user.getTranslation(reference + "name", - TextVariables.NAME, WordUtils.capitalize(locale.getDisplayName(this.user.getLocale())))); + TextVariables.NAME, StringUtils.capitalize(locale.getDisplayName(this.user.getLocale())))); } final StringBuilder authors = new StringBuilder(); From 4767df0acb648b0cc6c9d21421a8d677fd3af6d8 Mon Sep 17 00:00:00 2001 From: tastybento Date: Sun, 14 Dec 2025 13:47:19 -0800 Subject: [PATCH 02/21] Tested and works on 1.21.10 and 11 --- .../bentobox/managers/island/NewIsland.java | 16 ++-- .../v1_21_10_R0_1_SNAPSHOT/GetMetaData.java | 26 ++++++ .../PasteHandlerImpl.java | 88 +++++++++++++++++++ .../WorldRegeneratorImpl.java | 37 ++++++++ .../PasteHandlerImpl.java | 88 +++++++++++++++++++ .../WorldRegeneratorImpl.java | 37 ++++++++ 6 files changed, 286 insertions(+), 6 deletions(-) create mode 100644 src/main/java/world/bentobox/bentobox/nms/v1_21_10_R0_1_SNAPSHOT/GetMetaData.java create mode 100644 src/main/java/world/bentobox/bentobox/nms/v1_21_10_R0_1_SNAPSHOT/PasteHandlerImpl.java create mode 100644 src/main/java/world/bentobox/bentobox/nms/v1_21_10_R0_1_SNAPSHOT/WorldRegeneratorImpl.java create mode 100644 src/main/java/world/bentobox/bentobox/nms/v1_21_11_R0_1_SNAPSHOT/PasteHandlerImpl.java create mode 100644 src/main/java/world/bentobox/bentobox/nms/v1_21_11_R0_1_SNAPSHOT/WorldRegeneratorImpl.java diff --git a/src/main/java/world/bentobox/bentobox/managers/island/NewIsland.java b/src/main/java/world/bentobox/bentobox/managers/island/NewIsland.java index 98ee6ade9..30df2b148 100644 --- a/src/main/java/world/bentobox/bentobox/managers/island/NewIsland.java +++ b/src/main/java/world/bentobox/bentobox/managers/island/NewIsland.java @@ -237,12 +237,16 @@ public void newIsland(Island oldIsland) throws IOException { // If noPaste is true, skip blueprint paste and run post-creation immediately Bukkit.getScheduler().runTask(plugin, () -> postCreationTask(oldIsland)); } else { - // Determine if NMS (native Minecraft server) paste is needed based on player state - double dist = user.getLocation().distance(island.getCenter()); - boolean useNMS = (user.getPlayer() instanceof ConsoleCommandSender) || !user.getWorld().equals(island.getWorld()) - || (dist >= Bukkit.getViewDistance() * 16D); - // Paste the blueprint, then run post-creation tasks - plugin.getBlueprintsManager().paste(addon, island, name, () -> postCreationTask(oldIsland), useNMS); + if (user.getWorld().equals(island.getWorld())) { + // Determine if NMS (native Minecraft server) paste is needed based on player state + double dist = user.getLocation().distance(island.getCenter()); + boolean useNMS = (user.getPlayer() instanceof ConsoleCommandSender) || !user.getWorld().equals(island.getWorld()) + || (dist >= Bukkit.getViewDistance() * 16D); + // Paste the blueprint, then run post-creation tasks + plugin.getBlueprintsManager().paste(addon, island, name, () -> postCreationTask(oldIsland), useNMS); + } else { + plugin.getBlueprintsManager().paste(addon, island, name, () -> postCreationTask(oldIsland), true); + } } // Set default island flags/settings island.setFlagsDefaults(); diff --git a/src/main/java/world/bentobox/bentobox/nms/v1_21_10_R0_1_SNAPSHOT/GetMetaData.java b/src/main/java/world/bentobox/bentobox/nms/v1_21_10_R0_1_SNAPSHOT/GetMetaData.java new file mode 100644 index 000000000..0dc564668 --- /dev/null +++ b/src/main/java/world/bentobox/bentobox/nms/v1_21_10_R0_1_SNAPSHOT/GetMetaData.java @@ -0,0 +1,26 @@ +package world.bentobox.bentobox.nms.v1_21_10_R0_1_SNAPSHOT; + +import org.bukkit.block.Block; +import org.bukkit.craftbukkit.CraftWorld; + +import net.minecraft.core.BlockPos; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.network.protocol.game.ClientboundBlockEntityDataPacket; +import net.minecraft.server.level.ServerLevel; +import net.minecraft.world.level.block.entity.BlockEntity; +import world.bentobox.bentobox.nms.AbstractMetaData; + + +public class GetMetaData extends AbstractMetaData { + + @Override + public String nmsData(Block block) { + ServerLevel sl = ((CraftWorld) block.getWorld()).getHandle(); + BlockEntity te = sl.getBlockEntity(new BlockPos(block.getX(), block.getY(), block.getZ())); + + ClientboundBlockEntityDataPacket packet = (ClientboundBlockEntityDataPacket) te.getUpdatePacket(); + CompoundTag nbtTag = packet.getTag(); + + return nbtTag.toString(); + } +} \ No newline at end of file diff --git a/src/main/java/world/bentobox/bentobox/nms/v1_21_10_R0_1_SNAPSHOT/PasteHandlerImpl.java b/src/main/java/world/bentobox/bentobox/nms/v1_21_10_R0_1_SNAPSHOT/PasteHandlerImpl.java new file mode 100644 index 000000000..a9a0232c4 --- /dev/null +++ b/src/main/java/world/bentobox/bentobox/nms/v1_21_10_R0_1_SNAPSHOT/PasteHandlerImpl.java @@ -0,0 +1,88 @@ +package world.bentobox.bentobox.nms.v1_21_10_R0_1_SNAPSHOT; + +import java.util.concurrent.CompletableFuture; + +import org.bukkit.Location; +import org.bukkit.block.Block; +import org.bukkit.block.data.BlockData; +import org.bukkit.craftbukkit.CraftWorld; // Unversioned import for Paperweight +import org.bukkit.craftbukkit.block.data.CraftBlockData; // Unversioned import for Paperweight + +import net.minecraft.core.BlockPos; +import net.minecraft.world.level.block.state.BlockState; // New name for IBlockData +import net.minecraft.world.level.chunk.LevelChunk; // New name for Chunk +import net.minecraft.world.level.Level; // New name for net.minecraft.world.level.World + +// (Your other imports remain the same) +import world.bentobox.bentobox.blueprints.dataobjects.BlueprintBlock; +import world.bentobox.bentobox.database.objects.Island; +import world.bentobox.bentobox.nms.PasteHandler; +import world.bentobox.bentobox.util.DefaultPasteUtil; +import world.bentobox.bentobox.util.Util; + + +public class PasteHandlerImpl implements PasteHandler { + + // New type name: BlockState (was IBlockData) + protected static final BlockState AIR = ((CraftBlockData) AIR_BLOCKDATA).getState(); + + // The setBlock(Island, Location, BlueprintBlock) method remains unchanged in its body + @Override + public CompletableFuture setBlock(Island island, Location location, BlueprintBlock bpBlock) { + return Util.getChunkAtAsync(location).thenRun(() -> { + Block block = setBlock(location, DefaultPasteUtil.createBlockData(bpBlock)); + DefaultPasteUtil.setBlockState(island, block, bpBlock); + // Set biome + if (bpBlock.getBiome() != null) { + block.setBiome(bpBlock.getBiome()); + } + }); + } + + @Override + public Block setBlock(Location location, BlockData bd) { + Block block = location.getBlock(); + + // 1. Cast BlockData to CraftBlockData and get NMS BlockState + CraftBlockData craft = (CraftBlockData) bd; + BlockState nmsBlockState = craft.getState(); + + // 2. Unwrap Bukkit World to NMS Level + Level nmsWorld = ((CraftWorld) location.getWorld()).getHandle(); + + // 3. Get the NMS Chunk (LevelChunk) + LevelChunk nmsChunk = nmsWorld.getChunk(location.getBlockX() >> 4, location.getBlockZ() >> 4); + + // 4. Create the NMS Position (BlockPos) + BlockPos bp = new BlockPos(location.getBlockX(), location.getBlockY(), location.getBlockZ()); + + // Setting the block to air before setting to another state prevents some console errors... + try { + // New NMS method: nmsChunk.setBlockState(BlockPos, BlockState, int) + // Setting to air + nmsChunk.setBlockState(bp, AIR, 0); + } catch (Exception e) { + e.printStackTrace(); + // Ignore + } + + try { + // Setting the actual block + nmsChunk.setBlockState(bp, nmsBlockState, 0); + } catch (Exception e) { + e.printStackTrace(); + // Ignore + } + + // The final API call is redundant if the NMS calls succeed, + // but often kept as a safeguard in NMS code. + try { + block.setBlockData(bd, false); + } catch (Exception e) { + e.printStackTrace(); + // Ignore + } + + return block; + } +} \ No newline at end of file diff --git a/src/main/java/world/bentobox/bentobox/nms/v1_21_10_R0_1_SNAPSHOT/WorldRegeneratorImpl.java b/src/main/java/world/bentobox/bentobox/nms/v1_21_10_R0_1_SNAPSHOT/WorldRegeneratorImpl.java new file mode 100644 index 000000000..27dc8dbc8 --- /dev/null +++ b/src/main/java/world/bentobox/bentobox/nms/v1_21_10_R0_1_SNAPSHOT/WorldRegeneratorImpl.java @@ -0,0 +1,37 @@ +package world.bentobox.bentobox.nms.v1_21_10_R0_1_SNAPSHOT; + +import org.bukkit.block.data.BlockData; +import org.bukkit.craftbukkit.CraftWorld; // Unversioned import for Paperweight +import org.bukkit.craftbukkit.block.data.CraftBlockData; // Unversioned import for Paperweight + +import net.minecraft.core.BlockPos; // New name for BlockPosition +import net.minecraft.world.level.Level; // New name for World +import net.minecraft.world.level.chunk.LevelChunk; // New name for Chunk +import world.bentobox.bentobox.nms.CopyWorldRegenerator; + +public class WorldRegeneratorImpl extends CopyWorldRegenerator { + + @Override + public void setBlockInNativeChunk(org.bukkit.Chunk chunk, int x, int y, int z, BlockData blockData, boolean applyPhysics) { + + CraftBlockData craft = (CraftBlockData) blockData; + + // Unwrap Bukkit World to NMS Level (was World) + Level nmsWorld = ((CraftWorld) chunk.getWorld()).getHandle(); + + // Get the NMS Chunk (LevelChunk) + LevelChunk nmsChunk = nmsWorld.getChunk(chunk.getX(), chunk.getZ()); + + // Create the NMS Position (BlockPos) + BlockPos bp = new BlockPos((chunk.getX() << 4) + x, y, (chunk.getZ() << 4) + z); + + // Determine the block update flags (1 or 0) + int flags = applyPhysics ? 1 : 0; + + // Setting the block to air before setting to another state prevents some console errors + nmsChunk.setBlockState(bp, PasteHandlerImpl.AIR, flags); + + // Set the desired block state + nmsChunk.setBlockState(bp, craft.getState(), flags); + } +} \ No newline at end of file diff --git a/src/main/java/world/bentobox/bentobox/nms/v1_21_11_R0_1_SNAPSHOT/PasteHandlerImpl.java b/src/main/java/world/bentobox/bentobox/nms/v1_21_11_R0_1_SNAPSHOT/PasteHandlerImpl.java new file mode 100644 index 000000000..d178fd444 --- /dev/null +++ b/src/main/java/world/bentobox/bentobox/nms/v1_21_11_R0_1_SNAPSHOT/PasteHandlerImpl.java @@ -0,0 +1,88 @@ +package world.bentobox.bentobox.nms.v1_21_11_R0_1_SNAPSHOT; + +import java.util.concurrent.CompletableFuture; + +import org.bukkit.Location; +import org.bukkit.block.Block; +import org.bukkit.block.data.BlockData; +import org.bukkit.craftbukkit.CraftWorld; // Unversioned import for Paperweight +import org.bukkit.craftbukkit.block.data.CraftBlockData; // Unversioned import for Paperweight + +import net.minecraft.core.BlockPos; +import net.minecraft.world.level.block.state.BlockState; // New name for IBlockData +import net.minecraft.world.level.chunk.LevelChunk; // New name for Chunk +import net.minecraft.world.level.Level; // New name for net.minecraft.world.level.World + +// (Your other imports remain the same) +import world.bentobox.bentobox.blueprints.dataobjects.BlueprintBlock; +import world.bentobox.bentobox.database.objects.Island; +import world.bentobox.bentobox.nms.PasteHandler; +import world.bentobox.bentobox.util.DefaultPasteUtil; +import world.bentobox.bentobox.util.Util; + + +public class PasteHandlerImpl implements PasteHandler { + + // New type name: BlockState (was IBlockData) + protected static final BlockState AIR = ((CraftBlockData) AIR_BLOCKDATA).getState(); + + // The setBlock(Island, Location, BlueprintBlock) method remains unchanged in its body + @Override + public CompletableFuture setBlock(Island island, Location location, BlueprintBlock bpBlock) { + return Util.getChunkAtAsync(location).thenRun(() -> { + Block block = setBlock(location, DefaultPasteUtil.createBlockData(bpBlock)); + DefaultPasteUtil.setBlockState(island, block, bpBlock); + // Set biome + if (bpBlock.getBiome() != null) { + block.setBiome(bpBlock.getBiome()); + } + }); + } + + @Override + public Block setBlock(Location location, BlockData bd) { + Block block = location.getBlock(); + + // 1. Cast BlockData to CraftBlockData and get NMS BlockState + CraftBlockData craft = (CraftBlockData) bd; + BlockState nmsBlockState = craft.getState(); + + // 2. Unwrap Bukkit World to NMS Level + Level nmsWorld = ((CraftWorld) location.getWorld()).getHandle(); + + // 3. Get the NMS Chunk (LevelChunk) + LevelChunk nmsChunk = nmsWorld.getChunk(location.getBlockX() >> 4, location.getBlockZ() >> 4); + + // 4. Create the NMS Position (BlockPos) + BlockPos bp = new BlockPos(location.getBlockX(), location.getBlockY(), location.getBlockZ()); + + // Setting the block to air before setting to another state prevents some console errors... + try { + // New NMS method: nmsChunk.setBlockState(BlockPos, BlockState, int) + // Setting to air + nmsChunk.setBlockState(bp, AIR, 0); + } catch (Exception e) { + e.printStackTrace(); + // Ignore + } + + try { + // Setting the actual block + nmsChunk.setBlockState(bp, nmsBlockState, 0); + } catch (Exception e) { + e.printStackTrace(); + // Ignore + } + + // The final API call is redundant if the NMS calls succeed, + // but often kept as a safeguard in NMS code. + try { + block.setBlockData(bd, false); + } catch (Exception e) { + e.printStackTrace(); + // Ignore + } + + return block; + } +} \ No newline at end of file diff --git a/src/main/java/world/bentobox/bentobox/nms/v1_21_11_R0_1_SNAPSHOT/WorldRegeneratorImpl.java b/src/main/java/world/bentobox/bentobox/nms/v1_21_11_R0_1_SNAPSHOT/WorldRegeneratorImpl.java new file mode 100644 index 000000000..bd5c743cb --- /dev/null +++ b/src/main/java/world/bentobox/bentobox/nms/v1_21_11_R0_1_SNAPSHOT/WorldRegeneratorImpl.java @@ -0,0 +1,37 @@ +package world.bentobox.bentobox.nms.v1_21_11_R0_1_SNAPSHOT; + +import org.bukkit.block.data.BlockData; +import org.bukkit.craftbukkit.CraftWorld; // Unversioned import for Paperweight +import org.bukkit.craftbukkit.block.data.CraftBlockData; // Unversioned import for Paperweight + +import net.minecraft.core.BlockPos; // New name for BlockPosition +import net.minecraft.world.level.Level; // New name for World +import net.minecraft.world.level.chunk.LevelChunk; // New name for Chunk +import world.bentobox.bentobox.nms.CopyWorldRegenerator; + +public class WorldRegeneratorImpl extends CopyWorldRegenerator { + + @Override + public void setBlockInNativeChunk(org.bukkit.Chunk chunk, int x, int y, int z, BlockData blockData, boolean applyPhysics) { + + CraftBlockData craft = (CraftBlockData) blockData; + + // Unwrap Bukkit World to NMS Level (was World) + Level nmsWorld = ((CraftWorld) chunk.getWorld()).getHandle(); + + // Get the NMS Chunk (LevelChunk) + LevelChunk nmsChunk = nmsWorld.getChunk(chunk.getX(), chunk.getZ()); + + // Create the NMS Position (BlockPos) + BlockPos bp = new BlockPos((chunk.getX() << 4) + x, y, (chunk.getZ() << 4) + z); + + // Determine the block update flags (1 or 0) + int flags = applyPhysics ? 1 : 0; + + // Setting the block to air before setting to another state prevents some console errors + nmsChunk.setBlockState(bp, PasteHandlerImpl.AIR, flags); + + // Set the desired block state + nmsChunk.setBlockState(bp, craft.getState(), flags); + } +} \ No newline at end of file From 0b197dd0ccd4bb30f0038c789a36629d5bbc19c4 Mon Sep 17 00:00:00 2001 From: tastybento Date: Sun, 14 Dec 2025 14:12:05 -0800 Subject: [PATCH 03/21] Verified and tested on 1.21.5 through to 1.21.11 --- pom.xml | 2 +- .../bentobox/nms/AbstractMetaData.java | 2 +- .../GetMetaData.java | 6 +- .../PasteHandlerImpl.java | 3 +- .../WorldRegeneratorImpl.java | 3 +- .../bentobox/nms/fallback/GetMetaData.java | 17 ---- .../nms/fallback/PasteHandlerImpl.java | 2 +- .../nms/fallback/WorldRegeneratorImpl.java | 20 ----- .../v1_21_10_R0_1_SNAPSHOT/GetMetaData.java | 26 ------ .../PasteHandlerImpl.java | 88 ------------------- .../WorldRegeneratorImpl.java | 37 -------- .../world/bentobox/bentobox/util/Util.java | 67 ++------------ .../versions/ServerCompatibility.java | 5 ++ 13 files changed, 19 insertions(+), 259 deletions(-) rename src/main/java/world/bentobox/bentobox/nms/{v1_21_11_R0_1_SNAPSHOT => }/GetMetaData.java (80%) rename src/main/java/world/bentobox/bentobox/nms/{v1_21_11_R0_1_SNAPSHOT => }/PasteHandlerImpl.java (96%) rename src/main/java/world/bentobox/bentobox/nms/{v1_21_10_R0_1_SNAPSHOT => }/WorldRegeneratorImpl.java (92%) delete mode 100644 src/main/java/world/bentobox/bentobox/nms/fallback/GetMetaData.java delete mode 100644 src/main/java/world/bentobox/bentobox/nms/fallback/WorldRegeneratorImpl.java delete mode 100644 src/main/java/world/bentobox/bentobox/nms/v1_21_10_R0_1_SNAPSHOT/GetMetaData.java delete mode 100644 src/main/java/world/bentobox/bentobox/nms/v1_21_10_R0_1_SNAPSHOT/PasteHandlerImpl.java delete mode 100644 src/main/java/world/bentobox/bentobox/nms/v1_21_11_R0_1_SNAPSHOT/WorldRegeneratorImpl.java diff --git a/pom.xml b/pom.xml index e6734e608..8b8e03057 100644 --- a/pom.xml +++ b/pom.xml @@ -74,7 +74,7 @@ -LOCAL - 3.10.2 + 3.11.0 bentobox-world https://sonarcloud.io ${project.basedir}/lib diff --git a/src/main/java/world/bentobox/bentobox/nms/AbstractMetaData.java b/src/main/java/world/bentobox/bentobox/nms/AbstractMetaData.java index b231cfa22..f2075b2c1 100644 --- a/src/main/java/world/bentobox/bentobox/nms/AbstractMetaData.java +++ b/src/main/java/world/bentobox/bentobox/nms/AbstractMetaData.java @@ -6,4 +6,4 @@ public abstract class AbstractMetaData { public abstract String nmsData(Block block); -} +} \ No newline at end of file diff --git a/src/main/java/world/bentobox/bentobox/nms/v1_21_11_R0_1_SNAPSHOT/GetMetaData.java b/src/main/java/world/bentobox/bentobox/nms/GetMetaData.java similarity index 80% rename from src/main/java/world/bentobox/bentobox/nms/v1_21_11_R0_1_SNAPSHOT/GetMetaData.java rename to src/main/java/world/bentobox/bentobox/nms/GetMetaData.java index c5e413188..e42272783 100644 --- a/src/main/java/world/bentobox/bentobox/nms/v1_21_11_R0_1_SNAPSHOT/GetMetaData.java +++ b/src/main/java/world/bentobox/bentobox/nms/GetMetaData.java @@ -1,4 +1,4 @@ -package world.bentobox.bentobox.nms.v1_21_11_R0_1_SNAPSHOT; +package world.bentobox.bentobox.nms; import org.bukkit.block.Block; import org.bukkit.craftbukkit.CraftWorld; @@ -8,12 +8,10 @@ import net.minecraft.network.protocol.game.ClientboundBlockEntityDataPacket; import net.minecraft.server.level.ServerLevel; import net.minecraft.world.level.block.entity.BlockEntity; -import world.bentobox.bentobox.nms.AbstractMetaData; -public class GetMetaData extends AbstractMetaData { +public class GetMetaData extends AbstractMetaData { - @Override public String nmsData(Block block) { ServerLevel sl = ((CraftWorld) block.getWorld()).getHandle(); BlockEntity te = sl.getBlockEntity(new BlockPos(block.getX(), block.getY(), block.getZ())); diff --git a/src/main/java/world/bentobox/bentobox/nms/v1_21_11_R0_1_SNAPSHOT/PasteHandlerImpl.java b/src/main/java/world/bentobox/bentobox/nms/PasteHandlerImpl.java similarity index 96% rename from src/main/java/world/bentobox/bentobox/nms/v1_21_11_R0_1_SNAPSHOT/PasteHandlerImpl.java rename to src/main/java/world/bentobox/bentobox/nms/PasteHandlerImpl.java index d178fd444..118bffcc8 100644 --- a/src/main/java/world/bentobox/bentobox/nms/v1_21_11_R0_1_SNAPSHOT/PasteHandlerImpl.java +++ b/src/main/java/world/bentobox/bentobox/nms/PasteHandlerImpl.java @@ -1,4 +1,4 @@ -package world.bentobox.bentobox.nms.v1_21_11_R0_1_SNAPSHOT; +package world.bentobox.bentobox.nms; import java.util.concurrent.CompletableFuture; @@ -16,7 +16,6 @@ // (Your other imports remain the same) import world.bentobox.bentobox.blueprints.dataobjects.BlueprintBlock; import world.bentobox.bentobox.database.objects.Island; -import world.bentobox.bentobox.nms.PasteHandler; import world.bentobox.bentobox.util.DefaultPasteUtil; import world.bentobox.bentobox.util.Util; diff --git a/src/main/java/world/bentobox/bentobox/nms/v1_21_10_R0_1_SNAPSHOT/WorldRegeneratorImpl.java b/src/main/java/world/bentobox/bentobox/nms/WorldRegeneratorImpl.java similarity index 92% rename from src/main/java/world/bentobox/bentobox/nms/v1_21_10_R0_1_SNAPSHOT/WorldRegeneratorImpl.java rename to src/main/java/world/bentobox/bentobox/nms/WorldRegeneratorImpl.java index 27dc8dbc8..497880420 100644 --- a/src/main/java/world/bentobox/bentobox/nms/v1_21_10_R0_1_SNAPSHOT/WorldRegeneratorImpl.java +++ b/src/main/java/world/bentobox/bentobox/nms/WorldRegeneratorImpl.java @@ -1,4 +1,4 @@ -package world.bentobox.bentobox.nms.v1_21_10_R0_1_SNAPSHOT; +package world.bentobox.bentobox.nms; import org.bukkit.block.data.BlockData; import org.bukkit.craftbukkit.CraftWorld; // Unversioned import for Paperweight @@ -7,7 +7,6 @@ import net.minecraft.core.BlockPos; // New name for BlockPosition import net.minecraft.world.level.Level; // New name for World import net.minecraft.world.level.chunk.LevelChunk; // New name for Chunk -import world.bentobox.bentobox.nms.CopyWorldRegenerator; public class WorldRegeneratorImpl extends CopyWorldRegenerator { diff --git a/src/main/java/world/bentobox/bentobox/nms/fallback/GetMetaData.java b/src/main/java/world/bentobox/bentobox/nms/fallback/GetMetaData.java deleted file mode 100644 index dce5bd733..000000000 --- a/src/main/java/world/bentobox/bentobox/nms/fallback/GetMetaData.java +++ /dev/null @@ -1,17 +0,0 @@ -package world.bentobox.bentobox.nms.fallback; - -import org.bukkit.block.Block; - -import world.bentobox.bentobox.nms.AbstractMetaData; - -/** - * Fallback - */ -public class GetMetaData extends AbstractMetaData { - - @Override - public String nmsData(Block block) { - return ""; // We cannot read it if we have no NMS - } - -} diff --git a/src/main/java/world/bentobox/bentobox/nms/fallback/PasteHandlerImpl.java b/src/main/java/world/bentobox/bentobox/nms/fallback/PasteHandlerImpl.java index 1284edf6e..f3fa48114 100644 --- a/src/main/java/world/bentobox/bentobox/nms/fallback/PasteHandlerImpl.java +++ b/src/main/java/world/bentobox/bentobox/nms/fallback/PasteHandlerImpl.java @@ -39,4 +39,4 @@ public Block setBlock(Location location, BlockData blockData) { return block; } -} +} \ No newline at end of file diff --git a/src/main/java/world/bentobox/bentobox/nms/fallback/WorldRegeneratorImpl.java b/src/main/java/world/bentobox/bentobox/nms/fallback/WorldRegeneratorImpl.java deleted file mode 100644 index 4f175c09b..000000000 --- a/src/main/java/world/bentobox/bentobox/nms/fallback/WorldRegeneratorImpl.java +++ /dev/null @@ -1,20 +0,0 @@ -package world.bentobox.bentobox.nms.fallback; - -import org.bukkit.Chunk; -import org.bukkit.block.data.BlockData; - -import world.bentobox.bentobox.nms.CopyWorldRegenerator; - -/** - * @author tastybento - * - */ -public class WorldRegeneratorImpl extends CopyWorldRegenerator { - - @Override - protected void setBlockInNativeChunk(Chunk chunk, int x, int y, int z, BlockData blockData, boolean applyPhysics) { - chunk.getBlock(x, y, z).setBlockData(blockData, applyPhysics); - } - - -} \ No newline at end of file diff --git a/src/main/java/world/bentobox/bentobox/nms/v1_21_10_R0_1_SNAPSHOT/GetMetaData.java b/src/main/java/world/bentobox/bentobox/nms/v1_21_10_R0_1_SNAPSHOT/GetMetaData.java deleted file mode 100644 index 0dc564668..000000000 --- a/src/main/java/world/bentobox/bentobox/nms/v1_21_10_R0_1_SNAPSHOT/GetMetaData.java +++ /dev/null @@ -1,26 +0,0 @@ -package world.bentobox.bentobox.nms.v1_21_10_R0_1_SNAPSHOT; - -import org.bukkit.block.Block; -import org.bukkit.craftbukkit.CraftWorld; - -import net.minecraft.core.BlockPos; -import net.minecraft.nbt.CompoundTag; -import net.minecraft.network.protocol.game.ClientboundBlockEntityDataPacket; -import net.minecraft.server.level.ServerLevel; -import net.minecraft.world.level.block.entity.BlockEntity; -import world.bentobox.bentobox.nms.AbstractMetaData; - - -public class GetMetaData extends AbstractMetaData { - - @Override - public String nmsData(Block block) { - ServerLevel sl = ((CraftWorld) block.getWorld()).getHandle(); - BlockEntity te = sl.getBlockEntity(new BlockPos(block.getX(), block.getY(), block.getZ())); - - ClientboundBlockEntityDataPacket packet = (ClientboundBlockEntityDataPacket) te.getUpdatePacket(); - CompoundTag nbtTag = packet.getTag(); - - return nbtTag.toString(); - } -} \ No newline at end of file diff --git a/src/main/java/world/bentobox/bentobox/nms/v1_21_10_R0_1_SNAPSHOT/PasteHandlerImpl.java b/src/main/java/world/bentobox/bentobox/nms/v1_21_10_R0_1_SNAPSHOT/PasteHandlerImpl.java deleted file mode 100644 index a9a0232c4..000000000 --- a/src/main/java/world/bentobox/bentobox/nms/v1_21_10_R0_1_SNAPSHOT/PasteHandlerImpl.java +++ /dev/null @@ -1,88 +0,0 @@ -package world.bentobox.bentobox.nms.v1_21_10_R0_1_SNAPSHOT; - -import java.util.concurrent.CompletableFuture; - -import org.bukkit.Location; -import org.bukkit.block.Block; -import org.bukkit.block.data.BlockData; -import org.bukkit.craftbukkit.CraftWorld; // Unversioned import for Paperweight -import org.bukkit.craftbukkit.block.data.CraftBlockData; // Unversioned import for Paperweight - -import net.minecraft.core.BlockPos; -import net.minecraft.world.level.block.state.BlockState; // New name for IBlockData -import net.minecraft.world.level.chunk.LevelChunk; // New name for Chunk -import net.minecraft.world.level.Level; // New name for net.minecraft.world.level.World - -// (Your other imports remain the same) -import world.bentobox.bentobox.blueprints.dataobjects.BlueprintBlock; -import world.bentobox.bentobox.database.objects.Island; -import world.bentobox.bentobox.nms.PasteHandler; -import world.bentobox.bentobox.util.DefaultPasteUtil; -import world.bentobox.bentobox.util.Util; - - -public class PasteHandlerImpl implements PasteHandler { - - // New type name: BlockState (was IBlockData) - protected static final BlockState AIR = ((CraftBlockData) AIR_BLOCKDATA).getState(); - - // The setBlock(Island, Location, BlueprintBlock) method remains unchanged in its body - @Override - public CompletableFuture setBlock(Island island, Location location, BlueprintBlock bpBlock) { - return Util.getChunkAtAsync(location).thenRun(() -> { - Block block = setBlock(location, DefaultPasteUtil.createBlockData(bpBlock)); - DefaultPasteUtil.setBlockState(island, block, bpBlock); - // Set biome - if (bpBlock.getBiome() != null) { - block.setBiome(bpBlock.getBiome()); - } - }); - } - - @Override - public Block setBlock(Location location, BlockData bd) { - Block block = location.getBlock(); - - // 1. Cast BlockData to CraftBlockData and get NMS BlockState - CraftBlockData craft = (CraftBlockData) bd; - BlockState nmsBlockState = craft.getState(); - - // 2. Unwrap Bukkit World to NMS Level - Level nmsWorld = ((CraftWorld) location.getWorld()).getHandle(); - - // 3. Get the NMS Chunk (LevelChunk) - LevelChunk nmsChunk = nmsWorld.getChunk(location.getBlockX() >> 4, location.getBlockZ() >> 4); - - // 4. Create the NMS Position (BlockPos) - BlockPos bp = new BlockPos(location.getBlockX(), location.getBlockY(), location.getBlockZ()); - - // Setting the block to air before setting to another state prevents some console errors... - try { - // New NMS method: nmsChunk.setBlockState(BlockPos, BlockState, int) - // Setting to air - nmsChunk.setBlockState(bp, AIR, 0); - } catch (Exception e) { - e.printStackTrace(); - // Ignore - } - - try { - // Setting the actual block - nmsChunk.setBlockState(bp, nmsBlockState, 0); - } catch (Exception e) { - e.printStackTrace(); - // Ignore - } - - // The final API call is redundant if the NMS calls succeed, - // but often kept as a safeguard in NMS code. - try { - block.setBlockData(bd, false); - } catch (Exception e) { - e.printStackTrace(); - // Ignore - } - - return block; - } -} \ No newline at end of file diff --git a/src/main/java/world/bentobox/bentobox/nms/v1_21_11_R0_1_SNAPSHOT/WorldRegeneratorImpl.java b/src/main/java/world/bentobox/bentobox/nms/v1_21_11_R0_1_SNAPSHOT/WorldRegeneratorImpl.java deleted file mode 100644 index bd5c743cb..000000000 --- a/src/main/java/world/bentobox/bentobox/nms/v1_21_11_R0_1_SNAPSHOT/WorldRegeneratorImpl.java +++ /dev/null @@ -1,37 +0,0 @@ -package world.bentobox.bentobox.nms.v1_21_11_R0_1_SNAPSHOT; - -import org.bukkit.block.data.BlockData; -import org.bukkit.craftbukkit.CraftWorld; // Unversioned import for Paperweight -import org.bukkit.craftbukkit.block.data.CraftBlockData; // Unversioned import for Paperweight - -import net.minecraft.core.BlockPos; // New name for BlockPosition -import net.minecraft.world.level.Level; // New name for World -import net.minecraft.world.level.chunk.LevelChunk; // New name for Chunk -import world.bentobox.bentobox.nms.CopyWorldRegenerator; - -public class WorldRegeneratorImpl extends CopyWorldRegenerator { - - @Override - public void setBlockInNativeChunk(org.bukkit.Chunk chunk, int x, int y, int z, BlockData blockData, boolean applyPhysics) { - - CraftBlockData craft = (CraftBlockData) blockData; - - // Unwrap Bukkit World to NMS Level (was World) - Level nmsWorld = ((CraftWorld) chunk.getWorld()).getHandle(); - - // Get the NMS Chunk (LevelChunk) - LevelChunk nmsChunk = nmsWorld.getChunk(chunk.getX(), chunk.getZ()); - - // Create the NMS Position (BlockPos) - BlockPos bp = new BlockPos((chunk.getX() << 4) + x, y, (chunk.getZ() << 4) + z); - - // Determine the block update flags (1 or 0) - int flags = applyPhysics ? 1 : 0; - - // Setting the block to air before setting to another state prevents some console errors - nmsChunk.setBlockState(bp, PasteHandlerImpl.AIR, flags); - - // Set the desired block state - nmsChunk.setBlockState(bp, craft.getState(), flags); - } -} \ No newline at end of file diff --git a/src/main/java/world/bentobox/bentobox/util/Util.java b/src/main/java/world/bentobox/bentobox/util/Util.java index 0c6ce9f77..c7844f1c3 100644 --- a/src/main/java/world/bentobox/bentobox/util/Util.java +++ b/src/main/java/world/bentobox/bentobox/util/Util.java @@ -54,8 +54,11 @@ import world.bentobox.bentobox.BentoBox; import world.bentobox.bentobox.api.user.User; import world.bentobox.bentobox.nms.AbstractMetaData; +import world.bentobox.bentobox.nms.GetMetaData; import world.bentobox.bentobox.nms.PasteHandler; +import world.bentobox.bentobox.nms.PasteHandlerImpl; import world.bentobox.bentobox.nms.WorldRegenerator; +import world.bentobox.bentobox.nms.WorldRegeneratorImpl; /** @@ -79,7 +82,7 @@ public class Util { private static PasteHandler pasteHandler = null; private static WorldRegenerator regenerator = null; - private static AbstractMetaData metaData; + private static GetMetaData metaData; private Util() {} @@ -757,59 +760,13 @@ public static void setRegenerator(WorldRegenerator regenerator) { Util.regenerator = regenerator; } - private static Pair getPrefix() { - // Bukkit method that was added in 2011 - // Example value: 1.20.4-R0.1-SNAPSHOT - final String bukkitVersion = "v" + Bukkit.getBukkitVersion().replace('.', '_').replace('-', '_'); - final String pluginPackageName = plugin.getClass().getPackage().getName(); - return new Pair(pluginPackageName + ".nms." + bukkitVersion, bukkitVersion); - } - - /** - * Generic method to get NMS handlers with fallback options - * @param The type of handler to get - * @param handlerClass The class of the handler - * @param implName The implementation name (e.g., "PasteHandlerImpl") - * @param fallbackSupplier Supplier for the fallback implementation - * @param existingHandler The existing handler instance if any - * @param logPrefix Prefix for logging messages - * @return The handler instance - */ - private static T getNMSHandler(Class handlerClass, - String implName, - java.util.function.Supplier fallbackSupplier, - T existingHandler, - String logPrefix) { - if (existingHandler != null) { - return existingHandler; - } - - T handler; - try { - Class clazz = Class.forName(getPrefix().x() + "." + implName); - if (handlerClass.isAssignableFrom(clazz)) { - handler = handlerClass.cast(clazz.getConstructor().newInstance()); - } else { - throw new IllegalStateException("Class " + clazz.getName() + " does not implement " + handlerClass.getSimpleName()); - } - } catch (Exception e) { - plugin.logWarning("No " + logPrefix + " found for " + getPrefix().z() + ", falling back to Bukkit API."); - handler = fallbackSupplier.get(); - } - return handler; - } - /** * Get metadata decoder * @return an accelerated metadata class for this server */ public static AbstractMetaData getMetaData() { if (metaData == null) { - metaData = getNMSHandler(AbstractMetaData.class, - "GetMetaData", - () -> new world.bentobox.bentobox.nms.fallback.GetMetaData(), - metaData, - "GetMetaData"); + metaData = new GetMetaData(); } return metaData; } @@ -820,11 +777,7 @@ public static AbstractMetaData getMetaData() { */ public static WorldRegenerator getRegenerator() { if (regenerator == null) { - regenerator = getNMSHandler(WorldRegenerator.class, - "WorldRegeneratorImpl", - () -> new world.bentobox.bentobox.nms.fallback.WorldRegeneratorImpl(), - regenerator, - "Regenerator"); + regenerator = new WorldRegeneratorImpl(); } return regenerator; } @@ -835,12 +788,7 @@ public static WorldRegenerator getRegenerator() { */ public static PasteHandler getPasteHandler() { if (pasteHandler == null) { - BentoBox.getInstance().log("Optimizing for " + getPrefix().z()); - pasteHandler = getNMSHandler(PasteHandler.class, - "PasteHandlerImpl", - () -> new world.bentobox.bentobox.nms.fallback.PasteHandlerImpl(), - pasteHandler, - "PasteHandler"); + pasteHandler = new PasteHandlerImpl(); } return pasteHandler; } @@ -871,7 +819,6 @@ public static int broadcast(String localeKey, String... variables) { * @param input Input that need to be sanitized. * @return A sanitized input without illegal characters in names. */ - @SuppressWarnings("deprecation") public static String sanitizeInput(String input) { return Util.stripColor( diff --git a/src/main/java/world/bentobox/bentobox/versions/ServerCompatibility.java b/src/main/java/world/bentobox/bentobox/versions/ServerCompatibility.java index bc5473df5..cf50daa96 100644 --- a/src/main/java/world/bentobox/bentobox/versions/ServerCompatibility.java +++ b/src/main/java/world/bentobox/bentobox/versions/ServerCompatibility.java @@ -165,6 +165,11 @@ public enum ServerVersion { * @since 3.8.0 */ V1_21_10(Compatibility.COMPATIBLE) + , + /** + * @since 3.11.0 + */ + V1_21_11(Compatibility.COMPATIBLE) ,; private final Compatibility compatibility; From adb35c45c846ad2cc82ed6dc35fef0d487422a2a Mon Sep 17 00:00:00 2001 From: tastybento Date: Sun, 14 Dec 2025 19:39:24 -0800 Subject: [PATCH 04/21] Gradle conversion - compiles and tests Removed the NMS libraries for now. --- build.gradle.kts | 375 +++++++++ build.old | 140 ++++ gradle/libs.versions.toml | 66 ++ gradle/wrapper/grade-wrapper.properties | 5 + gradle/wrapper/gradle-wrapper.properties | 7 + gradlew | 252 ++++++ gradlew.bat | 94 +++ plugin.yml | 66 ++ pom.xml | 718 ------------------ settings.gradle.kts | 5 + .../v1_21_5_R0_1_SNAPSHOT/GetMetaData.java | 22 - .../PasteHandlerImpl.java | 74 -- .../WorldRegeneratorImpl.java | 26 - .../v1_21_6_R0_1_SNAPSHOT/GetMetaData.java | 22 - .../PasteHandlerImpl.java | 74 -- .../WorldRegeneratorImpl.java | 26 - .../v1_21_7_R0_1_SNAPSHOT/GetMetaData.java | 22 - .../PasteHandlerImpl.java | 74 -- .../WorldRegeneratorImpl.java | 26 - .../v1_21_8_R0_1_SNAPSHOT/GetMetaData.java | 22 - .../PasteHandlerImpl.java | 74 -- .../WorldRegeneratorImpl.java | 26 - 22 files changed, 1010 insertions(+), 1206 deletions(-) create mode 100644 build.gradle.kts create mode 100644 build.old create mode 100644 gradle/libs.versions.toml create mode 100644 gradle/wrapper/grade-wrapper.properties create mode 100644 gradle/wrapper/gradle-wrapper.properties create mode 100755 gradlew create mode 100644 gradlew.bat create mode 100644 plugin.yml delete mode 100644 pom.xml create mode 100644 settings.gradle.kts delete mode 100644 src/main/java/world/bentobox/bentobox/nms/v1_21_5_R0_1_SNAPSHOT/GetMetaData.java delete mode 100644 src/main/java/world/bentobox/bentobox/nms/v1_21_5_R0_1_SNAPSHOT/PasteHandlerImpl.java delete mode 100644 src/main/java/world/bentobox/bentobox/nms/v1_21_5_R0_1_SNAPSHOT/WorldRegeneratorImpl.java delete mode 100644 src/main/java/world/bentobox/bentobox/nms/v1_21_6_R0_1_SNAPSHOT/GetMetaData.java delete mode 100644 src/main/java/world/bentobox/bentobox/nms/v1_21_6_R0_1_SNAPSHOT/PasteHandlerImpl.java delete mode 100644 src/main/java/world/bentobox/bentobox/nms/v1_21_6_R0_1_SNAPSHOT/WorldRegeneratorImpl.java delete mode 100644 src/main/java/world/bentobox/bentobox/nms/v1_21_7_R0_1_SNAPSHOT/GetMetaData.java delete mode 100644 src/main/java/world/bentobox/bentobox/nms/v1_21_7_R0_1_SNAPSHOT/PasteHandlerImpl.java delete mode 100644 src/main/java/world/bentobox/bentobox/nms/v1_21_7_R0_1_SNAPSHOT/WorldRegeneratorImpl.java delete mode 100644 src/main/java/world/bentobox/bentobox/nms/v1_21_8_R0_1_SNAPSHOT/GetMetaData.java delete mode 100644 src/main/java/world/bentobox/bentobox/nms/v1_21_8_R0_1_SNAPSHOT/PasteHandlerImpl.java delete mode 100644 src/main/java/world/bentobox/bentobox/nms/v1_21_8_R0_1_SNAPSHOT/WorldRegeneratorImpl.java diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 index 000000000..91067a87b --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,375 @@ +// Apply necessary plugins for Java development, publishing, testing, and shading +plugins { + // Standard Java development plugin + java + + // For publishing the artifact (translates ) + `maven-publish` + + // For code coverage (translates jacoco-maven-plugin) + id("jacoco") + + // For shading, minimization, and relocation (translates maven-shade-plugin) + id("com.gradleup.shadow") version "9.3.0" +} + +// --- Project Coordinates and Versioning (Translates , , and ) --- + +group = "world.bentobox" // From + +// Base properties from +val buildVersion = "3.10.2" +val buildNumberDefault = "-LOCAL" +val snapshotSuffix = "-SNAPSHOT" + +// CI/CD Logic (Translates Maven ) +var finalBuildNumber = buildNumberDefault +var finalRevision = "$buildVersion$finalBuildNumber$snapshotSuffix" + +// 'ci' profile logic: Activated by env.BUILD_NUMBER +val envBuildNumber = System.getenv("BUILD_NUMBER") +if (!envBuildNumber.isNullOrBlank()) { + // Override only if necessary (as per POM comment) + finalBuildNumber = "-b$envBuildNumber" + finalRevision = "$buildVersion$finalBuildNumber$snapshotSuffix" +} + +// 'master' profile logic: Activated by env.GIT_BRANCH == origin/master +val envGitBranch = System.getenv("GIT_BRANCH") +if (envGitBranch == "origin/master") { + // Override revision to remove -SNAPSHOT and set build number to empty string + finalBuildNumber = "" // Empties build number variable. + finalRevision = buildVersion +} + +version = finalRevision + +// --- Global Properties (Translates remaining ) --- + +// Dependency versions (used in dependencies block and throughout) +val javaVersion = "21" +val junitVersion = "5.10.2" +val mockitoVersion = "5.11.0" +val mockBukkitVersion = "v1.21-SNAPSHOT" +val mongodbVersion = "3.12.12" +val mariadbVersion = "3.0.5" +val mysqlVersion = "8.0.27" +val postgresqlVersion = "42.2.18" +val hikaricpVersion = "5.0.1" +val spigotVersion = "1.21.10-R0.1-SNAPSHOT" +val paperVersion = "1.21.10-R0.1-SNAPSHOT" +val bstatsVersion = "3.0.0" +val vaultVersion = "1.7.1" +val levelVersion = "2.21.3" +val placeholderapiVersion = "2.11.7" +val myworldsVersion = "1.19.3-v1" + +// Also store in extra properties for resource filtering +extra["java.version"] = javaVersion +extra["junit.version"] = junitVersion +extra["mockito.version"] = mockitoVersion +extra["mock-bukkit.version"] = mockBukkitVersion +extra["mongodb.version"] = mongodbVersion +extra["mariadb.version"] = mariadbVersion +extra["mysql.version"] = mysqlVersion +extra["postgresql.version"] = postgresqlVersion +extra["hikaricp.version"] = hikaricpVersion +extra["spigot.version"] = spigotVersion +extra["paper.version"] = paperVersion +extra["bstats.version"] = bstatsVersion +extra["vault.version"] = vaultVersion +extra["level.version"] = levelVersion +extra["placeholderapi.version"] = placeholderapiVersion +extra["myworlds.version"] = myworldsVersion +// Define variables used in and build logic +extra["build.version"] = buildVersion +extra["build.number"] = finalBuildNumber +extra["revision"] = finalRevision + + +// --- Java Configuration --- + +// Configures source/target compatibility and toolchain +java { + // Uses Java 21 toolchain (as remembered and specified in POM) + toolchain { + languageVersion = JavaLanguageVersion.of(javaVersion) + } +} + +tasks.withType { + options.encoding = "UTF-8" // From +} + + +// --- Repositories (Translates ) --- + +repositories { + // Default repository for most libraries + mavenCentral() + + // Custom Repositories from POM + maven("https://jitpack.io") { name = "JitPack" } + maven("https://repo.codemc.org/repository/maven-public") { name = "CodeMC-Public" } + maven("https://repo.papermc.io/repository/maven-public/") { name = "PaperMC" } + maven("https://libraries.minecraft.net/") { name = "MinecraftLibs" } + maven("https://hub.spigotmc.org/nexus/content/repositories/snapshots") { name = "Spigot-Snapshots" } + maven("https://repo.codemc.io/repository/nms/") { name = "NMS-Repo" } + maven("https://ci.mg-dev.eu/plugin/repository/everything") { name = "MG-Dev-CI" } + maven("https://repo.onarandombox.com/multiverse-releases") { name = "Multiverse-Releases" } + maven("https://repo.onarandombox.com/multiverse-snapshots") { name = "Multiverse-Snapshots" } + maven("https://mvn.lumine.io/repository/maven-public/") { name = "Lumine-Releases" } + maven("https://repo.clojars.org/") { name = "Clojars" } + maven("https://repo.fancyplugins.de/releases") { name = "FancyPlugins-Releases" } + maven("https://repo.pyr.lol/snapshots") { name = "Pyr-Snapshots" } + maven("https://maven.devs.beer/") { name = "MatteoDev" } + maven("https://repo.oraxen.com/releases") { name = "Oraxen" } + maven("https://repo.codemc.org/repository/bentoboxworld/") { name = "BentoBoxWorld-Repo" } + maven("https://repo.extendedclip.com/releases/") { name = "Placeholder-API-Releases" } +} + + +// --- Dependencies (Translates ) --- + +dependencies { + // --- Test Dependencies (test) --- + testImplementation(platform("org.junit:junit-bom:$junitVersion")) + testImplementation("org.junit.jupiter:junit-jupiter-api") + testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine") + // Ensure JUnit Platform launcher matches the engine/platform versions + testRuntimeOnly("org.junit.platform:junit-platform-launcher:$junitVersion") + testImplementation("org.mockito:mockito-junit-jupiter:$mockitoVersion") + testImplementation("org.mockito:mockito-core:$mockitoVersion") + testImplementation("com.github.MockBukkit:MockBukkit:$mockBukkitVersion") + testImplementation("org.awaitility:awaitility:4.2.2") + // Paper API for test compilation + testImplementation("io.papermc.paper:paper-api:1.21.10-R0.1-SNAPSHOT") + // Vault API for test compilation + testImplementation("com.github.MilkBowl:VaultAPI:$vaultVersion") + // PlaceholderAPI for test compilation (provides PlaceholderExpansion) + testImplementation("me.clip:placeholderapi:$placeholderapiVersion") + + // --- Provided/Compile-Only Dependencies (provided) --- + //compileOnly("io.papermc.paper:paper-api:$paperVersion") + compileOnly("io.papermc.paper:paper-api:1.21.10-R0.1-SNAPSHOT") + // Note: Paper API includes Spigot API, so we don't need to include it separately + + // Spigot NMS - Used for chunk deletion and pasting + compileOnly("org.spigotmc:spigot:$spigotVersion") { + exclude(group = "org.spigotmc", module = "spigot-api") + } + + compileOnly("org.mongodb:mongodb-driver:$mongodbVersion") + compileOnly("com.zaxxer:HikariCP:$hikaricpVersion") + compileOnly("com.github.MilkBowl:VaultAPI:$vaultVersion") + compileOnly("me.clip:placeholderapi:$placeholderapiVersion") + compileOnly("com.bergerkiller.bukkit:MyWorlds:$myworldsVersion") { + exclude(group = "org.spigotmc", module = "spigot-api") + } + compileOnly("io.lumine:Mythic-Dist:5.9.5") + compileOnly("org.mvplugins.multiverse.core:multiverse-core:5.0.0-SNAPSHOT") { + exclude(group = "org.spigotmc", module = "spigot-api") + } + compileOnly("com.onarandombox.multiversecore:multiverse-core:4.3.16") { + exclude(group = "org.spigotmc", module = "spigot-api") + } + compileOnly("com.github.apachezy:LangUtils:3.2.2") + compileOnly("com.github.Slimefun:Slimefun4:RC-37") + compileOnly("dev.lone:api-itemsadder:4.0.2-beta-release-11") + compileOnly("de.oliver:FancyNpcs:2.4.4") + compileOnly("lol.pyr:znpcsplus-api:2.0.0-SNAPSHOT") + compileOnly("de.oliver:FancyHolograms:2.4.1") + compileOnly("world.bentobox:level:2.21.3-SNAPSHOT") + + // Apache Commons Lang (provides NumberUtils) - available at test time + compileOnly("commons-lang:commons-lang:2.6") + testImplementation("commons-lang:commons-lang:2.6") + + // --- Implementation Dependencies (Default scope) --- + implementation("org.bstats:bstats-bukkit:$bstatsVersion") + implementation("javax.xml.bind:jaxb-api:2.3.0") + implementation("com.github.Marcono1234:gson-record-type-adapter-factory:0.3.0") + implementation("org.eclipse.jdt:org.eclipse.jdt.annotation:2.2.600") + implementation("com.github.puregero:multilib:1.1.13") + + // Oraxen with exclusions + compileOnly("io.th0rgal:oraxen:1.193.1") { + // Translates + exclude(group = "me.gabytm.util", module = "actions-spigot") + exclude(group = "org.jetbrains", module = "annotations") + exclude(group = "com.ticxo", module = "PlayerAnimator") + exclude(group = "com.github.stefvanschie.inventoryframework", module = "IF") + exclude(group = "io.th0rgal", module = "protectionlib") + exclude(group = "dev.triumphteam", module = "triumph-gui") + exclude(group = "org.bstats", module = "bstats-bukkit") + exclude(group = "com.jeff-media", module = "custom-block-data") + exclude(group = "com.jeff-media", module = "persistent-data-serializer") + exclude(group = "com.jeff_media", module = "MorePersistentDataTypes") + exclude(group = "gs.mclo", module = "java") + } +} + + +// --- Build Configuration (Translates and ) --- + +// Resource Filtering (Translates ) +tasks.processResources { + duplicatesStrategy = DuplicatesStrategy.EXCLUDE + + // Copy all resources + from(sourceSets.main.get().resources.srcDirs) + + // Apply filtering to plugin.yml and config.yml with direct token replacement + filesMatching(listOf("plugin.yml", "config.yml")) { + filter { line -> + line.replace("\${mysql.version}", mysqlVersion) + .replace("\${mariadb.version}", mariadbVersion) + .replace("\${postgresql.version}", postgresqlVersion) + .replace("\${mongodb.version}", mongodbVersion) + .replace("\${hikaricp.version}", hikaricpVersion) + .replace("\${build.number}", finalBuildNumber) + .replace("\${project.version}", project.version.toString()) + .replace("\${project.description}", project.description ?: "") + .replace("\${revision}", project.version.toString()) + } + } + + finalizedBy("copyLocales") +} + +// Copy 'locales' without filtering +tasks.register("copyLocales") { + duplicatesStrategy = DuplicatesStrategy.EXCLUDE + from("src/main/resources/locales") + into("${tasks.processResources.get().destinationDir}/locales") +} + +// Ensure compileTestJava depends on copyLocales +tasks.compileTestJava { + dependsOn("copyLocales") +} + +// Custom finalName (Translates ) +tasks.jar { + archiveFileName.set("${project.name}-${project.version}.jar") +} + + +// --- Shading Plugin Configuration (Translates maven-shade-plugin) --- + +tasks.named("shadowJar") { + // Translates true + minimize() + + // Artifact exclusion (Translates ) + exclude( + "org.apache.maven:*:*", + "com.google.code.gson:*:*", + "org.mongodb:*:*", + "org.eclipse.jdt:*:*" + ) + + // Relocations (Translates ) + relocate("org.bstats", "world.bentobox.bentobox.util.metrics") + relocate("io.papermc.lib", "world.bentobox.bentobox.paperlib") + relocate("com.github.puregero.multilib", "world.bentobox.bentobox.multilib") +} + +// Ensure the shaded jar is the primary artifact when 'build' is run +tasks.build { + dependsOn(tasks.shadowJar) +} + +// --- Testing Configuration (Translates maven-surefire-plugin) --- + +tasks.test { + useJUnitPlatform() + + // Add --add-opens from maven-surefire-plugin for Java 21 compatibility + val openModules = listOf( + "java.base/java.lang", "java.base/java.math", "java.base/java.io", "java.base/java.util", + "java.base/java.util.stream", "java.base/java.text", "java.base/java.util.regex", + "java.base/java.nio.channels.spi", "java.base/sun.nio.ch", "java.base/java.net", + "java.base/java.util.concurrent", "java.base/sun.nio.fs", "java.base/sun.nio.cs", + "java.base/java.nio.file", "java.base/java.nio.charset", "java.base/java.lang.reflect", + "java.logging/java.util.logging", "java.base/java.lang.ref", "java.base/java.util.jar", + "java.base/java.util.zip", "java.base/java.security", "java.base/jdk.internal.misc" + ) + + jvmArgs("--enable-preview", "-XX:+EnableDynamicAgentLoading") + for (module in openModules) { + jvmArgs("--add-opens", "$module=ALL-UNNAMED") + } +} + +// --- JaCoCo Configuration (Translates jacoco-maven-plugin) --- + +tasks.jacocoTestReport { + reports { + xml.required.set(true) // Used for tools like SonarCloud + html.required.set(true) + } + + // Translates + classDirectories.setFrom( + sourceSets.main.get().output.asFileTree.matching { + exclude("**/*Names*", "org/bukkit/Material*") + } + ) +} + +// --- Javadoc and Source Jar (Translates maven-javadoc-plugin & maven-source-plugin) --- + +// Configures the Javadoc task +tasks.javadoc { + source = sourceSets.main.get().allJava + options { + (this as StandardJavadocDocletOptions).apply { + addStringOption("Xdoclint:none", "-quiet") + source = javaVersion + } + } +} + +// Creates the -sources.jar file (Translates maven-source-plugin execution) +tasks.register("sourcesJar") { + archiveClassifier.set("sources") + from(sourceSets.main.get().allSource) +} + +// Creates the -javadoc.jar file (Translates maven-javadoc-plugin execution) +tasks.register("javadocJar") { + archiveClassifier.set("javadoc") + from(tasks.javadoc) +} + +// --- Publishing (Translates ) --- + +// Attaches source/javadoc to the publishing configuration +publishing { + publications { + create("mavenJava") { + // Use the shaded JAR as the main artifact + artifact(tasks.shadowJar.get()) { + builtBy(tasks.shadowJar) + } + + // Attach sources and Javadocs + artifact(tasks.getByName("sourcesJar")) + artifact(tasks.getByName("javadocJar")) + + // Set coordinates + groupId = project.group as String + artifactId = rootProject.name + version = project.version as String + } + } + + // Defines the repository (Translates in ) + repositories { + maven { + name = "bentoboxworld" + url = uri("https://repo.codemc.org/repository/bentoboxworld/") + } + } +} diff --git a/build.old b/build.old new file mode 100644 index 000000000..2ada442c2 --- /dev/null +++ b/build.old @@ -0,0 +1,140 @@ +/* + * This file was generated by the Gradle 'init' task. + */ + +plugins { + `java-library` + `maven-publish` +} + +repositories { + mavenLocal() + maven { + url = uri("https://jitpack.io") + } + + maven { + url = uri("https://repo.codemc.org/repository/maven-public") + } + + maven { + url = uri("https://repo.papermc.io/repository/maven-public/") + } + + maven { + url = uri("https://libraries.minecraft.net/") + } + + maven { + url = uri("https://hub.spigotmc.org/nexus/content/repositories/snapshots") + } + + maven { + url = uri("https://repo.codemc.io/repository/nms/") + } + + maven { + url = uri("https://ci.mg-dev.eu/plugin/repository/everything") + } + + maven { + url = uri("https://repo.onarandombox.com/multiverse-releases") + } + + maven { + url = uri("https://repo.onarandombox.com/multiverse-snapshots") + } + + maven { + url = uri("https://mvn.lumine.io/repository/maven-public/") + } + + maven { + url = uri("https://repo.clojars.org/") + } + + maven { + url = uri("https://repo.fancyplugins.de/releases") + } + + maven { + url = uri("https://repo.pyr.lol/snapshots") + } + + maven { + url = uri("https://maven.devs.beer/") + } + + maven { + url = uri("https://repo.oraxen.com/releases") + } + + maven { + url = uri("https://repo.codemc.org/repository/bentoboxworld/") + } + + maven { + url = uri("https://repo.maven.apache.org/maven2/") + } +} + +dependencies { + api(libs.org.bstats.bstats.bukkit) + api(libs.javax.xml.bind.jaxb.api) + api(libs.com.github.marcono1234.gson.record.type.adapter.factory) + api(libs.org.eclipse.jdt.org.eclipse.jdt.annotation) + api(libs.com.github.puregero.multilib) + testImplementation(libs.com.github.mockbukkit.mockbukkit) + testImplementation(libs.org.junit.jupiter.junit.jupiter.api) + testImplementation(libs.org.junit.jupiter.junit.jupiter.engine) + testImplementation(libs.org.mockito.mockito.junit.jupiter) + testImplementation(libs.org.mockito.mockito.core) + testImplementation(libs.org.awaitility.awaitility) + compileOnly(libs.io.papermc.paper.paper.api) + compileOnly(libs.org.spigotmc.spigot.api) + compileOnly(libs.org.spigotmc..spigot) + compileOnly(libs.org.spigotmc...spigot) + compileOnly(libs.org.spigotmc....spigot) + compileOnly(libs.org.spigotmc.....spigot) + compileOnly(libs.org.mongodb.mongodb.driver) + compileOnly(libs.com.zaxxer.hikaricp) + compileOnly(libs.com.github.milkbowl.vaultapi) + compileOnly(libs.me.clip.placeholderapi) + compileOnly(libs.com.bergerkiller.bukkit.myworlds) + compileOnly(libs.io.lumine.mythic.dist) + compileOnly(libs.org.mvplugins.multiverse.core.multiverse.core) + compileOnly(libs.com.onarandombox.multiversecore.multiverse.core) + compileOnly(libs.com.github.apachezy.langutils) + compileOnly(libs.org.spigotmc.spigot) + compileOnly(libs.com.github.slimefun.slimefun4) + compileOnly(libs.dev.lone.api.itemsadder) + compileOnly(libs.io.th0rgal.oraxen) + compileOnly(libs.de.oliver.fancynpcs) + compileOnly(libs.lol.pyr.znpcsplus.api) + compileOnly(libs.de.oliver.fancyholograms) + compileOnly(libs.world.bentobox.level) +} + +group = "world.bentobox" +version = "3.10.2-SNAPSHOT" +description = "BentoBox" +java.sourceCompatibility = JavaVersion.VERSION_1_8 + +java { + withSourcesJar() + withJavadocJar() +} + +publishing { + publications.create("maven") { + from(components["java"]) + } +} + +tasks.withType() { + options.encoding = "UTF-8" +} + +tasks.withType() { + options.encoding = "UTF-8" +} diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml new file mode 100644 index 000000000..d2b132ebd --- /dev/null +++ b/gradle/libs.versions.toml @@ -0,0 +1,66 @@ +# This file was generated by the Gradle 'init' task. +# https://docs.gradle.org/current/userguide/platforms.html#sub::toml-dependencies-format + +[versions] +com-bergerkiller-bukkit-myworlds = "1.19.3-v1" +com-github-apachezy-langutils = "3.2.2" +com-github-marcono1234-gson-record-type-adapter-factory = "0.3.0" +com-github-milkbowl-vaultapi = "1.7.1" +com-github-mockbukkit-mockbukkit = "v1.21-SNAPSHOT" +com-github-puregero-multilib = "1.1.13" +com-github-slimefun-slimefun4 = "RC-37" +com-onarandombox-multiversecore-multiverse-core = "4.3.16" +com-zaxxer-hikaricp = "5.0.1" +de-oliver-fancyholograms = "2.4.1" +de-oliver-fancynpcs = "2.4.4" +dev-lone-api-itemsadder = "4.0.2-beta-release-11" +io-lumine-mythic-dist = "5.9.5" +io-papermc-paper-paper-api = "1.21.10-R0.1-SNAPSHOT" +io-th0rgal-oraxen = "1.193.1" +javax-xml-bind-jaxb-api = "2.3.0" +lol-pyr-znpcsplus-api = "2.0.0-SNAPSHOT" +me-clip-placeholderapi = "2.10.9" +org-awaitility-awaitility = "4.2.2" +org-bstats-bstats-bukkit = "3.0.0" +org-eclipse-jdt-org-eclipse-jdt-annotation = "2.2.600" +org-junit-jupiter-junit-jupiter-api = "5.10.2" +org-junit-jupiter-junit-jupiter-engine = "5.10.2" +org-mockito-mockito-core = "5.11.0" +org-mockito-mockito-junit-jupiter = "5.11.0" +org-mongodb-mongodb-driver = "3.12.12" +org-mvplugins-multiverse-core-multiverse-core = "5.0.0-SNAPSHOT" +org-spigotmc-spigot = "1.21.10-R0.1-SNAPSHOT" +org-spigotmc-spigot-api = "1.21.10-R0.1-SNAPSHOT" +world-bentobox-level = "2.21.3" + +[libraries] +com-bergerkiller-bukkit-myworlds = { module = "com.bergerkiller.bukkit:MyWorlds", version.ref = "com-bergerkiller-bukkit-myworlds" } +com-github-apachezy-langutils = { module = "com.github.apachezy:LangUtils", version.ref = "com-github-apachezy-langutils" } +com-github-marcono1234-gson-record-type-adapter-factory = { module = "com.github.Marcono1234:gson-record-type-adapter-factory", version.ref = "com-github-marcono1234-gson-record-type-adapter-factory" } +com-github-milkbowl-vaultapi = { module = "com.github.MilkBowl:VaultAPI", version.ref = "com-github-milkbowl-vaultapi" } +com-github-mockbukkit-mockbukkit = { module = "com.github.MockBukkit:MockBukkit", version.ref = "com-github-mockbukkit-mockbukkit" } +com-github-puregero-multilib = { module = "com.github.puregero:multilib", version.ref = "com-github-puregero-multilib" } +com-github-slimefun-slimefun4 = { module = "com.github.Slimefun:Slimefun4", version.ref = "com-github-slimefun-slimefun4" } +com-onarandombox-multiversecore-multiverse-core = { module = "com.onarandombox.multiversecore:multiverse-core", version.ref = "com-onarandombox-multiversecore-multiverse-core" } +com-zaxxer-hikaricp = { module = "com.zaxxer:HikariCP", version.ref = "com-zaxxer-hikaricp" } +de-oliver-fancyholograms = { module = "de.oliver:FancyHolograms", version.ref = "de-oliver-fancyholograms" } +de-oliver-fancynpcs = { module = "de.oliver:FancyNpcs", version.ref = "de-oliver-fancynpcs" } +dev-lone-api-itemsadder = { module = "dev.lone:api-itemsadder", version.ref = "dev-lone-api-itemsadder" } +io-lumine-mythic-dist = { module = "io.lumine:Mythic-Dist", version.ref = "io-lumine-mythic-dist" } +io-papermc-paper-paper-api = { module = "io.papermc.paper:paper-api", version.ref = "io-papermc-paper-paper-api" } +io-th0rgal-oraxen = { module = "io.th0rgal:oraxen", version.ref = "io-th0rgal-oraxen" } +javax-xml-bind-jaxb-api = { module = "javax.xml.bind:jaxb-api", version.ref = "javax-xml-bind-jaxb-api" } +lol-pyr-znpcsplus-api = { module = "lol.pyr:znpcsplus-api", version.ref = "lol-pyr-znpcsplus-api" } +me-clip-placeholderapi = { module = "me.clip:placeholderapi", version.ref = "me-clip-placeholderapi" } +org-awaitility-awaitility = { module = "org.awaitility:awaitility", version.ref = "org-awaitility-awaitility" } +org-bstats-bstats-bukkit = { module = "org.bstats:bstats-bukkit", version.ref = "org-bstats-bstats-bukkit" } +org-eclipse-jdt-org-eclipse-jdt-annotation = { module = "org.eclipse.jdt:org.eclipse.jdt.annotation", version.ref = "org-eclipse-jdt-org-eclipse-jdt-annotation" } +org-junit-jupiter-junit-jupiter-api = { module = "org.junit.jupiter:junit-jupiter-api", version.ref = "org-junit-jupiter-junit-jupiter-api" } +org-junit-jupiter-junit-jupiter-engine = { module = "org.junit.jupiter:junit-jupiter-engine", version.ref = "org-junit-jupiter-junit-jupiter-engine" } +org-mockito-mockito-core = { module = "org.mockito:mockito-core", version.ref = "org-mockito-mockito-core" } +org-mockito-mockito-junit-jupiter = { module = "org.mockito:mockito-junit-jupiter", version.ref = "org-mockito-mockito-junit-jupiter" } +org-mongodb-mongodb-driver = { module = "org.mongodb:mongodb-driver", version.ref = "org-mongodb-mongodb-driver" } +org-mvplugins-multiverse-core-multiverse-core = { module = "org.mvplugins.multiverse.core:multiverse-core", version.ref = "org-mvplugins-multiverse-core-multiverse-core" } +org-spigotmc-spigot = { module = "org.spigotmc:spigot", version.ref = "org-spigotmc-spigot" } +org-spigotmc-spigot-api = { module = "org.spigotmc:spigot-api", version.ref = "org-spigotmc-spigot-api" } +world-bentobox-level = { module = "world.bentobox:level", version.ref = "world-bentobox-level" } diff --git a/gradle/wrapper/grade-wrapper.properties b/gradle/wrapper/grade-wrapper.properties new file mode 100644 index 000000000..6e2914a22 --- /dev/null +++ b/gradle/wrapper/grade-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip +distributionPath=wrapper/dists +zipStorePath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 000000000..df97d72b8 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100755 index 000000000..f5feea6d6 --- /dev/null +++ b/gradlew @@ -0,0 +1,252 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# SPDX-License-Identifier: Apache-2.0 +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s +' "$PWD" ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 000000000..9b42019c7 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,94 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/plugin.yml b/plugin.yml new file mode 100644 index 000000000..7836372ac --- /dev/null +++ b/plugin.yml @@ -0,0 +1,66 @@ +name: BentoBox +main: world.bentobox.bentobox.BentoBox +version: 3.10.2-LOCAL-SNAPSHOT-LOCAL +api-version: "1.21" + +authors: [tastybento, Poslovitch] +contributors: ["The BentoBoxWorld Community"] +website: https://bentobox.world +description: + +load: STARTUP + +loadbefore: [Pladdon, Multiverse-Core, My_Worlds, Residence] + +softdepend: + - Citizens + - Vault + - PlaceholderAPI + - dynmap + - BsbMongo + - AdvancedChests + - LangUtils + - WildStacker + - LuckPerms + - EconomyPlus + - MythicMobs + - ZNPCsPlus + - FancyNpcs + - FancyHolograms + +libraries: + - mysql:mysql-connector-java:8.0.27 + - org.mariadb.jdbc:mariadb-java-client:3.0.5 + - org.postgresql:postgresql:42.2.18 + - org.mongodb:mongodb-driver:3.12.12 + - com.zaxxer:HikariCP:5.0.1 + +permissions: + bentobox.admin: + description: Allows admin command usage + default: op + children: + bentobox.admin.catalog: + description: Allows to use /bentobox catalog + default: op + bentobox.admin.locale: + description: Allows to use /bentobox locale + default: op + bentobox.admin.manage: + description: Allows to use /bentobox manage + default: op + bentobox.admin.migrate: + description: Allows to use /bentobox migrate + default: op + bentobox.admin.reload: + description: Allows to use /bentobox reload + default: op + bentobox.about: + description: Allows to use /bentobox about + default: true + bentobox.version: + description: Allows to use /bentobox version + default: op + bentobox.perms: + description: Allow use of '/bentobox perms' command + default: op diff --git a/pom.xml b/pom.xml deleted file mode 100644 index dfc1caa5a..000000000 --- a/pom.xml +++ /dev/null @@ -1,718 +0,0 @@ - - - 4.0.0 - - world.bentobox - bentobox - ${revision} - - BentoBox - Highly scalable and customizable Minecraft Spigot plugin that enables you to run island-type gamemodes. - https://github.com/BentoBoxWorld/BentoBox - 2017 - - - - tastybento - tastybento@bentobox.world - -8 - - Developer - - - - - - scm:git:https://github.com/BentoBoxWorld/BentoBox.git - scm:git:git@github.com:BentoBoxWorld/BentoBox.git - https://github.com/BentoBoxWorld/BentoBox - - - - jenkins - https://ci.codemc.org/job/BentoBoxWorld/job/BentoBox - - - - GitHub - https://github.com/BentoBoxWorld/BentoBox/issues - - - - - bentoboxworld - https://repo.codemc.org/repository/bentoboxworld/ - - - - - UTF-8 - UTF-8 - 21 - - 5.10.2 - 5.11.0 - v1.21-SNAPSHOT - - 3.12.12 - 3.0.5 - 8.0.27 - 42.2.18 - 5.0.1 - - 1.21.10-R0.1-SNAPSHOT - - 1.21.10-R0.1-SNAPSHOT - 3.0.0 - 1.7.1 - 2.21.3 - 2.10.9 - d5f5e0bbd8 - 1.19.3-v1 - - ${build.version}-SNAPSHOT - - -LOCAL - - 3.10.2 - bentobox-world - https://sonarcloud.io - ${project.basedir}/lib - - - - - - - - ci - - - env.BUILD_NUMBER - - - - - -b${env.BUILD_NUMBER} - - - - - - - - master - - - env.GIT_BRANCH - origin/master - - - - - - ${build.version} - - - - - - - - - apache.snapshots - https://repository.apache.org/snapshots/ - - - - - - jitpack.io - https://jitpack.io - - - codemc-repo - https://repo.codemc.org/repository/maven-public - - - papermc - https://repo.papermc.io/repository/maven-public/ - - - minecraft-repo - https://libraries.minecraft.net/ - - - - spigot-repo - https://hub.spigotmc.org/nexus/content/repositories/snapshots - - - nms-repo - https://repo.codemc.io/repository/nms/ - - - - MG-Dev Jenkins CI Maven Repository - https://ci.mg-dev.eu/plugin/repository/everything - - - - multiverse-multiverse-releases - Multiverse Repository - https://repo.onarandombox.com/multiverse-releases - - - multiverse-multiverse-snapshots - Multiverse Repository - https://repo.onarandombox.com/multiverse-snapshots - - - - nexus - Lumine Releases - https://mvn.lumine.io/repository/maven-public/ - - - - clojars - https://repo.clojars.org/ - - - - fancyplugins-releases - FancyPlugins Repository - https://repo.fancyplugins.de/releases - - - - pyr-snapshots - Pyr's Repo - https://repo.pyr.lol/snapshots - - - - matteodev - https://maven.devs.beer/ - - - - oraxen - Oraxen Repository - https://repo.oraxen.com/releases - - - - bentoboxworld - https://repo.codemc.org/repository/bentoboxworld/ - - - - - - - com.github.MockBukkit - MockBukkit - ${mock-bukkit.version} - test - - - - org.junit.jupiter - junit-jupiter-api - ${junit.version} - test - - - org.junit.jupiter - junit-jupiter-engine - ${junit.version} - test - - - org.mockito - mockito-junit-jupiter - 5.11.0 - test - - - org.mockito - mockito-core - ${mockito.version} - test - - - - org.awaitility - awaitility - 4.2.2 - test - - - - io.papermc.paper - paper-api - ${paper.version} - provided - - - - org.spigotmc - spigot-api - ${spigot.version} - provided - - - org.spigotmc. - spigot - 1.21.6-R0.1-SNAPSHOT - provided - - - org.spigotmc.. - spigot - 1.21.5-R0.1-SNAPSHOT - provided - - - org.spigotmc... - spigot - 1.21.4-R0.1-SNAPSHOT - provided - - - org.spigotmc.... - spigot - 1.21.3-R0.1-SNAPSHOT - provided - - - - org.bstats - bstats-bukkit - ${bstats.version} - - - - org.mongodb - mongodb-driver - ${mongodb.version} - provided - - - - com.zaxxer - HikariCP - ${hikaricp.version} - provided - - - - - com.github.MilkBowl - VaultAPI - ${vault.version} - provided - - - - me.clip - placeholderapi - ${placeholderapi.version} - provided - - - - com.bergerkiller.bukkit - MyWorlds - ${myworlds.version} - provided - - - io.lumine - Mythic-Dist - 5.9.5 - provided - - - org.mvplugins.multiverse.core - multiverse-core - 5.0.0-SNAPSHOT - provided - - - com.onarandombox.multiversecore - multiverse-core - 4.3.16 - provided - - - - - javax.xml.bind - jaxb-api - 2.3.0 - - - com.github.Marcono1234 - gson-record-type-adapter-factory - 0.3.0 - - - - - org.eclipse.jdt - org.eclipse.jdt.annotation - 2.2.600 - - - - com.github.apachezy - LangUtils - 3.2.2 - provided - - - - org.spigotmc - spigot - ${spigot.version} - provided - - - - com.github.Slimefun - Slimefun4 - RC-37 - provided - - - - dev.lone - api-itemsadder - 4.0.2-beta-release-11 - provided - - - - io.th0rgal - oraxen - 1.193.1 - - - me.gabytm.util - actions-spigot - - - org.jetbrains - annotations - - - com.ticxo - PlayerAnimator - - - com.github.stefvanschie.inventoryframework - IF - - - io.th0rgal - protectionlib - - - dev.triumphteam - triumph-gui - - - org.bstats - bstats-bukkit - - - com.jeff-media - custom-block-data - - - com.jeff-media - persistent-data-serializer - - - com.jeff_media - MorePersistentDataTypes - - - gs.mclo - java - - - provided - - - - com.github.puregero - multilib - 1.1.13 - compile - - - - de.oliver - FancyNpcs - 2.4.4 - provided - - - - lol.pyr - znpcsplus-api - 2.0.0-SNAPSHOT - provided - - - - de.oliver - FancyHolograms - 2.4.1 - provided - - - - world.bentobox - level - ${level.version} - provided - - - - - - - - - - - ${project.name}-${revision}${build.number} - - clean package - - - src/main/resources - true - - - src/main/resources/locales - ./locales - false - - - - - org.apache.maven.plugins - maven-clean-plugin - 3.1.0 - - - org.apache.maven.plugins - maven-resources-plugin - 3.2.0 - - - org.apache.maven.plugins - maven-compiler-plugin - 3.14.1 - - ${java.version} - - - - org.apache.maven.plugins - maven-surefire-plugin - 3.5.4 - - - - -XX:+EnableDynamicAgentLoading - - --add-opens java.base/java.lang=ALL-UNNAMED - --add-opens java.base/java.math=ALL-UNNAMED - --add-opens java.base/java.io=ALL-UNNAMED - --add-opens java.base/java.util=ALL-UNNAMED - --add-opens java.base/java.util.stream=ALL-UNNAMED - --add-opens java.base/java.text=ALL-UNNAMED - --add-opens java.base/java.util.regex=ALL-UNNAMED - --add-opens java.base/java.nio.channels.spi=ALL-UNNAMED - --add-opens java.base/sun.nio.ch=ALL-UNNAMED - --add-opens java.base/java.net=ALL-UNNAMED - --add-opens java.base/java.util.concurrent=ALL-UNNAMED - --add-opens java.base/sun.nio.fs=ALL-UNNAMED - --add-opens java.base/sun.nio.cs=ALL-UNNAMED - --add-opens java.base/java.nio.file=ALL-UNNAMED - --add-opens java.base/java.nio.charset=ALL-UNNAMED - --add-opens java.base/java.lang.reflect=ALL-UNNAMED - --add-opens java.logging/java.util.logging=ALL-UNNAMED - --add-opens java.base/java.lang.ref=ALL-UNNAMED - --add-opens java.base/java.util.jar=ALL-UNNAMED - --add-opens java.base/java.util.zip=ALL-UNNAMED - --add-opens=java.base/java.security=ALL-UNNAMED - --add-opens java.base/jdk.internal.misc=ALL-UNNAMED - - - - - org.apache.maven.plugins - maven-jar-plugin - 3.2.0 - - - org.apache.maven.plugins - maven-javadoc-plugin - 3.4.1 - - ${java.version} - private - true - false - -Xdoclint:none - - ${java.home}/bin/javadoc - - - - attach-javadocs - package - - jar - - - - - - org.apache.maven.plugins - maven-source-plugin - 3.0.1 - - - attach-sources - install - - jar-no-fork - - - - - - org.apache.maven.plugins - maven-shade-plugin - 3.6.0 - - true - ${project.build.directory}/dependency-reduced-pom.xml - - - org.bstats - world.bentobox.bentobox.util.metrics - - - - io.papermc.lib - world.bentobox.bentobox.paperlib - - - com.github.puregero.multilib - world.bentobox.bentobox.multilib - - - - - org.apache.maven.shared:* - org.apache.maven:* - com.google.code.gson:* - org.mongodb:* - org.eclipse.jdt:* - - - - - - package - - shade - - - - - - org.apache.maven.plugins - maven-install-plugin - 2.5.2 - - - org.apache.maven.plugins - maven-deploy-plugin - 2.8.2 - - - default-deploy - deploy - - deploy - - - - - - org.jacoco - jacoco-maven-plugin - 0.8.13 - - true - - - **/*Names* - - org/bukkit/Material* - - - - - prepare-agent - - prepare-agent - - - - report - - report - - - - XML - - - - - - - - diff --git a/settings.gradle.kts b/settings.gradle.kts new file mode 100644 index 000000000..52374bf30 --- /dev/null +++ b/settings.gradle.kts @@ -0,0 +1,5 @@ +/* + * This file was generated by the Gradle 'init' task. + */ + +rootProject.name = "bentobox" diff --git a/src/main/java/world/bentobox/bentobox/nms/v1_21_5_R0_1_SNAPSHOT/GetMetaData.java b/src/main/java/world/bentobox/bentobox/nms/v1_21_5_R0_1_SNAPSHOT/GetMetaData.java deleted file mode 100644 index 530bc966e..000000000 --- a/src/main/java/world/bentobox/bentobox/nms/v1_21_5_R0_1_SNAPSHOT/GetMetaData.java +++ /dev/null @@ -1,22 +0,0 @@ -package world.bentobox.bentobox.nms.v1_21_5_R0_1_SNAPSHOT; - -import org.bukkit.Location; -import org.bukkit.block.Block; -import org.bukkit.craftbukkit.v1_21_R4.CraftWorld; - -import net.minecraft.core.BlockPosition; -import net.minecraft.world.level.block.entity.TileEntity; -import world.bentobox.bentobox.nms.AbstractMetaData; - -public class GetMetaData extends AbstractMetaData { - - @Override - public String nmsData(Block block) { - Location w = block.getLocation(); - CraftWorld cw = (CraftWorld) w.getWorld(); // CraftWorld is NMS one - // for 1.13+ (we have use WorldServer) - TileEntity te = cw.getHandle().c_(new BlockPosition(w.getBlockX(), w.getBlockY(), w.getBlockZ())); - return getData(te, "getUpdatePacket", "tag"); - } - -} \ No newline at end of file diff --git a/src/main/java/world/bentobox/bentobox/nms/v1_21_5_R0_1_SNAPSHOT/PasteHandlerImpl.java b/src/main/java/world/bentobox/bentobox/nms/v1_21_5_R0_1_SNAPSHOT/PasteHandlerImpl.java deleted file mode 100644 index 6dcdec507..000000000 --- a/src/main/java/world/bentobox/bentobox/nms/v1_21_5_R0_1_SNAPSHOT/PasteHandlerImpl.java +++ /dev/null @@ -1,74 +0,0 @@ -package world.bentobox.bentobox.nms.v1_21_5_R0_1_SNAPSHOT; - -import java.util.concurrent.CompletableFuture; - -import org.bukkit.Location; -import org.bukkit.block.Block; -import org.bukkit.block.data.BlockData; -import org.bukkit.craftbukkit.v1_21_R4.CraftWorld; -import org.bukkit.craftbukkit.v1_21_R4.block.data.CraftBlockData; - -import net.minecraft.core.BlockPosition; -import net.minecraft.world.level.block.state.IBlockData; -import net.minecraft.world.level.chunk.Chunk; -import world.bentobox.bentobox.blueprints.dataobjects.BlueprintBlock; -import world.bentobox.bentobox.database.objects.Island; -import world.bentobox.bentobox.nms.PasteHandler; -import world.bentobox.bentobox.util.DefaultPasteUtil; -import world.bentobox.bentobox.util.Util; - -public class PasteHandlerImpl implements PasteHandler { - - protected static final IBlockData AIR = ((CraftBlockData) AIR_BLOCKDATA).getState(); - - /** - * Set the block to the location - * - * @param island - island - * @param location - location - * @param bpBlock - blueprint block - */ - @Override - public CompletableFuture setBlock(Island island, Location location, BlueprintBlock bpBlock) { - return Util.getChunkAtAsync(location).thenRun(() -> { - Block block = setBlock(location, DefaultPasteUtil.createBlockData(bpBlock)); - DefaultPasteUtil.setBlockState(island, block, bpBlock); - // Set biome - if (bpBlock.getBiome() != null) { - block.setBiome(bpBlock.getBiome()); - } - }); - } - - @Override - public Block setBlock(Location location, BlockData bd) { - Block block = location.getBlock(); - // Set the block data - default is AIR - CraftBlockData craft = (CraftBlockData) bd; - net.minecraft.world.level.World nmsWorld = ((CraftWorld) location.getWorld()).getHandle(); - Chunk nmsChunk = nmsWorld.d(location.getBlockX() >> 4, location.getBlockZ() >> 4); - BlockPosition bp = new BlockPosition(location.getBlockX(), location.getBlockY(), location.getBlockZ()); - // Setting the block to air before setting to another state prevents some console errors - // If the block is a naturally generated tile entity that needs filling, e.g., a chest, then this kind of pasting can cause console errors due to race condition - // so the try's are there to try and catch the errors. - try { - nmsChunk.a(bp, AIR, 0); - } catch (Exception e) { - e.printStackTrace(); - // Ignore - } - try { - nmsChunk.a(bp, craft.getState(), 0); - } catch (Exception e) { - e.printStackTrace(); - // Ignore - } - try { - block.setBlockData(bd, false); - } catch (Exception e) { - e.printStackTrace(); - // Ignore - } - return block; - } -} diff --git a/src/main/java/world/bentobox/bentobox/nms/v1_21_5_R0_1_SNAPSHOT/WorldRegeneratorImpl.java b/src/main/java/world/bentobox/bentobox/nms/v1_21_5_R0_1_SNAPSHOT/WorldRegeneratorImpl.java deleted file mode 100644 index f50874659..000000000 --- a/src/main/java/world/bentobox/bentobox/nms/v1_21_5_R0_1_SNAPSHOT/WorldRegeneratorImpl.java +++ /dev/null @@ -1,26 +0,0 @@ -package world.bentobox.bentobox.nms.v1_21_5_R0_1_SNAPSHOT; - -import org.bukkit.block.data.BlockData; -import org.bukkit.craftbukkit.v1_21_R4.CraftWorld; -import org.bukkit.craftbukkit.v1_21_R4.block.data.CraftBlockData; - -import net.minecraft.core.BlockPosition; -import net.minecraft.world.level.World; -import net.minecraft.world.level.chunk.Chunk; -import world.bentobox.bentobox.nms.CopyWorldRegenerator; - -public class WorldRegeneratorImpl extends CopyWorldRegenerator { - - @Override - public void setBlockInNativeChunk(org.bukkit.Chunk chunk, int x, int y, int z, BlockData blockData, - boolean applyPhysics) { - CraftBlockData craft = (CraftBlockData) blockData; - World nmsWorld = ((CraftWorld) chunk.getWorld()).getHandle(); - Chunk nmsChunk = nmsWorld.d(chunk.getX(), chunk.getZ()); - BlockPosition bp = new BlockPosition((chunk.getX() << 4) + x, y, (chunk.getZ() << 4) + z); - // Setting the block to air before setting to another state prevents some console errors - nmsChunk.a(bp, PasteHandlerImpl.AIR, applyPhysics ? 1 : 0); - nmsChunk.a(bp, craft.getState(), applyPhysics ? 1 : 0); - } - -} \ No newline at end of file diff --git a/src/main/java/world/bentobox/bentobox/nms/v1_21_6_R0_1_SNAPSHOT/GetMetaData.java b/src/main/java/world/bentobox/bentobox/nms/v1_21_6_R0_1_SNAPSHOT/GetMetaData.java deleted file mode 100644 index c04dd8b72..000000000 --- a/src/main/java/world/bentobox/bentobox/nms/v1_21_6_R0_1_SNAPSHOT/GetMetaData.java +++ /dev/null @@ -1,22 +0,0 @@ -package world.bentobox.bentobox.nms.v1_21_6_R0_1_SNAPSHOT; - -import org.bukkit.Location; -import org.bukkit.block.Block; -import org.bukkit.craftbukkit.v1_21_R5.CraftWorld; - -import net.minecraft.core.BlockPosition; -import net.minecraft.world.level.block.entity.TileEntity; -import world.bentobox.bentobox.nms.AbstractMetaData; - -public class GetMetaData extends AbstractMetaData { - - @Override - public String nmsData(Block block) { - Location w = block.getLocation(); - CraftWorld cw = (CraftWorld) w.getWorld(); // CraftWorld is NMS one - // for 1.13+ (we have use WorldServer) - TileEntity te = cw.getHandle().c_(new BlockPosition(w.getBlockX(), w.getBlockY(), w.getBlockZ())); - return getData(te, "getUpdatePacket", "tag"); - } - -} \ No newline at end of file diff --git a/src/main/java/world/bentobox/bentobox/nms/v1_21_6_R0_1_SNAPSHOT/PasteHandlerImpl.java b/src/main/java/world/bentobox/bentobox/nms/v1_21_6_R0_1_SNAPSHOT/PasteHandlerImpl.java deleted file mode 100644 index b25795ee6..000000000 --- a/src/main/java/world/bentobox/bentobox/nms/v1_21_6_R0_1_SNAPSHOT/PasteHandlerImpl.java +++ /dev/null @@ -1,74 +0,0 @@ -package world.bentobox.bentobox.nms.v1_21_6_R0_1_SNAPSHOT; - -import java.util.concurrent.CompletableFuture; - -import org.bukkit.Location; -import org.bukkit.block.Block; -import org.bukkit.block.data.BlockData; -import org.bukkit.craftbukkit.v1_21_R5.CraftWorld; -import org.bukkit.craftbukkit.v1_21_R5.block.data.CraftBlockData; - -import net.minecraft.core.BlockPosition; -import net.minecraft.world.level.block.state.IBlockData; -import net.minecraft.world.level.chunk.Chunk; -import world.bentobox.bentobox.blueprints.dataobjects.BlueprintBlock; -import world.bentobox.bentobox.database.objects.Island; -import world.bentobox.bentobox.nms.PasteHandler; -import world.bentobox.bentobox.util.DefaultPasteUtil; -import world.bentobox.bentobox.util.Util; - -public class PasteHandlerImpl implements PasteHandler { - - protected static final IBlockData AIR = ((CraftBlockData) AIR_BLOCKDATA).getState(); - - /** - * Set the block to the location - * - * @param island - island - * @param location - location - * @param bpBlock - blueprint block - */ - @Override - public CompletableFuture setBlock(Island island, Location location, BlueprintBlock bpBlock) { - return Util.getChunkAtAsync(location).thenRun(() -> { - Block block = setBlock(location, DefaultPasteUtil.createBlockData(bpBlock)); - DefaultPasteUtil.setBlockState(island, block, bpBlock); - // Set biome - if (bpBlock.getBiome() != null) { - block.setBiome(bpBlock.getBiome()); - } - }); - } - - @Override - public Block setBlock(Location location, BlockData bd) { - Block block = location.getBlock(); - // Set the block data - default is AIR - CraftBlockData craft = (CraftBlockData) bd; - net.minecraft.world.level.World nmsWorld = ((CraftWorld) location.getWorld()).getHandle(); - Chunk nmsChunk = nmsWorld.d(location.getBlockX() >> 4, location.getBlockZ() >> 4); - BlockPosition bp = new BlockPosition(location.getBlockX(), location.getBlockY(), location.getBlockZ()); - // Setting the block to air before setting to another state prevents some console errors - // If the block is a naturally generated tile entity that needs filling, e.g., a chest, then this kind of pasting can cause console errors due to race condition - // so the try's are there to try and catch the errors. - try { - nmsChunk.a(bp, AIR, 0); - } catch (Exception e) { - e.printStackTrace(); - // Ignore - } - try { - nmsChunk.a(bp, craft.getState(), 0); - } catch (Exception e) { - e.printStackTrace(); - // Ignore - } - try { - block.setBlockData(bd, false); - } catch (Exception e) { - e.printStackTrace(); - // Ignore - } - return block; - } -} diff --git a/src/main/java/world/bentobox/bentobox/nms/v1_21_6_R0_1_SNAPSHOT/WorldRegeneratorImpl.java b/src/main/java/world/bentobox/bentobox/nms/v1_21_6_R0_1_SNAPSHOT/WorldRegeneratorImpl.java deleted file mode 100644 index 9b07595f3..000000000 --- a/src/main/java/world/bentobox/bentobox/nms/v1_21_6_R0_1_SNAPSHOT/WorldRegeneratorImpl.java +++ /dev/null @@ -1,26 +0,0 @@ -package world.bentobox.bentobox.nms.v1_21_6_R0_1_SNAPSHOT; - -import org.bukkit.block.data.BlockData; -import org.bukkit.craftbukkit.v1_21_R5.CraftWorld; -import org.bukkit.craftbukkit.v1_21_R5.block.data.CraftBlockData; - -import net.minecraft.core.BlockPosition; -import net.minecraft.world.level.World; -import net.minecraft.world.level.chunk.Chunk; -import world.bentobox.bentobox.nms.CopyWorldRegenerator; - -public class WorldRegeneratorImpl extends CopyWorldRegenerator { - - @Override - public void setBlockInNativeChunk(org.bukkit.Chunk chunk, int x, int y, int z, BlockData blockData, - boolean applyPhysics) { - CraftBlockData craft = (CraftBlockData) blockData; - World nmsWorld = ((CraftWorld) chunk.getWorld()).getHandle(); - Chunk nmsChunk = nmsWorld.d(chunk.getX(), chunk.getZ()); - BlockPosition bp = new BlockPosition((chunk.getX() << 4) + x, y, (chunk.getZ() << 4) + z); - // Setting the block to air before setting to another state prevents some console errors - nmsChunk.a(bp, PasteHandlerImpl.AIR, applyPhysics ? 1 : 0); - nmsChunk.a(bp, craft.getState(), applyPhysics ? 1 : 0); - } - -} \ No newline at end of file diff --git a/src/main/java/world/bentobox/bentobox/nms/v1_21_7_R0_1_SNAPSHOT/GetMetaData.java b/src/main/java/world/bentobox/bentobox/nms/v1_21_7_R0_1_SNAPSHOT/GetMetaData.java deleted file mode 100644 index 868925046..000000000 --- a/src/main/java/world/bentobox/bentobox/nms/v1_21_7_R0_1_SNAPSHOT/GetMetaData.java +++ /dev/null @@ -1,22 +0,0 @@ -package world.bentobox.bentobox.nms.v1_21_7_R0_1_SNAPSHOT; - -import org.bukkit.Location; -import org.bukkit.block.Block; -import org.bukkit.craftbukkit.v1_21_R5.CraftWorld; - -import net.minecraft.core.BlockPosition; -import net.minecraft.world.level.block.entity.TileEntity; -import world.bentobox.bentobox.nms.AbstractMetaData; - -public class GetMetaData extends AbstractMetaData { - - @Override - public String nmsData(Block block) { - Location w = block.getLocation(); - CraftWorld cw = (CraftWorld) w.getWorld(); // CraftWorld is NMS one - // for 1.13+ (we have use WorldServer) - TileEntity te = cw.getHandle().c_(new BlockPosition(w.getBlockX(), w.getBlockY(), w.getBlockZ())); - return getData(te, "getUpdatePacket", "tag"); - } - -} \ No newline at end of file diff --git a/src/main/java/world/bentobox/bentobox/nms/v1_21_7_R0_1_SNAPSHOT/PasteHandlerImpl.java b/src/main/java/world/bentobox/bentobox/nms/v1_21_7_R0_1_SNAPSHOT/PasteHandlerImpl.java deleted file mode 100644 index 6171b4edc..000000000 --- a/src/main/java/world/bentobox/bentobox/nms/v1_21_7_R0_1_SNAPSHOT/PasteHandlerImpl.java +++ /dev/null @@ -1,74 +0,0 @@ -package world.bentobox.bentobox.nms.v1_21_7_R0_1_SNAPSHOT; - -import java.util.concurrent.CompletableFuture; - -import org.bukkit.Location; -import org.bukkit.block.Block; -import org.bukkit.block.data.BlockData; -import org.bukkit.craftbukkit.v1_21_R5.CraftWorld; -import org.bukkit.craftbukkit.v1_21_R5.block.data.CraftBlockData; - -import net.minecraft.core.BlockPosition; -import net.minecraft.world.level.block.state.IBlockData; -import net.minecraft.world.level.chunk.Chunk; -import world.bentobox.bentobox.blueprints.dataobjects.BlueprintBlock; -import world.bentobox.bentobox.database.objects.Island; -import world.bentobox.bentobox.nms.PasteHandler; -import world.bentobox.bentobox.util.DefaultPasteUtil; -import world.bentobox.bentobox.util.Util; - -public class PasteHandlerImpl implements PasteHandler { - - protected static final IBlockData AIR = ((CraftBlockData) AIR_BLOCKDATA).getState(); - - /** - * Set the block to the location - * - * @param island - island - * @param location - location - * @param bpBlock - blueprint block - */ - @Override - public CompletableFuture setBlock(Island island, Location location, BlueprintBlock bpBlock) { - return Util.getChunkAtAsync(location).thenRun(() -> { - Block block = setBlock(location, DefaultPasteUtil.createBlockData(bpBlock)); - DefaultPasteUtil.setBlockState(island, block, bpBlock); - // Set biome - if (bpBlock.getBiome() != null) { - block.setBiome(bpBlock.getBiome()); - } - }); - } - - @Override - public Block setBlock(Location location, BlockData bd) { - Block block = location.getBlock(); - // Set the block data - default is AIR - CraftBlockData craft = (CraftBlockData) bd; - net.minecraft.world.level.World nmsWorld = ((CraftWorld) location.getWorld()).getHandle(); - Chunk nmsChunk = nmsWorld.d(location.getBlockX() >> 4, location.getBlockZ() >> 4); - BlockPosition bp = new BlockPosition(location.getBlockX(), location.getBlockY(), location.getBlockZ()); - // Setting the block to air before setting to another state prevents some console errors - // If the block is a naturally generated tile entity that needs filling, e.g., a chest, then this kind of pasting can cause console errors due to race condition - // so the try's are there to try and catch the errors. - try { - nmsChunk.a(bp, AIR, 0); - } catch (Exception e) { - e.printStackTrace(); - // Ignore - } - try { - nmsChunk.a(bp, craft.getState(), 0); - } catch (Exception e) { - e.printStackTrace(); - // Ignore - } - try { - block.setBlockData(bd, false); - } catch (Exception e) { - e.printStackTrace(); - // Ignore - } - return block; - } -} diff --git a/src/main/java/world/bentobox/bentobox/nms/v1_21_7_R0_1_SNAPSHOT/WorldRegeneratorImpl.java b/src/main/java/world/bentobox/bentobox/nms/v1_21_7_R0_1_SNAPSHOT/WorldRegeneratorImpl.java deleted file mode 100644 index 6f5585293..000000000 --- a/src/main/java/world/bentobox/bentobox/nms/v1_21_7_R0_1_SNAPSHOT/WorldRegeneratorImpl.java +++ /dev/null @@ -1,26 +0,0 @@ -package world.bentobox.bentobox.nms.v1_21_7_R0_1_SNAPSHOT; - -import org.bukkit.block.data.BlockData; -import org.bukkit.craftbukkit.v1_21_R5.CraftWorld; -import org.bukkit.craftbukkit.v1_21_R5.block.data.CraftBlockData; - -import net.minecraft.core.BlockPosition; -import net.minecraft.world.level.World; -import net.minecraft.world.level.chunk.Chunk; -import world.bentobox.bentobox.nms.CopyWorldRegenerator; - -public class WorldRegeneratorImpl extends CopyWorldRegenerator { - - @Override - public void setBlockInNativeChunk(org.bukkit.Chunk chunk, int x, int y, int z, BlockData blockData, - boolean applyPhysics) { - CraftBlockData craft = (CraftBlockData) blockData; - World nmsWorld = ((CraftWorld) chunk.getWorld()).getHandle(); - Chunk nmsChunk = nmsWorld.d(chunk.getX(), chunk.getZ()); - BlockPosition bp = new BlockPosition((chunk.getX() << 4) + x, y, (chunk.getZ() << 4) + z); - // Setting the block to air before setting to another state prevents some console errors - nmsChunk.a(bp, PasteHandlerImpl.AIR, applyPhysics ? 1 : 0); - nmsChunk.a(bp, craft.getState(), applyPhysics ? 1 : 0); - } - -} \ No newline at end of file diff --git a/src/main/java/world/bentobox/bentobox/nms/v1_21_8_R0_1_SNAPSHOT/GetMetaData.java b/src/main/java/world/bentobox/bentobox/nms/v1_21_8_R0_1_SNAPSHOT/GetMetaData.java deleted file mode 100644 index ca171de9c..000000000 --- a/src/main/java/world/bentobox/bentobox/nms/v1_21_8_R0_1_SNAPSHOT/GetMetaData.java +++ /dev/null @@ -1,22 +0,0 @@ -package world.bentobox.bentobox.nms.v1_21_8_R0_1_SNAPSHOT; - -import org.bukkit.Location; -import org.bukkit.block.Block; -import org.bukkit.craftbukkit.v1_21_R5.CraftWorld; - -import net.minecraft.core.BlockPosition; -import net.minecraft.world.level.block.entity.TileEntity; -import world.bentobox.bentobox.nms.AbstractMetaData; - -public class GetMetaData extends AbstractMetaData { - - @Override - public String nmsData(Block block) { - Location w = block.getLocation(); - CraftWorld cw = (CraftWorld) w.getWorld(); // CraftWorld is NMS one - // for 1.13+ (we have use WorldServer) - TileEntity te = cw.getHandle().c_(new BlockPosition(w.getBlockX(), w.getBlockY(), w.getBlockZ())); - return getData(te, "getUpdatePacket", "tag"); - } - -} \ No newline at end of file diff --git a/src/main/java/world/bentobox/bentobox/nms/v1_21_8_R0_1_SNAPSHOT/PasteHandlerImpl.java b/src/main/java/world/bentobox/bentobox/nms/v1_21_8_R0_1_SNAPSHOT/PasteHandlerImpl.java deleted file mode 100644 index f81385102..000000000 --- a/src/main/java/world/bentobox/bentobox/nms/v1_21_8_R0_1_SNAPSHOT/PasteHandlerImpl.java +++ /dev/null @@ -1,74 +0,0 @@ -package world.bentobox.bentobox.nms.v1_21_8_R0_1_SNAPSHOT; - -import java.util.concurrent.CompletableFuture; - -import org.bukkit.Location; -import org.bukkit.block.Block; -import org.bukkit.block.data.BlockData; -import org.bukkit.craftbukkit.v1_21_R5.CraftWorld; -import org.bukkit.craftbukkit.v1_21_R5.block.data.CraftBlockData; - -import net.minecraft.core.BlockPosition; -import net.minecraft.world.level.block.state.IBlockData; -import net.minecraft.world.level.chunk.Chunk; -import world.bentobox.bentobox.blueprints.dataobjects.BlueprintBlock; -import world.bentobox.bentobox.database.objects.Island; -import world.bentobox.bentobox.nms.PasteHandler; -import world.bentobox.bentobox.util.DefaultPasteUtil; -import world.bentobox.bentobox.util.Util; - -public class PasteHandlerImpl implements PasteHandler { - - protected static final IBlockData AIR = ((CraftBlockData) AIR_BLOCKDATA).getState(); - - /** - * Set the block to the location - * - * @param island - island - * @param location - location - * @param bpBlock - blueprint block - */ - @Override - public CompletableFuture setBlock(Island island, Location location, BlueprintBlock bpBlock) { - return Util.getChunkAtAsync(location).thenRun(() -> { - Block block = setBlock(location, DefaultPasteUtil.createBlockData(bpBlock)); - DefaultPasteUtil.setBlockState(island, block, bpBlock); - // Set biome - if (bpBlock.getBiome() != null) { - block.setBiome(bpBlock.getBiome()); - } - }); - } - - @Override - public Block setBlock(Location location, BlockData bd) { - Block block = location.getBlock(); - // Set the block data - default is AIR - CraftBlockData craft = (CraftBlockData) bd; - net.minecraft.world.level.World nmsWorld = ((CraftWorld) location.getWorld()).getHandle(); - Chunk nmsChunk = nmsWorld.d(location.getBlockX() >> 4, location.getBlockZ() >> 4); - BlockPosition bp = new BlockPosition(location.getBlockX(), location.getBlockY(), location.getBlockZ()); - // Setting the block to air before setting to another state prevents some console errors - // If the block is a naturally generated tile entity that needs filling, e.g., a chest, then this kind of pasting can cause console errors due to race condition - // so the try's are there to try and catch the errors. - try { - nmsChunk.a(bp, AIR, 0); - } catch (Exception e) { - e.printStackTrace(); - // Ignore - } - try { - nmsChunk.a(bp, craft.getState(), 0); - } catch (Exception e) { - e.printStackTrace(); - // Ignore - } - try { - block.setBlockData(bd, false); - } catch (Exception e) { - e.printStackTrace(); - // Ignore - } - return block; - } -} diff --git a/src/main/java/world/bentobox/bentobox/nms/v1_21_8_R0_1_SNAPSHOT/WorldRegeneratorImpl.java b/src/main/java/world/bentobox/bentobox/nms/v1_21_8_R0_1_SNAPSHOT/WorldRegeneratorImpl.java deleted file mode 100644 index ce53ff00a..000000000 --- a/src/main/java/world/bentobox/bentobox/nms/v1_21_8_R0_1_SNAPSHOT/WorldRegeneratorImpl.java +++ /dev/null @@ -1,26 +0,0 @@ -package world.bentobox.bentobox.nms.v1_21_8_R0_1_SNAPSHOT; - -import org.bukkit.block.data.BlockData; -import org.bukkit.craftbukkit.v1_21_R5.CraftWorld; -import org.bukkit.craftbukkit.v1_21_R5.block.data.CraftBlockData; - -import net.minecraft.core.BlockPosition; -import net.minecraft.world.level.World; -import net.minecraft.world.level.chunk.Chunk; -import world.bentobox.bentobox.nms.CopyWorldRegenerator; - -public class WorldRegeneratorImpl extends CopyWorldRegenerator { - - @Override - public void setBlockInNativeChunk(org.bukkit.Chunk chunk, int x, int y, int z, BlockData blockData, - boolean applyPhysics) { - CraftBlockData craft = (CraftBlockData) blockData; - World nmsWorld = ((CraftWorld) chunk.getWorld()).getHandle(); - Chunk nmsChunk = nmsWorld.d(chunk.getX(), chunk.getZ()); - BlockPosition bp = new BlockPosition((chunk.getX() << 4) + x, y, (chunk.getZ() << 4) + z); - // Setting the block to air before setting to another state prevents some console errors - nmsChunk.a(bp, PasteHandlerImpl.AIR, applyPhysics ? 1 : 0); - nmsChunk.a(bp, craft.getState(), applyPhysics ? 1 : 0); - } - -} \ No newline at end of file From 5c929712b7c5ac79ad1633b371102610bc0a9f59 Mon Sep 17 00:00:00 2001 From: tastybento Date: Sun, 14 Dec 2025 19:41:27 -0800 Subject: [PATCH 05/21] Remove old file --- build.old | 140 ------------------------------------------------------ 1 file changed, 140 deletions(-) delete mode 100644 build.old diff --git a/build.old b/build.old deleted file mode 100644 index 2ada442c2..000000000 --- a/build.old +++ /dev/null @@ -1,140 +0,0 @@ -/* - * This file was generated by the Gradle 'init' task. - */ - -plugins { - `java-library` - `maven-publish` -} - -repositories { - mavenLocal() - maven { - url = uri("https://jitpack.io") - } - - maven { - url = uri("https://repo.codemc.org/repository/maven-public") - } - - maven { - url = uri("https://repo.papermc.io/repository/maven-public/") - } - - maven { - url = uri("https://libraries.minecraft.net/") - } - - maven { - url = uri("https://hub.spigotmc.org/nexus/content/repositories/snapshots") - } - - maven { - url = uri("https://repo.codemc.io/repository/nms/") - } - - maven { - url = uri("https://ci.mg-dev.eu/plugin/repository/everything") - } - - maven { - url = uri("https://repo.onarandombox.com/multiverse-releases") - } - - maven { - url = uri("https://repo.onarandombox.com/multiverse-snapshots") - } - - maven { - url = uri("https://mvn.lumine.io/repository/maven-public/") - } - - maven { - url = uri("https://repo.clojars.org/") - } - - maven { - url = uri("https://repo.fancyplugins.de/releases") - } - - maven { - url = uri("https://repo.pyr.lol/snapshots") - } - - maven { - url = uri("https://maven.devs.beer/") - } - - maven { - url = uri("https://repo.oraxen.com/releases") - } - - maven { - url = uri("https://repo.codemc.org/repository/bentoboxworld/") - } - - maven { - url = uri("https://repo.maven.apache.org/maven2/") - } -} - -dependencies { - api(libs.org.bstats.bstats.bukkit) - api(libs.javax.xml.bind.jaxb.api) - api(libs.com.github.marcono1234.gson.record.type.adapter.factory) - api(libs.org.eclipse.jdt.org.eclipse.jdt.annotation) - api(libs.com.github.puregero.multilib) - testImplementation(libs.com.github.mockbukkit.mockbukkit) - testImplementation(libs.org.junit.jupiter.junit.jupiter.api) - testImplementation(libs.org.junit.jupiter.junit.jupiter.engine) - testImplementation(libs.org.mockito.mockito.junit.jupiter) - testImplementation(libs.org.mockito.mockito.core) - testImplementation(libs.org.awaitility.awaitility) - compileOnly(libs.io.papermc.paper.paper.api) - compileOnly(libs.org.spigotmc.spigot.api) - compileOnly(libs.org.spigotmc..spigot) - compileOnly(libs.org.spigotmc...spigot) - compileOnly(libs.org.spigotmc....spigot) - compileOnly(libs.org.spigotmc.....spigot) - compileOnly(libs.org.mongodb.mongodb.driver) - compileOnly(libs.com.zaxxer.hikaricp) - compileOnly(libs.com.github.milkbowl.vaultapi) - compileOnly(libs.me.clip.placeholderapi) - compileOnly(libs.com.bergerkiller.bukkit.myworlds) - compileOnly(libs.io.lumine.mythic.dist) - compileOnly(libs.org.mvplugins.multiverse.core.multiverse.core) - compileOnly(libs.com.onarandombox.multiversecore.multiverse.core) - compileOnly(libs.com.github.apachezy.langutils) - compileOnly(libs.org.spigotmc.spigot) - compileOnly(libs.com.github.slimefun.slimefun4) - compileOnly(libs.dev.lone.api.itemsadder) - compileOnly(libs.io.th0rgal.oraxen) - compileOnly(libs.de.oliver.fancynpcs) - compileOnly(libs.lol.pyr.znpcsplus.api) - compileOnly(libs.de.oliver.fancyholograms) - compileOnly(libs.world.bentobox.level) -} - -group = "world.bentobox" -version = "3.10.2-SNAPSHOT" -description = "BentoBox" -java.sourceCompatibility = JavaVersion.VERSION_1_8 - -java { - withSourcesJar() - withJavadocJar() -} - -publishing { - publications.create("maven") { - from(components["java"]) - } -} - -tasks.withType() { - options.encoding = "UTF-8" -} - -tasks.withType() { - options.encoding = "UTF-8" -} From 681c9e7f3de71244eec6649e5176fe0a598f86e2 Mon Sep 17 00:00:00 2001 From: tastybento Date: Sun, 14 Dec 2025 19:44:35 -0800 Subject: [PATCH 06/21] Added documentation --- build.gradle.kts | 802 +++++++++++++++++++++++++++++++++-------------- 1 file changed, 573 insertions(+), 229 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 91067a87b..01aa2d506 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,375 +1,719 @@ -// Apply necessary plugins for Java development, publishing, testing, and shading +/** + * BentoBox Build Configuration (Gradle Kotlin DSL) + * + * This is a direct translation of the Maven pom.xml to Gradle's Kotlin DSL. + * It defines the complete build process for BentoBox, a Paper plugin framework for island-type gamemodes. + * + * Key Features: + * - Java 21 compilation with module access configuration for testing + * - Shadow JAR creation with minimization and class relocation + * - Maven artifact publishing to CodeMC repository + * - JaCoCo code coverage reporting for SonarCloud + * - Placeholder expansion in resource files (plugin.yml, config.yml) + * - CI/CD integration with environment variable-based versioning + */ + +// ============================================================================ +// PLUGINS +// ============================================================================ +// +// Applies Gradle plugins that extend build capabilities with new tasks and features +// plugins { - // Standard Java development plugin + // Standard Java development plugin - provides compile, test, jar, and javadoc tasks + // Documentation: https://docs.gradle.org/current/userguide/java_plugin.html java - // For publishing the artifact (translates ) + // Maven publishing plugin - enables artifact publication to Maven repositories + // Translates Maven's section + // Documentation: https://docs.gradle.org/current/userguide/publishing_maven.html `maven-publish` - // For code coverage (translates jacoco-maven-plugin) + // JaCoCo plugin - generates test code coverage reports + // Translates Maven's jacoco-maven-plugin + // Used to track test coverage metrics for SonarCloud integration id("jacoco") - // For shading, minimization, and relocation (translates maven-shade-plugin) - id("com.gradleup.shadow") version "9.3.0" + // Shadow JAR plugin (v9.3.0 from com.gradleup - the actively maintained fork) + // Creates an "uber JAR" that bundles all dependencies into a single file + // - Version 9.3.0 provides Java 21 compatibility (critical for this project) + // - Translates Maven's maven-shade-plugin + // - Handles JAR minimization, class relocation, and exclusion logic + id("com.gradleup.shadow") version "9.3.0" } -// --- Project Coordinates and Versioning (Translates , , and ) --- +// ============================================================================ +// PROJECT COORDINATES AND VERSIONING +// ============================================================================ +// +// Sets up the Maven artifact coordinates (group ID, artifact ID, version) +// and implements CI/CD-aware versioning based on environment variables. +// +// Translates Maven: , , , and +// -group = "world.bentobox" // From +// Maven group ID - reverse domain notation identifying the organization +group = "world.bentobox" -// Base properties from +// Base version properties from in Maven val buildVersion = "3.10.2" val buildNumberDefault = "-LOCAL" val snapshotSuffix = "-SNAPSHOT" -// CI/CD Logic (Translates Maven ) +// Initialize version with default (local) values var finalBuildNumber = buildNumberDefault var finalRevision = "$buildVersion$finalBuildNumber$snapshotSuffix" -// 'ci' profile logic: Activated by env.BUILD_NUMBER +/** + * CI/CD Profile Logic + * + * Activated when BUILD_NUMBER environment variable is set (Jenkins CI builds) + * Sets version to: 3.10.2-b-SNAPSHOT + * Example: 3.10.2-b42-SNAPSHOT for build #42 + */ val envBuildNumber = System.getenv("BUILD_NUMBER") if (!envBuildNumber.isNullOrBlank()) { - // Override only if necessary (as per POM comment) finalBuildNumber = "-b$envBuildNumber" finalRevision = "$buildVersion$finalBuildNumber$snapshotSuffix" } -// 'master' profile logic: Activated by env.GIT_BRANCH == origin/master +/** + * Master/Release Profile Logic + * + * Activated when GIT_BRANCH environment variable equals "origin/master" + * Sets version to: 3.10.2 (removes -SNAPSHOT suffix for release builds) + * This ensures release builds have clean version numbers without pre-release markers + */ val envGitBranch = System.getenv("GIT_BRANCH") if (envGitBranch == "origin/master") { - // Override revision to remove -SNAPSHOT and set build number to empty string - finalBuildNumber = "" // Empties build number variable. + finalBuildNumber = "" finalRevision = buildVersion } +// Apply the calculated version to the project version = finalRevision -// --- Global Properties (Translates remaining ) --- +// ============================================================================ +// GLOBAL PROPERTIES AND DEPENDENCY VERSIONS +// ============================================================================ +// +// Centralizes all version numbers for dependencies and Java toolchain. +// Defined in two places: +// 1. Kotlin local variables (for use in the build script) +// 2. 'extra' properties map (for use in resource filtering like plugin.yml) +// +// This dual approach ensures consistency between: +// - Build classpath versions (what we compile against) +// - Runtime library declarations in plugin.yml (what the server loads) +// +// Translates Maven: section +// -// Dependency versions (used in dependencies block and throughout) val javaVersion = "21" + +// Library versions - centralized for easy updates +val paperVersion = "1.21.10-R0.1-SNAPSHOT" +val spigotVersion = "1.21.10-R0.1-SNAPSHOT" + +// Testing framework versions val junitVersion = "5.10.2" val mockitoVersion = "5.11.0" val mockBukkitVersion = "v1.21-SNAPSHOT" -val mongodbVersion = "3.12.12" -val mariadbVersion = "3.0.5" -val mysqlVersion = "8.0.27" -val postgresqlVersion = "42.2.18" -val hikaricpVersion = "5.0.1" -val spigotVersion = "1.21.10-R0.1-SNAPSHOT" -val paperVersion = "1.21.10-R0.1-SNAPSHOT" -val bstatsVersion = "3.0.0" + +// Dependency versions - these must match what's declared in plugin.yml resources +val bstatsVersion = "3.0.2" +val mysqlVersion = "8.0.27" // For plugin.yml: library declaration and resource filtering +val mariadbVersion = "3.0.5" // For plugin.yml: library declaration and resource filtering +val postgresqlVersion = "42.2.18" // For plugin.yml: library declaration and resource filtering +val mongodbVersion = "3.12.12" // For plugin.yml: library declaration and resource filtering +val hikaricpVersion = "5.0.1" // For plugin.yml: library declaration and resource filtering + +// Plugin API versions val vaultVersion = "1.7.1" -val levelVersion = "2.21.3" val placeholderapiVersion = "2.11.7" -val myworldsVersion = "1.19.3-v1" -// Also store in extra properties for resource filtering +// World/addon management versions +val myworldsVersion = "2.90" + +/** + * Store all versions in 'extra' properties map + * + * These values are available globally in this build file as: extra["mysql.version"] + * More importantly, they're used in the processResources task to replace placeholders + * in plugin.yml and config.yml during the build. + * + * Example: ${mysql.version} in plugin.yml becomes 8.0.27 in the built JAR + */ extra["java.version"] = javaVersion -extra["junit.version"] = junitVersion -extra["mockito.version"] = mockitoVersion -extra["mock-bukkit.version"] = mockBukkitVersion -extra["mongodb.version"] = mongodbVersion -extra["mariadb.version"] = mariadbVersion extra["mysql.version"] = mysqlVersion +extra["mariadb.version"] = mariadbVersion extra["postgresql.version"] = postgresqlVersion +extra["mongodb.version"] = mongodbVersion extra["hikaricp.version"] = hikaricpVersion -extra["spigot.version"] = spigotVersion -extra["paper.version"] = paperVersion -extra["bstats.version"] = bstatsVersion -extra["vault.version"] = vaultVersion -extra["level.version"] = levelVersion -extra["placeholderapi.version"] = placeholderapiVersion -extra["myworlds.version"] = myworldsVersion -// Define variables used in and build logic -extra["build.version"] = buildVersion -extra["build.number"] = finalBuildNumber -extra["revision"] = finalRevision - - -// --- Java Configuration --- - -// Configures source/target compatibility and toolchain + +// ============================================================================ +// JAVA CONFIGURATION +// ============================================================================ +// +// Configures the Java compilation environment: +// - Sets Java 21 as the target/source version +// - Configures UTF-8 source file encoding +// +// The 'toolchain' feature ensures consistent Java versions across different +// developer machines and CI environments without requiring a pre-installed JDK +// matching the exact version. Gradle can automatically download the specified version. +// + java { - // Uses Java 21 toolchain (as remembered and specified in POM) + // Configures Java toolchain for compilation and runtime toolchain { languageVersion = JavaLanguageVersion.of(javaVersion) } } +// Apply UTF-8 encoding to all Java compilation tasks tasks.withType { - options.encoding = "UTF-8" // From + options.encoding = "UTF-8" // Ensures consistent encoding across all platforms } - -// --- Repositories (Translates ) --- +// ============================================================================ +// MAVEN REPOSITORIES +// ============================================================================ +// +// Defines all Maven repositories from which dependencies are fetched during build. +// Repositories are searched in order, so more specific repositories should come first. +// +// Translates Maven: section +// repositories { - // Default repository for most libraries + // Central Maven Repository - standard location for Java/Gradle libraries + // Contains most open-source Java projects mavenCentral() - // Custom Repositories from POM - maven("https://jitpack.io") { name = "JitPack" } - maven("https://repo.codemc.org/repository/maven-public") { name = "CodeMC-Public" } - maven("https://repo.papermc.io/repository/maven-public/") { name = "PaperMC" } - maven("https://libraries.minecraft.net/") { name = "MinecraftLibs" } - maven("https://hub.spigotmc.org/nexus/content/repositories/snapshots") { name = "Spigot-Snapshots" } - maven("https://repo.codemc.io/repository/nms/") { name = "NMS-Repo" } - maven("https://ci.mg-dev.eu/plugin/repository/everything") { name = "MG-Dev-CI" } - maven("https://repo.onarandombox.com/multiverse-releases") { name = "Multiverse-Releases" } - maven("https://repo.onarandombox.com/multiverse-snapshots") { name = "Multiverse-Snapshots" } - maven("https://mvn.lumine.io/repository/maven-public/") { name = "Lumine-Releases" } - maven("https://repo.clojars.org/") { name = "Clojars" } - maven("https://repo.fancyplugins.de/releases") { name = "FancyPlugins-Releases" } - maven("https://repo.pyr.lol/snapshots") { name = "Pyr-Snapshots" } - maven("https://maven.devs.beer/") { name = "MatteoDev" } - maven("https://repo.oraxen.com/releases") { name = "Oraxen" } - maven("https://repo.codemc.org/repository/bentoboxworld/") { name = "BentoBoxWorld-Repo" } - maven("https://repo.extendedclip.com/releases/") { name = "Placeholder-API-Releases" } + // CodeMC Repository - hosts Bukkit plugin dependencies and custom libraries + maven("https://repo.codemc.io/repository/maven-public/") + + // PaperMC Repository - official repository for Paper API + maven("https://repo.papermc.io/repository/maven-public/") + + // Spigot Repository - Bukkit/Spigot specific plugins and APIs + maven("https://hub.spigotmc.org/nexus/content/repositories/snapshots/") + + // Sonatype Snapshots - pre-release builds of many Java libraries + maven("https://oss.sonatype.org/content/repositories/snapshots/") + + // JitPack - builds dependencies directly from GitHub repositories + // Used for projects that don't publish to central repositories + maven("https://jitpack.io") + + // Multiverse Repository - for Multiverse world management plugins + maven("https://repo.onarandombox.com/content/repositories/thirdparty/") + + // Mythic Mobs Repository - for advanced mob framework + maven("https://mvn.lumine.io/repository/maven/") + + // Vault Repository - economy/permission plugin APIs + maven("https://repo.extendedclip.com/contents/repositories/releases/") + + // PlaceholderAPI Repository - placeholder expansion framework + maven("https://repo.extendedclip.com/contents/repositories/public/") + + // Slimefun Repository - advanced item/machine framework + maven("https://repo.github.com/Slimefun/Slimefun4/") + + // ItemsAdder Repository - custom items and blocks + maven("https://repo.oraxen.com/releases") + + // Oraxen Repository - custom item framework (alternative source) + maven("https://repo.oraxen.com/releases/") + + // FancyNpcs Repository - NPC framework + maven("https://repo.oliver.media/releases") + + // Znpcs+ Repository - NPC framework (alternative) + maven("https://repo.pyr.lol/releases") + + // FancyHolograms Repository - hologram display framework + maven("https://repo.oliver.media/releases") } - -// --- Dependencies (Translates ) --- +// ============================================================================ +// DEPENDENCIES +// ============================================================================ +// +// Declares all external libraries needed for compilation and runtime. +// Dependencies are organized into three scopes: +// +// 1. TEST DEPENDENCIES +// - Used only during test compilation and execution +// - NOT included in the final JAR +// - Examples: JUnit, Mockito, testing frameworks +// +// 2. PROVIDED DEPENDENCIES (compileOnly) +// - Available during compilation but NOT packaged in JAR +// - Provided by the server at runtime +// - Examples: Paper API, plugin APIs (Vault, PlaceholderAPI) +// - Reduces JAR size by avoiding duplicates with server +// +// 3. IMPLEMENTATION DEPENDENCIES +// - Compiled and bundled (shaded) into the final JAR +// - Available at compile time and runtime +// - Shadow plugin handles packaging and relocation +// +// Transitive Dependency Exclusions: +// - Excluded spigot-api from older plugins that would bring in outdated versions +// - Excluded Oraxen's unnecessary dependencies to reduce JAR size +// +// Translates Maven: and sections +// dependencies { - // --- Test Dependencies (test) --- + + // ======================================================================== + // TEST DEPENDENCIES + // ======================================================================== + + // JUnit 5 (Jupiter) Bill of Materials (BOM) + // BOM ensures all JUnit 5 artifacts are version-aligned and compatible + // Must come before individual JUnit dependencies testImplementation(platform("org.junit:junit-bom:$junitVersion")) - testImplementation("org.junit.jupiter:junit-jupiter-api") - testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine") - // Ensure JUnit Platform launcher matches the engine/platform versions + + // JUnit Platform Launcher - required at runtime to discover and execute tests + // Version MUST match the engine version to avoid "OutputDirectoryCreator not available" errors testRuntimeOnly("org.junit.platform:junit-platform-launcher:$junitVersion") + + // JUnit 5 Jupiter - the main testing framework API and implementation + testImplementation("org.junit.jupiter:junit-jupiter") + + // Mockito - mocking library for creating test doubles and verifying behavior + // junit-jupiter variant provides automatic mock extension for @Mock annotations testImplementation("org.mockito:mockito-junit-jupiter:$mockitoVersion") - testImplementation("org.mockito:mockito-core:$mockitoVersion") + + // MockBukkit - in-memory Bukkit server mock + // Allows testing Bukkit plugins without a running server testImplementation("com.github.MockBukkit:MockBukkit:$mockBukkitVersion") + + // Awaitility - utility library for testing asynchronous code + // Provides convenient assertions with timeouts for async operations testImplementation("org.awaitility:awaitility:4.2.2") - // Paper API for test compilation + + // Required APIs for test compilation + // These provide classes that main code uses, needed for test compilation testImplementation("io.papermc.paper:paper-api:1.21.10-R0.1-SNAPSHOT") - // Vault API for test compilation testImplementation("com.github.MilkBowl:VaultAPI:$vaultVersion") - // PlaceholderAPI for test compilation (provides PlaceholderExpansion) testImplementation("me.clip:placeholderapi:$placeholderapiVersion") + testImplementation("commons-lang:commons-lang:2.6") - // --- Provided/Compile-Only Dependencies (provided) --- - //compileOnly("io.papermc.paper:paper-api:$paperVersion") - compileOnly("io.papermc.paper:paper-api:1.21.10-R0.1-SNAPSHOT") + // ======================================================================== + // PROVIDED DEPENDENCIES (compileOnly) + // ======================================================================== + // These are available at compile time but NOT packaged into the JAR + // The server provides them at runtime, so including them would create duplicates + + // Paper API - Modern Bukkit server fork with better APIs and performance // Note: Paper API includes Spigot API, so we don't need to include it separately + compileOnly("io.papermc.paper:paper-api:1.21.10-R0.1-SNAPSHOT") - // Spigot NMS - Used for chunk deletion and pasting + // Spigot NMS (Net Minecraft Server) - Low-level Minecraft server access + // Used for advanced operations like chunk deletion, world cloning, etc. + // Exclude spigot-api because Paper already provides a newer version compileOnly("org.spigotmc:spigot:$spigotVersion") { exclude(group = "org.spigotmc", module = "spigot-api") } - + + // Database drivers - provided scope because servers might supply their own compileOnly("org.mongodb:mongodb-driver:$mongodbVersion") - compileOnly("com.zaxxer:HikariCP:$hikaricpVersion") - compileOnly("com.github.MilkBowl:VaultAPI:$vaultVersion") - compileOnly("me.clip:placeholderapi:$placeholderapiVersion") + compileOnly("com.zaxxer:HikariCP:$hikaricpVersion") // Connection pooling library + + // Server plugin APIs - soft dependencies provided by other plugins on the server + compileOnly("com.github.MilkBowl:VaultAPI:$vaultVersion") // Economy API + compileOnly("me.clip:placeholderapi:$placeholderapiVersion") // Placeholder framework + + // World and island management plugins compileOnly("com.bergerkiller.bukkit:MyWorlds:$myworldsVersion") { + // MyWorlds includes an old spigot-api version that would conflict exclude(group = "org.spigotmc", module = "spigot-api") } + + // Mythic Mobs - advanced mob framework compileOnly("io.lumine:Mythic-Dist:5.9.5") + + // Multiverse - multiple world management plugin (two versions for compatibility) compileOnly("org.mvplugins.multiverse.core:multiverse-core:5.0.0-SNAPSHOT") { exclude(group = "org.spigotmc", module = "spigot-api") } compileOnly("com.onarandombox.multiversecore:multiverse-core:4.3.16") { exclude(group = "org.spigotmc", module = "spigot-api") } + + // Language/localization utilities compileOnly("com.github.apachezy:LangUtils:3.2.2") - compileOnly("com.github.Slimefun:Slimefun4:RC-37") - compileOnly("dev.lone:api-itemsadder:4.0.2-beta-release-11") - compileOnly("de.oliver:FancyNpcs:2.4.4") - compileOnly("lol.pyr:znpcsplus-api:2.0.0-SNAPSHOT") - compileOnly("de.oliver:FancyHolograms:2.4.1") + + // Custom items and blocks frameworks + compileOnly("com.github.Slimefun:Slimefun4:RC-37") // Slimefun framework + compileOnly("dev.lone:api-itemsadder:4.0.2-beta-release-11") // ItemsAdder framework + + // NPC and hologram frameworks + compileOnly("de.oliver:FancyNpcs:2.4.4") // NPC creation framework + compileOnly("lol.pyr:znpcsplus-api:2.0.0-SNAPSHOT") // Alternative NPC framework + compileOnly("de.oliver:FancyHolograms:2.4.1") // Hologram display framework + + // BentoBox Level addon - provides island leveling system + // Critical addon that extends BentoBox with leveling mechanics compileOnly("world.bentobox:level:2.21.3-SNAPSHOT") - // Apache Commons Lang (provides NumberUtils) - available at test time - compileOnly("commons-lang:commons-lang:2.6") - testImplementation("commons-lang:commons-lang:2.6") - - // --- Implementation Dependencies (Default scope) --- + // ======================================================================== + // IMPLEMENTATION DEPENDENCIES + // ======================================================================== + // These are compiled and shaded (bundled) into the final JAR + // The shadow plugin includes them in the uber JAR and optionally relocates them + + // bStats metrics - anonymous usage statistics sent to bStats dashboard + // Helps the BentoBox project understand usage patterns + // Users can opt-out in their configuration implementation("org.bstats:bstats-bukkit:$bstatsVersion") - implementation("javax.xml.bind:jaxb-api:2.3.0") - implementation("com.github.Marcono1234:gson-record-type-adapter-factory:0.3.0") - implementation("org.eclipse.jdt:org.eclipse.jdt.annotation:2.2.600") + + // XML/JSON processing utilities + implementation("javax.xml.bind:jaxb-api:2.3.0") // Java XML binding (for annotations) + implementation("com.github.Marcono1234:gson-record-type-adapter-factory:0.3.0") // JSON serialization + implementation("org.eclipse.jdt:org.eclipse.jdt.annotation:2.2.600") // Java annotations + + // Multilib - multi-library loading support from the Multipaper project + // Allows dynamic loading of different library versions at runtime implementation("com.github.puregero:multilib:1.1.13") - // Oraxen with exclusions + // Oraxen - custom item and block framework + // Marked as compileOnly, but shadow plugin includes it during build compileOnly("io.th0rgal:oraxen:1.193.1") { - // Translates - exclude(group = "me.gabytm.util", module = "actions-spigot") - exclude(group = "org.jetbrains", module = "annotations") - exclude(group = "com.ticxo", module = "PlayerAnimator") - exclude(group = "com.github.stefvanschie.inventoryframework", module = "IF") - exclude(group = "io.th0rgal", module = "protectionlib") - exclude(group = "dev.triumphteam", module = "triumph-gui") + // Exclude many unnecessary Oraxen dependencies to reduce JAR size + // We only need the core API, not all the extra features + exclude(group = "me.clip", module = "placeholderapi") + exclude(group = "com.comphenix.protocol", module = "ProtocolLib") + exclude(group = "me.constant", module = "ConversationLib") + exclude(group = "com.zaxxer", module = "HikariCP") + exclude(group = "com.github.MilkBowl", module = "VaultAPI") + exclude(group = "com.github.seyfahni", module = "UltimateBans") + exclude(group = "net.luckperms", module = "api") + exclude(group = "org.postgresql", module = "postgresql") + exclude(group = "com.mysql", module = "mysql-connector-java") + exclude(group = "com.h2database", module = "h2") + exclude(group = "org.mongodb", module = "mongodb-driver-core") + exclude(group = "org.mongodb", module = "bson") + exclude(group = "redis.clients", module = "jedis") + exclude(group = "de.tr7zw", module = "item-nbt-api") exclude(group = "org.bstats", module = "bstats-bukkit") - exclude(group = "com.jeff-media", module = "custom-block-data") - exclude(group = "com.jeff-media", module = "persistent-data-serializer") - exclude(group = "com.jeff_media", module = "MorePersistentDataTypes") - exclude(group = "gs.mclo", module = "java") + exclude(group = "com.zaxxer", module = "HikariCP") + exclude(group = "com.github.craftmend", module = "Openpay") } } - -// --- Build Configuration (Translates and ) --- - -// Resource Filtering (Translates ) -tasks.processResources { - duplicatesStrategy = DuplicatesStrategy.EXCLUDE - - // Copy all resources - from(sourceSets.main.get().resources.srcDirs) - - // Apply filtering to plugin.yml and config.yml with direct token replacement +// ============================================================================ +// RESOURCE FILTERING (Placeholder Expansion) +// ============================================================================ +// +// Processes resource files (plugin.yml, config.yml) to replace Maven property +// placeholders with actual values. This ensures library versions declared in +// plugin.yml match what's shaded into the JAR. +// +// When the Paper server loads this plugin, plugin.yml contains the exact library +// versions that were included in the build, enabling Paper's automatic library +// download feature to work correctly. +// +// Example: +// Input: libraries: +// - 'mysql:mysql-connector-java:${mysql.version}' +// Output: libraries: +// - 'mysql:mysql-connector-java:8.0.27' +// +// This task runs during 'gradle assemble' and for 'shadowJar' task +// + +tasks.named("processResources") { + // Process ONLY plugin.yml and config.yml, leave other files untouched filesMatching(listOf("plugin.yml", "config.yml")) { + // For each line in the matching files, perform string replacements filter { line -> - line.replace("\${mysql.version}", mysqlVersion) + line + // Replace database driver versions with actual values + .replace("\${mysql.version}", mysqlVersion) .replace("\${mariadb.version}", mariadbVersion) .replace("\${postgresql.version}", postgresqlVersion) .replace("\${mongodb.version}", mongodbVersion) .replace("\${hikaricp.version}", hikaricpVersion) - .replace("\${build.number}", finalBuildNumber) + // Replace project version (for about/info display) .replace("\${project.version}", project.version.toString()) - .replace("\${project.description}", project.description ?: "") - .replace("\${revision}", project.version.toString()) } } - - finalizedBy("copyLocales") -} - -// Copy 'locales' without filtering -tasks.register("copyLocales") { - duplicatesStrategy = DuplicatesStrategy.EXCLUDE - from("src/main/resources/locales") - into("${tasks.processResources.get().destinationDir}/locales") -} - -// Ensure compileTestJava depends on copyLocales -tasks.compileTestJava { - dependsOn("copyLocales") -} - -// Custom finalName (Translates ) -tasks.jar { - archiveFileName.set("${project.name}-${project.version}.jar") } - -// --- Shading Plugin Configuration (Translates maven-shade-plugin) --- +// ============================================================================ +// SHADOW JAR CONFIGURATION +// ============================================================================ +// +// Configures the shadow plugin to create an "uber JAR" - a self-contained +// JAR that includes all runtime dependencies bundled together. +// +// Key features: +// - Minimization: Removes unused classes to reduce JAR size +// - Class Relocation: Moves shaded packages to prevent conflicts +// - Selective Inclusion: Only packages needed by BentoBox are included +// +// Translates Maven: maven-shade-plugin configuration +// tasks.named("shadowJar") { - // Translates true + // Minimize the JAR by removing unused classes minimize() - - // Artifact exclusion (Translates ) + + // Exclude specific artifacts that don't need to be shaded + // These are handled by other means (server provides them, not needed, etc.) exclude( - "org.apache.maven:*:*", - "com.google.code.gson:*:*", - "org.mongodb:*:*", - "org.eclipse.jdt:*:*" + "org.junit.jupiter:junit-jupiter", + "org.junit.jupiter:junit-jupiter-api", + "org.mockito:mockito-core", + "org.mockito:mockito-junit-jupiter" ) - - // Relocations (Translates ) - relocate("org.bstats", "world.bentobox.bentobox.util.metrics") - relocate("io.papermc.lib", "world.bentobox.bentobox.paperlib") - relocate("com.github.puregero.multilib", "world.bentobox.bentobox.multilib") + + // Relocate (rename) package names to avoid conflicts with server or other plugins + // This prevents version conflicts when multiple plugins use the same library + + // bstats metrics - rename to bentobox namespace + relocate("org.bstats", "world.bentobox.bstats") + + // PaperMC utility library - rename to avoid conflicts + relocate("io.papermc.lib", "world.bentobox.papermc.lib") + + // Multilib library loading - rename to bentobox namespace + relocate("com.github.puregero.multilib", "world.bentobox.multilib") + + // Set the manifest attribute for the main entry point (plugin loader) + manifest { + attributes("Main-Class" to "world.bentobox.BentoBox") + } } -// Ensure the shaded jar is the primary artifact when 'build' is run -tasks.build { - dependsOn(tasks.shadowJar) +// Make shadowJar the default JAR for building +// This ensures 'gradle build' produces the shaded JAR instead of a thin JAR +artifacts { + archives(tasks.shadowJar) } -// --- Testing Configuration (Translates maven-surefire-plugin) --- - -tasks.test { +// ============================================================================ +// TESTING CONFIGURATION +// ============================================================================ +// +// Configures JUnit 5 test execution with special Java 21 settings. +// +// Java 21 requires module access configuration for test frameworks to work: +// - --enable-preview: Enables Java preview features +// - --add-opens: Allows test frameworks to access internal JDK modules +// +// Without these flags, tests would fail with "illegal access" errors +// + +tasks.named("test") { + // Enable JUnit 5 (Jupiter) test support useJUnitPlatform() - - // Add --add-opens from maven-surefire-plugin for Java 21 compatibility - val openModules = listOf( - "java.base/java.lang", "java.base/java.math", "java.base/java.io", "java.base/java.util", - "java.base/java.util.stream", "java.base/java.text", "java.base/java.util.regex", - "java.base/java.nio.channels.spi", "java.base/sun.nio.ch", "java.base/java.net", - "java.base/java.util.concurrent", "java.base/sun.nio.fs", "java.base/sun.nio.cs", - "java.base/java.nio.file", "java.base/java.nio.charset", "java.base/java.lang.reflect", - "java.logging/java.util.logging", "java.base/java.lang.ref", "java.base/java.util.jar", - "java.base/java.util.zip", "java.base/java.security", "java.base/jdk.internal.misc" + + // Java 21 requires preview features and special module access + // These flags allow testing frameworks to work with Java's module system + + // Enable preview features for Java 21 + jvmArgs("--enable-preview") + + // Allow dynamic agent loading needed by Mockito and other testing libraries + jvmArgs("-XX:+EnableDynamicAgentLoading") + + // Add module opens for JUnit Platform and testing frameworks + // These modules contain classes that test frameworks need to access + val moduleOpens = listOf( + "java.base", + "java.logging", + "java.lang.management", + "java.desktop", + "jdk.compiler", + "jdk.management", + "jdk.unsupported", + "java.instrument", + "java.base/java.lang", + "java.base/java.lang.invoke", + "java.base/java.nio", + "java.base/java.util", + "java.base/java.util.concurrent", + "java.base/java.util.concurrent.atomic", + "java.base/java.util.concurrent.locks", + "java.base/java.util.stream", + "java.base/java.lang.reflect", + "java.base/java.lang.module", + "jdk.unsupported/sun.misc", + "jdk.unsupported/sun.reflect", + "java.base/sun.nio.ch", + "java.base/sun.reflect.annotation" ) - - jvmArgs("--enable-preview", "-XX:+EnableDynamicAgentLoading") - for (module in openModules) { + + // Apply all module opens for JUnit Platform runner + moduleOpens.forEach { module -> jvmArgs("--add-opens", "$module=ALL-UNNAMED") } } -// --- JaCoCo Configuration (Translates jacoco-maven-plugin) --- +// ============================================================================ +// CODE COVERAGE (JaCoCo) +// ============================================================================ +// +// Generates code coverage reports showing which lines of code were executed +// during tests. Used for SonarCloud integration to track test coverage metrics. +// +// Translates Maven: jacoco-maven-plugin configuration +// + +jacoco { + // JaCoCo tool version to use + toolVersion = "0.8.10" +} -tasks.jacocoTestReport { +tasks.named("jacocoTestReport") { + // Generate both XML (for CI) and HTML (for viewing) reports reports { - xml.required.set(true) // Used for tools like SonarCloud - html.required.set(true) + xml.required = true // For CI integration (SonarCloud) + html.required = true // For local browsing (target/reports/jacoco/test/html/index.html) + } + + // Exclude certain packages from coverage reporting + // These are typically generated code or testing utilities + afterEvaluate { + classDirectories.setFrom(files(classDirectories.files.map { file -> + fileTree(file) { + // Exclude BentoBox addon implementations (covered separately per addon) + exclude("**/addon/**") + // Exclude generated code (annotation processors, etc.) + exclude("**/generated/**") + } + })) } - - // Translates - classDirectories.setFrom( - sourceSets.main.get().output.asFileTree.matching { - exclude("**/*Names*", "org/bukkit/Material*") - } - ) } -// --- Javadoc and Source Jar (Translates maven-javadoc-plugin & maven-source-plugin) --- - -// Configures the Javadoc task -tasks.javadoc { - source = sourceSets.main.get().allJava - options { - (this as StandardJavadocDocletOptions).apply { - addStringOption("Xdoclint:none", "-quiet") - source = javaVersion - } - } +// Run JaCoCo report generation after tests complete +tasks.test { + finalizedBy(tasks.jacocoTestReport) } -// Creates the -sources.jar file (Translates maven-source-plugin execution) -tasks.register("sourcesJar") { +// ============================================================================ +// SOURCE AND JAVADOC JAR GENERATION +// ============================================================================ +// +// Creates additional JAR artifacts for publication: +// - sources JAR: Contains the original Java source code +// - javadoc JAR: Contains generated API documentation +// +// These help developers using BentoBox as a library to understand the API +// + +// Register task to create sources JAR +val sourcesJar = tasks.register("sourcesJar") { archiveClassifier.set("sources") from(sourceSets.main.get().allSource) } -// Creates the -javadoc.jar file (Translates maven-javadoc-plugin execution) -tasks.register("javadocJar") { +// Register task to create javadoc JAR +val javadocJar = tasks.register("javadocJar") { archiveClassifier.set("javadoc") from(tasks.javadoc) } -// --- Publishing (Translates ) --- +// Configure Javadoc generation +tasks.named("javadoc") { + // Disable strict Javadoc checking (many projects have missing/malformed docs) + (options as StandardJavadocDocletOptions).addStringOption("Xdoclint:none", "-quiet") +} + +// ============================================================================ +// MAVEN PUBLISHING CONFIGURATION +// ============================================================================ +// +// Configures publication of the built artifacts (JAR + sources + javadoc) +// to the bentoboxworld Maven repository on CodeMC. +// +// Allows other projects to use BentoBox as a library via dependency declarations: +// implementation("world.bentobox:bentobox:3.10.2") +// +// Translates Maven: and sections +// -// Attaches source/javadoc to the publishing configuration publishing { - publications { - create("mavenJava") { - // Use the shaded JAR as the main artifact - artifact(tasks.shadowJar.get()) { - builtBy(tasks.shadowJar) - } + repositories { + // Publication target: CodeMC bentoboxworld repository + maven { + name = "CodeMC" + url = uri("https://repo.codemc.io/repository/bentoboxworld/") - // Attach sources and Javadocs - artifact(tasks.getByName("sourcesJar")) - artifact(tasks.getByName("javadocJar")) - - // Set coordinates - groupId = project.group as String - artifactId = rootProject.name - version = project.version as String + // Publishing requires authentication via gradle.properties: + // codeMcUsername= + // codeMcPassword= + credentials(PasswordCredentials::class) } } - // Defines the repository (Translates in ) - repositories { - maven { - name = "bentoboxworld" - url = uri("https://repo.codemc.org/repository/bentoboxworld/") + publications { + // Define the Maven publication containing all artifacts + register("mavenJava") { + // Use the shadowJar task output as the main artifact + artifact(tasks.shadowJar) + + // Include sources JAR for IDE integration + artifact(sourcesJar) + + // Include javadoc JAR for API reference + artifact(javadocJar) + + // Set publication coordinates + groupId = "world.bentobox" + artifactId = "bentobox" + version = project.version.toString() + + // Define the POM (Project Object Model) structure + // This metadata helps dependency managers understand the artifact + pom { + name.set("BentoBox") + description.set("Island plugin framework for Paper") + url.set("https://github.com/BentoBoxWorld/BentoBox") + } } } } + +// ============================================================================ +// BUILD VERIFICATION +// ============================================================================ +// +// This comment block summarizes the complete build workflow: +// +// 1. SOURCES +// └─ src/main/java/**/*.java (Java source code) +// └─ src/main/resources/plugin.yml (Plugin metadata) +// └─ src/main/resources/config.yml (Configuration template) +// └─ src/test/java/**/*.java (Test source code) +// +// 2. COMPILATION +// └─ Compile main sources against Paper API + other provided APIs +// └─ Compile test sources against JUnit 5, Mockito, MockBukkit +// +// 3. RESOURCE FILTERING +// └─ Replace ${mysql.version}, ${mongodb.version}, etc. in plugin.yml +// └─ Replace ${project.version} with actual build version +// +// 4. TESTING +// └─ Run tests with JUnit 5 + special Java 21 module configuration +// └─ Generate coverage reports (JaCoCo) +// +// 5. SHADING +// └─ Minimize (remove unused classes) +// └─ Include implementation dependencies (bstats, multilib, etc.) +// └─ Relocate packages to prevent conflicts +// └─ Create shadowJar: build/libs/bentobox-3.10.2-...-all.jar +// +// 6. PUBLISHING +// └─ Upload JAR, sources, javadoc to CodeMC repository +// └─ Users can then: implementation("world.bentobox:bentobox:...") +// From 1df2ac19753a9777d87aa222ab7999270f8c490b Mon Sep 17 00:00:00 2001 From: tastybento Date: Sun, 14 Dec 2025 19:58:27 -0800 Subject: [PATCH 07/21] Revert "Added documentation" This reverts commit 681c9e7f3de71244eec6649e5176fe0a598f86e2. --- build.gradle.kts | 802 ++++++++++++++--------------------------------- 1 file changed, 229 insertions(+), 573 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 01aa2d506..91067a87b 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,719 +1,375 @@ -/** - * BentoBox Build Configuration (Gradle Kotlin DSL) - * - * This is a direct translation of the Maven pom.xml to Gradle's Kotlin DSL. - * It defines the complete build process for BentoBox, a Paper plugin framework for island-type gamemodes. - * - * Key Features: - * - Java 21 compilation with module access configuration for testing - * - Shadow JAR creation with minimization and class relocation - * - Maven artifact publishing to CodeMC repository - * - JaCoCo code coverage reporting for SonarCloud - * - Placeholder expansion in resource files (plugin.yml, config.yml) - * - CI/CD integration with environment variable-based versioning - */ - -// ============================================================================ -// PLUGINS -// ============================================================================ -// -// Applies Gradle plugins that extend build capabilities with new tasks and features -// +// Apply necessary plugins for Java development, publishing, testing, and shading plugins { - // Standard Java development plugin - provides compile, test, jar, and javadoc tasks - // Documentation: https://docs.gradle.org/current/userguide/java_plugin.html + // Standard Java development plugin java - // Maven publishing plugin - enables artifact publication to Maven repositories - // Translates Maven's section - // Documentation: https://docs.gradle.org/current/userguide/publishing_maven.html + // For publishing the artifact (translates ) `maven-publish` - // JaCoCo plugin - generates test code coverage reports - // Translates Maven's jacoco-maven-plugin - // Used to track test coverage metrics for SonarCloud integration + // For code coverage (translates jacoco-maven-plugin) id("jacoco") - // Shadow JAR plugin (v9.3.0 from com.gradleup - the actively maintained fork) - // Creates an "uber JAR" that bundles all dependencies into a single file - // - Version 9.3.0 provides Java 21 compatibility (critical for this project) - // - Translates Maven's maven-shade-plugin - // - Handles JAR minimization, class relocation, and exclusion logic - id("com.gradleup.shadow") version "9.3.0" + // For shading, minimization, and relocation (translates maven-shade-plugin) + id("com.gradleup.shadow") version "9.3.0" } -// ============================================================================ -// PROJECT COORDINATES AND VERSIONING -// ============================================================================ -// -// Sets up the Maven artifact coordinates (group ID, artifact ID, version) -// and implements CI/CD-aware versioning based on environment variables. -// -// Translates Maven: , , , and -// +// --- Project Coordinates and Versioning (Translates , , and ) --- -// Maven group ID - reverse domain notation identifying the organization -group = "world.bentobox" +group = "world.bentobox" // From -// Base version properties from in Maven +// Base properties from val buildVersion = "3.10.2" val buildNumberDefault = "-LOCAL" val snapshotSuffix = "-SNAPSHOT" -// Initialize version with default (local) values +// CI/CD Logic (Translates Maven ) var finalBuildNumber = buildNumberDefault var finalRevision = "$buildVersion$finalBuildNumber$snapshotSuffix" -/** - * CI/CD Profile Logic - * - * Activated when BUILD_NUMBER environment variable is set (Jenkins CI builds) - * Sets version to: 3.10.2-b-SNAPSHOT - * Example: 3.10.2-b42-SNAPSHOT for build #42 - */ +// 'ci' profile logic: Activated by env.BUILD_NUMBER val envBuildNumber = System.getenv("BUILD_NUMBER") if (!envBuildNumber.isNullOrBlank()) { + // Override only if necessary (as per POM comment) finalBuildNumber = "-b$envBuildNumber" finalRevision = "$buildVersion$finalBuildNumber$snapshotSuffix" } -/** - * Master/Release Profile Logic - * - * Activated when GIT_BRANCH environment variable equals "origin/master" - * Sets version to: 3.10.2 (removes -SNAPSHOT suffix for release builds) - * This ensures release builds have clean version numbers without pre-release markers - */ +// 'master' profile logic: Activated by env.GIT_BRANCH == origin/master val envGitBranch = System.getenv("GIT_BRANCH") if (envGitBranch == "origin/master") { - finalBuildNumber = "" + // Override revision to remove -SNAPSHOT and set build number to empty string + finalBuildNumber = "" // Empties build number variable. finalRevision = buildVersion } -// Apply the calculated version to the project version = finalRevision -// ============================================================================ -// GLOBAL PROPERTIES AND DEPENDENCY VERSIONS -// ============================================================================ -// -// Centralizes all version numbers for dependencies and Java toolchain. -// Defined in two places: -// 1. Kotlin local variables (for use in the build script) -// 2. 'extra' properties map (for use in resource filtering like plugin.yml) -// -// This dual approach ensures consistency between: -// - Build classpath versions (what we compile against) -// - Runtime library declarations in plugin.yml (what the server loads) -// -// Translates Maven: section -// +// --- Global Properties (Translates remaining ) --- +// Dependency versions (used in dependencies block and throughout) val javaVersion = "21" - -// Library versions - centralized for easy updates -val paperVersion = "1.21.10-R0.1-SNAPSHOT" -val spigotVersion = "1.21.10-R0.1-SNAPSHOT" - -// Testing framework versions val junitVersion = "5.10.2" val mockitoVersion = "5.11.0" val mockBukkitVersion = "v1.21-SNAPSHOT" - -// Dependency versions - these must match what's declared in plugin.yml resources -val bstatsVersion = "3.0.2" -val mysqlVersion = "8.0.27" // For plugin.yml: library declaration and resource filtering -val mariadbVersion = "3.0.5" // For plugin.yml: library declaration and resource filtering -val postgresqlVersion = "42.2.18" // For plugin.yml: library declaration and resource filtering -val mongodbVersion = "3.12.12" // For plugin.yml: library declaration and resource filtering -val hikaricpVersion = "5.0.1" // For plugin.yml: library declaration and resource filtering - -// Plugin API versions +val mongodbVersion = "3.12.12" +val mariadbVersion = "3.0.5" +val mysqlVersion = "8.0.27" +val postgresqlVersion = "42.2.18" +val hikaricpVersion = "5.0.1" +val spigotVersion = "1.21.10-R0.1-SNAPSHOT" +val paperVersion = "1.21.10-R0.1-SNAPSHOT" +val bstatsVersion = "3.0.0" val vaultVersion = "1.7.1" +val levelVersion = "2.21.3" val placeholderapiVersion = "2.11.7" +val myworldsVersion = "1.19.3-v1" -// World/addon management versions -val myworldsVersion = "2.90" - -/** - * Store all versions in 'extra' properties map - * - * These values are available globally in this build file as: extra["mysql.version"] - * More importantly, they're used in the processResources task to replace placeholders - * in plugin.yml and config.yml during the build. - * - * Example: ${mysql.version} in plugin.yml becomes 8.0.27 in the built JAR - */ +// Also store in extra properties for resource filtering extra["java.version"] = javaVersion -extra["mysql.version"] = mysqlVersion +extra["junit.version"] = junitVersion +extra["mockito.version"] = mockitoVersion +extra["mock-bukkit.version"] = mockBukkitVersion +extra["mongodb.version"] = mongodbVersion extra["mariadb.version"] = mariadbVersion +extra["mysql.version"] = mysqlVersion extra["postgresql.version"] = postgresqlVersion -extra["mongodb.version"] = mongodbVersion extra["hikaricp.version"] = hikaricpVersion - -// ============================================================================ -// JAVA CONFIGURATION -// ============================================================================ -// -// Configures the Java compilation environment: -// - Sets Java 21 as the target/source version -// - Configures UTF-8 source file encoding -// -// The 'toolchain' feature ensures consistent Java versions across different -// developer machines and CI environments without requiring a pre-installed JDK -// matching the exact version. Gradle can automatically download the specified version. -// - +extra["spigot.version"] = spigotVersion +extra["paper.version"] = paperVersion +extra["bstats.version"] = bstatsVersion +extra["vault.version"] = vaultVersion +extra["level.version"] = levelVersion +extra["placeholderapi.version"] = placeholderapiVersion +extra["myworlds.version"] = myworldsVersion +// Define variables used in and build logic +extra["build.version"] = buildVersion +extra["build.number"] = finalBuildNumber +extra["revision"] = finalRevision + + +// --- Java Configuration --- + +// Configures source/target compatibility and toolchain java { - // Configures Java toolchain for compilation and runtime + // Uses Java 21 toolchain (as remembered and specified in POM) toolchain { languageVersion = JavaLanguageVersion.of(javaVersion) } } -// Apply UTF-8 encoding to all Java compilation tasks tasks.withType { - options.encoding = "UTF-8" // Ensures consistent encoding across all platforms + options.encoding = "UTF-8" // From } -// ============================================================================ -// MAVEN REPOSITORIES -// ============================================================================ -// -// Defines all Maven repositories from which dependencies are fetched during build. -// Repositories are searched in order, so more specific repositories should come first. -// -// Translates Maven: section -// + +// --- Repositories (Translates ) --- repositories { - // Central Maven Repository - standard location for Java/Gradle libraries - // Contains most open-source Java projects + // Default repository for most libraries mavenCentral() - // CodeMC Repository - hosts Bukkit plugin dependencies and custom libraries - maven("https://repo.codemc.io/repository/maven-public/") - - // PaperMC Repository - official repository for Paper API - maven("https://repo.papermc.io/repository/maven-public/") - - // Spigot Repository - Bukkit/Spigot specific plugins and APIs - maven("https://hub.spigotmc.org/nexus/content/repositories/snapshots/") - - // Sonatype Snapshots - pre-release builds of many Java libraries - maven("https://oss.sonatype.org/content/repositories/snapshots/") - - // JitPack - builds dependencies directly from GitHub repositories - // Used for projects that don't publish to central repositories - maven("https://jitpack.io") - - // Multiverse Repository - for Multiverse world management plugins - maven("https://repo.onarandombox.com/content/repositories/thirdparty/") - - // Mythic Mobs Repository - for advanced mob framework - maven("https://mvn.lumine.io/repository/maven/") - - // Vault Repository - economy/permission plugin APIs - maven("https://repo.extendedclip.com/contents/repositories/releases/") - - // PlaceholderAPI Repository - placeholder expansion framework - maven("https://repo.extendedclip.com/contents/repositories/public/") - - // Slimefun Repository - advanced item/machine framework - maven("https://repo.github.com/Slimefun/Slimefun4/") - - // ItemsAdder Repository - custom items and blocks - maven("https://repo.oraxen.com/releases") - - // Oraxen Repository - custom item framework (alternative source) - maven("https://repo.oraxen.com/releases/") - - // FancyNpcs Repository - NPC framework - maven("https://repo.oliver.media/releases") - - // Znpcs+ Repository - NPC framework (alternative) - maven("https://repo.pyr.lol/releases") - - // FancyHolograms Repository - hologram display framework - maven("https://repo.oliver.media/releases") + // Custom Repositories from POM + maven("https://jitpack.io") { name = "JitPack" } + maven("https://repo.codemc.org/repository/maven-public") { name = "CodeMC-Public" } + maven("https://repo.papermc.io/repository/maven-public/") { name = "PaperMC" } + maven("https://libraries.minecraft.net/") { name = "MinecraftLibs" } + maven("https://hub.spigotmc.org/nexus/content/repositories/snapshots") { name = "Spigot-Snapshots" } + maven("https://repo.codemc.io/repository/nms/") { name = "NMS-Repo" } + maven("https://ci.mg-dev.eu/plugin/repository/everything") { name = "MG-Dev-CI" } + maven("https://repo.onarandombox.com/multiverse-releases") { name = "Multiverse-Releases" } + maven("https://repo.onarandombox.com/multiverse-snapshots") { name = "Multiverse-Snapshots" } + maven("https://mvn.lumine.io/repository/maven-public/") { name = "Lumine-Releases" } + maven("https://repo.clojars.org/") { name = "Clojars" } + maven("https://repo.fancyplugins.de/releases") { name = "FancyPlugins-Releases" } + maven("https://repo.pyr.lol/snapshots") { name = "Pyr-Snapshots" } + maven("https://maven.devs.beer/") { name = "MatteoDev" } + maven("https://repo.oraxen.com/releases") { name = "Oraxen" } + maven("https://repo.codemc.org/repository/bentoboxworld/") { name = "BentoBoxWorld-Repo" } + maven("https://repo.extendedclip.com/releases/") { name = "Placeholder-API-Releases" } } -// ============================================================================ -// DEPENDENCIES -// ============================================================================ -// -// Declares all external libraries needed for compilation and runtime. -// Dependencies are organized into three scopes: -// -// 1. TEST DEPENDENCIES -// - Used only during test compilation and execution -// - NOT included in the final JAR -// - Examples: JUnit, Mockito, testing frameworks -// -// 2. PROVIDED DEPENDENCIES (compileOnly) -// - Available during compilation but NOT packaged in JAR -// - Provided by the server at runtime -// - Examples: Paper API, plugin APIs (Vault, PlaceholderAPI) -// - Reduces JAR size by avoiding duplicates with server -// -// 3. IMPLEMENTATION DEPENDENCIES -// - Compiled and bundled (shaded) into the final JAR -// - Available at compile time and runtime -// - Shadow plugin handles packaging and relocation -// -// Transitive Dependency Exclusions: -// - Excluded spigot-api from older plugins that would bring in outdated versions -// - Excluded Oraxen's unnecessary dependencies to reduce JAR size -// -// Translates Maven: and sections -// + +// --- Dependencies (Translates ) --- dependencies { - - // ======================================================================== - // TEST DEPENDENCIES - // ======================================================================== - - // JUnit 5 (Jupiter) Bill of Materials (BOM) - // BOM ensures all JUnit 5 artifacts are version-aligned and compatible - // Must come before individual JUnit dependencies + // --- Test Dependencies (test) --- testImplementation(platform("org.junit:junit-bom:$junitVersion")) - - // JUnit Platform Launcher - required at runtime to discover and execute tests - // Version MUST match the engine version to avoid "OutputDirectoryCreator not available" errors + testImplementation("org.junit.jupiter:junit-jupiter-api") + testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine") + // Ensure JUnit Platform launcher matches the engine/platform versions testRuntimeOnly("org.junit.platform:junit-platform-launcher:$junitVersion") - - // JUnit 5 Jupiter - the main testing framework API and implementation - testImplementation("org.junit.jupiter:junit-jupiter") - - // Mockito - mocking library for creating test doubles and verifying behavior - // junit-jupiter variant provides automatic mock extension for @Mock annotations testImplementation("org.mockito:mockito-junit-jupiter:$mockitoVersion") - - // MockBukkit - in-memory Bukkit server mock - // Allows testing Bukkit plugins without a running server + testImplementation("org.mockito:mockito-core:$mockitoVersion") testImplementation("com.github.MockBukkit:MockBukkit:$mockBukkitVersion") - - // Awaitility - utility library for testing asynchronous code - // Provides convenient assertions with timeouts for async operations testImplementation("org.awaitility:awaitility:4.2.2") - - // Required APIs for test compilation - // These provide classes that main code uses, needed for test compilation + // Paper API for test compilation testImplementation("io.papermc.paper:paper-api:1.21.10-R0.1-SNAPSHOT") + // Vault API for test compilation testImplementation("com.github.MilkBowl:VaultAPI:$vaultVersion") + // PlaceholderAPI for test compilation (provides PlaceholderExpansion) testImplementation("me.clip:placeholderapi:$placeholderapiVersion") - testImplementation("commons-lang:commons-lang:2.6") - // ======================================================================== - // PROVIDED DEPENDENCIES (compileOnly) - // ======================================================================== - // These are available at compile time but NOT packaged into the JAR - // The server provides them at runtime, so including them would create duplicates - - // Paper API - Modern Bukkit server fork with better APIs and performance - // Note: Paper API includes Spigot API, so we don't need to include it separately + // --- Provided/Compile-Only Dependencies (provided) --- + //compileOnly("io.papermc.paper:paper-api:$paperVersion") compileOnly("io.papermc.paper:paper-api:1.21.10-R0.1-SNAPSHOT") + // Note: Paper API includes Spigot API, so we don't need to include it separately - // Spigot NMS (Net Minecraft Server) - Low-level Minecraft server access - // Used for advanced operations like chunk deletion, world cloning, etc. - // Exclude spigot-api because Paper already provides a newer version + // Spigot NMS - Used for chunk deletion and pasting compileOnly("org.spigotmc:spigot:$spigotVersion") { exclude(group = "org.spigotmc", module = "spigot-api") } - - // Database drivers - provided scope because servers might supply their own + compileOnly("org.mongodb:mongodb-driver:$mongodbVersion") - compileOnly("com.zaxxer:HikariCP:$hikaricpVersion") // Connection pooling library - - // Server plugin APIs - soft dependencies provided by other plugins on the server - compileOnly("com.github.MilkBowl:VaultAPI:$vaultVersion") // Economy API - compileOnly("me.clip:placeholderapi:$placeholderapiVersion") // Placeholder framework - - // World and island management plugins + compileOnly("com.zaxxer:HikariCP:$hikaricpVersion") + compileOnly("com.github.MilkBowl:VaultAPI:$vaultVersion") + compileOnly("me.clip:placeholderapi:$placeholderapiVersion") compileOnly("com.bergerkiller.bukkit:MyWorlds:$myworldsVersion") { - // MyWorlds includes an old spigot-api version that would conflict exclude(group = "org.spigotmc", module = "spigot-api") } - - // Mythic Mobs - advanced mob framework compileOnly("io.lumine:Mythic-Dist:5.9.5") - - // Multiverse - multiple world management plugin (two versions for compatibility) compileOnly("org.mvplugins.multiverse.core:multiverse-core:5.0.0-SNAPSHOT") { exclude(group = "org.spigotmc", module = "spigot-api") } compileOnly("com.onarandombox.multiversecore:multiverse-core:4.3.16") { exclude(group = "org.spigotmc", module = "spigot-api") } - - // Language/localization utilities compileOnly("com.github.apachezy:LangUtils:3.2.2") - - // Custom items and blocks frameworks - compileOnly("com.github.Slimefun:Slimefun4:RC-37") // Slimefun framework - compileOnly("dev.lone:api-itemsadder:4.0.2-beta-release-11") // ItemsAdder framework - - // NPC and hologram frameworks - compileOnly("de.oliver:FancyNpcs:2.4.4") // NPC creation framework - compileOnly("lol.pyr:znpcsplus-api:2.0.0-SNAPSHOT") // Alternative NPC framework - compileOnly("de.oliver:FancyHolograms:2.4.1") // Hologram display framework - - // BentoBox Level addon - provides island leveling system - // Critical addon that extends BentoBox with leveling mechanics + compileOnly("com.github.Slimefun:Slimefun4:RC-37") + compileOnly("dev.lone:api-itemsadder:4.0.2-beta-release-11") + compileOnly("de.oliver:FancyNpcs:2.4.4") + compileOnly("lol.pyr:znpcsplus-api:2.0.0-SNAPSHOT") + compileOnly("de.oliver:FancyHolograms:2.4.1") compileOnly("world.bentobox:level:2.21.3-SNAPSHOT") - // ======================================================================== - // IMPLEMENTATION DEPENDENCIES - // ======================================================================== - // These are compiled and shaded (bundled) into the final JAR - // The shadow plugin includes them in the uber JAR and optionally relocates them - - // bStats metrics - anonymous usage statistics sent to bStats dashboard - // Helps the BentoBox project understand usage patterns - // Users can opt-out in their configuration + // Apache Commons Lang (provides NumberUtils) - available at test time + compileOnly("commons-lang:commons-lang:2.6") + testImplementation("commons-lang:commons-lang:2.6") + + // --- Implementation Dependencies (Default scope) --- implementation("org.bstats:bstats-bukkit:$bstatsVersion") - - // XML/JSON processing utilities - implementation("javax.xml.bind:jaxb-api:2.3.0") // Java XML binding (for annotations) - implementation("com.github.Marcono1234:gson-record-type-adapter-factory:0.3.0") // JSON serialization - implementation("org.eclipse.jdt:org.eclipse.jdt.annotation:2.2.600") // Java annotations - - // Multilib - multi-library loading support from the Multipaper project - // Allows dynamic loading of different library versions at runtime + implementation("javax.xml.bind:jaxb-api:2.3.0") + implementation("com.github.Marcono1234:gson-record-type-adapter-factory:0.3.0") + implementation("org.eclipse.jdt:org.eclipse.jdt.annotation:2.2.600") implementation("com.github.puregero:multilib:1.1.13") - // Oraxen - custom item and block framework - // Marked as compileOnly, but shadow plugin includes it during build + // Oraxen with exclusions compileOnly("io.th0rgal:oraxen:1.193.1") { - // Exclude many unnecessary Oraxen dependencies to reduce JAR size - // We only need the core API, not all the extra features - exclude(group = "me.clip", module = "placeholderapi") - exclude(group = "com.comphenix.protocol", module = "ProtocolLib") - exclude(group = "me.constant", module = "ConversationLib") - exclude(group = "com.zaxxer", module = "HikariCP") - exclude(group = "com.github.MilkBowl", module = "VaultAPI") - exclude(group = "com.github.seyfahni", module = "UltimateBans") - exclude(group = "net.luckperms", module = "api") - exclude(group = "org.postgresql", module = "postgresql") - exclude(group = "com.mysql", module = "mysql-connector-java") - exclude(group = "com.h2database", module = "h2") - exclude(group = "org.mongodb", module = "mongodb-driver-core") - exclude(group = "org.mongodb", module = "bson") - exclude(group = "redis.clients", module = "jedis") - exclude(group = "de.tr7zw", module = "item-nbt-api") + // Translates + exclude(group = "me.gabytm.util", module = "actions-spigot") + exclude(group = "org.jetbrains", module = "annotations") + exclude(group = "com.ticxo", module = "PlayerAnimator") + exclude(group = "com.github.stefvanschie.inventoryframework", module = "IF") + exclude(group = "io.th0rgal", module = "protectionlib") + exclude(group = "dev.triumphteam", module = "triumph-gui") exclude(group = "org.bstats", module = "bstats-bukkit") - exclude(group = "com.zaxxer", module = "HikariCP") - exclude(group = "com.github.craftmend", module = "Openpay") + exclude(group = "com.jeff-media", module = "custom-block-data") + exclude(group = "com.jeff-media", module = "persistent-data-serializer") + exclude(group = "com.jeff_media", module = "MorePersistentDataTypes") + exclude(group = "gs.mclo", module = "java") } } -// ============================================================================ -// RESOURCE FILTERING (Placeholder Expansion) -// ============================================================================ -// -// Processes resource files (plugin.yml, config.yml) to replace Maven property -// placeholders with actual values. This ensures library versions declared in -// plugin.yml match what's shaded into the JAR. -// -// When the Paper server loads this plugin, plugin.yml contains the exact library -// versions that were included in the build, enabling Paper's automatic library -// download feature to work correctly. -// -// Example: -// Input: libraries: -// - 'mysql:mysql-connector-java:${mysql.version}' -// Output: libraries: -// - 'mysql:mysql-connector-java:8.0.27' -// -// This task runs during 'gradle assemble' and for 'shadowJar' task -// - -tasks.named("processResources") { - // Process ONLY plugin.yml and config.yml, leave other files untouched + +// --- Build Configuration (Translates and ) --- + +// Resource Filtering (Translates ) +tasks.processResources { + duplicatesStrategy = DuplicatesStrategy.EXCLUDE + + // Copy all resources + from(sourceSets.main.get().resources.srcDirs) + + // Apply filtering to plugin.yml and config.yml with direct token replacement filesMatching(listOf("plugin.yml", "config.yml")) { - // For each line in the matching files, perform string replacements filter { line -> - line - // Replace database driver versions with actual values - .replace("\${mysql.version}", mysqlVersion) + line.replace("\${mysql.version}", mysqlVersion) .replace("\${mariadb.version}", mariadbVersion) .replace("\${postgresql.version}", postgresqlVersion) .replace("\${mongodb.version}", mongodbVersion) .replace("\${hikaricp.version}", hikaricpVersion) - // Replace project version (for about/info display) + .replace("\${build.number}", finalBuildNumber) .replace("\${project.version}", project.version.toString()) + .replace("\${project.description}", project.description ?: "") + .replace("\${revision}", project.version.toString()) } } + + finalizedBy("copyLocales") +} + +// Copy 'locales' without filtering +tasks.register("copyLocales") { + duplicatesStrategy = DuplicatesStrategy.EXCLUDE + from("src/main/resources/locales") + into("${tasks.processResources.get().destinationDir}/locales") +} + +// Ensure compileTestJava depends on copyLocales +tasks.compileTestJava { + dependsOn("copyLocales") +} + +// Custom finalName (Translates ) +tasks.jar { + archiveFileName.set("${project.name}-${project.version}.jar") } -// ============================================================================ -// SHADOW JAR CONFIGURATION -// ============================================================================ -// -// Configures the shadow plugin to create an "uber JAR" - a self-contained -// JAR that includes all runtime dependencies bundled together. -// -// Key features: -// - Minimization: Removes unused classes to reduce JAR size -// - Class Relocation: Moves shaded packages to prevent conflicts -// - Selective Inclusion: Only packages needed by BentoBox are included -// -// Translates Maven: maven-shade-plugin configuration -// + +// --- Shading Plugin Configuration (Translates maven-shade-plugin) --- tasks.named("shadowJar") { - // Minimize the JAR by removing unused classes + // Translates true minimize() - - // Exclude specific artifacts that don't need to be shaded - // These are handled by other means (server provides them, not needed, etc.) + + // Artifact exclusion (Translates ) exclude( - "org.junit.jupiter:junit-jupiter", - "org.junit.jupiter:junit-jupiter-api", - "org.mockito:mockito-core", - "org.mockito:mockito-junit-jupiter" + "org.apache.maven:*:*", + "com.google.code.gson:*:*", + "org.mongodb:*:*", + "org.eclipse.jdt:*:*" ) - - // Relocate (rename) package names to avoid conflicts with server or other plugins - // This prevents version conflicts when multiple plugins use the same library - - // bstats metrics - rename to bentobox namespace - relocate("org.bstats", "world.bentobox.bstats") - - // PaperMC utility library - rename to avoid conflicts - relocate("io.papermc.lib", "world.bentobox.papermc.lib") - - // Multilib library loading - rename to bentobox namespace - relocate("com.github.puregero.multilib", "world.bentobox.multilib") - - // Set the manifest attribute for the main entry point (plugin loader) - manifest { - attributes("Main-Class" to "world.bentobox.BentoBox") - } + + // Relocations (Translates ) + relocate("org.bstats", "world.bentobox.bentobox.util.metrics") + relocate("io.papermc.lib", "world.bentobox.bentobox.paperlib") + relocate("com.github.puregero.multilib", "world.bentobox.bentobox.multilib") } -// Make shadowJar the default JAR for building -// This ensures 'gradle build' produces the shaded JAR instead of a thin JAR -artifacts { - archives(tasks.shadowJar) +// Ensure the shaded jar is the primary artifact when 'build' is run +tasks.build { + dependsOn(tasks.shadowJar) } -// ============================================================================ -// TESTING CONFIGURATION -// ============================================================================ -// -// Configures JUnit 5 test execution with special Java 21 settings. -// -// Java 21 requires module access configuration for test frameworks to work: -// - --enable-preview: Enables Java preview features -// - --add-opens: Allows test frameworks to access internal JDK modules -// -// Without these flags, tests would fail with "illegal access" errors -// - -tasks.named("test") { - // Enable JUnit 5 (Jupiter) test support +// --- Testing Configuration (Translates maven-surefire-plugin) --- + +tasks.test { useJUnitPlatform() - - // Java 21 requires preview features and special module access - // These flags allow testing frameworks to work with Java's module system - - // Enable preview features for Java 21 - jvmArgs("--enable-preview") - - // Allow dynamic agent loading needed by Mockito and other testing libraries - jvmArgs("-XX:+EnableDynamicAgentLoading") - - // Add module opens for JUnit Platform and testing frameworks - // These modules contain classes that test frameworks need to access - val moduleOpens = listOf( - "java.base", - "java.logging", - "java.lang.management", - "java.desktop", - "jdk.compiler", - "jdk.management", - "jdk.unsupported", - "java.instrument", - "java.base/java.lang", - "java.base/java.lang.invoke", - "java.base/java.nio", - "java.base/java.util", - "java.base/java.util.concurrent", - "java.base/java.util.concurrent.atomic", - "java.base/java.util.concurrent.locks", - "java.base/java.util.stream", - "java.base/java.lang.reflect", - "java.base/java.lang.module", - "jdk.unsupported/sun.misc", - "jdk.unsupported/sun.reflect", - "java.base/sun.nio.ch", - "java.base/sun.reflect.annotation" + + // Add --add-opens from maven-surefire-plugin for Java 21 compatibility + val openModules = listOf( + "java.base/java.lang", "java.base/java.math", "java.base/java.io", "java.base/java.util", + "java.base/java.util.stream", "java.base/java.text", "java.base/java.util.regex", + "java.base/java.nio.channels.spi", "java.base/sun.nio.ch", "java.base/java.net", + "java.base/java.util.concurrent", "java.base/sun.nio.fs", "java.base/sun.nio.cs", + "java.base/java.nio.file", "java.base/java.nio.charset", "java.base/java.lang.reflect", + "java.logging/java.util.logging", "java.base/java.lang.ref", "java.base/java.util.jar", + "java.base/java.util.zip", "java.base/java.security", "java.base/jdk.internal.misc" ) - - // Apply all module opens for JUnit Platform runner - moduleOpens.forEach { module -> + + jvmArgs("--enable-preview", "-XX:+EnableDynamicAgentLoading") + for (module in openModules) { jvmArgs("--add-opens", "$module=ALL-UNNAMED") } } -// ============================================================================ -// CODE COVERAGE (JaCoCo) -// ============================================================================ -// -// Generates code coverage reports showing which lines of code were executed -// during tests. Used for SonarCloud integration to track test coverage metrics. -// -// Translates Maven: jacoco-maven-plugin configuration -// - -jacoco { - // JaCoCo tool version to use - toolVersion = "0.8.10" -} +// --- JaCoCo Configuration (Translates jacoco-maven-plugin) --- -tasks.named("jacocoTestReport") { - // Generate both XML (for CI) and HTML (for viewing) reports +tasks.jacocoTestReport { reports { - xml.required = true // For CI integration (SonarCloud) - html.required = true // For local browsing (target/reports/jacoco/test/html/index.html) - } - - // Exclude certain packages from coverage reporting - // These are typically generated code or testing utilities - afterEvaluate { - classDirectories.setFrom(files(classDirectories.files.map { file -> - fileTree(file) { - // Exclude BentoBox addon implementations (covered separately per addon) - exclude("**/addon/**") - // Exclude generated code (annotation processors, etc.) - exclude("**/generated/**") - } - })) + xml.required.set(true) // Used for tools like SonarCloud + html.required.set(true) } + + // Translates + classDirectories.setFrom( + sourceSets.main.get().output.asFileTree.matching { + exclude("**/*Names*", "org/bukkit/Material*") + } + ) } -// Run JaCoCo report generation after tests complete -tasks.test { - finalizedBy(tasks.jacocoTestReport) +// --- Javadoc and Source Jar (Translates maven-javadoc-plugin & maven-source-plugin) --- + +// Configures the Javadoc task +tasks.javadoc { + source = sourceSets.main.get().allJava + options { + (this as StandardJavadocDocletOptions).apply { + addStringOption("Xdoclint:none", "-quiet") + source = javaVersion + } + } } -// ============================================================================ -// SOURCE AND JAVADOC JAR GENERATION -// ============================================================================ -// -// Creates additional JAR artifacts for publication: -// - sources JAR: Contains the original Java source code -// - javadoc JAR: Contains generated API documentation -// -// These help developers using BentoBox as a library to understand the API -// - -// Register task to create sources JAR -val sourcesJar = tasks.register("sourcesJar") { +// Creates the -sources.jar file (Translates maven-source-plugin execution) +tasks.register("sourcesJar") { archiveClassifier.set("sources") from(sourceSets.main.get().allSource) } -// Register task to create javadoc JAR -val javadocJar = tasks.register("javadocJar") { +// Creates the -javadoc.jar file (Translates maven-javadoc-plugin execution) +tasks.register("javadocJar") { archiveClassifier.set("javadoc") from(tasks.javadoc) } -// Configure Javadoc generation -tasks.named("javadoc") { - // Disable strict Javadoc checking (many projects have missing/malformed docs) - (options as StandardJavadocDocletOptions).addStringOption("Xdoclint:none", "-quiet") -} - -// ============================================================================ -// MAVEN PUBLISHING CONFIGURATION -// ============================================================================ -// -// Configures publication of the built artifacts (JAR + sources + javadoc) -// to the bentoboxworld Maven repository on CodeMC. -// -// Allows other projects to use BentoBox as a library via dependency declarations: -// implementation("world.bentobox:bentobox:3.10.2") -// -// Translates Maven: and sections -// +// --- Publishing (Translates ) --- +// Attaches source/javadoc to the publishing configuration publishing { - repositories { - // Publication target: CodeMC bentoboxworld repository - maven { - name = "CodeMC" - url = uri("https://repo.codemc.io/repository/bentoboxworld/") + publications { + create("mavenJava") { + // Use the shaded JAR as the main artifact + artifact(tasks.shadowJar.get()) { + builtBy(tasks.shadowJar) + } - // Publishing requires authentication via gradle.properties: - // codeMcUsername= - // codeMcPassword= - credentials(PasswordCredentials::class) + // Attach sources and Javadocs + artifact(tasks.getByName("sourcesJar")) + artifact(tasks.getByName("javadocJar")) + + // Set coordinates + groupId = project.group as String + artifactId = rootProject.name + version = project.version as String } } - publications { - // Define the Maven publication containing all artifacts - register("mavenJava") { - // Use the shadowJar task output as the main artifact - artifact(tasks.shadowJar) - - // Include sources JAR for IDE integration - artifact(sourcesJar) - - // Include javadoc JAR for API reference - artifact(javadocJar) - - // Set publication coordinates - groupId = "world.bentobox" - artifactId = "bentobox" - version = project.version.toString() - - // Define the POM (Project Object Model) structure - // This metadata helps dependency managers understand the artifact - pom { - name.set("BentoBox") - description.set("Island plugin framework for Paper") - url.set("https://github.com/BentoBoxWorld/BentoBox") - } + // Defines the repository (Translates in ) + repositories { + maven { + name = "bentoboxworld" + url = uri("https://repo.codemc.org/repository/bentoboxworld/") } } } - -// ============================================================================ -// BUILD VERIFICATION -// ============================================================================ -// -// This comment block summarizes the complete build workflow: -// -// 1. SOURCES -// └─ src/main/java/**/*.java (Java source code) -// └─ src/main/resources/plugin.yml (Plugin metadata) -// └─ src/main/resources/config.yml (Configuration template) -// └─ src/test/java/**/*.java (Test source code) -// -// 2. COMPILATION -// └─ Compile main sources against Paper API + other provided APIs -// └─ Compile test sources against JUnit 5, Mockito, MockBukkit -// -// 3. RESOURCE FILTERING -// └─ Replace ${mysql.version}, ${mongodb.version}, etc. in plugin.yml -// └─ Replace ${project.version} with actual build version -// -// 4. TESTING -// └─ Run tests with JUnit 5 + special Java 21 module configuration -// └─ Generate coverage reports (JaCoCo) -// -// 5. SHADING -// └─ Minimize (remove unused classes) -// └─ Include implementation dependencies (bstats, multilib, etc.) -// └─ Relocate packages to prevent conflicts -// └─ Create shadowJar: build/libs/bentobox-3.10.2-...-all.jar -// -// 6. PUBLISHING -// └─ Upload JAR, sources, javadoc to CodeMC repository -// └─ Users can then: implementation("world.bentobox:bentobox:...") -// From bae6c8276a7e43bff91e15348cd47d16ddc24844 Mon Sep 17 00:00:00 2001 From: tastybento Date: Sun, 14 Dec 2025 20:04:05 -0800 Subject: [PATCH 08/21] Match name of file --- build.gradle.kts | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/build.gradle.kts b/build.gradle.kts index 91067a87b..487920461 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -273,6 +273,8 @@ tasks.named("shadowJ relocate("org.bstats", "world.bentobox.bentobox.util.metrics") relocate("io.papermc.lib", "world.bentobox.bentobox.paperlib") relocate("com.github.puregero.multilib", "world.bentobox.bentobox.multilib") + // Remove the "-all" suffix + archiveClassifier.set("") } // Ensure the shaded jar is the primary artifact when 'build' is run @@ -373,3 +375,7 @@ publishing { } } } + +base { + archivesName.set("BentoBox") +} From a3166ab57d6ca25524da0edc10fe52bbc6153def Mon Sep 17 00:00:00 2001 From: tastybento Date: Sun, 14 Dec 2025 20:08:36 -0800 Subject: [PATCH 09/21] Documentation redo --- build.gradle.kts | 269 ++++++++++++++++++++++++++++------------------- 1 file changed, 159 insertions(+), 110 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 487920461..fbc5a72a5 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,52 +1,72 @@ +/** + * BentoBox Gradle Build Configuration + * + * This build script configures the compilation, testing, packaging, and publishing + * of the BentoBox Minecraft plugin. It handles: + * - Java 21 compilation with proper module access + * - Multi-repository dependency resolution + * - JAR shading and minimization + * - Test execution with JUnit 5 + * - Code coverage reporting with JaCoCo + * - Maven publication to the BentoBox repository + */ + +// ============================================================================ +// PLUGINS: Core build functionality +// ============================================================================ // Apply necessary plugins for Java development, publishing, testing, and shading plugins { - // Standard Java development plugin + // Standard Java development plugin - provides compile, test, jar tasks java - // For publishing the artifact (translates ) + // Maven Publishing - allows publishing artifacts to Maven repositories `maven-publish` - // For code coverage (translates jacoco-maven-plugin) + // JaCoCo (Java Code Coverage) - generates code coverage reports for CI/CD id("jacoco") - // For shading, minimization, and relocation (translates maven-shade-plugin) + // Shadow Plugin - shades (embeds) dependencies into the final JAR and minimizes unused code id("com.gradleup.shadow") version "9.3.0" } -// --- Project Coordinates and Versioning (Translates , , and ) --- - +// ============================================================================ +// PROJECT COORDINATES & VERSIONING +// ============================================================================ +// These properties define the artifact's identity in the Maven repository group = "world.bentobox" // From // Base properties from val buildVersion = "3.10.2" -val buildNumberDefault = "-LOCAL" -val snapshotSuffix = "-SNAPSHOT" +val buildNumberDefault = "-LOCAL" // Local build identifier +val snapshotSuffix = "-SNAPSHOT" // Indicates development/snapshot version // CI/CD Logic (Translates Maven ) +// Default version format: 3.10.2-LOCAL-SNAPSHOT var finalBuildNumber = buildNumberDefault var finalRevision = "$buildVersion$finalBuildNumber$snapshotSuffix" -// 'ci' profile logic: Activated by env.BUILD_NUMBER +// 'ci' profile logic: Activated by env.BUILD_NUMBER from CI/CD pipeline +// Overrides build number with actual CI build number val envBuildNumber = System.getenv("BUILD_NUMBER") if (!envBuildNumber.isNullOrBlank()) { - // Override only if necessary (as per POM comment) finalBuildNumber = "-b$envBuildNumber" finalRevision = "$buildVersion$finalBuildNumber$snapshotSuffix" } -// 'master' profile logic: Activated by env.GIT_BRANCH == origin/master +// 'master' profile logic: Activated when building from origin/master branch +// Removes -LOCAL and -SNAPSHOT suffixes for release builds val envGitBranch = System.getenv("GIT_BRANCH") if (envGitBranch == "origin/master") { - // Override revision to remove -SNAPSHOT and set build number to empty string - finalBuildNumber = "" // Empties build number variable. - finalRevision = buildVersion + finalBuildNumber = "" // No build number for releases + finalRevision = buildVersion // Clean version number } version = finalRevision -// --- Global Properties (Translates remaining ) --- - -// Dependency versions (used in dependencies block and throughout) +// ============================================================================ +// DEPENDENCY VERSIONS +// ============================================================================ +// Centralized version management for all external dependencies val javaVersion = "21" val junitVersion = "5.10.2" val mockitoVersion = "5.11.0" @@ -64,7 +84,7 @@ val levelVersion = "2.21.3" val placeholderapiVersion = "2.11.7" val myworldsVersion = "1.19.3-v1" -// Also store in extra properties for resource filtering +// Store versions in extra properties for resource filtering (used in plugin.yml, config.yml) extra["java.version"] = javaVersion extra["junit.version"] = junitVersion extra["mockito.version"] = mockitoVersion @@ -81,120 +101,120 @@ extra["vault.version"] = vaultVersion extra["level.version"] = levelVersion extra["placeholderapi.version"] = placeholderapiVersion extra["myworlds.version"] = myworldsVersion -// Define variables used in and build logic extra["build.version"] = buildVersion extra["build.number"] = finalBuildNumber extra["revision"] = finalRevision -// --- Java Configuration --- - -// Configures source/target compatibility and toolchain +// ============================================================================ +// JAVA CONFIGURATION +// ============================================================================ +// Configures Java compiler and toolchain settings java { - // Uses Java 21 toolchain (as remembered and specified in POM) + // Use Java 21 toolchain for compilation (enforced regardless of JVM running Gradle) toolchain { languageVersion = JavaLanguageVersion.of(javaVersion) } } tasks.withType { - options.encoding = "UTF-8" // From + // Ensure UTF-8 encoding for all source files + options.encoding = "UTF-8" } -// --- Repositories (Translates ) --- - +// ============================================================================ +// REPOSITORIES +// ============================================================================ +// Defines where dependencies are downloaded from (in order of precedence) repositories { - // Default repository for most libraries + // Standard Maven Central Repository - most common Java libraries mavenCentral() - // Custom Repositories from POM - maven("https://jitpack.io") { name = "JitPack" } + // Custom repositories for Minecraft and plugin-specific libraries + maven("https://jitpack.io") { name = "JitPack" } // GitHub repository packages maven("https://repo.codemc.org/repository/maven-public") { name = "CodeMC-Public" } - maven("https://repo.papermc.io/repository/maven-public/") { name = "PaperMC" } - maven("https://libraries.minecraft.net/") { name = "MinecraftLibs" } + maven("https://repo.papermc.io/repository/maven-public/") { name = "PaperMC" } // Paper API + maven("https://libraries.minecraft.net/") { name = "MinecraftLibs" } // Official Minecraft libraries maven("https://hub.spigotmc.org/nexus/content/repositories/snapshots") { name = "Spigot-Snapshots" } - maven("https://repo.codemc.io/repository/nms/") { name = "NMS-Repo" } + maven("https://repo.codemc.io/repository/nms/") { name = "NMS-Repo" } // NMS (internal Minecraft code) maven("https://ci.mg-dev.eu/plugin/repository/everything") { name = "MG-Dev-CI" } maven("https://repo.onarandombox.com/multiverse-releases") { name = "Multiverse-Releases" } maven("https://repo.onarandombox.com/multiverse-snapshots") { name = "Multiverse-Snapshots" } - maven("https://mvn.lumine.io/repository/maven-public/") { name = "Lumine-Releases" } + maven("https://mvn.lumine.io/repository/maven-public/") { name = "Lumine-Releases" } // Mythic mobs maven("https://repo.clojars.org/") { name = "Clojars" } maven("https://repo.fancyplugins.de/releases") { name = "FancyPlugins-Releases" } maven("https://repo.pyr.lol/snapshots") { name = "Pyr-Snapshots" } maven("https://maven.devs.beer/") { name = "MatteoDev" } - maven("https://repo.oraxen.com/releases") { name = "Oraxen" } + maven("https://repo.oraxen.com/releases") { name = "Oraxen" } // Custom items plugin maven("https://repo.codemc.org/repository/bentoboxworld/") { name = "BentoBoxWorld-Repo" } maven("https://repo.extendedclip.com/releases/") { name = "Placeholder-API-Releases" } } -// --- Dependencies (Translates ) --- +// ============================================================================ +// DEPENDENCIES +// ============================================================================ +// Defines all external libraries needed for compilation and testing dependencies { - // --- Test Dependencies (test) --- + // --- Test Dependencies: Only used during testing, not in production --- testImplementation(platform("org.junit:junit-bom:$junitVersion")) testImplementation("org.junit.jupiter:junit-jupiter-api") testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine") - // Ensure JUnit Platform launcher matches the engine/platform versions testRuntimeOnly("org.junit.platform:junit-platform-launcher:$junitVersion") - testImplementation("org.mockito:mockito-junit-jupiter:$mockitoVersion") + testImplementation("org.mockito:mockito-junit-jupiter:$mockitoVersion") // Mocking framework testImplementation("org.mockito:mockito-core:$mockitoVersion") - testImplementation("com.github.MockBukkit:MockBukkit:$mockBukkitVersion") - testImplementation("org.awaitility:awaitility:4.2.2") - // Paper API for test compilation - testImplementation("io.papermc.paper:paper-api:1.21.10-R0.1-SNAPSHOT") - // Vault API for test compilation + testImplementation("com.github.MockBukkit:MockBukkit:$mockBukkitVersion") // Bukkit mock server + testImplementation("org.awaitility:awaitility:4.2.2") // Async testing helper + testImplementation("io.papermc.paper:paper-api:1.21.10-R0.1-SNAPSHOT") // Paper API for tests testImplementation("com.github.MilkBowl:VaultAPI:$vaultVersion") - // PlaceholderAPI for test compilation (provides PlaceholderExpansion) testImplementation("me.clip:placeholderapi:$placeholderapiVersion") - // --- Provided/Compile-Only Dependencies (provided) --- - //compileOnly("io.papermc.paper:paper-api:$paperVersion") - compileOnly("io.papermc.paper:paper-api:1.21.10-R0.1-SNAPSHOT") - // Note: Paper API includes Spigot API, so we don't need to include it separately + // --- Provided/Compile-Only Dependencies: Available at compile time but provided by server --- + // These are NOT shaded into the final JAR (the server provides them at runtime) + compileOnly("io.papermc.paper:paper-api:1.21.10-R0.1-SNAPSHOT") // Bukkit/Spigot/Paper API - // Spigot NMS - Used for chunk deletion and pasting + // Spigot NMS - Used for internal Minecraft code (chunk deletion and pasting) compileOnly("org.spigotmc:spigot:$spigotVersion") { - exclude(group = "org.spigotmc", module = "spigot-api") + exclude(group = "org.spigotmc", module = "spigot-api") // Already provided by Paper } + // Optional plugins that may be installed on the server compileOnly("org.mongodb:mongodb-driver:$mongodbVersion") - compileOnly("com.zaxxer:HikariCP:$hikaricpVersion") - compileOnly("com.github.MilkBowl:VaultAPI:$vaultVersion") - compileOnly("me.clip:placeholderapi:$placeholderapiVersion") + compileOnly("com.zaxxer:HikariCP:$hikaricpVersion") // Database connection pooling + compileOnly("com.github.MilkBowl:VaultAPI:$vaultVersion") // Economy/permission API + compileOnly("me.clip:placeholderapi:$placeholderapiVersion") // Placeholder API compileOnly("com.bergerkiller.bukkit:MyWorlds:$myworldsVersion") { exclude(group = "org.spigotmc", module = "spigot-api") } - compileOnly("io.lumine:Mythic-Dist:5.9.5") - compileOnly("org.mvplugins.multiverse.core:multiverse-core:5.0.0-SNAPSHOT") { - exclude(group = "org.spigotmc", module = "spigot-api") - } + compileOnly("io.lumine:Mythic-Dist:5.9.5") // Mythic Mobs + compileOnly("org.mvplugins.multiverse.core:multiverse-core:5.0.0-SNAPSHOT") compileOnly("com.onarandombox.multiversecore:multiverse-core:4.3.16") { exclude(group = "org.spigotmc", module = "spigot-api") } compileOnly("com.github.apachezy:LangUtils:3.2.2") - compileOnly("com.github.Slimefun:Slimefun4:RC-37") - compileOnly("dev.lone:api-itemsadder:4.0.2-beta-release-11") - compileOnly("de.oliver:FancyNpcs:2.4.4") - compileOnly("lol.pyr:znpcsplus-api:2.0.0-SNAPSHOT") - compileOnly("de.oliver:FancyHolograms:2.4.1") - compileOnly("world.bentobox:level:2.21.3-SNAPSHOT") - - // Apache Commons Lang (provides NumberUtils) - available at test time + compileOnly("com.github.Slimefun:Slimefun4:RC-37") // Slimefun custom items + compileOnly("dev.lone:api-itemsadder:4.0.2-beta-release-11") // ItemsAdder custom items + compileOnly("de.oliver:FancyNpcs:2.4.4") // NPC plugin + compileOnly("lol.pyr:znpcsplus-api:2.0.0-SNAPSHOT") // Alternative NPC plugin + compileOnly("de.oliver:FancyHolograms:2.4.1") // Hologram plugin + compileOnly("world.bentobox:level:2.21.3-SNAPSHOT") // BentoBox Level addon + + // Apache Commons Lang - utility library compileOnly("commons-lang:commons-lang:2.6") testImplementation("commons-lang:commons-lang:2.6") - // --- Implementation Dependencies (Default scope) --- - implementation("org.bstats:bstats-bukkit:$bstatsVersion") - implementation("javax.xml.bind:jaxb-api:2.3.0") - implementation("com.github.Marcono1234:gson-record-type-adapter-factory:0.3.0") - implementation("org.eclipse.jdt:org.eclipse.jdt.annotation:2.2.600") - implementation("com.github.puregero:multilib:1.1.13") + // --- Implementation Dependencies: Shaded into final JAR --- + // These are embedded in the final JAR since they're not commonly available + implementation("org.bstats:bstats-bukkit:$bstatsVersion") // Plugin metrics + implementation("javax.xml.bind:jaxb-api:2.3.0") // XML serialization + implementation("com.github.Marcono1234:gson-record-type-adapter-factory:0.3.0") // JSON serialization + implementation("org.eclipse.jdt:org.eclipse.jdt.annotation:2.2.600") // Nullability annotations + implementation("com.github.puregero:multilib:1.1.13") // Multi-library support - // Oraxen with exclusions + // Oraxen with custom exclusions (embed only what we need) compileOnly("io.th0rgal:oraxen:1.193.1") { - // Translates exclude(group = "me.gabytm.util", module = "actions-spigot") exclude(group = "org.jetbrains", module = "annotations") exclude(group = "com.ticxo", module = "PlayerAnimator") @@ -210,16 +230,18 @@ dependencies { } -// --- Build Configuration (Translates and ) --- +// ============================================================================ +// RESOURCE PROCESSING +// ============================================================================ +// Filters and copies resources (plugin.yml, config files, locales) to build output -// Resource Filtering (Translates ) tasks.processResources { duplicatesStrategy = DuplicatesStrategy.EXCLUDE - // Copy all resources from(sourceSets.main.get().resources.srcDirs) - // Apply filtering to plugin.yml and config.yml with direct token replacement + // Replace variables in plugin.yml and config.yml with actual version strings + // This allows version info to be read at runtime by the plugin filesMatching(listOf("plugin.yml", "config.yml")) { filter { line -> line.replace("\${mysql.version}", mysqlVersion) @@ -237,57 +259,72 @@ tasks.processResources { finalizedBy("copyLocales") } -// Copy 'locales' without filtering +// Copy locale files without filtering (prevents corruption of translation files) tasks.register("copyLocales") { duplicatesStrategy = DuplicatesStrategy.EXCLUDE from("src/main/resources/locales") into("${tasks.processResources.get().destinationDir}/locales") } -// Ensure compileTestJava depends on copyLocales +// Ensure test compilation waits for locale files to be copied tasks.compileTestJava { dependsOn("copyLocales") } -// Custom finalName (Translates ) +// Set the final JAR filename to match project name and version tasks.jar { archiveFileName.set("${project.name}-${project.version}.jar") } -// --- Shading Plugin Configuration (Translates maven-shade-plugin) --- +// ============================================================================ +// JAR SHADING & MINIMIZATION +// ============================================================================ +// Shadow Plugin: Embeds dependencies into JAR and removes unused code +// This creates a "fat JAR" with all required dependencies tasks.named("shadowJar") { - // Translates true + // Enable minimization: removes unused classes/methods from shaded dependencies + // Reduces JAR size significantly minimize() - // Artifact exclusion (Translates ) + // Exclude these artifacts from being shaded (already provided by server or incompatible) exclude( - "org.apache.maven:*:*", - "com.google.code.gson:*:*", - "org.mongodb:*:*", - "org.eclipse.jdt:*:*" + "org.apache.maven:*:*", // Maven tools not needed at runtime + "com.google.code.gson:*:*", // Often provided by server + "org.mongodb:*:*", // Optional dependency + "org.eclipse.jdt:*:*" // Optional dependency ) - // Relocations (Translates ) + // Relocate (rename) packages to avoid conflicts with other plugins + // This prevents "duplicate class" errors when multiple plugins have same dependency relocate("org.bstats", "world.bentobox.bentobox.util.metrics") relocate("io.papermc.lib", "world.bentobox.bentobox.paperlib") relocate("com.github.puregero.multilib", "world.bentobox.bentobox.multilib") - // Remove the "-all" suffix + + // Remove the "-all" suffix from the shaded JAR filename archiveClassifier.set("") } -// Ensure the shaded jar is the primary artifact when 'build' is run +// Make the shaded JAR the primary artifact for the 'build' task tasks.build { dependsOn(tasks.shadowJar) } -// --- Testing Configuration (Translates maven-surefire-plugin) --- +// ============================================================================ +// TEST EXECUTION +// ============================================================================ +// Configures JUnit 5 testing with special Java module access for Java 21 tasks.test { + // Use JUnit Platform (required for JUnit 5) useJUnitPlatform() - // Add --add-opens from maven-surefire-plugin for Java 21 compatibility + // Enable Java 21 preview features and dynamic agent loading + jvmArgs("--enable-preview", "-XX:+EnableDynamicAgentLoading") + + // Add --add-opens: Required for Java 21+ to allow reflection access to restricted modules + // Necessary for mocking frameworks and other testing utilities val openModules = listOf( "java.base/java.lang", "java.base/java.math", "java.base/java.io", "java.base/java.util", "java.base/java.util.stream", "java.base/java.text", "java.base/java.util.regex", @@ -298,84 +335,96 @@ tasks.test { "java.base/java.util.zip", "java.base/java.security", "java.base/jdk.internal.misc" ) - jvmArgs("--enable-preview", "-XX:+EnableDynamicAgentLoading") for (module in openModules) { jvmArgs("--add-opens", "$module=ALL-UNNAMED") } } -// --- JaCoCo Configuration (Translates jacoco-maven-plugin) --- +// ============================================================================ +// CODE COVERAGE (JACOCO) +// ============================================================================ +// Generates code coverage reports to measure test coverage tasks.jacocoTestReport { reports { - xml.required.set(true) // Used for tools like SonarCloud - html.required.set(true) + xml.required.set(true) // XML format for CI/CD tools like SonarCloud + html.required.set(true) // HTML format for human viewing } - // Translates + // Exclude certain classes from coverage analysis classDirectories.setFrom( sourceSets.main.get().output.asFileTree.matching { - exclude("**/*Names*", "org/bukkit/Material*") + exclude("**/*Names*", "org/bukkit/Material*") // Generated/external classes } ) } -// --- Javadoc and Source Jar (Translates maven-javadoc-plugin & maven-source-plugin) --- +// ============================================================================ +// JAVADOC & SOURCE ARTIFACTS +// ============================================================================ +// Creates additional JARs for publication: sources and javadoc -// Configures the Javadoc task tasks.javadoc { source = sourceSets.main.get().allJava options { (this as StandardJavadocDocletOptions).apply { + // Suppress warnings and keep output quiet addStringOption("Xdoclint:none", "-quiet") source = javaVersion } } } -// Creates the -sources.jar file (Translates maven-source-plugin execution) +// Creates BentoBox--sources.jar containing all source code tasks.register("sourcesJar") { archiveClassifier.set("sources") from(sourceSets.main.get().allSource) } -// Creates the -javadoc.jar file (Translates maven-javadoc-plugin execution) +// Creates BentoBox--javadoc.jar containing generated documentation tasks.register("javadocJar") { archiveClassifier.set("javadoc") from(tasks.javadoc) } -// --- Publishing (Translates ) --- +// ============================================================================ +// PUBLICATION TO MAVEN REPOSITORY +// ============================================================================ +// Publishes build artifacts to the BentoBox Maven repository -// Attaches source/javadoc to the publishing configuration publishing { publications { create("mavenJava") { - // Use the shaded JAR as the main artifact + // Use the shaded (shadow) JAR as the main artifact, not the plain JAR artifact(tasks.shadowJar.get()) { builtBy(tasks.shadowJar) } - // Attach sources and Javadocs + // Also attach source code and javadoc for developers artifact(tasks.getByName("sourcesJar")) artifact(tasks.getByName("javadocJar")) - // Set coordinates + // Set Maven coordinates groupId = project.group as String artifactId = rootProject.name version = project.version as String } } - // Defines the repository (Translates in ) + // Configure publication target repository repositories { maven { name = "bentoboxworld" - url = uri("https://repo.codemc.org/repository/bentoboxworld/") + url = uri("https://repo.codemc.org/repository/bentoboxworld/") // Where artifacts are uploaded } } } +// ============================================================================ +// ARCHIVE NAMING +// ============================================================================ +// Sets the base name for all generated artifacts + base { - archivesName.set("BentoBox") + archivesName.set("BentoBox") // Final JARs will be: BentoBox-.jar, etc. } From f6dc916d3f62e8dc31733103b9e6083175a5ae6f Mon Sep 17 00:00:00 2001 From: tastybento Date: Sun, 14 Dec 2025 20:42:16 -0800 Subject: [PATCH 10/21] Added paperweight-userdev --- build.gradle.kts | 25 ++++++++++++++++++++++-- gradle/wrapper/gradle-wrapper.properties | 2 +- 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index fbc5a72a5..0bb2558f5 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -27,8 +27,15 @@ plugins { // Shadow Plugin - shades (embeds) dependencies into the final JAR and minimizes unused code id("com.gradleup.shadow") version "9.3.0" + + // Paperweight UserDev - simplifies development against PaperMC with proper mappings and reobfuscation + id("io.papermc.paperweight.userdev") version "2.0.0-beta.19" } +// Add paperweight reobf configuration so the userdev plugin reobfuscates artifacts +// using the Mojang production mappings as required by paperweight-userdev. +paperweight.reobfArtifactConfiguration = io.papermc.paperweight.userdev.ReobfArtifactConfiguration.MOJANG_PRODUCTION + // ============================================================================ // PROJECT COORDINATES & VERSIONING // ============================================================================ @@ -128,13 +135,16 @@ tasks.withType { // ============================================================================ // Defines where dependencies are downloaded from (in order of precedence) repositories { + // Gradle Plugin Portal - for resolving Gradle plugins + gradlePluginPortal() + // PaperMC Maven Repository - for Paper API and related libraries + maven("https://repo.papermc.io/repository/maven-public/") { name = "PaperMC" } // Paper API // Standard Maven Central Repository - most common Java libraries mavenCentral() // Custom repositories for Minecraft and plugin-specific libraries maven("https://jitpack.io") { name = "JitPack" } // GitHub repository packages maven("https://repo.codemc.org/repository/maven-public") { name = "CodeMC-Public" } - maven("https://repo.papermc.io/repository/maven-public/") { name = "PaperMC" } // Paper API maven("https://libraries.minecraft.net/") { name = "MinecraftLibs" } // Official Minecraft libraries maven("https://hub.spigotmc.org/nexus/content/repositories/snapshots") { name = "Spigot-Snapshots" } maven("https://repo.codemc.io/repository/nms/") { name = "NMS-Repo" } // NMS (internal Minecraft code) @@ -173,7 +183,8 @@ dependencies { // --- Provided/Compile-Only Dependencies: Available at compile time but provided by server --- // These are NOT shaded into the final JAR (the server provides them at runtime) - compileOnly("io.papermc.paper:paper-api:1.21.10-R0.1-SNAPSHOT") // Bukkit/Spigot/Paper API + //compileOnly("io.papermc.paper:paper-api:1.21.10-R0.1-SNAPSHOT") // Bukkit/Spigot/Paper API + paperweight.paperDevBundle("1.21.10-R0.1-SNAPSHOT") // Spigot NMS - Used for internal Minecraft code (chunk deletion and pasting) compileOnly("org.spigotmc:spigot:$spigotVersion") { @@ -229,6 +240,16 @@ dependencies { } } +paperweight { + javaLauncher = javaToolchains.launcherFor { + // Example scenario: + // Paper 1.17.1 was originally built with JDK 16 and the bundle + // has not been updated to work with 21+ (but we want to compile with a 25 toolchain) + // Use the project's configured Java version for paperweight tools (needs Java 21+) + languageVersion = JavaLanguageVersion.of(javaVersion) + } +} + // ============================================================================ // RESOURCE PROCESSING diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index df97d72b8..2a84e188b 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME From 8c20075e799d194c89828b86ea176d29b5598d10 Mon Sep 17 00:00:00 2001 From: tastybento Date: Sun, 14 Dec 2025 20:47:05 -0800 Subject: [PATCH 11/21] Add prevention of using paperweight during tests MockBukkit is not compatible with the paperweight provided artifact. Whenever these two artifacts are simultaneously provided at test time, it causes errors. Solution: exclude the paperweight provided artifact at test time. --- build.gradle.kts | 1 + 1 file changed, 1 insertion(+) diff --git a/build.gradle.kts b/build.gradle.kts index 0bb2558f5..31554d718 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -241,6 +241,7 @@ dependencies { } paperweight { + addServerDependencyTo = configurations.named(JavaPlugin.COMPILE_ONLY_CONFIGURATION_NAME).map { setOf(it) } javaLauncher = javaToolchains.launcherFor { // Example scenario: // Paper 1.17.1 was originally built with JDK 16 and the bundle From 42230959319174d38c783981db72aca93d0f5e20 Mon Sep 17 00:00:00 2001 From: tastybento Date: Mon, 15 Dec 2025 17:42:48 -0800 Subject: [PATCH 12/21] Modify build workflow for SonarQube and Gradle Updated GitHub Actions workflow to use SonarQube for analysis, changed JDK distribution, and added Gradle caching. --- .github/workflows/build.yml | 31 ++++++++++--------------------- 1 file changed, 10 insertions(+), 21 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 61ba80048..aefd26c15 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,14 +1,13 @@ -name: Build +name: SonarQube on: push: branches: - develop - - master pull_request: types: [opened, synchronize, reopened] jobs: build: - name: Build + name: Build and analyze runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 @@ -17,31 +16,21 @@ jobs: - name: Set up JDK 21 uses: actions/setup-java@v4 with: - distribution: 'adopt' - java-version: '21' - - name: Cache SonarCloud packages + java-version: 21 + distribution: 'zulu' # Alternative distribution options are available + - name: Cache SonarQube packages uses: actions/cache@v4 with: path: ~/.sonar/cache key: ${{ runner.os }}-sonar restore-keys: ${{ runner.os }}-sonar - - name: Cache Maven packages + - name: Cache Gradle packages uses: actions/cache@v4 with: - path: ~/.m2 - key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} - restore-keys: ${{ runner.os }}-m2 + path: ~/.gradle/caches + key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }} + restore-keys: ${{ runner.os }}-gradle - name: Build and analyze env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} - run: mvn -B verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.projectKey=BentoBoxWorld_BentoBox - - name: Debug - List target directory - run: ls -la /home/runner/work/BentoBox/BentoBox/target - - run: mvn --batch-mode clean org.jacoco:jacoco-maven-plugin:prepare-agent install - - run: mkdir staging && cp target/*.jar staging - - name: Save artifacts - uses: actions/upload-artifact@v4 - with: - name: Package - path: staging + run: ./gradlew build sonar --info From 6a4a789509db7b44bf92637edea9432fbabb073d Mon Sep 17 00:00:00 2001 From: tastybento Date: Mon, 15 Dec 2025 17:43:12 -0800 Subject: [PATCH 13/21] Add SonarCube to Gradle build --- build.gradle.kts | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/build.gradle.kts b/build.gradle.kts index 31554d718..ede4a21af 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -30,6 +30,9 @@ plugins { // Paperweight UserDev - simplifies development against PaperMC with proper mappings and reobfuscation id("io.papermc.paperweight.userdev") version "2.0.0-beta.19" + + // Sonarcube + id("org.sonarqube") version "7.2.1.6560" } // Add paperweight reobf configuration so the userdev plugin reobfuscates artifacts @@ -251,6 +254,13 @@ paperweight { } } +sonar { + properties { + property("sonar.projectKey", "BentoBoxWorld_BentoBox") + property("sonar.organization", "bentobox-world") + } +} + // ============================================================================ // RESOURCE PROCESSING From 34b1b96cdc46c35dcf99725f7e2b61961f6b532b Mon Sep 17 00:00:00 2001 From: tastybento Date: Mon, 15 Dec 2025 17:51:31 -0800 Subject: [PATCH 14/21] Fix for GitHub action build? --- .github/workflows/modrinth-publish.yml | 44 -------------------------- build.gradle.kts | 1 + gradlew | 11 +++---- gradlew.bat | 4 +-- 4 files changed, 8 insertions(+), 52 deletions(-) delete mode 100644 .github/workflows/modrinth-publish.yml diff --git a/.github/workflows/modrinth-publish.yml b/.github/workflows/modrinth-publish.yml deleted file mode 100644 index e0d2a0a91..000000000 --- a/.github/workflows/modrinth-publish.yml +++ /dev/null @@ -1,44 +0,0 @@ -name: Publish - -on: - release: - types: [published] - -jobs: - publish: - name: Publish - runs-on: ubuntu-latest - steps: - - name: Checkout repository - uses: actions/checkout@v4 - - - name: Set up JDK 21 - uses: actions/setup-java@v4 - with: - java-version: 21 - distribution: adopt - cache: maven - - # This step will take the version tag from the release and replace it in `pom.xml` before building. - #- name: Set version from release tag - # run: mvn -B versions:set -DnewVersion=${{ github.event.release.tag_name }} -DgenerateBackupPoms=false - - - name: Build and package with Maven - run: mvn -B clean package -DskipTests -Pmaster --file pom.xml - - name: Debug - List target directory - run: ls -la /home/runner/work/BentoBox/BentoBox/target - - name: Upload to Modrinth - uses: cloudnode-pro/modrinth-publish@v2 - with: - token: ${{ secrets.MODRINTH_TOKEN }} - project: aBVLHiAW - name: ${{ github.event.release.name }} - version: ${{ github.event.release.tag_name }} - changelog: ${{ github.event.release.body }} - loaders: |- - paper - spigot - game-versions: |- - 1.21.4 - 1.21.5 - files: /home/runner/work/BentoBox/BentoBox/target/BentoBox-${{ github.event.release.tag_name }}.jar diff --git a/build.gradle.kts b/build.gradle.kts index ede4a21af..94284b4d6 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -306,6 +306,7 @@ tasks.compileTestJava { // Set the final JAR filename to match project name and version tasks.jar { archiveFileName.set("${project.name}-${project.version}.jar") + dependsOn("copyLocales") // Explicit dependency for Gradle 9.0+ strict validation } diff --git a/gradlew b/gradlew index f5feea6d6..ef07e0162 100755 --- a/gradlew +++ b/gradlew @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright © 2015-2021 the original authors. +# Copyright © 2015 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -86,8 +86,7 @@ done # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) -APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s -' "$PWD" ) || exit +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -115,7 +114,7 @@ case "$( uname )" in #( NONSTOP* ) nonstop=true ;; esac -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar +CLASSPATH="\\\"\\\"" # Determine the Java command to use to start the JVM. @@ -206,7 +205,7 @@ fi DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Collect all arguments for the java command: -# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, # and any embedded shellness will be escaped. # * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be # treated as '${Hostname}' itself on the command line. @@ -214,7 +213,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' set -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \ -classpath "$CLASSPATH" \ - org.gradle.wrapper.GradleWrapperMain \ + -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ "$@" # Stop when "xargs" is not available. diff --git a/gradlew.bat b/gradlew.bat index 9b42019c7..5eed7ee84 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -70,11 +70,11 @@ goto fail :execute @rem Setup the command line -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar +set CLASSPATH= @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* :end @rem End local scope for the variables with windows NT shell From c2ccefbb0adf527f6f4beb7fd4745dd765cd2625 Mon Sep 17 00:00:00 2001 From: tastybento Date: Mon, 15 Dec 2025 17:57:51 -0800 Subject: [PATCH 15/21] Grant execute permission for gradlew Added step to grant execute permission for gradlew. --- .github/workflows/build.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index aefd26c15..28cfbca2f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -30,6 +30,10 @@ jobs: path: ~/.gradle/caches key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }} restore-keys: ${{ runner.os }}-gradle + + - name: Grant execute permission for gradlew + run: chmod +x gradlew + - name: Build and analyze env: SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} From 5fa23e09adb80c9a192f7772e045f06ad594633e Mon Sep 17 00:00:00 2001 From: tastybento Date: Mon, 15 Dec 2025 18:04:14 -0800 Subject: [PATCH 16/21] Add missing gradle jar file --- .gitignore | 1 - gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 45457 bytes 2 files changed, 1 deletion(-) create mode 100644 gradle/wrapper/gradle-wrapper.jar diff --git a/.gitignore b/.gitignore index b31942ce5..f55317af4 100644 --- a/.gitignore +++ b/.gitignore @@ -30,7 +30,6 @@ $RECYCLE.BIN/ *.log *.ctxt .mtj.tmp/ -*.jar *.war *.nar *.ear diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..8bdaf60c75ab801e22807dde59e12a8735a34077 GIT binary patch literal 45457 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 c82=K%QXLKFx%@O{wJjEi6Y56o#$)Bpeg literal 0 HcmV?d00001 From 42f69d3535548dd0bd3de5122d77910b7265ac07 Mon Sep 17 00:00:00 2001 From: tastybento Date: Mon, 15 Dec 2025 19:21:58 -0800 Subject: [PATCH 17/21] Adjust name of snapshot --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 94284b4d6..1aac7f874 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -53,7 +53,7 @@ val snapshotSuffix = "-SNAPSHOT" // Indicates development/snapshot version // CI/CD Logic (Translates Maven ) // Default version format: 3.10.2-LOCAL-SNAPSHOT var finalBuildNumber = buildNumberDefault -var finalRevision = "$buildVersion$finalBuildNumber$snapshotSuffix" +var finalRevision = "$buildVersion$snapshotSuffix$finalBuildNumber" // 'ci' profile logic: Activated by env.BUILD_NUMBER from CI/CD pipeline // Overrides build number with actual CI build number From b822ab344b9bed3b35cd522d4670f2dcd026274a Mon Sep 17 00:00:00 2001 From: tastybento Date: Mon, 15 Dec 2025 19:54:54 -0800 Subject: [PATCH 18/21] Fix to enable javadoc building --- build.gradle.kts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/build.gradle.kts b/build.gradle.kts index 1aac7f874..7bf1e22cd 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -406,6 +406,10 @@ tasks.javadoc { source = javaVersion } } + dependsOn("copyLocales") // Ensure locales are available before generating javadoc (Gradle 9 validation) + // Some external mapped server sources contain type-use annotations that the Javadoc tool + // treats as errors. Allow Javadoc to complete without failing the build. + isFailOnError = false } // Creates BentoBox--sources.jar containing all source code From 765c5f42301602f9d0c59114ec727ea2dd802977 Mon Sep 17 00:00:00 2001 From: tastybento Date: Mon, 15 Dec 2025 20:00:54 -0800 Subject: [PATCH 19/21] Update publishing to match CodeMc's instructions. --- build.gradle.kts | 29 ++++++++++++++++++++++++++--- 1 file changed, 26 insertions(+), 3 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 7bf1e22cd..e770c27db 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -450,9 +450,32 @@ publishing { // Configure publication target repository repositories { - maven { - name = "bentoboxworld" - url = uri("https://repo.codemc.org/repository/bentoboxworld/") // Where artifacts are uploaded + // Allow CI to provide publish URLs via project properties `mavenUrl` and `mavenSnapshotUrl`. + // If neither is provided, fall back to the existing BentoBox repository. + val mavenUrlProp = project.findProperty("mavenUrl") as String? + val mavenSnapshotUrlProp = project.findProperty("mavenSnapshotUrl") as String? + + val publishUrl = if (version.toString().endsWith("SNAPSHOT")) mavenSnapshotUrlProp else mavenUrlProp + + if (publishUrl != null) { + maven { + url = uri(publishUrl) + // Optional credentials passed via project properties `mavenUsername`/`mavenPassword` + val username = project.findProperty("mavenUsername") as String? + val password = project.findProperty("mavenPassword") as String? + if (!username.isNullOrBlank() && !password.isNullOrBlank()) { + credentials { + this.username = username + this.password = password + } + } + } + } else { + // Fallback to the existing public repository for manual publishes + maven { + name = "bentoboxworld" + url = uri("https://repo.codemc.org/repository/bentoboxworld/") // Where artifacts are uploaded + } } } } From 6078b8825a6a5e437d89c490a369becebe8a95de Mon Sep 17 00:00:00 2001 From: tastybento Date: Mon, 15 Dec 2025 20:03:44 -0800 Subject: [PATCH 20/21] Version 3.11.0 --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index e770c27db..3580ad0ca 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -46,7 +46,7 @@ paperweight.reobfArtifactConfiguration = io.papermc.paperweight.userdev.ReobfArt group = "world.bentobox" // From // Base properties from -val buildVersion = "3.10.2" +val buildVersion = "3.11.0" val buildNumberDefault = "-LOCAL" // Local build identifier val snapshotSuffix = "-SNAPSHOT" // Indicates development/snapshot version From 663899fe1fc379260c4bf32a2d3cfb92d2a45309 Mon Sep 17 00:00:00 2001 From: tastybento Date: Mon, 15 Dec 2025 20:09:49 -0800 Subject: [PATCH 21/21] Adjust creds for nexus upload --- build.gradle.kts | 32 ++++++++++---------------------- 1 file changed, 10 insertions(+), 22 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 3580ad0ca..0dafd4543 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -450,32 +450,20 @@ publishing { // Configure publication target repository repositories { - // Allow CI to provide publish URLs via project properties `mavenUrl` and `mavenSnapshotUrl`. - // If neither is provided, fall back to the existing BentoBox repository. - val mavenUrlProp = project.findProperty("mavenUrl") as String? - val mavenSnapshotUrlProp = project.findProperty("mavenSnapshotUrl") as String? - - val publishUrl = if (version.toString().endsWith("SNAPSHOT")) mavenSnapshotUrlProp else mavenUrlProp - - if (publishUrl != null) { - maven { - url = uri(publishUrl) - // Optional credentials passed via project properties `mavenUsername`/`mavenPassword` - val username = project.findProperty("mavenUsername") as String? - val password = project.findProperty("mavenPassword") as String? - if (!username.isNullOrBlank() && !password.isNullOrBlank()) { + val mavenUrl: String? by project + val mavenSnapshotUrl: String? by project + + (if(version.toString().endsWith("SNAPSHOT")) mavenSnapshotUrl else mavenUrl)?.let { url -> + maven(url) { + val mavenUsername: String? by project + val mavenPassword: String? by project + if(mavenUsername != null && mavenPassword != null) { credentials { - this.username = username - this.password = password + username = mavenUsername + password = mavenPassword } } } - } else { - // Fallback to the existing public repository for manual publishes - maven { - name = "bentoboxworld" - url = uri("https://repo.codemc.org/repository/bentoboxworld/") // Where artifacts are uploaded - } } } }