Merge remote-tracking branch 'architectury/1.16' into 1.16

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

@@ -20,11 +20,8 @@
 package me.shedaniel.architectury.hooks;
 
 import me.shedaniel.architectury.annotations.ExpectPlatform;
-import net.fabricmc.api.EnvType;
-import net.fabricmc.api.Environment;
 import net.minecraft.world.entity.Entity;
 
-@Environment(EnvType.CLIENT)
 public final class EntityHooks {
     private EntityHooks() {}
     

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

@@ -20,14 +20,11 @@
 package me.shedaniel.architectury.hooks;
 
 import me.shedaniel.architectury.annotations.ExpectPlatform;
-import net.fabricmc.api.EnvType;
-import net.fabricmc.api.Environment;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.level.Explosion;
 import net.minecraft.world.phys.Vec3;
 import org.jetbrains.annotations.Nullable;
 
-@Environment(EnvType.CLIENT)
 public final class ExplosionHooks {
     private ExplosionHooks() {}
     

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

@@ -21,11 +21,8 @@ package me.shedaniel.architectury.hooks;
 
 import me.shedaniel.architectury.annotations.ExpectPlatform;
 import me.shedaniel.architectury.utils.IntValue;
-import net.fabricmc.api.EnvType;
-import net.fabricmc.api.Environment;
 import net.minecraft.world.entity.item.ItemEntity;
 
-@Environment(EnvType.CLIENT)
 public final class ItemEntityHooks {
     private ItemEntityHooks() {}
     
@@ -38,4 +35,4 @@ public final class ItemEntityHooks {
     public static IntValue lifespan(ItemEntity entity) {
         throw new AssertionError();
     }
-}
+}

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

@@ -20,11 +20,8 @@
 package me.shedaniel.architectury.hooks;
 
 import me.shedaniel.architectury.annotations.ExpectPlatform;
-import net.fabricmc.api.EnvType;
-import net.fabricmc.api.Environment;
 import net.minecraft.world.entity.player.Player;
 
-@Environment(EnvType.CLIENT)
 public final class PlayerHooks {
     private PlayerHooks() {}