From 0756781b263c53eace1a3ab390adcbcbb55ce4f6 Mon Sep 17 00:00:00 2001 From: Marc Baloup Date: Sat, 24 Dec 2022 11:33:54 +0100 Subject: [PATCH] Merged some modules to fix future dependency issues --- Readme.md | 7 +- pandalib-bungee-commands/pom.xml | 48 ----------- pandalib-bungee/pom.xml | 10 +++ .../commands/BungeeBrigadierCommand.java | 0 .../commands/BungeeBrigadierDispatcher.java | 0 pandalib-paper-commands/pom.xml | 79 ------------------ pandalib-paper-reflect/pom.xml | 81 ------------------- pandalib-paper/pom.xml | 33 ++++++++ .../paper/commands/PaperBrigadierCommand.java | 0 .../lib/paper/reflect/NMSReflect.java | 0 .../lib/paper/reflect/NMSTypeWrapper.java | 0 .../lib/paper/reflect/OBCReflect.java | 0 .../paper/reflect/PandalibPaperReflect.java | 0 .../util/BedrockBambooCollisionFixer.java | 0 .../lib/paper/reflect/util/PrimaryWorlds.java | 0 .../lib/paper/reflect/util/WorldSaveUtil.java | 0 .../wrapper/brigadier/CommandNode.java | 0 .../wrapper/craftbukkit/CraftMapView.java | 0 .../craftbukkit/CraftNamespacedKey.java | 3 +- .../wrapper/craftbukkit/CraftPlayer.java | 0 .../wrapper/craftbukkit/CraftServer.java | 0 .../wrapper/craftbukkit/CraftVector.java | 5 +- .../wrapper/craftbukkit/CraftWorld.java | 0 .../wrapper/craftbukkit/RenderData.java | 0 .../craftbukkit/VanillaCommandWrapper.java | 0 .../wrapper/minecraft/DetectedVersion.java | 0 .../wrapper/minecraft/SharedConstants.java | 0 .../wrapper/minecraft/WorldVersion.java | 0 .../minecraft/commands/BlockPosArgument.java | 0 .../commands/CommandSourceStack.java | 0 .../wrapper/minecraft/commands/Commands.java | 0 .../minecraft/commands/ComponentArgument.java | 0 .../minecraft/commands/Coordinates.java | 0 .../minecraft/commands/EntityArgument.java | 0 .../minecraft/commands/EntitySelector.java | 0 .../commands/GameProfileArgument.java | 0 .../commands/ResourceLocationArgument.java | 0 .../minecraft/commands/Vec3Argument.java | 0 .../wrapper/minecraft/core/BlockPos.java | 0 .../reflect/wrapper/minecraft/core/Vec3i.java | 0 .../wrapper/minecraft/nbt/CompoundTag.java | 0 .../reflect/wrapper/minecraft/nbt/NbtIo.java | 0 .../wrapper/minecraft/nbt/StringTag.java | 0 .../reflect/wrapper/minecraft/nbt/Tag.java | 0 .../minecraft/network/FriendlyByteBuf.java | 0 .../minecraft/network/chat/Component.java | 0 .../ClientboundCustomPayloadPacket.java | 0 .../protocol/ClientboundGameEventPacket.java | 0 .../minecraft/network/protocol/Packet.java | 0 .../minecraft/resources/ResourceLocation.java | 0 .../wrapper/minecraft/server/ChunkMap.java | 5 -- .../minecraft/server/DedicatedPlayerList.java | 0 .../minecraft/server/DedicatedServer.java | 0 .../server/DedicatedServerProperties.java | 0 .../minecraft/server/MinecraftServer.java | 0 .../minecraft/server/ServerChunkCache.java | 0 .../server/ServerGamePacketListenerImpl.java | 0 .../wrapper/minecraft/server/ServerLevel.java | 0 .../minecraft/server/ServerPlayer.java | 0 .../wrapper/minecraft/server/Settings.java | 0 .../minecraft/util/ProgressListener.java | 0 .../reflect/wrapper/minecraft/world/AABB.java | 0 .../wrapper/minecraft/world/ChunkPos.java | 0 .../wrapper/minecraft/world/ChunkStorage.java | 0 .../wrapper/minecraft/world/DamageSource.java | 0 .../wrapper/minecraft/world/Entity.java | 0 .../wrapper/minecraft/world/Level.java | 0 .../minecraft/world/MapItemSavedData.java | 0 .../wrapper/minecraft/world/SavedData.java | 0 .../reflect/wrapper/minecraft/world/Vec3.java | 0 .../wrapper/minecraft/world/VoxelShape.java | 0 .../minecraft/world/block/BambooBlock.java | 0 .../paper/reflect/wrapper/netty/ByteBuf.java | 0 .../paper/reflect/wrapper/netty/Unpooled.java | 0 .../reflect/wrapper/paper/AABBVoxelShape.java | 0 .../reflect/wrapper/paper/PaperAdventure.java | 0 .../paper/QueuedChangesMapLong2Object.java | 0 .../configuration/FallbackValue_Int.java | 0 .../configuration/WorldConfiguration.java | 0 pom.xml | 3 - 80 files changed, 50 insertions(+), 224 deletions(-) delete mode 100644 pandalib-bungee-commands/pom.xml rename {pandalib-bungee-commands => pandalib-bungee}/src/main/java/fr/pandacube/lib/bungee/commands/BungeeBrigadierCommand.java (100%) rename {pandalib-bungee-commands => pandalib-bungee}/src/main/java/fr/pandacube/lib/bungee/commands/BungeeBrigadierDispatcher.java (100%) delete mode 100644 pandalib-paper-commands/pom.xml delete mode 100644 pandalib-paper-reflect/pom.xml rename {pandalib-paper-commands => pandalib-paper}/src/main/java/fr/pandacube/lib/paper/commands/PaperBrigadierCommand.java (100%) rename {pandalib-paper-reflect => pandalib-paper}/src/main/java/fr/pandacube/lib/paper/reflect/NMSReflect.java (100%) rename {pandalib-paper-reflect => pandalib-paper}/src/main/java/fr/pandacube/lib/paper/reflect/NMSTypeWrapper.java (100%) rename {pandalib-paper-reflect => pandalib-paper}/src/main/java/fr/pandacube/lib/paper/reflect/OBCReflect.java (100%) rename {pandalib-paper-reflect => pandalib-paper}/src/main/java/fr/pandacube/lib/paper/reflect/PandalibPaperReflect.java (100%) rename {pandalib-paper-reflect => pandalib-paper}/src/main/java/fr/pandacube/lib/paper/reflect/util/BedrockBambooCollisionFixer.java (100%) rename {pandalib-paper-reflect => pandalib-paper}/src/main/java/fr/pandacube/lib/paper/reflect/util/PrimaryWorlds.java (100%) rename {pandalib-paper-reflect => pandalib-paper}/src/main/java/fr/pandacube/lib/paper/reflect/util/WorldSaveUtil.java (100%) rename {pandalib-paper-reflect => pandalib-paper}/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/brigadier/CommandNode.java (100%) rename {pandalib-paper-reflect => pandalib-paper}/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/craftbukkit/CraftMapView.java (100%) rename {pandalib-paper-reflect => pandalib-paper}/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/craftbukkit/CraftNamespacedKey.java (85%) rename {pandalib-paper-reflect => pandalib-paper}/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/craftbukkit/CraftPlayer.java (100%) rename {pandalib-paper-reflect => pandalib-paper}/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/craftbukkit/CraftServer.java (100%) rename {pandalib-paper-reflect => pandalib-paper}/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/craftbukkit/CraftVector.java (82%) rename {pandalib-paper-reflect => pandalib-paper}/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/craftbukkit/CraftWorld.java (100%) rename {pandalib-paper-reflect => pandalib-paper}/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/craftbukkit/RenderData.java (100%) rename {pandalib-paper-reflect => pandalib-paper}/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/craftbukkit/VanillaCommandWrapper.java (100%) rename {pandalib-paper-reflect => pandalib-paper}/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/DetectedVersion.java (100%) rename {pandalib-paper-reflect => pandalib-paper}/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/SharedConstants.java (100%) rename {pandalib-paper-reflect => pandalib-paper}/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/WorldVersion.java (100%) rename {pandalib-paper-reflect => pandalib-paper}/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/commands/BlockPosArgument.java (100%) rename {pandalib-paper-reflect => pandalib-paper}/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/commands/CommandSourceStack.java (100%) rename {pandalib-paper-reflect => pandalib-paper}/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/commands/Commands.java (100%) rename {pandalib-paper-reflect => pandalib-paper}/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/commands/ComponentArgument.java (100%) rename {pandalib-paper-reflect => pandalib-paper}/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/commands/Coordinates.java (100%) rename {pandalib-paper-reflect => pandalib-paper}/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/commands/EntityArgument.java (100%) rename {pandalib-paper-reflect => pandalib-paper}/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/commands/EntitySelector.java (100%) rename {pandalib-paper-reflect => pandalib-paper}/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/commands/GameProfileArgument.java (100%) rename {pandalib-paper-reflect => pandalib-paper}/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/commands/ResourceLocationArgument.java (100%) rename {pandalib-paper-reflect => pandalib-paper}/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/commands/Vec3Argument.java (100%) rename {pandalib-paper-reflect => pandalib-paper}/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/core/BlockPos.java (100%) rename {pandalib-paper-reflect => pandalib-paper}/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/core/Vec3i.java (100%) rename {pandalib-paper-reflect => pandalib-paper}/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/nbt/CompoundTag.java (100%) rename {pandalib-paper-reflect => pandalib-paper}/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/nbt/NbtIo.java (100%) rename {pandalib-paper-reflect => pandalib-paper}/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/nbt/StringTag.java (100%) rename {pandalib-paper-reflect => pandalib-paper}/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/nbt/Tag.java (100%) rename {pandalib-paper-reflect => pandalib-paper}/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/network/FriendlyByteBuf.java (100%) rename {pandalib-paper-reflect => pandalib-paper}/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/network/chat/Component.java (100%) rename {pandalib-paper-reflect => pandalib-paper}/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/network/protocol/ClientboundCustomPayloadPacket.java (100%) rename {pandalib-paper-reflect => pandalib-paper}/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/network/protocol/ClientboundGameEventPacket.java (100%) rename {pandalib-paper-reflect => pandalib-paper}/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/network/protocol/Packet.java (100%) rename {pandalib-paper-reflect => pandalib-paper}/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/resources/ResourceLocation.java (100%) rename {pandalib-paper-reflect => pandalib-paper}/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/server/ChunkMap.java (77%) rename {pandalib-paper-reflect => pandalib-paper}/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/server/DedicatedPlayerList.java (100%) rename {pandalib-paper-reflect => pandalib-paper}/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/server/DedicatedServer.java (100%) rename {pandalib-paper-reflect => pandalib-paper}/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/server/DedicatedServerProperties.java (100%) rename {pandalib-paper-reflect => pandalib-paper}/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/server/MinecraftServer.java (100%) rename {pandalib-paper-reflect => pandalib-paper}/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/server/ServerChunkCache.java (100%) rename {pandalib-paper-reflect => pandalib-paper}/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/server/ServerGamePacketListenerImpl.java (100%) rename {pandalib-paper-reflect => pandalib-paper}/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/server/ServerLevel.java (100%) rename {pandalib-paper-reflect => pandalib-paper}/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/server/ServerPlayer.java (100%) rename {pandalib-paper-reflect => pandalib-paper}/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/server/Settings.java (100%) rename {pandalib-paper-reflect => pandalib-paper}/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/util/ProgressListener.java (100%) rename {pandalib-paper-reflect => pandalib-paper}/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/world/AABB.java (100%) rename {pandalib-paper-reflect => pandalib-paper}/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/world/ChunkPos.java (100%) rename {pandalib-paper-reflect => pandalib-paper}/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/world/ChunkStorage.java (100%) rename {pandalib-paper-reflect => pandalib-paper}/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/world/DamageSource.java (100%) rename {pandalib-paper-reflect => pandalib-paper}/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/world/Entity.java (100%) rename {pandalib-paper-reflect => pandalib-paper}/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/world/Level.java (100%) rename {pandalib-paper-reflect => pandalib-paper}/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/world/MapItemSavedData.java (100%) rename {pandalib-paper-reflect => pandalib-paper}/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/world/SavedData.java (100%) rename {pandalib-paper-reflect => pandalib-paper}/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/world/Vec3.java (100%) rename {pandalib-paper-reflect => pandalib-paper}/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/world/VoxelShape.java (100%) rename {pandalib-paper-reflect => pandalib-paper}/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/world/block/BambooBlock.java (100%) rename {pandalib-paper-reflect => pandalib-paper}/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/netty/ByteBuf.java (100%) rename {pandalib-paper-reflect => pandalib-paper}/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/netty/Unpooled.java (100%) rename {pandalib-paper-reflect => pandalib-paper}/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/paper/AABBVoxelShape.java (100%) rename {pandalib-paper-reflect => pandalib-paper}/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/paper/PaperAdventure.java (100%) rename {pandalib-paper-reflect => pandalib-paper}/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/paper/QueuedChangesMapLong2Object.java (100%) rename {pandalib-paper-reflect => pandalib-paper}/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/paper/configuration/FallbackValue_Int.java (100%) rename {pandalib-paper-reflect => pandalib-paper}/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/paper/configuration/WorldConfiguration.java (100%) diff --git a/Readme.md b/Readme.md index e3d1dd4..9e3f120 100644 --- a/Readme.md +++ b/Readme.md @@ -9,10 +9,9 @@ that are detailed in their respective Readme file (if any). - `pandalib-util` General purpose utility and helper classes; - `pandalib-chat` A chat API working on top of the Adventure API; - `pandalib-db` An ORM working with a MySQL server through JDBC; -- `pandalib-bungee` Utility and helper classes to use in Bungeecord plugins; -- `pandalib-paper` Utility and helper classes to use in Spigot/Paper plugins; +- `pandalib-bungee` Utility and helper classes to use in Bungeecord plugins. Also provides platform implementation for `pandalib-players` and `pandalib-commands`; +- `pandalib-paper` Utility and helper classes to use in Spigot/Paper plugins. Also provides platform implementation for `pandalib-players` and `pandalib-commands`; - `pandalib-reflect` A reflection wrapper to make reflective operation easier; -- `pandalib-paper-reflect` A reflection API to ease access to NMS and OBS stuff in Paper server; - `pandalib-permissions` A general purpose permission system; - `pandalib-bungee-permissions` Integration of the permission system `pandalib-permissions` into Bungeecord; - `pandalib-paper-permissions` Integration of the permission system `pandalib-permissions` into Bukkit, Vault and WEPIF permission systems; @@ -21,8 +20,6 @@ that are detailed in their respective Readme file (if any). - `pandalib-netapi` A poorly designed, but working TCP network library; - `pandalib-net` A better-designed, packet-based TCP network library (_still in development_); - `pandalib-commands` An abstract command manager working on top of [Brigadier](https://github.com/Mojang/brigadier); -- `pandalib-bungee-commands` Integrates Brigadier commands into Bungeecord, extending `pandalib-commands`; -- `pandalib-paper-commands` Integrates Brigadier commands into the Paper server, extending `pandalib-commands`; - `pandalib-cli` Utility and helper classes for a standalone CLI Java application. - `pandalib-core` A catch-all module for some helper classes that didn’t have their own module yet; diff --git a/pandalib-bungee-commands/pom.xml b/pandalib-bungee-commands/pom.xml deleted file mode 100644 index 204c1e0..0000000 --- a/pandalib-bungee-commands/pom.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - pandalib-parent - fr.pandacube.lib - 1.0-SNAPSHOT - - 4.0.0 - - pandalib-bungee-commands - jar - - - - bungeecord-repo - https://oss.sonatype.org/content/repositories/snapshots - - - - - - fr.pandacube.lib - pandalib-util - ${project.version} - - - fr.pandacube.lib - pandalib-chat - ${project.version} - - - fr.pandacube.lib - pandalib-commands - ${project.version} - - - - net.md-5 - bungeecord-api - ${bungeecord.version} - provided - - - - - \ No newline at end of file diff --git a/pandalib-bungee/pom.xml b/pandalib-bungee/pom.xml index 738f22e..b18bdef 100644 --- a/pandalib-bungee/pom.xml +++ b/pandalib-bungee/pom.xml @@ -31,6 +31,11 @@ pandalib-util ${project.version} + + fr.pandacube.lib + pandalib-chat + ${project.version} + fr.pandacube.lib pandalib-players @@ -41,6 +46,11 @@ pandalib-reflect ${project.version} + + fr.pandacube.lib + pandalib-commands + ${project.version} + net.md-5 diff --git a/pandalib-bungee-commands/src/main/java/fr/pandacube/lib/bungee/commands/BungeeBrigadierCommand.java b/pandalib-bungee/src/main/java/fr/pandacube/lib/bungee/commands/BungeeBrigadierCommand.java similarity index 100% rename from pandalib-bungee-commands/src/main/java/fr/pandacube/lib/bungee/commands/BungeeBrigadierCommand.java rename to pandalib-bungee/src/main/java/fr/pandacube/lib/bungee/commands/BungeeBrigadierCommand.java diff --git a/pandalib-bungee-commands/src/main/java/fr/pandacube/lib/bungee/commands/BungeeBrigadierDispatcher.java b/pandalib-bungee/src/main/java/fr/pandacube/lib/bungee/commands/BungeeBrigadierDispatcher.java similarity index 100% rename from pandalib-bungee-commands/src/main/java/fr/pandacube/lib/bungee/commands/BungeeBrigadierDispatcher.java rename to pandalib-bungee/src/main/java/fr/pandacube/lib/bungee/commands/BungeeBrigadierDispatcher.java diff --git a/pandalib-paper-commands/pom.xml b/pandalib-paper-commands/pom.xml deleted file mode 100644 index d1fe212..0000000 --- a/pandalib-paper-commands/pom.xml +++ /dev/null @@ -1,79 +0,0 @@ - - - - pandalib-parent - fr.pandacube.lib - 1.0-SNAPSHOT - - 4.0.0 - - pandalib-paper-commands - jar - - - - papermc - https://papermc.io/repo/repository/maven-public/ - - - - - - fr.pandacube.lib - pandalib-chat - ${project.version} - - - net.kyori - adventure-api - - - net.kyori - adventure-text-serializer-plain - - - - - - fr.pandacube.lib - pandalib-commands - ${project.version} - - - - fr.pandacube.lib - pandalib-paper-reflect - ${project.version} - - - - fr.pandacube.lib - pandalib-util - ${project.version} - - - - fr.pandacube.lib - pandalib-paper-permissions - ${project.version} - provided - - - - - io.papermc.paper - paper-api - ${paper.version}-SNAPSHOT - provided - - - io.papermc.paper - paper-mojangapi - ${paper.version}-SNAPSHOT - provided - - - - \ No newline at end of file diff --git a/pandalib-paper-reflect/pom.xml b/pandalib-paper-reflect/pom.xml deleted file mode 100644 index 78c2fb5..0000000 --- a/pandalib-paper-reflect/pom.xml +++ /dev/null @@ -1,81 +0,0 @@ - - - - pandalib-parent - fr.pandacube.lib - 1.0-SNAPSHOT - ../pom.xml - - 4.0.0 - - pandalib-paper-reflect - jar - - - - papermc - https://papermc.io/repo/repository/maven-public/ - - - fabricmc - https://maven.fabricmc.net/ - - - - - - - fr.pandacube.lib - pandalib-util - ${project.version} - - - - fr.pandacube.lib - pandalib-reflect - ${project.version} - - - - fr.pandacube.lib - pandalib-paper - ${project.version} - - - - - io.papermc.paper - paper-api - ${paper.version}-SNAPSHOT - - - io.papermc.paper - paper-mojangapi - ${paper.version}-SNAPSHOT - - - - - - net.fabricmc - mapping-io - 0.3.0 - provided - - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - - fr.pandacube.lib.paper.reflect.wrapper.* - - - - - - \ No newline at end of file diff --git a/pandalib-paper/pom.xml b/pandalib-paper/pom.xml index e2f59a9..75c754b 100644 --- a/pandalib-paper/pom.xml +++ b/pandalib-paper/pom.xml @@ -41,6 +41,12 @@ + + fr.pandacube.lib + pandalib-commands + ${project.version} + + fr.pandacube.lib pandalib-reflect @@ -65,6 +71,13 @@ ${project.version} + + fr.pandacube.lib + pandalib-paper-permissions + ${project.version} + provided + + io.papermc.paper @@ -76,6 +89,26 @@ paper-mojangapi ${paper.version}-SNAPSHOT + + + + net.fabricmc + mapping-io + 0.3.0 + provided + + + + + org.apache.maven.plugins + maven-javadoc-plugin + + fr.pandacube.lib.paper.reflect.wrapper.* + + + + + \ No newline at end of file diff --git a/pandalib-paper-commands/src/main/java/fr/pandacube/lib/paper/commands/PaperBrigadierCommand.java b/pandalib-paper/src/main/java/fr/pandacube/lib/paper/commands/PaperBrigadierCommand.java similarity index 100% rename from pandalib-paper-commands/src/main/java/fr/pandacube/lib/paper/commands/PaperBrigadierCommand.java rename to pandalib-paper/src/main/java/fr/pandacube/lib/paper/commands/PaperBrigadierCommand.java diff --git a/pandalib-paper-reflect/src/main/java/fr/pandacube/lib/paper/reflect/NMSReflect.java b/pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/NMSReflect.java similarity index 100% rename from pandalib-paper-reflect/src/main/java/fr/pandacube/lib/paper/reflect/NMSReflect.java rename to pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/NMSReflect.java diff --git a/pandalib-paper-reflect/src/main/java/fr/pandacube/lib/paper/reflect/NMSTypeWrapper.java b/pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/NMSTypeWrapper.java similarity index 100% rename from pandalib-paper-reflect/src/main/java/fr/pandacube/lib/paper/reflect/NMSTypeWrapper.java rename to pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/NMSTypeWrapper.java diff --git a/pandalib-paper-reflect/src/main/java/fr/pandacube/lib/paper/reflect/OBCReflect.java b/pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/OBCReflect.java similarity index 100% rename from pandalib-paper-reflect/src/main/java/fr/pandacube/lib/paper/reflect/OBCReflect.java rename to pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/OBCReflect.java diff --git a/pandalib-paper-reflect/src/main/java/fr/pandacube/lib/paper/reflect/PandalibPaperReflect.java b/pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/PandalibPaperReflect.java similarity index 100% rename from pandalib-paper-reflect/src/main/java/fr/pandacube/lib/paper/reflect/PandalibPaperReflect.java rename to pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/PandalibPaperReflect.java diff --git a/pandalib-paper-reflect/src/main/java/fr/pandacube/lib/paper/reflect/util/BedrockBambooCollisionFixer.java b/pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/util/BedrockBambooCollisionFixer.java similarity index 100% rename from pandalib-paper-reflect/src/main/java/fr/pandacube/lib/paper/reflect/util/BedrockBambooCollisionFixer.java rename to pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/util/BedrockBambooCollisionFixer.java diff --git a/pandalib-paper-reflect/src/main/java/fr/pandacube/lib/paper/reflect/util/PrimaryWorlds.java b/pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/util/PrimaryWorlds.java similarity index 100% rename from pandalib-paper-reflect/src/main/java/fr/pandacube/lib/paper/reflect/util/PrimaryWorlds.java rename to pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/util/PrimaryWorlds.java diff --git a/pandalib-paper-reflect/src/main/java/fr/pandacube/lib/paper/reflect/util/WorldSaveUtil.java b/pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/util/WorldSaveUtil.java similarity index 100% rename from pandalib-paper-reflect/src/main/java/fr/pandacube/lib/paper/reflect/util/WorldSaveUtil.java rename to pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/util/WorldSaveUtil.java diff --git a/pandalib-paper-reflect/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/brigadier/CommandNode.java b/pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/brigadier/CommandNode.java similarity index 100% rename from pandalib-paper-reflect/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/brigadier/CommandNode.java rename to pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/brigadier/CommandNode.java diff --git a/pandalib-paper-reflect/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/craftbukkit/CraftMapView.java b/pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/craftbukkit/CraftMapView.java similarity index 100% rename from pandalib-paper-reflect/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/craftbukkit/CraftMapView.java rename to pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/craftbukkit/CraftMapView.java diff --git a/pandalib-paper-reflect/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/craftbukkit/CraftNamespacedKey.java b/pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/craftbukkit/CraftNamespacedKey.java similarity index 85% rename from pandalib-paper-reflect/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/craftbukkit/CraftNamespacedKey.java rename to pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/craftbukkit/CraftNamespacedKey.java index ff23bd2..fc0b359 100644 --- a/pandalib-paper-reflect/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/craftbukkit/CraftNamespacedKey.java +++ b/pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/craftbukkit/CraftNamespacedKey.java @@ -6,6 +6,7 @@ import fr.pandacube.lib.paper.reflect.wrapper.minecraft.resources.ResourceLocati import fr.pandacube.lib.reflect.ReflectClass; import fr.pandacube.lib.reflect.ReflectMethod; +import fr.pandacube.lib.util.ThrowableUtil; import org.bukkit.NamespacedKey; import static fr.pandacube.lib.util.ThrowableUtil.wrapEx; @@ -14,7 +15,7 @@ import static fr.pandacube.lib.util.ThrowableUtil.wrapReflectEx; public class CraftNamespacedKey extends ReflectWrapper { public static final ReflectClass REFLECT = wrapEx(() -> OBCReflect.ofClass("util.CraftNamespacedKey")); public static final ReflectMethod toMinecraft = wrapEx(() -> REFLECT.method("toMinecraft", NamespacedKey.class)); - public static final ReflectMethod fromMinecraft = wrapEx(() -> REFLECT.method("fromMinecraft", ResourceLocation.MAPPING.runtimeClass())); + public static final ReflectMethod fromMinecraft = ThrowableUtil.wrapEx(() -> REFLECT.method("fromMinecraft", ResourceLocation.MAPPING.runtimeClass())); public static ResourceLocation toMinecraft(NamespacedKey key) { return wrap(wrapReflectEx(() -> toMinecraft.invokeStatic(key)), ResourceLocation.class); diff --git a/pandalib-paper-reflect/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/craftbukkit/CraftPlayer.java b/pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/craftbukkit/CraftPlayer.java similarity index 100% rename from pandalib-paper-reflect/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/craftbukkit/CraftPlayer.java rename to pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/craftbukkit/CraftPlayer.java diff --git a/pandalib-paper-reflect/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/craftbukkit/CraftServer.java b/pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/craftbukkit/CraftServer.java similarity index 100% rename from pandalib-paper-reflect/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/craftbukkit/CraftServer.java rename to pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/craftbukkit/CraftServer.java diff --git a/pandalib-paper-reflect/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/craftbukkit/CraftVector.java b/pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/craftbukkit/CraftVector.java similarity index 82% rename from pandalib-paper-reflect/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/craftbukkit/CraftVector.java rename to pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/craftbukkit/CraftVector.java index 97c1f7e..231e5be 100644 --- a/pandalib-paper-reflect/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/craftbukkit/CraftVector.java +++ b/pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/craftbukkit/CraftVector.java @@ -7,6 +7,7 @@ import fr.pandacube.lib.paper.reflect.wrapper.minecraft.world.Vec3; import fr.pandacube.lib.reflect.ReflectClass; import fr.pandacube.lib.reflect.ReflectMethod; +import fr.pandacube.lib.util.ThrowableUtil; import org.bukkit.util.Vector; import static fr.pandacube.lib.util.ThrowableUtil.wrapEx; @@ -14,8 +15,8 @@ import static fr.pandacube.lib.util.ThrowableUtil.wrapReflectEx; public class CraftVector extends ReflectWrapper { public static final ReflectClass REFLECT = wrapEx(() -> OBCReflect.ofClass("util.CraftVector")); - public static final ReflectMethod toBukkit_Vec3 = wrapEx(() -> REFLECT.method("toBukkit", Vec3.MAPPING.runtimeClass())); - public static final ReflectMethod toBukkit_BlockPos = wrapEx(() -> REFLECT.method("toBukkit", BlockPos.MAPPING.runtimeClass())); + public static final ReflectMethod toBukkit_Vec3 = ThrowableUtil.wrapEx(() -> REFLECT.method("toBukkit", Vec3.MAPPING.runtimeClass())); + public static final ReflectMethod toBukkit_BlockPos = ThrowableUtil.wrapEx(() -> REFLECT.method("toBukkit", BlockPos.MAPPING.runtimeClass())); public static final ReflectMethod toNMS = wrapEx(() -> REFLECT.method("toNMS", Vector.class)); public static final ReflectMethod toBlockPos = wrapEx(() -> REFLECT.method("toNMS", Vector.class)); diff --git a/pandalib-paper-reflect/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/craftbukkit/CraftWorld.java b/pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/craftbukkit/CraftWorld.java similarity index 100% rename from pandalib-paper-reflect/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/craftbukkit/CraftWorld.java rename to pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/craftbukkit/CraftWorld.java diff --git a/pandalib-paper-reflect/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/craftbukkit/RenderData.java b/pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/craftbukkit/RenderData.java similarity index 100% rename from pandalib-paper-reflect/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/craftbukkit/RenderData.java rename to pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/craftbukkit/RenderData.java diff --git a/pandalib-paper-reflect/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/craftbukkit/VanillaCommandWrapper.java b/pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/craftbukkit/VanillaCommandWrapper.java similarity index 100% rename from pandalib-paper-reflect/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/craftbukkit/VanillaCommandWrapper.java rename to pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/craftbukkit/VanillaCommandWrapper.java diff --git a/pandalib-paper-reflect/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/DetectedVersion.java b/pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/DetectedVersion.java similarity index 100% rename from pandalib-paper-reflect/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/DetectedVersion.java rename to pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/DetectedVersion.java diff --git a/pandalib-paper-reflect/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/SharedConstants.java b/pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/SharedConstants.java similarity index 100% rename from pandalib-paper-reflect/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/SharedConstants.java rename to pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/SharedConstants.java diff --git a/pandalib-paper-reflect/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/WorldVersion.java b/pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/WorldVersion.java similarity index 100% rename from pandalib-paper-reflect/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/WorldVersion.java rename to pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/WorldVersion.java diff --git a/pandalib-paper-reflect/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/commands/BlockPosArgument.java b/pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/commands/BlockPosArgument.java similarity index 100% rename from pandalib-paper-reflect/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/commands/BlockPosArgument.java rename to pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/commands/BlockPosArgument.java diff --git a/pandalib-paper-reflect/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/commands/CommandSourceStack.java b/pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/commands/CommandSourceStack.java similarity index 100% rename from pandalib-paper-reflect/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/commands/CommandSourceStack.java rename to pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/commands/CommandSourceStack.java diff --git a/pandalib-paper-reflect/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/commands/Commands.java b/pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/commands/Commands.java similarity index 100% rename from pandalib-paper-reflect/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/commands/Commands.java rename to pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/commands/Commands.java diff --git a/pandalib-paper-reflect/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/commands/ComponentArgument.java b/pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/commands/ComponentArgument.java similarity index 100% rename from pandalib-paper-reflect/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/commands/ComponentArgument.java rename to pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/commands/ComponentArgument.java diff --git a/pandalib-paper-reflect/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/commands/Coordinates.java b/pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/commands/Coordinates.java similarity index 100% rename from pandalib-paper-reflect/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/commands/Coordinates.java rename to pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/commands/Coordinates.java diff --git a/pandalib-paper-reflect/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/commands/EntityArgument.java b/pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/commands/EntityArgument.java similarity index 100% rename from pandalib-paper-reflect/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/commands/EntityArgument.java rename to pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/commands/EntityArgument.java diff --git a/pandalib-paper-reflect/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/commands/EntitySelector.java b/pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/commands/EntitySelector.java similarity index 100% rename from pandalib-paper-reflect/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/commands/EntitySelector.java rename to pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/commands/EntitySelector.java diff --git a/pandalib-paper-reflect/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/commands/GameProfileArgument.java b/pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/commands/GameProfileArgument.java similarity index 100% rename from pandalib-paper-reflect/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/commands/GameProfileArgument.java rename to pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/commands/GameProfileArgument.java diff --git a/pandalib-paper-reflect/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/commands/ResourceLocationArgument.java b/pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/commands/ResourceLocationArgument.java similarity index 100% rename from pandalib-paper-reflect/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/commands/ResourceLocationArgument.java rename to pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/commands/ResourceLocationArgument.java diff --git a/pandalib-paper-reflect/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/commands/Vec3Argument.java b/pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/commands/Vec3Argument.java similarity index 100% rename from pandalib-paper-reflect/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/commands/Vec3Argument.java rename to pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/commands/Vec3Argument.java diff --git a/pandalib-paper-reflect/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/core/BlockPos.java b/pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/core/BlockPos.java similarity index 100% rename from pandalib-paper-reflect/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/core/BlockPos.java rename to pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/core/BlockPos.java diff --git a/pandalib-paper-reflect/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/core/Vec3i.java b/pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/core/Vec3i.java similarity index 100% rename from pandalib-paper-reflect/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/core/Vec3i.java rename to pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/core/Vec3i.java diff --git a/pandalib-paper-reflect/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/nbt/CompoundTag.java b/pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/nbt/CompoundTag.java similarity index 100% rename from pandalib-paper-reflect/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/nbt/CompoundTag.java rename to pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/nbt/CompoundTag.java diff --git a/pandalib-paper-reflect/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/nbt/NbtIo.java b/pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/nbt/NbtIo.java similarity index 100% rename from pandalib-paper-reflect/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/nbt/NbtIo.java rename to pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/nbt/NbtIo.java diff --git a/pandalib-paper-reflect/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/nbt/StringTag.java b/pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/nbt/StringTag.java similarity index 100% rename from pandalib-paper-reflect/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/nbt/StringTag.java rename to pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/nbt/StringTag.java diff --git a/pandalib-paper-reflect/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/nbt/Tag.java b/pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/nbt/Tag.java similarity index 100% rename from pandalib-paper-reflect/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/nbt/Tag.java rename to pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/nbt/Tag.java diff --git a/pandalib-paper-reflect/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/network/FriendlyByteBuf.java b/pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/network/FriendlyByteBuf.java similarity index 100% rename from pandalib-paper-reflect/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/network/FriendlyByteBuf.java rename to pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/network/FriendlyByteBuf.java diff --git a/pandalib-paper-reflect/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/network/chat/Component.java b/pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/network/chat/Component.java similarity index 100% rename from pandalib-paper-reflect/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/network/chat/Component.java rename to pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/network/chat/Component.java diff --git a/pandalib-paper-reflect/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/network/protocol/ClientboundCustomPayloadPacket.java b/pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/network/protocol/ClientboundCustomPayloadPacket.java similarity index 100% rename from pandalib-paper-reflect/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/network/protocol/ClientboundCustomPayloadPacket.java rename to pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/network/protocol/ClientboundCustomPayloadPacket.java diff --git a/pandalib-paper-reflect/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/network/protocol/ClientboundGameEventPacket.java b/pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/network/protocol/ClientboundGameEventPacket.java similarity index 100% rename from pandalib-paper-reflect/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/network/protocol/ClientboundGameEventPacket.java rename to pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/network/protocol/ClientboundGameEventPacket.java diff --git a/pandalib-paper-reflect/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/network/protocol/Packet.java b/pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/network/protocol/Packet.java similarity index 100% rename from pandalib-paper-reflect/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/network/protocol/Packet.java rename to pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/network/protocol/Packet.java diff --git a/pandalib-paper-reflect/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/resources/ResourceLocation.java b/pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/resources/ResourceLocation.java similarity index 100% rename from pandalib-paper-reflect/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/resources/ResourceLocation.java rename to pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/resources/ResourceLocation.java diff --git a/pandalib-paper-reflect/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/server/ChunkMap.java b/pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/server/ChunkMap.java similarity index 77% rename from pandalib-paper-reflect/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/server/ChunkMap.java rename to pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/server/ChunkMap.java index 9104e7e..48e2e8d 100644 --- a/pandalib-paper-reflect/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/server/ChunkMap.java +++ b/pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/server/ChunkMap.java @@ -2,13 +2,8 @@ package fr.pandacube.lib.paper.reflect.wrapper.minecraft.server; import fr.pandacube.lib.paper.reflect.NMSReflect; import fr.pandacube.lib.paper.reflect.wrapper.minecraft.world.ChunkStorage; -import fr.pandacube.lib.paper.reflect.wrapper.paper.QueuedChangesMapLong2Object; import fr.pandacube.lib.reflect.ReflectField; -import it.unimi.dsi.fastutil.longs.Long2ObjectLinkedOpenHashMap; -import it.unimi.dsi.fastutil.longs.LongSet; -import it.unimi.dsi.fastutil.objects.ObjectRBTreeSet; - import static fr.pandacube.lib.util.ThrowableUtil.wrapEx; import static fr.pandacube.lib.util.ThrowableUtil.wrapReflectEx; diff --git a/pandalib-paper-reflect/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/server/DedicatedPlayerList.java b/pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/server/DedicatedPlayerList.java similarity index 100% rename from pandalib-paper-reflect/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/server/DedicatedPlayerList.java rename to pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/server/DedicatedPlayerList.java diff --git a/pandalib-paper-reflect/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/server/DedicatedServer.java b/pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/server/DedicatedServer.java similarity index 100% rename from pandalib-paper-reflect/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/server/DedicatedServer.java rename to pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/server/DedicatedServer.java diff --git a/pandalib-paper-reflect/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/server/DedicatedServerProperties.java b/pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/server/DedicatedServerProperties.java similarity index 100% rename from pandalib-paper-reflect/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/server/DedicatedServerProperties.java rename to pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/server/DedicatedServerProperties.java diff --git a/pandalib-paper-reflect/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/server/MinecraftServer.java b/pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/server/MinecraftServer.java similarity index 100% rename from pandalib-paper-reflect/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/server/MinecraftServer.java rename to pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/server/MinecraftServer.java diff --git a/pandalib-paper-reflect/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/server/ServerChunkCache.java b/pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/server/ServerChunkCache.java similarity index 100% rename from pandalib-paper-reflect/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/server/ServerChunkCache.java rename to pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/server/ServerChunkCache.java diff --git a/pandalib-paper-reflect/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/server/ServerGamePacketListenerImpl.java b/pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/server/ServerGamePacketListenerImpl.java similarity index 100% rename from pandalib-paper-reflect/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/server/ServerGamePacketListenerImpl.java rename to pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/server/ServerGamePacketListenerImpl.java diff --git a/pandalib-paper-reflect/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/server/ServerLevel.java b/pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/server/ServerLevel.java similarity index 100% rename from pandalib-paper-reflect/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/server/ServerLevel.java rename to pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/server/ServerLevel.java diff --git a/pandalib-paper-reflect/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/server/ServerPlayer.java b/pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/server/ServerPlayer.java similarity index 100% rename from pandalib-paper-reflect/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/server/ServerPlayer.java rename to pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/server/ServerPlayer.java diff --git a/pandalib-paper-reflect/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/server/Settings.java b/pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/server/Settings.java similarity index 100% rename from pandalib-paper-reflect/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/server/Settings.java rename to pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/server/Settings.java diff --git a/pandalib-paper-reflect/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/util/ProgressListener.java b/pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/util/ProgressListener.java similarity index 100% rename from pandalib-paper-reflect/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/util/ProgressListener.java rename to pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/util/ProgressListener.java diff --git a/pandalib-paper-reflect/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/world/AABB.java b/pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/world/AABB.java similarity index 100% rename from pandalib-paper-reflect/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/world/AABB.java rename to pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/world/AABB.java diff --git a/pandalib-paper-reflect/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/world/ChunkPos.java b/pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/world/ChunkPos.java similarity index 100% rename from pandalib-paper-reflect/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/world/ChunkPos.java rename to pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/world/ChunkPos.java diff --git a/pandalib-paper-reflect/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/world/ChunkStorage.java b/pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/world/ChunkStorage.java similarity index 100% rename from pandalib-paper-reflect/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/world/ChunkStorage.java rename to pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/world/ChunkStorage.java diff --git a/pandalib-paper-reflect/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/world/DamageSource.java b/pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/world/DamageSource.java similarity index 100% rename from pandalib-paper-reflect/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/world/DamageSource.java rename to pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/world/DamageSource.java diff --git a/pandalib-paper-reflect/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/world/Entity.java b/pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/world/Entity.java similarity index 100% rename from pandalib-paper-reflect/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/world/Entity.java rename to pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/world/Entity.java diff --git a/pandalib-paper-reflect/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/world/Level.java b/pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/world/Level.java similarity index 100% rename from pandalib-paper-reflect/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/world/Level.java rename to pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/world/Level.java diff --git a/pandalib-paper-reflect/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/world/MapItemSavedData.java b/pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/world/MapItemSavedData.java similarity index 100% rename from pandalib-paper-reflect/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/world/MapItemSavedData.java rename to pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/world/MapItemSavedData.java diff --git a/pandalib-paper-reflect/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/world/SavedData.java b/pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/world/SavedData.java similarity index 100% rename from pandalib-paper-reflect/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/world/SavedData.java rename to pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/world/SavedData.java diff --git a/pandalib-paper-reflect/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/world/Vec3.java b/pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/world/Vec3.java similarity index 100% rename from pandalib-paper-reflect/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/world/Vec3.java rename to pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/world/Vec3.java diff --git a/pandalib-paper-reflect/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/world/VoxelShape.java b/pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/world/VoxelShape.java similarity index 100% rename from pandalib-paper-reflect/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/world/VoxelShape.java rename to pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/world/VoxelShape.java diff --git a/pandalib-paper-reflect/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/world/block/BambooBlock.java b/pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/world/block/BambooBlock.java similarity index 100% rename from pandalib-paper-reflect/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/world/block/BambooBlock.java rename to pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/minecraft/world/block/BambooBlock.java diff --git a/pandalib-paper-reflect/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/netty/ByteBuf.java b/pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/netty/ByteBuf.java similarity index 100% rename from pandalib-paper-reflect/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/netty/ByteBuf.java rename to pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/netty/ByteBuf.java diff --git a/pandalib-paper-reflect/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/netty/Unpooled.java b/pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/netty/Unpooled.java similarity index 100% rename from pandalib-paper-reflect/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/netty/Unpooled.java rename to pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/netty/Unpooled.java diff --git a/pandalib-paper-reflect/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/paper/AABBVoxelShape.java b/pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/paper/AABBVoxelShape.java similarity index 100% rename from pandalib-paper-reflect/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/paper/AABBVoxelShape.java rename to pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/paper/AABBVoxelShape.java diff --git a/pandalib-paper-reflect/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/paper/PaperAdventure.java b/pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/paper/PaperAdventure.java similarity index 100% rename from pandalib-paper-reflect/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/paper/PaperAdventure.java rename to pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/paper/PaperAdventure.java diff --git a/pandalib-paper-reflect/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/paper/QueuedChangesMapLong2Object.java b/pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/paper/QueuedChangesMapLong2Object.java similarity index 100% rename from pandalib-paper-reflect/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/paper/QueuedChangesMapLong2Object.java rename to pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/paper/QueuedChangesMapLong2Object.java diff --git a/pandalib-paper-reflect/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/paper/configuration/FallbackValue_Int.java b/pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/paper/configuration/FallbackValue_Int.java similarity index 100% rename from pandalib-paper-reflect/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/paper/configuration/FallbackValue_Int.java rename to pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/paper/configuration/FallbackValue_Int.java diff --git a/pandalib-paper-reflect/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/paper/configuration/WorldConfiguration.java b/pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/paper/configuration/WorldConfiguration.java similarity index 100% rename from pandalib-paper-reflect/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/paper/configuration/WorldConfiguration.java rename to pandalib-paper/src/main/java/fr/pandacube/lib/paper/reflect/wrapper/paper/configuration/WorldConfiguration.java diff --git a/pom.xml b/pom.xml index 7b0c8bf..bd4d1cd 100644 --- a/pom.xml +++ b/pom.xml @@ -62,7 +62,6 @@ pandalib-bungee - pandalib-bungee-commands pandalib-bungee-permissions pandalib-chat pandalib-cli @@ -72,9 +71,7 @@ pandalib-net pandalib-netapi pandalib-paper - pandalib-paper-commands pandalib-paper-permissions - pandalib-paper-reflect pandalib-permissions pandalib-players pandalib-players-permissible