Fork/herobrine-2
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More updating of the codebase for Spigot 1.14.4

Browse Source
This commit is contained in:
David Berdik 2019-09-02 16:46:54 -04:00
parent 7dfa84f6c6
commit 6a9e8876c5
9 changed files with 47 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/org/jakub1221/herobrineai/AI/AICore.java
View File

@ -623,7 +623,7 @@ public class AICore {
} }
public ItemStack createAncientSword() { public ItemStack createAncientSword() {
ItemStack item = new ItemStack(Material.GOLD_SWORD); ItemStack item = new ItemStack(Material.GOLDEN_SWORD);
String name = "Ancient Sword"; String name = "Ancient Sword";
ArrayList<String> lore = new ArrayList<String>(); ArrayList<String> lore = new ArrayList<String>();
lore.add("AncientSword"); lore.add("AncientSword");

14
src/org/jakub1221/herobrineai/AI/cores/RandomPosition.java
View File

@ -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.LAVA
&& world.getBlockAt(randx, randy - 1, randz).getType() != Material.GRASS && 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.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.WHEAT
&& world.getBlockAt(randx, randy - 1, randz).getType() != Material.TORCH && 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
&& 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.REDSTONE
&& world.getBlockAt(randx, randy - 1, randz).getType() != Material.STATIONARY_WATER
&& world.getBlockAt(randx, randy - 1, randz).getType() != Material.STATIONARY_LAVA) {
AICore.log.info("[HerobrineAI] RandomLocation " AICore.log.info("[HerobrineAI] RandomLocation "
+ world.getBlockAt(randx, randy - 1, randz).getType().toString() + " is X:" + randx + " Y:" + world.getBlockAt(randx, randy - 1, randz).getType().toString() + " is X:" + randx + " Y:"

30
src/org/jakub1221/herobrineai/HerobrineAI.java
View File

@ -151,20 +151,28 @@ public class HerobrineAI extends JavaPlugin implements Listener {
AllowedBlocks.add(Material.AIR); AllowedBlocks.add(Material.AIR);
AllowedBlocks.add(Material.SNOW); AllowedBlocks.add(Material.SNOW);
AllowedBlocks.add(Material.getMaterial(31)); AllowedBlocks.add(Material.RAIL);
AllowedBlocks.add(Material.RAILS); AllowedBlocks.add(Material.ACTIVATOR_RAIL);
AllowedBlocks.add(Material.getMaterial(32)); AllowedBlocks.add(Material.DETECTOR_RAIL);
AllowedBlocks.add(Material.getMaterial(37)); AllowedBlocks.add(Material.POWERED_RAIL);
AllowedBlocks.add(Material.getMaterial(38)); AllowedBlocks.add(Material.DEAD_BUSH);
AllowedBlocks.add(Material.getMaterial(70)); AllowedBlocks.add(Material.DANDELION);
AllowedBlocks.add(Material.getMaterial(72)); AllowedBlocks.add(Material.POPPY);
AllowedBlocks.add(Material.getMaterial(106)); 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.TORCH);
AllowedBlocks.add(Material.REDSTONE); AllowedBlocks.add(Material.REDSTONE);
AllowedBlocks.add(Material.REDSTONE_TORCH_ON); AllowedBlocks.add(Material.REDSTONE_TORCH);
AllowedBlocks.add(Material.REDSTONE_TORCH_OFF);
AllowedBlocks.add(Material.LEVER); AllowedBlocks.add(Material.LEVER);
AllowedBlocks.add(Material.getMaterial(77)); AllowedBlocks.add(Material.STONE_BUTTON);
AllowedBlocks.add(Material.LADDER); AllowedBlocks.add(Material.LADDER);
/* /*

10
src/org/jakub1221/herobrineai/NPC/NMS/BServer.java
View File

@ -1,5 +1,6 @@
package org.jakub1221.herobrineai.NPC.NMS; package org.jakub1221.herobrineai.NPC.NMS;
import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.logging.Level; import java.util.logging.Level;
@ -32,12 +33,12 @@ public class BServer {
} }
public void stop() { public void stop() {
mcServer.safeShutdown(); mcServer.safeShutdown(true);
} }
public void sendConsoleCommand(String cmd) { public void sendConsoleCommand(String cmd) {
if (mcServer.isRunning()) { if (mcServer.isRunning()) {
((DedicatedServer) mcServer).issueCommand(cmd, mcServer); ((DedicatedServer) mcServer).issueCommand(cmd, mcServer.getServerCommandListener());
} }
} }
@ -46,7 +47,10 @@ public class BServer {
} }
public List<WorldServer> getWorldServers() { public List<WorldServer> getWorldServers() {
return mcServer.worlds; List<WorldServer> worlds = new ArrayList<>();
for (WorldServer world:mcServer.getWorlds())
worlds.add(world);
return worlds;
} }
public Server getServer() { public Server getServer() {

3
src/org/jakub1221/herobrineai/commands/CmdExecutor.java
View File

@ -13,9 +13,6 @@ import org.jakub1221.herobrineai.HerobrineAI;
public class CmdExecutor implements CommandExecutor { public class CmdExecutor implements CommandExecutor {
@Deprecated
private HerobrineAI P_Core = null;
private Logger log = null; private Logger log = null;
private HashMap<String, SubCommand> subCommands = new HashMap<String, SubCommand>(); private HashMap<String, SubCommand> subCommands = new HashMap<String, SubCommand>();
private String[] helpCommandOrder = { private String[] helpCommandOrder = {

2
src/org/jakub1221/herobrineai/commands/CmdPosition.java
View File

@ -2,13 +2,11 @@ package org.jakub1221.herobrineai.commands;
import java.util.logging.Logger; import java.util.logging.Logger;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.jakub1221.herobrineai.HerobrineAI; import org.jakub1221.herobrineai.HerobrineAI;
import org.jakub1221.herobrineai.AI.AICore; import org.jakub1221.herobrineai.AI.AICore;
import org.jakub1221.herobrineai.AI.Core.CoreType;
public class CmdPosition extends SubCommand { public class CmdPosition extends SubCommand {

2
src/org/jakub1221/herobrineai/commands/CmdReload.java
View File

@ -2,11 +2,9 @@ package org.jakub1221.herobrineai.commands;
import java.util.logging.Logger; import java.util.logging.Logger;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.jakub1221.herobrineai.HerobrineAI; import org.jakub1221.herobrineai.HerobrineAI;
import org.jakub1221.herobrineai.AI.Core.CoreType;
public class CmdReload extends SubCommand { public class CmdReload extends SubCommand {

23
src/org/jakub1221/herobrineai/entity/CustomZombie.java
View File

@ -10,6 +10,7 @@ import org.bukkit.inventory.ItemStack;
import org.jakub1221.herobrineai.HerobrineAI; import org.jakub1221.herobrineai.HerobrineAI;
import org.jakub1221.herobrineai.Utils; 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.GenericAttributes;
import net.minecraft.server.v1_14_R1.World; 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) { private void spawnArtifactGuardian(Location loc) {
this.getAttributeInstance(GenericAttributes.c).setValue(HerobrineAI.getPluginCore().getConfigDB().npc.getDouble("npc.Guardian.Speed")); this.getAttributeInstance(GenericAttributes.MOVEMENT_SPEED).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.MAX_HEALTH).setValue(HerobrineAI.getPluginCore().getConfigDB().npc.getInt("npc.Guardian.HP"));
this.setHealth(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(); Zombie entityCast = (Zombie) this.getBukkitEntity();
entityCast.getEquipment().setItemInMainHand(new ItemStack(Material.GOLD_SWORD, 1)); entityCast.getEquipment().setItemInMainHand(new ItemStack(Material.GOLDEN_SWORD, 1));
entityCast.getEquipment().setHelmet(new ItemStack(Material.GOLD_HELMET, 1)); entityCast.getEquipment().setHelmet(new ItemStack(Material.GOLDEN_HELMET, 1));
entityCast.getEquipment().setChestplate(new ItemStack(Material.GOLD_CHESTPLATE, 1)); entityCast.getEquipment().setChestplate(new ItemStack(Material.GOLDEN_CHESTPLATE, 1));
entityCast.getEquipment().setLeggings(new ItemStack(Material.GOLD_LEGGINGS, 1)); entityCast.getEquipment().setLeggings(new ItemStack(Material.GOLDEN_LEGGINGS, 1));
entityCast.getEquipment().setBoots(new ItemStack(Material.GOLD_BOOTS, 1)); entityCast.getEquipment().setBoots(new ItemStack(Material.GOLDEN_BOOTS, 1));
this.getBukkitEntity().teleport(loc); 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) { private void spawnHerobrineWarrior(Location loc) {
this.getAttributeInstance(GenericAttributes.c).setValue(HerobrineAI.getPluginCore().getConfigDB().npc.getDouble("npc.Warrior.Speed")); this.getAttributeInstance(GenericAttributes.MOVEMENT_SPEED).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.MAX_HEALTH).setValue(HerobrineAI.getPluginCore().getConfigDB().npc.getInt("npc.Warrior.HP"));
this.setHealth(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(); Zombie entityCast = (Zombie) this.getBukkitEntity();

2
src/org/jakub1221/herobrineai/support/TownyHook.java
View File

@ -2,8 +2,6 @@ package org.jakub1221.herobrineai.support;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.Location; 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.Towny;
import com.palmergames.bukkit.towny.object.TownBlock; import com.palmergames.bukkit.towny.object.TownBlock;