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

Migrated codebase to Spigot 1.15.1

Browse Source
This commit is contained in:
David Berdik 2019-12-25 19:48:51 -05:00
parent 04923d1128
commit 8628494bff
14 changed files with 44 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.classpath
View File

@ -6,7 +6,6 @@
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="lib" path="libs/spigot-1.14.4.jar"/>
<classpathentry kind="lib" path="libs/Factions.jar"/>
<classpathentry kind="lib" path="libs/GriefPrevention.jar"/>
<classpathentry kind="lib" path="libs/MassiveCore.jar"/>
@ -17,5 +16,6 @@
<classpathentry kind="lib" path="libs/WorldEdit.jar"/>
<classpathentry kind="lib" path="libs/WorldGuard.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="lib" path="libs/spigot-1.15.1.jar"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>

2
.gitignore vendored
View File

@ -1,3 +1,3 @@
/bin/
/target/
/libs/spigot-1.14.4.jar
/libs/spigot-1.15.1.jar

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

@ -220,7 +220,7 @@ public class HerobrineAI extends JavaPlugin implements Listener {
args[1] = String.class;
args[2] = int.class;
Method a = net.minecraft.server.v1_14_R1.EntityTypes.class.getDeclaredMethod("a", args);
Method a = net.minecraft.server.v1_15_R1.EntityTypes.class.getDeclaredMethod("a", args);
a.setAccessible(true);
a.invoke(a, CustomZombie.class, "Zombie", 54);

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

@ -1,16 +1,16 @@
package org.jakub1221.herobrineai.NPC.Entity;
import net.minecraft.server.v1_14_R1.Entity;
import net.minecraft.server.v1_14_R1.EntityHuman;
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 net.minecraft.server.v1_15_R1.Entity;
import net.minecraft.server.v1_15_R1.EntityHuman;
import net.minecraft.server.v1_15_R1.EntityPlayer;
import net.minecraft.server.v1_15_R1.EnumGamemode;
import net.minecraft.server.v1_15_R1.EnumMoveType;
import net.minecraft.server.v1_15_R1.PlayerInteractManager;
import net.minecraft.server.v1_15_R1.Vec3D;
import org.bukkit.Bukkit;
import org.bukkit.craftbukkit.v1_14_R1.CraftServer;
import org.bukkit.craftbukkit.v1_14_R1.entity.CraftPlayer;
import org.bukkit.craftbukkit.v1_15_R1.CraftServer;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftPlayer;
import org.jakub1221.herobrineai.NPC.NPCCore;
import org.jakub1221.herobrineai.NPC.NMS.BWorld;
import org.jakub1221.herobrineai.NPC.Network.NetworkHandler;

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

@ -1,10 +1,10 @@
package org.jakub1221.herobrineai.NPC.Entity;
import net.minecraft.server.v1_14_R1.EntityPlayer;
import net.minecraft.server.v1_14_R1.EnumHand;
import net.minecraft.server.v1_14_R1.PacketPlayInArmAnimation;
import net.minecraft.server.v1_14_R1.PlayerChunkMap;
import net.minecraft.server.v1_14_R1.WorldServer;
import net.minecraft.server.v1_15_R1.EntityPlayer;
import net.minecraft.server.v1_15_R1.EnumHand;
import net.minecraft.server.v1_15_R1.PacketPlayInArmAnimation;
import net.minecraft.server.v1_15_R1.PlayerChunkMap;
import net.minecraft.server.v1_15_R1.WorldServer;
import org.bukkit.Location;
import org.bukkit.entity.LivingEntity;

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

@ -6,13 +6,13 @@ import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
import net.minecraft.server.v1_14_R1.DedicatedServer;
import net.minecraft.server.v1_14_R1.MinecraftServer;
import net.minecraft.server.v1_14_R1.WorldServer;
import net.minecraft.server.v1_15_R1.DedicatedServer;
import net.minecraft.server.v1_15_R1.MinecraftServer;
import net.minecraft.server.v1_15_R1.WorldServer;
import org.bukkit.Bukkit;
import org.bukkit.Server;
import org.bukkit.craftbukkit.v1_14_R1.CraftServer;
import org.bukkit.craftbukkit.v1_15_R1.CraftServer;
public class BServer {

6
src/org/jakub1221/herobrineai/NPC/NMS/BWorld.java
View File

@ -3,11 +3,11 @@ package org.jakub1221.herobrineai.NPC.NMS;
import java.util.logging.Level;
import java.util.logging.Logger;
import net.minecraft.server.v1_14_R1.PlayerChunkMap;
import net.minecraft.server.v1_14_R1.WorldServer;
import net.minecraft.server.v1_15_R1.PlayerChunkMap;
import net.minecraft.server.v1_15_R1.WorldServer;
import org.bukkit.World;
import org.bukkit.craftbukkit.v1_14_R1.CraftWorld;
import org.bukkit.craftbukkit.v1_15_R1.CraftWorld;
public class BWorld {

4
src/org/jakub1221/herobrineai/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_14_R1.Entity;
import net.minecraft.server.v1_14_R1.PlayerInteractManager;
import net.minecraft.server.v1_15_R1.Entity;
import net.minecraft.server.v1_15_R1.PlayerInteractManager;
import org.bukkit.Bukkit;
import org.bukkit.Location;

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

@ -1,7 +1,7 @@
package org.jakub1221.herobrineai.NPC.Network;
import net.minecraft.server.v1_14_R1.EnumProtocolDirection;
import net.minecraft.server.v1_14_R1.NetworkManager;
import net.minecraft.server.v1_15_R1.EnumProtocolDirection;
import net.minecraft.server.v1_15_R1.NetworkManager;
public class NetworkCore extends NetworkManager {

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

@ -2,9 +2,9 @@ package org.jakub1221.herobrineai.NPC.Network;
import org.jakub1221.herobrineai.NPC.NPCCore;
import net.minecraft.server.v1_14_R1.EntityPlayer;
import net.minecraft.server.v1_14_R1.Packet;
import net.minecraft.server.v1_14_R1.PlayerConnection;
import net.minecraft.server.v1_15_R1.EntityPlayer;
import net.minecraft.server.v1_15_R1.Packet;
import net.minecraft.server.v1_15_R1.PlayerConnection;
public class NetworkHandler extends PlayerConnection {

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

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

10
src/org/jakub1221/herobrineai/entity/CustomSkeleton.java
View File

@ -11,12 +11,12 @@ import org.bukkit.Color;
import org.jakub1221.herobrineai.HerobrineAI;
import org.jakub1221.herobrineai.misc.ItemName;
import net.minecraft.server.v1_14_R1.ChatComponentText;
import net.minecraft.server.v1_14_R1.EntityTypes;
import net.minecraft.server.v1_14_R1.GenericAttributes;
import net.minecraft.server.v1_14_R1.World;
import net.minecraft.server.v1_15_R1.ChatComponentText;
import net.minecraft.server.v1_15_R1.EntityTypes;
import net.minecraft.server.v1_15_R1.GenericAttributes;
import net.minecraft.server.v1_15_R1.World;
public class CustomSkeleton extends net.minecraft.server.v1_14_R1.EntitySkeleton implements CustomEntity {
public class CustomSkeleton extends net.minecraft.server.v1_15_R1.EntitySkeleton implements CustomEntity {
private MobType mobType = null;

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

@ -8,11 +8,11 @@ import org.bukkit.entity.Zombie;
import org.bukkit.inventory.ItemStack;
import org.jakub1221.herobrineai.HerobrineAI;
import net.minecraft.server.v1_14_R1.ChatComponentText;
import net.minecraft.server.v1_14_R1.GenericAttributes;
import net.minecraft.server.v1_14_R1.World;
import net.minecraft.server.v1_15_R1.ChatComponentText;
import net.minecraft.server.v1_15_R1.GenericAttributes;
import net.minecraft.server.v1_15_R1.World;
public class CustomZombie extends net.minecraft.server.v1_14_R1.EntityZombie implements CustomEntity {
public class CustomZombie extends net.minecraft.server.v1_15_R1.EntityZombie implements CustomEntity {
private MobType mobType = null;

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

@ -13,7 +13,7 @@ public class EntityManager {
public void spawnCustomZombie(Location loc,MobType mbt){
World world = loc.getWorld();
net.minecraft.server.v1_14_R1.World mcWorld = ((org.bukkit.craftbukkit.v1_14_R1.CraftWorld) world).getHandle();
net.minecraft.server.v1_15_R1.World mcWorld = ((org.bukkit.craftbukkit.v1_15_R1.CraftWorld) world).getHandle();
CustomZombie zmb = new CustomZombie(mcWorld,loc,mbt);
mcWorld.addEntity(zmb);
mobList.put(new Integer(zmb.getBukkitEntity().getEntityId()),zmb);
@ -23,7 +23,7 @@ public class EntityManager {
public void spawnCustomSkeleton(Location loc,MobType mbt){
World world = loc.getWorld();
net.minecraft.server.v1_14_R1.World mcWorld = ((org.bukkit.craftbukkit.v1_14_R1.CraftWorld) world).getHandle();
net.minecraft.server.v1_15_R1.World mcWorld = ((org.bukkit.craftbukkit.v1_15_R1.CraftWorld) world).getHandle();
CustomSkeleton zmb = new CustomSkeleton(mcWorld,loc,mbt);
mcWorld.addEntity(zmb);
mobList.put(new Integer(zmb.getBukkitEntity().getEntityId()),zmb);