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

Continued updating codebase for 1.14.4

Browse Source
This commit is contained in:
David Berdik 2019-09-02 18:45:21 -04:00
parent ff1fb6f713
commit 2334f1fd78
10 changed files with 41 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/org/jakub1221/herobrineai/AI/cores/Graveyard.java
View File

@ -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);
}

3
src/org/jakub1221/herobrineai/AI/cores/Heads.java
View File

@ -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);

2
src/org/jakub1221/herobrineai/AI/cores/Pyramid.java
View File

@ -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;

3
src/org/jakub1221/herobrineai/AI/extensions/GraveyardWorld.java
View File

@ -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);
}
}

10
src/org/jakub1221/herobrineai/NPC/Entity/HumanEntity.java
View File

@ -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

2
src/org/jakub1221/herobrineai/listeners/EntityListener.java
View File

@ -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();

2
src/org/jakub1221/herobrineai/listeners/InventoryListener.java
View File

@ -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()));
}
}
}

5
src/org/jakub1221/herobrineai/listeners/PlayerListener.java
View File

@ -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);
}
}

36
src/org/jakub1221/herobrineai/misc/BlockChanger.java
View File

@ -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);
}

13
src/org/jakub1221/herobrineai/misc/ItemName.java
View File

@ -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;
}