From 2cc20fa249b1e619defe1da85f6e574d7ddfb2cf Mon Sep 17 00:00:00 2001 From: shedaniel Date: Fri, 6 Aug 2021 17:20:03 +0800 Subject: [PATCH] Update to architectury plugin 3.3 --- build.gradle | 2 +- .../src/main/java/me/shedaniel/architectury/Architectury.java | 2 +- .../main/java/me/shedaniel/architectury/PlatformMethods.java | 2 +- .../java/me/shedaniel/architectury/event/EventFactory.java | 2 +- .../java/me/shedaniel/architectury/event/EventHandler.java | 2 +- .../me/shedaniel/architectury/event/events/ChunkEvent.java | 1 - .../java/me/shedaniel/architectury/hooks/DyeColorHooks.java | 2 +- .../java/me/shedaniel/architectury/hooks/EntityHooks.java | 2 +- .../java/me/shedaniel/architectury/hooks/ExplosionHooks.java | 2 +- .../java/me/shedaniel/architectury/hooks/FluidStackHooks.java | 2 +- .../me/shedaniel/architectury/hooks/FoodPropertiesHooks.java | 2 +- .../java/me/shedaniel/architectury/hooks/ItemEntityHooks.java | 2 +- .../me/shedaniel/architectury/hooks/PackRepositoryHooks.java | 2 +- .../java/me/shedaniel/architectury/hooks/PlayerHooks.java | 2 +- .../java/me/shedaniel/architectury/hooks/ScreenHooks.java | 2 +- .../main/java/me/shedaniel/architectury/hooks/TagHooks.java | 2 +- .../architectury/hooks/biome/GenerationProperties.java | 1 - .../me/shedaniel/architectury/networking/NetworkManager.java | 2 +- .../java/me/shedaniel/architectury/platform/Platform.java | 4 ++-- .../shedaniel/architectury/registry/BiomeModifications.java | 2 +- .../shedaniel/architectury/registry/BlockEntityRenderers.java | 2 +- .../me/shedaniel/architectury/registry/BlockProperties.java | 2 +- .../me/shedaniel/architectury/registry/ColorHandlers.java | 2 +- .../java/me/shedaniel/architectury/registry/CreativeTabs.java | 2 +- .../architectury/registry/CriteriaTriggersRegistry.java | 2 +- .../me/shedaniel/architectury/registry/GameRuleFactory.java | 2 +- .../me/shedaniel/architectury/registry/GameRuleRegistry.java | 2 +- .../java/me/shedaniel/architectury/registry/KeyBindings.java | 2 +- .../java/me/shedaniel/architectury/registry/MenuRegistry.java | 2 +- .../architectury/registry/ParticleProviderRegistry.java | 2 +- .../java/me/shedaniel/architectury/registry/Registries.java | 2 +- .../me/shedaniel/architectury/registry/ReloadListeners.java | 2 +- .../java/me/shedaniel/architectury/registry/RenderTypes.java | 2 +- .../java/me/shedaniel/architectury/registry/ToolType.java | 2 +- .../architectury/registry/entity/EntityAttributes.java | 2 +- .../architectury/registry/entity/EntityRenderers.java | 2 +- .../me/shedaniel/architectury/registry/fuel/FuelRegistry.java | 2 +- .../shedaniel/architectury/registry/trade/TradeRegistry.java | 2 +- .../java/me/shedaniel/architectury/utils/GameInstance.java | 2 +- 39 files changed, 38 insertions(+), 40 deletions(-) diff --git a/build.gradle b/build.gradle index a1897e89..f96b6341 100644 --- a/build.gradle +++ b/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 diff --git a/common/src/main/java/me/shedaniel/architectury/Architectury.java b/common/src/main/java/me/shedaniel/architectury/Architectury.java index 239fea5d..a90cf0b2 100644 --- a/common/src/main/java/me/shedaniel/architectury/Architectury.java +++ b/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 diff --git a/common/src/main/java/me/shedaniel/architectury/PlatformMethods.java b/common/src/main/java/me/shedaniel/architectury/PlatformMethods.java index 45cae0e6..1b17e4ad 100644 --- a/common/src/main/java/me/shedaniel/architectury/PlatformMethods.java +++ b/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; diff --git a/common/src/main/java/me/shedaniel/architectury/event/EventFactory.java b/common/src/main/java/me/shedaniel/architectury/event/EventFactory.java index 9aee7d24..2ef92e3d 100644 --- 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 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; diff --git a/common/src/main/java/me/shedaniel/architectury/event/EventHandler.java b/common/src/main/java/me/shedaniel/architectury/event/EventHandler.java index e7cb28dc..a9757900 100644 --- 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.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; diff --git a/common/src/main/java/me/shedaniel/architectury/event/events/ChunkEvent.java b/common/src/main/java/me/shedaniel/architectury/event/events/ChunkEvent.java index b941d3af..8bb242d7 100644 --- a/common/src/main/java/me/shedaniel/architectury/event/events/ChunkEvent.java +++ b/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 { diff --git a/common/src/main/java/me/shedaniel/architectury/hooks/DyeColorHooks.java b/common/src/main/java/me/shedaniel/architectury/hooks/DyeColorHooks.java index bf70a331..ca68d37a 100644 --- 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.annotations.ExpectPlatform; +import dev.architectury.injectables.annotations.ExpectPlatform; import net.minecraft.world.item.DyeColor; public class DyeColorHooks { diff --git a/common/src/main/java/me/shedaniel/architectury/hooks/EntityHooks.java b/common/src/main/java/me/shedaniel/architectury/hooks/EntityHooks.java index 51527e1b..37d57329 100644 --- 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.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; diff --git a/common/src/main/java/me/shedaniel/architectury/hooks/ExplosionHooks.java b/common/src/main/java/me/shedaniel/architectury/hooks/ExplosionHooks.java index 74ad3a90..3676dd3c 100644 --- 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.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; diff --git a/common/src/main/java/me/shedaniel/architectury/hooks/FluidStackHooks.java b/common/src/main/java/me/shedaniel/architectury/hooks/FluidStackHooks.java index a839f39c..8312ddcb 100644 --- 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.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; diff --git a/common/src/main/java/me/shedaniel/architectury/hooks/FoodPropertiesHooks.java b/common/src/main/java/me/shedaniel/architectury/hooks/FoodPropertiesHooks.java index 9f87032e..1cd5980e 100644 --- a/common/src/main/java/me/shedaniel/architectury/hooks/FoodPropertiesHooks.java +++ b/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; diff --git a/common/src/main/java/me/shedaniel/architectury/hooks/ItemEntityHooks.java b/common/src/main/java/me/shedaniel/architectury/hooks/ItemEntityHooks.java index e140f29f..c717a17a 100644 --- 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.annotations.ExpectPlatform; +import dev.architectury.injectables.annotations.ExpectPlatform; import me.shedaniel.architectury.utils.IntValue; import net.minecraft.world.entity.item.ItemEntity; diff --git a/common/src/main/java/me/shedaniel/architectury/hooks/PackRepositoryHooks.java b/common/src/main/java/me/shedaniel/architectury/hooks/PackRepositoryHooks.java index afb842ce..e47d1e10 100644 --- 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.annotations.ExpectPlatform; +import dev.architectury.injectables.annotations.ExpectPlatform; import net.minecraft.server.packs.repository.PackRepository; import net.minecraft.server.packs.repository.RepositorySource; diff --git a/common/src/main/java/me/shedaniel/architectury/hooks/PlayerHooks.java b/common/src/main/java/me/shedaniel/architectury/hooks/PlayerHooks.java index 3ff8bed4..fec28850 100644 --- 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.annotations.ExpectPlatform; +import dev.architectury.injectables.annotations.ExpectPlatform; import net.minecraft.world.entity.player.Player; public final class PlayerHooks { diff --git a/common/src/main/java/me/shedaniel/architectury/hooks/ScreenHooks.java b/common/src/main/java/me/shedaniel/architectury/hooks/ScreenHooks.java index 4bb1d79b..83854c08 100644 --- 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.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; diff --git a/common/src/main/java/me/shedaniel/architectury/hooks/TagHooks.java b/common/src/main/java/me/shedaniel/architectury/hooks/TagHooks.java index ac732333..09186b08 100644 --- a/common/src/main/java/me/shedaniel/architectury/hooks/TagHooks.java +++ b/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.*; diff --git a/common/src/main/java/me/shedaniel/architectury/hooks/biome/GenerationProperties.java b/common/src/main/java/me/shedaniel/architectury/hooks/biome/GenerationProperties.java index c225c35b..2854fa8b 100644 --- a/common/src/main/java/me/shedaniel/architectury/hooks/biome/GenerationProperties.java +++ b/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; diff --git a/common/src/main/java/me/shedaniel/architectury/networking/NetworkManager.java b/common/src/main/java/me/shedaniel/architectury/networking/NetworkManager.java index 3c976ddb..c7989707 100644 --- 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.annotations.ExpectPlatform; +import dev.architectury.injectables.annotations.ExpectPlatform; import me.shedaniel.architectury.utils.Env; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; diff --git a/common/src/main/java/me/shedaniel/architectury/platform/Platform.java b/common/src/main/java/me/shedaniel/architectury/platform/Platform.java index e85f3327..3d94fbc9 100644 --- a/common/src/main/java/me/shedaniel/architectury/platform/Platform.java +++ b/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; diff --git a/common/src/main/java/me/shedaniel/architectury/registry/BiomeModifications.java b/common/src/main/java/me/shedaniel/architectury/registry/BiomeModifications.java index 3e532742..ef958618 100644 --- 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.annotations.ExpectPlatform; +import dev.architectury.injectables.annotations.ExpectPlatform; import me.shedaniel.architectury.hooks.biome.BiomeProperties; import net.minecraft.resources.ResourceLocation; diff --git a/common/src/main/java/me/shedaniel/architectury/registry/BlockEntityRenderers.java b/common/src/main/java/me/shedaniel/architectury/registry/BlockEntityRenderers.java index fcc5e0ee..fa520a71 100644 --- 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.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; diff --git a/common/src/main/java/me/shedaniel/architectury/registry/BlockProperties.java b/common/src/main/java/me/shedaniel/architectury/registry/BlockProperties.java index ccea650a..415930b8 100644 --- 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.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; diff --git a/common/src/main/java/me/shedaniel/architectury/registry/ColorHandlers.java b/common/src/main/java/me/shedaniel/architectury/registry/ColorHandlers.java index c7a10a15..f440c0ac 100644 --- 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.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; diff --git a/common/src/main/java/me/shedaniel/architectury/registry/CreativeTabs.java b/common/src/main/java/me/shedaniel/architectury/registry/CreativeTabs.java index 41726c1b..6740d902 100644 --- 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.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; diff --git a/common/src/main/java/me/shedaniel/architectury/registry/CriteriaTriggersRegistry.java b/common/src/main/java/me/shedaniel/architectury/registry/CriteriaTriggersRegistry.java index 9d4e4995..7ef5fd94 100644 --- 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.annotations.ExpectPlatform; +import dev.architectury.injectables.annotations.ExpectPlatform; import net.minecraft.advancements.CriterionTrigger; public final class CriteriaTriggersRegistry { diff --git a/common/src/main/java/me/shedaniel/architectury/registry/GameRuleFactory.java b/common/src/main/java/me/shedaniel/architectury/registry/GameRuleFactory.java index a4928ec4..026e5a44 100644 --- a/common/src/main/java/me/shedaniel/architectury/registry/GameRuleFactory.java +++ b/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; diff --git a/common/src/main/java/me/shedaniel/architectury/registry/GameRuleRegistry.java b/common/src/main/java/me/shedaniel/architectury/registry/GameRuleRegistry.java index 3e291d35..a437d41b 100644 --- a/common/src/main/java/me/shedaniel/architectury/registry/GameRuleRegistry.java +++ b/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; /** diff --git a/common/src/main/java/me/shedaniel/architectury/registry/KeyBindings.java b/common/src/main/java/me/shedaniel/architectury/registry/KeyBindings.java index 27f66a46..525a85f4 100644 --- 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.annotations.ExpectPlatform; +import dev.architectury.injectables.annotations.ExpectPlatform; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.client.KeyMapping; diff --git a/common/src/main/java/me/shedaniel/architectury/registry/MenuRegistry.java b/common/src/main/java/me/shedaniel/architectury/registry/MenuRegistry.java index 7376597b..5ea2a8c2 100644 --- 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.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; diff --git a/common/src/main/java/me/shedaniel/architectury/registry/ParticleProviderRegistry.java b/common/src/main/java/me/shedaniel/architectury/registry/ParticleProviderRegistry.java index f3d9bb26..844d00e1 100644 --- a/common/src/main/java/me/shedaniel/architectury/registry/ParticleProviderRegistry.java +++ b/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; diff --git a/common/src/main/java/me/shedaniel/architectury/registry/Registries.java b/common/src/main/java/me/shedaniel/architectury/registry/Registries.java index 7c573ae0..394a082c 100644 --- 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.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; diff --git a/common/src/main/java/me/shedaniel/architectury/registry/ReloadListeners.java b/common/src/main/java/me/shedaniel/architectury/registry/ReloadListeners.java index 9e176e70..3637cae0 100644 --- 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.annotations.ExpectPlatform; +import dev.architectury.injectables.annotations.ExpectPlatform; import net.minecraft.server.packs.PackType; import net.minecraft.server.packs.resources.PreparableReloadListener; diff --git a/common/src/main/java/me/shedaniel/architectury/registry/RenderTypes.java b/common/src/main/java/me/shedaniel/architectury/registry/RenderTypes.java index a293c853..4b5f0884 100644 --- 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.annotations.ExpectPlatform; +import dev.architectury.injectables.annotations.ExpectPlatform; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.client.renderer.RenderType; diff --git a/common/src/main/java/me/shedaniel/architectury/registry/ToolType.java b/common/src/main/java/me/shedaniel/architectury/registry/ToolType.java index 6c2ec82a..2cc28d9a 100644 --- 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.annotations.ExpectPlatform; +import dev.architectury.injectables.annotations.ExpectPlatform; import net.minecraft.tags.Tag; import net.minecraft.world.item.Item; diff --git a/common/src/main/java/me/shedaniel/architectury/registry/entity/EntityAttributes.java b/common/src/main/java/me/shedaniel/architectury/registry/entity/EntityAttributes.java index c17b8958..5b56f859 100644 --- a/common/src/main/java/me/shedaniel/architectury/registry/entity/EntityAttributes.java +++ b/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; diff --git a/common/src/main/java/me/shedaniel/architectury/registry/entity/EntityRenderers.java b/common/src/main/java/me/shedaniel/architectury/registry/entity/EntityRenderers.java index 1a86b9c8..a11255da 100644 --- a/common/src/main/java/me/shedaniel/architectury/registry/entity/EntityRenderers.java +++ b/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; diff --git a/common/src/main/java/me/shedaniel/architectury/registry/fuel/FuelRegistry.java b/common/src/main/java/me/shedaniel/architectury/registry/fuel/FuelRegistry.java index 32bc7cbd..8abda62a 100644 --- a/common/src/main/java/me/shedaniel/architectury/registry/fuel/FuelRegistry.java +++ b/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; diff --git a/common/src/main/java/me/shedaniel/architectury/registry/trade/TradeRegistry.java b/common/src/main/java/me/shedaniel/architectury/registry/trade/TradeRegistry.java index c5d96efa..7a393e0e 100644 --- a/common/src/main/java/me/shedaniel/architectury/registry/trade/TradeRegistry.java +++ b/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; diff --git a/common/src/main/java/me/shedaniel/architectury/utils/GameInstance.java b/common/src/main/java/me/shedaniel/architectury/utils/GameInstance.java index d1fc42d3..b4f3bc46 100644 --- 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.annotations.ExpectPlatform; +import dev.architectury.injectables.annotations.ExpectPlatform; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.client.Minecraft;