1.15 port

src/main/java/appeng/core/stats/AppEngAdvancementTrigger.java

@@ -31,8 +31,8 @@ import com.google.gson.JsonObject;
 
 import net.minecraft.advancements.ICriterionTrigger;
 import net.minecraft.advancements.PlayerAdvancements;
-import net.minecraft.advancements.critereon.AbstractCriterionInstance;
-import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.advancements.criterion.CriterionInstance;
+import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.util.ResourceLocation;
 
 import appeng.core.AppEng;
@@ -98,7 +98,7 @@ public class AppEngAdvancementTrigger implements ICriterionTrigger<AppEngAdvance
 	}
 
 	@Override
-	public void trigger( EntityPlayerMP parPlayer )
+	public void trigger( PlayerEntity parPlayer )
 	{
 		AppEngAdvancementTrigger.Listeners l = this.listeners.get( parPlayer.getAdvancements() );
 
@@ -108,7 +108,7 @@ public class AppEngAdvancementTrigger implements ICriterionTrigger<AppEngAdvance
 		}
 	}
 
-	public static class Instance extends AbstractCriterionInstance
+	public static class Instance extends CriterionInstance
 	{
 		public Instance( ResourceLocation parID )
 		{
@@ -146,7 +146,7 @@ public class AppEngAdvancementTrigger implements ICriterionTrigger<AppEngAdvance
 			this.listeners.remove( listener );
 		}
 
-		public void trigger( EntityPlayerMP player )
+		public void trigger( PlayerEntity player )
 		{
 			List<ICriterionTrigger.Listener<AppEngAdvancementTrigger.Instance>> list = null;
 

src/main/java/appeng/core/stats/IAdvancementTrigger.java

@@ -19,11 +19,11 @@
 package appeng.core.stats;
 
 
-import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.entity.player.PlayerEntity;
 
 
 @FunctionalInterface
 public interface IAdvancementTrigger
 {
-	void trigger( EntityPlayerMP parPlayer );
+	void trigger( PlayerEntity parPlayer );
 }

src/main/java/appeng/core/stats/Stats.java

@@ -19,7 +19,7 @@
 package appeng.core.stats;
 
 
-import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.stats.StatBasic;
 import net.minecraft.util.text.TextComponentTranslation;
 
@@ -42,7 +42,7 @@ public enum Stats
 	{
 	}
 
-	public void addToPlayer( final EntityPlayer player, final int howMany )
+	public void addToPlayer( final PlayerEntity player, final int howMany )
 	{
 		player.addStat( this.stat, howMany );
 	}