From 6a9e8876c51c3e7f3813aa5855220e63e2ed453b Mon Sep 17 00:00:00 2001 From: David Berdik Date: Mon, 2 Sep 2019 16:46:54 -0400 Subject: [PATCH] More updating of the codebase for Spigot 1.14.4 --- src/org/jakub1221/herobrineai/AI/AICore.java | 2 +- .../herobrineai/AI/cores/RandomPosition.java | 14 +++++---- .../jakub1221/herobrineai/HerobrineAI.java | 30 ++++++++++++------- .../herobrineai/NPC/NMS/BServer.java | 10 +++++-- .../herobrineai/commands/CmdExecutor.java | 3 -- .../herobrineai/commands/CmdPosition.java | 2 -- .../herobrineai/commands/CmdReload.java | 2 -- .../herobrineai/entity/CustomZombie.java | 23 +++++++------- .../herobrineai/support/TownyHook.java | 2 -- 9 files changed, 47 insertions(+), 41 deletions(-) diff --git a/src/org/jakub1221/herobrineai/AI/AICore.java b/src/org/jakub1221/herobrineai/AI/AICore.java index 3e513e6..3071fea 100644 --- a/src/org/jakub1221/herobrineai/AI/AICore.java +++ b/src/org/jakub1221/herobrineai/AI/AICore.java @@ -623,7 +623,7 @@ public class AICore { } public ItemStack createAncientSword() { - ItemStack item = new ItemStack(Material.GOLD_SWORD); + ItemStack item = new ItemStack(Material.GOLDEN_SWORD); String name = "Ancient Sword"; ArrayList lore = new ArrayList(); lore.add("AncientSword"); diff --git a/src/org/jakub1221/herobrineai/AI/cores/RandomPosition.java b/src/org/jakub1221/herobrineai/AI/cores/RandomPosition.java index 9f95d90..c7acfaf 100644 --- a/src/org/jakub1221/herobrineai/AI/cores/RandomPosition.java +++ b/src/org/jakub1221/herobrineai/AI/cores/RandomPosition.java @@ -127,14 +127,16 @@ public class RandomPosition extends Core { && world.getBlockAt(randx, randy - 1, randz).getType() != Material.LAVA && world.getBlockAt(randx, randy - 1, randz).getType() != Material.GRASS && world.getBlockAt(randx, randy - 1, randz).getType() != Material.SNOW - && world.getBlockAt(randx, randy - 1, randz).getType() != Material.LEAVES + && world.getBlockAt(randx, randy - 1, randz).getType() != Material.ACACIA_LEAVES + && world.getBlockAt(randx, randy - 1, randz).getType() != Material.BIRCH_LEAVES + && world.getBlockAt(randx, randy - 1, randz).getType() != Material.DARK_OAK_LEAVES + && world.getBlockAt(randx, randy - 1, randz).getType() != Material.JUNGLE_LEAVES + && world.getBlockAt(randx, randy - 1, randz).getType() != Material.OAK_LEAVES + && world.getBlockAt(randx, randy - 1, randz).getType() != Material.SPRUCE_LEAVES && world.getBlockAt(randx, randy - 1, randz).getType() != Material.WHEAT && world.getBlockAt(randx, randy - 1, randz).getType() != Material.TORCH - && world.getBlockAt(randx, randy - 1, randz).getType() != Material.REDSTONE_TORCH_OFF - && world.getBlockAt(randx, randy - 1, randz).getType() != Material.REDSTONE_TORCH_ON - && world.getBlockAt(randx, randy - 1, randz).getType() != Material.REDSTONE - && world.getBlockAt(randx, randy - 1, randz).getType() != Material.STATIONARY_WATER - && world.getBlockAt(randx, randy - 1, randz).getType() != Material.STATIONARY_LAVA) { + && world.getBlockAt(randx, randy - 1, randz).getType() != Material.REDSTONE_TORCH + && world.getBlockAt(randx, randy - 1, randz).getType() != Material.REDSTONE) { AICore.log.info("[HerobrineAI] RandomLocation " + world.getBlockAt(randx, randy - 1, randz).getType().toString() + " is X:" + randx + " Y:" diff --git a/src/org/jakub1221/herobrineai/HerobrineAI.java b/src/org/jakub1221/herobrineai/HerobrineAI.java index 030d01a..e2c221e 100644 --- a/src/org/jakub1221/herobrineai/HerobrineAI.java +++ b/src/org/jakub1221/herobrineai/HerobrineAI.java @@ -151,20 +151,28 @@ public class HerobrineAI extends JavaPlugin implements Listener { AllowedBlocks.add(Material.AIR); AllowedBlocks.add(Material.SNOW); - AllowedBlocks.add(Material.getMaterial(31)); - AllowedBlocks.add(Material.RAILS); - AllowedBlocks.add(Material.getMaterial(32)); - AllowedBlocks.add(Material.getMaterial(37)); - AllowedBlocks.add(Material.getMaterial(38)); - AllowedBlocks.add(Material.getMaterial(70)); - AllowedBlocks.add(Material.getMaterial(72)); - AllowedBlocks.add(Material.getMaterial(106)); + AllowedBlocks.add(Material.RAIL); + AllowedBlocks.add(Material.ACTIVATOR_RAIL); + AllowedBlocks.add(Material.DETECTOR_RAIL); + AllowedBlocks.add(Material.POWERED_RAIL); + AllowedBlocks.add(Material.DEAD_BUSH); + AllowedBlocks.add(Material.DANDELION); + AllowedBlocks.add(Material.POPPY); + AllowedBlocks.add(Material.ACACIA_PRESSURE_PLATE); + AllowedBlocks.add(Material.BIRCH_PRESSURE_PLATE); + AllowedBlocks.add(Material.DARK_OAK_PRESSURE_PLATE); + AllowedBlocks.add(Material.HEAVY_WEIGHTED_PRESSURE_PLATE); + AllowedBlocks.add(Material.JUNGLE_PRESSURE_PLATE); + AllowedBlocks.add(Material.LIGHT_WEIGHTED_PRESSURE_PLATE); + AllowedBlocks.add(Material.OAK_PRESSURE_PLATE); + AllowedBlocks.add(Material.SPRUCE_PRESSURE_PLATE); + AllowedBlocks.add(Material.STONE_PRESSURE_PLATE); + AllowedBlocks.add(Material.VINE); AllowedBlocks.add(Material.TORCH); AllowedBlocks.add(Material.REDSTONE); - AllowedBlocks.add(Material.REDSTONE_TORCH_ON); - AllowedBlocks.add(Material.REDSTONE_TORCH_OFF); + AllowedBlocks.add(Material.REDSTONE_TORCH); AllowedBlocks.add(Material.LEVER); - AllowedBlocks.add(Material.getMaterial(77)); + AllowedBlocks.add(Material.STONE_BUTTON); AllowedBlocks.add(Material.LADDER); /* diff --git a/src/org/jakub1221/herobrineai/NPC/NMS/BServer.java b/src/org/jakub1221/herobrineai/NPC/NMS/BServer.java index c963504..a625775 100644 --- a/src/org/jakub1221/herobrineai/NPC/NMS/BServer.java +++ b/src/org/jakub1221/herobrineai/NPC/NMS/BServer.java @@ -1,5 +1,6 @@ package org.jakub1221.herobrineai.NPC.NMS; +import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.logging.Level; @@ -32,12 +33,12 @@ public class BServer { } public void stop() { - mcServer.safeShutdown(); + mcServer.safeShutdown(true); } public void sendConsoleCommand(String cmd) { if (mcServer.isRunning()) { - ((DedicatedServer) mcServer).issueCommand(cmd, mcServer); + ((DedicatedServer) mcServer).issueCommand(cmd, mcServer.getServerCommandListener()); } } @@ -46,7 +47,10 @@ public class BServer { } public List getWorldServers() { - return mcServer.worlds; + List worlds = new ArrayList<>(); + for (WorldServer world:mcServer.getWorlds()) + worlds.add(world); + return worlds; } public Server getServer() { diff --git a/src/org/jakub1221/herobrineai/commands/CmdExecutor.java b/src/org/jakub1221/herobrineai/commands/CmdExecutor.java index b7f684b..c0a15ae 100644 --- a/src/org/jakub1221/herobrineai/commands/CmdExecutor.java +++ b/src/org/jakub1221/herobrineai/commands/CmdExecutor.java @@ -13,9 +13,6 @@ import org.jakub1221.herobrineai.HerobrineAI; public class CmdExecutor implements CommandExecutor { - @Deprecated - private HerobrineAI P_Core = null; - private Logger log = null; private HashMap subCommands = new HashMap(); private String[] helpCommandOrder = { diff --git a/src/org/jakub1221/herobrineai/commands/CmdPosition.java b/src/org/jakub1221/herobrineai/commands/CmdPosition.java index c513721..02be7b4 100644 --- a/src/org/jakub1221/herobrineai/commands/CmdPosition.java +++ b/src/org/jakub1221/herobrineai/commands/CmdPosition.java @@ -2,13 +2,11 @@ package org.jakub1221.herobrineai.commands; import java.util.logging.Logger; -import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.Location; import org.bukkit.entity.Player; import org.jakub1221.herobrineai.HerobrineAI; import org.jakub1221.herobrineai.AI.AICore; -import org.jakub1221.herobrineai.AI.Core.CoreType; public class CmdPosition extends SubCommand { diff --git a/src/org/jakub1221/herobrineai/commands/CmdReload.java b/src/org/jakub1221/herobrineai/commands/CmdReload.java index 57ccf7f..272d28c 100644 --- a/src/org/jakub1221/herobrineai/commands/CmdReload.java +++ b/src/org/jakub1221/herobrineai/commands/CmdReload.java @@ -2,11 +2,9 @@ package org.jakub1221.herobrineai.commands; import java.util.logging.Logger; -import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.entity.Player; import org.jakub1221.herobrineai.HerobrineAI; -import org.jakub1221.herobrineai.AI.Core.CoreType; public class CmdReload extends SubCommand { diff --git a/src/org/jakub1221/herobrineai/entity/CustomZombie.java b/src/org/jakub1221/herobrineai/entity/CustomZombie.java index f436049..a779ea3 100644 --- a/src/org/jakub1221/herobrineai/entity/CustomZombie.java +++ b/src/org/jakub1221/herobrineai/entity/CustomZombie.java @@ -10,6 +10,7 @@ import org.bukkit.inventory.ItemStack; import org.jakub1221.herobrineai.HerobrineAI; import org.jakub1221.herobrineai.Utils; +import net.minecraft.server.v1_14_R1.ChatComponentText; import net.minecraft.server.v1_14_R1.GenericAttributes; import net.minecraft.server.v1_14_R1.World; @@ -29,19 +30,19 @@ public class CustomZombie extends net.minecraft.server.v1_14_R1.EntityZombie imp private void spawnArtifactGuardian(Location loc) { - this.getAttributeInstance(GenericAttributes.c).setValue(HerobrineAI.getPluginCore().getConfigDB().npc.getDouble("npc.Guardian.Speed")); - this.getAttributeInstance(GenericAttributes.maxHealth).setValue(HerobrineAI.getPluginCore().getConfigDB().npc.getInt("npc.Guardian.HP")); + this.getAttributeInstance(GenericAttributes.MOVEMENT_SPEED).setValue(HerobrineAI.getPluginCore().getConfigDB().npc.getDouble("npc.Guardian.Speed")); + this.getAttributeInstance(GenericAttributes.MAX_HEALTH).setValue(HerobrineAI.getPluginCore().getConfigDB().npc.getInt("npc.Guardian.HP")); this.setHealth(HerobrineAI.getPluginCore().getConfigDB().npc.getInt("npc.Guardian.HP")); - this.setCustomName("Artifact Guardian"); + this.setCustomName(new ChatComponentText("Artifact Guardian")); Zombie entityCast = (Zombie) this.getBukkitEntity(); - entityCast.getEquipment().setItemInMainHand(new ItemStack(Material.GOLD_SWORD, 1)); - entityCast.getEquipment().setHelmet(new ItemStack(Material.GOLD_HELMET, 1)); - entityCast.getEquipment().setChestplate(new ItemStack(Material.GOLD_CHESTPLATE, 1)); - entityCast.getEquipment().setLeggings(new ItemStack(Material.GOLD_LEGGINGS, 1)); - entityCast.getEquipment().setBoots(new ItemStack(Material.GOLD_BOOTS, 1)); + entityCast.getEquipment().setItemInMainHand(new ItemStack(Material.GOLDEN_SWORD, 1)); + entityCast.getEquipment().setHelmet(new ItemStack(Material.GOLDEN_HELMET, 1)); + entityCast.getEquipment().setChestplate(new ItemStack(Material.GOLDEN_CHESTPLATE, 1)); + entityCast.getEquipment().setLeggings(new ItemStack(Material.GOLDEN_LEGGINGS, 1)); + entityCast.getEquipment().setBoots(new ItemStack(Material.GOLDEN_BOOTS, 1)); this.getBukkitEntity().teleport(loc); @@ -49,11 +50,11 @@ public class CustomZombie extends net.minecraft.server.v1_14_R1.EntityZombie imp private void spawnHerobrineWarrior(Location loc) { - this.getAttributeInstance(GenericAttributes.c).setValue(HerobrineAI.getPluginCore().getConfigDB().npc.getDouble("npc.Warrior.Speed")); - this.getAttributeInstance(GenericAttributes.maxHealth).setValue(HerobrineAI.getPluginCore().getConfigDB().npc.getInt("npc.Warrior.HP")); + this.getAttributeInstance(GenericAttributes.MOVEMENT_SPEED).setValue(HerobrineAI.getPluginCore().getConfigDB().npc.getDouble("npc.Warrior.Speed")); + this.getAttributeInstance(GenericAttributes.MAX_HEALTH).setValue(HerobrineAI.getPluginCore().getConfigDB().npc.getInt("npc.Warrior.HP")); this.setHealth(HerobrineAI.getPluginCore().getConfigDB().npc.getInt("npc.Warrior.HP")); - this.setCustomName("Herobrine Warrior"); + this.setCustomName(new ChatComponentText("Herobrine Warrior")); Zombie entityCast = (Zombie) this.getBukkitEntity(); diff --git a/src/org/jakub1221/herobrineai/support/TownyHook.java b/src/org/jakub1221/herobrineai/support/TownyHook.java index 4b40122..6f972f7 100644 --- a/src/org/jakub1221/herobrineai/support/TownyHook.java +++ b/src/org/jakub1221/herobrineai/support/TownyHook.java @@ -2,8 +2,6 @@ package org.jakub1221.herobrineai.support; import org.bukkit.Bukkit; import org.bukkit.Location; -import org.jakub1221.customitems.API; -import org.jakub1221.customitems.CustomItems; import com.palmergames.bukkit.towny.Towny; import com.palmergames.bukkit.towny.object.TownBlock;