From e7fb908aaa22ac83fda8f83d15543260de3fecbe Mon Sep 17 00:00:00 2001 From: David Berdik Date: Mon, 2 Sep 2019 19:14:10 -0400 Subject: [PATCH] Continued updating codebase for 1.14.4 --- .../jakub1221/herobrineai/HerobrineAI.java | 7 ---- .../jakub1221/herobrineai/NPC/NMS/BWorld.java | 2 +- .../jakub1221/herobrineai/NPC/NPCCore.java | 34 ------------------- .../herobrineai/commands/CmdExecutor.java | 2 +- .../herobrineai/entity/CustomSkeleton.java | 2 +- .../herobrineai/listeners/EntityListener.java | 20 +++++------ .../herobrineai/listeners/PlayerListener.java | 14 ++++---- .../herobrineai/misc/StructureLoader.java | 14 ++++---- .../herobrineai/support/TownyHook.java | 4 ++- 9 files changed, 31 insertions(+), 68 deletions(-) diff --git a/src/org/jakub1221/herobrineai/HerobrineAI.java b/src/org/jakub1221/herobrineai/HerobrineAI.java index 14d502f..0eb94f2 100644 --- a/src/org/jakub1221/herobrineai/HerobrineAI.java +++ b/src/org/jakub1221/herobrineai/HerobrineAI.java @@ -211,13 +211,6 @@ public class HerobrineAI extends JavaPlugin implements Listener { argst[0] = Class.class; argst[1] = String.class; argst[2] = int.class; - try { - Method ab = net.minecraft.server.v1_14_R1.EntityTypes.class.getDeclaredMethod("a", argst); - } catch (NoSuchMethodException e1) { - isNPCDisabled = true; - } catch (SecurityException e1) { - isNPCDisabled = true; - } if (!isNPCDisabled) { try { diff --git a/src/org/jakub1221/herobrineai/NPC/NMS/BWorld.java b/src/org/jakub1221/herobrineai/NPC/NMS/BWorld.java index edec6d9..e7756a2 100644 --- a/src/org/jakub1221/herobrineai/NPC/NMS/BWorld.java +++ b/src/org/jakub1221/herobrineai/NPC/NMS/BWorld.java @@ -24,7 +24,7 @@ public class BWorld { } public PlayerChunkMap getPlayerManager() { - return wServer.getPlayerChunkMap(); + return wServer.getChunkProvider().playerChunkMap; } public CraftWorld getCraftWorld() { diff --git a/src/org/jakub1221/herobrineai/NPC/NPCCore.java b/src/org/jakub1221/herobrineai/NPC/NPCCore.java index c388776..84fd02d 100644 --- a/src/org/jakub1221/herobrineai/NPC/NPCCore.java +++ b/src/org/jakub1221/herobrineai/NPC/NPCCore.java @@ -11,11 +11,6 @@ import net.minecraft.server.v1_14_R1.PlayerInteractManager; import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.World; -import org.bukkit.event.EventException; -import org.bukkit.event.EventHandler; -import org.bukkit.event.Listener; -import org.bukkit.event.world.ChunkLoadEvent; -import org.bukkit.event.world.ChunkUnloadEvent; import org.bukkit.plugin.java.JavaPlugin; import org.jakub1221.herobrineai.HerobrineAI; import org.jakub1221.herobrineai.NPC.Entity.HumanEntity; @@ -104,35 +99,6 @@ public class NPCCore { Bukkit.getServer().getScheduler().cancelTask(taskid); } - private class WorldL implements Listener { - @SuppressWarnings("unused") - @EventHandler - public void onChunkLoad(ChunkLoadEvent event) throws EventException { - for (HumanNPC humannpc : npcs) { - if (humannpc != null - && event.getChunk() == humannpc.getBukkitEntity().getLocation().getBlock().getChunk()) { - - if (isInLoaded == false) { - BWorld world = getBWorld(event.getWorld()); - - isInLoaded = true; - } - } - } - - } - - @EventHandler - public void onChunkUnload(ChunkUnloadEvent event) { - for (HumanNPC humannpc : npcs) { - if (humannpc != null - && event.getChunk() == humannpc.getBukkitEntity().getLocation().getBlock().getChunk()) { - - } - } - } - } - public HumanNPC spawnHumanNPC(String name, Location l) { lastID++; int id = lastID; diff --git a/src/org/jakub1221/herobrineai/commands/CmdExecutor.java b/src/org/jakub1221/herobrineai/commands/CmdExecutor.java index c0a15ae..dc00086 100644 --- a/src/org/jakub1221/herobrineai/commands/CmdExecutor.java +++ b/src/org/jakub1221/herobrineai/commands/CmdExecutor.java @@ -20,7 +20,7 @@ public class CmdExecutor implements CommandExecutor { "bury", "curse", "burn", "pyramid", "cave", "temple", "graveyard" }; public CmdExecutor(HerobrineAI p) { - log = p.log; + log = HerobrineAI.log; subCommands.put("reload", new CmdReload(p, log)); subCommands.put("cancel", new CmdCancel(p, log)); diff --git a/src/org/jakub1221/herobrineai/entity/CustomSkeleton.java b/src/org/jakub1221/herobrineai/entity/CustomSkeleton.java index 2de4acd..7fd7d7e 100644 --- a/src/org/jakub1221/herobrineai/entity/CustomSkeleton.java +++ b/src/org/jakub1221/herobrineai/entity/CustomSkeleton.java @@ -35,7 +35,7 @@ public class CustomSkeleton extends net.minecraft.server.v1_14_R1.EntitySkeleton Skeleton entityCast = (Skeleton) this.getBukkitEntity(); - entityCast.getEquipment().setItemInHand(new ItemStack(Material.GOLDEN_APPLE, 1)); + entityCast.getEquipment().setItemInMainHand(new ItemStack(Material.GOLDEN_APPLE, 1)); entityCast.getEquipment().setHelmet(ItemName.colorLeatherArmor(new ItemStack(Material.LEATHER_HELMET, 1), Color.RED)); entityCast.getEquipment().setChestplate(ItemName.colorLeatherArmor(new ItemStack(Material.LEATHER_CHESTPLATE, 1), Color.RED)); entityCast.getEquipment().setLeggings(ItemName.colorLeatherArmor(new ItemStack(Material.LEATHER_LEGGINGS, 1), Color.RED)); diff --git a/src/org/jakub1221/herobrineai/listeners/EntityListener.java b/src/org/jakub1221/herobrineai/listeners/EntityListener.java index 1250413..4590779 100644 --- a/src/org/jakub1221/herobrineai/listeners/EntityListener.java +++ b/src/org/jakub1221/herobrineai/listeners/EntityListener.java @@ -120,9 +120,9 @@ public class EntityListener implements Listener { if (arrow.getShooter() instanceof Player) { Player player = (Player) arrow.getShooter(); - if (player.getItemInHand() != null) { + if (player.getInventory().getItemInMainHand() != null) { - itemInHand = player.getItemInHand(); + itemInHand = player.getInventory().getItemInMainHand(); if (itemInHand.getType() != null) { if (itemInHand.getType() == Material.BOW) { @@ -233,10 +233,10 @@ public class EntityListener implements Listener { EntityDamageByEntityEvent dEvent = (EntityDamageByEntityEvent) event; if (dEvent.getDamager() instanceof Player) { Player player = (Player) dEvent.getDamager(); - if (player.getItemInHand() != null) { - if (player.getItemInHand().getType() == Material.DIAMOND_SWORD) { - if (ItemName.getLore(player.getItemInHand()) != null) { - itemInHand = player.getItemInHand(); + if (player.getInventory().getItemInMainHand() != null) { + if (player.getInventory().getItemInMainHand().getType() == Material.DIAMOND_SWORD) { + if (ItemName.getLore(player.getInventory().getItemInMainHand()) != null) { + itemInHand = player.getInventory().getItemInMainHand(); getLore = ItemName.getLore(itemInHand); if (getLore.containsAll(equalsLoreS)) { if (PluginCore.getConfigDB().UseArtifactSword) { @@ -269,10 +269,10 @@ public class EntityListener implements Listener { if (event.getEntity() instanceof Player) { if (event.getEntity().getEntityId() != PluginCore.HerobrineEntityID) { Player player = (Player) event.getEntity(); - if (player.getItemInHand() != null) { - if (player.getItemInHand().getType() == Material.DIAMOND_SWORD) { - if (ItemName.getLore(player.getItemInHand()) != null) { - itemInHand = player.getItemInHand(); + if (player.getInventory().getItemInMainHand() != null) { + if (player.getInventory().getItemInMainHand().getType() == Material.DIAMOND_SWORD) { + if (ItemName.getLore(player.getInventory().getItemInMainHand()) != null) { + itemInHand = player.getInventory().getItemInMainHand(); getLore = ItemName.getLore(itemInHand); if (getLore.containsAll(equalsLoreS)) { if (PluginCore.getConfigDB().UseArtifactSword) { diff --git a/src/org/jakub1221/herobrineai/listeners/PlayerListener.java b/src/org/jakub1221/herobrineai/listeners/PlayerListener.java index fce30ad..b34ae70 100644 --- a/src/org/jakub1221/herobrineai/listeners/PlayerListener.java +++ b/src/org/jakub1221/herobrineai/listeners/PlayerListener.java @@ -51,10 +51,10 @@ public class PlayerListener implements Listener { public void onPlayerInteract(PlayerInteractEvent event) { if (event.getAction() == Action.LEFT_CLICK_BLOCK || event.getAction() == Action.RIGHT_CLICK_BLOCK) { - if (event.getClickedBlock() != null && event.getPlayer().getItemInHand() != null) { + if (event.getClickedBlock() != null && event.getPlayer().getInventory().getItemInMainHand() != null) { - ItemStack itemInHand = event.getPlayer().getItemInHand(); - if (event.getPlayer().getItemInHand().getType() != null) { + ItemStack itemInHand = event.getPlayer().getInventory().getItemInMainHand(); + if (event.getPlayer().getInventory().getItemInMainHand().getType() != null) { if (itemInHand.getType() == Material.DIAMOND_SWORD || itemInHand.getType() == Material.GOLDEN_APPLE) { @@ -128,10 +128,10 @@ public class PlayerListener implements Listener { } if (event.getClickedBlock() != null) { - if (event.getPlayer().getItemInHand() != null) { + if (event.getPlayer().getInventory().getItemInMainHand() != null) { if (event.getClickedBlock().getType() == Material.JUKEBOX) { - ItemStack item = event.getPlayer().getItemInHand(); + ItemStack item = event.getPlayer().getInventory().getItemInMainHand(); Jukebox block = (Jukebox) event.getClickedBlock().getState(); if (!block.isPlaying()) { @@ -175,11 +175,11 @@ public class PlayerListener implements Listener { public void onPlayerQuit(PlayerQuitEvent event) { if (event.getPlayer().getEntityId() != PluginCore.HerobrineEntityID) { - if (PluginCore.getAICore().PlayerTarget == event.getPlayer() + if (AICore.PlayerTarget == event.getPlayer() && PluginCore.getAICore().getCoreTypeNow() == CoreType.GRAVEYARD && event.getPlayer().getLocation().getWorld() == Bukkit.getServer() .getWorld("world_herobrineai_graveyard") - && PluginCore.getAICore().isTarget) { + && AICore.isTarget) { if (Utils.getRandomGen().nextBoolean()) { event.getPlayer() diff --git a/src/org/jakub1221/herobrineai/misc/StructureLoader.java b/src/org/jakub1221/herobrineai/misc/StructureLoader.java index b3f2c43..309e0a2 100644 --- a/src/org/jakub1221/herobrineai/misc/StructureLoader.java +++ b/src/org/jakub1221/herobrineai/misc/StructureLoader.java @@ -3,7 +3,10 @@ package org.jakub1221.herobrineai.misc; import java.io.FileNotFoundException; import java.io.IOException; import java.io.InputStream; +import java.io.InputStreamReader; +import java.nio.charset.StandardCharsets; +import org.bukkit.Material; import org.bukkit.World; import org.bukkit.configuration.InvalidConfigurationException; import org.bukkit.configuration.file.YamlConfiguration; @@ -21,7 +24,7 @@ public class StructureLoader { file = new YamlConfiguration(); try { - file.load(inp); + file.load(new InputStreamReader(inp, StandardCharsets.UTF_8)); } catch (FileNotFoundException e) { e.printStackTrace(); @@ -41,12 +44,11 @@ public class StructureLoader { } public void Build(World world, int MainX, int MainY, int MainZ) { - + length = file.getInt("DATA.LENGTH") - 1; - for (current = 0; current <= length; current++) { - world.getBlockAt(MainX + file.getInt("DATA." + current + ".X"), - MainY + file.getInt("DATA." + current + ".Y"), MainZ + file.getInt("DATA." + current + ".Z")) - .setTypeIdAndData(+file.getInt("DATA." + current + ".ID"),(byte) +file.getInt("DATA." + current + ".DATA"), false); + for(current = 0; current <= length; current++) { + world.getBlockAt(MainX + file.getInt("DATA." + current + ".X"), MainY + file.getInt("DATA." + current + ".Y"), MainZ + file.getInt("DATA." + current + ".Z")) + .setType(Material.valueOf(file.getString("DATA." + current + ".MATERIAL"))); } } diff --git a/src/org/jakub1221/herobrineai/support/TownyHook.java b/src/org/jakub1221/herobrineai/support/TownyHook.java index 6f972f7..e412bb1 100644 --- a/src/org/jakub1221/herobrineai/support/TownyHook.java +++ b/src/org/jakub1221/herobrineai/support/TownyHook.java @@ -5,6 +5,7 @@ import org.bukkit.Location; import com.palmergames.bukkit.towny.Towny; import com.palmergames.bukkit.towny.object.TownBlock; +import com.palmergames.bukkit.towny.object.TownyUniverse; public class TownyHook { public boolean Check() { @@ -15,7 +16,8 @@ public class TownyHook { public boolean isSecuredArea(Location loc) { Towny towny = (Towny) Bukkit.getServer().getPluginManager().getPlugin("Towny"); - TownBlock block = towny.getTownyUniverse().getTownBlock(loc); + towny.getTownyUniverse(); + TownBlock block = TownyUniverse.getTownBlock(loc); return (block != null); } }