diff --git a/.github/workflows/build-and-upload.yml b/.github/workflows/build-and-upload.yml index c2daec5e..1efa26e0 100644 --- a/.github/workflows/build-and-upload.yml +++ b/.github/workflows/build-and-upload.yml @@ -12,7 +12,7 @@ jobs: steps: - uses: actions/checkout@v7 - name: Set up JDK 21 - uses: actions/setup-java@v5 + uses: actions/setup-java@v6 with: distribution: 'temurin' java-version: 21 diff --git a/.github/workflows/pull-request-build.yml b/.github/workflows/pull-request-build.yml index 86a92668..400ecf64 100644 --- a/.github/workflows/pull-request-build.yml +++ b/.github/workflows/pull-request-build.yml @@ -10,7 +10,7 @@ jobs: steps: - uses: actions/checkout@v7 - name: Set up JDK 21 - uses: actions/setup-java@v5 + uses: actions/setup-java@v6 with: distribution: 'temurin' java-version: 21 diff --git a/README.md b/README.md index 4775b1e0..d6d9a876 100644 --- a/README.md +++ b/README.md @@ -252,6 +252,7 @@ Constructor getFirstConstructor(Set> params); ``` #### Utils +<<<<<<< HEAD `com.falchus.lib.utils.FileUtils` ```java static void createFolder(Path path, FileAttribute... attributes); @@ -274,6 +275,8 @@ static void delete(Path path); static void deleteFolder(Path path); ``` +======= +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git `com.falchus.lib.utils.JsonUtils` ```java static JsonElement get(String json, String path); @@ -357,6 +360,7 @@ static boolean isSoftLanding(Block block); `com.falchus.lib.minecraft.spigot.utils.EntityUtils` ```java static Object getEntity(Entity entity); +<<<<<<< HEAD static Object getEntityLiving(LivingEntity entity); static Entity getBukkitEntity(WrappedEntity entity); @@ -381,6 +385,33 @@ static boolean isOnClimbable(Entity entity); static boolean isUnderBlock(Entity entity); +static double getAbsorption(Damageable entity); +static void setAbsorption(Damageable entity, double absorption); +======= + +static Entity getBukkitEntity(Object entity); +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git + +static Entity getEntityById(World world, int id); + +static WrappedAxisAlignedBB getBoundingBox(Entity entity); +static WrappedAxisAlignedBB modifyBoundingBox(WrappedAxisAlignedBB axisAlignedBB, double minX, double minY, double minZ, double maxX, double maxY, double maxZ); + +static boolean isOnGround(Entity entity, double yExpand); +static boolean isOnGround(Entity entity); + +static boolean isInLiquid(Entity entity); + +static boolean isOnSlime(Entity entity); + +static boolean isOnStairs(Entity entity); + +static boolean isOnIce(Entity entity); + +static boolean isOnClimbable(Entity entity); + +static boolean isUnderBlock(Entity entity); + static double getAbsorption(Damageable entity); static void setAbsorption(Damageable entity, double absorption); diff --git a/pom.xml b/pom.xml index 202eb800..30bee198 100644 --- a/pom.xml +++ b/pom.xml @@ -45,7 +45,7 @@ com.velocitypowered velocity-api - 4.0.0 + 4.1.1 provided @@ -78,7 +78,7 @@ org.jsoup jsoup - 1.22.2 + 1.23.2 provided diff --git a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/PacketWrapper.java b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/PacketWrapper.java index 99f15509..d34f32d5 100644 --- a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/PacketWrapper.java +++ b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/PacketWrapper.java @@ -270,6 +270,15 @@ public static T wrap(Object obj) { } current = current.getSuperclass(); } +<<<<<<< HEAD return (T) new PacketWrapper(obj, Set.of(obj.getClass().getName())); +======= + for (Map.Entry, Function> entry : registry.entrySet()) { + if (entry.getKey().isAssignableFrom(packet.getClass())) { + return (T) entry.getValue().apply(packet); + } + } + return (T) new PacketWrapper(packet, Set.of(packet.getClass().getName())); +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git } } diff --git a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/block/action/PacketBlockActionWrapper.java b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/block/action/PacketBlockActionWrapper.java index 4a156ce6..75cfad09 100644 --- a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/block/action/PacketBlockActionWrapper.java +++ b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/block/action/PacketBlockActionWrapper.java @@ -12,7 +12,11 @@ import lombok.experimental.FieldDefaults; @FieldDefaults(makeFinal = true) +<<<<<<< HEAD class PacketBlockActionWrapper extends PacketWrapper implements PacketBlockAction { +======= +class PacketBlockActionWrapper extends PacketWrapper { +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git Field pos; Field type; @@ -45,9 +49,17 @@ public BlockPosition getPos() { return SpigotWrapper.wrap(getFieldValue(pos)); } +<<<<<<< HEAD @Override public void setPos(BlockPosition pos) { setField(this.pos, pos.getHandle()); +======= + /** + * @param pos BlockPosition + */ + public void setPos(Object pos) { + setField(this.pos, pos); +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git } @Override @@ -75,8 +87,16 @@ public Block getBlock() { return SpigotWrapper.wrap(getFieldValue(block)); } +<<<<<<< HEAD @Override public void setBlock(Block block) { setField(this.block, block.getHandle()); +======= + /** + * @param block Block + */ + public void setBlock(Object block) { + setField(this.block, block); +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git } } diff --git a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/block/action/WrappedPacketOutBlockAction.java b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/block/action/WrappedPacketOutBlockAction.java index e309cef4..ca62784f 100644 --- a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/block/action/WrappedPacketOutBlockAction.java +++ b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/block/action/WrappedPacketOutBlockAction.java @@ -17,6 +17,7 @@ public class WrappedPacketOutBlockAction extends PacketBlockActionWrapper { ); private WrappedPacketOutBlockAction(@NonNull Object handle) { +<<<<<<< HEAD super(handle, names); } @@ -41,5 +42,11 @@ public WrappedPacketOutBlockAction(@NonNull BlockPosition pos, @NonNull Block bl data ) ).build()); +======= + super(handle, Set.of( + version.getPackageNms() + "PacketPlayOutBlockAction", + networkProtocolGame + "PacketPlayOutBlockAction" + )); +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git } } diff --git a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/block/breakanimation/PacketBlockBreakAnimationWrapper.java b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/block/breakanimation/PacketBlockBreakAnimationWrapper.java index 0245ad2d..a172a22a 100644 --- a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/block/breakanimation/PacketBlockBreakAnimationWrapper.java +++ b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/block/breakanimation/PacketBlockBreakAnimationWrapper.java @@ -11,7 +11,11 @@ import lombok.experimental.FieldDefaults; @FieldDefaults(makeFinal = true) +<<<<<<< HEAD class PacketBlockBreakAnimationWrapper extends PacketWrapper implements PacketBlockBreakAnimation { +======= +class PacketBlockBreakAnimationWrapper extends PacketWrapper { +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git Field id; Field pos; @@ -49,9 +53,17 @@ public BlockPosition getPos() { return SpigotWrapper.wrap(getFieldValue(pos)); } +<<<<<<< HEAD @Override public void setPos(BlockPosition pos) { setField(this.pos, pos.getHandle()); +======= + /** + * @param pos BlockPosition + */ + public void setPos(Object pos) { + setField(this.pos, pos); +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git } @Override diff --git a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/block/breakanimation/WrappedPacketOutBlockBreakAnimation.java b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/block/breakanimation/WrappedPacketOutBlockBreakAnimation.java index 76ba0ffa..c613f764 100644 --- a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/block/breakanimation/WrappedPacketOutBlockBreakAnimation.java +++ b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/block/breakanimation/WrappedPacketOutBlockBreakAnimation.java @@ -16,6 +16,7 @@ public class WrappedPacketOutBlockBreakAnimation extends PacketBlockBreakAnimati ); private WrappedPacketOutBlockBreakAnimation(@NonNull Object handle) { +<<<<<<< HEAD super(handle, names); } @@ -36,5 +37,11 @@ public WrappedPacketOutBlockBreakAnimation(int entityId, @NonNull BlockPosition progress ) ).build()); +======= + super(handle, Set.of( + version.getPackageNms() + "PacketPlayOutBlockBreakAnimation", + networkProtocolGame + "PacketPlayOutBlockBreakAnimation" + )); +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git } } diff --git a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/block/change/PacketBlockChangeWrapper.java b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/block/change/PacketBlockChangeWrapper.java index 7911adc7..5bb6d9a2 100644 --- a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/block/change/PacketBlockChangeWrapper.java +++ b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/block/change/PacketBlockChangeWrapper.java @@ -11,7 +11,11 @@ import lombok.experimental.FieldDefaults; @FieldDefaults(makeFinal = true) +<<<<<<< HEAD class PacketBlockChangeWrapper extends PacketWrapper implements PacketBlockChange { +======= +class PacketBlockChangeWrapper extends PacketWrapper { +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git Field pos; @@ -29,8 +33,16 @@ public BlockPosition getPos() { return SpigotWrapper.wrap(getFieldValue(pos)); } +<<<<<<< HEAD @Override public void setPos(BlockPosition pos) { setField(this.pos, pos.getHandle()); +======= + /** + * @param pos BlockPosition + */ + public void setPos(Object pos) { + setField(this.pos, pos); +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git } } diff --git a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/block/dig/PacketBlockDigWrapper.java b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/block/dig/PacketBlockDigWrapper.java index 7904dc0b..47d0d18f 100644 --- a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/block/dig/PacketBlockDigWrapper.java +++ b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/block/dig/PacketBlockDigWrapper.java @@ -4,15 +4,23 @@ import java.util.Set; import com.falchus.lib.minecraft.spigot.packets.wrapper.PacketWrapper; +<<<<<<< HEAD import com.falchus.lib.minecraft.spigot.wrapper.SpigotWrapper; import com.falchus.lib.minecraft.spigot.wrapper.core.baseblockposition.BlockPosition; +======= +import com.falchus.lib.minecraft.spigot.utils.ServerUtils; +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git import lombok.NonNull; import lombok.SneakyThrows; import lombok.experimental.FieldDefaults; @FieldDefaults(makeFinal = true) +<<<<<<< HEAD class PacketBlockDigWrapper extends PacketWrapper implements PacketBlockDig { +======= +class PacketBlockDigWrapper extends PacketWrapper { +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git Field pos; Field direction; @@ -40,9 +48,17 @@ public BlockPosition getPos() { return SpigotWrapper.wrap(getFieldValue(pos)); } +<<<<<<< HEAD @Override public void setPos(BlockPosition pos) { setField(this.pos, pos.getHandle()); +======= + /** + * @param pos BlockPosition + */ + public void setPos(Object pos) { + setField(this.pos, pos); +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git } @Override @@ -50,21 +66,56 @@ public Direction getDirection() { return Direction.valueOf(getFieldValue(direction, Enum.class).name()); } +<<<<<<< HEAD @SuppressWarnings({ "unchecked", "rawtypes" }) @Override public void setDirection(Direction direction) { setField(this.direction, Enum.valueOf((Class) this.direction.getType(), direction.name())); +======= + /** + * @param direction EnumDirection + */ + public void setDirection(Object direction) { + setField(this.direction, direction); + } + + public enum Action { + START_DESTROY_BLOCK, + ABORT_DESTROY_BLOCK, + STOP_DESTROY_BLOCK, + DROP_ALL_ITEMS, + DROP_ITEM, + RELEASE_USE_ITEM +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git } @SneakyThrows @Override public Action getAction() { +<<<<<<< HEAD return Action.valueOf(getFieldValue(action, Enum.class).name()); +======= + String name; + if (ServerUtils.getVersion().isBefore(Version.v1_17)) { + name = ((Enum) getFieldValue(action)).name(); + } else { + name = getFieldValue(action, Enum.class).name(); + } + return Action.valueOf(name); +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git } +<<<<<<< HEAD @SuppressWarnings({ "unchecked", "rawtypes" }) @Override public void setAction(Action action) { setField(this.action, Enum.valueOf((Class) this.action.getType(), action.name())); +======= + /** + * @param action EnumPlayerDigType + */ + public void setAction(Object action) { + setField(this.action, action); +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git } } diff --git a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/block/place/PacketBlockPlaceWrapper.java b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/block/place/PacketBlockPlaceWrapper.java index 7beae64a..2ff6b004 100644 --- a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/block/place/PacketBlockPlaceWrapper.java +++ b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/block/place/PacketBlockPlaceWrapper.java @@ -5,14 +5,22 @@ import com.falchus.lib.minecraft.spigot.packets.wrapper.PacketWrapper; import com.falchus.lib.minecraft.spigot.wrapper.SpigotWrapper; +<<<<<<< HEAD import com.falchus.lib.minecraft.spigot.wrapper.core.baseblockposition.BlockPosition; import com.falchus.lib.minecraft.spigot.wrapper.world.level.block.Block; +======= +import com.falchus.lib.minecraft.spigot.wrapper.core.baseblockposition.WrappedBlockPosition; +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git import lombok.NonNull; import lombok.experimental.FieldDefaults; @FieldDefaults(makeFinal = true) +<<<<<<< HEAD class PacketBlockPlaceWrapper extends PacketWrapper implements PacketBlockPlace { +======= +class PacketBlockPlaceWrapper extends PacketWrapper { +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git Field pos; Field type; @@ -40,14 +48,29 @@ class PacketBlockPlaceWrapper extends PacketWrapper implements PacketBlockPlace ); } +<<<<<<< HEAD @Override public BlockPosition getPos() { +======= + /** + * @return {@link WrappedBlockPosition} + */ + public WrappedBlockPosition getPos() { +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git return SpigotWrapper.wrap(getFieldValue(pos)); } +<<<<<<< HEAD @Override public void setPos(BlockPosition pos) { setField(this.pos, pos.getHandle()); +======= + /** + * @param pos BlockPosition + */ + public void setPos(Object pos) { + setField(this.pos, pos); +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git } @Override @@ -75,8 +98,16 @@ public Block getBlock() { return SpigotWrapper.wrap(getFieldValue(block)); } +<<<<<<< HEAD @Override public void setBlock(Block block) { setField(this.block, block.getHandle()); +======= + /** + * @param block Block + */ + public void setBlock(Object block) { + setField(this.block, block); +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git } } diff --git a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/block/update/PacketBlockUpdateWrapper.java b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/block/update/PacketBlockUpdateWrapper.java index 7edd9698..f403c900 100644 --- a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/block/update/PacketBlockUpdateWrapper.java +++ b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/block/update/PacketBlockUpdateWrapper.java @@ -11,7 +11,11 @@ import lombok.experimental.FieldDefaults; @FieldDefaults(makeFinal = true) +<<<<<<< HEAD class PacketBlockUpdateWrapper extends PacketWrapper implements PacketBlockUpdate { +======= +class PacketBlockUpdateWrapper extends PacketWrapper { +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git Field pos; Field blockState; @@ -34,9 +38,17 @@ public BlockPosition getPos() { return SpigotWrapper.wrap(getFieldValue(pos)); } +<<<<<<< HEAD @Override public void setPos(BlockPosition pos) { setField(this.pos, pos.getHandle()); +======= + /** + * @param pos BlockPosition + */ + public void setPos(Object pos) { + setField(this.pos, pos); +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git } @Override @@ -44,7 +56,13 @@ public Object getBlockState() { return getFieldValue(blockState); } +<<<<<<< HEAD @Override +======= + /** + * @param block BlockState + */ +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git public void setBlockState(Object blockState) { setField(this.blockState, blockState); } diff --git a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/camera/PacketCameraWrapper.java b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/camera/PacketCameraWrapper.java index 11223e83..f4e2508c 100644 --- a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/camera/PacketCameraWrapper.java +++ b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/camera/PacketCameraWrapper.java @@ -9,7 +9,11 @@ import lombok.experimental.FieldDefaults; @FieldDefaults(makeFinal = true) +<<<<<<< HEAD class PacketCameraWrapper extends PacketWrapper implements PacketCamera { +======= +class PacketCameraWrapper extends PacketWrapper { +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git Field cameraId; diff --git a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/camera/WrappedPacketOutCamera.java b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/camera/WrappedPacketOutCamera.java index e3a9fd56..3c3f90e5 100644 --- a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/camera/WrappedPacketOutCamera.java +++ b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/camera/WrappedPacketOutCamera.java @@ -17,6 +17,7 @@ public class WrappedPacketOutCamera extends PacketCameraWrapper { ); private WrappedPacketOutCamera(@NonNull Object handle) { +<<<<<<< HEAD super(handle, names); } @@ -29,5 +30,11 @@ public WrappedPacketOutCamera(@NonNull Entity entity) { entity.getHandle() ) ).build()); +======= + super(handle, Set.of( + version.getPackageNms() + "PacketPlayOutCamera", + networkProtocolGame + "PacketPlayOutCamera" + )); +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git } } diff --git a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/chat/WrappedPacketInChat.java b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/chat/WrappedPacketInChat.java index fe886b4b..62151269 100644 --- a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/chat/WrappedPacketInChat.java +++ b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/chat/WrappedPacketInChat.java @@ -9,7 +9,11 @@ public class WrappedPacketInChat extends PacketChatWrapper { private WrappedPacketInChat(@NonNull Object handle) { super(handle, Set.of( version.getPackageNms() + "PacketPlayInChat", +<<<<<<< HEAD networkProtocolGame + "PacketPlayInChat" +======= + networkProtocolGame + "ServerboundChatPacket" +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git )); } diff --git a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/clientcommand/PacketClientCommandWrapper.java b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/clientcommand/PacketClientCommandWrapper.java index 778ee863..1c4772d3 100644 --- a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/clientcommand/PacketClientCommandWrapper.java +++ b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/clientcommand/PacketClientCommandWrapper.java @@ -9,7 +9,11 @@ import lombok.experimental.FieldDefaults; @FieldDefaults(makeFinal = true) +<<<<<<< HEAD class PacketClientCommandWrapper extends PacketWrapper implements PacketClientCommand { +======= +class PacketClientCommandWrapper extends PacketWrapper { +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git Field action; @@ -27,9 +31,17 @@ public Action getAction() { return Action.valueOf(getFieldValue(action, Enum.class).name()); } +<<<<<<< HEAD @SuppressWarnings({ "unchecked", "rawtypes" }) @Override public void setAction(Action action) { setField(this.action, Enum.valueOf((Class) this.action.getType(), action.name())); +======= + /** + * @param action PacketPlayInClientCommand$EnumClientCommand + */ + public void setAction(Object action) { + setField(this.action, action); +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git } } diff --git a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/closewindow/PacketCloseWindowWrapper.java b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/closewindow/PacketCloseWindowWrapper.java index 4d0fb63e..b51905be 100644 --- a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/closewindow/PacketCloseWindowWrapper.java +++ b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/closewindow/PacketCloseWindowWrapper.java @@ -9,7 +9,11 @@ import lombok.experimental.FieldDefaults; @FieldDefaults(makeFinal = true) +<<<<<<< HEAD class PacketCloseWindowWrapper extends PacketWrapper implements PacketCloseWindow { +======= +class PacketCloseWindowWrapper extends PacketWrapper { +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git Field containerId; diff --git a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/closewindow/WrappedPacketInCloseWindow.java b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/closewindow/WrappedPacketInCloseWindow.java index 551dc102..04cfbb58 100644 --- a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/closewindow/WrappedPacketInCloseWindow.java +++ b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/closewindow/WrappedPacketInCloseWindow.java @@ -15,6 +15,7 @@ public class WrappedPacketInCloseWindow extends PacketCloseWindowWrapper { ); private WrappedPacketInCloseWindow(@NonNull Object handle) { +<<<<<<< HEAD super(handle, names); } @@ -27,5 +28,11 @@ public WrappedPacketInCloseWindow(int syncId) { syncId ) ).build()); +======= + super(handle, Set.of( + version.getPackageNms() + "PacketPlayInCloseWindow", + networkProtocolGame + "PacketPlayInCloseWindow" + )); +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git } } diff --git a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/closewindow/WrappedPacketOutCloseWindow.java b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/closewindow/WrappedPacketOutCloseWindow.java index ea09ec89..ae8b2dd1 100644 --- a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/closewindow/WrappedPacketOutCloseWindow.java +++ b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/closewindow/WrappedPacketOutCloseWindow.java @@ -15,6 +15,7 @@ public class WrappedPacketOutCloseWindow extends PacketCloseWindowWrapper { ); private WrappedPacketOutCloseWindow(@NonNull Object handle) { +<<<<<<< HEAD super(handle, names); } @@ -27,5 +28,11 @@ public WrappedPacketOutCloseWindow(int syncId) { syncId ) ).build()); +======= + super(handle, Set.of( + version.getPackageNms() + "PacketPlayOutCloseWindow", + networkProtocolGame + "PacketPlayOutCloseWindow" + )); +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git } } diff --git a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/collect/PacketCollectWrapper.java b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/collect/PacketCollectWrapper.java index 45b87a50..0c427683 100644 --- a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/collect/PacketCollectWrapper.java +++ b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/collect/PacketCollectWrapper.java @@ -9,7 +9,11 @@ import lombok.experimental.FieldDefaults; @FieldDefaults(makeFinal = true) +<<<<<<< HEAD class PacketCollectWrapper extends PacketWrapper implements PacketCollect { +======= +class PacketCollectWrapper extends PacketWrapper { +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git Field itemId; Field playerId; diff --git a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/custompayload/PacketCustomPayloadWrapper.java b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/custompayload/PacketCustomPayloadWrapper.java index 1f4a6be8..67a21953 100644 --- a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/custompayload/PacketCustomPayloadWrapper.java +++ b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/custompayload/PacketCustomPayloadWrapper.java @@ -6,7 +6,11 @@ import lombok.NonNull; +<<<<<<< HEAD class PacketCustomPayloadWrapper extends PacketWrapper implements PacketCustomPayload { +======= +class PacketCustomPayloadWrapper extends PacketWrapper { +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git PacketCustomPayloadWrapper(@NonNull Object handle, @NonNull Set names) { super(handle, names); diff --git a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/enchantitem/PacketEnchantItemWrapper.java b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/enchantitem/PacketEnchantItemWrapper.java index 8890da3c..20d4a216 100644 --- a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/enchantitem/PacketEnchantItemWrapper.java +++ b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/enchantitem/PacketEnchantItemWrapper.java @@ -9,7 +9,11 @@ import lombok.experimental.FieldDefaults; @FieldDefaults(makeFinal = true) +<<<<<<< HEAD class PacketEnchantItemWrapper extends PacketWrapper implements PacketEnchantItem { +======= +class PacketEnchantItemWrapper extends PacketWrapper { +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git Field containerId; Field buttonId; diff --git a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/enchantitem/WrappedPacketInEnchantItem.java b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/enchantitem/WrappedPacketInEnchantItem.java index 4078a690..9f10b95c 100644 --- a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/enchantitem/WrappedPacketInEnchantItem.java +++ b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/enchantitem/WrappedPacketInEnchantItem.java @@ -15,6 +15,7 @@ public class WrappedPacketInEnchantItem extends PacketEnchantItemWrapper { ); private WrappedPacketInEnchantItem(@NonNull Object handle) { +<<<<<<< HEAD super(handle, names); } @@ -31,5 +32,11 @@ public WrappedPacketInEnchantItem(int syncId, int buttonId) { buttonId ) ).build()); +======= + super(handle, Set.of( + version.getPackageNms() + "PacketPlayInEnchantItem", + networkProtocolGame + "PacketPlayInEnchantItem" + )); +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git } } diff --git a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/entity/PacketEntityWrapper.java b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/entity/PacketEntityWrapper.java index ca70a737..79ae3cd6 100644 --- a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/entity/PacketEntityWrapper.java +++ b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/entity/PacketEntityWrapper.java @@ -9,7 +9,11 @@ import lombok.experimental.FieldDefaults; @FieldDefaults(makeFinal = true) +<<<<<<< HEAD class PacketEntityWrapper extends PacketWrapper implements PacketEntity { +======= +class PacketEntityWrapper extends PacketWrapper { +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git Field entityId; diff --git a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/entity/WrappedPacketInEntityAction.java b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/entity/WrappedPacketInEntityAction.java index 9ccab2b7..0cff8c44 100644 --- a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/entity/WrappedPacketInEntityAction.java +++ b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/entity/WrappedPacketInEntityAction.java @@ -39,9 +39,17 @@ public Action getAction() { return Action.valueOf(getFieldValue(action, Enum.class).name()); } +<<<<<<< HEAD @SuppressWarnings({ "unchecked", "rawtypes" }) public void setAction(Action action) { setField(this.action, Enum.valueOf((Class) this.action.getType(), action.name())); +======= + /** + * @param action PacketPlayInEntityAction$EnumPlayerAction + */ + public void setAction(Object action) { + setField(this.action, action); +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git } public int getData() { diff --git a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/entity/WrappedPacketOutEntityDestroy.java b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/entity/WrappedPacketOutEntityDestroy.java index 59f935a2..654b2e92 100644 --- a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/entity/WrappedPacketOutEntityDestroy.java +++ b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/entity/WrappedPacketOutEntityDestroy.java @@ -15,6 +15,7 @@ public class WrappedPacketOutEntityDestroy extends PacketEntityWrapper { ); private WrappedPacketOutEntityDestroy(@NonNull Object handle) { +<<<<<<< HEAD super(handle, names); } @@ -27,5 +28,11 @@ public WrappedPacketOutEntityDestroy(int... entityIds) { entityIds ) ).build()); +======= + super(handle, Set.of( + version.getPackageNms() + "PacketPlayOutEntityDestroy", + networkProtocolGame + "PacketPlayOutEntityDestroy" + )); +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git } } diff --git a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/entity/WrappedPacketOutEntityHeadRotation.java b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/entity/WrappedPacketOutEntityHeadRotation.java index 283ab385..890d09de 100644 --- a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/entity/WrappedPacketOutEntityHeadRotation.java +++ b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/entity/WrappedPacketOutEntityHeadRotation.java @@ -22,7 +22,14 @@ public class WrappedPacketOutEntityHeadRotation extends PacketEntityWrapper { Field yHeadRot; private WrappedPacketOutEntityHeadRotation(@NonNull Object handle) { +<<<<<<< HEAD super(handle, names); +======= + super(handle, Set.of( + version.getPackageNms() + "PacketPlayOutEntityHeadRotation", + networkProtocolGame + "PacketPlayOutEntityHeadRotation" + )); +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git yHeadRot = getFirstField( "yHeadRot", diff --git a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/entity/WrappedPacketOutEntityMetadata.java b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/entity/WrappedPacketOutEntityMetadata.java index afcf3afd..a57e63da 100644 --- a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/entity/WrappedPacketOutEntityMetadata.java +++ b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/entity/WrappedPacketOutEntityMetadata.java @@ -16,6 +16,7 @@ public class WrappedPacketOutEntityMetadata extends PacketEntityWrapper { ); private WrappedPacketOutEntityMetadata(@NonNull Object handle) { +<<<<<<< HEAD super(handle, names); } @@ -37,5 +38,11 @@ public WrappedPacketOutEntityMetadata(int id, @NonNull DataWatcher tracker, bool forceUpdateAll ) ).build()); +======= + super(handle, Set.of( + version.getPackageNms() + "PacketPlayOutEntityMetadata", + networkProtocolGame + "PacketPlayOutEntityMetadata" + )); +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git } } diff --git a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/entity/WrappedPacketOutEntityStatus.java b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/entity/WrappedPacketOutEntityStatus.java index c43f66b9..910b664d 100644 --- a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/entity/WrappedPacketOutEntityStatus.java +++ b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/entity/WrappedPacketOutEntityStatus.java @@ -22,7 +22,14 @@ public class WrappedPacketOutEntityStatus extends PacketEntityWrapper { Field eventId; private WrappedPacketOutEntityStatus(@NonNull Object handle) { +<<<<<<< HEAD super(handle, names); +======= + super(handle, Set.of( + version.getPackageNms() + "PacketPlayOutEntityStatus", + networkProtocolGame + "PacketPlayOutEntityStatus" + )); +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git eventId = getFirstField( "eventId", diff --git a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/entity/WrappedPacketOutEntityVelocity.java b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/entity/WrappedPacketOutEntityVelocity.java index c49806da..5c5d8a06 100644 --- a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/entity/WrappedPacketOutEntityVelocity.java +++ b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/entity/WrappedPacketOutEntityVelocity.java @@ -1,31 +1,52 @@ package com.falchus.lib.minecraft.spigot.packets.wrapper.entity; import java.lang.reflect.Field; +<<<<<<< HEAD import java.util.Map; +======= +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git import java.util.Set; +<<<<<<< HEAD import com.falchus.lib.minecraft.spigot.utils.version.VersionProvider; import com.falchus.lib.minecraft.spigot.wrapper.world.entity.Entity; import com.falchus.lib.utils.builder.ClassInstanceBuilder; +======= +import lombok.NonNull; +import lombok.experimental.FieldDefaults; +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git +<<<<<<< HEAD import lombok.NonNull; import lombok.experimental.FieldDefaults; +======= +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git @FieldDefaults(makeFinal = true) public class WrappedPacketOutEntityVelocity extends PacketEntityWrapper { +<<<<<<< HEAD private static final Set names = Set.of( version.getPackageNms() + "PacketPlayOutEntityVelocity", networkProtocolGame + "PacketPlayOutEntityVelocity" ); +======= +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git Field x; Field y; Field z; private WrappedPacketOutEntityVelocity(@NonNull Object handle) { +<<<<<<< HEAD super(handle, names); +======= + super(handle, Set.of( + version.getPackageNms() + "PacketPlayOutEntityVelocity", + networkProtocolGame + "PacketPlayOutEntityVelocity" + )); +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git x = getFirstField( "xa", "b" @@ -40,6 +61,7 @@ private WrappedPacketOutEntityVelocity(@NonNull Object handle) { ); } +<<<<<<< HEAD public WrappedPacketOutEntityVelocity(@NonNull Entity entity) { this(new ClassInstanceBuilder( names @@ -51,6 +73,8 @@ public WrappedPacketOutEntityVelocity(@NonNull Entity entity) { ).build()); } +======= +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git public int getX() { return getFieldValue(x); } diff --git a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/experience/PacketExperienceWrapper.java b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/experience/PacketExperienceWrapper.java index fc09c0b1..7ffff71c 100644 --- a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/experience/PacketExperienceWrapper.java +++ b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/experience/PacketExperienceWrapper.java @@ -9,7 +9,11 @@ import lombok.experimental.FieldDefaults; @FieldDefaults(makeFinal = true) +<<<<<<< HEAD class PacketExperienceWrapper extends PacketWrapper implements PacketExperience { +======= +class PacketExperienceWrapper extends PacketWrapper { +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git Field experienceProgress; Field totalExperience; diff --git a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/experience/WrappedPacketOutExperience.java b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/experience/WrappedPacketOutExperience.java index 8dca4185..d38cb995 100644 --- a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/experience/WrappedPacketOutExperience.java +++ b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/experience/WrappedPacketOutExperience.java @@ -15,6 +15,7 @@ public class WrappedPacketOutExperience extends PacketExperienceWrapper { ); private WrappedPacketOutExperience(@NonNull Object handle) { +<<<<<<< HEAD super(handle, names); } @@ -35,5 +36,11 @@ public WrappedPacketOutExperience(float barProgress, int experienceLevel, int ex experience ) ).build()); +======= + super(handle, Set.of( + version.getPackageNms() + "PacketPlayOutExperience", + networkProtocolGame + "PacketPlayOutExperience" + )); +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git } } diff --git a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/explosion/PacketExplosionWrapper.java b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/explosion/PacketExplosionWrapper.java index 55333b52..b44f3478 100644 --- a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/explosion/PacketExplosionWrapper.java +++ b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/explosion/PacketExplosionWrapper.java @@ -9,7 +9,11 @@ import lombok.experimental.FieldDefaults; @FieldDefaults(makeFinal = true) +<<<<<<< HEAD class PacketExplosionWrapper extends PacketWrapper implements PacketExplosion { +======= +class PacketExplosionWrapper extends PacketWrapper { +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git Field radius; diff --git a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/flying/PacketFlyingWrapper.java b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/flying/PacketFlyingWrapper.java index 212ca9fb..acaf5bc0 100644 --- a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/flying/PacketFlyingWrapper.java +++ b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/flying/PacketFlyingWrapper.java @@ -9,7 +9,11 @@ import lombok.experimental.FieldDefaults; @FieldDefaults(makeFinal = true) +<<<<<<< HEAD class PacketFlyingWrapper extends PacketWrapper implements PacketFlying { +======= +class PacketFlyingWrapper extends PacketWrapper { +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git Field x; Field y; diff --git a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/gamestatechange/PacketGameStateChangeWrapper.java b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/gamestatechange/PacketGameStateChangeWrapper.java index b93038be..017b96c7 100644 --- a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/gamestatechange/PacketGameStateChangeWrapper.java +++ b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/gamestatechange/PacketGameStateChangeWrapper.java @@ -9,7 +9,11 @@ import lombok.experimental.FieldDefaults; @FieldDefaults(makeFinal = true) +<<<<<<< HEAD class PacketGameStateChangeWrapper extends PacketWrapper implements PacketGameStateChange { +======= +class PacketGameStateChangeWrapper extends PacketWrapper { +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git Field param; diff --git a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/gamestatechange/WrappedPacketOutGameStateChange.java b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/gamestatechange/WrappedPacketOutGameStateChange.java index ddc4481b..c39613c0 100644 --- a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/gamestatechange/WrappedPacketOutGameStateChange.java +++ b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/gamestatechange/WrappedPacketOutGameStateChange.java @@ -15,6 +15,7 @@ public class WrappedPacketOutGameStateChange extends PacketGameStateChangeWrappe ); private WrappedPacketOutGameStateChange(@NonNull Object handle) { +<<<<<<< HEAD super(handle, names); } @@ -32,5 +33,11 @@ public WrappedPacketOutGameStateChange(int reason, float param) { param ) ).build()); +======= + super(handle, Set.of( + version.getPackageNms() + "PacketPlayOutGameStateChange", + networkProtocolGame + "PacketPlayOutGameStateChange" + )); +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git } } diff --git a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/helditemslot/PacketHeldItemSlotWrapper.java b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/helditemslot/PacketHeldItemSlotWrapper.java index 9a2aa155..47117aba 100644 --- a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/helditemslot/PacketHeldItemSlotWrapper.java +++ b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/helditemslot/PacketHeldItemSlotWrapper.java @@ -9,7 +9,11 @@ import lombok.experimental.FieldDefaults; @FieldDefaults(makeFinal = true) +<<<<<<< HEAD class PacketHeldItemSlotWrapper extends PacketWrapper implements PacketHeldItemSlot { +======= +class PacketHeldItemSlotWrapper extends PacketWrapper { +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git Field slot; diff --git a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/helditemslot/WrappedPacketInHeldItemSlot.java b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/helditemslot/WrappedPacketInHeldItemSlot.java index 22404f72..16eaee31 100644 --- a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/helditemslot/WrappedPacketInHeldItemSlot.java +++ b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/helditemslot/WrappedPacketInHeldItemSlot.java @@ -15,6 +15,7 @@ public class WrappedPacketInHeldItemSlot extends PacketHeldItemSlotWrapper { ); private WrappedPacketInHeldItemSlot(@NonNull Object handle) { +<<<<<<< HEAD super(handle, names); } @@ -27,5 +28,11 @@ public WrappedPacketInHeldItemSlot(int selectedSlot) { selectedSlot ) ).build()); +======= + super(handle, Set.of( + version.getPackageNms() + "PacketPlayInHeldItemSlot", + networkProtocolGame + "PacketPlayInHeldItemSlot" + )); +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git } } diff --git a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/helditemslot/WrappedPacketOutHeldItemSlot.java b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/helditemslot/WrappedPacketOutHeldItemSlot.java index ec968341..316e0d03 100644 --- a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/helditemslot/WrappedPacketOutHeldItemSlot.java +++ b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/helditemslot/WrappedPacketOutHeldItemSlot.java @@ -15,6 +15,7 @@ public class WrappedPacketOutHeldItemSlot extends PacketHeldItemSlotWrapper { ); private WrappedPacketOutHeldItemSlot(@NonNull Object handle) { +<<<<<<< HEAD super(handle, names); } @@ -27,5 +28,11 @@ public WrappedPacketOutHeldItemSlot(int slot) { slot ) ).build()); +======= + super(handle, Set.of( + version.getPackageNms() + "PacketPlayOutHeldItemSlot", + networkProtocolGame + "PacketPlayOutHeldItemSlot" + )); +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git } } diff --git a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/kickdisconnect/PacketKickDisconnectWrapper.java b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/kickdisconnect/PacketKickDisconnectWrapper.java index cea28ee6..b85c4032 100644 --- a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/kickdisconnect/PacketKickDisconnectWrapper.java +++ b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/kickdisconnect/PacketKickDisconnectWrapper.java @@ -11,7 +11,11 @@ import lombok.experimental.FieldDefaults; @FieldDefaults(makeFinal = true) +<<<<<<< HEAD class PacketKickDisconnectWrapper extends PacketWrapper implements PacketKickDisconnect { +======= +class PacketKickDisconnectWrapper extends PacketWrapper { +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git Field reason; @@ -29,8 +33,16 @@ public Component getReason() { return SpigotWrapper.wrap(getFieldValue(reason)); } +<<<<<<< HEAD @Override public void setReason(Component reason) { setField(this.reason, reason.getHandle()); +======= + /** + * @param reason IChatBaseComponent + */ + public void setReason(Object reason) { + setField(this.reason, reason); +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git } } diff --git a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/login/PacketLoginWrapper.java b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/login/PacketLoginWrapper.java index 805565c4..45a21919 100644 --- a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/login/PacketLoginWrapper.java +++ b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/login/PacketLoginWrapper.java @@ -9,7 +9,11 @@ import lombok.experimental.FieldDefaults; @FieldDefaults(makeFinal = true) +<<<<<<< HEAD class PacketLoginWrapper extends PacketWrapper implements PacketLogin { +======= +class PacketLoginWrapper extends PacketWrapper { +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git Field playerId; Field hardcore; diff --git a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/map/PacketMapWrapper.java b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/map/PacketMapWrapper.java index 3ba48a00..f6caf01d 100644 --- a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/map/PacketMapWrapper.java +++ b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/map/PacketMapWrapper.java @@ -9,7 +9,11 @@ import lombok.experimental.FieldDefaults; @FieldDefaults(makeFinal = true) +<<<<<<< HEAD class PacketMapWrapper extends PacketWrapper implements PacketMap { +======= +class PacketMapWrapper extends PacketWrapper { +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git Field scale; diff --git a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/multiblockchange/PacketMultiBlockChangeWrapper.java b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/multiblockchange/PacketMultiBlockChangeWrapper.java index e7ec0071..62205b48 100644 --- a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/multiblockchange/PacketMultiBlockChangeWrapper.java +++ b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/multiblockchange/PacketMultiBlockChangeWrapper.java @@ -6,7 +6,11 @@ import lombok.NonNull; +<<<<<<< HEAD class PacketMultiBlockChangeWrapper extends PacketWrapper implements PacketMultiBlockChange { +======= +class PacketMultiBlockChangeWrapper extends PacketWrapper { +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git PacketMultiBlockChangeWrapper(@NonNull Object handle, @NonNull Set names) { super(handle, names); diff --git a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/namedsoundeffect/PacketNamedSoundEffectWrapper.java b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/namedsoundeffect/PacketNamedSoundEffectWrapper.java index 0e8d22b5..d5811c71 100644 --- a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/namedsoundeffect/PacketNamedSoundEffectWrapper.java +++ b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/namedsoundeffect/PacketNamedSoundEffectWrapper.java @@ -9,7 +9,11 @@ import lombok.experimental.FieldDefaults; @FieldDefaults(makeFinal = true) +<<<<<<< HEAD class PacketNamedSoundEffectWrapper extends PacketWrapper implements PacketNamedSoundEffect { +======= +class PacketNamedSoundEffectWrapper extends PacketWrapper { +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git Field x; Field y; diff --git a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/open/signeditor/PacketOpenSignEditorWrapper.java b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/open/signeditor/PacketOpenSignEditorWrapper.java index 23963e0a..4d24237e 100644 --- a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/open/signeditor/PacketOpenSignEditorWrapper.java +++ b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/open/signeditor/PacketOpenSignEditorWrapper.java @@ -11,7 +11,11 @@ import lombok.experimental.FieldDefaults; @FieldDefaults(makeFinal = true) +<<<<<<< HEAD class PacketOpenSignEditorWrapper extends PacketWrapper implements PacketOpenSignEditor { +======= +class PacketOpenSignEditorWrapper extends PacketWrapper { +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git Field pos; @@ -29,8 +33,16 @@ public BlockPosition getPos() { return SpigotWrapper.wrap(getFieldValue(pos)); } +<<<<<<< HEAD @Override public void setPos(BlockPosition pos) { setField(this.pos, pos.getHandle()); +======= + /** + * @param pos BlockPosition + */ + public void setPos(Object pos) { + setField(this.pos, pos); +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git } } diff --git a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/open/window/PacketOpenWindowWrapper.java b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/open/window/PacketOpenWindowWrapper.java index f5123184..fdefa3d5 100644 --- a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/open/window/PacketOpenWindowWrapper.java +++ b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/open/window/PacketOpenWindowWrapper.java @@ -11,7 +11,11 @@ import lombok.experimental.FieldDefaults; @FieldDefaults(makeFinal = true) +<<<<<<< HEAD class PacketOpenWindowWrapper extends PacketWrapper implements PacketOpenWindow { +======= +class PacketOpenWindowWrapper extends PacketWrapper { +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git Field containerId; Field title; @@ -44,8 +48,16 @@ public Component getTitle() { return SpigotWrapper.wrap(getFieldValue(title)); } +<<<<<<< HEAD @Override public void setTitle(Component title) { setField(this.title, title.getHandle()); +======= + /** + * @param title IChatBaseComponent + */ + public void setTitle(Object title) { + setField(this.title, title); +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git } } diff --git a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/playerlistheaderfooter/PacketPlayerListHeaderFooterWrapper.java b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/playerlistheaderfooter/PacketPlayerListHeaderFooterWrapper.java index a241bc88..4c7f3868 100644 --- a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/playerlistheaderfooter/PacketPlayerListHeaderFooterWrapper.java +++ b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/playerlistheaderfooter/PacketPlayerListHeaderFooterWrapper.java @@ -14,7 +14,11 @@ import lombok.experimental.FieldDefaults; @FieldDefaults(makeFinal = true) +<<<<<<< HEAD class PacketPlayerListHeaderFooterWrapper extends PacketWrapper implements PacketPlayerListHeaderFooter { +======= +class PacketPlayerListHeaderFooterWrapper extends PacketWrapper { +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git Field header; Field footer; @@ -36,9 +40,17 @@ public Component getHeader() { return SpigotWrapper.wrap(getFieldValue(header)); } +<<<<<<< HEAD @Override public void setHeader(@NonNull String header) { setField(this.header, new WrappedComponent(header).getHandle()); +======= + /** + * @param header IChatBaseComponent + */ + public void setHeader(Object header) { + setField(this.header, header); +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git } @Override @@ -46,8 +58,16 @@ public Component getFooter() { return SpigotWrapper.wrap(getFieldValue(footer)); } +<<<<<<< HEAD @Override public void setFooter(@NonNull String footer) { setField(this.footer, new WrappedComponent(footer).getHandle()); +======= + /** + * @param footer IChatBaseComponent + */ + public void setFooter(Object footer) { + setField(this.footer, footer); +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git } } diff --git a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/playerlistheaderfooter/WrappedPacketOutPlayerListHeaderFooter.java b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/playerlistheaderfooter/WrappedPacketOutPlayerListHeaderFooter.java index 19ad7303..4fd608cb 100644 --- a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/playerlistheaderfooter/WrappedPacketOutPlayerListHeaderFooter.java +++ b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/playerlistheaderfooter/WrappedPacketOutPlayerListHeaderFooter.java @@ -14,10 +14,17 @@ public class WrappedPacketOutPlayerListHeaderFooter extends PacketPlayerListHead ); private WrappedPacketOutPlayerListHeaderFooter(@NonNull Object handle) { +<<<<<<< HEAD super(handle, names); } public WrappedPacketOutPlayerListHeaderFooter(@NonNull String header, @NonNull String footer) { this(VersionProvider.get().createPacketOutPlayerListHeaderFooter(names, header, footer)); +======= + super(handle, Set.of( + version.getPackageNms() + "PacketPlayOutPlayerListHeaderFooter", + networkProtocolGame + "PacketPlayOutPlayerListHeaderFooter" + )); +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git } } diff --git a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/position/PacketPositionWrapper.java b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/position/PacketPositionWrapper.java index a0ea2cec..d86679fe 100644 --- a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/position/PacketPositionWrapper.java +++ b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/position/PacketPositionWrapper.java @@ -8,6 +8,7 @@ import lombok.NonNull; import lombok.experimental.FieldDefaults; +<<<<<<< HEAD @FieldDefaults(makeFinal = true) class PacketPositionWrapper extends PacketWrapper implements PacketPosition { @@ -17,6 +18,9 @@ class PacketPositionWrapper extends PacketWrapper implements PacketPosition { Field yaw; Field pitch; Field relatives; +======= +class PacketPositionWrapper extends PacketWrapper { +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git // TODO: multi-version PacketPositionWrapper(@NonNull Object handle, @NonNull Set names) { diff --git a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/removeentityeffect/PacketRemoveEntityEffectWrapper.java b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/removeentityeffect/PacketRemoveEntityEffectWrapper.java index 4b643d0d..95e5a01d 100644 --- a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/removeentityeffect/PacketRemoveEntityEffectWrapper.java +++ b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/removeentityeffect/PacketRemoveEntityEffectWrapper.java @@ -9,7 +9,11 @@ import lombok.experimental.FieldDefaults; @FieldDefaults(makeFinal = true) +<<<<<<< HEAD class PacketRemoveEntityEffectWrapper extends PacketWrapper implements PacketRemoveEntityEffect { +======= +class PacketRemoveEntityEffectWrapper extends PacketWrapper { +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git Field entityId; diff --git a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/resourcepackstatus/PacketResourcePackStatusWrapper.java b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/resourcepackstatus/PacketResourcePackStatusWrapper.java index f4f8db99..c6d4015a 100644 --- a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/resourcepackstatus/PacketResourcePackStatusWrapper.java +++ b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/resourcepackstatus/PacketResourcePackStatusWrapper.java @@ -9,7 +9,11 @@ import lombok.experimental.FieldDefaults; @FieldDefaults(makeFinal = true) +<<<<<<< HEAD class PacketResourcePackStatusWrapper extends PacketWrapper implements PacketResourcePackStatus { +======= +class PacketResourcePackStatusWrapper extends PacketWrapper { +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git Field status; @@ -28,9 +32,17 @@ public Status getStatus() { return Status.valueOf(getFieldValue(status, Enum.class).name()); } +<<<<<<< HEAD @SuppressWarnings({ "unchecked", "rawtypes" }) @Override public void setStatus(Status status) { setField(this.status, Enum.valueOf((Class) this.status.getType(), status.name())); +======= + /** + * @param status PacketPlayInResourcePackStatus$EnumResourcePackStatus + */ + public void setStatus(Object status) { + setField(this.status, status); +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git } } diff --git a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/respawn/PacketRespawnWrapper.java b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/respawn/PacketRespawnWrapper.java index 8085739d..8fa1eac6 100644 --- a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/respawn/PacketRespawnWrapper.java +++ b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/respawn/PacketRespawnWrapper.java @@ -8,9 +8,37 @@ import lombok.experimental.FieldDefaults; @FieldDefaults(makeFinal = true) +<<<<<<< HEAD class PacketRespawnWrapper extends PacketWrapper implements PacketRespawn { // TODO +======= +class PacketRespawnWrapper extends PacketWrapper { + + Field levelType; +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git PacketRespawnWrapper(@NonNull Object handle, @NonNull Set names) { super(handle, names); +<<<<<<< HEAD +======= + + levelType = getFirstField( + "levelType", + "d" + ); + } + + /** + * @return WorldType + */ + public Object getLevelType() { + return getFieldValue(levelType); + } + + /** + * @param levelType WorldType + */ + public void setLevelType(Object levelType) { + setField(this.levelType, levelType); +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git } } diff --git a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/scoreboard/display/objective/PacketScoreboardDisplayObjectiveWrapper.java b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/scoreboard/display/objective/PacketScoreboardDisplayObjectiveWrapper.java index 0b4cb090..dcc3e151 100644 --- a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/scoreboard/display/objective/PacketScoreboardDisplayObjectiveWrapper.java +++ b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/scoreboard/display/objective/PacketScoreboardDisplayObjectiveWrapper.java @@ -9,7 +9,11 @@ import lombok.experimental.FieldDefaults; @FieldDefaults(makeFinal = true) +<<<<<<< HEAD class PacketScoreboardDisplayObjectiveWrapper extends PacketWrapper implements PacketScoreboardDisplayObjective { +======= +class PacketScoreboardDisplayObjectiveWrapper extends PacketWrapper { +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git Field objectiveName; diff --git a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/scoreboard/display/objective/WrappedPacketOutScoreboardDisplayObjective.java b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/scoreboard/display/objective/WrappedPacketOutScoreboardDisplayObjective.java index c32872e8..7d7c2c36 100644 --- a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/scoreboard/display/objective/WrappedPacketOutScoreboardDisplayObjective.java +++ b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/scoreboard/display/objective/WrappedPacketOutScoreboardDisplayObjective.java @@ -19,6 +19,7 @@ public class WrappedPacketOutScoreboardDisplayObjective extends PacketScoreboard ); private WrappedPacketOutScoreboardDisplayObjective(@NonNull Object handle) { +<<<<<<< HEAD super(handle, names); } @@ -71,5 +72,11 @@ public enum DisplaySlot { TEAM_WHITE(18); private final int slot; +======= + super(handle, Set.of( + version.getPackageNms() + "PacketPlayOutScoreboardDisplayObjective", + networkProtocolGame + "PacketPlayOutScoreboardDisplayObjective" + )); +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git } } diff --git a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/scoreboard/objective/PacketScoreboardObjectiveWrapper.java b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/scoreboard/objective/PacketScoreboardObjectiveWrapper.java index 17e6c4e0..5bcd3b13 100644 --- a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/scoreboard/objective/PacketScoreboardObjectiveWrapper.java +++ b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/scoreboard/objective/PacketScoreboardObjectiveWrapper.java @@ -10,7 +10,11 @@ import lombok.experimental.FieldDefaults; @FieldDefaults(makeFinal = true) +<<<<<<< HEAD class PacketScoreboardObjectiveWrapper extends PacketWrapper implements PacketScoreboardObjective { +======= +class PacketScoreboardObjectiveWrapper extends PacketWrapper { +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git Field objectiveName; Field renderType; @@ -48,10 +52,18 @@ public ScoreboardRenderType getRenderType() { return ScoreboardRenderType.valueOf(getFieldValue(renderType, Enum.class).name()); } +<<<<<<< HEAD @SuppressWarnings({ "unchecked", "rawtypes" }) @Override public void setRenderType(ScoreboardRenderType renderType) { setField(this.renderType, Enum.valueOf((Class) this.renderType.getType(), renderType.name())); +======= + /** + * @param renderType IScoreboardCriteria$EnumScoreboardHealthDisplay + */ + public void setRenderType(Object renderType) { + setField(this.renderType, renderType); +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git } @Override diff --git a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/scoreboard/objective/WrappedPacketOutScoreboardObjective.java b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/scoreboard/objective/WrappedPacketOutScoreboardObjective.java index c18ea17c..ab200432 100644 --- a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/scoreboard/objective/WrappedPacketOutScoreboardObjective.java +++ b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/scoreboard/objective/WrappedPacketOutScoreboardObjective.java @@ -16,6 +16,7 @@ public class WrappedPacketOutScoreboardObjective extends PacketScoreboardObjecti ); private WrappedPacketOutScoreboardObjective(@NonNull Object handle) { +<<<<<<< HEAD super(handle, names); } @@ -32,5 +33,11 @@ public WrappedPacketOutScoreboardObjective(@NonNull ScoreboardObjective objectiv mode ) ).build()); +======= + super(handle, Set.of( + version.getPackageNms() + "PacketPlayOutScoreboardObjective", + networkProtocolGame + "PacketPlayOutScoreboardObjective" + )); +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git } } diff --git a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/scoreboard/score/PacketScoreboardScoreWrapper.java b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/scoreboard/score/PacketScoreboardScoreWrapper.java index eec08c36..90b246f3 100644 --- a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/scoreboard/score/PacketScoreboardScoreWrapper.java +++ b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/scoreboard/score/PacketScoreboardScoreWrapper.java @@ -9,7 +9,11 @@ import lombok.experimental.FieldDefaults; @FieldDefaults(makeFinal = true) +<<<<<<< HEAD class PacketScoreboardScoreWrapper extends PacketWrapper implements PacketScoreboardScore { +======= +class PacketScoreboardScoreWrapper extends PacketWrapper { +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git Field owner; Field objectiveName; diff --git a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/scoreboard/score/WrappedPacketOutScoreboardScore.java b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/scoreboard/score/WrappedPacketOutScoreboardScore.java index 4cae3973..31d8c595 100644 --- a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/scoreboard/score/WrappedPacketOutScoreboardScore.java +++ b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/scoreboard/score/WrappedPacketOutScoreboardScore.java @@ -18,6 +18,7 @@ public class WrappedPacketOutScoreboardScore extends PacketScoreboardScoreWrappe ); private WrappedPacketOutScoreboardScore(@NonNull Object handle) { +<<<<<<< HEAD super(handle, names); } @@ -63,5 +64,11 @@ public WrappedPacketOutScoreboardScore(@NonNull String entry, @NonNull Scoreboar }; } ).build()); +======= + super(handle, Set.of( + version.getPackageNms() + "PacketPlayOutScoreboardScore", + networkProtocolGame + "PacketPlayOutScoreboardScore" + )); +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git } } diff --git a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/scoreboard/team/PacketScoreboardTeamWrapper.java b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/scoreboard/team/PacketScoreboardTeamWrapper.java index eb984f51..e66fc9a9 100644 --- a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/scoreboard/team/PacketScoreboardTeamWrapper.java +++ b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/scoreboard/team/PacketScoreboardTeamWrapper.java @@ -10,7 +10,11 @@ import lombok.experimental.FieldDefaults; @FieldDefaults(makeFinal = true) +<<<<<<< HEAD class PacketScoreboardTeamWrapper extends PacketWrapper implements PacketScoreboardTeam { +======= +class PacketScoreboardTeamWrapper extends PacketWrapper { +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git Field name; Field players; diff --git a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/scoreboard/team/WrappedPacketOutScoreboardTeam.java b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/scoreboard/team/WrappedPacketOutScoreboardTeam.java index eb417302..60769f0e 100644 --- a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/scoreboard/team/WrappedPacketOutScoreboardTeam.java +++ b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/scoreboard/team/WrappedPacketOutScoreboardTeam.java @@ -30,6 +30,7 @@ public enum Mode { } private WrappedPacketOutScoreboardTeam(@NonNull Object handle) { +<<<<<<< HEAD super(handle, names); } @@ -43,5 +44,11 @@ public WrappedPacketOutScoreboardTeam(@NonNull ScoreboardTeam team, @NonNull Mod public WrappedPacketOutScoreboardTeam(@NonNull Mode mode, String playerName) { this(new WrappedScoreboardTeam(playerName), mode, playerName); +======= + super(handle, Set.of( + version.getPackageNms() + "PacketPlayOutScoreboardTeam", + networkProtocolGame + "PacketPlayOutScoreboardTeam" + )); +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git } } diff --git a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/set/creativeslot/PacketSetCreativeSlotWrapper.java b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/set/creativeslot/PacketSetCreativeSlotWrapper.java index d41dbf5e..32a0f959 100644 --- a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/set/creativeslot/PacketSetCreativeSlotWrapper.java +++ b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/set/creativeslot/PacketSetCreativeSlotWrapper.java @@ -11,7 +11,11 @@ import lombok.experimental.FieldDefaults; @FieldDefaults(makeFinal = true) +<<<<<<< HEAD class PacketSetCreativeSlotWrapper extends PacketWrapper implements PacketSetCreativeSlot { +======= +class PacketSetCreativeSlotWrapper extends PacketWrapper { +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git Field itemStack; @@ -29,8 +33,16 @@ public ItemStack getItemStack() { return SpigotWrapper.wrap(getFieldValue(itemStack)); } +<<<<<<< HEAD @Override public void setItemStack(ItemStack itemStack) { setField(this.itemStack, itemStack.getHandle()); +======= + /** + * @param itemStack ItemStack + */ + public void setItemStack(Object itemStack) { + setField(this.itemStack, itemStack); +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git } } diff --git a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/set/creativeslot/WrappedPacketInSetCreativeSlot.java b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/set/creativeslot/WrappedPacketInSetCreativeSlot.java index 60712ec5..740733f5 100644 --- a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/set/creativeslot/WrappedPacketInSetCreativeSlot.java +++ b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/set/creativeslot/WrappedPacketInSetCreativeSlot.java @@ -16,6 +16,7 @@ public class WrappedPacketInSetCreativeSlot extends PacketSetCreativeSlotWrapper ); private WrappedPacketInSetCreativeSlot(@NonNull Object handle) { +<<<<<<< HEAD super(handle, names); } @@ -32,5 +33,11 @@ public WrappedPacketInSetCreativeSlot(int slot, @NonNull ItemStack stack) { stack.getHandle() ) ).build()); +======= + super(handle, Set.of( + version.getPackageNms() + "PacketPlayInSetCreativeSlot", + networkProtocolGame + "PacketPlayInSetCreativeSlot" + )); +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git } } diff --git a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/set/slot/PacketSetSlotWrapper.java b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/set/slot/PacketSetSlotWrapper.java index 22a3978e..bbd010f5 100644 --- a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/set/slot/PacketSetSlotWrapper.java +++ b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/set/slot/PacketSetSlotWrapper.java @@ -11,7 +11,11 @@ import lombok.experimental.FieldDefaults; @FieldDefaults(makeFinal = true) +<<<<<<< HEAD class PacketSetSlotWrapper extends PacketWrapper implements PacketSetSlot { +======= +class PacketSetSlotWrapper extends PacketWrapper { +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git Field containerId; Field slot; @@ -59,8 +63,16 @@ public ItemStack getItemStack() { return SpigotWrapper.wrap(getFieldValue(itemStack)); } +<<<<<<< HEAD @Override public void setItemStack(ItemStack itemStack) { setField(this.itemStack, itemStack.getHandle()); +======= + /** + * @param itemStack ItemStack + */ + public void setItemStack(Object itemStack) { + setField(this.itemStack, itemStack); +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git } } diff --git a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/settings/PacketSettingsWrapper.java b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/settings/PacketSettingsWrapper.java index 4e2ddeeb..479738f8 100644 --- a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/settings/PacketSettingsWrapper.java +++ b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/settings/PacketSettingsWrapper.java @@ -6,7 +6,11 @@ import lombok.NonNull; +<<<<<<< HEAD class PacketSettingsWrapper extends PacketWrapper implements PacketSettings { +======= +class PacketSettingsWrapper extends PacketWrapper { +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git PacketSettingsWrapper(@NonNull Object handle, @NonNull Set names) { super(handle, names); diff --git a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/spawn/entity/PacketSpawnEntityWrapper.java b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/spawn/entity/PacketSpawnEntityWrapper.java index 39cc717f..e7253868 100644 --- a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/spawn/entity/PacketSpawnEntityWrapper.java +++ b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/spawn/entity/PacketSpawnEntityWrapper.java @@ -9,7 +9,11 @@ import lombok.experimental.FieldDefaults; @FieldDefaults(makeFinal = true) +<<<<<<< HEAD class PacketSpawnEntityWrapper extends PacketWrapper implements PacketSpawnEntity { +======= +class PacketSpawnEntityWrapper extends PacketWrapper { +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git Field id; diff --git a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/spawn/entity/WrappedPacketOutSpawnEntity.java b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/spawn/entity/WrappedPacketOutSpawnEntity.java index 226a61ca..8a0de5e7 100644 --- a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/spawn/entity/WrappedPacketOutSpawnEntity.java +++ b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/spawn/entity/WrappedPacketOutSpawnEntity.java @@ -21,12 +21,19 @@ public class WrappedPacketOutSpawnEntity extends PacketSpawnEntityWrapper { Field data; private WrappedPacketOutSpawnEntity(@NonNull Object handle) { +<<<<<<< HEAD super(handle, names); data = getFirstField( "data", "k" ); +======= + super(handle, Set.of( + version.getPackageNms() + "PacketPlayOutSpawnEntity", + networkProtocolGame + "PacketPlayOutSpawnEntity" + )); +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git } // TODO: support 1.21+ diff --git a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/spawn/position/PacketSpawnPositionWrapper.java b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/spawn/position/PacketSpawnPositionWrapper.java index ad03878a..ff77ff7e 100644 --- a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/spawn/position/PacketSpawnPositionWrapper.java +++ b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/spawn/position/PacketSpawnPositionWrapper.java @@ -6,7 +6,11 @@ import lombok.NonNull; +<<<<<<< HEAD class PacketSpawnPositionWrapper extends PacketWrapper implements PacketSpawnPosition { +======= +class PacketSpawnPositionWrapper extends PacketWrapper { +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git PacketSpawnPositionWrapper(@NonNull Object handle, @NonNull Set names) { super(handle, names); diff --git a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/spectate/PacketSpectateWrapper.java b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/spectate/PacketSpectateWrapper.java index 0570c3dc..783e55c0 100644 --- a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/spectate/PacketSpectateWrapper.java +++ b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/spectate/PacketSpectateWrapper.java @@ -10,7 +10,11 @@ import lombok.experimental.FieldDefaults; @FieldDefaults(makeFinal = true) +<<<<<<< HEAD class PacketSpectateWrapper extends PacketWrapper implements PacketSpectate { +======= +class PacketSpectateWrapper extends PacketWrapper { +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git Field uuid; diff --git a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/spectate/WrappedPacketInSpectate.java b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/spectate/WrappedPacketInSpectate.java index 815c41a8..726eccb9 100644 --- a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/spectate/WrappedPacketInSpectate.java +++ b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/spectate/WrappedPacketInSpectate.java @@ -16,6 +16,7 @@ public class WrappedPacketInSpectate extends PacketSpectateWrapper { ); private WrappedPacketInSpectate(@NonNull Object handle) { +<<<<<<< HEAD super(handle, names); } @@ -28,5 +29,11 @@ public WrappedPacketInSpectate(@NonNull UUID targetUuid) { targetUuid ) ).build()); +======= + super(handle, Set.of( + version.getPackageNms() + "PacketPlayInSpectate", + networkProtocolGame + "PacketPlayInSpectate" + )); +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git } } diff --git a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/statistic/PacketStatisticWrapper.java b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/statistic/PacketStatisticWrapper.java index 32e1792b..8d3b31d4 100644 --- a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/statistic/PacketStatisticWrapper.java +++ b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/statistic/PacketStatisticWrapper.java @@ -6,7 +6,11 @@ import lombok.NonNull; +<<<<<<< HEAD class PacketStatisticWrapper extends PacketWrapper implements PacketStatistic { +======= +class PacketStatisticWrapper extends PacketWrapper { +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git PacketStatisticWrapper(@NonNull Object handle, @NonNull Set names) { super(handle, names); diff --git a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/steervehicle/PacketSteerVehicleWrapper.java b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/steervehicle/PacketSteerVehicleWrapper.java index 42c88bc3..4072b744 100644 --- a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/steervehicle/PacketSteerVehicleWrapper.java +++ b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/steervehicle/PacketSteerVehicleWrapper.java @@ -9,7 +9,11 @@ import lombok.experimental.FieldDefaults; @FieldDefaults(makeFinal = true) +<<<<<<< HEAD class PacketSteerVehicleWrapper extends PacketWrapper implements PacketSteerVehicle { +======= +class PacketSteerVehicleWrapper extends PacketWrapper { +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git Field sideways; Field forward; @@ -36,6 +40,7 @@ class PacketSteerVehicleWrapper extends PacketWrapper implements PacketSteerVehi ); } +<<<<<<< HEAD @Override public float getSideways() { return getFieldValue(sideways); @@ -72,6 +77,36 @@ public boolean isSneaking() { } @Override +======= + public float getSideways() { + return getFieldValue(sideways); + } + + public void setSideways(float sideways) { + setField(this.sideways, sideways); + } + + public float getForward() { + return getFieldValue(forward); + } + + public void setForward(float forward) { + setField(this.forward, forward); + } + + public boolean isJumping() { + return getFieldValue(jumping); + } + + public void setJumping(boolean jumping) { + setField(this.jumping, jumping); + } + + public boolean isSneaking() { + return getFieldValue(sneaking); + } + +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git public void setSneaking(boolean sneaking) { setField(this.sneaking, sneaking); } diff --git a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/tabcomplete/PacketTabCompleteWrapper.java b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/tabcomplete/PacketTabCompleteWrapper.java index 86f9f252..f25341c2 100644 --- a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/tabcomplete/PacketTabCompleteWrapper.java +++ b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/tabcomplete/PacketTabCompleteWrapper.java @@ -6,7 +6,11 @@ import lombok.NonNull; +<<<<<<< HEAD class PacketTabCompleteWrapper extends PacketWrapper implements PacketTabComplete { +======= +class PacketTabCompleteWrapper extends PacketWrapper { +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git PacketTabCompleteWrapper(@NonNull Object handle, @NonNull Set names) { super(handle, names); diff --git a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/tileentitydata/PacketTileEntityDataWrapper.java b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/tileentitydata/PacketTileEntityDataWrapper.java index 2f19ae74..7c3b870a 100644 --- a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/tileentitydata/PacketTileEntityDataWrapper.java +++ b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/tileentitydata/PacketTileEntityDataWrapper.java @@ -12,7 +12,11 @@ import lombok.experimental.FieldDefaults; @FieldDefaults(makeFinal = true) +<<<<<<< HEAD class PacketTileEntityDataWrapper extends PacketWrapper implements PacketTileEntityData { +======= +class PacketTileEntityDataWrapper extends PacketWrapper { +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git Field pos; Field type; @@ -40,9 +44,17 @@ public BlockPosition getPos() { return SpigotWrapper.wrap(getFieldValue(pos)); } +<<<<<<< HEAD @Override public void setPos(BlockPosition pos) { setField(this.pos, pos.getHandle()); +======= + /** + * @param pos BlockPosition + */ + public void setPos(Object pos) { + setField(this.pos, pos); +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git } @Override @@ -60,8 +72,16 @@ public CompoundTag getTag() { return SpigotWrapper.wrap(getFieldValue(tag)); } +<<<<<<< HEAD @Override public void setTag(CompoundTag tag) { setField(this.tag, tag.getHandle()); +======= + /** + * @param tag NBTTagCompound + */ + public void setTag(Object tag) { + setField(this.tag, tag); +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git } } diff --git a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/title/PacketTitleWrapper.java b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/title/PacketTitleWrapper.java index b360b3f2..58b7e64f 100644 --- a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/title/PacketTitleWrapper.java +++ b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/title/PacketTitleWrapper.java @@ -6,7 +6,11 @@ import lombok.NonNull; +<<<<<<< HEAD class PacketTitleWrapper extends PacketWrapper implements PacketTitle { +======= +class PacketTitleWrapper extends PacketWrapper { +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git PacketTitleWrapper(@NonNull Object handle, @NonNull Set names) { super(handle, names); diff --git a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/title/WrappedPacketOutAnimationTitle.java b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/title/WrappedPacketOutAnimationTitle.java index 28d828ba..e6487dc5 100644 --- a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/title/WrappedPacketOutAnimationTitle.java +++ b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/title/WrappedPacketOutAnimationTitle.java @@ -22,7 +22,14 @@ public class WrappedPacketOutAnimationTitle extends PacketTitleWrapper { Field fadeOutTime; private WrappedPacketOutAnimationTitle(@NonNull Object handle) { +<<<<<<< HEAD super(handle, names); +======= + super(handle, Set.of( + version.getPackageNms() + "PacketPlayOutTitle", + networkProtocolGame + "ClientboundSetTitlesAnimationPacket" + )); +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git fadeInTime = getFirstField( "fadeInTime", diff --git a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/title/WrappedPacketOutSubtitleTitle.java b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/title/WrappedPacketOutSubtitleTitle.java index 660b7508..425ad70b 100644 --- a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/title/WrappedPacketOutSubtitleTitle.java +++ b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/title/WrappedPacketOutSubtitleTitle.java @@ -21,7 +21,14 @@ public class WrappedPacketOutSubtitleTitle extends PacketTitleWrapper { Field text; private WrappedPacketOutSubtitleTitle(@NonNull Object handle) { +<<<<<<< HEAD super(handle, names); +======= + super(handle, Set.of( + version.getPackageNms() + "PacketPlayOutTitle", + networkProtocolGame + "ClientboundSetSubtitleTextPacket" + )); +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git text = getFirstField( "text", @@ -37,7 +44,15 @@ public Component getText() { return SpigotWrapper.wrap(getFieldValue(text)); } +<<<<<<< HEAD public void setText(Component text) { setField(this.text, text.getHandle()); +======= + /** + * @param text IChatBaseComponent + */ + public void setText(Object text) { + setField(this.text, text); +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git } } diff --git a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/title/WrappedPacketOutTitleTitle.java b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/title/WrappedPacketOutTitleTitle.java index d722293f..9378145c 100644 --- a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/title/WrappedPacketOutTitleTitle.java +++ b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/title/WrappedPacketOutTitleTitle.java @@ -21,7 +21,14 @@ public class WrappedPacketOutTitleTitle extends PacketTitleWrapper { Field text; private WrappedPacketOutTitleTitle(@NonNull Object handle) { +<<<<<<< HEAD super(handle, names); +======= + super(handle, Set.of( + version.getPackageNms() + "PacketPlayOutTitle", + networkProtocolGame + "ClientboundSetTitleTextPacket" + )); +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git text = getFirstField( "text", @@ -37,7 +44,15 @@ public Component getText() { return SpigotWrapper.wrap(getFieldValue(text)); } +<<<<<<< HEAD public void setText(Component text) { setField(this.text, text.getHandle()); +======= + /** + * @param text IChatBaseComponent + */ + public void setText(Object text) { + setField(this.text, text); +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git } } diff --git a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/update/attributes/PacketUpdateAttributesWrapper.java b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/update/attributes/PacketUpdateAttributesWrapper.java index d6b6aebf..a2d406c2 100644 --- a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/update/attributes/PacketUpdateAttributesWrapper.java +++ b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/update/attributes/PacketUpdateAttributesWrapper.java @@ -9,7 +9,11 @@ import lombok.experimental.FieldDefaults; @FieldDefaults(makeFinal = true) +<<<<<<< HEAD class PacketUpdateAttributesWrapper extends PacketWrapper implements PacketUpdateAttributes { +======= +class PacketUpdateAttributesWrapper extends PacketWrapper { +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git Field entityId; diff --git a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/update/health/PacketUpdateHealthWrapper.java b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/update/health/PacketUpdateHealthWrapper.java index ee51f1cd..e325c5f8 100644 --- a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/update/health/PacketUpdateHealthWrapper.java +++ b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/update/health/PacketUpdateHealthWrapper.java @@ -9,7 +9,11 @@ import lombok.experimental.FieldDefaults; @FieldDefaults(makeFinal = true) +<<<<<<< HEAD class PacketUpdateHealthWrapper extends PacketWrapper implements PacketUpdateHealth { +======= +class PacketUpdateHealthWrapper extends PacketWrapper { +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git Field health; Field food; diff --git a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/update/health/WrappedPacketOutUpdateHealth.java b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/update/health/WrappedPacketOutUpdateHealth.java index ed9a3c01..1bf8a3f9 100644 --- a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/update/health/WrappedPacketOutUpdateHealth.java +++ b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/update/health/WrappedPacketOutUpdateHealth.java @@ -15,6 +15,7 @@ public class WrappedPacketOutUpdateHealth extends PacketUpdateHealthWrapper { ); private WrappedPacketOutUpdateHealth(@NonNull Object handle) { +<<<<<<< HEAD super(handle, names); } @@ -35,5 +36,11 @@ public WrappedPacketOutUpdateHealth(float health, int food, float saturation) { saturation ) ).build()); +======= + super(handle, Set.of( + version.getPackageNms() + "PacketPlayOutUpdateHealth", + networkProtocolGame + "PacketPlayOutUpdateHealth" + )); +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git } } diff --git a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/update/sign/PacketUpdateSignWrapper.java b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/update/sign/PacketUpdateSignWrapper.java index c863e222..3652709d 100644 --- a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/update/sign/PacketUpdateSignWrapper.java +++ b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/update/sign/PacketUpdateSignWrapper.java @@ -11,7 +11,11 @@ import lombok.experimental.FieldDefaults; @FieldDefaults(makeFinal = true) +<<<<<<< HEAD class PacketUpdateSignWrapper extends PacketWrapper implements PacketUpdateSign { +======= +class PacketUpdateSignWrapper extends PacketWrapper { +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git Field pos; @@ -29,8 +33,16 @@ public BlockPosition getPos() { return SpigotWrapper.wrap(getFieldValue(pos)); } +<<<<<<< HEAD @Override public void setPos(BlockPosition pos) { setField(this.pos, pos.getHandle()); +======= + /** + * @param pos BlockPosition + */ + public void setPos(Object pos) { + setField(this.pos, pos); +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git } } diff --git a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/update/time/PacketUpdateTimeWrapper.java b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/update/time/PacketUpdateTimeWrapper.java index 25ffefeb..412c54d7 100644 --- a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/update/time/PacketUpdateTimeWrapper.java +++ b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/update/time/PacketUpdateTimeWrapper.java @@ -9,7 +9,11 @@ import lombok.experimental.FieldDefaults; @FieldDefaults(makeFinal = true) +<<<<<<< HEAD class PacketUpdateTimeWrapper extends PacketWrapper implements PacketUpdateTime { +======= +class PacketUpdateTimeWrapper extends PacketWrapper { +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git Field gameTime; Field dayTime; diff --git a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/update/time/WrappedPacketOutUpdateTime.java b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/update/time/WrappedPacketOutUpdateTime.java index d889f83e..0eb31b3a 100644 --- a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/update/time/WrappedPacketOutUpdateTime.java +++ b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/update/time/WrappedPacketOutUpdateTime.java @@ -15,6 +15,7 @@ public class WrappedPacketOutUpdateTime extends PacketUpdateTimeWrapper { ); private WrappedPacketOutUpdateTime(@NonNull Object handle) { +<<<<<<< HEAD super(handle, names); } @@ -35,5 +36,11 @@ public WrappedPacketOutUpdateTime(long time, long timeOfDay, boolean tickDayTime tickDayTime ) ).build()); +======= + super(handle, Set.of( + version.getPackageNms() + "PacketPlayOutUpdateTime", + networkProtocolGame + "PacketPlayOutUpdateTime" + )); +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git } } diff --git a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/use/PacketUseEntityWrapper.java b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/use/PacketUseEntityWrapper.java index af376a6a..0898e397 100644 --- a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/use/PacketUseEntityWrapper.java +++ b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/use/PacketUseEntityWrapper.java @@ -4,13 +4,21 @@ import java.util.Set; import com.falchus.lib.minecraft.spigot.packets.wrapper.PacketWrapper; +<<<<<<< HEAD +======= +import com.falchus.lib.minecraft.spigot.utils.ServerUtils; +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git import lombok.NonNull; import lombok.SneakyThrows; import lombok.experimental.FieldDefaults; @FieldDefaults(makeFinal = true) +<<<<<<< HEAD class PacketUseEntityWrapper extends PacketWrapper implements PacketUseEntity { +======= +class PacketUseEntityWrapper extends PacketWrapper { +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git Field entityId; Field action; @@ -38,12 +46,30 @@ public void setEntityId(int entityId) { @SneakyThrows @Override public Action getAction() { +<<<<<<< HEAD return Action.valueOf(getFieldValue(action, Enum.class).name()); +======= + String name; + if (ServerUtils.getVersion().isBefore(Version.v1_17)) { + name = ((Enum) getFieldValue(action)).name(); + } else { + name = getFieldValue(action, Enum.class).name(); + } + return Action.valueOf(name); +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git } +<<<<<<< HEAD @SuppressWarnings({ "unchecked", "rawtypes" }) @Override public void setAction(Action action) { setField(this.action, Enum.valueOf((Class) this.action.getType(), action.name())); +======= + /** + * @param action PacketPlayInUseEntity$EnumEntityUseAction + */ + public void setAction(Object action) { + setField(this.action, action); +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git } } diff --git a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/window/PacketWindowClickWrapper.java b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/window/PacketWindowClickWrapper.java index f4348084..23358719 100644 --- a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/window/PacketWindowClickWrapper.java +++ b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/window/PacketWindowClickWrapper.java @@ -7,7 +7,11 @@ import lombok.experimental.FieldDefaults; @FieldDefaults(makeFinal = true) +<<<<<<< HEAD class PacketWindowClickWrapper extends PacketWindowWrapper implements PacketWindowClick { +======= +class PacketWindowClickWrapper extends PacketUpdateWindow { +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git Field slotNum; Field buttonNum; diff --git a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/window/WrappedPacketOutWindowData.java b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/window/WrappedPacketOutWindowData.java index a0dec3eb..d448dd23 100644 --- a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/window/WrappedPacketOutWindowData.java +++ b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/window/WrappedPacketOutWindowData.java @@ -15,6 +15,7 @@ public class WrappedPacketOutWindowData extends PacketWindowDataWrapper { ); private WrappedPacketOutWindowData(@NonNull Object handle) { +<<<<<<< HEAD super(handle, names); } @@ -35,5 +36,11 @@ public WrappedPacketOutWindowData(int syncId, int propertyId, int value) { value ) ).build()); +======= + super(handle, Set.of( + version.getPackageNms() + "PacketPlayOutWindowData", + networkProtocolGame + "PacketPlayOutWindowData" + )); +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git } } diff --git a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/world/event/PacketWorldEventWrapper.java b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/world/event/PacketWorldEventWrapper.java index 9ba88edf..2a97f0c3 100644 --- a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/world/event/PacketWorldEventWrapper.java +++ b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/world/event/PacketWorldEventWrapper.java @@ -12,7 +12,11 @@ // TODO: add PacketPlayOutWorldParticles wrapper @FieldDefaults(makeFinal = true) +<<<<<<< HEAD class PacketWorldEventWrapper extends PacketWrapper implements PacketWorldEvent { +======= +class PacketWorldEventWrapper extends PacketWrapper { +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git Field type; Field pos; @@ -55,9 +59,17 @@ public BlockPosition getPos() { return SpigotWrapper.wrap(getFieldValue(type)); } +<<<<<<< HEAD @Override public void setPos(BlockPosition pos) { setField(this.pos, pos.getHandle()); +======= + /** + * @param pos BlockPosition + */ + public void setPos(Object pos) { + setField(this.pos, pos); +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git } @Override diff --git a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/world/event/WrappedPacketOutWorldEvent.java b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/world/event/WrappedPacketOutWorldEvent.java index 482aa899..30135597 100644 --- a/src/com/falchus/lib/minecraft/spigot/packets/wrapper/world/event/WrappedPacketOutWorldEvent.java +++ b/src/com/falchus/lib/minecraft/spigot/packets/wrapper/world/event/WrappedPacketOutWorldEvent.java @@ -16,6 +16,7 @@ public class WrappedPacketOutWorldEvent extends PacketWorldEventWrapper { ); private WrappedPacketOutWorldEvent(@NonNull Object handle) { +<<<<<<< HEAD super(handle, names); } @@ -40,5 +41,11 @@ public WrappedPacketOutWorldEvent(int eventId, @NonNull BlockPosition pos, int d global ) ).build()); +======= + super(handle, Set.of( + version.getPackageNms() + "PacketPlayOutWorldEvent", + networkProtocolGame + "PacketPlayOutWorldEvent" + )); +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git } } diff --git a/src/com/falchus/lib/minecraft/spigot/task/SpigotTask.java b/src/com/falchus/lib/minecraft/spigot/task/SpigotTask.java index 27669949..b092fd57 100644 --- a/src/com/falchus/lib/minecraft/spigot/task/SpigotTask.java +++ b/src/com/falchus/lib/minecraft/spigot/task/SpigotTask.java @@ -2,6 +2,7 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; +<<<<<<< HEAD import java.util.concurrent.TimeUnit; import org.bukkit.Bukkit; @@ -88,6 +89,42 @@ public T runLaterAsync(long delay, @NonNull TimeUnit unit) { run(); end(); }, toTicks(delay, unit))); +======= + +import org.bukkit.Bukkit; +import org.bukkit.scheduler.BukkitTask; + +import com.falchus.lib.minecraft.spigot.FalchusLibMinecraftSpigot; +import com.falchus.lib.task.Task; + +import lombok.NonNull; + +public class SpigotTask extends Task { + + private final FalchusLibMinecraftSpigot plugin = FalchusLibMinecraftSpigot.getInstance(); + + private static final Map tasks = new ConcurrentHashMap<>(); + + @SuppressWarnings("unchecked") + @Override + protected final T execute(@NonNull Runnable runnable) { + if (Bukkit.isPrimaryThread()) { + super.execute(runnable); + } else { + tasks.put(getId(), Bukkit.getScheduler().runTask(plugin, runnable)); + } + return (T) this; + } + + @SuppressWarnings("unchecked") + @Override + protected final T executeAsync(@NonNull Runnable runnable) { + if (!Bukkit.isPrimaryThread()) { + super.executeAsync(runnable); + } else { + tasks.put(getId(), Bukkit.getScheduler().runTaskAsynchronously(plugin, runnable)); + } +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git return (T) this; } diff --git a/src/com/falchus/lib/minecraft/spigot/utils/EntityUtils.java b/src/com/falchus/lib/minecraft/spigot/utils/EntityUtils.java index 695b4f92..3134a2b2 100644 --- a/src/com/falchus/lib/minecraft/spigot/utils/EntityUtils.java +++ b/src/com/falchus/lib/minecraft/spigot/utils/EntityUtils.java @@ -3,13 +3,21 @@ import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.World; +<<<<<<< HEAD +======= +import org.bukkit.block.Block; +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git import org.bukkit.entity.Damageable; import org.bukkit.entity.Entity; import org.bukkit.entity.LivingEntity; import com.falchus.lib.minecraft.spigot.utils.version.VersionProvider; +<<<<<<< HEAD import com.falchus.lib.minecraft.spigot.wrapper.world.AxisAlignedBB; import com.falchus.lib.minecraft.spigot.wrapper.world.entity.WrappedEntity; +======= +import com.falchus.lib.minecraft.spigot.wrapper.world.WrappedAxisAlignedBB; +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git import lombok.NonNull; import lombok.experimental.UtilityClass; @@ -41,10 +49,31 @@ public static Entity getEntityById(@NonNull World world, int id) { return null; } +<<<<<<< HEAD public static AxisAlignedBB getBoundingBox(@NonNull Entity entity) { return new WrappedEntity(entity).getBoundingBox(); +======= + /** + * @return {@link Entity} + */ + public static Entity getEntityById(@NonNull World world, int id) { + for (Entity entity : world.getEntities()) { + if (entity.getEntityId() == id) { + return entity; + } + } + return null; } + /** + * @return {@link WrappedAxisAlignedBB} + */ + public static WrappedAxisAlignedBB getBoundingBox(@NonNull Entity entity) { + return VersionProvider.get().getBoundingBox(entity); +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git + } + +<<<<<<< HEAD public static AxisAlignedBB modifyBoundingBox(@NonNull AxisAlignedBB axisAlignedBB, double minX, double minY, double minZ, double maxX, double maxY, double maxZ) { axisAlignedBB.setMinX(axisAlignedBB.getMinX() + minX); axisAlignedBB.setMinY(axisAlignedBB.getMinY() + minY); @@ -53,6 +82,13 @@ public static AxisAlignedBB modifyBoundingBox(@NonNull AxisAlignedBB axisAligned axisAlignedBB.setMaxY(axisAlignedBB.getMaxY() + maxY); axisAlignedBB.setMaxZ(axisAlignedBB.getMaxZ() + maxZ); return axisAlignedBB; +======= + /** + * @return {@link WrappedAxisAlignedBB} + */ + public static WrappedAxisAlignedBB modifyBoundingBox(@NonNull WrappedAxisAlignedBB axisAlignedBB, double minX, double minY, double minZ, double maxX, double maxY, double maxZ) { + return VersionProvider.get().modifyBoundingBox(axisAlignedBB, minX, minY, minZ, maxX, maxY, maxZ); +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git } /** @@ -73,6 +109,7 @@ public static boolean isOnGround(@NonNull Entity entity) { * @return {@code true} if in liquid, {@code false} otherwise. */ public static boolean isInLiquid(@NonNull Entity entity) { +<<<<<<< HEAD AxisAlignedBB axisAlignedBB = modifyBoundingBox(getBoundingBox(entity), 0, -0.5, 0, 0, 0, 0); return WorldUtils.getBlocksInBox(entity.getWorld(), axisAlignedBB).stream() .anyMatch(BlockUtils::isLiquid); @@ -107,6 +144,81 @@ public static boolean isOnIce(@NonNull Entity entity) { AxisAlignedBB axisAlignedBB = modifyBoundingBox(getBoundingBox(entity), 0, -0.5, 0, 0, 0, 0); return WorldUtils.getBlocksInBox(entity.getWorld(), axisAlignedBB).stream() .anyMatch(block -> block.getType().name().endsWith("ICE")); +======= + WrappedAxisAlignedBB axisAlignedBB = modifyBoundingBox(getBoundingBox(entity), 0, -0.5, 0, 0, 0, 0); + for (double x = axisAlignedBB.getMinX(); x < axisAlignedBB.getMaxX(); x++) { + for (double y = axisAlignedBB.getMinY(); y < axisAlignedBB.getMaxY(); y++) { + for (double z = axisAlignedBB.getMinZ(); z < axisAlignedBB.getMaxZ(); z++) { + Block block = new Location(entity.getWorld(), x, y, z).getBlock(); + + if (BlockUtils.isLiquid(block)) { + return true; + } + } + } + } + return false; + } + + /** + * @return {@code true} if on slime, {@code false} otherwise. + */ + public static boolean isOnSlime(@NonNull Entity entity) { + WrappedAxisAlignedBB axisAlignedBB = modifyBoundingBox(getBoundingBox(entity), 0, -0.5, 0, 0, 0, 0); + for (double x = axisAlignedBB.getMinX(); x < axisAlignedBB.getMaxX(); x++) { + for (double y = axisAlignedBB.getMinY(); y < axisAlignedBB.getMaxY(); y++) { + for (double z = axisAlignedBB.getMinZ(); z < axisAlignedBB.getMaxZ(); z++) { + Block block = new Location(entity.getWorld(), x, y, z).getBlock(); + + if (block.getType() == Material.SLIME_BLOCK) { + return true; + } + } + } + } + return false; + } + + /** + * @return {@code true} if on stairs, {@code false} otherwise. + */ + public static boolean isOnStairs(@NonNull Entity entity) { + WrappedAxisAlignedBB axisAlignedBB = modifyBoundingBox(getBoundingBox(entity), 0, -0.5, 0, 0, 0, 0); + for (double x = axisAlignedBB.getMinX(); x < axisAlignedBB.getMaxX(); x++) { + for (double y = axisAlignedBB.getMinY(); y < axisAlignedBB.getMaxY(); y++) { + for (double z = axisAlignedBB.getMinZ(); z < axisAlignedBB.getMaxZ(); z++) { + Block block = new Location(entity.getWorld(), x, y, z).getBlock(); + + if (BlockUtils.isStair(block) || + BlockUtils.isSlab(block) || + block.getType() == Material.SKULL || + block.getType() == Material.CAKE_BLOCK) { + return true; + } + } + } + } + return false; + } + + /** + * @return {@code true} if on ice, {@code false} otherwise. + */ + public static boolean isOnIce(@NonNull Entity entity) { + WrappedAxisAlignedBB axisAlignedBB = modifyBoundingBox(getBoundingBox(entity), 0, -0.5, 0, 0, 0, 0); + for (double x = axisAlignedBB.getMinX(); x < axisAlignedBB.getMaxX(); x++) { + for (double y = axisAlignedBB.getMinY(); y < axisAlignedBB.getMaxY(); y++) { + for (double z = axisAlignedBB.getMinZ(); z < axisAlignedBB.getMaxZ(); z++) { + Block block = new Location(entity.getWorld(), x, y, z).getBlock(); + + if (block.getType().name().endsWith("ICE")) { + return true; + } + } + } + } + return false; +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git } /** @@ -122,9 +234,25 @@ public static boolean isOnClimbable(@NonNull Entity entity) { * @return {@code true} if under block, {@code false} otherwise. */ public static boolean isUnderBlock(@NonNull Entity entity) { +<<<<<<< HEAD AxisAlignedBB axisAlignedBB = modifyBoundingBox(getBoundingBox(entity), 0, -0.5, 0, 0, 0, 0); return WorldUtils.getBlocksInBox(entity.getWorld(), axisAlignedBB).stream() .anyMatch(block -> block.getType().isSolid()); +======= + WrappedAxisAlignedBB axisAlignedBB = modifyBoundingBox(getBoundingBox(entity), 0, -0.5, 0, 0, 0, 0); + for (double x = axisAlignedBB.getMinX(); x < axisAlignedBB.getMaxX(); x++) { + for (double y = axisAlignedBB.getMinY(); y < axisAlignedBB.getMaxY(); y++) { + for (double z = axisAlignedBB.getMinZ(); z < axisAlignedBB.getMaxZ(); z++) { + Block block = new Location(entity.getWorld(), x, y, z).getBlock(); + + if (block.getType().isSolid()) { + return true; + } + } + } + } + return false; +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git } /** diff --git a/src/com/falchus/lib/minecraft/spigot/utils/WorldUtils.java b/src/com/falchus/lib/minecraft/spigot/utils/WorldUtils.java index a2973034..f1a27744 100644 --- a/src/com/falchus/lib/minecraft/spigot/utils/WorldUtils.java +++ b/src/com/falchus/lib/minecraft/spigot/utils/WorldUtils.java @@ -1,6 +1,9 @@ package com.falchus.lib.minecraft.spigot.utils; +<<<<<<< HEAD import java.util.ArrayList; +======= +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git import java.util.List; import org.bukkit.Material; @@ -11,7 +14,11 @@ import com.falchus.lib.minecraft.spigot.enums.GameRule; import com.falchus.lib.minecraft.spigot.enums.Version; import com.falchus.lib.minecraft.spigot.utils.version.VersionProvider; +<<<<<<< HEAD import com.falchus.lib.minecraft.spigot.wrapper.world.AxisAlignedBB; +======= +import com.falchus.lib.minecraft.spigot.wrapper.world.WrappedAxisAlignedBB; +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git import lombok.NonNull; import lombok.experimental.UtilityClass; @@ -64,7 +71,11 @@ public static Object getWorldServer(@NonNull World world) { /** * @return {@link List} */ +<<<<<<< HEAD public static List getCollidingBlocks(@NonNull World world, @NonNull AxisAlignedBB axisAlignedBB) { +======= + public static List getCollidingBlocks(@NonNull World world, @NonNull WrappedAxisAlignedBB axisAlignedBB) { +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git return VersionProvider.get().getCollidingBlocks(world, axisAlignedBB); } diff --git a/src/com/falchus/lib/minecraft/spigot/utils/builder/EntityPlayerBuilder.java b/src/com/falchus/lib/minecraft/spigot/utils/builder/EntityPlayerBuilder.java index 031d50bd..92a5aedd 100644 --- a/src/com/falchus/lib/minecraft/spigot/utils/builder/EntityPlayerBuilder.java +++ b/src/com/falchus/lib/minecraft/spigot/utils/builder/EntityPlayerBuilder.java @@ -15,8 +15,11 @@ import com.falchus.lib.minecraft.spigot.utils.ServerUtils; import com.falchus.lib.minecraft.spigot.utils.WorldUtils; import com.falchus.lib.minecraft.spigot.utils.version.VersionProvider; +<<<<<<< HEAD import com.falchus.lib.minecraft.spigot.wrapper.SpigotWrapper; import com.falchus.lib.minecraft.spigot.wrapper.world.entity.Entity; +======= +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git import com.falchus.lib.utils.builder.ClassInstanceBuilder; import com.mojang.authlib.GameProfile; import com.mojang.authlib.properties.Property; diff --git a/src/com/falchus/lib/minecraft/spigot/utils/version/IVersionAdapter.java b/src/com/falchus/lib/minecraft/spigot/utils/version/IVersionAdapter.java index 55609f85..7958237f 100644 --- a/src/com/falchus/lib/minecraft/spigot/utils/version/IVersionAdapter.java +++ b/src/com/falchus/lib/minecraft/spigot/utils/version/IVersionAdapter.java @@ -18,9 +18,13 @@ import com.falchus.lib.minecraft.spigot.enums.GameRule; import com.falchus.lib.minecraft.spigot.enums.Sound; +<<<<<<< HEAD import com.falchus.lib.minecraft.spigot.wrapper.network.chat.Component; import com.falchus.lib.minecraft.spigot.wrapper.world.AxisAlignedBB; import com.falchus.lib.minecraft.spigot.wrapper.world.scores.ScoreboardTeam; +======= +import com.falchus.lib.minecraft.spigot.wrapper.world.WrappedAxisAlignedBB; +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git import com.mojang.authlib.GameProfile; import lombok.NonNull; @@ -56,7 +60,24 @@ public interface IVersionAdapter { Object getEntity(@NonNull Entity entity); +<<<<<<< HEAD Object getEntityLiving(@NonNull LivingEntity entity); +======= + /** + * @return {@link Entity} + */ + Entity getBukkitEntity(@NonNull Object entity); + + /** + * @return {@link WrappedAxisAlignedBB} + */ + WrappedAxisAlignedBB getBoundingBox(@NonNull Entity entity); + + /** + * @return {@link WrappedAxisAlignedBB} + */ + WrappedAxisAlignedBB modifyBoundingBox(@NonNull WrappedAxisAlignedBB axisAlignedBB, double minX, double minY, double minZ, double maxX, double maxY, double maxZ); +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git /** * @return absorption from a {@link Damageable} entity. @@ -229,12 +250,20 @@ public interface IVersionAdapter { Object getWorld(@NonNull World world); /** +<<<<<<< HEAD * @return WorldServer from a {@link World} +======= + * @return {@link List} +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git */ +<<<<<<< HEAD Object getWorldServer(@NonNull World world); /** * @return {@link List} */ List getCollidingBlocks(@NonNull World world, @NonNull AxisAlignedBB axisAlignedBB); +======= + List getCollidingBlocks(@NonNull World world, @NonNull WrappedAxisAlignedBB axisAlignedBB); +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git } diff --git a/src/com/falchus/lib/minecraft/spigot/utils/version/VersionAdapter.java b/src/com/falchus/lib/minecraft/spigot/utils/version/VersionAdapter.java index 9415ad2b..5bceb278 100644 --- a/src/com/falchus/lib/minecraft/spigot/utils/version/VersionAdapter.java +++ b/src/com/falchus/lib/minecraft/spigot/utils/version/VersionAdapter.java @@ -37,6 +37,7 @@ import com.falchus.lib.minecraft.spigot.utils.SchedulerUtils; import com.falchus.lib.minecraft.spigot.utils.builder.GameProfileBuilder; import com.falchus.lib.minecraft.spigot.wrapper.SpigotWrapper; +<<<<<<< HEAD import com.falchus.lib.minecraft.spigot.wrapper.network.chat.Component; import com.falchus.lib.minecraft.spigot.wrapper.network.chat.WrappedComponent; import com.falchus.lib.minecraft.spigot.wrapper.network.syncher.DataWatcher; @@ -45,6 +46,9 @@ import com.falchus.lib.minecraft.spigot.wrapper.world.entity.WrappedEntity; import com.falchus.lib.minecraft.spigot.wrapper.world.scores.ScoreboardTeam; import com.falchus.lib.minecraft.spigot.wrapper.world.scores.WrappedScoreboardTeam; +======= +import com.falchus.lib.minecraft.spigot.wrapper.world.WrappedAxisAlignedBB; +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git import com.falchus.lib.utils.builder.ClassInstanceBuilder; import com.falchus.lib.utils.reflection.ReflectionUtils; import com.mojang.authlib.GameProfile; @@ -93,10 +97,20 @@ public class VersionAdapter implements IVersionAdapter { Class chatComponentText; Class craftEntity; +<<<<<<< HEAD Method craftEntity_getHandle; Class craftLivingEntity; Method craftLivingEntity_getHandle; +======= + Method entity_getHandle; + Method entity_getBukkitEntity; + Method entity_getBoundingBox; +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git Class axisAlignedBB; +<<<<<<< HEAD +======= + Method entity_setYawPitch; +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git Class craftItemStack; Class nmsItemStack; @@ -298,13 +312,30 @@ public VersionAdapter() { ); craftEntity = ReflectionUtils.getClass(packageObc + "entity.CraftEntity"); +<<<<<<< HEAD craftEntity_getHandle = ReflectionUtils.getMethod(craftEntity, "getHandle"); craftLivingEntity = ReflectionUtils.getClass(packageObc + "entity.CraftLivingEntity"); craftLivingEntity_getHandle = ReflectionUtils.getMethod(craftLivingEntity, "getHandle"); +======= + entity_getHandle = ReflectionUtils.getMethod(craftEntity, "getHandle"); + entity_getBukkitEntity = ReflectionUtils.getMethod(entity, "getBukkitEntity"); + entity_getBoundingBox = ReflectionUtils.getMethod(entity, "getBoundingBox"); +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git axisAlignedBB = ReflectionUtils.getFirstClass( packageNms + "AxisAlignedBB", packageNm + "world.phys.AxisAlignedBB" ); +<<<<<<< HEAD +======= + entity_setYawPitch = ReflectionUtils.getFirstMethod(entity, + List.of( + float.class, + float.class + ), + "setYawPitch", + "setRot" + ); +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git craftItemStack = ReflectionUtils.getClass(packageObc + "inventory.CraftItemStack"); nmsItemStack = ReflectionUtils.getFirstClass( @@ -497,7 +528,35 @@ public Object getEntity(@NonNull Entity entity) { @Override public Object getEntityLiving(@NonNull LivingEntity entity) { try { +<<<<<<< HEAD return craftLivingEntity_getHandle.invoke(entity); +======= + return (Entity) entity_getBukkitEntity.invoke(entity); + } catch (Exception e) { + throw new RuntimeException(e); + } + } + + @Override + public WrappedAxisAlignedBB getBoundingBox(@NonNull Entity entity) { + try { + return SpigotWrapper.wrap(entity_getBoundingBox.invoke(getEntity(entity))); + } catch (Exception e) { + throw new RuntimeException(e); + } + } + + @Override + public WrappedAxisAlignedBB modifyBoundingBox(@NonNull WrappedAxisAlignedBB axisAlignedBB, double minX, double minY, double minZ, double maxX, double maxY, double maxZ) { + try { + axisAlignedBB.setMinX(axisAlignedBB.getMinX() + minX); + axisAlignedBB.setMinY(axisAlignedBB.getMinY() + minY); + axisAlignedBB.setMinZ(axisAlignedBB.getMinZ() + minZ); + axisAlignedBB.setMaxX(axisAlignedBB.getMaxX() + maxX); + axisAlignedBB.setMaxY(axisAlignedBB.getMaxY() + maxY); + axisAlignedBB.setMaxZ(axisAlignedBB.getMaxZ() + maxZ); + return axisAlignedBB; +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git } catch (Exception e) { throw new RuntimeException(e); } @@ -1109,9 +1168,17 @@ public Object getWorldServer(@NonNull World world) { } @Override +<<<<<<< HEAD public List getCollidingBlocks(@NonNull World world, @NonNull AxisAlignedBB axisAlignedBB) { +======= + public List getCollidingBlocks(@NonNull World world, @NonNull WrappedAxisAlignedBB axisAlignedBB) { +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git try { +<<<<<<< HEAD List list = new ArrayList<>(); +======= + List list = new ArrayList<>(); +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git for (Object obj : (List) world_getCubes.invoke(getWorldServer(world), axisAlignedBB.getHandle() )) { diff --git a/src/com/falchus/lib/minecraft/spigot/wrapper/SpigotWrapper.java b/src/com/falchus/lib/minecraft/spigot/wrapper/SpigotWrapper.java index 34f7a8f1..394a9af9 100644 --- a/src/com/falchus/lib/minecraft/spigot/wrapper/SpigotWrapper.java +++ b/src/com/falchus/lib/minecraft/spigot/wrapper/SpigotWrapper.java @@ -8,6 +8,7 @@ import com.falchus.lib.minecraft.spigot.utils.version.IVersionAdapter; import com.falchus.lib.minecraft.spigot.utils.version.VersionProvider; import com.falchus.lib.minecraft.spigot.wrapper.core.baseblockposition.*; +<<<<<<< HEAD import com.falchus.lib.minecraft.spigot.wrapper.nbt.*; import com.falchus.lib.minecraft.spigot.wrapper.network.chat.*; import com.falchus.lib.minecraft.spigot.wrapper.network.protocol.status.WrappedServerPing; @@ -133,5 +134,77 @@ public static T wrap(Object obj) { current = current.getSuperclass(); } return (T) new SpigotWrapper(obj, Set.of(obj.getClass().getName())); +======= +import com.falchus.lib.minecraft.spigot.wrapper.world.*; +import com.falchus.lib.utils.builder.ClassInstanceBuilder; +import com.falchus.lib.utils.reflection.Dummy; +import com.falchus.lib.utils.wrapper.impl.FirstClassWrapper; + +import lombok.NonNull; + +public class SpigotWrapper extends FirstClassWrapper { + + protected static final IVersionAdapter version = VersionProvider.get(); + + protected static final String core = version.getPackageNm() + "core."; + + private static final String world = version.getPackageNm() + "world."; + protected static final String worldPhys = world + "phys."; + + private static final Map, Function> registry = new HashMap<>(); + + public SpigotWrapper(@NonNull Object handle, @NonNull Set names) { + super(handle, names); + } + + @SuppressWarnings("unchecked") + private static void register() { + if (!registry.isEmpty()) return; + Class[] wrappers = new Class[] { + WrappedBaseBlockPosition.class, + WrappedBlockPosition.class, + + WrappedAxisAlignedBB.class + }; + + for (Class wrapper : wrappers) { + SpigotWrapper dummy = (T) new ClassInstanceBuilder( + wrapper + ).withParams( + Map.of( + Object.class, + Dummy.instance + ) + ).build(); + for (Class clazz : dummy.getClasses()) { + registry.put(clazz, obj -> { + return (T) new ClassInstanceBuilder( + wrapper + ).withParams( + Map.of( + Object.class, + obj + ) + ).build(); + }); + } + } + } + + @SuppressWarnings("unchecked") + public static T wrap(Object packet) { + register(); + + Function wrapper = registry.get(packet.getClass()); + if (wrapper != null) { + return (T) wrapper.apply(packet); + } + for (Map.Entry, Function> entry : registry.entrySet()) { + if (entry.getKey().isAssignableFrom(packet.getClass())) { + return (T) entry.getValue().apply(packet); + } + } + return (T) new SpigotWrapper(packet, Set.of(packet.getClass().getName())); +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git } } diff --git a/src/com/falchus/lib/minecraft/spigot/wrapper/core/baseblockposition/BaseBlockPositionWrapper.java b/src/com/falchus/lib/minecraft/spigot/wrapper/core/baseblockposition/BaseBlockPositionWrapper.java index a2c012e9..dc839ef6 100644 --- a/src/com/falchus/lib/minecraft/spigot/wrapper/core/baseblockposition/BaseBlockPositionWrapper.java +++ b/src/com/falchus/lib/minecraft/spigot/wrapper/core/baseblockposition/BaseBlockPositionWrapper.java @@ -9,6 +9,7 @@ import lombok.experimental.FieldDefaults; @FieldDefaults(makeFinal = true) +<<<<<<< HEAD class BaseBlockPositionWrapper extends SpigotWrapper implements BaseBlockPosition { Field x; @@ -58,6 +59,51 @@ public int getZ() { } @Override +======= +class BaseBlockPositionWrapper extends SpigotWrapper { + + Field x; + Field y; + Field z; + + BaseBlockPositionWrapper(@NonNull Object handle, @NonNull Set names) { + super(handle, names); + + x = getFirstField( + "x", + "a" + ); + y = getFirstField( + "y", + "c" + ); + z = getFirstField( + "z", + "d" + ); + } + + public int getX() { + return getFieldValue(x); + } + + public void setX(int x) { + setField(this.x, x); + } + + public int getY() { + return getFieldValue(y); + } + + public void setY(int y) { + setField(this.y, y); + } + + public int getZ() { + return getFieldValue(z); + } + +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git public void setZ(int z) { setField(this.z, z); } diff --git a/src/com/falchus/lib/minecraft/spigot/wrapper/core/baseblockposition/WrappedBaseBlockPosition.java b/src/com/falchus/lib/minecraft/spigot/wrapper/core/baseblockposition/WrappedBaseBlockPosition.java index ea221284..70bff07e 100644 --- a/src/com/falchus/lib/minecraft/spigot/wrapper/core/baseblockposition/WrappedBaseBlockPosition.java +++ b/src/com/falchus/lib/minecraft/spigot/wrapper/core/baseblockposition/WrappedBaseBlockPosition.java @@ -1,5 +1,6 @@ package com.falchus.lib.minecraft.spigot.wrapper.core.baseblockposition; +<<<<<<< HEAD import java.util.Map; import java.util.Set; @@ -35,5 +36,18 @@ public WrappedBaseBlockPosition(int x, int y, int z) { z ) ).build()); +======= +import java.util.Set; + +import lombok.NonNull; + +public class WrappedBaseBlockPosition extends BaseBlockPositionWrapper { + + WrappedBaseBlockPosition(@NonNull Object handle) { + super(handle, Set.of( + version.getPackageNms() + "BaseBlockPosition", + core + "BaseBlockPosition" + )); +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git } } diff --git a/src/com/falchus/lib/minecraft/spigot/wrapper/core/baseblockposition/WrappedBlockPosition.java b/src/com/falchus/lib/minecraft/spigot/wrapper/core/baseblockposition/WrappedBlockPosition.java index 769e0d05..637fb2f5 100644 --- a/src/com/falchus/lib/minecraft/spigot/wrapper/core/baseblockposition/WrappedBlockPosition.java +++ b/src/com/falchus/lib/minecraft/spigot/wrapper/core/baseblockposition/WrappedBlockPosition.java @@ -1,5 +1,6 @@ package com.falchus.lib.minecraft.spigot.wrapper.core.baseblockposition; +<<<<<<< HEAD import java.util.Map; import java.util.Set; @@ -35,5 +36,18 @@ public WrappedBlockPosition(int x, int y, int z) { z ) ).build()); +======= +import java.util.Set; + +import lombok.NonNull; + +public class WrappedBlockPosition extends BaseBlockPositionWrapper { + + WrappedBlockPosition(@NonNull Object handle) { + super(handle, Set.of( + version.getPackageNms() + "BlockPosition", + core + "BlockPosition" + )); +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git } } diff --git a/src/com/falchus/lib/minecraft/spigot/wrapper/world/WrappedAxisAlignedBB.java b/src/com/falchus/lib/minecraft/spigot/wrapper/world/WrappedAxisAlignedBB.java index 71909c11..789a6649 100644 --- a/src/com/falchus/lib/minecraft/spigot/wrapper/world/WrappedAxisAlignedBB.java +++ b/src/com/falchus/lib/minecraft/spigot/wrapper/world/WrappedAxisAlignedBB.java @@ -9,6 +9,7 @@ import lombok.experimental.FieldDefaults; @FieldDefaults(makeFinal = true) +<<<<<<< HEAD public class WrappedAxisAlignedBB extends SpigotWrapper implements AxisAlignedBB { Field minX; @@ -106,6 +107,93 @@ public double getMaxZ() { } @Override +======= +public class WrappedAxisAlignedBB extends SpigotWrapper { + + Field minX; + Field minY; + Field minZ; + Field maxX; + Field maxY; + Field maxZ; + + WrappedAxisAlignedBB(@NonNull Object handle) { + super(handle, Set.of( + version.getPackageNms() + "AxisAlignedBB", + worldPhys + "AxisAlignedBB" + )); + + minX = getFirstField( + "minX", + "a" + ); + minY = getFirstField( + "minY", + "b" + ); + minZ = getFirstField( + "minZ", + "c" + ); + maxX = getFirstField( + "maxX", + "d" + ); + maxY = getFirstField( + "maxY", + "e" + ); + maxZ = getFirstField( + "maxZ", + "f" + ); + } + + public double getMinX() { + return getFieldValue(minX); + } + + public void setMinX(double minX) { + setField(this.minX, minX); + } + + public double getMinY() { + return getFieldValue(minY); + } + + public void setMinY(double minY) { + setField(this.minY, minY); + } + + public double getMinZ() { + return getFieldValue(minZ); + } + + public void setMinZ(double minZ) { + setField(this.minZ, minZ); + } + + public double getMaxX() { + return getFieldValue(maxX); + } + + public void setMaxX(double maxX) { + setField(this.maxX, maxX); + } + + public double getMaxY() { + return getFieldValue(maxY); + } + + public void setMaxY(double maxY) { + setField(this.maxY, maxY); + } + + public double getMaxZ() { + return getFieldValue(maxZ); + } + +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git public void setMaxZ(double maxZ) { setField(this.maxZ, maxZ); } diff --git a/src/com/falchus/lib/task/Task.java b/src/com/falchus/lib/task/Task.java index 8cc46376..a9da9a18 100644 --- a/src/com/falchus/lib/task/Task.java +++ b/src/com/falchus/lib/task/Task.java @@ -25,6 +25,7 @@ public class Task implements Runnable { @Getter private volatile boolean ended; @Getter private volatile int tick; +<<<<<<< HEAD public Task() { tasks.put(id, this); } @@ -38,6 +39,8 @@ protected void onRun(int tick) { }; } +======= +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git @SuppressWarnings("unchecked") protected T execute(@NonNull Runnable runnable) { runnable.run(); @@ -64,8 +67,37 @@ public final void run() { onRun(tick++); } +<<<<<<< HEAD public final T runAsync() { return executeAsync(); +======= + @SuppressWarnings("unchecked") + public static final T run(@NonNull Runnable runnable) { + Task task; + if (runnable instanceof Task t) { + task = t; + } else { + task = new Task() { + @Override + protected void onRun(int tick) { + execute(runnable); + } + }; + } + return (T) task; + } + + public static final T runAsync(@NonNull Runnable runnable) { + return run(runnable).executeAsync(); + } + + public static final T runTimer(@NonNull Runnable runnable, long period, @NonNull TimeUnit unit) { + return runTimer(runnable, 0, period, unit); + } + + public static final T runTimerAsync(@NonNull Runnable runnable, long period, @NonNull TimeUnit unit) { + return runTimerAsync(runnable, 0, period, unit); +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git } public final T runTimer(long period, @NonNull TimeUnit unit) { @@ -76,23 +108,70 @@ public final T runTimerAsync(long period, @NonNull TimeUnit uni return runTimerAsync(0, period, unit); } +<<<<<<< HEAD +======= + public static final T runTimer(@NonNull Runnable runnable, long delay, long period, @NonNull TimeUnit unit) { + return run(runnable).runTimer(delay, period, unit); + } + + public static final T runTimerAsync(@NonNull Runnable runnable, long delay, long period, @NonNull TimeUnit unit) { + return run(runnable).runTimerAsync(delay, period, unit); + } + +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git @SuppressWarnings("unchecked") +<<<<<<< HEAD public T runTimer(long delay, long period, @NonNull TimeUnit unit) { ScheduledFuture future = scheduler.scheduleAtFixedRate(this::execute, delay, period, unit); +======= + public final T runTimer(long delay, long period, @NonNull TimeUnit unit) { + ScheduledFuture future = scheduler.scheduleAtFixedRate(this::execute, delay, period, unit); + tasks.put(id, this); +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git taskFutures.put(id, future); return (T) this; } @SuppressWarnings("unchecked") +<<<<<<< HEAD public T runTimerAsync(long delay, long period, @NonNull TimeUnit unit) { ScheduledFuture future = scheduler.scheduleAtFixedRate(this::executeAsync, delay, period, unit); +======= + public final T runTimerAsync(long delay, long period, @NonNull TimeUnit unit) { + ScheduledFuture future = scheduler.scheduleAtFixedRate(this::executeAsync, delay, period, unit); + tasks.put(id, this); taskFutures.put(id, future); return (T) this; } + public static final T runLater(@NonNull Runnable runnable, long delay, @NonNull TimeUnit unit) { + return run(runnable).runLater(delay, unit); + } + + public static final T runLaterAsync(@NonNull Runnable runnable, long delay, @NonNull TimeUnit unit) { + return run(runnable).runLaterAsync(delay, unit); + } + @SuppressWarnings("unchecked") + public final T runLater(long delay, @NonNull TimeUnit unit) { + ScheduledFuture future = scheduler.schedule(() -> execute(() -> { + run(); + end(); + }), delay, unit); + tasks.put(id, this); +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git + taskFutures.put(id, future); + return (T) this; + } + + @SuppressWarnings("unchecked") +<<<<<<< HEAD public T runLater(long delay, @NonNull TimeUnit unit) { ScheduledFuture future = scheduler.schedule(() -> execute(() -> { +======= + public final T runLaterAsync(long delay, @NonNull TimeUnit unit) { + ScheduledFuture future = scheduler.schedule(() -> executeAsync(() -> { +>>>>>>> branch 'master' of https://github.com/Falchus/FalchusLib-Java.git run(); end(); }), delay, unit);