Merge pull request #20 from devs-immortal/patch/1.18.2/remove-1-7-0-d…

…eprecated-members Remove deprecated members from 1.7.0
Azzyypaaras · Nov 18, 2022 · b1f5514 · b1f5514
2 parents ffc3a85 + 71e0802
commit b1f5514
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 118 deletions.
diff --git a/src/main/java/net/id/incubus_core/condition/api/Condition.java b/src/main/java/net/id/incubus_core/condition/api/Condition.java
@@ -41,13 +41,9 @@
 public abstract class Condition {
 
     /**
-     * @deprecated
-     * This field will become private in a later version. <br>
      * A tag containing all {@code EntityType}s which cannot get this condition.
      */
-    @Deprecated(since = "1.7.0", forRemoval = true)
-    @ApiStatus.ScheduledForRemoval
-    public final TagKey<EntityType<?>> exempt;
+    private final TagKey<EntityType<?>> exempt;
     /**
      * The maximum value for the {@code Temporary} {@link Persistence}.
      */
@@ -100,18 +96,6 @@ public final Identifier getId(){
         return IncubusCondition.CONDITION_REGISTRY.getId(this);
     }
 
-    /**
-     * @deprecated
-     * Use {@link #isApplicableTo(LivingEntity)}
-     * @param entity A {@code LivingEntity} to be tested.
-     * @return Whether the provided {@code LivingEntity} is exempt from the condition
-     */
-    @Deprecated(since = "1.7.0", forRemoval = true)
-    @ApiStatus.ScheduledForRemoval
-    public final boolean isExempt(LivingEntity entity) {
-        return !isApplicableTo(entity);
-    }
-
     /**
      * @return Whether this condition is applicable to the given entity
      */

diff --git a/src/main/java/net/id/incubus_core/condition/api/ConditionAPI.java b/src/main/java/net/id/incubus_core/condition/api/ConditionAPI.java
diff --git a/src/main/java/net/id/incubus_core/condition/api/Persistence.java b/src/main/java/net/id/incubus_core/condition/api/Persistence.java
@@ -1,7 +1,5 @@
 package net.id.incubus_core.condition.api;
 
-import org.jetbrains.annotations.ApiStatus;
-
 /**
  * {@code Persistence} is how much a {@code Condition} persists.
  * There are three main types: {@link Persistence#TEMPORARY},
@@ -13,6 +11,7 @@
  * @see Persistence#CHRONIC
  * @see Persistence#CONSTANT
  */
+@SuppressWarnings("unused")
 public enum Persistence {
     /**
      * This {@code Persistence} is what you'd expect.
@@ -32,19 +31,6 @@ public enum Persistence {
      */
     CONSTANT;
 
-    /**
-     * @deprecated
-     * Use {@link #getTranslationKey()} instead. <br>
-     * The translation key. <br> e.g. {@code "condition.persistence.temporary"}.
-     */
-    @Deprecated(since = "1.7.0", forRemoval = true)
-    @ApiStatus.ScheduledForRemoval
-    public final String translation;
-
-    Persistence() {
-        this.translation = this.getTranslationKey();
-    }
-
     /**
      * @return The translation key of this Persistence <br> e.g. {@code "condition.persistence.temporary"}.
      */