-
Notifications
You must be signed in to change notification settings - Fork 49
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #126 from Mooselk/master
Fix NPCState#CROUCHED for 1.14.x -> 1.16.x
- Loading branch information
Showing
22 changed files
with
71 additions
and
125 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
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
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
32 changes: 12 additions & 20 deletions
32
...c/main/java/net/jitse/npclib/nms/v1_14_R1/packets/PacketPlayOutEntityMetadataWrapper.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,37 +1,29 @@ | ||
package net.jitse.npclib.nms.v1_14_R1.packets; | ||
|
||
import java.util.Collection; | ||
|
||
import net.jitse.npclib.api.state.NPCState; | ||
import net.minecraft.server.v1_14_R1.DataWatcher; | ||
import net.minecraft.server.v1_14_R1.DataWatcherObject; | ||
import net.minecraft.server.v1_14_R1.DataWatcherRegistry; | ||
import net.minecraft.server.v1_14_R1.EntityPose; | ||
import net.minecraft.server.v1_14_R1.PacketPlayOutEntityMetadata; | ||
|
||
import java.util.Collection; | ||
|
||
public class PacketPlayOutEntityMetadataWrapper { | ||
|
||
public PacketPlayOutEntityMetadata create(Collection<NPCState> activateStates, int entityId) { | ||
DataWatcher dataWatcher = new DataWatcher(null); | ||
byte masked = NPCState.getMasked(activateStates); | ||
// TODO: Find out why NPCState#CROUCHED doesn't work. | ||
|
||
dataWatcher.register(new DataWatcherObject<EntityPose>(6, DataWatcherRegistry.s), getMaskedPose(activateStates)); | ||
dataWatcher.register(new DataWatcherObject<>(0, DataWatcherRegistry.a), masked); | ||
|
||
// for (Player online : Bukkit.getOnlinePlayers()) { | ||
// DataWatcher watcher = ((CraftPlayer) online).getHandle().getDataWatcher(); | ||
// try { | ||
// Field entriesField = watcher.getClass().getDeclaredField("entries"); | ||
// entriesField.setAccessible(true); | ||
// | ||
// Int2ObjectOpenHashMap<DataWatcher.Item<?>> entries = (Int2ObjectOpenHashMap<DataWatcher.Item<?>>) entriesField.get(watcher); | ||
// entries.forEach((integer, item) -> { | ||
// if (item.b() instanceof Boolean || item.b() instanceof Byte) | ||
// online.sendMessage(integer + ": " + item.b() + " type = " + item.b().getClass().toString()); | ||
// }); | ||
// } catch (NoSuchFieldException | IllegalAccessException e) { | ||
// e.printStackTrace(); | ||
// } | ||
// } | ||
|
||
|
||
return new PacketPlayOutEntityMetadata(entityId, dataWatcher, true); | ||
} | ||
|
||
private EntityPose getMaskedPose(Collection<NPCState> states) { | ||
if (states.contains(NPCState.CROUCHED)) | ||
return EntityPose.SNEAKING; | ||
return EntityPose.STANDING; | ||
} | ||
} |
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
36 changes: 14 additions & 22 deletions
36
...c/main/java/net/jitse/npclib/nms/v1_15_R1/packets/PacketPlayOutEntityMetadataWrapper.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,39 +1,31 @@ | ||
package net.jitse.npclib.nms.v1_15_R1.packets; | ||
|
||
import java.util.Collection; | ||
|
||
import net.jitse.npclib.api.state.NPCState; | ||
import net.minecraft.server.v1_15_R1.DataWatcher; | ||
import net.minecraft.server.v1_15_R1.DataWatcherObject; | ||
import net.minecraft.server.v1_15_R1.DataWatcherRegistry; | ||
import net.minecraft.server.v1_15_R1.EntityPose; | ||
import net.minecraft.server.v1_15_R1.PacketPlayOutEntityMetadata; | ||
|
||
import java.util.Collection; | ||
|
||
public class PacketPlayOutEntityMetadataWrapper { | ||
|
||
public PacketPlayOutEntityMetadata create(Collection<NPCState> activateStates, int entityId) { | ||
DataWatcher dataWatcher = new DataWatcher(null); | ||
dataWatcher.register(new DataWatcherObject<>(16, DataWatcherRegistry.a), (byte) 127); | ||
|
||
byte masked = NPCState.getMasked(activateStates); | ||
// TODO: Find out why NPCState#CROUCHED doesn't work. | ||
|
||
dataWatcher.register(new DataWatcherObject<EntityPose>(6, DataWatcherRegistry.s), getMaskedPose(activateStates)); | ||
dataWatcher.register(new DataWatcherObject<>(0, DataWatcherRegistry.a), masked); | ||
|
||
// for (Player online : Bukkit.getOnlinePlayers()) { | ||
// DataWatcher watcher = ((CraftPlayer) online).getHandle().getDataWatcher(); | ||
// try { | ||
// Field entriesField = watcher.getClass().getDeclaredField("entries"); | ||
// entriesField.setAccessible(true); | ||
// | ||
// Int2ObjectOpenHashMap<DataWatcher.Item<?>> entries = (Int2ObjectOpenHashMap<DataWatcher.Item<?>>) entriesField.get(watcher); | ||
// entries.forEach((integer, item) -> { | ||
// if (item.b() instanceof Boolean || item.b() instanceof Byte) | ||
// online.sendMessage(integer + ": " + item.b() + " type = " + item.b().getClass().toString()); | ||
// }); | ||
// } catch (NoSuchFieldException | IllegalAccessException e) { | ||
// e.printStackTrace(); | ||
// } | ||
// } | ||
|
||
|
||
return new PacketPlayOutEntityMetadata(entityId, dataWatcher, true); | ||
} | ||
|
||
private EntityPose getMaskedPose(Collection<NPCState> states) { | ||
if (states.contains(NPCState.CROUCHED)) | ||
return EntityPose.CROUCHING; | ||
// if (states.contains(NPCState.SLEEPING)) | ||
// return EntityPose.SLEEPING; | ||
return EntityPose.STANDING; | ||
} | ||
} |
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
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
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