Update to architectury plugin 3.3

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-    id "architectury-plugin" version "3.1-SNAPSHOT"
+    id "architectury-plugin" version "3.3-SNAPSHOT"
     id "dev.architectury.loom" version "0.7.2-SNAPSHOT" apply false
     id "org.cadixdev.licenser" version "0.5.0"
     id "com.matthewprenger.cursegradle" version "1.4.0" apply false

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

@@ -19,7 +19,7 @@
 
 package me.shedaniel.architectury;
 
-import me.shedaniel.architectury.targets.ArchitecturyTarget;
+import dev.architectury.injectables.targets.ArchitecturyTarget;
 import org.jetbrains.annotations.ApiStatus;
 
 @Deprecated

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

@@ -19,7 +19,7 @@
 
 package me.shedaniel.architectury;
 
-import me.shedaniel.architectury.targets.ArchitecturyTarget;
+import dev.architectury.injectables.targets.ArchitecturyTarget;
 import me.shedaniel.architectury.utils.PlatformExpectedError;
 import org.jetbrains.annotations.ApiStatus;
 

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 dev.architectury.injectables.annotations.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.annotations.ExpectPlatform;
+import dev.architectury.injectables.annotations.ExpectPlatform;
 import me.shedaniel.architectury.event.events.BlockEvent;
 import me.shedaniel.architectury.event.events.EntityEvent;
 import me.shedaniel.architectury.event.events.PlayerEvent;

common/src/main/java/me/shedaniel/architectury/event/events/ChunkEvent.java

@@ -24,7 +24,6 @@ import me.shedaniel.architectury.event.EventFactory;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.level.chunk.ChunkAccess;
-import net.minecraft.world.level.chunk.ProtoChunk;
 import org.jetbrains.annotations.Nullable;
 
 public interface ChunkEvent {

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

@@ -19,7 +19,7 @@
 
 package me.shedaniel.architectury.hooks;
 
-import me.shedaniel.architectury.annotations.ExpectPlatform;
+import dev.architectury.injectables.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.annotations.ExpectPlatform;
+import dev.architectury.injectables.annotations.ExpectPlatform;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.phys.shapes.CollisionContext;
 import org.jetbrains.annotations.Nullable;

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

@@ -19,7 +19,7 @@
 
 package me.shedaniel.architectury.hooks;
 
-import me.shedaniel.architectury.annotations.ExpectPlatform;
+import dev.architectury.injectables.annotations.ExpectPlatform;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.level.Explosion;
 import net.minecraft.world.phys.Vec3;

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

@@ -19,7 +19,7 @@
 
 package me.shedaniel.architectury.hooks;
 
-import me.shedaniel.architectury.annotations.ExpectPlatform;
+import dev.architectury.injectables.annotations.ExpectPlatform;
 import me.shedaniel.architectury.fluid.FluidStack;
 import me.shedaniel.architectury.utils.Fraction;
 import net.fabricmc.api.EnvType;

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

@@ -19,7 +19,7 @@
 
 package me.shedaniel.architectury.hooks;
 
-import me.shedaniel.architectury.annotations.ExpectPlatform;
+import dev.architectury.injectables.annotations.ExpectPlatform;
 import net.minecraft.world.effect.MobEffectInstance;
 import net.minecraft.world.food.FoodProperties;
 

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

@@ -19,7 +19,7 @@
 
 package me.shedaniel.architectury.hooks;
 
-import me.shedaniel.architectury.annotations.ExpectPlatform;
+import dev.architectury.injectables.annotations.ExpectPlatform;
 import me.shedaniel.architectury.utils.IntValue;
 import net.minecraft.world.entity.item.ItemEntity;
 

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

@@ -19,7 +19,7 @@
 
 package me.shedaniel.architectury.hooks;
 
-import me.shedaniel.architectury.annotations.ExpectPlatform;
+import dev.architectury.injectables.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.annotations.ExpectPlatform;
+import dev.architectury.injectables.annotations.ExpectPlatform;
 import net.minecraft.world.entity.player.Player;
 
 public final class PlayerHooks {

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

@@ -19,7 +19,7 @@
 
 package me.shedaniel.architectury.hooks;
 
-import me.shedaniel.architectury.annotations.ExpectPlatform;
+import dev.architectury.injectables.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/TagHooks.java

@@ -19,7 +19,7 @@
 
 package me.shedaniel.architectury.hooks;
 
-import me.shedaniel.architectury.annotations.ExpectPlatform;
+import dev.architectury.injectables.annotations.ExpectPlatform;
 import me.shedaniel.architectury.mixin.FluidTagsAccessor;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.tags.*;

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

@@ -19,7 +19,6 @@
 
 package me.shedaniel.architectury.hooks.biome;
 
-import net.minecraft.world.entity.animal.Panda;
 import net.minecraft.world.level.levelgen.GenerationStep;
 import net.minecraft.world.level.levelgen.carver.ConfiguredWorldCarver;
 import net.minecraft.world.level.levelgen.feature.ConfiguredFeature;

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

@@ -19,7 +19,7 @@
 
 package me.shedaniel.architectury.networking;
 
-import me.shedaniel.architectury.annotations.ExpectPlatform;
+import dev.architectury.injectables.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

@@ -19,9 +19,9 @@
 
 package me.shedaniel.architectury.platform;
 
+import dev.architectury.injectables.annotations.ExpectPlatform;
+import dev.architectury.injectables.targets.ArchitecturyTarget;
 import me.shedaniel.architectury.Architectury;
-import me.shedaniel.architectury.annotations.ExpectPlatform;
-import me.shedaniel.architectury.targets.ArchitecturyTarget;
 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.annotations.ExpectPlatform;
+import dev.architectury.injectables.annotations.ExpectPlatform;
 import me.shedaniel.architectury.hooks.biome.BiomeProperties;
 import net.minecraft.resources.ResourceLocation;
 

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

@@ -19,7 +19,7 @@
 
 package me.shedaniel.architectury.registry;
 
-import me.shedaniel.architectury.annotations.ExpectPlatform;
+import dev.architectury.injectables.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.annotations.ExpectPlatform;
+import dev.architectury.injectables.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.annotations.ExpectPlatform;
+import dev.architectury.injectables.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.annotations.ExpectPlatform;
+import dev.architectury.injectables.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.annotations.ExpectPlatform;
+import dev.architectury.injectables.annotations.ExpectPlatform;
 import net.minecraft.advancements.CriterionTrigger;
 
 public final class CriteriaTriggersRegistry {

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

@@ -19,7 +19,7 @@
 
 package me.shedaniel.architectury.registry;
 
-import me.shedaniel.architectury.annotations.ExpectPlatform;
+import dev.architectury.injectables.annotations.ExpectPlatform;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.world.level.GameRules;
 

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

@@ -19,7 +19,7 @@
 
 package me.shedaniel.architectury.registry;
 
-import me.shedaniel.architectury.annotations.ExpectPlatform;
+import dev.architectury.injectables.annotations.ExpectPlatform;
 import net.minecraft.world.level.GameRules;
 
 /**

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

@@ -19,7 +19,7 @@
 
 package me.shedaniel.architectury.registry;
 
-import me.shedaniel.architectury.annotations.ExpectPlatform;
+import dev.architectury.injectables.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.annotations.ExpectPlatform;
+import dev.architectury.injectables.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/ParticleProviderRegistry.java

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

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

@@ -19,7 +19,7 @@
 
 package me.shedaniel.architectury.registry;
 
-import me.shedaniel.architectury.annotations.ExpectPlatform;
+import dev.architectury.injectables.annotations.ExpectPlatform;
 import me.shedaniel.architectury.core.RegistryEntry;
 import me.shedaniel.architectury.registry.registries.RegistryBuilder;
 import net.minecraft.resources.ResourceKey;

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

@@ -19,7 +19,7 @@
 
 package me.shedaniel.architectury.registry;
 
-import me.shedaniel.architectury.annotations.ExpectPlatform;
+import dev.architectury.injectables.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.annotations.ExpectPlatform;
+import dev.architectury.injectables.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.annotations.ExpectPlatform;
+import dev.architectury.injectables.annotations.ExpectPlatform;
 import net.minecraft.tags.Tag;
 import net.minecraft.world.item.Item;
 

common/src/main/java/me/shedaniel/architectury/registry/entity/EntityAttributes.java

@@ -19,7 +19,7 @@
 
 package me.shedaniel.architectury.registry.entity;
 
-import me.shedaniel.architectury.annotations.ExpectPlatform;
+import dev.architectury.injectables.annotations.ExpectPlatform;
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.entity.ai.attributes.AttributeSupplier;

common/src/main/java/me/shedaniel/architectury/registry/entity/EntityRenderers.java

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

common/src/main/java/me/shedaniel/architectury/registry/fuel/FuelRegistry.java

@@ -19,7 +19,7 @@
 
 package me.shedaniel.architectury.registry.fuel;
 
-import me.shedaniel.architectury.annotations.ExpectPlatform;
+import dev.architectury.injectables.annotations.ExpectPlatform;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.ItemLike;
 

common/src/main/java/me/shedaniel/architectury/registry/trade/TradeRegistry.java

@@ -19,7 +19,7 @@
 
 package me.shedaniel.architectury.registry.trade;
 
-import me.shedaniel.architectury.annotations.ExpectPlatform;
+import dev.architectury.injectables.annotations.ExpectPlatform;
 import net.minecraft.world.entity.npc.VillagerProfession;
 import net.minecraft.world.entity.npc.VillagerTrades;
 

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

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