From 2334f1fd7883bdaf90f7476e497c4d248740be28 Mon Sep 17 00:00:00 2001 From: David Berdik Date: Mon, 2 Sep 2019 18:45:21 -0400 Subject: [PATCH] Continued updating codebase for 1.14.4 --- .../herobrineai/AI/cores/Graveyard.java | 8 ++--- .../jakub1221/herobrineai/AI/cores/Heads.java | 3 +- .../herobrineai/AI/cores/Pyramid.java | 2 -- .../AI/extensions/GraveyardWorld.java | 3 +- .../herobrineai/NPC/Entity/HumanEntity.java | 10 ++---- .../herobrineai/listeners/EntityListener.java | 2 +- .../listeners/InventoryListener.java | 2 +- .../herobrineai/listeners/PlayerListener.java | 5 ++- .../herobrineai/misc/BlockChanger.java | 36 +++++++++---------- .../jakub1221/herobrineai/misc/ItemName.java | 13 ++++--- 10 files changed, 41 insertions(+), 43 deletions(-) diff --git a/src/org/jakub1221/herobrineai/AI/cores/Graveyard.java b/src/org/jakub1221/herobrineai/AI/cores/Graveyard.java index 0f0ecaf..8e82de0 100644 --- a/src/org/jakub1221/herobrineai/AI/cores/Graveyard.java +++ b/src/org/jakub1221/herobrineai/AI/cores/Graveyard.java @@ -48,7 +48,7 @@ public class Graveyard extends Core { } Bukkit.getServer().getWorld("world_herobrineai_graveyard").setTime(15000); - HerobrineAI.getPluginCore().getAICore().PlayerTarget = player; + AICore.PlayerTarget = player; Location loc = (Location) player.getLocation(); savedX = loc.getX(); savedY = loc.getY(); @@ -65,7 +65,7 @@ public class Graveyard extends Core { Start(); - HerobrineAI.getPluginCore().getAICore().isTarget = true; + AICore.isTarget = true; Bukkit.getServer().getWorld("world_herobrineai_graveyard").setStorm(false); return new CoreResult(true, "Player successfully teleported!"); @@ -111,9 +111,9 @@ public class Graveyard extends Core { if (savedPlayer.isDead() == true || savedPlayer.isOnline() == false || savedPlayer.getLocation().getWorld() != Bukkit.getServer().getWorld("world_herobrineai_graveyard") - || this.ticks == 90 || HerobrineAI.getPluginCore().getAICore().isTarget == false) { + || this.ticks == 90 || AICore.isTarget == false) { - if (HerobrineAI.getPluginCore().getAICore().PlayerTarget == savedPlayer) { + if (AICore.PlayerTarget == savedPlayer) { HerobrineAI.getPluginCore().getAICore().CancelTarget(CoreType.GRAVEYARD); } diff --git a/src/org/jakub1221/herobrineai/AI/cores/Heads.java b/src/org/jakub1221/herobrineai/AI/cores/Heads.java index 43ee9d5..f7f2ebe 100644 --- a/src/org/jakub1221/herobrineai/AI/cores/Heads.java +++ b/src/org/jakub1221/herobrineai/AI/cores/Heads.java @@ -3,6 +3,7 @@ package org.jakub1221.herobrineai.AI.cores; import java.util.ArrayList; import java.util.List; import java.util.Random; +import java.util.UUID; import org.bukkit.Bukkit; import org.bukkit.Location; @@ -52,7 +53,7 @@ public class Heads extends Core { } Block block = loc.getWorld().getBlockAt(px + x, y, pz + z); - BlockChanger.PlaceSkull(block.getLocation(), "Herobrine"); + BlockChanger.PlaceSkull(block.getLocation(), UUID.fromString("f84c6a79-0a4e-45e0-879b-cd49ebd4c4e2")); headList.add(block); diff --git a/src/org/jakub1221/herobrineai/AI/cores/Pyramid.java b/src/org/jakub1221/herobrineai/AI/cores/Pyramid.java index b7def98..1dc37d7 100644 --- a/src/org/jakub1221/herobrineai/AI/cores/Pyramid.java +++ b/src/org/jakub1221/herobrineai/AI/cores/Pyramid.java @@ -1,7 +1,5 @@ package org.jakub1221.herobrineai.AI.cores; -import java.util.Random; - import org.bukkit.Chunk; import org.bukkit.Location; import org.bukkit.Material; diff --git a/src/org/jakub1221/herobrineai/AI/extensions/GraveyardWorld.java b/src/org/jakub1221/herobrineai/AI/extensions/GraveyardWorld.java index 187d2f2..6e24e8d 100644 --- a/src/org/jakub1221/herobrineai/AI/extensions/GraveyardWorld.java +++ b/src/org/jakub1221/herobrineai/AI/extensions/GraveyardWorld.java @@ -2,6 +2,7 @@ package org.jakub1221.herobrineai.AI.extensions; import org.bukkit.Bukkit; import org.bukkit.Location; +import org.bukkit.Material; import org.jakub1221.herobrineai.HerobrineAI; import org.jakub1221.herobrineai.misc.StructureLoader; @@ -14,7 +15,7 @@ public class GraveyardWorld { for (int x = -50; x <= 50; x++) { for (int z = -50; z <= 50; z++) { - loc.getWorld().getBlockAt(x, 3, z).setTypeId(110); + loc.getWorld().getBlockAt(x, 3, z).setType(Material.MYCELIUM); } } diff --git a/src/org/jakub1221/herobrineai/NPC/Entity/HumanEntity.java b/src/org/jakub1221/herobrineai/NPC/Entity/HumanEntity.java index 1e4e04b..17a1c7f 100644 --- a/src/org/jakub1221/herobrineai/NPC/Entity/HumanEntity.java +++ b/src/org/jakub1221/herobrineai/NPC/Entity/HumanEntity.java @@ -6,10 +6,10 @@ import net.minecraft.server.v1_14_R1.EntityPlayer; import net.minecraft.server.v1_14_R1.EnumGamemode; import net.minecraft.server.v1_14_R1.EnumMoveType; import net.minecraft.server.v1_14_R1.PlayerInteractManager; +import net.minecraft.server.v1_14_R1.Vec3D; import org.bukkit.Bukkit; import org.bukkit.craftbukkit.v1_14_R1.CraftServer; -import org.bukkit.craftbukkit.v1_14_R1.entity.CraftEntity; import org.bukkit.craftbukkit.v1_14_R1.entity.CraftPlayer; import org.jakub1221.herobrineai.NPC.NPCCore; import org.jakub1221.herobrineai.NPC.NMS.BWorld; @@ -30,13 +30,9 @@ public class HumanEntity extends EntityPlayer { fauxSleeping = true; } - public void setBukkitEntity(org.bukkit.entity.Entity entity) { - bukkitEntity = (CraftEntity) entity; - } - @Override - public void move(EnumMoveType x, double arg0, double arg1, double arg2) { - setPosition(arg0, arg1, arg2); + public void move(EnumMoveType x, Vec3D vec3d) { + setPosition(vec3d.x, vec3d.y, vec3d.z); } @Override diff --git a/src/org/jakub1221/herobrineai/listeners/EntityListener.java b/src/org/jakub1221/herobrineai/listeners/EntityListener.java index 00e8d05..1250413 100644 --- a/src/org/jakub1221/herobrineai/listeners/EntityListener.java +++ b/src/org/jakub1221/herobrineai/listeners/EntityListener.java @@ -50,7 +50,7 @@ public class EntityListener implements Listener { @EventHandler public void onCreatureSpawn(CreatureSpawnEvent event) { - if (!PluginCore.isNPCDisabled) { + if (!HerobrineAI.isNPCDisabled) { if (PluginCore.getConfigDB().useWorlds.contains(event.getEntity().getLocation().getWorld().getName())) { Entity entity = event.getEntity(); diff --git a/src/org/jakub1221/herobrineai/listeners/InventoryListener.java b/src/org/jakub1221/herobrineai/listeners/InventoryListener.java index 7a4688b..40df940 100644 --- a/src/org/jakub1221/herobrineai/listeners/InventoryListener.java +++ b/src/org/jakub1221/herobrineai/listeners/InventoryListener.java @@ -30,7 +30,7 @@ public class InventoryListener implements Listener { if (event.getInventory().firstEmpty() != -1) { if (HerobrineAI.getPluginCore().getAICore().getResetLimits().isHead()) { event.getInventory().setItem(event.getInventory().firstEmpty(), - ItemName.CreateSkull(event.getPlayer().getName())); + ItemName.CreateSkull(event.getPlayer().getUniqueId(), event.getPlayer().getName())); } } } diff --git a/src/org/jakub1221/herobrineai/listeners/PlayerListener.java b/src/org/jakub1221/herobrineai/listeners/PlayerListener.java index 005825a..fce30ad 100644 --- a/src/org/jakub1221/herobrineai/listeners/PlayerListener.java +++ b/src/org/jakub1221/herobrineai/listeners/PlayerListener.java @@ -8,7 +8,6 @@ import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.World; import org.bukkit.block.Jukebox; -import org.bukkit.craftbukkit.v1_14_R1.entity.CraftPlayer; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; import org.bukkit.event.EventPriority; @@ -136,7 +135,7 @@ public class PlayerListener implements Listener { Jukebox block = (Jukebox) event.getClickedBlock().getState(); if (!block.isPlaying()) { - if (item.getType() == Material.getMaterial(2266)) { + if (item.getType() == Material.MUSIC_DISC_11) { PluginCore.getAICore(); @@ -166,7 +165,7 @@ public class PlayerListener implements Listener { public void onPlayerEnterBed(PlayerBedEnterEvent event) { if (Utils.getRandomGen().nextInt(100) > 75) { Player player = event.getPlayer(); - ((CraftPlayer) player).getHandle().a(true, false, false); + event.setCancelled(true); PluginCore.getAICore().playerBedEnter(player); } } diff --git a/src/org/jakub1221/herobrineai/misc/BlockChanger.java b/src/org/jakub1221/herobrineai/misc/BlockChanger.java index c73e6fc..4ec1600 100644 --- a/src/org/jakub1221/herobrineai/misc/BlockChanger.java +++ b/src/org/jakub1221/herobrineai/misc/BlockChanger.java @@ -1,13 +1,15 @@ package org.jakub1221.herobrineai.misc; import java.util.Random; +import java.util.UUID; +import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.Material; -import org.bukkit.SkullType; import org.bukkit.block.Block; import org.bukkit.block.BlockFace; import org.bukkit.block.Skull; +import org.bukkit.block.data.Rotatable; public class BlockChanger { @@ -78,28 +80,26 @@ public class BlockChanger { } - public static void PlaceSkull(Location loc, String name) { - int chance = new Random().nextInt(7); - Block b = loc.getBlock(); - b.setType(Material.SKULL); + public static void PlaceSkull(final Location loc, final UUID uuid) { + final int chance = new Random().nextInt(4); + BlockFace bface; - Skull skull = (Skull) b.getState(); - skull.setSkullType(SkullType.PLAYER); - skull.setOwner(name); - - BlockFace bface = BlockFace.EAST; - - if (chance == 0) { + if (chance == 0) bface = BlockFace.WEST; - } else if (chance == 1) { + else if (chance == 1) bface = BlockFace.EAST; - } else if (chance == 2) { + else if (chance == 2) bface = BlockFace.SOUTH; - } else if (chance == 3) { + else bface = BlockFace.NORTH; - } - - skull.setRawData((byte) bface.ordinal()); + + Block b = loc.getBlock(); + b.setType(Material.PLAYER_HEAD); + Rotatable blockData = (Rotatable) b.getBlockData(); + blockData.setRotation(bface); + b.setBlockData(blockData); + Skull skull = (Skull) b.getState(); + skull.setOwningPlayer(Bukkit.getOfflinePlayer(uuid)); skull.update(true); } diff --git a/src/org/jakub1221/herobrineai/misc/ItemName.java b/src/org/jakub1221/herobrineai/misc/ItemName.java index d91397d..e8e8abe 100644 --- a/src/org/jakub1221/herobrineai/misc/ItemName.java +++ b/src/org/jakub1221/herobrineai/misc/ItemName.java @@ -1,11 +1,12 @@ package org.jakub1221.herobrineai.misc; import java.util.ArrayList; +import java.util.UUID; +import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.Color; import org.bukkit.Material; -import org.bukkit.SkullType; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.ItemMeta; import org.bukkit.inventory.meta.LeatherArmorMeta; @@ -55,13 +56,15 @@ public class ItemName { return item.getItemMeta().getDisplayName(); } - public static ItemStack CreateSkull(String data) { - ItemStack skull = new ItemStack(Material.SKULL_ITEM, 1, (short) SkullType.PLAYER.ordinal()); - SkullMeta skullmeta = (SkullMeta) skull.getItemMeta(); - skullmeta.setOwner(data); + public static ItemStack CreateSkull(final UUID uuid, final String data) { + final ItemStack skull = new ItemStack(Material.PLAYER_HEAD); + final SkullMeta skullmeta = (SkullMeta) skull.getItemMeta(); + skullmeta.setOwningPlayer(Bukkit.getOfflinePlayer(uuid)); skullmeta.setDisplayName(ChatColor.RESET + data); + skull.setItemMeta(skullmeta); + return skull; }