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

Fixed more errors. 64 remaining.

Browse Source
This commit is contained in:
David Berdik 2021-07-01 16:43:59 -04:00
parent 7da381ec6a
commit bac190a385
6 changed files with 22 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/net/theprogrammersworld/herobrine/Herobrine.java
View File

@ -24,7 +24,7 @@ import org.bukkit.plugin.java.JavaPlugin;
import net.minecraft.world.entity.Entity;
import net.minecraft.world.entity.EntityType;
import net.minecraft.world.entity.EnumCreatureType;
import net.minecraft.world.entity.MobCategory;
import net.minecraft.core.IRegistry;
import net.theprogrammersworld.herobrine.AI.AICore;
import net.theprogrammersworld.herobrine.AI.Core.CoreType;
@ -104,8 +104,8 @@ public class Herobrine extends JavaPlugin implements Listener {
// Custom Entity Injection
if (!isNPCDisabled) {
try {
addCustomEntity("mzombie", CustomZombie::new, EnumCreatureType.MONSTER);
addCustomEntity("mskeleton", CustomSkeleton::new, EnumCreatureType.MONSTER);
addCustomEntity("mzombie", CustomZombie::new, MobCategory.MONSTER);
addCustomEntity("mskeleton", CustomSkeleton::new, MobCategory.MONSTER);
} catch (Exception e) {
e.printStackTrace();
getServer().getPluginManager().disablePlugin(this);
@ -363,7 +363,7 @@ public class Herobrine extends JavaPlugin implements Listener {
}
}
private static <T extends Entity> void addCustomEntity(String customName, EntityType.b<T> _func, EnumCreatureType enumCreatureType) {
private static <T extends Entity> void addCustomEntity(String customName, EntityType.b<T> _func, MobCategory enumCreatureType) {
// Registers a custom entity. Adapted from https://www.spigotmc.org/threads/handling-custom-entity-registry-on-spigot-1-13.353426/#post-3447111
EntityType.Builder<?> entity = EntityType.Builder.a(_func, enumCreatureType);
entity.b();

4
src/main/java/net/theprogrammersworld/herobrine/NPC/Entity/HumanEntity.java
View File

@ -3,7 +3,7 @@ package net.theprogrammersworld.herobrine.NPC.Entity;
import net.minecraft.world.entity.Entity;
import net.minecraft.world.entity.player.EntityHuman;
import net.minecraft.world.entity.player.Player;
import net.minecraft.world.level.EnumGamemode;
import net.minecraft.world.level.GameType;
import net.minecraft.world.entity.EnumMoveType;
import net.minecraft.server.level.PlayerInteractManager;
import net.minecraft.world.phys.Vec3D;
@ -24,7 +24,7 @@ public class HumanEntity extends Player {
public HumanEntity(final NPCCore npcCore, final BWorld world, final GameProfile s, final PlayerInteractManager playerInteractManager) {
super(npcCore.getServer().getMCServer(), world.getWorldServer(), s, playerInteractManager);
playerInteractManager.b(EnumGamemode.SURVIVAL);
playerInteractManager.b(GameType.SURVIVAL);
playerConnection = new NetworkHandler(npcCore, this);
fauxSleeping = true;

10
src/main/java/net/theprogrammersworld/herobrine/NPC/Entity/HumanNPC.java
View File

@ -2,10 +2,10 @@ package net.theprogrammersworld.herobrine.NPC.Entity;
import net.minecraft.server.level.ChunkProviderServer;
import net.minecraft.server.level.ServerPlayer;
import net.minecraft.world.EnumHand;
import net.minecraft.world.InteractionHand;
import net.minecraft.network.protocol.game.PacketPlayInArmAnimation;
import net.minecraft.server.level.PlayerChunkMap;
import net.minecraft.server.level.WorldServer;
import net.minecraft.server.level.ChunkMap;
import net.minecraft.server.level.ServerLevel;
import net.theprogrammersworld.herobrine.Herobrine;
import org.bukkit.Bukkit;
@ -34,12 +34,12 @@ public class HumanNPC {
}
public void ArmSwingAnimation() {
ChunkProviderServer chunkProvider = ((WorldServer) this.entity.world).getChunkProvider();
ChunkProviderServer chunkProvider = ((ServerLevel) this.entity.world).getChunkProvider();
PlayerChunkMap playerChunkMap = chunkProvider.playerChunkMap;
PlayerChunkMap.EntityTracker playerchunkmap_entitytracker = playerChunkMap.trackedEntities.get(this.entity.getId());
if(playerchunkmap_entitytracker != null) {
playerchunkmap_entitytracker.broadcast(new PacketPlayInArmAnimation(EnumHand.MAIN_HAND));
playerchunkmap_entitytracker.broadcast(new PacketPlayInArmAnimation(InteractionHand.MAIN_HAND));
}
}

1
src/main/java/net/theprogrammersworld/herobrine/NPC/NMS/BServer.java
View File

@ -8,7 +8,6 @@ import java.util.logging.Logger;
import net.minecraft.server.dedicated.DedicatedServer;
import net.minecraft.server.MinecraftServer;
import net.minecraft.server.level.WorldServer;
import org.bukkit.Bukkit;
import org.bukkit.Server;

12
src/main/java/net/theprogrammersworld/herobrine/NPC/NMS/BWorld.java
View File

@ -4,8 +4,8 @@ import java.util.logging.Level;
import java.util.logging.Logger;
import net.minecraft.server.level.ChunkProviderServer;
import net.minecraft.server.level.PlayerChunkMap;
import net.minecraft.server.level.WorldServer;
import net.minecraft.server.level.ChunkMap;
import net.minecraft.server.level.ServerLevel;
import org.bukkit.World;
import org.bukkit.craftbukkit.v1_17_R1.CraftWorld;
@ -13,7 +13,7 @@ import org.bukkit.craftbukkit.v1_17_R1.CraftWorld;
public class BWorld {
private CraftWorld cWorld;
private WorldServer wServer;
private ServerLevel wServer;
public BWorld(final World world) {
try {
@ -24,8 +24,8 @@ public class BWorld {
}
}
public PlayerChunkMap getPlayerManager() {
ChunkProviderServer chunkProvider = ((WorldServer) wServer).getChunkProvider();
public ChunkMap getPlayerManager() {
ChunkProviderServer chunkProvider = ((ServerLevel) wServer).getChunkProvider();
return chunkProvider.playerChunkMap;
}
@ -33,7 +33,7 @@ public class BWorld {
return cWorld;
}
public WorldServer getWorldServer() {
public ServerLevel getWorldServer() {
return wServer;
}
}

10
src/main/java/net/theprogrammersworld/herobrine/NPC/Network/NetworkCore.java
View File

@ -1,16 +1,16 @@
package net.theprogrammersworld.herobrine.NPC.Network;
import net.minecraft.network.protocol.EnumProtocolDirection;
import net.minecraft.network.NetworkManager;
import net.minecraft.network.protocol.PacketFlow;
import net.minecraft.network.Connection;
public class NetworkCore extends NetworkManager {
public class NetworkCore extends Connection {
public NetworkCore() {
super(EnumProtocolDirection.SERVERBOUND);
super(PacketFlow.SERVERBOUND);
}
@Override
public void a() {
public void tick() {
}