Helpers folder

DenizenScript · Jun 9, 2017 · a6da768 · a6da768
1 parent 54c8385
commit a6da768
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 13 deletions.
diff --git a/v1_12_R1/src/main/java/net/aufdemrand/denizen/nms/helpers/AnimationHelper_v1_12_R1.java b/v1_12_R1/src/main/java/net/aufdemrand/denizen/nms/helpers/AnimationHelper_v1_12_R1.java
@@ -13,15 +13,15 @@ public AnimationHelper_v1_12_R1() {
             @Override
             public void play(Entity entity) {
                 if (entity.getType() == EntityType.SKELETON) {
-                    ((CraftSkeleton) entity).getHandle().a(true);
+                    ((CraftSkeleton) entity).getHandle().p(true);
                 }
             }
         });
         register("SKELETON_STOP_SWING_ARM", new EntityAnimation() {
             @Override
             public void play(Entity entity) {
                 if (entity.getType() == EntityType.SKELETON) {
-                    ((CraftSkeleton) entity).getHandle().a(false);
+                    ((CraftSkeleton) entity).getHandle().p(false);
                 }
             }
         });

diff --git a/v1_12_R1/src/main/java/net/aufdemrand/denizen/nms/helpers/EntityHelper_v1_12_R1.java b/v1_12_R1/src/main/java/net/aufdemrand/denizen/nms/helpers/EntityHelper_v1_12_R1.java
@@ -60,7 +60,7 @@ public boolean isBreeding(Animals entity) {
     @Override
     public void setBreeding(Animals entity, boolean breeding) {
         if (breeding) {
-            ((CraftAnimals) entity).getHandle().c((EntityHuman) null);
+            ((CraftAnimals) entity).getHandle().a((EntityHuman) null);
         }
         else {
             ((CraftAnimals) entity).getHandle().resetLove();
@@ -148,7 +148,7 @@ public void toggleAI(Entity entity, boolean hasAI) {
         if (!(nmsEntity instanceof EntityInsentient)) {
             return;
         }
-        ((EntityInsentient) nmsEntity).setAI(!hasAI);
+        ((EntityInsentient) nmsEntity).setNoAI(!hasAI);
     }
 
     @Override
@@ -157,7 +157,7 @@ public boolean isAIDisabled(Entity entity) {
         if (!(nmsEntity instanceof EntityInsentient)) {
             return true;
         }
-        return ((EntityInsentient) nmsEntity).hasAI();
+        return ((EntityInsentient) nmsEntity).isNoAI();
     }
 
     @Override
@@ -275,7 +275,7 @@ public void walkTo(final Entity entity, Location location, double speed, final R
             new BukkitRunnable() {
                 @Override
                 public void run() {
-                    if (entityNavigation.n() || path.b()) {
+                    if (entityNavigation.o() || path.b()) {
                         if (callback != null) {
                             callback.run();
                         }

diff --git a/v1_12_R1/src/main/java/net/aufdemrand/denizen/nms/helpers/FishingHelper_v1_12_R1.java b/v1_12_R1/src/main/java/net/aufdemrand/denizen/nms/helpers/FishingHelper_v1_12_R1.java
@@ -69,17 +69,17 @@ private ItemStack catchRandomJunk(EntityFishingHook fishHook) {
         fishHook.owner.a(StatisticList.F, 1);
         WorldServer worldServer = (WorldServer) fishHook.getWorld();
         LootTableInfo.a playerFishEvent2 = new LootTableInfo.a(worldServer);
-        playerFishEvent2.a((float)EnchantmentManager.a(Enchantments.LUCK, fishHook.owner) + fishHook.owner.dj());
-        List<ItemStack> itemStacks = fishHook.getWorld().ak().a(LootTables.aA).a(worldServer.random, playerFishEvent2.a());
+        playerFishEvent2.a((float)EnchantmentManager.a(Enchantments.LUCK, fishHook.owner) + fishHook.owner.du());
+        List<ItemStack> itemStacks = fishHook.getWorld().getLootTableRegistry().a(LootTables.aA).a(worldServer.random, playerFishEvent2.a());
         return itemStacks.get(worldServer.random.nextInt(itemStacks.size()));
     }
 
     private ItemStack catchRandomTreasure(EntityFishingHook fishHook) {
         fishHook.owner.a(StatisticList.G, 1);
         WorldServer worldServer = (WorldServer) fishHook.getWorld();
         LootTableInfo.a playerFishEvent2 = new LootTableInfo.a((WorldServer)fishHook.getWorld());
-        playerFishEvent2.a((float)EnchantmentManager.a(Enchantments.LUCK, fishHook.owner) + fishHook.owner.dj());
-        List<ItemStack> itemStacks = fishHook.getWorld().ak().a(LootTables.aB).a(worldServer.random, playerFishEvent2.a());
+        playerFishEvent2.a((float)EnchantmentManager.a(Enchantments.LUCK, fishHook.owner) + fishHook.owner.du());
+        List<ItemStack> itemStacks = fishHook.getWorld().getLootTableRegistry().a(LootTables.aB).a(worldServer.random, playerFishEvent2.a());
         return itemStacks.get(worldServer.random.nextInt(itemStacks.size()));
     }
 
@@ -88,8 +88,8 @@ private ItemStack catchRandomFish(EntityFishingHook fishHook) {
         fishHook.owner.a(StatisticList.E, 1);
         WorldServer worldServer = (WorldServer) fishHook.getWorld();
         LootTableInfo.a playerFishEvent2 = new LootTableInfo.a((WorldServer)fishHook.getWorld());
-        playerFishEvent2.a((float)EnchantmentManager.a(Enchantments.LUCK, fishHook.owner) + fishHook.owner.dj());
-        List<ItemStack> itemStacks = fishHook.getWorld().ak().a(LootTables.aC).a(worldServer.random, playerFishEvent2.a());
+        playerFishEvent2.a((float)EnchantmentManager.a(Enchantments.LUCK, fishHook.owner) + fishHook.owner.du());
+        List<ItemStack> itemStacks = fishHook.getWorld().getLootTableRegistry().a(LootTables.aC).a(worldServer.random, playerFishEvent2.a());
         return itemStacks.get(worldServer.random.nextInt(itemStacks.size()));
     }
 }
diff --git a/v1_12_R1/src/main/java/net/aufdemrand/denizen/nms/helpers/PacketHelper_v1_12_R1.java b/v1_12_R1/src/main/java/net/aufdemrand/denizen/nms/helpers/PacketHelper_v1_12_R1.java
@@ -77,7 +77,8 @@ public void showBannerUpdate(Player player, Location location, DyeColor base, Li
 
     @Override
     public void showTabListHeaderFooter(Player player, String header, String footer) {
-        PacketPlayOutPlayerListHeaderFooter packet = new PacketPlayOutPlayerListHeaderFooter(new ChatComponentText(header));
+        PacketPlayOutPlayerListHeaderFooter packet = new PacketPlayOutPlayerListHeaderFooter();
+        ReflectionHelper.setFieldValue(packet.getClass(), "a", packet, new ChatComponentText(header));
         ReflectionHelper.setFieldValue(packet.getClass(), "b", packet, new ChatComponentText(footer));
         sendPacket(player, packet);
     }