forked from Lauriethefish/BetterPortals
-
Notifications
You must be signed in to change notification settings - Fork 6
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
3dd9500
commit f9d8ed6
Showing
13 changed files
with
206 additions
and
374 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
236 changes: 103 additions & 133 deletions
236
bukkit/src/main/java/com/lauriethefish/betterportals/bukkit/block/bukkit/BukkitBlockMap.java
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
68 changes: 14 additions & 54 deletions
68
bukkit/src/main/java/com/lauriethefish/betterportals/bukkit/nms/EntityUtil.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,81 +1,41 @@ | ||
| package com.lauriethefish.betterportals.bukkit.nms; | ||
|
|
||
| import com.comphenix.protocol.PacketType; | ||
| import com.comphenix.protocol.events.PacketContainer; | ||
| import com.comphenix.protocol.wrappers.WrappedDataWatcher; | ||
| import com.lauriethefish.betterportals.bukkit.util.VersionUtil; | ||
| import com.lauriethefish.betterportals.shared.util.ReflectionUtil; | ||
| import org.bukkit.Location; | ||
| import org.bukkit.entity.EnderDragonPart; | ||
| import org.bukkit.entity.Entity; | ||
| import org.bukkit.entity.Marker; | ||
| import org.bukkit.util.Vector; | ||
| import org.jetbrains.annotations.NotNull; | ||
| import org.jetbrains.annotations.Nullable; | ||
|
|
||
| import java.lang.reflect.Constructor; | ||
| import java.lang.reflect.Field; | ||
| import java.lang.reflect.Method; | ||
| import java.lang.reflect.Modifier; | ||
|
|
||
| public class EntityUtil { | ||
| private static final Method GET_HANDLE; | ||
| private static final Field DATA_WATCHER; | ||
| private static final boolean USE_DIRECT_ENTITY_PACKET; | ||
| private static final Method GET_ENTITY_SPAWN_PACKET; | ||
| private static final Constructor<?> ENTITY_TRACKER_ENTRY_NEW; | ||
|
|
||
| static { | ||
| Class<?> NMS_ENTITY = ReflectionUtil.findClass("net.minecraft.world.entity.Entity"); | ||
| Class<?> NMS_DATA_WATCHER = ReflectionUtil.findClass("net.minecraft.network.syncher.DataWatcher"); | ||
|
|
||
| GET_HANDLE = ReflectionUtil.findMethod(CraftBukkitClassUtil.findCraftBukkitClass("entity.CraftEntity"), "getHandle"); | ||
|
|
||
| DATA_WATCHER = ReflectionUtil.findFieldByType(NMS_ENTITY, NMS_DATA_WATCHER); | ||
|
|
||
| // On newer versions of the game, the Entity NMS class have an abstract method for getting the correct spawn packet that is overridden by every entity. | ||
| USE_DIRECT_ENTITY_PACKET = true; | ||
| ENTITY_TRACKER_ENTRY_NEW = null; | ||
|
|
||
| Class<?> NMS_PACKET = ReflectionUtil.findClass("net.minecraft.network.protocol.Packet"); | ||
|
|
||
| int mask = Modifier.PUBLIC; | ||
| GET_ENTITY_SPAWN_PACKET = ReflectionUtil.findMethodByTypes(NMS_ENTITY, NMS_PACKET, mask, mask); | ||
| } | ||
|
|
||
| /** | ||
| * ProtocolLib unfortunately doesn't provide any methods for getting the <i>actual</i> {@link WrappedDataWatcher} of an entity. | ||
| * {@link WrappedDataWatcher#WrappedDataWatcher(Entity)} doesn't do this - it returns a new empty {@link WrappedDataWatcher} for this entity. | ||
| * This function wraps the entities actual watcher in the ProtocolLib wrapper. | ||
| * Gets the actual data watcher for the given entity. | ||
| * ProtocolLib unfortunately doesn't provide any methods for getting the actual WrappedDataWatcher of an entity. | ||
| * @param entity The entity to wrap the data watcher of | ||
| * @return The wrapped data watcher | ||
| */ | ||
| @NotNull | ||
| public static WrappedDataWatcher getActualDataWatcher(@NotNull Entity entity) { | ||
| Object nmsEntity = ReflectionUtil.invokeMethod(entity, GET_HANDLE); | ||
| Object nmsDataWatcher = ReflectionUtil.getField(nmsEntity, DATA_WATCHER); | ||
| return new WrappedDataWatcher(nmsDataWatcher); | ||
| // Utilize ProtocolLib to get the data watcher directly from the entity | ||
| return WrappedDataWatcher.getEntityWatcher(entity); | ||
| } | ||
|
|
||
| /** | ||
| * Getting a valid spawn packet that works correctly for a specific {@link Entity} is surprisingly difficult. | ||
| * This method uses some NMS to get the correct spawn packet. | ||
| * Getting a valid spawn packet that works correctly for a specific Entity is surprisingly difficult. | ||
| * This method checks if the entity is a type that can be spawned and returns a packet if it can. | ||
| * @param entity The entity to get the spawn packet of | ||
| * @return A container with the valid packet, or <code>null</code> since some entities can't be spawned with a packet. | ||
| * @return A container with the valid packet, or null since some entities can't be spawned with a packet. | ||
| */ | ||
| public static @Nullable PacketContainer getRawEntitySpawnPacket(@NotNull Entity entity) { | ||
| if (entity instanceof EnderDragonPart) return null; | ||
| if (entity instanceof Marker) return null; | ||
| if (entity instanceof EnderDragonPart || entity instanceof Marker) return null; | ||
|
|
||
| Object nmsEntity = ReflectionUtil.invokeMethod(entity, GET_HANDLE); | ||
| if(USE_DIRECT_ENTITY_PACKET) { | ||
| return PacketContainer.fromPacket(ReflectionUtil.invokeMethod(nmsEntity, GET_ENTITY_SPAWN_PACKET)); | ||
| } else { | ||
| // Create a dummy tracker entry | ||
| Object trackerEntry = ReflectionUtil.invokeConstructor(ENTITY_TRACKER_ENTRY_NEW, nmsEntity, 0, 0, 0, false); | ||
| Object nmsPacket = ReflectionUtil.invokeMethod(trackerEntry, GET_ENTITY_SPAWN_PACKET); | ||
| if(nmsPacket == null) {return null;} | ||
| // Use ProtocolLib to create a spawn packet for the entity | ||
| PacketContainer spawnPacket = new PacketContainer(PacketType.Play.Server.SPAWN_ENTITY); | ||
| spawnPacket.getIntegers().write(0, entity.getEntityId()); | ||
| spawnPacket.getEntityTypeModifier().write(0, entity.getType()); | ||
|
|
||
| return PacketContainer.fromPacket(nmsPacket); | ||
| } | ||
| return spawnPacket; | ||
| } | ||
| } |
Oops, something went wrong.