Skip to content

Commit

Permalink
v9.8.1
Browse files Browse the repository at this point in the history
XSound
Added namespaced sounds, category and seed support.
All parameters are now variable now (can be changed at any time)

NMSExtras
Fixed data registry error with 1.19.4
  • Loading branch information
CryptoMorin committed Jan 1, 2024
1 parent b3fae10 commit 6e15550
Show file tree
Hide file tree
Showing 3 changed files with 395 additions and 115 deletions.
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>com.github.cryptomorin</groupId>
<artifactId>XSeries</artifactId>
<version>9.8.0</version>
<version>9.8.1</version>

<name>XSeries</name>
<description>A set of utilities for Minecraft plugins</description>
Expand Down
17 changes: 14 additions & 3 deletions src/main/java/com/cryptomorin/xseries/NMSExtras.java
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,18 @@ public final class NMSExtras {

getHandle = lookup.findVirtual(CraftEntityClass, "getHandle", MethodType.methodType(nmsEntity));
getDataWatcher = lookup.findVirtual(nmsEntity, v(20, 4, "an").v(20, 2, "al").v(19, "aj").v(18, "ai").orElse("getDataWatcher"), MethodType.methodType(DataWatcherClass)); // getEntityData()
dataWatcherGetItem = lookup.findVirtual(DataWatcherClass, v(18, "b").orElse("get"), MethodType.methodType(Object.class, DataWatcherObjectClass)); // private <T> Item<T> c(DataWatcherObject<T> datawatcherobject)


// public <T> T b(DataWatcherObject<T> datawatcherobject) {
// return this.c(datawatcherobject).b();
// }
dataWatcherGetItem = lookup.findVirtual(DataWatcherClass, v(20, "b").v(19, "a").v(18, "b").orElse("get"), MethodType.methodType(Object.class, DataWatcherObjectClass)); // private <T> Item<T> c(DataWatcherObject<T> datawatcherobject)

/*
public <T> void b(DataWatcherObject<T> datawatcherobject, T t0) {
this.a(datawatcherobject, t0, false);
}
*/
dataWatcherSetItem = lookup.findVirtual(DataWatcherClass, v(18, "b").orElse("set"), MethodType.methodType(void.class, DataWatcherObjectClass, Object.class)); // private <T> Item<T> c(DataWatcherObject<T> datawatcherobject)

getBukkitEntity = lookup.findVirtual(nmsEntity, "getBukkitEntity", MethodType.methodType(craftEntity));
Expand Down Expand Up @@ -323,7 +334,7 @@ public static void lightning(Collection<Player> players, Location location, bool
Object packet = ENTITY_PACKET.invoke(lightningBolt);

for (Player player : players) {
if (sound) XSound.ENTITY_LIGHTNING_BOLT_THUNDER.play(player);
if (sound) XSound.ENTITY_LIGHTNING_BOLT_THUNDER.record().soundPlayer().forPlayers(player).play();
sendPacket(player, packet);
}
} else {
Expand All @@ -337,7 +348,7 @@ public static void lightning(Collection<Player> players, Location location, bool
Object packet = ENTITY_PACKET.invoke(lightningBoltID, lightningBoltUUID, location.getX(), location.getY(), location.getZ(), 0F, 0F, lightningType, 0, vec3D);

for (Player player : players) {
if (sound) XSound.ENTITY_LIGHTNING_BOLT_THUNDER.play(player);
if (sound) XSound.ENTITY_LIGHTNING_BOLT_THUNDER.record().soundPlayer().forPlayers(player).play();
sendPacket(player, packet);
}
}
Expand Down
Loading

0 comments on commit 6e15550

Please sign in to comment.