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

Started updating codebase for Spigot 1.14.4 and resolving warnings

Browse Source
This commit is contained in:
David Berdik 2019-09-02 16:12:58 -04:00
parent e066b30acf
commit dfbea65587
23 changed files with 43 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,7 +1,5 @@
package org.jakub1221.herobrineai.AI.cores;
import java.util.Random;
import org.bukkit.Bukkit;
import org.bukkit.Effect;
import org.bukkit.Location;

1
src/org/jakub1221/herobrineai/AI/cores/Book.java
View File

@ -1,7 +1,6 @@
package org.jakub1221.herobrineai.AI.cores;
import java.util.ArrayList;
import java.util.Random;
import org.bukkit.Material;
import org.bukkit.entity.Player;

7
src/org/jakub1221/herobrineai/AI/cores/Haunt.java
View File

@ -1,16 +1,11 @@
package org.jakub1221.herobrineai.AI.cores;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Random;
import java.util.Set;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.World;
import org.bukkit.block.Block;
import org.bukkit.entity.EntityType;
import org.bukkit.entity.Player;
import org.bukkit.entity.Wolf;
@ -20,8 +15,6 @@ import org.jakub1221.herobrineai.AI.AICore;
import org.jakub1221.herobrineai.AI.Core;
import org.jakub1221.herobrineai.AI.CoreResult;
import com.google.common.collect.Sets;
public class Haunt extends Core {
private int _ticks = 0;

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

@ -1,7 +1,5 @@
package org.jakub1221.herobrineai.AI.cores;
import java.util.Random;
import org.bukkit.Location;
import org.bukkit.entity.Player;
import org.jakub1221.herobrineai.HerobrineAI;

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

@ -1,7 +1,5 @@
package org.jakub1221.herobrineai.AI.cores;
import java.util.Random;
import org.bukkit.Sound;
import org.bukkit.entity.Player;
import org.jakub1221.herobrineai.HerobrineAI;

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

@ -216,7 +216,7 @@ public class HerobrineAI extends JavaPlugin implements Listener {
argst[1] = String.class;
argst[2] = int.class;
try {
Method ab = net.minecraft.server.v1_11_R1.EntityTypes.class.getDeclaredMethod("a", argst);
Method ab = net.minecraft.server.v1_14_R1.EntityTypes.class.getDeclaredMethod("a", argst);
} catch (NoSuchMethodException e1) {
isNPCDisabled = true;
} catch (SecurityException e1) {
@ -231,7 +231,7 @@ public class HerobrineAI extends JavaPlugin implements Listener {
args[1] = String.class;
args[2] = int.class;
Method a = net.minecraft.server.v1_11_R1.EntityTypes.class.getDeclaredMethod("a", args);
Method a = net.minecraft.server.v1_14_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_11_R1.Entity;
import net.minecraft.server.v1_11_R1.EntityHuman;
import net.minecraft.server.v1_11_R1.EntityPlayer;
import net.minecraft.server.v1_11_R1.EnumGamemode;
import net.minecraft.server.v1_11_R1.EnumMoveType;
import net.minecraft.server.v1_11_R1.PlayerInteractManager;
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 org.bukkit.Bukkit;
import org.bukkit.craftbukkit.v1_11_R1.CraftServer;
import org.bukkit.craftbukkit.v1_11_R1.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_11_R1.entity.CraftPlayer;
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;
import org.jakub1221.herobrineai.NPC.Network.NetworkHandler;

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

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

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

@ -5,13 +5,13 @@ import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
import net.minecraft.server.v1_11_R1.DedicatedServer;
import net.minecraft.server.v1_11_R1.MinecraftServer;
import net.minecraft.server.v1_11_R1.WorldServer;
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 org.bukkit.Bukkit;
import org.bukkit.Server;
import org.bukkit.craftbukkit.v1_11_R1.CraftServer;
import org.bukkit.craftbukkit.v1_14_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_11_R1.PlayerChunkMap;
import net.minecraft.server.v1_11_R1.WorldServer;
import net.minecraft.server.v1_14_R1.PlayerChunkMap;
import net.minecraft.server.v1_14_R1.WorldServer;
import org.bukkit.World;
import org.bukkit.craftbukkit.v1_11_R1.CraftWorld;
import org.bukkit.craftbukkit.v1_14_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_11_R1.Entity;
import net.minecraft.server.v1_11_R1.PlayerInteractManager;
import net.minecraft.server.v1_14_R1.Entity;
import net.minecraft.server.v1_14_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_11_R1.EnumProtocolDirection;
import net.minecraft.server.v1_11_R1.NetworkManager;
import net.minecraft.server.v1_14_R1.EnumProtocolDirection;
import net.minecraft.server.v1_14_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_11_R1.EntityPlayer;
import net.minecraft.server.v1_11_R1.Packet;
import net.minecraft.server.v1_11_R1.PlayerConnection;
import net.minecraft.server.v1_14_R1.EntityPlayer;
import net.minecraft.server.v1_14_R1.Packet;
import net.minecraft.server.v1_14_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_11_R1.Packet;
import net.minecraft.server.v1_14_R1.Packet;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.World;
import org.bukkit.craftbukkit.v1_11_R1.entity.CraftPlayer;
import org.bukkit.craftbukkit.v1_14_R1.entity.CraftPlayer;
import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack;

20
src/org/jakub1221/herobrineai/Support.java
View File

@ -2,7 +2,6 @@ package org.jakub1221.herobrineai;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.jakub1221.herobrineai.support.CustomItemsHook;
import org.jakub1221.herobrineai.support.FactionsHook;
import org.jakub1221.herobrineai.support.GriefPreventionHook;
import org.jakub1221.herobrineai.support.PreciousStonesHook;
@ -15,14 +14,12 @@ public class Support {
private boolean B_Residence = false;
private boolean B_GriefPrevention = false;
private boolean B_Towny = false;
private boolean B_CustomItems = false;
private boolean B_WorldGuard = false;
private boolean B_PreciousStones = false;
private boolean B_Factions = false;
private ResidenceHook ResidenceCore = null;
private GriefPreventionHook GriefPreventionCore = null;
private TownyHook TownyCore = null;
private CustomItemsHook CustomItems = null;
private WorldGuardHook WorldGuard = null;
private PreciousStonesHook PreciousStones = null;
private FactionsHook Factions = null;
@ -31,7 +28,6 @@ public class Support {
ResidenceCore = new ResidenceHook();
GriefPreventionCore = new GriefPreventionHook();
TownyCore = new TownyHook();
CustomItems = new CustomItemsHook();
WorldGuard = new WorldGuardHook();
PreciousStones = new PreciousStonesHook();
Factions = new FactionsHook();
@ -80,11 +76,6 @@ public class Support {
B_Towny = true;
HerobrineAI.log.info("[HerobrineAI] Towny plugin detected!");
}
if (CustomItems.Check()) {
B_CustomItems = true;
HerobrineAI.log.info("[HerobrineAI] CustomItems plugin detected!");
CustomItems.init();
}
if (WorldGuard.Check()) {
B_WorldGuard = true;
HerobrineAI.log.info("[HerobrineAI] WorldGuard plugin detected!");
@ -135,16 +126,5 @@ public class Support {
public boolean checkBooks(final Location loc) {
return HerobrineAI.getPluginCore().getConfigDB().SecuredArea_Books || !isSecuredArea(loc);
}
public boolean isCustomItems() {
return B_CustomItems;
}
public CustomItemsHook getCustomItems() {
if (B_CustomItems) {
return CustomItems;
}
return null;
}
}

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

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

1
src/org/jakub1221/herobrineai/commands/CmdCancel.java
View File

@ -2,7 +2,6 @@ package org.jakub1221.herobrineai.commands;
import java.util.logging.Logger;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.entity.Player;
import org.jakub1221.herobrineai.HerobrineAI;

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

@ -2,18 +2,14 @@ package org.jakub1221.herobrineai.commands;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Map.Entry;
import java.util.logging.Logger;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import org.jakub1221.herobrineai.HerobrineAI;
import org.jakub1221.herobrineai.AI.AICore;
import org.jakub1221.herobrineai.AI.Core.CoreType;
public class CmdExecutor implements CommandExecutor {

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

@ -9,10 +9,10 @@ import org.jakub1221.herobrineai.HerobrineAI;
import org.jakub1221.herobrineai.Utils;
import org.jakub1221.herobrineai.misc.ItemName;
import net.minecraft.server.v1_11_R1.GenericAttributes;
import net.minecraft.server.v1_11_R1.World;
import net.minecraft.server.v1_14_R1.GenericAttributes;
import net.minecraft.server.v1_14_R1.World;
public class CustomSkeleton extends net.minecraft.server.v1_11_R1.EntitySkeleton implements CustomEntity {
public class CustomSkeleton extends net.minecraft.server.v1_14_R1.EntitySkeleton implements CustomEntity {
private MobType mobType = null;

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

@ -10,10 +10,10 @@ import org.bukkit.inventory.ItemStack;
import org.jakub1221.herobrineai.HerobrineAI;
import org.jakub1221.herobrineai.Utils;
import net.minecraft.server.v1_11_R1.GenericAttributes;
import net.minecraft.server.v1_11_R1.World;
import net.minecraft.server.v1_14_R1.GenericAttributes;
import net.minecraft.server.v1_14_R1.World;
public class CustomZombie extends net.minecraft.server.v1_11_R1.EntityZombie implements CustomEntity {
public class CustomZombie extends net.minecraft.server.v1_14_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_11_R1.World mcWorld = ((org.bukkit.craftbukkit.v1_11_R1.CraftWorld) world).getHandle();
net.minecraft.server.v1_14_R1.World mcWorld = ((org.bukkit.craftbukkit.v1_14_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_11_R1.World mcWorld = ((org.bukkit.craftbukkit.v1_11_R1.CraftWorld) world).getHandle();
net.minecraft.server.v1_14_R1.World mcWorld = ((org.bukkit.craftbukkit.v1_14_R1.CraftWorld) world).getHandle();
CustomSkeleton zmb = new CustomSkeleton(mcWorld,loc,mbt);
mcWorld.addEntity(zmb);
mobList.put(new Integer(zmb.getBukkitEntity().getEntityId()),zmb);

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

@ -8,7 +8,7 @@ import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.World;
import org.bukkit.block.Jukebox;
import org.bukkit.craftbukkit.v1_11_R1.entity.CraftPlayer;
import org.bukkit.craftbukkit.v1_14_R1.entity.CraftPlayer;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player;
import org.bukkit.event.EventPriority;

6
src/org/jakub1221/herobrineai/support/FactionsHook.java
View File

@ -3,8 +3,8 @@ package org.jakub1221.herobrineai.support;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import com.massivecraft.factions.entity.BoardColls;
import com.massivecraft.mcore.ps.PS;
import com.massivecraft.factions.entity.BoardColl;
import com.massivecraft.massivecore.ps.PS;
public class FactionsHook {
@ -13,6 +13,6 @@ public class FactionsHook {
}
public boolean isSecuredArea(Location loc) {
return !BoardColls.get().getFactionAt(PS.valueOf(loc)).getComparisonName().equalsIgnoreCase("Wilderness");
return !BoardColl.get().getFactionAt(PS.valueOf(loc)).getComparisonName().equalsIgnoreCase("Wilderness");
}
}