Fork/herobrine-for-bukkit-or-spigot
Archived
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated plugin from Bukkit/Spigot 1.8.3 to 1.8.6.

Browse Source
This commit is contained in:
David Berdik 2015-06-02 16:17:40 -04:00
parent f1b0cb39cd
commit 9f048a3326
17 changed files with 45 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.classpath
View File

@ -2,11 +2,6 @@
<classpath> <classpath>
<classpathentry kind="src" path="src"/> <classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="lib" path="libs/craftbukkit-1.8.3.jar">
<attributes>
<attribute name="javadoc_location" value="https://hub.spigotmc.org/javadocs/spigot/"/>
</attributes>
</classpathentry>
<classpathentry kind="lib" path="libs/CustomItems.jar"/> <classpathentry kind="lib" path="libs/CustomItems.jar"/>
<classpathentry kind="lib" path="libs/Factions.jar"/> <classpathentry kind="lib" path="libs/Factions.jar"/>
<classpathentry kind="lib" path="libs/GriefPrevention.jar"/> <classpathentry kind="lib" path="libs/GriefPrevention.jar"/>
@ -16,5 +11,6 @@
<classpathentry kind="lib" path="libs/Towny.jar"/> <classpathentry kind="lib" path="libs/Towny.jar"/>
<classpathentry kind="lib" path="libs/worldguard-6.0.0-beta-05.jar"/> <classpathentry kind="lib" path="libs/worldguard-6.0.0-beta-05.jar"/>
<classpathentry kind="lib" path="libs/worldedit-bukkit-6.0.jar"/> <classpathentry kind="lib" path="libs/worldedit-bukkit-6.0.jar"/>
<classpathentry kind="lib" path="libs/craftbukkit-1.8.6.jar"/>
<classpathentry kind="output" path="bin"/> <classpathentry kind="output" path="bin"/>
</classpath> </classpath>

2
.gitignore vendored
View File

@ -1,2 +1,2 @@
/bin/ /bin/
/libs/craftbukkit-1.8.3.jar /libs/craftbukkit-1.8.6.jar

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

@ -852,7 +852,7 @@ public class CmdExecutor implements CommandExecutor {
double x = P_Core.herobrineNPC.getNMSEntity().locX; double x = P_Core.herobrineNPC.getNMSEntity().locX;
double y = P_Core.herobrineNPC.getNMSEntity().locY; double y = P_Core.herobrineNPC.getNMSEntity().locY;
double z = P_Core.herobrineNPC.getNMSEntity().locZ; double z = P_Core.herobrineNPC.getNMSEntity().locZ;
net.minecraft.server.v1_8_R2.World world = P_Core.herobrineNPC.getNMSEntity().getWorld(); net.minecraft.server.v1_8_R3.World world = P_Core.herobrineNPC.getNMSEntity().getWorld();
sender.sendMessage(red + "Herobrine's location world: " + red sender.sendMessage(red + "Herobrine's location world: " + red
+ world + red + " x: " + red + x + red + " y: " + red + world + red + " x: " + red + x + red + " y: " + red
+ y + red + " z: " + red + y); + y + red + " z: " + red + y);

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

@ -3,16 +3,16 @@ package org.jakub1221.herobrineai.listeners;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Random; import java.util.Random;
import net.minecraft.server.v1_8_R2.EntityPlayer; import net.minecraft.server.v1_8_R3.EntityPlayer;
import net.minecraft.server.v1_8_R2.PacketPlayOutPlayerInfo.EnumPlayerInfoAction; import net.minecraft.server.v1_8_R3.PacketPlayOutPlayerInfo.EnumPlayerInfoAction;
import net.minecraft.server.v1_8_R2.PacketPlayOutPlayerInfo; import net.minecraft.server.v1_8_R3.PacketPlayOutPlayerInfo;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.block.Jukebox; import org.bukkit.block.Jukebox;
import org.bukkit.craftbukkit.v1_8_R2.entity.CraftPlayer; import org.bukkit.craftbukkit.v1_8_R3.entity.CraftPlayer;
import org.bukkit.entity.LivingEntity; import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;

4
src/org/jakub1221/herobrineai/nms/NPC/NPCCore.java
View File

@ -5,8 +5,8 @@ import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.UUID; import java.util.UUID;
import net.minecraft.server.v1_8_R2.Entity; import net.minecraft.server.v1_8_R3.Entity;
import net.minecraft.server.v1_8_R2.PlayerInteractManager; import net.minecraft.server.v1_8_R3.PlayerInteractManager;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.Location; import org.bukkit.Location;

14
src/org/jakub1221/herobrineai/nms/NPC/entity/HumanEntity.java
View File

@ -1,15 +1,15 @@
package org.jakub1221.herobrineai.nms.NPC.entity; package org.jakub1221.herobrineai.nms.NPC.entity;
import net.minecraft.server.v1_8_R2.Entity; import net.minecraft.server.v1_8_R3.Entity;
import net.minecraft.server.v1_8_R2.EntityHuman; import net.minecraft.server.v1_8_R3.EntityHuman;
import net.minecraft.server.v1_8_R2.EntityPlayer; import net.minecraft.server.v1_8_R3.EntityPlayer;
import net.minecraft.server.v1_8_R2.WorldSettings.EnumGamemode; import net.minecraft.server.v1_8_R3.WorldSettings.EnumGamemode;
import net.minecraft.server.v1_8_R2.PlayerInteractManager; import net.minecraft.server.v1_8_R3.PlayerInteractManager;
import com.mojang.authlib.GameProfile; import com.mojang.authlib.GameProfile;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.craftbukkit.v1_8_R2.CraftServer; import org.bukkit.craftbukkit.v1_8_R3.CraftServer;
import org.bukkit.craftbukkit.v1_8_R2.entity.CraftPlayer; import org.bukkit.craftbukkit.v1_8_R3.entity.CraftPlayer;
import org.jakub1221.herobrineai.nms.NPC.NPCCore; import org.jakub1221.herobrineai.nms.NPC.NPCCore;
import org.jakub1221.herobrineai.nms.NPC.network.NetworkHandler; import org.jakub1221.herobrineai.nms.NPC.network.NetworkHandler;
import org.jakub1221.herobrineai.nms.NPC.utils.NMSWorldAccess; import org.jakub1221.herobrineai.nms.NPC.utils.NMSWorldAccess;

6
src/org/jakub1221/herobrineai/nms/NPC/entity/HumanNPC.java
View File

@ -1,8 +1,8 @@
package org.jakub1221.herobrineai.nms.NPC.entity; package org.jakub1221.herobrineai.nms.NPC.entity;
import net.minecraft.server.v1_8_R2.EntityPlayer; import net.minecraft.server.v1_8_R3.EntityPlayer;
import net.minecraft.server.v1_8_R2.PacketPlayInArmAnimation; import net.minecraft.server.v1_8_R3.PacketPlayInArmAnimation;
import net.minecraft.server.v1_8_R2.WorldServer; import net.minecraft.server.v1_8_R3.WorldServer;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.entity.LivingEntity; import org.bukkit.entity.LivingEntity;

4
src/org/jakub1221/herobrineai/nms/NPC/network/NetworkCore.java
View File

@ -1,7 +1,7 @@
package org.jakub1221.herobrineai.nms.NPC.network; package org.jakub1221.herobrineai.nms.NPC.network;
import net.minecraft.server.v1_8_R2.EnumProtocolDirection; import net.minecraft.server.v1_8_R3.EnumProtocolDirection;
import net.minecraft.server.v1_8_R2.NetworkManager; import net.minecraft.server.v1_8_R3.NetworkManager;
public class NetworkCore extends NetworkManager { public class NetworkCore extends NetworkManager {

6
src/org/jakub1221/herobrineai/nms/NPC/network/NetworkHandler.java
View File

@ -1,8 +1,8 @@
package org.jakub1221.herobrineai.nms.NPC.network; package org.jakub1221.herobrineai.nms.NPC.network;
import net.minecraft.server.v1_8_R2.EntityPlayer; import net.minecraft.server.v1_8_R3.EntityPlayer;
import net.minecraft.server.v1_8_R2.Packet; import net.minecraft.server.v1_8_R3.Packet;
import net.minecraft.server.v1_8_R2.PlayerConnection; import net.minecraft.server.v1_8_R3.PlayerConnection;
import org.jakub1221.herobrineai.nms.NPC.NPCCore; import org.jakub1221.herobrineai.nms.NPC.NPCCore;

4
src/org/jakub1221/herobrineai/nms/NPC/network/NetworkUtils.java
View File

@ -1,11 +1,11 @@
package org.jakub1221.herobrineai.nms.NPC.network; package org.jakub1221.herobrineai.nms.NPC.network;
import net.minecraft.server.v1_8_R2.Packet; import net.minecraft.server.v1_8_R3.Packet;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.World; import org.bukkit.World;
import org.bukkit.craftbukkit.v1_8_R2.entity.CraftPlayer; import org.bukkit.craftbukkit.v1_8_R3.entity.CraftPlayer;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;

6
src/org/jakub1221/herobrineai/nms/NPC/utils/NMSServerAccess.java
View File

@ -3,12 +3,12 @@ package org.jakub1221.herobrineai.nms.NPC.utils;
import java.util.List; import java.util.List;
import java.util.logging.Logger; import java.util.logging.Logger;
import net.minecraft.server.v1_8_R2.MinecraftServer; import net.minecraft.server.v1_8_R3.MinecraftServer;
import net.minecraft.server.v1_8_R2.WorldServer; import net.minecraft.server.v1_8_R3.WorldServer;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.Server; import org.bukkit.Server;
import org.bukkit.craftbukkit.v1_8_R2.CraftServer; import org.bukkit.craftbukkit.v1_8_R3.CraftServer;
public class NMSServerAccess { public class NMSServerAccess {

6
src/org/jakub1221/herobrineai/nms/NPC/utils/NMSWorldAccess.java
View File

@ -3,11 +3,11 @@ package org.jakub1221.herobrineai.nms.NPC.utils;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
import net.minecraft.server.v1_8_R2.PlayerChunkMap; import net.minecraft.server.v1_8_R3.PlayerChunkMap;
import net.minecraft.server.v1_8_R2.WorldServer; import net.minecraft.server.v1_8_R3.WorldServer;
import org.bukkit.World; import org.bukkit.World;
import org.bukkit.craftbukkit.v1_8_R2.CraftWorld; import org.bukkit.craftbukkit.v1_8_R3.CraftWorld;
public class NMSWorldAccess { public class NMSWorldAccess {

8
src/org/jakub1221/herobrineai/nms/entity/CustomSkeleton.java
View File

@ -2,9 +2,9 @@ package org.jakub1221.herobrineai.nms.entity;
import java.util.Random; import java.util.Random;
import net.minecraft.server.v1_8_R2.EntitySkeleton; import net.minecraft.server.v1_8_R3.EntitySkeleton;
import net.minecraft.server.v1_8_R2.GenericAttributes; import net.minecraft.server.v1_8_R3.GenericAttributes;
import net.minecraft.server.v1_8_R2.World; import net.minecraft.server.v1_8_R3.World;
import org.bukkit.Color; import org.bukkit.Color;
import org.bukkit.Location; import org.bukkit.Location;
@ -28,7 +28,7 @@ public class CustomSkeleton extends EntitySkeleton implements CustomEntity {
} }
public void spawnDemon(final Location loc) { public void spawnDemon(final Location loc) {
getAttributeInstance(GenericAttributes.d).setValue(HerobrineAI.getPluginCore().getConfigDB().npc.getDouble("npc.Demon.Speed")); getAttributeInstance(GenericAttributes.c).setValue(HerobrineAI.getPluginCore().getConfigDB().npc.getDouble("npc.Demon.Speed"));
getAttributeInstance(GenericAttributes.maxHealth).setValue(HerobrineAI.getPluginCore().getConfigDB().npc.getInt("npc.Demon.HP")); getAttributeInstance(GenericAttributes.maxHealth).setValue(HerobrineAI.getPluginCore().getConfigDB().npc.getInt("npc.Demon.HP"));
setHealth(HerobrineAI.getPluginCore().getConfigDB().npc.getInt("npc.Demon.HP")); setHealth(HerobrineAI.getPluginCore().getConfigDB().npc.getInt("npc.Demon.HP"));
setCustomName("Demon"); setCustomName("Demon");

10
src/org/jakub1221/herobrineai/nms/entity/CustomZombie.java
View File

@ -2,9 +2,9 @@ package org.jakub1221.herobrineai.nms.entity;
import java.util.Random; import java.util.Random;
import net.minecraft.server.v1_8_R2.EntityZombie; import net.minecraft.server.v1_8_R3.EntityZombie;
import net.minecraft.server.v1_8_R2.GenericAttributes; import net.minecraft.server.v1_8_R3.GenericAttributes;
import net.minecraft.server.v1_8_R2.World; import net.minecraft.server.v1_8_R3.World;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.Material; import org.bukkit.Material;
@ -28,7 +28,7 @@ public class CustomZombie extends EntityZombie implements CustomEntity {
} }
private void spawnArtifactGuardian(final Location loc) { private void spawnArtifactGuardian(final Location loc) {
getAttributeInstance(GenericAttributes.d).setValue(HerobrineAI.getPluginCore().getConfigDB().npc.getDouble("npc.Guardian.Speed")); getAttributeInstance(GenericAttributes.c).setValue(HerobrineAI.getPluginCore().getConfigDB().npc.getDouble("npc.Guardian.Speed"));
getAttributeInstance(GenericAttributes.maxHealth).setValue(HerobrineAI.getPluginCore().getConfigDB().npc.getInt("npc.Guardian.HP")); getAttributeInstance(GenericAttributes.maxHealth).setValue(HerobrineAI.getPluginCore().getConfigDB().npc.getInt("npc.Guardian.HP"));
setHealth(HerobrineAI.getPluginCore().getConfigDB().npc.getInt("npc.Guardian.HP")); setHealth(HerobrineAI.getPluginCore().getConfigDB().npc.getInt("npc.Guardian.HP"));
setCustomName("Artifact Guardian"); setCustomName("Artifact Guardian");
@ -41,7 +41,7 @@ public class CustomZombie extends EntityZombie implements CustomEntity {
} }
private void spawnHerobrineWarrior(final Location loc) { private void spawnHerobrineWarrior(final Location loc) {
getAttributeInstance(GenericAttributes.d).setValue(HerobrineAI.getPluginCore().getConfigDB().npc.getDouble("npc.Warrior.Speed")); getAttributeInstance(GenericAttributes.c).setValue(HerobrineAI.getPluginCore().getConfigDB().npc.getDouble("npc.Warrior.Speed"));
getAttributeInstance(GenericAttributes.maxHealth).setValue(HerobrineAI.getPluginCore().getConfigDB().npc.getInt("npc.Warrior.HP")); getAttributeInstance(GenericAttributes.maxHealth).setValue(HerobrineAI.getPluginCore().getConfigDB().npc.getInt("npc.Warrior.HP"));
setHealth(HerobrineAI.getPluginCore().getConfigDB().npc.getInt("npc.Warrior.HP")); setHealth(HerobrineAI.getPluginCore().getConfigDB().npc.getInt("npc.Warrior.HP"));
setCustomName("Herobrine?s Warrior"); setCustomName("Herobrine?s Warrior");

2
src/org/jakub1221/herobrineai/nms/entity/EntityInjector.java
View File

@ -4,7 +4,7 @@ import java.lang.reflect.Field;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.util.Map; import java.util.Map;
import net.minecraft.server.v1_8_R2.EntityTypes; import net.minecraft.server.v1_8_R3.EntityTypes;
import org.jakub1221.herobrineai.HerobrineAI; import org.jakub1221.herobrineai.HerobrineAI;

4
src/org/jakub1221/herobrineai/nms/entity/EntityManager.java
View File

@ -3,10 +3,10 @@ package org.jakub1221.herobrineai.nms.entity;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import net.minecraft.server.v1_8_R2.World; import net.minecraft.server.v1_8_R3.World;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.craftbukkit.v1_8_R2.CraftWorld; import org.bukkit.craftbukkit.v1_8_R3.CraftWorld;
public class EntityManager { public class EntityManager {

2
src/plugin.yml
View File

@ -1,6 +1,6 @@
name: Herobrine name: Herobrine
main: org.jakub1221.herobrineai.HerobrineAI main: org.jakub1221.herobrineai.HerobrineAI
version: 1.1.2 version: 1.2.0
commands: commands:
herobrine: herobrine:
description: Main command. description: Main command.