Migrate to non API centralized ExpectPlatform

build.gradle

@@ -1,6 +1,6 @@
 plugins {
-    id "architectury-plugin" version "1.3.43"
-    id "forgified-fabric-loom" version "0.5.23" apply false
+    id "architectury-plugin" version "1.3.45"
+    id "forgified-fabric-loom" version "0.5.25" apply false
     id "org.cadixdev.licenser" version "0.5.0"
     id "com.jfrog.bintray" version "1.8.4"
     id "com.matthewprenger.cursegradle" version "1.4.0" apply false

common/src/main/java/me/shedaniel/architectury/ExpectPlatform.java

@@ -24,7 +24,11 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
+/**
+ * Please migrate to {@link me.shedaniel.architectury.annotations.ExpectPlatform}.
+ */
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.METHOD)
+@Deprecated
 public @interface ExpectPlatform {
 }

common/src/main/java/me/shedaniel/architectury/event/EventFactory.java

@@ -20,9 +20,9 @@
 package me.shedaniel.architectury.event;
 
 import com.google.common.reflect.AbstractInvocationHandler;
-import me.shedaniel.architectury.ExpectPlatform;
 import me.shedaniel.architectury.ForgeEvent;
 import me.shedaniel.architectury.ForgeEventCancellable;
+import me.shedaniel.architectury.annotations.ExpectPlatform;
 import net.jodah.typetools.TypeResolver;
 import net.minecraft.world.InteractionResult;
 import net.minecraft.world.InteractionResultHolder;

common/src/main/java/me/shedaniel/architectury/event/EventHandler.java

@@ -19,7 +19,7 @@
 
 package me.shedaniel.architectury.event;
 
-import me.shedaniel.architectury.ExpectPlatform;
+import me.shedaniel.architectury.annotations.ExpectPlatform;
 import me.shedaniel.architectury.platform.Platform;
 import me.shedaniel.architectury.utils.Env;
 import net.fabricmc.api.EnvType;

common/src/main/java/me/shedaniel/architectury/hooks/DyeColorHooks.java

@@ -19,7 +19,7 @@
 
 package me.shedaniel.architectury.hooks;
 
-import me.shedaniel.architectury.ExpectPlatform;
+import me.shedaniel.architectury.annotations.ExpectPlatform;
 import net.minecraft.world.item.DyeColor;
 
 public class DyeColorHooks {

common/src/main/java/me/shedaniel/architectury/hooks/EntityHooks.java

@@ -19,7 +19,7 @@
 
 package me.shedaniel.architectury.hooks;
 
-import me.shedaniel.architectury.ExpectPlatform;
+import me.shedaniel.architectury.annotations.ExpectPlatform;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.minecraft.world.entity.Entity;

common/src/main/java/me/shedaniel/architectury/hooks/ExplosionHooks.java

@@ -19,7 +19,7 @@
 
 package me.shedaniel.architectury.hooks;
 
-import me.shedaniel.architectury.ExpectPlatform;
+import me.shedaniel.architectury.annotations.ExpectPlatform;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.minecraft.world.entity.Entity;

common/src/main/java/me/shedaniel/architectury/hooks/FluidStackHooks.java

@@ -19,7 +19,7 @@
 
 package me.shedaniel.architectury.hooks;
 
-import me.shedaniel.architectury.ExpectPlatform;
+import me.shedaniel.architectury.annotations.ExpectPlatform;
 import me.shedaniel.architectury.fluid.FluidStack;
 import me.shedaniel.architectury.utils.Fraction;
 import net.minecraft.nbt.CompoundTag;

common/src/main/java/me/shedaniel/architectury/hooks/ItemEntityHooks.java

@@ -19,7 +19,7 @@
 
 package me.shedaniel.architectury.hooks;
 
-import me.shedaniel.architectury.ExpectPlatform;
+import me.shedaniel.architectury.annotations.ExpectPlatform;
 import me.shedaniel.architectury.utils.IntValue;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;

common/src/main/java/me/shedaniel/architectury/hooks/PackRepositoryHooks.java

@@ -19,7 +19,7 @@
 
 package me.shedaniel.architectury.hooks;
 
-import me.shedaniel.architectury.ExpectPlatform;
+import me.shedaniel.architectury.annotations.ExpectPlatform;
 import net.minecraft.server.packs.repository.PackRepository;
 import net.minecraft.server.packs.repository.RepositorySource;
 

common/src/main/java/me/shedaniel/architectury/hooks/PlayerHooks.java

@@ -19,7 +19,7 @@
 
 package me.shedaniel.architectury.hooks;
 
-import me.shedaniel.architectury.ExpectPlatform;
+import me.shedaniel.architectury.annotations.ExpectPlatform;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.minecraft.world.entity.player.Player;

common/src/main/java/me/shedaniel/architectury/hooks/ScreenHooks.java

@@ -19,7 +19,7 @@
 
 package me.shedaniel.architectury.hooks;
 
-import me.shedaniel.architectury.ExpectPlatform;
+import me.shedaniel.architectury.annotations.ExpectPlatform;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.minecraft.client.gui.components.AbstractWidget;

common/src/main/java/me/shedaniel/architectury/hooks/biome/EffectsProperties.java

@@ -64,7 +64,7 @@ public interface EffectsProperties {
     @NotNull
     Optional<Music> getBackgroundMusic();
     
-    interface Mutable  extends EffectsProperties{
+    interface Mutable extends EffectsProperties {
         @NotNull
         EffectsProperties.Mutable setFogColor(int color);
         

common/src/main/java/me/shedaniel/architectury/networking/NetworkManager.java

@@ -19,7 +19,7 @@
 
 package me.shedaniel.architectury.networking;
 
-import me.shedaniel.architectury.ExpectPlatform;
+import me.shedaniel.architectury.annotations.ExpectPlatform;
 import me.shedaniel.architectury.utils.Env;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;

common/src/main/java/me/shedaniel/architectury/platform/Platform.java

@@ -20,7 +20,7 @@
 package me.shedaniel.architectury.platform;
 
 import me.shedaniel.architectury.Architectury;
-import me.shedaniel.architectury.ExpectPlatform;
+import me.shedaniel.architectury.annotations.ExpectPlatform;
 import me.shedaniel.architectury.utils.Env;
 import net.fabricmc.api.EnvType;
 import net.minecraft.SharedConstants;

common/src/main/java/me/shedaniel/architectury/registry/BiomeModifications.java

@@ -20,7 +20,7 @@
 package me.shedaniel.architectury.registry;
 
 import com.google.common.base.Predicates;
-import me.shedaniel.architectury.ExpectPlatform;
+import me.shedaniel.architectury.annotations.ExpectPlatform;
 import me.shedaniel.architectury.hooks.biome.BiomeProperties;
 import net.minecraft.resources.ResourceLocation;
 import org.jetbrains.annotations.NotNull;

common/src/main/java/me/shedaniel/architectury/registry/BlockEntityRenderers.java

@@ -19,7 +19,7 @@
 
 package me.shedaniel.architectury.registry;
 
-import me.shedaniel.architectury.ExpectPlatform;
+import me.shedaniel.architectury.annotations.ExpectPlatform;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.minecraft.client.renderer.blockentity.BlockEntityRenderDispatcher;

common/src/main/java/me/shedaniel/architectury/registry/BlockProperties.java

@@ -19,7 +19,7 @@
 
 package me.shedaniel.architectury.registry;
 
-import me.shedaniel.architectury.ExpectPlatform;
+import me.shedaniel.architectury.annotations.ExpectPlatform;
 import net.minecraft.world.item.DyeColor;
 import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.level.block.state.BlockState;

common/src/main/java/me/shedaniel/architectury/registry/ColorHandlers.java

@@ -19,7 +19,7 @@
 
 package me.shedaniel.architectury.registry;
 
-import me.shedaniel.architectury.ExpectPlatform;
+import me.shedaniel.architectury.annotations.ExpectPlatform;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.minecraft.client.color.block.BlockColor;

common/src/main/java/me/shedaniel/architectury/registry/CreativeTabs.java

@@ -19,7 +19,7 @@
 
 package me.shedaniel.architectury.registry;
 
-import me.shedaniel.architectury.ExpectPlatform;
+import me.shedaniel.architectury.annotations.ExpectPlatform;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.CreativeModeTab;
 import net.minecraft.world.item.ItemStack;

common/src/main/java/me/shedaniel/architectury/registry/CriteriaTriggersRegistry.java

@@ -19,7 +19,7 @@
 
 package me.shedaniel.architectury.registry;
 
-import me.shedaniel.architectury.ExpectPlatform;
+import me.shedaniel.architectury.annotations.ExpectPlatform;
 import net.minecraft.advancements.CriterionTrigger;
 
 public final class CriteriaTriggersRegistry {

common/src/main/java/me/shedaniel/architectury/registry/KeyBindings.java

@@ -19,7 +19,7 @@
 
 package me.shedaniel.architectury.registry;
 
-import me.shedaniel.architectury.ExpectPlatform;
+import me.shedaniel.architectury.annotations.ExpectPlatform;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.minecraft.client.KeyMapping;

common/src/main/java/me/shedaniel/architectury/registry/MenuRegistry.java

@@ -19,7 +19,7 @@
 
 package me.shedaniel.architectury.registry;
 
-import me.shedaniel.architectury.ExpectPlatform;
+import me.shedaniel.architectury.annotations.ExpectPlatform;
 import me.shedaniel.architectury.registry.menu.ExtendedMenuProvider;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;

common/src/main/java/me/shedaniel/architectury/registry/Registries.java

@@ -19,7 +19,7 @@
 
 package me.shedaniel.architectury.registry;
 
-import me.shedaniel.architectury.ExpectPlatform;
+import me.shedaniel.architectury.annotations.ExpectPlatform;
 import net.minecraft.resources.ResourceKey;
 import net.minecraft.resources.ResourceLocation;
 import org.jetbrains.annotations.ApiStatus;

common/src/main/java/me/shedaniel/architectury/registry/ReloadListeners.java

@@ -19,7 +19,7 @@
 
 package me.shedaniel.architectury.registry;
 
-import me.shedaniel.architectury.ExpectPlatform;
+import me.shedaniel.architectury.annotations.ExpectPlatform;
 import net.minecraft.server.packs.PackType;
 import net.minecraft.server.packs.resources.PreparableReloadListener;
 

common/src/main/java/me/shedaniel/architectury/registry/RenderTypes.java

@@ -19,7 +19,7 @@
 
 package me.shedaniel.architectury.registry;
 
-import me.shedaniel.architectury.ExpectPlatform;
+import me.shedaniel.architectury.annotations.ExpectPlatform;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.minecraft.client.renderer.RenderType;

common/src/main/java/me/shedaniel/architectury/registry/ToolType.java

@@ -20,7 +20,7 @@
 package me.shedaniel.architectury.registry;
 
 import com.google.common.collect.Maps;
-import me.shedaniel.architectury.ExpectPlatform;
+import me.shedaniel.architectury.annotations.ExpectPlatform;
 import net.minecraft.tags.Tag;
 import net.minecraft.world.item.Item;
 

common/src/main/java/me/shedaniel/architectury/utils/GameInstance.java

@@ -19,7 +19,7 @@
 
 package me.shedaniel.architectury.utils;
 
-import me.shedaniel.architectury.ExpectPlatform;
+import me.shedaniel.architectury.annotations.ExpectPlatform;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.minecraft.client.Minecraft;