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

Fixed CraftBukkit imports to match 1.8.3. All but two imports have been fixed. The two remaining imports don't seem to follow the same naming conventions as the other imports for this update of CraftBukkit, so I have left them untouched for now.

Browse Source
This commit is contained in:
David Berdik 2015-03-22 21:36:38 -04:00
parent 7e6b75533b
commit d079cdc0f7
15 changed files with 42 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.classpath
View File

@ -3,17 +3,17 @@
<classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="lib" path="libs/craftbukkit-1.8.3.jar">
<attributes>
<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/WorldGuard.jar"/>
<classpathentry kind="lib" path="libs/Factions.jar"/>
<classpathentry kind="lib" path="libs/MassiveCore.jar"/>
<classpathentry kind="lib" path="libs/GriefPrevention.jar"/>
<classpathentry kind="lib" path="libs/MassiveCore.jar"/>
<classpathentry kind="lib" path="libs/PreciousStones.jar"/>
<classpathentry kind="lib" path="libs/Residence.jar"/>
<classpathentry kind="lib" path="libs/Towny.jar"/>
<classpathentry kind="lib" path="libs/WorldGuard.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>

2
.settings/org.eclipse.core.resources.prefs
View File

@ -1,2 +0,0 @@
eclipse.preferences.version=1
encoding/<project>=UTF-8

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.Random;
import net.minecraft.server.v1_8_R1.EntityPlayer;
import net.minecraft.server.v1_8_R1.EnumPlayerInfoAction;
import net.minecraft.server.v1_8_R1.PacketPlayOutPlayerInfo;
import net.minecraft.server.v1_8_R2.EntityPlayer;
import net.minecraft.server.v1_8_R2.EnumPlayerInfoAction;
import net.minecraft.server.v1_8_R2.PacketPlayOutPlayerInfo;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.block.Jukebox;
import org.bukkit.craftbukkit.v1_8_R1.entity.CraftPlayer;
import org.bukkit.craftbukkit.v1_8_R2.entity.CraftPlayer;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player;
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.UUID;
import net.minecraft.server.v1_8_R1.Entity;
import net.minecraft.server.v1_8_R1.PlayerInteractManager;
import net.minecraft.server.v1_8_R2.Entity;
import net.minecraft.server.v1_8_R2.PlayerInteractManager;
import org.bukkit.Bukkit;
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;
import net.minecraft.server.v1_8_R1.Entity;
import net.minecraft.server.v1_8_R1.EntityHuman;
import net.minecraft.server.v1_8_R1.EntityPlayer;
import net.minecraft.server.v1_8_R1.EnumGamemode;
import net.minecraft.server.v1_8_R1.PlayerInteractManager;
import net.minecraft.server.v1_8_R2.Entity;
import net.minecraft.server.v1_8_R2.EntityHuman;
import net.minecraft.server.v1_8_R2.EntityPlayer;
import net.minecraft.server.v1_8_R2.EnumGamemode;
import net.minecraft.server.v1_8_R2.PlayerInteractManager;
import com.mojang.authlib.GameProfile;
import org.bukkit.Bukkit;
import org.bukkit.craftbukkit.v1_8_R1.CraftServer;
import org.bukkit.craftbukkit.v1_8_R1.entity.CraftPlayer;
import org.bukkit.craftbukkit.v1_8_R2.CraftServer;
import org.bukkit.craftbukkit.v1_8_R2.entity.CraftPlayer;
import org.jakub1221.herobrineai.nms.NPC.NPCCore;
import org.jakub1221.herobrineai.nms.NPC.network.NetworkHandler;
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;
import net.minecraft.server.v1_8_R1.EntityPlayer;
import net.minecraft.server.v1_8_R1.PacketPlayInArmAnimation;
import net.minecraft.server.v1_8_R1.WorldServer;
import net.minecraft.server.v1_8_R2.EntityPlayer;
import net.minecraft.server.v1_8_R2.PacketPlayInArmAnimation;
import net.minecraft.server.v1_8_R2.WorldServer;
import org.bukkit.Location;
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;
import net.minecraft.server.v1_8_R1.EnumProtocolDirection;
import net.minecraft.server.v1_8_R1.NetworkManager;
import net.minecraft.server.v1_8_R2.EnumProtocolDirection;
import net.minecraft.server.v1_8_R2.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;
import net.minecraft.server.v1_8_R1.EntityPlayer;
import net.minecraft.server.v1_8_R1.Packet;
import net.minecraft.server.v1_8_R1.PlayerConnection;
import net.minecraft.server.v1_8_R2.EntityPlayer;
import net.minecraft.server.v1_8_R2.Packet;
import net.minecraft.server.v1_8_R2.PlayerConnection;
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;
import net.minecraft.server.v1_8_R1.Packet;
import net.minecraft.server.v1_8_R2.Packet;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.World;
import org.bukkit.craftbukkit.v1_8_R1.entity.CraftPlayer;
import org.bukkit.craftbukkit.v1_8_R2.entity.CraftPlayer;
import org.bukkit.entity.Player;
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.logging.Logger;
import net.minecraft.server.v1_8_R1.MinecraftServer;
import net.minecraft.server.v1_8_R1.WorldServer;
import net.minecraft.server.v1_8_R2.MinecraftServer;
import net.minecraft.server.v1_8_R2.WorldServer;
import org.bukkit.Bukkit;
import org.bukkit.Server;
import org.bukkit.craftbukkit.v1_8_R1.CraftServer;
import org.bukkit.craftbukkit.v1_8_R2.CraftServer;
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.Logger;
import net.minecraft.server.v1_8_R1.PlayerChunkMap;
import net.minecraft.server.v1_8_R1.WorldServer;
import net.minecraft.server.v1_8_R2.PlayerChunkMap;
import net.minecraft.server.v1_8_R2.WorldServer;
import org.bukkit.World;
import org.bukkit.craftbukkit.v1_8_R1.CraftWorld;
import org.bukkit.craftbukkit.v1_8_R2.CraftWorld;
public class NMSWorldAccess {

6
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 net.minecraft.server.v1_8_R1.EntitySkeleton;
import net.minecraft.server.v1_8_R1.GenericAttributes;
import net.minecraft.server.v1_8_R1.World;
import net.minecraft.server.v1_8_R2.EntitySkeleton;
import net.minecraft.server.v1_8_R2.GenericAttributes;
import net.minecraft.server.v1_8_R2.World;
import org.bukkit.Color;
import org.bukkit.Location;

6
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 net.minecraft.server.v1_8_R1.EntityZombie;
import net.minecraft.server.v1_8_R1.GenericAttributes;
import net.minecraft.server.v1_8_R1.World;
import net.minecraft.server.v1_8_R2.EntityZombie;
import net.minecraft.server.v1_8_R2.GenericAttributes;
import net.minecraft.server.v1_8_R2.World;
import org.bukkit.Location;
import org.bukkit.Material;

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.util.Map;
import net.minecraft.server.v1_8_R1.EntityTypes;
import net.minecraft.server.v1_8_R2.EntityTypes;
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.Map;
import net.minecraft.server.v1_8_R1.World;
import net.minecraft.server.v1_8_R2.World;
import org.bukkit.Location;
import org.bukkit.craftbukkit.v1_8_R1.CraftWorld;
import org.bukkit.craftbukkit.v1_8_R2.CraftWorld;
public class EntityManager {