From bf92dd96a5ebac54bf79a79bafe23cf1aba8264c Mon Sep 17 00:00:00 2001 From: Alex Nijjar Date: Sun, 14 Apr 2024 13:50:36 -0500 Subject: [PATCH] Mark old API for removal in 1.21 --- .../java/earth/terrarium/cadmus/api/claims/ClaimApi.java | 7 +++++++ .../earth/terrarium/cadmus/api/claims/InteractionType.java | 4 ++++ .../earth/terrarium/cadmus/api/claims/admin/FlagApi.java | 7 +++++++ .../terrarium/cadmus/api/claims/admin/flags/Flag.java | 7 +++++++ .../cadmus/api/claims/maxclaims/MaxClaimProvider.java | 4 ++++ .../cadmus/api/claims/maxclaims/MaxClaimProviderApi.java | 4 ++++ .../earth/terrarium/cadmus/api/teams/TeamProvider.java | 3 +++ .../earth/terrarium/cadmus/api/teams/TeamProviderApi.java | 4 ++++ .../java/earth/terrarium/cadmus/forge/CadmusForge.java | 2 -- 9 files changed, 40 insertions(+), 2 deletions(-) diff --git a/common/src/main/java/earth/terrarium/cadmus/api/claims/ClaimApi.java b/common/src/main/java/earth/terrarium/cadmus/api/claims/ClaimApi.java index 6db33d5..3395e1b 100644 --- a/common/src/main/java/earth/terrarium/cadmus/api/claims/ClaimApi.java +++ b/common/src/main/java/earth/terrarium/cadmus/api/claims/ClaimApi.java @@ -11,11 +11,18 @@ import net.minecraft.world.level.ChunkPos; import net.minecraft.world.level.Explosion; import net.minecraft.world.level.Level; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import java.util.UUID; +/** + * This API is being heavily reworked in 1.21. + */ +@Deprecated +@ApiStatus.ScheduledForRemoval(inVersion = "1.21") public interface ClaimApi { + ClaimApi API = ApiHelper.load(ClaimApi.class); /** diff --git a/common/src/main/java/earth/terrarium/cadmus/api/claims/InteractionType.java b/common/src/main/java/earth/terrarium/cadmus/api/claims/InteractionType.java index 2a61894..de2c889 100644 --- a/common/src/main/java/earth/terrarium/cadmus/api/claims/InteractionType.java +++ b/common/src/main/java/earth/terrarium/cadmus/api/claims/InteractionType.java @@ -1,5 +1,9 @@ package earth.terrarium.cadmus.api.claims; +import org.jetbrains.annotations.ApiStatus; + +@Deprecated(forRemoval = true) +@ApiStatus.ScheduledForRemoval(inVersion = "1.21") public enum InteractionType { ATTACK, USE, diff --git a/common/src/main/java/earth/terrarium/cadmus/api/claims/admin/FlagApi.java b/common/src/main/java/earth/terrarium/cadmus/api/claims/admin/FlagApi.java index c814b54..45908af 100644 --- a/common/src/main/java/earth/terrarium/cadmus/api/claims/admin/FlagApi.java +++ b/common/src/main/java/earth/terrarium/cadmus/api/claims/admin/FlagApi.java @@ -2,10 +2,17 @@ import earth.terrarium.cadmus.api.ApiHelper; import earth.terrarium.cadmus.api.claims.admin.flags.Flag; +import org.jetbrains.annotations.ApiStatus; import java.util.Map; +/** + * This API is being heavily reworked in 1.21. + */ +@Deprecated +@ApiStatus.ScheduledForRemoval(inVersion = "1.21") public interface FlagApi { + FlagApi API = ApiHelper.load(FlagApi.class); /** diff --git a/common/src/main/java/earth/terrarium/cadmus/api/claims/admin/flags/Flag.java b/common/src/main/java/earth/terrarium/cadmus/api/claims/admin/flags/Flag.java index a5e4d10..f5890ac 100644 --- a/common/src/main/java/earth/terrarium/cadmus/api/claims/admin/flags/Flag.java +++ b/common/src/main/java/earth/terrarium/cadmus/api/claims/admin/flags/Flag.java @@ -3,8 +3,15 @@ import com.mojang.brigadier.builder.RequiredArgumentBuilder; import com.mojang.brigadier.context.CommandContext; import net.minecraft.commands.CommandSourceStack; +import org.jetbrains.annotations.ApiStatus; +/** + * This API is being heavily reworked in 1.21. + */ +@Deprecated +@ApiStatus.ScheduledForRemoval(inVersion = "1.21") public interface Flag { + T getValue(); RequiredArgumentBuilder createArgument(String string); diff --git a/common/src/main/java/earth/terrarium/cadmus/api/claims/maxclaims/MaxClaimProvider.java b/common/src/main/java/earth/terrarium/cadmus/api/claims/maxclaims/MaxClaimProvider.java index e0efe02..2b9fb85 100644 --- a/common/src/main/java/earth/terrarium/cadmus/api/claims/maxclaims/MaxClaimProvider.java +++ b/common/src/main/java/earth/terrarium/cadmus/api/claims/maxclaims/MaxClaimProvider.java @@ -3,10 +3,14 @@ import net.minecraft.server.MinecraftServer; import net.minecraft.server.level.ServerLevel; import net.minecraft.world.entity.player.Player; +import org.jetbrains.annotations.ApiStatus; import java.util.UUID; +@Deprecated(forRemoval = true) +@ApiStatus.ScheduledForRemoval(inVersion = "1.21") public interface MaxClaimProvider { + void calculate(String id, MinecraftServer server); void removeTeam(String id, MinecraftServer server); diff --git a/common/src/main/java/earth/terrarium/cadmus/api/claims/maxclaims/MaxClaimProviderApi.java b/common/src/main/java/earth/terrarium/cadmus/api/claims/maxclaims/MaxClaimProviderApi.java index 3075a66..64ce39c 100644 --- a/common/src/main/java/earth/terrarium/cadmus/api/claims/maxclaims/MaxClaimProviderApi.java +++ b/common/src/main/java/earth/terrarium/cadmus/api/claims/maxclaims/MaxClaimProviderApi.java @@ -2,11 +2,15 @@ import earth.terrarium.cadmus.api.ApiHelper; import net.minecraft.resources.ResourceLocation; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.Nullable; import java.util.Collection; +@Deprecated(forRemoval = true) +@ApiStatus.ScheduledForRemoval(inVersion = "1.21") public interface MaxClaimProviderApi { + MaxClaimProviderApi API = ApiHelper.load(MaxClaimProviderApi.class); /** diff --git a/common/src/main/java/earth/terrarium/cadmus/api/teams/TeamProvider.java b/common/src/main/java/earth/terrarium/cadmus/api/teams/TeamProvider.java index 4442258..8b07bef 100644 --- a/common/src/main/java/earth/terrarium/cadmus/api/teams/TeamProvider.java +++ b/common/src/main/java/earth/terrarium/cadmus/api/teams/TeamProvider.java @@ -11,11 +11,14 @@ import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.player.Player; import net.minecraft.world.level.Explosion; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.Nullable; import java.util.Set; import java.util.UUID; +@Deprecated(forRemoval = true) +@ApiStatus.ScheduledForRemoval(inVersion = "1.21") public interface TeamProvider { /** diff --git a/common/src/main/java/earth/terrarium/cadmus/api/teams/TeamProviderApi.java b/common/src/main/java/earth/terrarium/cadmus/api/teams/TeamProviderApi.java index 42203f1..65451d2 100644 --- a/common/src/main/java/earth/terrarium/cadmus/api/teams/TeamProviderApi.java +++ b/common/src/main/java/earth/terrarium/cadmus/api/teams/TeamProviderApi.java @@ -2,11 +2,15 @@ import earth.terrarium.cadmus.api.ApiHelper; import net.minecraft.resources.ResourceLocation; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.Nullable; import java.util.Collection; +@Deprecated(forRemoval = true) +@ApiStatus.ScheduledForRemoval(inVersion = "1.21") public interface TeamProviderApi { + TeamProviderApi API = ApiHelper.load(TeamProviderApi.class); /** diff --git a/forge/src/main/java/earth/terrarium/cadmus/forge/CadmusForge.java b/forge/src/main/java/earth/terrarium/cadmus/forge/CadmusForge.java index cbc3308..5c30247 100644 --- a/forge/src/main/java/earth/terrarium/cadmus/forge/CadmusForge.java +++ b/forge/src/main/java/earth/terrarium/cadmus/forge/CadmusForge.java @@ -15,8 +15,6 @@ import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.entity.player.Player; import net.minecraft.world.level.ChunkPos; -import net.minecraft.world.level.Level; -import net.minecraft.world.level.block.piston.PistonStructureResolver; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.RegisterCommandsEvent; import net.minecraftforge.event.entity.EntityEvent;