imports/architectury-api
1
0
Fork 0
mirror of https://github.com/architectury/architectury-api.git synced 2026-03-30 21:05:56 -05:00
Code Issues Packages Projects Releases Wiki Activity

Update to architectury plugin 3.3

Browse Source
This commit is contained in:
shedaniel
2021-08-06 17:20:03 +08:00
parent 9a5de11b59
commit 2cc20fa249
39 changed files with 38 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@@ -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

2
common/src/main/java/me/shedaniel/architectury/Architectury.java
View File

@@ -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

2
common/src/main/java/me/shedaniel/architectury/PlatformMethods.java
View File

@@ -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;

2
common/src/main/java/me/shedaniel/architectury/event/EventFactory.java
View File

@@ -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;

2
common/src/main/java/me/shedaniel/architectury/event/EventHandler.java
View File

@@ -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;

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

@@ -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 {

2
common/src/main/java/me/shedaniel/architectury/hooks/DyeColorHooks.java
View File

@@ -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 {

2
common/src/main/java/me/shedaniel/architectury/hooks/EntityHooks.java
View File

@@ -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;

2
common/src/main/java/me/shedaniel/architectury/hooks/ExplosionHooks.java
View File

@@ -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;

2
common/src/main/java/me/shedaniel/architectury/hooks/FluidStackHooks.java
View File

@@ -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;

2
common/src/main/java/me/shedaniel/architectury/hooks/FoodPropertiesHooks.java
View File

@@ -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;

2
common/src/main/java/me/shedaniel/architectury/hooks/ItemEntityHooks.java
View File

@@ -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;

2
common/src/main/java/me/shedaniel/architectury/hooks/PackRepositoryHooks.java
View File

@@ -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;

2
common/src/main/java/me/shedaniel/architectury/hooks/PlayerHooks.java
View File

@@ -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 {

2
common/src/main/java/me/shedaniel/architectury/hooks/ScreenHooks.java
View File

@@ -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;

2
common/src/main/java/me/shedaniel/architectury/hooks/TagHooks.java
View File

@@ -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.*;

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

@@ -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;

2
common/src/main/java/me/shedaniel/architectury/networking/NetworkManager.java
View File

@@ -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;

4
common/src/main/java/me/shedaniel/architectury/platform/Platform.java
View File

@@ -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;

2
common/src/main/java/me/shedaniel/architectury/registry/BiomeModifications.java
View File

@@ -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;

2
common/src/main/java/me/shedaniel/architectury/registry/BlockEntityRenderers.java
View File

@@ -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;

2
common/src/main/java/me/shedaniel/architectury/registry/BlockProperties.java
View File

@@ -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;

2
common/src/main/java/me/shedaniel/architectury/registry/ColorHandlers.java
View File

@@ -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;

2
common/src/main/java/me/shedaniel/architectury/registry/CreativeTabs.java
View File

@@ -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;

2
common/src/main/java/me/shedaniel/architectury/registry/CriteriaTriggersRegistry.java
View File

@@ -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 {

2
common/src/main/java/me/shedaniel/architectury/registry/GameRuleFactory.java
View File

@@ -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;

2
common/src/main/java/me/shedaniel/architectury/registry/GameRuleRegistry.java
View File

@@ -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;
/**

2
common/src/main/java/me/shedaniel/architectury/registry/KeyBindings.java
View File

@@ -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;

2
common/src/main/java/me/shedaniel/architectury/registry/MenuRegistry.java
View File

@@ -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;

2
common/src/main/java/me/shedaniel/architectury/registry/ParticleProviderRegistry.java
View File

@@ -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;

2
common/src/main/java/me/shedaniel/architectury/registry/Registries.java
View File

@@ -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;

2
common/src/main/java/me/shedaniel/architectury/registry/ReloadListeners.java
View File

@@ -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;

2
common/src/main/java/me/shedaniel/architectury/registry/RenderTypes.java
View File

@@ -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;

2
common/src/main/java/me/shedaniel/architectury/registry/ToolType.java
View File

@@ -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;

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

@@ -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;

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

@@ -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;

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

@@ -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;

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

@@ -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;

2
common/src/main/java/me/shedaniel/architectury/utils/GameInstance.java
View File

@@ -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;