From 8de19c5d44c947d03fb981c5e2f143a9ab790c39 Mon Sep 17 00:00:00 2001 From: OldSerpskiStalker Date: Thu, 10 Oct 2024 22:44:02 +0500 Subject: [PATCH] A fix for multiplayer --- .../gameplay/commands/cmdAdminDumpBlock.java | 6 +++--- .../gameplay/commands/cmdAdminDumpEntity.java | 4 ++-- .../gameplay/commands/cmdAdminDumpItem.java | 6 +++--- .../commands/cmdAdminLaunchFireball.java | 6 +++--- .../commands/cmdServerMobsKiller.java | 6 +++--- .../gameplay/events/OnUpdateTorchLogic.java | 8 ++++---- .../technical/customlibrary/AuxFunctions.java | 8 ++++---- .../customlibrary/ListActionsBinary.java | 20 +++++++++---------- .../customlibrary/ListActionsConsumer.java | 16 +++++++-------- .../technical/customlibrary/RayTrace.java | 10 +++++----- .../technical/customlibrary/Sender.java | 6 +++--- .../generic/GenericBlockBreakActions.java | 10 +++++----- .../generic/GenericBlockPlaceActions.java | 10 +++++----- .../generic/GenericDropLoot.java | 6 +++--- .../generic/GenericExperience.java | 6 +++--- .../generic/GenericLeftClickActions.java | 10 +++++----- .../generic/GenericMapEffectsActions.java | 10 +++++----- .../generic/GenericMobTaskManager.java | 10 +++++----- .../generic/GenericPotentialSpawn.java | 4 ++-- .../generic/GenericRightClickActions.java | 10 +++++----- .../generic/GenericSpawnConditions.java | 10 +++++----- .../primitive/OnComplexityBiomes.java | 6 +++--- .../primitive/OnPlayerEvents.java | 10 +++++----- .../signal/SignalDataAccessor.java | 4 ++-- .../signal/SignalDataGetter.java | 4 ++-- .../technical/proxy/ClientProxy.java | 7 +++---- .../technical/proxy/IProxy.java | 6 +++--- .../technical/proxy/ServerProxy.java | 6 +++--- .../technical/worldcache/Cache.java | 5 +++-- 29 files changed, 115 insertions(+), 115 deletions(-) diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/commands/cmdAdminDumpBlock.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/commands/cmdAdminDumpBlock.java index ccbb17f..822996d 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/commands/cmdAdminDumpBlock.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/commands/cmdAdminDumpBlock.java @@ -5,7 +5,7 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.command.CommandBase; import net.minecraft.command.ICommandSender; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.server.MinecraftServer; import net.minecraft.tileentity.TileEntity; @@ -67,9 +67,9 @@ public String getUsage(@Nonnull ICommandSender sender) @Override public void execute(@Nonnull MinecraftServer server, @Nonnull ICommandSender sender, @Nonnull String... args) { - if (sender instanceof EntityPlayer) + if (sender instanceof EntityPlayerMP) { - EntityPlayer player = (EntityPlayer) sender; + EntityPlayerMP player = (EntityPlayerMP) sender; RayTraceResult result = RayTrace.getMovingObjectPositionFromPlayer(player.getEntityWorld(), player, false); if (result != null && result.typeOfHit == RayTraceResult.Type.BLOCK) diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/commands/cmdAdminDumpEntity.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/commands/cmdAdminDumpEntity.java index 08dcd9b..1355b01 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/commands/cmdAdminDumpEntity.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/commands/cmdAdminDumpEntity.java @@ -4,7 +4,7 @@ import net.minecraft.command.CommandBase; import net.minecraft.command.ICommandSender; import net.minecraft.entity.Entity; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.server.MinecraftServer; import net.minecraft.util.math.RayTraceResult; import net.minecraft.util.text.TextComponentString; @@ -59,7 +59,7 @@ public String getUsage(@Nonnull ICommandSender sender) @Override public void execute(@Nonnull MinecraftServer server, @Nonnull ICommandSender sender, @Nonnull String... args) { - if (sender instanceof EntityPlayer) + if (sender instanceof EntityPlayerMP) { RayTraceResult result = Minecraft.getMinecraft().objectMouseOver; diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/commands/cmdAdminDumpItem.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/commands/cmdAdminDumpItem.java index 95db0f3..6d970cb 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/commands/cmdAdminDumpItem.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/commands/cmdAdminDumpItem.java @@ -2,7 +2,7 @@ import net.minecraft.command.CommandBase; import net.minecraft.command.ICommandSender; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTBase; @@ -65,9 +65,9 @@ public String getUsage(@Nonnull ICommandSender sender) @Override public void execute(@Nonnull MinecraftServer server, @Nonnull ICommandSender sender, @Nonnull String... args) { - if (sender instanceof EntityPlayer) + if (sender instanceof EntityPlayerMP) { - EntityPlayer player = (EntityPlayer) sender; + EntityPlayerMP player = (EntityPlayerMP) sender; ItemStack heldItem = player.getHeldItem(EnumHand.MAIN_HAND); Item item = heldItem.getItem(); sender.sendMessage(new TextComponentString(TextFormatting.GOLD + Objects.requireNonNull(item.getRegistryName()).toString())); diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/commands/cmdAdminLaunchFireball.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/commands/cmdAdminLaunchFireball.java index 2bccb3d..ae9dd40 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/commands/cmdAdminLaunchFireball.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/commands/cmdAdminLaunchFireball.java @@ -2,7 +2,7 @@ import net.minecraft.command.CommandBase; import net.minecraft.command.ICommandSender; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.server.MinecraftServer; import net.minecraft.util.text.TextComponentString; import net.minecraft.world.World; @@ -63,13 +63,13 @@ public void execute(@Nonnull MinecraftServer server, @Nonnull ICommandSender sen return; } - if (!(sender instanceof EntityPlayer)) + if (!(sender instanceof EntityPlayerMP)) { sender.sendMessage(new TextComponentString("This command can only be used by players!")); return; } - EntityPlayer player = (EntityPlayer) sender; + EntityPlayerMP player = (EntityPlayerMP) sender; World world = player.getEntityWorld(); double speed, explosionStrength; diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/commands/cmdServerMobsKiller.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/commands/cmdServerMobsKiller.java index 9903891..cb00ce8 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/commands/cmdServerMobsKiller.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/commands/cmdServerMobsKiller.java @@ -6,7 +6,7 @@ import net.minecraft.entity.monster.IMob; import net.minecraft.entity.passive.EntityAmbientCreature; import net.minecraft.entity.passive.EntityAnimal; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.server.MinecraftServer; import net.minecraft.util.text.TextComponentString; import net.minecraft.util.text.TextFormatting; @@ -66,14 +66,14 @@ public void execute(@Nonnull MinecraftServer server, @Nonnull ICommandSender sen if (args.length > 0) { String argument0 = args[0].toLowerCase(); - WorldServer worldServer = server.getWorld((sender instanceof EntityPlayer) ? sender.getEntityWorld().provider.getDimension() : 0); + WorldServer worldServer = server.getWorld((sender instanceof EntityPlayerMP) ? sender.getEntityWorld().provider.getDimension() : 0); List entityList = new ArrayList<>(); if ("all".equals(argument0)) { for (Entity entity : worldServer.loadedEntityList) { - if (!(entity instanceof EntityPlayer)) + if (!(entity instanceof EntityPlayerMP)) { entityList.add(entity); } diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/events/OnUpdateTorchLogic.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/events/OnUpdateTorchLogic.java index c2f5a8a..ae8b2cd 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/events/OnUpdateTorchLogic.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/gameplay/events/OnUpdateTorchLogic.java @@ -6,7 +6,7 @@ import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.monster.EntitySkeleton; import net.minecraft.entity.monster.EntityZombie; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; @@ -69,9 +69,9 @@ public synchronized void onHit(LivingHurtEvent event) entity.setFire(5); } } - else if (entityGetTrueSource instanceof EntityPlayer) + else if (entityGetTrueSource instanceof EntityPlayerMP) { - EntityPlayer player = (EntityPlayer)entityGetTrueSource; + EntityPlayerMP player = (EntityPlayerMP)entityGetTrueSource; if (Block.getBlockFromItem(player.getHeldItemMainhand().getItem()) instanceof BlockTorch) { @@ -97,7 +97,7 @@ else if (entityGetTrueSource instanceof EntitySkeleton) @SubscribeEvent public synchronized void onBreak(BlockEvent.BreakEvent event) { - EntityPlayer player = event.getPlayer(); + EntityPlayerMP player = (EntityPlayerMP) event.getPlayer(); if (Block.getBlockFromItem(player.getHeldItemMainhand().getItem()) instanceof BlockTorch) { diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/customlibrary/AuxFunctions.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/customlibrary/AuxFunctions.java index 356b4d2..8032dd1 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/customlibrary/AuxFunctions.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/customlibrary/AuxFunctions.java @@ -10,7 +10,7 @@ import net.minecraft.block.properties.IProperty; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.Entity; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -832,7 +832,7 @@ public static List> getNbtMatchers(JsonArray nbtArray) */ public static boolean isFakePlayer(Entity entity) { - if (!(entity instanceof EntityPlayer)) + if (!(entity instanceof EntityPlayerMP)) { return false; } @@ -844,7 +844,7 @@ public static boolean isFakePlayer(Entity entity) // Если этот метод возвращает false, всё ещё возможно, что это фальшивый игрок. Попробуем найти игрока в списке онлайн-игроков PlayerList playerList = Objects.requireNonNull(DimensionManager.getWorld(0).getMinecraftServer()).getPlayerList(); - EntityPlayerMP playerByUUID = playerList.getPlayerByUUID(((EntityPlayer) entity).getGameProfile().getId()); + EntityPlayerMP playerByUUID = playerList.getPlayerByUUID(((EntityPlayerMP) entity).getGameProfile().getId()); if (playerByUUID == null) { @@ -863,7 +863,7 @@ public static boolean isFakePlayer(Entity entity) */ public static boolean isRealPlayer(Entity entity) { - if (!(entity instanceof EntityPlayer)) + if (!(entity instanceof EntityPlayerMP)) { return false; } diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/customlibrary/ListActionsBinary.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/customlibrary/ListActionsBinary.java index 6532335..9521fae 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/customlibrary/ListActionsBinary.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/customlibrary/ListActionsBinary.java @@ -5,7 +5,7 @@ import net.minecraft.entity.EntityLiving; import net.minecraft.entity.monster.IMob; import net.minecraft.entity.passive.IAnimals; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; @@ -601,7 +601,7 @@ public void addHelmetCheck(AttributeMap map) this.ARRAY_LIST.add((event, query) -> { - EntityPlayer player = query.getPlayer(event); + EntityPlayerMP player = query.getPlayer(event); if (player != null) { @@ -626,7 +626,7 @@ public void addChestPlateCheck(AttributeMap map) this.ARRAY_LIST.add((event, query) -> { - EntityPlayer player = query.getPlayer(event); + EntityPlayerMP player = query.getPlayer(event); if (player != null) { @@ -651,7 +651,7 @@ public void addLeggingsCheck(AttributeMap map) this.ARRAY_LIST.add((event, query) -> { - EntityPlayer player = query.getPlayer(event); + EntityPlayerMP player = query.getPlayer(event); if (player != null) { @@ -676,7 +676,7 @@ public void addBootsCheck(AttributeMap map) this.ARRAY_LIST.add((event, query) -> { - EntityPlayer player = query.getPlayer(event); + EntityPlayerMP player = query.getPlayer(event); if (player != null) { @@ -1059,11 +1059,11 @@ private void addPlayerCheck(AttributeMap map) if ((Boolean)asPlayer) { this.ARRAY_LIST.add((event, query) -> - query.getAttacker(event) instanceof EntityPlayer); + query.getAttacker(event) instanceof EntityPlayerMP); } //else //{ - // _arrayList.add((event, query) -> query.getAttacker(event) instanceof EntityPlayer); + // _arrayList.add((event, query) -> query.getAttacker(event) instanceof EntityPlayerMP); //} } @@ -1118,7 +1118,7 @@ public void addHeldItemCheck(AttributeMap map, AttributeKey key) this.ARRAY_LIST.add((event,query) -> { - EntityPlayer player = query.getPlayer(event); + EntityPlayerMP player = query.getPlayer(event); if (player != null) { @@ -1150,7 +1150,7 @@ public void addOffHandItemCheck(AttributeMap map) this.ARRAY_LIST.add((event,query) -> { - EntityPlayer player = query.getPlayer(event); + EntityPlayerMP player = query.getPlayer(event); if (player != null) { @@ -1282,7 +1282,7 @@ public void addBothHandsItemCheck(AttributeMap map) this.ARRAY_LIST.add((event,query) -> { - EntityPlayer player = query.getPlayer(event); + EntityPlayerMP player = query.getPlayer(event); if (player != null) { diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/customlibrary/ListActionsConsumer.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/customlibrary/ListActionsConsumer.java index 8dbc2f4..3e1099c 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/customlibrary/ListActionsConsumer.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/customlibrary/ListActionsConsumer.java @@ -12,7 +12,7 @@ import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.monster.EntityEnderman; import net.minecraft.entity.monster.EntityPigZombie; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; @@ -191,11 +191,11 @@ private void addDoMessageAction(AttributeMap map) this.ACTIONS.add(event -> { - EntityPlayer player = event.getPlayer(); + EntityPlayerMP player = event.getPlayer(); if (player == null) { - player = event.getWorld().getClosestPlayerToEntity(event.getEntityLiving(), 100); + player = (EntityPlayerMP) event.getWorld().getClosestPlayerToEntity(event.getEntityLiving(), 100); } if (player != null) @@ -222,7 +222,7 @@ public void addAngryAction(AttributeMap map) if (entityLiving instanceof EntityPigZombie) { EntityPigZombie pigZombie = (EntityPigZombie) entityLiving; - EntityPlayer player = event.getWorld().getClosestPlayerToEntity(entityLiving, 50); + EntityPlayerMP player = (EntityPlayerMP) event.getWorld().getClosestPlayerToEntity(entityLiving, 50); if (player != null) { @@ -231,7 +231,7 @@ public void addAngryAction(AttributeMap map) } else if (entityLiving instanceof EntityLiving) { - EntityPlayer player = event.getWorld().getClosestPlayerToEntity(entityLiving, 50); + EntityPlayerMP player = (EntityPlayerMP) event.getWorld().getClosestPlayerToEntity(entityLiving, 50); if (player != null) { @@ -576,7 +576,7 @@ private void addGiveAction(AttributeMap map) this.ACTIONS.add(event -> { - EntityPlayer player = event.getPlayer(); + EntityPlayerMP player = event.getPlayer(); if (player != null) { @@ -593,7 +593,7 @@ private void addGiveAction(AttributeMap map) this.ACTIONS.add(event -> { - EntityPlayer player = event.getPlayer(); + EntityPlayerMP player = event.getPlayer(); if (player != null) { @@ -656,7 +656,7 @@ private void addCommandAction(AttributeMap map) this.ACTIONS.add(event -> { - EntityPlayer player = event.getPlayer(); + EntityPlayerMP player = event.getPlayer(); MinecraftServer server = event.getWorld().getMinecraftServer(); assert server != null; diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/customlibrary/RayTrace.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/customlibrary/RayTrace.java index d656d63..4daa1c6 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/customlibrary/RayTrace.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/customlibrary/RayTrace.java @@ -2,7 +2,7 @@ import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.init.Blocks; import net.minecraft.util.math.BlockPos; @@ -23,7 +23,7 @@ public final class RayTrace * @param useLiquids * @return */ - public static RayTraceResult getMovingObjectPositionFromPlayer(World worldIn, EntityPlayer playerIn, boolean useLiquids) + public static RayTraceResult getMovingObjectPositionFromPlayer(World worldIn, EntityPlayerMP playerIn, boolean useLiquids) { float pitch = playerIn.rotationPitch; float yaw = playerIn.rotationYaw; @@ -54,7 +54,7 @@ public static RayTraceResult getMovingObjectPositionFromPlayer(World worldIn, En * @param playerIn * @return */ - private static Vec3d getPlayerEyes(EntityPlayer playerIn) + private static Vec3d getPlayerEyes(EntityPlayerMP playerIn) { double x = playerIn.posX; double y = playerIn.posY + playerIn.getEyeHeight(); @@ -69,7 +69,7 @@ private static Vec3d getPlayerEyes(EntityPlayer playerIn) * @param player * @return */ - public static boolean isPlayerStandingOnBlock(World world, EntityPlayer player) + public static boolean isPlayerStandingOnBlock(World world, EntityPlayerMP player) { double posX = player.posX; double posY = player.posY; @@ -90,7 +90,7 @@ public static boolean isPlayerStandingOnBlock(World world, EntityPlayer player) * @param player * @return */ - public static BlockPos getBlockPosBelowPlayer(EntityPlayer player) + public static BlockPos getBlockPosBelowPlayer(EntityPlayerMP player) { double posX = player.posX; double posY = player.posY - 0.1; diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/customlibrary/Sender.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/customlibrary/Sender.java index 6d4511f..6485889 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/customlibrary/Sender.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/customlibrary/Sender.java @@ -3,7 +3,7 @@ import net.minecraft.command.CommandResultStats; import net.minecraft.command.ICommandSender; import net.minecraft.entity.Entity; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.server.MinecraftServer; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Vec3d; @@ -27,14 +27,14 @@ public final class Sender implements ICommandSender /** * */ - private final EntityPlayer PLAYER; + private final EntityPlayerMP PLAYER; /** * * @param world * @param player */ - public Sender(World world, EntityPlayer player) + public Sender(World world, EntityPlayerMP player) { this.WORLD = world; this.PLAYER = player; diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/generic/GenericBlockBreakActions.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/generic/GenericBlockBreakActions.java index 7b491ec..0ff1376 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/generic/GenericBlockBreakActions.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/generic/GenericBlockBreakActions.java @@ -3,7 +3,7 @@ import com.google.gson.JsonElement; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.util.DamageSource; import net.minecraft.util.math.BlockPos; @@ -173,9 +173,9 @@ public Entity getAttacker(BlockEvent.BreakEvent data) * @return */ @Override - public EntityPlayer getPlayer(BlockEvent.BreakEvent data) + public EntityPlayerMP getPlayer(BlockEvent.BreakEvent data) { - return data.getPlayer(); + return (EntityPlayerMP) data.getPlayer(); } /** @@ -227,9 +227,9 @@ public EntityLivingBase getEntityLiving() * @return */ @Override - public EntityPlayer getPlayer() + public EntityPlayerMP getPlayer() { - return event.getPlayer(); + return (EntityPlayerMP) event.getPlayer(); } /** diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/generic/GenericBlockPlaceActions.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/generic/GenericBlockPlaceActions.java index e478cba..6b63b3c 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/generic/GenericBlockPlaceActions.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/generic/GenericBlockPlaceActions.java @@ -3,7 +3,7 @@ import com.google.gson.JsonElement; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.util.DamageSource; import net.minecraft.util.math.BlockPos; @@ -175,9 +175,9 @@ public Entity getAttacker(BlockEvent.PlaceEvent data) * @return */ @Override - public EntityPlayer getPlayer(BlockEvent.PlaceEvent data) + public EntityPlayerMP getPlayer(BlockEvent.PlaceEvent data) { - return data.getPlayer(); + return (EntityPlayerMP) data.getPlayer(); } /** @@ -230,9 +230,9 @@ public EntityLivingBase getEntityLiving() * @return */ @Override - public EntityPlayer getPlayer() + public EntityPlayerMP getPlayer() { - return event.getPlayer(); + return (EntityPlayerMP) event.getPlayer(); } /** diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/generic/GenericDropLoot.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/generic/GenericDropLoot.java index d23512a..4e5a6e8 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/generic/GenericDropLoot.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/generic/GenericDropLoot.java @@ -3,7 +3,7 @@ import com.google.common.base.Predicate; import com.google.gson.JsonElement; import net.minecraft.entity.Entity; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.nbt.JsonToNBT; import net.minecraft.nbt.NBTException; @@ -231,11 +231,11 @@ public Entity getAttacker(LivingDropsEvent data) * @return */ @Override - public EntityPlayer getPlayer(LivingDropsEvent data) + public EntityPlayerMP getPlayer(LivingDropsEvent data) { Entity entity = data.getSource().getTrueSource(); - return entity instanceof EntityPlayer ? (EntityPlayer) entity : null; + return entity instanceof EntityPlayerMP ? (EntityPlayerMP) entity : null; } /** diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/generic/GenericExperience.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/generic/GenericExperience.java index f91f888..1c72105 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/generic/GenericExperience.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/generic/GenericExperience.java @@ -2,7 +2,7 @@ import com.google.gson.JsonElement; import net.minecraft.entity.Entity; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.util.DamageSource; import net.minecraft.util.math.BlockPos; @@ -233,9 +233,9 @@ public Entity getAttacker(LivingExperienceDropEvent data) * @return */ @Override - public EntityPlayer getPlayer(LivingExperienceDropEvent data) + public EntityPlayerMP getPlayer(LivingExperienceDropEvent data) { - return data.getAttackingPlayer(); + return (EntityPlayerMP) data.getAttackingPlayer(); } /** diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/generic/GenericLeftClickActions.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/generic/GenericLeftClickActions.java index 73c2ede..dcf5ca7 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/generic/GenericLeftClickActions.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/generic/GenericLeftClickActions.java @@ -3,7 +3,7 @@ import com.google.gson.JsonElement; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.util.DamageSource; import net.minecraft.util.math.BlockPos; @@ -184,9 +184,9 @@ public Entity getAttacker(PlayerInteractEvent.LeftClickBlock data) * @return */ @Override - public EntityPlayer getPlayer(PlayerInteractEvent.LeftClickBlock data) + public EntityPlayerMP getPlayer(PlayerInteractEvent.LeftClickBlock data) { - return data.getEntityPlayer(); + return (EntityPlayerMP) data.getEntityPlayer(); } /** @@ -227,9 +227,9 @@ public EntityLivingBase getEntityLiving() * @return */ @Override - public EntityPlayer getPlayer() + public EntityPlayerMP getPlayer() { - return event.getEntityPlayer(); + return (EntityPlayerMP) event.getEntityPlayer(); } /** diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/generic/GenericMapEffectsActions.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/generic/GenericMapEffectsActions.java index a2661e8..bc71a60 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/generic/GenericMapEffectsActions.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/generic/GenericMapEffectsActions.java @@ -3,7 +3,7 @@ import com.google.gson.JsonElement; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.util.DamageSource; import net.minecraft.util.math.BlockPos; @@ -189,9 +189,9 @@ public Entity getAttacker(TickEvent.PlayerTickEvent data) * @return */ @Override - public EntityPlayer getPlayer(TickEvent.PlayerTickEvent data) + public EntityPlayerMP getPlayer(TickEvent.PlayerTickEvent data) { - return data.player; + return (EntityPlayerMP) data.player; } /** @@ -298,9 +298,9 @@ public EntityLivingBase getEntityLiving() * @return */ @Override - public EntityPlayer getPlayer() + public EntityPlayerMP getPlayer() { - return event.player; + return (EntityPlayerMP) event.player; } /** diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/generic/GenericMobTaskManager.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/generic/GenericMobTaskManager.java index e148b8a..6ccf49b 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/generic/GenericMobTaskManager.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/generic/GenericMobTaskManager.java @@ -3,7 +3,7 @@ import com.google.gson.JsonElement; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.util.DamageSource; import net.minecraft.util.math.BlockPos; @@ -172,7 +172,7 @@ public Entity getAttacker(EntityJoinWorldEvent data) * @return */ @Override - public EntityPlayer getPlayer(EntityJoinWorldEvent data) + public EntityPlayerMP getPlayer(EntityJoinWorldEvent data) { return getClosestPlayer(data.getWorld(), data.getEntity().getPosition()); } @@ -195,9 +195,9 @@ public ItemStack getItem(EntityJoinWorldEvent data) * @param blockPos * @return */ - private static EntityPlayer getClosestPlayer(World world, BlockPos blockPos) + private static EntityPlayerMP getClosestPlayer(World world, BlockPos blockPos) { - return world.getClosestPlayer(blockPos.getX(), blockPos.getY(), blockPos.getZ(), 100, false); + return (EntityPlayerMP) world.getClosestPlayer(blockPos.getX(), blockPos.getY(), blockPos.getZ(), 100, false); } /** @@ -254,7 +254,7 @@ public EntityLivingBase getEntityLiving() * @return */ @Override - public EntityPlayer getPlayer() + public EntityPlayerMP getPlayer() { return null; } diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/generic/GenericPotentialSpawn.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/generic/GenericPotentialSpawn.java index 0db4e3b..f7fb121 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/generic/GenericPotentialSpawn.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/generic/GenericPotentialSpawn.java @@ -5,7 +5,7 @@ import com.google.gson.JsonObject; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLiving; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.DamageSource; @@ -260,7 +260,7 @@ public Entity getAttacker(WorldEvent.PotentialSpawns data) * @return */ @Override - public EntityPlayer getPlayer(WorldEvent.PotentialSpawns data) + public EntityPlayerMP getPlayer(WorldEvent.PotentialSpawns data) { return null; } diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/generic/GenericRightClickActions.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/generic/GenericRightClickActions.java index 7f50808..b6c5e3b 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/generic/GenericRightClickActions.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/generic/GenericRightClickActions.java @@ -3,7 +3,7 @@ import com.google.gson.JsonElement; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.util.DamageSource; import net.minecraft.util.math.BlockPos; @@ -184,9 +184,9 @@ public Entity getAttacker(PlayerInteractEvent.RightClickBlock data) * @return */ @Override - public EntityPlayer getPlayer(PlayerInteractEvent.RightClickBlock data) + public EntityPlayerMP getPlayer(PlayerInteractEvent.RightClickBlock data) { - return data.getEntityPlayer(); + return (EntityPlayerMP) data.getEntityPlayer(); } /** @@ -226,9 +226,9 @@ public EntityLivingBase getEntityLiving() * @return */ @Override - public EntityPlayer getPlayer() + public EntityPlayerMP getPlayer() { - return event.getEntityPlayer(); + return (EntityPlayerMP) event.getEntityPlayer(); } /** diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/generic/GenericSpawnConditions.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/generic/GenericSpawnConditions.java index 152f8c6..4788167 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/generic/GenericSpawnConditions.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/generic/GenericSpawnConditions.java @@ -3,7 +3,7 @@ import com.google.gson.JsonElement; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.util.DamageSource; import net.minecraft.util.math.BlockPos; @@ -172,7 +172,7 @@ public Entity getAttacker(LivingSpawnEvent.CheckSpawn data) * @return */ @Override - public EntityPlayer getPlayer(LivingSpawnEvent.CheckSpawn data) + public EntityPlayerMP getPlayer(LivingSpawnEvent.CheckSpawn data) { return getClosestPlayer(data.getWorld(), new BlockPos(data.getX(), data.getY(), data.getZ())); } @@ -195,9 +195,9 @@ public ItemStack getItem(LivingSpawnEvent.CheckSpawn data) * @param blockPos * @return */ - private static EntityPlayer getClosestPlayer(World world, BlockPos blockPos) + private static EntityPlayerMP getClosestPlayer(World world, BlockPos blockPos) { - return world.getClosestPlayer(blockPos.getX(), blockPos.getY(), blockPos.getZ(), 100, false); + return (EntityPlayerMP) world.getClosestPlayer(blockPos.getX(), blockPos.getY(), blockPos.getZ(), 100, false); } /** @@ -304,7 +304,7 @@ public EntityLivingBase getEntityLiving() * @return */ @Override - public EntityPlayer getPlayer() + public EntityPlayerMP getPlayer() { return null; } diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/primitive/OnComplexityBiomes.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/primitive/OnComplexityBiomes.java index 3c78a71..a2954fb 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/primitive/OnComplexityBiomes.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/primitive/OnComplexityBiomes.java @@ -1,7 +1,7 @@ package org.imesense.dynamicspawncontrol.technical.eventprocessor.primitive; import net.minecraft.client.Minecraft; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.util.ResourceLocation; import net.minecraft.world.biome.Biome; import net.minecraftforge.client.event.RenderGameOverlayEvent; @@ -85,9 +85,9 @@ public OnComplexityBiomes() @SubscribeEvent(priority = EventPriority.LOWEST) public void onPlayerTick(LivingEvent.LivingUpdateEvent event) { - if (event.getEntity() instanceof EntityPlayer) + if (event.getEntity() instanceof EntityPlayerMP) { - EntityPlayer player = (EntityPlayer) event.getEntity(); + EntityPlayerMP player = (EntityPlayerMP) event.getEntity(); Biome biome = player.world.getBiome(player.getPosition()); if (biome != currentBiome) diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/primitive/OnPlayerEvents.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/primitive/OnPlayerEvents.java index 5551ae0..1ea63a2 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/primitive/OnPlayerEvents.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/primitive/OnPlayerEvents.java @@ -2,7 +2,7 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.monster.IMob; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; @@ -59,9 +59,9 @@ public OnPlayerEvents() @SubscribeEvent(priority = EventPriority.LOWEST) public synchronized void onUpdateEntityJoinWorld_0(EntityJoinWorldEvent event) { - if (event.getEntity() instanceof EntityPlayer && !(event.getEntity() instanceof FakePlayer)) + if (event.getEntity() instanceof EntityPlayerMP && !(event.getEntity() instanceof FakePlayer)) { - EntityPlayer player = (EntityPlayer) event.getEntity(); + EntityPlayerMP player = (EntityPlayerMP) event.getEntity(); if (!PLAYER_LIST.contains(player.getName())) { @@ -78,7 +78,7 @@ public synchronized void onUpdateEntityJoinWorld_0(EntityJoinWorldEvent event) @SubscribeEvent(priority = EventPriority.LOWEST) public synchronized void onUpdatePlayerLoggedOut_1(PlayerEvent.PlayerLoggedOutEvent event) { - EntityPlayer player = event.player; + EntityPlayerMP player = (EntityPlayerMP) event.player; PLAYER_LIST.remove(player.getName()); Log.writeDataToLogFile(0, String.format("Player [%s] has been removed from the list", player.getName())); } @@ -120,7 +120,7 @@ public synchronized void onUpdatePlayerLogout_0(FMLNetworkEvent.ClientDisconnect @SubscribeEvent(priority = EventPriority.LOWEST) public void onPlayerRespawn_0(PlayerEvent.PlayerRespawnEvent event) { - EntityPlayer player = event.player; + EntityPlayerMP player = (EntityPlayerMP) event.player; World world = player.world; BlockPos playerPos = player.getPosition(); diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/signal/SignalDataAccessor.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/signal/SignalDataAccessor.java index 654b6d5..d2744ab 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/signal/SignalDataAccessor.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/signal/SignalDataAccessor.java @@ -5,7 +5,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.DamageSource; import net.minecraft.util.math.BlockPos; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; /** * @@ -60,7 +60,7 @@ public abstract class SignalDataAccessor * @param classEvent * @return */ - public abstract EntityPlayer getPlayer(ClassEvent classEvent); + public abstract EntityPlayerMP getPlayer(ClassEvent classEvent); /** * diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/signal/SignalDataGetter.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/signal/SignalDataGetter.java index 6168bb3..46cd065 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/signal/SignalDataGetter.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/eventprocessor/signal/SignalDataGetter.java @@ -4,7 +4,7 @@ import net.minecraft.entity.Entity; import net.minecraft.util.math.BlockPos; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; /** * @@ -33,7 +33,7 @@ public abstract class SignalDataGetter * * @return */ - public abstract EntityPlayer getPlayer(); + public abstract EntityPlayerMP getPlayer(); /** * diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/proxy/ClientProxy.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/proxy/ClientProxy.java index b12fe1c..6f74e8a 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/proxy/ClientProxy.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/proxy/ClientProxy.java @@ -5,12 +5,11 @@ import com.google.common.util.concurrent.ListenableFuture; import net.minecraft.client.Minecraft; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.client.entity.EntityPlayerSP; import net.minecraft.world.World; import net.minecraftforge.fml.common.event.FMLInitializationEvent; import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; -import org.imesense.dynamicspawncontrol.technical.initializer.RegisterCfgClasses; import org.imesense.dynamicspawncontrol.technical.initializer.RegisterOreGenerators; /** @@ -63,11 +62,11 @@ public World getClientWorld() /** * Get client player instance - * + * * @return Current player instance */ @Override - public EntityPlayer getClientPlayer() + public EntityPlayerSP getClientPlayer() { return Minecraft.getMinecraft().player; } diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/proxy/IProxy.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/proxy/IProxy.java index 7c78c11..21966fb 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/proxy/IProxy.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/proxy/IProxy.java @@ -4,7 +4,7 @@ import com.google.common.util.concurrent.ListenableFuture; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.client.entity.EntityPlayerSP; import net.minecraft.world.World; import net.minecraftforge.fml.common.event.FMLInitializationEvent; import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; @@ -45,10 +45,10 @@ public interface IProxy /** * Get client player instance - * + * * @return Current player instance */ - EntityPlayer getClientPlayer(); + EntityPlayerSP getClientPlayer(); /** * Add task to schedule for execution on client diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/proxy/ServerProxy.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/proxy/ServerProxy.java index 69b3db6..8326ac6 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/proxy/ServerProxy.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/proxy/ServerProxy.java @@ -4,7 +4,7 @@ import com.google.common.util.concurrent.ListenableFuture; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.client.entity.EntityPlayerSP; import net.minecraft.world.World; import net.minecraftforge.fml.common.event.FMLInitializationEvent; import net.minecraftforge.fml.common.event.FMLPostInitializationEvent; @@ -58,11 +58,11 @@ public World getClientWorld() /** * Get client player instance - * + * * @return Current player instance */ @Override - public EntityPlayer getClientPlayer() + public EntityPlayerSP getClientPlayer() { throw new IllegalStateException("The server cannot process this function, the call occurs from the client side!"); } diff --git a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/worldcache/Cache.java b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/worldcache/Cache.java index a3464d3..58b6596 100644 --- a/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/worldcache/Cache.java +++ b/dynamicspawncontrol-1.12.2/src/main/java/org/imesense/dynamicspawncontrol/technical/worldcache/Cache.java @@ -7,6 +7,7 @@ import net.minecraft.entity.passive.EntityAnimal; import net.minecraft.entity.passive.IAnimals; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.server.management.PlayerChunkMapEntry; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.ChunkPos; @@ -76,7 +77,7 @@ public void updateCache(@Nonnull World world) for (EntityPlayer player : world.playerEntities) { - Set validChunks = totalValidChunksSpawnForPlayer(worldServer, player); + Set validChunks = totalValidChunksSpawnForPlayer(worldServer, (EntityPlayerMP) player); CACHE_VALID_CHUNKS.addAll(validChunks); } } @@ -119,7 +120,7 @@ else if (entity instanceof EntityMob) } } - private Set totalValidChunksSpawnForPlayer(WorldServer worldServer, EntityPlayer player) + private Set totalValidChunksSpawnForPlayer(WorldServer worldServer, EntityPlayerMP player) { Set validChunks = new HashSet<>();