1.15 port

This commit is contained in:
yueh
2020-05-18 14:02:45 +02:00
parent 0ea86c939c
commit 16d6d55d7f
630 changed files with 4211 additions and 12664 deletions
@@ -21,7 +21,7 @@ package appeng.me.helpers;
import java.util.Optional;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.PlayerEntity;
import appeng.api.networking.security.IActionHost;
import appeng.api.networking.security.IActionSource;
@@ -31,7 +31,7 @@ public class BaseActionSource implements IActionSource
{
@Override
public Optional<EntityPlayer> player()
public Optional<PlayerEntity> player()
{
return Optional.empty();
}