chore: optimize imports

src/main/java/com/aetherteam/aether/Aether.java

@@ -27,19 +27,16 @@
 import com.aetherteam.aether.entity.AetherEntityTypes;
 import com.aetherteam.aether.entity.ai.attribute.AetherAttributes;
 import com.aetherteam.aether.event.hooks.AbilityHooks;
-import com.aetherteam.aether.event.listeners.*;
+import com.aetherteam.aether.event.listeners.DimensionListener;
+import com.aetherteam.aether.event.listeners.EntityListener;
+import com.aetherteam.aether.event.listeners.PerkListener;
+import com.aetherteam.aether.event.listeners.RecipeListener;
 import com.aetherteam.aether.event.listeners.abilities.AccessoryAbilityListener;
 import com.aetherteam.aether.event.listeners.abilities.ArmorAbilityListener;
 import com.aetherteam.aether.event.listeners.abilities.ToolAbilityListener;
 import com.aetherteam.aether.event.listeners.abilities.WeaponAbilityListener;
 import com.aetherteam.aether.event.listeners.capability.AetherPlayerListener;
 import com.aetherteam.aether.event.listeners.capability.AetherTimeListener;
-import com.aetherteam.aether.loot.modifiers.AetherLootTableModifications;
-import com.aetherteam.aetherfabric.events.AddPackFindersEvent;
-import com.aetherteam.aetherfabric.NetworkRegisterHelper;
-import com.aetherteam.aetherfabric.WrappedInventoryStorage;
-import com.aetherteam.aetherfabric.events.ItemAttributeModifierHelper;
-import com.aetherteam.aetherfabric.events.LivingEntityEvents;
 import com.aetherteam.aether.inventory.AetherAccessorySlots;
 import com.aetherteam.aether.inventory.AetherRecipeBookTypes;
 import com.aetherteam.aether.inventory.menu.AetherMenuTypes;
@@ -53,6 +50,7 @@
 import com.aetherteam.aether.item.components.AetherDataComponents;
 import com.aetherteam.aether.loot.conditions.AetherLootConditions;
 import com.aetherteam.aether.loot.functions.AetherLootFunctions;
+import com.aetherteam.aether.loot.modifiers.AetherLootTableModifications;
 import com.aetherteam.aether.network.packet.AetherPlayerSyncPacket;
 import com.aetherteam.aether.network.packet.AetherTimeSyncPacket;
 import com.aetherteam.aether.network.packet.PhoenixArrowSyncPacket;
@@ -69,6 +67,14 @@
 import com.aetherteam.aether.world.structurepiece.AetherStructurePieceTypes;
 import com.aetherteam.aether.world.treedecorator.AetherTreeDecoratorTypes;
 import com.aetherteam.aether.world.trunkplacer.AetherTrunkPlacerTypes;
+import com.aetherteam.aetherfabric.AetherFabric;
+import com.aetherteam.aetherfabric.NetworkRegisterHelper;
+import com.aetherteam.aetherfabric.WrappedInventoryStorage;
+import com.aetherteam.aetherfabric.events.AddPackFindersEvent;
+import com.aetherteam.aetherfabric.events.ItemAttributeModifierHelper;
+import com.aetherteam.aetherfabric.events.LivingEntityEvents;
+import com.aetherteam.aetherfabric.registries.DeferredRegister;
+import com.aetherteam.aetherfabric.registries.datamaps.RegisterDataMapTypesEvent;
 import com.google.common.reflect.Reflection;
 import com.mojang.logging.LogUtils;
 import fuzs.forgeconfigapiport.fabric.api.neoforge.v4.NeoForgeConfigRegistry;
@@ -103,13 +109,11 @@
 import net.minecraft.world.level.block.ChestBlock;
 import net.minecraft.world.level.block.DispenserBlock;
 import net.neoforged.fml.config.ModConfig;
-import com.aetherteam.aetherfabric.AetherFabric;
-import com.aetherteam.aetherfabric.registries.DeferredRegister;
-import com.aetherteam.aetherfabric.registries.datamaps.RegisterDataMapTypesEvent;
 import org.slf4j.Logger;
 
 import java.nio.file.Path;
-import java.util.*;
+import java.util.List;
+import java.util.Optional;
 import java.util.function.UnaryOperator;
 
 public class Aether implements ModInitializer {

src/main/java/com/aetherteam/aether/AetherEnumExtensions.java

@@ -2,13 +2,10 @@
 
 import com.aetherteam.aether.block.AetherBlocks;
 import com.aetherteam.aether.item.AetherItems;
-import net.minecraft.ChatFormatting;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.Items;
-import net.minecraft.world.item.Rarity;
 import net.minecraft.world.level.block.Block;
-//import net.neoforged.fml.common.asm.enumextension.EnumProxy;
 
 import java.util.List;
 import java.util.function.Supplier;

src/main/java/com/aetherteam/aether/AetherGameEvents.java

@@ -1,9 +1,9 @@
 package com.aetherteam.aether;
 
-import net.minecraft.core.registries.Registries;
-import net.minecraft.world.level.gameevent.GameEvent;
 import com.aetherteam.aetherfabric.registries.DeferredHolder;
 import com.aetherteam.aetherfabric.registries.DeferredRegister;
+import net.minecraft.core.registries.Registries;
+import net.minecraft.world.level.gameevent.GameEvent;
 
 public class AetherGameEvents {
     public static final DeferredRegister<GameEvent> GAME_EVENTS = DeferredRegister.create(Registries.GAME_EVENT, Aether.MODID);

src/main/java/com/aetherteam/aether/advancement/AetherAdvancementTriggers.java

@@ -1,10 +1,10 @@
 package com.aetherteam.aether.advancement;
 
 import com.aetherteam.aether.Aether;
-import net.minecraft.advancements.CriterionTrigger;
-import net.minecraft.core.registries.Registries;
 import com.aetherteam.aetherfabric.registries.DeferredHolder;
 import com.aetherteam.aetherfabric.registries.DeferredRegister;
+import net.minecraft.advancements.CriterionTrigger;
+import net.minecraft.core.registries.Registries;
 
 public class AetherAdvancementTriggers {
     public static final DeferredRegister<CriterionTrigger<?>> TRIGGERS = DeferredRegister.create(Registries.TRIGGER_TYPE, Aether.MODID);

src/main/java/com/aetherteam/aether/api/AetherAdvancementSoundOverrides.java

@@ -3,6 +3,9 @@
 import com.aetherteam.aether.Aether;
 import com.aetherteam.aether.api.registers.AdvancementSoundOverride;
 import com.aetherteam.aether.client.AetherSoundEvents;
+import com.aetherteam.aetherfabric.registries.DeferredHolder;
+import com.aetherteam.aetherfabric.registries.DeferredRegister;
+import net.fabricmc.fabric.api.event.registry.FabricRegistryBuilder;
 import net.minecraft.advancements.AdvancementHolder;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.player.LocalPlayer;
@@ -11,9 +14,6 @@
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.sounds.SoundEvent;
 import net.minecraft.sounds.SoundEvents;
-import com.aetherteam.aetherfabric.registries.DeferredHolder;
-import com.aetherteam.aetherfabric.registries.DeferredRegister;
-import net.fabricmc.fabric.api.event.registry.FabricRegistryBuilder;
 import org.jetbrains.annotations.Nullable;
 
 public class AetherAdvancementSoundOverrides {

src/main/java/com/aetherteam/aether/api/AetherMenus.java

@@ -7,7 +7,6 @@
 import net.minecraft.client.renderer.CubeMap;
 import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceLocation;
-import com.aetherteam.aetherfabric.registries.DeferredRegister;
 
 @CumulusEntrypoint
 public class AetherMenus implements MenuInitializer {

src/main/java/com/aetherteam/aether/attachment/AetherPlayerAttachment.java

@@ -21,6 +21,7 @@
 import com.aetherteam.aether.perk.data.ClientHaloPerkData;
 import com.aetherteam.aether.perk.data.ClientMoaSkinPerkData;
 import com.aetherteam.aether.perk.data.ServerPerkData;
+import com.aetherteam.aetherfabric.network.PacketDistributor;
 import com.aetherteam.nitrogen.attachment.INBTSynchable;
 import com.aetherteam.nitrogen.network.packet.SyncPacket;
 import com.mojang.serialization.Codec;
@@ -42,10 +43,9 @@
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.Level;
-import com.aetherteam.aetherfabric.network.PacketDistributor;
 import org.apache.commons.lang3.tuple.Triple;
-
 import org.jetbrains.annotations.Nullable;
+
 import java.util.*;
 import java.util.function.Consumer;
 import java.util.function.Supplier;

src/main/java/com/aetherteam/aether/block/AetherBlocks.java

@@ -19,6 +19,8 @@
 import com.aetherteam.aether.item.AetherItems;
 import com.aetherteam.aether.mixin.mixins.common.accessor.FireBlockAccessor;
 import com.aetherteam.aether.world.treegrower.AetherTreeGrowers;
+import com.aetherteam.aetherfabric.registries.DeferredBlock;
+import com.aetherteam.aetherfabric.registries.DeferredRegister;
 import com.aetherteam.nitrogen.item.block.EntityBlockItem;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
@@ -35,8 +37,6 @@
 import net.minecraft.world.level.block.state.properties.NoteBlockInstrument;
 import net.minecraft.world.level.material.MapColor;
 import net.minecraft.world.level.material.PushReaction;
-import com.aetherteam.aetherfabric.registries.DeferredBlock;
-import com.aetherteam.aetherfabric.registries.DeferredRegister;
 
 import java.util.Objects;
 import java.util.function.Function;

src/main/java/com/aetherteam/aether/block/FreezingBlock.java

@@ -18,8 +18,8 @@
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.block.state.properties.BlockStateProperties;
 import net.minecraft.world.level.material.FluidState;
-
 import org.jetbrains.annotations.Nullable;
+
 import java.util.*;
 
 public interface FreezingBlock extends FreezingBehavior<BlockState> {

src/main/java/com/aetherteam/aether/block/construction/BookshelfBlock.java

@@ -1,9 +1,6 @@
 package com.aetherteam.aether.block.construction;
 
-import net.minecraft.core.BlockPos;
-import net.minecraft.world.level.LevelReader;
 import net.minecraft.world.level.block.Block;
-import net.minecraft.world.level.block.state.BlockState;
 
 public class BookshelfBlock extends Block {
     public BookshelfBlock(Properties properties) {

src/main/java/com/aetherteam/aether/block/dungeon/DoorwayBlock.java

@@ -29,7 +29,6 @@
 import net.minecraft.world.phys.shapes.EntityCollisionContext;
 import net.minecraft.world.phys.shapes.Shapes;
 import net.minecraft.world.phys.shapes.VoxelShape;
-import org.jetbrains.annotations.Nullable;
 
 import java.util.function.Supplier;
 

src/main/java/com/aetherteam/aether/block/miscellaneous/UnstableObsidianBlock.java

@@ -13,7 +13,6 @@
 import net.minecraft.world.level.block.state.StateDefinition;
 import net.minecraft.world.level.block.state.properties.BlockStateProperties;
 import net.minecraft.world.level.block.state.properties.IntegerProperty;
-import net.minecraft.world.level.material.PushReaction;
 
 /**
  * [CODE COPY] - {@link net.minecraft.world.level.block.FrostedIceBlock}.

src/main/java/com/aetherteam/aether/block/natural/AetherGrassBlock.java

@@ -3,8 +3,8 @@
 import com.aetherteam.aether.block.AetherBlockStateProperties;
 import com.aetherteam.aether.block.AetherBlocks;
 import com.aetherteam.aether.data.resources.registries.AetherPlacedFeatures;
-import com.aetherteam.aetherfabric.Utils;
 import com.aetherteam.aether.mixin.mixins.common.accessor.SpreadingSnowyDirtBlockAccessor;
+import com.aetherteam.aetherfabric.Utils;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Holder;
 import net.minecraft.server.level.ServerLevel;

src/main/java/com/aetherteam/aether/block/natural/CrystalFruitLeavesBlock.java

@@ -19,8 +19,8 @@
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.gameevent.GameEvent;
 import net.minecraft.world.phys.BlockHitResult;
-
 import org.jetbrains.annotations.Nullable;
+
 import java.util.function.Supplier;
 
 public class CrystalFruitLeavesBlock extends LeavesWithParticlesBlock {

src/main/java/com/aetherteam/aether/block/natural/EnchantedAetherGrassBlock.java

@@ -2,8 +2,8 @@
 
 import com.aetherteam.aether.block.AetherBlocks;
 import com.aetherteam.aether.data.resources.registries.AetherPlacedFeatures;
-import com.aetherteam.aetherfabric.Utils;
 import com.aetherteam.aether.mixin.mixins.common.accessor.SpreadingSnowyDirtBlockAccessor;
+import com.aetherteam.aetherfabric.Utils;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Holder;
 import net.minecraft.server.level.ServerLevel;

src/main/java/com/aetherteam/aether/block/portal/AetherPortalBlock.java

@@ -5,6 +5,8 @@
 import com.aetherteam.aether.client.particle.AetherParticleTypes;
 import com.aetherteam.aether.client.sound.FadeOutSoundInstance;
 import com.aetherteam.aether.world.LevelUtil;
+import net.fabricmc.api.EnvType;
+import net.fabricmc.api.Environment;
 import net.minecraft.BlockUtil;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.resources.sounds.SoundInstance;
@@ -33,10 +35,8 @@
 import net.minecraft.world.phys.Vec3;
 import net.minecraft.world.phys.shapes.CollisionContext;
 import net.minecraft.world.phys.shapes.VoxelShape;
-import net.fabricmc.api.EnvType;
-import net.fabricmc.api.Environment;
-
 import org.jetbrains.annotations.Nullable;
+
 import java.util.Optional;
 
 public class AetherPortalBlock extends Block implements Portal {

src/main/java/com/aetherteam/aether/block/portal/AetherPortalForcer.java

@@ -4,6 +4,7 @@
 import com.aetherteam.aether.block.AetherBlocks;
 import com.aetherteam.aether.network.packet.clientbound.PortalTravelSoundPacket;
 import com.aetherteam.aether.world.AetherPoi;
+import com.aetherteam.aetherfabric.network.PacketDistributor;
 import net.minecraft.BlockUtil;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
@@ -20,7 +21,6 @@
 import net.minecraft.world.level.border.WorldBorder;
 import net.minecraft.world.level.levelgen.Heightmap;
 import net.minecraft.world.level.portal.DimensionTransition;
-import com.aetherteam.aetherfabric.network.PacketDistributor;
 
 import java.util.Comparator;
 import java.util.Optional;

src/main/java/com/aetherteam/aether/block/portal/AetherPortalShape.java

@@ -16,8 +16,8 @@
 import net.minecraft.world.phys.Vec3;
 import net.minecraft.world.phys.shapes.Shapes;
 import net.minecraft.world.phys.shapes.VoxelShape;
-
 import org.jetbrains.annotations.Nullable;
+
 import java.util.Optional;
 import java.util.function.Predicate;
 

src/main/java/com/aetherteam/aether/block/utility/SunAltarBlock.java

@@ -7,6 +7,7 @@
 import com.aetherteam.aether.command.SunAltarWhitelist;
 import com.aetherteam.aether.data.resources.registries.AetherDimensions;
 import com.aetherteam.aether.network.packet.clientbound.OpenSunAltarPacket;
+import com.aetherteam.aetherfabric.network.PacketDistributor;
 import com.mojang.serialization.MapCodec;
 import net.minecraft.core.BlockPos;
 import net.minecraft.network.chat.Component;
@@ -19,7 +20,6 @@
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.phys.BlockHitResult;
-import com.aetherteam.aetherfabric.network.PacketDistributor;
 
 public class SunAltarBlock extends BaseEntityBlock {
 

src/main/java/com/aetherteam/aether/blockentity/AetherBlockEntityTypes.java

@@ -2,10 +2,10 @@
 
 import com.aetherteam.aether.Aether;
 import com.aetherteam.aether.block.AetherBlocks;
-import net.minecraft.core.registries.BuiltInRegistries;
-import net.minecraft.world.level.block.entity.BlockEntityType;
 import com.aetherteam.aetherfabric.registries.DeferredHolder;
 import com.aetherteam.aetherfabric.registries.DeferredRegister;
+import net.minecraft.core.registries.BuiltInRegistries;
+import net.minecraft.world.level.block.entity.BlockEntityType;
 
 public class AetherBlockEntityTypes {
     public static final DeferredRegister<BlockEntityType<?>> BLOCK_ENTITY_TYPES = DeferredRegister.create(BuiltInRegistries.BLOCK_ENTITY_TYPE, Aether.MODID);

src/main/java/com/aetherteam/aether/blockentity/IncubatorBlockEntity.java

@@ -41,8 +41,8 @@
 import net.minecraft.world.level.block.entity.AbstractFurnaceBlockEntity;
 import net.minecraft.world.level.block.entity.BaseContainerBlockEntity;
 import net.minecraft.world.level.block.state.BlockState;
-
 import org.jetbrains.annotations.Nullable;
+
 import java.util.List;
 
 /**

src/main/java/com/aetherteam/aether/blockentity/SunAltarBlockEntity.java

@@ -14,7 +14,6 @@
 import net.minecraft.world.Nameable;
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.block.state.BlockState;
-
 import org.jetbrains.annotations.Nullable;
 
 public class SunAltarBlockEntity extends BlockEntity implements Nameable {

src/main/java/com/aetherteam/aether/blockentity/TreasureChestBlockEntity.java

@@ -2,9 +2,9 @@
 
 import com.aetherteam.aether.Aether;
 import com.aetherteam.aether.block.AetherBlocks;
-import com.aetherteam.aetherfabric.Utils;
 import com.aetherteam.aether.item.components.AetherDataComponents;
 import com.aetherteam.aether.item.components.DungeonKind;
+import com.aetherteam.aetherfabric.Utils;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
 import net.minecraft.core.HolderLookup;

src/main/java/com/aetherteam/aether/client/AetherAtlases.java

@@ -1,7 +1,6 @@
 package com.aetherteam.aether.client;
 
 import com.aetherteam.aether.Aether;
-import com.aetherteam.aether.block.AetherWoodTypes;
 import net.minecraft.client.renderer.Sheets;
 import net.minecraft.client.resources.model.Material;
 import net.minecraft.resources.ResourceLocation;

src/main/java/com/aetherteam/aether/client/AetherClient.java

@@ -2,7 +2,6 @@
 
 import com.aetherteam.aether.Aether;
 import com.aetherteam.aether.AetherConfig;
-import com.aetherteam.aether.api.AetherMenus;
 import com.aetherteam.aether.block.AetherBlocks;
 import com.aetherteam.aether.client.event.listeners.*;
 import com.aetherteam.aether.client.event.listeners.abilities.AccessoryAbilityClientListener;
@@ -11,16 +10,16 @@
 import com.aetherteam.aether.client.renderer.AetherOverlays;
 import com.aetherteam.aether.client.renderer.AetherRenderers;
 import com.aetherteam.aether.client.renderer.level.AetherRenderEffects;
+import com.aetherteam.aether.event.hooks.AbilityHooks;
 import com.aetherteam.aether.event.listeners.ItemListener;
 import com.aetherteam.aether.event.listeners.capability.AetherPlayerListener;
-import com.aetherteam.aetherfabric.events.RecipeBookCategoriesHelper;
-import com.aetherteam.aether.event.hooks.AbilityHooks;
 import com.aetherteam.aether.inventory.menu.AetherMenuTypes;
 import com.aetherteam.aether.inventory.menu.LoreBookMenu;
 import com.aetherteam.aether.item.AetherItems;
 import com.aetherteam.aether.mixin.mixins.client.accessor.RecipeBookCategoriesAccessor;
 import com.aetherteam.aether.perk.CustomizationsOptions;
-import com.aetherteam.cumulus.CumulusConfig;
+import com.aetherteam.aetherfabric.client.AetherFabricClient;
+import com.aetherteam.aetherfabric.events.RecipeBookCategoriesHelper;
 import com.aetherteam.nitrogen.event.listeners.TooltipListeners;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.reflect.Reflection;
@@ -39,7 +38,6 @@
 import net.minecraft.network.chat.contents.TranslatableContents;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.ItemStack;
-import com.aetherteam.aetherfabric.client.AetherFabricClient;
 import net.neoforged.neoforge.client.gui.ConfigurationScreen;
 
 import java.util.HashMap;