Migrate to non API centralized ExpectPlatform

2026-04-03 05:57:40 -05:00 · 2021-01-11 11:15:14 +08:00
parent 2ded801007
commit 75ee6b0d03
28 changed files with 32 additions and 28 deletions
--- a/common/src/main/java/me/shedaniel/architectury/ExpectPlatform.java
+++ b/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 {
 }
--- a/common/src/main/java/me/shedaniel/architectury/event/EventFactory.java
+++ b/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;
--- a/common/src/main/java/me/shedaniel/architectury/event/EventHandler.java
+++ b/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;
--- a/common/src/main/java/me/shedaniel/architectury/hooks/DyeColorHooks.java
+++ b/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 {
--- a/common/src/main/java/me/shedaniel/architectury/hooks/EntityHooks.java
+++ b/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;
--- a/common/src/main/java/me/shedaniel/architectury/hooks/ExplosionHooks.java
+++ b/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;
--- a/common/src/main/java/me/shedaniel/architectury/hooks/FluidStackHooks.java
+++ b/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;
--- a/common/src/main/java/me/shedaniel/architectury/hooks/ItemEntityHooks.java
+++ b/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;
--- a/common/src/main/java/me/shedaniel/architectury/hooks/PackRepositoryHooks.java
+++ b/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;

--- a/common/src/main/java/me/shedaniel/architectury/hooks/PlayerHooks.java
+++ b/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;
--- a/common/src/main/java/me/shedaniel/architectury/hooks/ScreenHooks.java
+++ b/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;
--- a/common/src/main/java/me/shedaniel/architectury/hooks/biome/EffectsProperties.java
+++ b/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);
        
--- a/common/src/main/java/me/shedaniel/architectury/networking/NetworkManager.java
+++ b/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;
--- a/common/src/main/java/me/shedaniel/architectury/platform/Platform.java
+++ b/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;
--- a/common/src/main/java/me/shedaniel/architectury/registry/BiomeModifications.java
+++ b/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;
--- a/common/src/main/java/me/shedaniel/architectury/registry/BlockEntityRenderers.java
+++ b/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;
--- a/common/src/main/java/me/shedaniel/architectury/registry/BlockProperties.java
+++ b/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;
--- a/common/src/main/java/me/shedaniel/architectury/registry/ColorHandlers.java
+++ b/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;
--- a/common/src/main/java/me/shedaniel/architectury/registry/CreativeTabs.java
+++ b/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;
--- a/common/src/main/java/me/shedaniel/architectury/registry/CriteriaTriggersRegistry.java
+++ b/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 {
--- a/common/src/main/java/me/shedaniel/architectury/registry/KeyBindings.java
+++ b/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;
--- a/common/src/main/java/me/shedaniel/architectury/registry/MenuRegistry.java
+++ b/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;
--- a/common/src/main/java/me/shedaniel/architectury/registry/Registries.java
+++ b/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;
--- a/common/src/main/java/me/shedaniel/architectury/registry/ReloadListeners.java
+++ b/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;

--- a/common/src/main/java/me/shedaniel/architectury/registry/RenderTypes.java
+++ b/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;
--- a/common/src/main/java/me/shedaniel/architectury/registry/ToolType.java
+++ b/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;

--- a/common/src/main/java/me/shedaniel/architectury/utils/GameInstance.java
+++ b/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;