From 4dd84d53bea187a3618a4a0f3c28f300f2872f48 Mon Sep 17 00:00:00 2001 From: OmerBenGera Date: Fri, 12 Aug 2022 13:51:58 +0300 Subject: [PATCH] Fixed support for 1.19 (Untested) --- .../nms/v1_19_R1/ChunkLoaderNPC.java | 15 +------------- .../nms/v1_19_R1/EntityHolograms.java | 20 +------------------ 2 files changed, 2 insertions(+), 33 deletions(-) diff --git a/v1_19_R1/src/main/java/com/bgsoftware/wildloaders/nms/v1_19_R1/ChunkLoaderNPC.java b/v1_19_R1/src/main/java/com/bgsoftware/wildloaders/nms/v1_19_R1/ChunkLoaderNPC.java index b263101..4a686e0 100644 --- a/v1_19_R1/src/main/java/com/bgsoftware/wildloaders/nms/v1_19_R1/ChunkLoaderNPC.java +++ b/v1_19_R1/src/main/java/com/bgsoftware/wildloaders/nms/v1_19_R1/ChunkLoaderNPC.java @@ -64,13 +64,9 @@ public final class ChunkLoaderNPC extends EntityPlayer implements com.bgsoftware super.a(this.boundingBox); } - @Remap(classPath = "net.minecraft.world.entity.Entity", - name = "getUUID", - type = Remap.Type.METHOD, - remappedName = "co") @Override public UUID getUniqueId() { - return super.co(); + return getBukkitEntity().getUniqueId(); } @Remap(classPath = "net.minecraft.world.entity.Entity", @@ -82,15 +78,6 @@ public final class ChunkLoaderNPC extends EntityPlayer implements com.bgsoftware ah(); } - @Remap(classPath = "net.minecraft.world.entity.Entity", - name = "getBoundingBoxForCulling", - type = Remap.Type.METHOD, - remappedName = "cz") - @Override - public AxisAlignedBB cz() { - return this.boundingBox; - } - @Remap(classPath = "net.minecraft.world.entity.Entity", name = "remove", type = Remap.Type.METHOD, diff --git a/v1_19_R1/src/main/java/com/bgsoftware/wildloaders/nms/v1_19_R1/EntityHolograms.java b/v1_19_R1/src/main/java/com/bgsoftware/wildloaders/nms/v1_19_R1/EntityHolograms.java index e1b7017..efafda5 100644 --- a/v1_19_R1/src/main/java/com/bgsoftware/wildloaders/nms/v1_19_R1/EntityHolograms.java +++ b/v1_19_R1/src/main/java/com/bgsoftware/wildloaders/nms/v1_19_R1/EntityHolograms.java @@ -36,7 +36,7 @@ public final class EntityHolograms extends EntityArmorStand implements Hologram @Remap(classPath = "net.minecraft.world.entity.decoration.ArmorStand", name = "setMarker", type = Remap.Type.METHOD, remappedName = "t") @Remap(classPath = "net.minecraft.world.entity.Entity", name = "setCustomNameVisible", type = Remap.Type.METHOD, remappedName = "n") @Remap(classPath = "net.minecraft.world.entity.Entity", name = "setBoundingBox", type = Remap.Type.METHOD, remappedName = "a") - public EntityHolograms(World world, double x, double y, double z){ + public EntityHolograms(World world, double x, double y, double z) { super(world, x, y, z); j(true); // Invisible a(true); // Small @@ -161,15 +161,6 @@ public final class EntityHolograms extends EntityArmorStand implements Hologram return true; } - @Remap(classPath = "net.minecraft.world.entity.Entity", - name = "repositionEntityAfterLoad", - type = Remap.Type.METHOD, - remappedName = "bm") - @Override - public boolean bm() { - return false; - } - @Remap(classPath = "net.minecraft.world.entity.Entity", name = "setCustomName", type = Remap.Type.METHOD, @@ -203,15 +194,6 @@ public final class EntityHolograms extends EntityArmorStand implements Hologram // Prevent stand being equipped } - @Remap(classPath = "net.minecraft.world.entity.Entity", - name = "getBoundingBoxForCulling", - type = Remap.Type.METHOD, - remappedName = "cz") - @Override - public AxisAlignedBB cz() { - return EMPTY_BOUND; - } - public void forceSetBoundingBox(AxisAlignedBB boundingBox) { super.a(boundingBox); }