From aa0073905cd769f57d372cae6ad1275d4ac8dad0 Mon Sep 17 00:00:00 2001 From: Jika Date: Sun, 3 Aug 2025 14:11:56 +0200 Subject: [PATCH] Organize imports --- src/main/java/com/imbgt/ibg/Config.java | 8 ++++---- src/main/java/com/imbgt/ibg/IBG.java | 4 ++-- .../com/imbgt/ibg/block/custom/AnimatedBlock.java | 10 +++++----- .../java/com/imbgt/ibg/block/custom/PartBlock.java | 1 + .../ibg/block/entity/AnimatedBlockEntity.java | 6 +++++- .../java/com/imbgt/ibg/block/entity/PartBE.java | 1 - .../ibg/item/client/AnimatedBlockItemModel.java | 6 +++--- .../imbgt/ibg/item/custom/AnimatedBlockItem.java | 6 +++++- .../ibg/mixin/MetaMachineBlockEntityGeoMixin.java | 12 +++++++++--- .../com/imbgt/ibg/mixin/MetaMachineBlockMixin.java | 14 +++++++------- 10 files changed, 41 insertions(+), 27 deletions(-) diff --git a/src/main/java/com/imbgt/ibg/Config.java b/src/main/java/com/imbgt/ibg/Config.java index a2c99bc..172918c 100644 --- a/src/main/java/com/imbgt/ibg/Config.java +++ b/src/main/java/com/imbgt/ibg/Config.java @@ -1,5 +1,9 @@ package com.imbgt.ibg; +import java.util.List; +import java.util.Set; +import java.util.stream.Collectors; + import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.Item; import net.minecraftforge.common.ForgeConfigSpec; @@ -8,10 +12,6 @@ import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.event.config.ModConfigEvent; import net.minecraftforge.registries.ForgeRegistries; -import java.util.List; -import java.util.Set; -import java.util.stream.Collectors; - @Mod.EventBusSubscriber(modid = IBG.MOD_ID, bus = Mod.EventBusSubscriber.Bus.MOD) public class Config { diff --git a/src/main/java/com/imbgt/ibg/IBG.java b/src/main/java/com/imbgt/ibg/IBG.java index 67e862e..61ed3a5 100644 --- a/src/main/java/com/imbgt/ibg/IBG.java +++ b/src/main/java/com/imbgt/ibg/IBG.java @@ -1,5 +1,7 @@ package com.imbgt.ibg; +import org.slf4j.Logger; + import com.gregtechceu.gtceu.api.registry.GTRegistries; import com.imbgt.ibg.block.ModBlocks; import com.imbgt.ibg.block.entity.ModBlockEntities; @@ -25,8 +27,6 @@ import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent; import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; import software.bernie.geckolib.GeckoLib; -import org.slf4j.Logger; - @Mod(IBG.MOD_ID) public class IBG { public static final String MOD_ID = "ibg"; diff --git a/src/main/java/com/imbgt/ibg/block/custom/AnimatedBlock.java b/src/main/java/com/imbgt/ibg/block/custom/AnimatedBlock.java index 698bd2e..362ef24 100644 --- a/src/main/java/com/imbgt/ibg/block/custom/AnimatedBlock.java +++ b/src/main/java/com/imbgt/ibg/block/custom/AnimatedBlock.java @@ -1,19 +1,19 @@ package com.imbgt.ibg.block.custom; +import org.jetbrains.annotations.Nullable; + +import com.imbgt.ibg.block.entity.AnimatedBlockEntity; + +import net.minecraft.core.BlockPos; import net.minecraft.world.level.BlockGetter; import net.minecraft.world.level.block.BaseEntityBlock; import net.minecraft.world.level.block.Block; -import net.minecraft.core.BlockPos; import net.minecraft.world.level.block.RenderShape; import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.phys.shapes.CollisionContext; import net.minecraft.world.phys.shapes.VoxelShape; -import org.jetbrains.annotations.Nullable; - -import com.imbgt.ibg.block.entity.AnimatedBlockEntity; - public class AnimatedBlock extends BaseEntityBlock { public static final VoxelShape SHAPE = Block.box(0, 0, 0, 16, 12, 16); diff --git a/src/main/java/com/imbgt/ibg/block/custom/PartBlock.java b/src/main/java/com/imbgt/ibg/block/custom/PartBlock.java index 62fb018..ff36b82 100644 --- a/src/main/java/com/imbgt/ibg/block/custom/PartBlock.java +++ b/src/main/java/com/imbgt/ibg/block/custom/PartBlock.java @@ -1,6 +1,7 @@ package com.imbgt.ibg.block.custom; import java.util.function.Consumer; + import javax.annotation.Nullable; import com.gregtechceu.gtceu.api.block.MetaMachineBlock; diff --git a/src/main/java/com/imbgt/ibg/block/entity/AnimatedBlockEntity.java b/src/main/java/com/imbgt/ibg/block/entity/AnimatedBlockEntity.java index 3328810..5884e2d 100644 --- a/src/main/java/com/imbgt/ibg/block/entity/AnimatedBlockEntity.java +++ b/src/main/java/com/imbgt/ibg/block/entity/AnimatedBlockEntity.java @@ -7,7 +7,11 @@ import software.bernie.geckolib.animatable.GeoBlockEntity; import software.bernie.geckolib.core.animatable.GeoAnimatable; import software.bernie.geckolib.core.animatable.instance.AnimatableInstanceCache; import software.bernie.geckolib.core.animatable.instance.SingletonAnimatableInstanceCache; -import software.bernie.geckolib.core.animation.*; +import software.bernie.geckolib.core.animation.AnimatableManager; +import software.bernie.geckolib.core.animation.Animation; +import software.bernie.geckolib.core.animation.AnimationController; +import software.bernie.geckolib.core.animation.AnimationState; +import software.bernie.geckolib.core.animation.RawAnimation; import software.bernie.geckolib.core.object.PlayState; import software.bernie.geckolib.util.RenderUtils; diff --git a/src/main/java/com/imbgt/ibg/block/entity/PartBE.java b/src/main/java/com/imbgt/ibg/block/entity/PartBE.java index eda97e4..30af2bb 100644 --- a/src/main/java/com/imbgt/ibg/block/entity/PartBE.java +++ b/src/main/java/com/imbgt/ibg/block/entity/PartBE.java @@ -93,5 +93,4 @@ public class PartBE extends BlockEntity { } } } - } diff --git a/src/main/java/com/imbgt/ibg/item/client/AnimatedBlockItemModel.java b/src/main/java/com/imbgt/ibg/item/client/AnimatedBlockItemModel.java index d431b84..c80fb20 100644 --- a/src/main/java/com/imbgt/ibg/item/client/AnimatedBlockItemModel.java +++ b/src/main/java/com/imbgt/ibg/item/client/AnimatedBlockItemModel.java @@ -1,11 +1,11 @@ package com.imbgt.ibg.item.client; -import net.minecraft.resources.ResourceLocation; -import software.bernie.geckolib.model.GeoModel; - import com.imbgt.ibg.IBG; import com.imbgt.ibg.item.custom.AnimatedBlockItem; +import net.minecraft.resources.ResourceLocation; +import software.bernie.geckolib.model.GeoModel; + public class AnimatedBlockItemModel extends GeoModel { @Override public ResourceLocation getModelResource(AnimatedBlockItem animatable) { diff --git a/src/main/java/com/imbgt/ibg/item/custom/AnimatedBlockItem.java b/src/main/java/com/imbgt/ibg/item/custom/AnimatedBlockItem.java index b0f53fd..438f3b7 100644 --- a/src/main/java/com/imbgt/ibg/item/custom/AnimatedBlockItem.java +++ b/src/main/java/com/imbgt/ibg/item/custom/AnimatedBlockItem.java @@ -13,7 +13,11 @@ import software.bernie.geckolib.animatable.SingletonGeoAnimatable; import software.bernie.geckolib.core.animatable.GeoAnimatable; import software.bernie.geckolib.core.animatable.instance.AnimatableInstanceCache; import software.bernie.geckolib.core.animatable.instance.SingletonAnimatableInstanceCache; -import software.bernie.geckolib.core.animation.*; +import software.bernie.geckolib.core.animation.AnimatableManager; +import software.bernie.geckolib.core.animation.Animation; +import software.bernie.geckolib.core.animation.AnimationController; +import software.bernie.geckolib.core.animation.AnimationState; +import software.bernie.geckolib.core.animation.RawAnimation; import software.bernie.geckolib.core.object.PlayState; import software.bernie.geckolib.util.RenderUtils; diff --git a/src/main/java/com/imbgt/ibg/mixin/MetaMachineBlockEntityGeoMixin.java b/src/main/java/com/imbgt/ibg/mixin/MetaMachineBlockEntityGeoMixin.java index aa2cdff..6b678f1 100644 --- a/src/main/java/com/imbgt/ibg/mixin/MetaMachineBlockEntityGeoMixin.java +++ b/src/main/java/com/imbgt/ibg/mixin/MetaMachineBlockEntityGeoMixin.java @@ -1,15 +1,21 @@ package com.imbgt.ibg.mixin; -import com.gregtechceu.gtceu.api.blockentity.MetaMachineBlockEntity; -import com.gregtechceu.gtceu.api.machine.MetaMachine; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.Unique; + +import com.gregtechceu.gtceu.api.blockentity.MetaMachineBlockEntity; +import com.gregtechceu.gtceu.api.machine.MetaMachine; + import software.bernie.geckolib.animatable.GeoBlockEntity; import software.bernie.geckolib.core.animatable.GeoAnimatable; import software.bernie.geckolib.core.animatable.instance.AnimatableInstanceCache; import software.bernie.geckolib.core.animatable.instance.SingletonAnimatableInstanceCache; -import software.bernie.geckolib.core.animation.*; +import software.bernie.geckolib.core.animation.AnimatableManager; +import software.bernie.geckolib.core.animation.Animation; +import software.bernie.geckolib.core.animation.AnimationController; +import software.bernie.geckolib.core.animation.AnimationState; +import software.bernie.geckolib.core.animation.RawAnimation; import software.bernie.geckolib.core.object.PlayState; import software.bernie.geckolib.util.RenderUtils; diff --git a/src/main/java/com/imbgt/ibg/mixin/MetaMachineBlockMixin.java b/src/main/java/com/imbgt/ibg/mixin/MetaMachineBlockMixin.java index 6dbbbc2..485957c 100644 --- a/src/main/java/com/imbgt/ibg/mixin/MetaMachineBlockMixin.java +++ b/src/main/java/com/imbgt/ibg/mixin/MetaMachineBlockMixin.java @@ -1,5 +1,12 @@ package com.imbgt.ibg.mixin; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; + import com.gregtechceu.gtceu.api.block.AppearanceBlock; import com.gregtechceu.gtceu.api.block.IMachineBlock; import com.gregtechceu.gtceu.api.block.MetaMachineBlock; @@ -18,13 +25,6 @@ import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.phys.shapes.Shapes; import net.minecraft.world.phys.shapes.VoxelShape; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Shadow; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; - @Mixin(MetaMachineBlock.class) public abstract class MetaMachineBlockMixin extends AppearanceBlock {