From db5f0a5544204ee108fa39018fc9f5aa5e888454 Mon Sep 17 00:00:00 2001
From: Sollace <sollacea@gmail.com>
Date: Wed, 15 Apr 2020 17:26:12 +0200
Subject: [PATCH] advancements -> advancement

---
 .../{advancements => advancement}/AbstractCriterion.java      | 4 ++--
 .../{advancements => advancement}/AdvancementPredicate.java   | 2 +-
 .../{advancements => advancement}/BOHDeathCriterion.java      | 2 +-
 .../unicopia/container/BagOfHoldingInventory.java             | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)
 rename src/main/java/com/minelittlepony/unicopia/{advancements => advancement}/AbstractCriterion.java (89%)
 rename src/main/java/com/minelittlepony/unicopia/{advancements => advancement}/AdvancementPredicate.java (94%)
 rename src/main/java/com/minelittlepony/unicopia/{advancements => advancement}/BOHDeathCriterion.java (97%)

diff --git a/src/main/java/com/minelittlepony/unicopia/advancements/AbstractCriterion.java b/src/main/java/com/minelittlepony/unicopia/advancement/AbstractCriterion.java
similarity index 89%
rename from src/main/java/com/minelittlepony/unicopia/advancements/AbstractCriterion.java
rename to src/main/java/com/minelittlepony/unicopia/advancement/AbstractCriterion.java
index 469374ce..0fe06dae 100644
--- a/src/main/java/com/minelittlepony/unicopia/advancements/AbstractCriterion.java
+++ b/src/main/java/com/minelittlepony/unicopia/advancement/AbstractCriterion.java
@@ -1,4 +1,4 @@
-package com.minelittlepony.unicopia.advancements;
+package com.minelittlepony.unicopia.advancement;
 
 import java.util.List;
 import java.util.Map;
@@ -10,7 +10,7 @@ import net.minecraft.advancement.PlayerAdvancementTracker;
 import net.minecraft.advancement.criterion.Criterion;
 import net.minecraft.advancement.criterion.CriterionConditions;
 
-public abstract class AbstractCriterion<E extends AbstractCriterion.Entry<T>, T extends CriterionConditions> implements Criterion<T> {
+abstract class AbstractCriterion<E extends AbstractCriterion.Entry<T>, T extends CriterionConditions> implements Criterion<T> {
 
     protected final Map<PlayerAdvancementTracker, E> listeners = Maps.newHashMap();
 
diff --git a/src/main/java/com/minelittlepony/unicopia/advancements/AdvancementPredicate.java b/src/main/java/com/minelittlepony/unicopia/advancement/AdvancementPredicate.java
similarity index 94%
rename from src/main/java/com/minelittlepony/unicopia/advancements/AdvancementPredicate.java
rename to src/main/java/com/minelittlepony/unicopia/advancement/AdvancementPredicate.java
index dbbef2ca..e42e7954 100644
--- a/src/main/java/com/minelittlepony/unicopia/advancements/AdvancementPredicate.java
+++ b/src/main/java/com/minelittlepony/unicopia/advancement/AdvancementPredicate.java
@@ -1,4 +1,4 @@
-package com.minelittlepony.unicopia.advancements;
+package com.minelittlepony.unicopia.advancement;
 
 import com.google.gson.JsonElement;
 
diff --git a/src/main/java/com/minelittlepony/unicopia/advancements/BOHDeathCriterion.java b/src/main/java/com/minelittlepony/unicopia/advancement/BOHDeathCriterion.java
similarity index 97%
rename from src/main/java/com/minelittlepony/unicopia/advancements/BOHDeathCriterion.java
rename to src/main/java/com/minelittlepony/unicopia/advancement/BOHDeathCriterion.java
index 8b4215c4..ccd3247a 100644
--- a/src/main/java/com/minelittlepony/unicopia/advancements/BOHDeathCriterion.java
+++ b/src/main/java/com/minelittlepony/unicopia/advancement/BOHDeathCriterion.java
@@ -1,4 +1,4 @@
-package com.minelittlepony.unicopia.advancements;
+package com.minelittlepony.unicopia.advancement;
 
 import java.util.Optional;
 
diff --git a/src/main/java/com/minelittlepony/unicopia/container/BagOfHoldingInventory.java b/src/main/java/com/minelittlepony/unicopia/container/BagOfHoldingInventory.java
index b0a3cc07..7f03285c 100644
--- a/src/main/java/com/minelittlepony/unicopia/container/BagOfHoldingInventory.java
+++ b/src/main/java/com/minelittlepony/unicopia/container/BagOfHoldingInventory.java
@@ -5,7 +5,7 @@ import java.util.List;
 import java.util.Optional;
 import java.util.function.BiFunction;
 
-import com.minelittlepony.unicopia.advancements.BOHDeathCriterion;
+import com.minelittlepony.unicopia.advancement.BOHDeathCriterion;
 import com.minelittlepony.unicopia.magic.IMagicalItem;
 import com.minelittlepony.unicopia.util.HeavyInventoryUtils;
 import com.minelittlepony.unicopia.util.InbtSerialisable;