More compile things

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

@@ -33,6 +33,7 @@ import net.minecraft.advancements.ICriterionTrigger;
 import net.minecraft.advancements.PlayerAdvancements;
 import net.minecraft.advancements.criterion.CriterionInstance;
 import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.entity.player.ServerPlayerEntity;
 import net.minecraft.util.ResourceLocation;
 
 import appeng.core.AppEng;
@@ -98,7 +99,7 @@ public class AppEngAdvancementTrigger implements ICriterionTrigger<AppEngAdvance
 	}
 
 	@Override
-	public void trigger( PlayerEntity parPlayer )
+	public void trigger( ServerPlayerEntity parPlayer )
 	{
 		AppEngAdvancementTrigger.Listeners l = this.listeners.get( parPlayer.getAdvancements() );
 

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

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

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

@@ -21,11 +21,10 @@ package appeng.core.stats;
 
 import com.google.gson.JsonObject;
 
-import net.minecraft.advancements.critereon.ItemPredicate;
+import net.minecraft.advancements.criterion.ItemPredicate;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.JSONUtils;
 import net.minecraft.util.ResourceLocation;
-import net.minecraftforge.advancements.critereon.ItemPredicates;
 
 import appeng.core.AppEng;
 import appeng.items.parts.ItemPart;
@@ -65,6 +64,6 @@ public class PartItemPredicate extends ItemPredicate
 
 	public static void register()
 	{
-		ItemPredicates.register( new ResourceLocation( AppEng.MOD_ID, "part" ), PartItemPredicate::deserialize );
+		ItemPredicate.register( new ResourceLocation( AppEng.MOD_ID, "part" ), PartItemPredicate::deserialize );
 	}
 }