diff --git a/src/api/java/appeng/api/features/IChargerRegistry.java b/src/api/java/appeng/api/features/IChargerRegistry.java index cfb0c586d..286eea5df 100644 --- a/src/api/java/appeng/api/features/IChargerRegistry.java +++ b/src/api/java/appeng/api/features/IChargerRegistry.java @@ -33,16 +33,16 @@ import appeng.api.implementations.items.IAEItemPowerStorage; /** * A registry to allow mapping {@link Item}s to a specific charge rate when * being placed inside a charger. - * + * * The registry is used in favor of an additional method for * {@link IAEItemPowerStorage} with a fixed value per item. This allows more * flexibility for other charger like machines to choose their own values when * needed. - * + * * There is no guarantee that this is charged per tick, it only represents the * value per operation. By default this is one charging operation every 10 ticks * in case of an AE2 charger. - * + * * @author yueh * @version rv5 * @since rv5 @@ -51,10 +51,10 @@ public interface IChargerRegistry { /** * Fetch a charge rate for a specific item. - * + * * The specific item does not need to have a mapping registered at all. In this * case it will use a default value of 160 AE. - * + * * @param item A {@link Item} implementing {@link IAEItemPowerStorage}. * @return custom rate or default of 160 */ @@ -63,12 +63,12 @@ public interface IChargerRegistry { /** * Register a custom charge rate for a specific item. - * + * * Capped at 16000 to avoid extracting too much energy from a network for each * operation. This is done silently without any feedback or exception. Further * the cap is not fixed, it can change at any time in the future should power * issues arise. - * + * * @param item A {@link Item} implementing {@link IAEItemPowerStorage}. * @param chargeRate the custom rate, must be > 0, capped to 16000d */ @@ -76,9 +76,9 @@ public interface IChargerRegistry { /** * Remove the custom rate for a specific item. - * + * * It will revert to the default value afterwards. - * + * * @param item A {@link Item} implementing {@link IAEItemPowerStorage}. */ void removeChargeRate(@Nonnull Item item); diff --git a/src/api/java/appeng/api/implementations/items/ISpatialStorageCell.java b/src/api/java/appeng/api/implementations/items/ISpatialStorageCell.java index 491dae0da..afbca3f53 100644 --- a/src/api/java/appeng/api/implementations/items/ISpatialStorageCell.java +++ b/src/api/java/appeng/api/implementations/items/ISpatialStorageCell.java @@ -25,12 +25,10 @@ package appeng.api.implementations.items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraft.world.dimension.DimensionType; import appeng.api.implementations.TransitionResult; -import appeng.api.storage.ISpatialDimension; import appeng.api.util.WorldCoord; /** diff --git a/src/api/java/appeng/api/networking/IGridNode.java b/src/api/java/appeng/api/networking/IGridNode.java index f29bba536..fb6b19032 100644 --- a/src/api/java/appeng/api/networking/IGridNode.java +++ b/src/api/java/appeng/api/networking/IGridNode.java @@ -29,7 +29,6 @@ import javax.annotation.Nonnull; import net.minecraft.nbt.CompoundNBT; import net.minecraft.world.IWorld; -import net.minecraft.world.World; import appeng.api.IAppEngApi; import appeng.api.util.AEPartLocation; diff --git a/src/api/java/appeng/api/networking/energy/IEnergyGridProvider.java b/src/api/java/appeng/api/networking/energy/IEnergyGridProvider.java index 572014ff8..ada5c4e42 100644 --- a/src/api/java/appeng/api/networking/energy/IEnergyGridProvider.java +++ b/src/api/java/appeng/api/networking/energy/IEnergyGridProvider.java @@ -36,15 +36,15 @@ import appeng.api.config.Actionable; public interface IEnergyGridProvider { /** * internal use only - * + * * Can return a list of providers behind the current. - * + * * An example would be something acting as proxy between different * {@link IEnergyGrid}s. - * + * * This can contain duplicate entries, AE will ensure that each provider is only * visited once. - * + * * internal use only */ @Nonnull @@ -52,12 +52,12 @@ public interface IEnergyGridProvider { /** * internal use only - * + * * Extracts the requested amount from the provider. - * + * * This should never forward a call to another {@link IEnergyGridProvider}, * instead return them via {@link IEnergyGridProvider#providers()} - * + * * @return the used amount */ @Nonnegative @@ -65,12 +65,12 @@ public interface IEnergyGridProvider { /** * Injects the offered amount into the provider. - * + * * This should never forward a call to another {@link IEnergyGridProvider}, * instead return them via {@link IEnergyGridProvider#providers()} - * + * * internal use only - * + * * @return the leftover amount */ @Nonnegative @@ -78,13 +78,13 @@ public interface IEnergyGridProvider { /** * internal use only - * + * * Returns the current demand of an provider. - * + * * This should never forward a call to another {@link IEnergyGridProvider}, * instead return them via {@link IEnergyGridProvider#providers()} - * - * + * + * * @param d the max amount offered, the demand should never exceed it. * @return the total amount demanded */ @@ -93,33 +93,33 @@ public interface IEnergyGridProvider { /** * internal use only - * + * * AE currently uses this to enqueue the next visited provider. - * + * * There is no guarantee that this works on in a perfect way. It can be limited * to the returns of the past {@link IEnergyGridProvider#providers()}, but not * any future one discovered by visiting further providers. - * + * * E.g. inject into the the lowest one first or extract from the highest one. - * + * * @return the current stored amount. - * - * + * + * */ @Nonnegative double getProviderStoredEnergy(); /** * internal use only - * + * * AE currently uses this to enqueue the next visited provider. - * + * * There is no guarantee that this works on in a perfect way. It can be limited * to the returns of the past {@link IEnergyGridProvider#providers()}, but not * any future one discovered by visiting further providers. - * + * * E.g. inject into the the lowest one first or extract from the highest one. - * + * * @return the maximum amount stored. */ @Nonnegative diff --git a/src/api/java/appeng/api/parts/IPartItem.java b/src/api/java/appeng/api/parts/IPartItem.java index 60a4b3076..890a3ccd7 100644 --- a/src/api/java/appeng/api/parts/IPartItem.java +++ b/src/api/java/appeng/api/parts/IPartItem.java @@ -23,8 +23,6 @@ package appeng.api.parts; -import javax.annotation.Nullable; - import net.minecraft.item.ItemStack; //@formatter:off diff --git a/src/api/java/appeng/api/storage/ICellInventoryHandler.java b/src/api/java/appeng/api/storage/ICellInventoryHandler.java index 3325560d0..35d613faa 100644 --- a/src/api/java/appeng/api/storage/ICellInventoryHandler.java +++ b/src/api/java/appeng/api/storage/ICellInventoryHandler.java @@ -32,7 +32,7 @@ public interface ICellInventoryHandler> extends IMEInvento /** * Get access to the ICellInventory. Can be null for custom cells. - * + * * @return get access to the Cell Inventory. */ @Nullable diff --git a/src/api/java/appeng/api/storage/ISaveProvider.java b/src/api/java/appeng/api/storage/ISaveProvider.java index 521d118c6..6609fef45 100644 --- a/src/api/java/appeng/api/storage/ISaveProvider.java +++ b/src/api/java/appeng/api/storage/ISaveProvider.java @@ -33,7 +33,7 @@ import javax.annotation.Nullable; public interface ISaveProvider { /** * Cell has changed and needs to be changed. - * + * * @param cellInventory can be null for custom cells. */ void saveChanges(@Nullable ICellInventory cellInventory); diff --git a/src/api/java/appeng/api/storage/ISpatialDimension.java b/src/api/java/appeng/api/storage/ISpatialDimension.java index 5f661c971..18eb95c8b 100644 --- a/src/api/java/appeng/api/storage/ISpatialDimension.java +++ b/src/api/java/appeng/api/storage/ISpatialDimension.java @@ -24,7 +24,6 @@ import javax.annotation.Nullable; import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.ITextComponent; -import net.minecraft.world.World; import net.minecraft.world.dimension.DimensionType; import net.minecraft.world.server.ServerWorld; diff --git a/src/api/java/appeng/api/util/IClientHelper.java b/src/api/java/appeng/api/util/IClientHelper.java index 4b7550500..b2f9cf584 100644 --- a/src/api/java/appeng/api/util/IClientHelper.java +++ b/src/api/java/appeng/api/util/IClientHelper.java @@ -11,7 +11,7 @@ import appeng.api.storage.data.IAEStack; public interface IClientHelper { /** * Add cell information to the provided list. Used for tooltip content. - * + * * @param handler Cell handler. * @param lines List of lines to add to. */ diff --git a/src/main/java/appeng/block/AEBaseBlock.java b/src/main/java/appeng/block/AEBaseBlock.java index 501f5f32d..a04820721 100644 --- a/src/main/java/appeng/block/AEBaseBlock.java +++ b/src/main/java/appeng/block/AEBaseBlock.java @@ -30,8 +30,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.ActionResultType; import net.minecraft.util.Direction; import net.minecraft.util.Hand; -import net.minecraft.util.Rotation; -import net.minecraft.util.math.*; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.BlockRayTraceResult; import net.minecraft.util.math.shapes.VoxelShape; import net.minecraft.util.math.shapes.VoxelShapes; import net.minecraft.world.IBlockReader; diff --git a/src/main/java/appeng/block/AEBaseBlockItem.java b/src/main/java/appeng/block/AEBaseBlockItem.java index e123bea5f..d04b37895 100644 --- a/src/main/java/appeng/block/AEBaseBlockItem.java +++ b/src/main/java/appeng/block/AEBaseBlockItem.java @@ -29,7 +29,6 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.ActionResultType; import net.minecraft.util.Direction; -import net.minecraft.util.math.MathHelper; import net.minecraft.util.text.ITextComponent; import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; diff --git a/src/main/java/appeng/block/grindstone/BlockCrank.java b/src/main/java/appeng/block/grindstone/BlockCrank.java index 89d2f795b..0cf9923d1 100644 --- a/src/main/java/appeng/block/grindstone/BlockCrank.java +++ b/src/main/java/appeng/block/grindstone/BlockCrank.java @@ -23,7 +23,6 @@ import javax.annotation.Nullable; import net.minecraft.block.Block; import net.minecraft.block.BlockRenderType; import net.minecraft.block.BlockState; -import net.minecraft.block.Blocks; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; diff --git a/src/main/java/appeng/block/misc/BlockCharger.java b/src/main/java/appeng/block/misc/BlockCharger.java index d786ff447..597d4d6a3 100644 --- a/src/main/java/appeng/block/misc/BlockCharger.java +++ b/src/main/java/appeng/block/misc/BlockCharger.java @@ -52,7 +52,6 @@ import net.minecraftforge.api.distmarker.OnlyIn; import appeng.api.AEApi; import appeng.api.util.AEAxisAlignedBB; import appeng.block.AEBaseTileBlock; -import appeng.client.render.effects.ChargedOreFX; import appeng.client.render.effects.LightningFX; import appeng.client.render.renderable.ItemRenderable; import appeng.client.render.tesr.ModularTESR; diff --git a/src/main/java/appeng/block/misc/BlockCondenser.java b/src/main/java/appeng/block/misc/BlockCondenser.java index c10535468..e6c5de87c 100644 --- a/src/main/java/appeng/block/misc/BlockCondenser.java +++ b/src/main/java/appeng/block/misc/BlockCondenser.java @@ -29,12 +29,10 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockRayTraceResult; import net.minecraft.world.World; -import appeng.api.util.AEPartLocation; import appeng.block.AEBaseTileBlock; import appeng.container.ContainerLocator; import appeng.container.ContainerOpener; import appeng.container.implementations.ContainerCondenser; -import appeng.container.implementations.ContainerDrive; import appeng.tile.misc.TileCondenser; import appeng.util.Platform; diff --git a/src/main/java/appeng/block/misc/BlockInscriber.java b/src/main/java/appeng/block/misc/BlockInscriber.java index 777c50322..c11730667 100644 --- a/src/main/java/appeng/block/misc/BlockInscriber.java +++ b/src/main/java/appeng/block/misc/BlockInscriber.java @@ -34,8 +34,6 @@ import appeng.block.AEBaseTileBlock; import appeng.container.ContainerLocator; import appeng.container.ContainerOpener; import appeng.container.implementations.ContainerInscriber; -import appeng.container.implementations.ContainerInterface; -import appeng.fluids.container.ContainerFluidLevelEmitter; import appeng.tile.misc.TileInscriber; public class BlockInscriber extends AEBaseTileBlock { diff --git a/src/main/java/appeng/block/misc/BlockInterface.java b/src/main/java/appeng/block/misc/BlockInterface.java index 6400af9d1..f1cd53ec9 100644 --- a/src/main/java/appeng/block/misc/BlockInterface.java +++ b/src/main/java/appeng/block/misc/BlockInterface.java @@ -32,14 +32,12 @@ import net.minecraft.util.Direction; import net.minecraft.util.Hand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockRayTraceResult; -import net.minecraft.world.IWorld; import net.minecraft.world.World; import appeng.api.util.IOrientable; import appeng.block.AEBaseTileBlock; import appeng.container.ContainerLocator; import appeng.container.ContainerOpener; -import appeng.container.implementations.ContainerDrive; import appeng.container.implementations.ContainerInterface; import appeng.tile.misc.TileInterface; import appeng.util.Platform; diff --git a/src/main/java/appeng/block/misc/BlockQuartzFixture.java b/src/main/java/appeng/block/misc/BlockQuartzFixture.java index 9bd124e59..b1eb39590 100644 --- a/src/main/java/appeng/block/misc/BlockQuartzFixture.java +++ b/src/main/java/appeng/block/misc/BlockQuartzFixture.java @@ -94,6 +94,7 @@ public class BlockQuartzFixture extends AEBaseBlock implements IOrientableBlock } // For reference, see WallTorchBlock + @Override @Nullable public BlockState getStateForPlacement(BlockItemUseContext context) { BlockState blockstate = super.getStateForPlacement(context); diff --git a/src/main/java/appeng/block/misc/BlockQuartzGrowthAccelerator.java b/src/main/java/appeng/block/misc/BlockQuartzGrowthAccelerator.java index 2652ea24f..20a5c1956 100644 --- a/src/main/java/appeng/block/misc/BlockQuartzGrowthAccelerator.java +++ b/src/main/java/appeng/block/misc/BlockQuartzGrowthAccelerator.java @@ -29,7 +29,6 @@ import net.minecraft.state.BooleanProperty; import net.minecraft.state.StateContainer; import net.minecraft.util.Direction; import net.minecraft.util.math.BlockPos; -import net.minecraft.world.IWorld; import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; diff --git a/src/main/java/appeng/block/misc/BlockSecurityStation.java b/src/main/java/appeng/block/misc/BlockSecurityStation.java index 097cb1390..0979455a0 100644 --- a/src/main/java/appeng/block/misc/BlockSecurityStation.java +++ b/src/main/java/appeng/block/misc/BlockSecurityStation.java @@ -28,21 +28,16 @@ import net.minecraft.item.ItemStack; import net.minecraft.state.BooleanProperty; import net.minecraft.state.StateContainer; import net.minecraft.util.ActionResultType; -import net.minecraft.util.Direction; import net.minecraft.util.Hand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockRayTraceResult; -import net.minecraft.world.IWorld; import net.minecraft.world.World; -import appeng.api.util.AEPartLocation; import appeng.block.AEBaseTileBlock; import appeng.container.ContainerLocator; import appeng.container.ContainerOpener; -import appeng.container.implementations.ContainerFormationPlane; import appeng.container.implementations.ContainerSecurityStation; import appeng.tile.misc.TileSecurityStation; -import appeng.util.Platform; public class BlockSecurityStation extends AEBaseTileBlock { diff --git a/src/main/java/appeng/block/misc/BlockTinyTNT.java b/src/main/java/appeng/block/misc/BlockTinyTNT.java index 2e0f809bd..f0c8ad1be 100644 --- a/src/main/java/appeng/block/misc/BlockTinyTNT.java +++ b/src/main/java/appeng/block/misc/BlockTinyTNT.java @@ -22,8 +22,6 @@ import javax.annotation.Nullable; import net.minecraft.block.Block; import net.minecraft.block.BlockState; -import net.minecraft.block.SoundType; -import net.minecraft.block.material.Material; import net.minecraft.entity.Entity; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.player.PlayerEntity; diff --git a/src/main/java/appeng/block/misc/BlockVibrationChamber.java b/src/main/java/appeng/block/misc/BlockVibrationChamber.java index 6f55b9548..0e4cc3630 100644 --- a/src/main/java/appeng/block/misc/BlockVibrationChamber.java +++ b/src/main/java/appeng/block/misc/BlockVibrationChamber.java @@ -35,13 +35,11 @@ import net.minecraft.util.Direction; import net.minecraft.util.Hand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockRayTraceResult; -import net.minecraft.world.IWorld; import net.minecraft.world.World; import appeng.block.AEBaseTileBlock; import appeng.container.ContainerLocator; import appeng.container.ContainerOpener; -import appeng.container.implementations.ContainerDrive; import appeng.container.implementations.ContainerVibrationChamber; import appeng.core.AEConfig; import appeng.tile.AEBaseTile; diff --git a/src/main/java/appeng/block/misc/InscriberRendering.java b/src/main/java/appeng/block/misc/InscriberRendering.java index 3529d8793..c512f721c 100644 --- a/src/main/java/appeng/block/misc/InscriberRendering.java +++ b/src/main/java/appeng/block/misc/InscriberRendering.java @@ -4,7 +4,8 @@ package appeng.block.misc; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -import appeng.bootstrap.*; +import appeng.bootstrap.TileEntityRendering; +import appeng.bootstrap.TileEntityRenderingCustomizer; import appeng.client.render.tesr.InscriberTESR; import appeng.tile.misc.TileInscriber; diff --git a/src/main/java/appeng/block/misc/SkyCompassRendering.java b/src/main/java/appeng/block/misc/SkyCompassRendering.java index a1f0109c6..eb994c492 100644 --- a/src/main/java/appeng/block/misc/SkyCompassRendering.java +++ b/src/main/java/appeng/block/misc/SkyCompassRendering.java @@ -21,7 +21,8 @@ package appeng.block.misc; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -import appeng.bootstrap.*; +import appeng.bootstrap.TileEntityRendering; +import appeng.bootstrap.TileEntityRenderingCustomizer; import appeng.client.render.tesr.SkyCompassTESR; import appeng.tile.misc.TileSkyCompass; diff --git a/src/main/java/appeng/block/networking/BlockCableBus.java b/src/main/java/appeng/block/networking/BlockCableBus.java index cc2704b07..fd2c6f32f 100644 --- a/src/main/java/appeng/block/networking/BlockCableBus.java +++ b/src/main/java/appeng/block/networking/BlockCableBus.java @@ -35,15 +35,21 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.fluid.IFluidState; -import net.minecraft.item.*; -import net.minecraft.state.BooleanProperty; +import net.minecraft.item.BlockItemUseContext; +import net.minecraft.item.DyeColor; +import net.minecraft.item.ItemGroup; +import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ActionResultType; import net.minecraft.util.Direction; import net.minecraft.util.Hand; import net.minecraft.util.NonNullList; -import net.minecraft.util.math.*; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.BlockRayTraceResult; +import net.minecraft.util.math.RayTraceResult; import net.minecraft.util.math.RayTraceResult.Type; +import net.minecraft.util.math.Vec3d; import net.minecraft.util.math.shapes.ISelectionContext; import net.minecraft.util.math.shapes.VoxelShape; import net.minecraft.util.math.shapes.VoxelShapes; @@ -69,7 +75,6 @@ import appeng.parts.ICableBusContainer; import appeng.parts.NullCableBusContainer; import appeng.tile.AEBaseTile; import appeng.tile.networking.TileCableBus; -import appeng.tile.networking.TileCableBusTESR; import appeng.util.Platform; public class BlockCableBus extends AEBaseTileBlock /* FIXME implements IAEFacade */ { diff --git a/src/main/java/appeng/block/networking/BlockController.java b/src/main/java/appeng/block/networking/BlockController.java index 4bfdfc42b..9c7237e46 100644 --- a/src/main/java/appeng/block/networking/BlockController.java +++ b/src/main/java/appeng/block/networking/BlockController.java @@ -26,7 +26,6 @@ import net.minecraft.state.StateContainer; import net.minecraft.util.Direction; import net.minecraft.util.IStringSerializable; import net.minecraft.util.math.BlockPos; -import net.minecraft.world.IBlockReader; import net.minecraft.world.IWorld; import net.minecraft.world.World; diff --git a/src/main/java/appeng/block/networking/BlockEnergyAcceptor.java b/src/main/java/appeng/block/networking/BlockEnergyAcceptor.java index 170cc364c..22f598be8 100644 --- a/src/main/java/appeng/block/networking/BlockEnergyAcceptor.java +++ b/src/main/java/appeng/block/networking/BlockEnergyAcceptor.java @@ -18,7 +18,6 @@ package appeng.block.networking; -import net.minecraft.block.Block; import net.minecraft.block.material.Material; import appeng.block.AEBaseTileBlock; diff --git a/src/main/java/appeng/block/networking/BlockEnergyCellRendering.java b/src/main/java/appeng/block/networking/BlockEnergyCellRendering.java index c2892cb24..8c3b302a9 100644 --- a/src/main/java/appeng/block/networking/BlockEnergyCellRendering.java +++ b/src/main/java/appeng/block/networking/BlockEnergyCellRendering.java @@ -18,11 +18,8 @@ package appeng.block.networking; -import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; -import appeng.api.implementations.items.IAEItemPowerStorage; -import appeng.block.AEBaseBlockItemChargeable; import appeng.bootstrap.BlockRenderingCustomizer; import appeng.bootstrap.IBlockRendering; import appeng.bootstrap.IItemRendering; diff --git a/src/main/java/appeng/block/networking/BlockWireless.java b/src/main/java/appeng/block/networking/BlockWireless.java index 10c04f04f..2f104b1ae 100644 --- a/src/main/java/appeng/block/networking/BlockWireless.java +++ b/src/main/java/appeng/block/networking/BlockWireless.java @@ -23,7 +23,6 @@ import net.minecraft.block.BlockState; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.state.EnumProperty; import net.minecraft.state.StateContainer; -import net.minecraft.state.properties.BlockStateProperties; import net.minecraft.util.ActionResultType; import net.minecraft.util.Direction; import net.minecraft.util.Hand; @@ -35,7 +34,6 @@ import net.minecraft.util.math.shapes.ISelectionContext; import net.minecraft.util.math.shapes.VoxelShape; import net.minecraft.util.math.shapes.VoxelShapes; import net.minecraft.world.IBlockReader; -import net.minecraft.world.IWorld; import net.minecraft.world.World; import appeng.block.AEBaseTileBlock; diff --git a/src/main/java/appeng/block/networking/CableBusColor.java b/src/main/java/appeng/block/networking/CableBusColor.java index aaf0e2417..d2b0134ea 100644 --- a/src/main/java/appeng/block/networking/CableBusColor.java +++ b/src/main/java/appeng/block/networking/CableBusColor.java @@ -24,13 +24,11 @@ import net.minecraft.block.BlockState; import net.minecraft.client.renderer.color.IBlockColor; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; -import net.minecraft.world.IBlockReader; import net.minecraft.world.ILightReader; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import appeng.api.util.AEColor; -import appeng.client.render.cablebus.CableBusRenderState; import appeng.parts.CableBusContainer; import appeng.tile.networking.TileCableBus; diff --git a/src/main/java/appeng/block/networking/CableBusRendering.java b/src/main/java/appeng/block/networking/CableBusRendering.java index 2a1023018..484f88eae 100644 --- a/src/main/java/appeng/block/networking/CableBusRendering.java +++ b/src/main/java/appeng/block/networking/CableBusRendering.java @@ -24,8 +24,6 @@ import net.minecraftforge.api.distmarker.OnlyIn; import appeng.bootstrap.BlockRenderingCustomizer; import appeng.bootstrap.IBlockRendering; import appeng.bootstrap.IItemRendering; -import appeng.client.render.cablebus.CableBusModel; -import appeng.core.features.registries.PartModels; /** * Customizes the rendering behavior for cable busses, which are the biggest diff --git a/src/main/java/appeng/block/paint/PaintSplotchesBakedModel.java b/src/main/java/appeng/block/paint/PaintSplotchesBakedModel.java index 116b76f16..750818905 100644 --- a/src/main/java/appeng/block/paint/PaintSplotchesBakedModel.java +++ b/src/main/java/appeng/block/paint/PaintSplotchesBakedModel.java @@ -14,12 +14,10 @@ import com.google.common.collect.ImmutableList; import net.minecraft.block.BlockState; import net.minecraft.client.renderer.model.BakedQuad; -import net.minecraft.client.renderer.model.IBakedModel; import net.minecraft.client.renderer.model.ItemOverrideList; import net.minecraft.client.renderer.model.Material; import net.minecraft.client.renderer.texture.AtlasTexture; import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.client.renderer.vertex.VertexFormat; import net.minecraft.util.Direction; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.model.data.IDynamicBakedModel; diff --git a/src/main/java/appeng/block/paint/PaintSplotchesModel.java b/src/main/java/appeng/block/paint/PaintSplotchesModel.java index a77890439..85d2a095b 100644 --- a/src/main/java/appeng/block/paint/PaintSplotchesModel.java +++ b/src/main/java/appeng/block/paint/PaintSplotchesModel.java @@ -7,7 +7,12 @@ import java.util.function.Function; import com.mojang.datafixers.util.Pair; -import net.minecraft.client.renderer.model.*; +import net.minecraft.client.renderer.model.IBakedModel; +import net.minecraft.client.renderer.model.IModelTransform; +import net.minecraft.client.renderer.model.IUnbakedModel; +import net.minecraft.client.renderer.model.ItemOverrideList; +import net.minecraft.client.renderer.model.Material; +import net.minecraft.client.renderer.model.ModelBakery; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.model.IModelConfiguration; diff --git a/src/main/java/appeng/block/qnb/BlockQuantumBase.java b/src/main/java/appeng/block/qnb/BlockQuantumBase.java index 5004da373..45dc955bb 100644 --- a/src/main/java/appeng/block/qnb/BlockQuantumBase.java +++ b/src/main/java/appeng/block/qnb/BlockQuantumBase.java @@ -22,14 +22,12 @@ import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.state.BooleanProperty; import net.minecraft.state.StateContainer; -import net.minecraft.util.Direction; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.shapes.ISelectionContext; import net.minecraft.util.math.shapes.VoxelShape; import net.minecraft.util.math.shapes.VoxelShapes; import net.minecraft.world.IBlockReader; -import net.minecraft.world.IWorld; import net.minecraft.world.World; import appeng.block.AEBaseTileBlock; diff --git a/src/main/java/appeng/block/qnb/BlockQuantumLinkChamber.java b/src/main/java/appeng/block/qnb/BlockQuantumLinkChamber.java index a267d34d7..4fc467646 100644 --- a/src/main/java/appeng/block/qnb/BlockQuantumLinkChamber.java +++ b/src/main/java/appeng/block/qnb/BlockQuantumLinkChamber.java @@ -18,15 +18,11 @@ package appeng.block.qnb; -import java.util.Collections; -import java.util.List; import java.util.Random; import javax.annotation.Nullable; -import net.minecraft.block.Block; import net.minecraft.block.BlockState; -import net.minecraft.entity.Entity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.util.ActionResultType; @@ -40,7 +36,6 @@ import net.minecraft.util.math.shapes.VoxelShapes; import net.minecraft.world.IBlockReader; import net.minecraft.world.World; -import appeng.api.util.AEPartLocation; import appeng.client.EffectType; import appeng.container.ContainerLocator; import appeng.container.ContainerOpener; diff --git a/src/main/java/appeng/block/qnb/QnbFormedBakedModel.java b/src/main/java/appeng/block/qnb/QnbFormedBakedModel.java index b880b6671..b874a0a3f 100644 --- a/src/main/java/appeng/block/qnb/QnbFormedBakedModel.java +++ b/src/main/java/appeng/block/qnb/QnbFormedBakedModel.java @@ -1,7 +1,11 @@ package appeng.block.qnb; -import java.util.*; +import java.util.Collections; +import java.util.EnumSet; +import java.util.List; +import java.util.Random; +import java.util.Set; import java.util.function.Function; import javax.annotation.Nullable; diff --git a/src/main/java/appeng/block/qnb/QnbFormedModel.java b/src/main/java/appeng/block/qnb/QnbFormedModel.java index 396d23974..af4ac7a9a 100644 --- a/src/main/java/appeng/block/qnb/QnbFormedModel.java +++ b/src/main/java/appeng/block/qnb/QnbFormedModel.java @@ -7,7 +7,12 @@ import java.util.function.Function; import com.mojang.datafixers.util.Pair; -import net.minecraft.client.renderer.model.*; +import net.minecraft.client.renderer.model.IBakedModel; +import net.minecraft.client.renderer.model.IModelTransform; +import net.minecraft.client.renderer.model.IUnbakedModel; +import net.minecraft.client.renderer.model.ItemOverrideList; +import net.minecraft.client.renderer.model.Material; +import net.minecraft.client.renderer.model.ModelBakery; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.model.IModelConfiguration; diff --git a/src/main/java/appeng/block/spatial/BlockMatrixFrame.java b/src/main/java/appeng/block/spatial/BlockMatrixFrame.java index 50a89e3a1..2a3387461 100644 --- a/src/main/java/appeng/block/spatial/BlockMatrixFrame.java +++ b/src/main/java/appeng/block/spatial/BlockMatrixFrame.java @@ -18,9 +18,6 @@ package appeng.block.spatial; -import java.util.Collections; -import java.util.List; - import net.minecraft.block.BlockRenderType; import net.minecraft.block.BlockState; import net.minecraft.block.material.Material; @@ -30,7 +27,6 @@ import net.minecraft.entity.Entity; import net.minecraft.item.ItemGroup; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; -import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.shapes.ISelectionContext; import net.minecraft.util.math.shapes.VoxelShape; diff --git a/src/main/java/appeng/block/spatial/BlockSpatialIOPort.java b/src/main/java/appeng/block/spatial/BlockSpatialIOPort.java index 125dcae87..5f27d4ba3 100644 --- a/src/main/java/appeng/block/spatial/BlockSpatialIOPort.java +++ b/src/main/java/appeng/block/spatial/BlockSpatialIOPort.java @@ -31,12 +31,10 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockRayTraceResult; import net.minecraft.world.World; -import appeng.api.util.AEPartLocation; import appeng.block.AEBaseTileBlock; import appeng.container.ContainerLocator; import appeng.container.ContainerOpener; import appeng.container.implementations.ContainerSpatialIOPort; -import appeng.fluids.container.ContainerFluidLevelEmitter; import appeng.tile.spatial.TileSpatialIOPort; import appeng.util.Platform; diff --git a/src/main/java/appeng/block/storage/BlockChest.java b/src/main/java/appeng/block/storage/BlockChest.java index f51e8bea9..d6fd1fe28 100644 --- a/src/main/java/appeng/block/storage/BlockChest.java +++ b/src/main/java/appeng/block/storage/BlockChest.java @@ -28,21 +28,17 @@ import net.minecraft.item.ItemStack; import net.minecraft.state.EnumProperty; import net.minecraft.state.StateContainer; import net.minecraft.util.ActionResultType; -import net.minecraft.util.Direction; import net.minecraft.util.Hand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockRayTraceResult; -import net.minecraft.world.IWorld; import net.minecraft.world.World; import appeng.block.AEBaseTileBlock; import appeng.container.ContainerLocator; import appeng.container.ContainerOpener; import appeng.container.implementations.ContainerChest; -import appeng.container.implementations.ContainerQNB; import appeng.core.localization.PlayerMessages; import appeng.tile.storage.TileChest; -import appeng.util.Platform; public class BlockChest extends AEBaseTileBlock { diff --git a/src/main/java/appeng/block/storage/BlockDrive.java b/src/main/java/appeng/block/storage/BlockDrive.java index 4b108143d..7d6057fc3 100644 --- a/src/main/java/appeng/block/storage/BlockDrive.java +++ b/src/main/java/appeng/block/storage/BlockDrive.java @@ -33,7 +33,6 @@ import appeng.block.AEBaseTileBlock; import appeng.container.ContainerLocator; import appeng.container.ContainerOpener; import appeng.container.implementations.ContainerDrive; -import appeng.container.implementations.ContainerQuartzKnife; import appeng.tile.storage.TileDrive; import appeng.util.Platform; diff --git a/src/main/java/appeng/block/storage/BlockIOPort.java b/src/main/java/appeng/block/storage/BlockIOPort.java index a898189af..1f3bfbe80 100644 --- a/src/main/java/appeng/block/storage/BlockIOPort.java +++ b/src/main/java/appeng/block/storage/BlockIOPort.java @@ -35,7 +35,6 @@ import appeng.block.AEBaseTileBlock; import appeng.container.ContainerLocator; import appeng.container.ContainerOpener; import appeng.container.implementations.ContainerIOPort; -import appeng.fluids.container.ContainerFluidInterface; import appeng.tile.storage.TileIOPort; import appeng.util.Platform; diff --git a/src/main/java/appeng/block/storage/BlockSkyChest.java b/src/main/java/appeng/block/storage/BlockSkyChest.java index c46dbf05b..5e9906c78 100644 --- a/src/main/java/appeng/block/storage/BlockSkyChest.java +++ b/src/main/java/appeng/block/storage/BlockSkyChest.java @@ -23,7 +23,6 @@ import javax.annotation.Nullable; import net.minecraft.block.BlockRenderType; import net.minecraft.block.BlockState; import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.util.ActionResultType; import net.minecraft.util.Direction; diff --git a/src/main/java/appeng/block/storage/DriveSlotsState.java b/src/main/java/appeng/block/storage/DriveSlotsState.java index 3768e068f..0d9b415a0 100644 --- a/src/main/java/appeng/block/storage/DriveSlotsState.java +++ b/src/main/java/appeng/block/storage/DriveSlotsState.java @@ -21,7 +21,6 @@ package appeng.block.storage; import com.google.common.base.Preconditions; import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; import appeng.api.implementations.tiles.IChestOrDrive; diff --git a/src/main/java/appeng/bootstrap/BlockRendering.java b/src/main/java/appeng/bootstrap/BlockRendering.java index 9d2b32c96..9e8895fe3 100644 --- a/src/main/java/appeng/bootstrap/BlockRendering.java +++ b/src/main/java/appeng/bootstrap/BlockRendering.java @@ -25,10 +25,6 @@ import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.color.IBlockColor; import net.minecraft.client.renderer.model.IBakedModel; -import net.minecraft.client.renderer.model.IUnbakedModel; -import net.minecraft.client.renderer.tileentity.TileEntityRenderer; -import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; -import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.ResourceLocation; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; diff --git a/src/main/java/appeng/bootstrap/FeatureFactory.java b/src/main/java/appeng/bootstrap/FeatureFactory.java index 097a277f0..3c61b4e12 100644 --- a/src/main/java/appeng/bootstrap/FeatureFactory.java +++ b/src/main/java/appeng/bootstrap/FeatureFactory.java @@ -31,7 +31,6 @@ import java.util.function.Supplier; import net.minecraft.block.Block; import net.minecraft.client.renderer.model.IBakedModel; -import net.minecraft.client.renderer.model.IUnbakedModel; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityClassification; import net.minecraft.entity.EntityType; diff --git a/src/main/java/appeng/bootstrap/IBlockRendering.java b/src/main/java/appeng/bootstrap/IBlockRendering.java index 58cc3ba38..a3e482d3b 100644 --- a/src/main/java/appeng/bootstrap/IBlockRendering.java +++ b/src/main/java/appeng/bootstrap/IBlockRendering.java @@ -19,16 +19,11 @@ package appeng.bootstrap; import java.util.function.BiFunction; -import java.util.function.Function; import java.util.function.Predicate; import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.color.IBlockColor; import net.minecraft.client.renderer.model.IBakedModel; -import net.minecraft.client.renderer.model.IUnbakedModel; -import net.minecraft.client.renderer.model.ModelResourceLocation; -import net.minecraft.client.renderer.tileentity.TileEntityRenderer; -import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; import net.minecraft.util.ResourceLocation; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; diff --git a/src/main/java/appeng/bootstrap/IModelRegistry.java b/src/main/java/appeng/bootstrap/IModelRegistry.java index b1c2eb0ec..75caa6a39 100644 --- a/src/main/java/appeng/bootstrap/IModelRegistry.java +++ b/src/main/java/appeng/bootstrap/IModelRegistry.java @@ -18,8 +18,6 @@ package appeng.bootstrap; -import net.minecraft.block.Block; -import net.minecraft.client.renderer.model.ModelResourceLocation; import net.minecraft.item.Item; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/appeng/bootstrap/components/BlockColorComponent.java b/src/main/java/appeng/bootstrap/components/BlockColorComponent.java index e1b66c241..c7ffe4796 100644 --- a/src/main/java/appeng/bootstrap/components/BlockColorComponent.java +++ b/src/main/java/appeng/bootstrap/components/BlockColorComponent.java @@ -21,7 +21,6 @@ package appeng.bootstrap.components; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.color.IBlockColor; -import net.minecraftforge.api.distmarker.Dist; public class BlockColorComponent implements IInitComponent { diff --git a/src/main/java/appeng/bootstrap/components/IEntityRegistrationComponent.java b/src/main/java/appeng/bootstrap/components/IEntityRegistrationComponent.java index a19ddff17..b29ffffc9 100644 --- a/src/main/java/appeng/bootstrap/components/IEntityRegistrationComponent.java +++ b/src/main/java/appeng/bootstrap/components/IEntityRegistrationComponent.java @@ -1,7 +1,6 @@ package appeng.bootstrap.components; -import net.minecraft.entity.Entity; import net.minecraft.entity.EntityType; import net.minecraftforge.registries.IForgeRegistry; diff --git a/src/main/java/appeng/bootstrap/components/IInitComponent.java b/src/main/java/appeng/bootstrap/components/IInitComponent.java index ee1a365bf..1fd758fa2 100644 --- a/src/main/java/appeng/bootstrap/components/IInitComponent.java +++ b/src/main/java/appeng/bootstrap/components/IInitComponent.java @@ -18,8 +18,6 @@ package appeng.bootstrap.components; -import net.minecraftforge.api.distmarker.Dist; - import appeng.bootstrap.IBootstrapComponent; @FunctionalInterface diff --git a/src/main/java/appeng/bootstrap/components/IRecipeRegistrationComponent.java b/src/main/java/appeng/bootstrap/components/IRecipeRegistrationComponent.java index 9ea405877..46a4b9dfa 100644 --- a/src/main/java/appeng/bootstrap/components/IRecipeRegistrationComponent.java +++ b/src/main/java/appeng/bootstrap/components/IRecipeRegistrationComponent.java @@ -1,7 +1,6 @@ package appeng.bootstrap.components; -import net.minecraft.item.crafting.IRecipe; import net.minecraft.item.crafting.IRecipeSerializer; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.registries.IForgeRegistry; diff --git a/src/main/java/appeng/bootstrap/components/ModelOverrideComponent.java b/src/main/java/appeng/bootstrap/components/ModelOverrideComponent.java index b9d27054b..9af970c13 100644 --- a/src/main/java/appeng/bootstrap/components/ModelOverrideComponent.java +++ b/src/main/java/appeng/bootstrap/components/ModelOverrideComponent.java @@ -41,6 +41,7 @@ public class ModelOverrideComponent implements IModelBakeComponent { this.customizer.put(resourcePath, customizer); } + @Override public void onModelBakeEvent(final ModelBakeEvent event) { Map modelRegistry = event.getModelRegistry(); Set keys = Sets.newHashSet(modelRegistry.keySet()); diff --git a/src/main/java/appeng/bootstrap/components/StateMapperComponent.java b/src/main/java/appeng/bootstrap/components/StateMapperComponent.java index 478b7e77a..85cefc972 100644 --- a/src/main/java/appeng/bootstrap/components/StateMapperComponent.java +++ b/src/main/java/appeng/bootstrap/components/StateMapperComponent.java @@ -18,8 +18,6 @@ package appeng.bootstrap.components; -import net.minecraft.block.Block; -import net.minecraft.client.Minecraft; import net.minecraftforge.api.distmarker.Dist; import appeng.bootstrap.IModelRegistry; diff --git a/src/main/java/appeng/bootstrap/definitions/TileEntityDefinition.java b/src/main/java/appeng/bootstrap/definitions/TileEntityDefinition.java index ef1c3b1a6..b53daebf4 100644 --- a/src/main/java/appeng/bootstrap/definitions/TileEntityDefinition.java +++ b/src/main/java/appeng/bootstrap/definitions/TileEntityDefinition.java @@ -22,8 +22,6 @@ import java.util.function.Consumer; import net.minecraft.block.Block; -import appeng.tile.AEBaseTile; - /** * @author GuntherDW */ diff --git a/src/main/java/appeng/capabilities/NullSpatialDimension.java b/src/main/java/appeng/capabilities/NullSpatialDimension.java index fd43550a6..9c5b157a4 100644 --- a/src/main/java/appeng/capabilities/NullSpatialDimension.java +++ b/src/main/java/appeng/capabilities/NullSpatialDimension.java @@ -22,7 +22,6 @@ import java.util.List; import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.ITextComponent; -import net.minecraft.world.World; import net.minecraft.world.dimension.DimensionType; import net.minecraft.world.server.ServerWorld; diff --git a/src/main/java/appeng/client/ClientHelper.java b/src/main/java/appeng/client/ClientHelper.java index ccd8fb39f..551932359 100644 --- a/src/main/java/appeng/client/ClientHelper.java +++ b/src/main/java/appeng/client/ClientHelper.java @@ -18,7 +18,10 @@ package appeng.client; -import java.util.*; +import java.util.Collections; +import java.util.EnumMap; +import java.util.List; +import java.util.Random; import net.minecraft.client.Minecraft; import net.minecraft.client.settings.KeyBinding; @@ -33,12 +36,13 @@ import net.minecraftforge.client.event.InputEvent; import net.minecraftforge.client.event.RenderLivingEvent; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fml.client.registry.ClientRegistry; -import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent; -import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; import appeng.api.parts.CableRenderMode; import appeng.block.AEBaseBlock; -import appeng.client.render.effects.*; +import appeng.client.render.effects.EnergyFx; +import appeng.client.render.effects.LightningArcFX; +import appeng.client.render.effects.LightningFX; +import appeng.client.render.effects.VibrantFX; import appeng.core.AEConfig; import appeng.core.AppEng; import appeng.core.sync.network.NetworkHandler; diff --git a/src/main/java/appeng/client/gui/AEBaseGui.java b/src/main/java/appeng/client/gui/AEBaseGui.java index 6334712cf..d58506436 100644 --- a/src/main/java/appeng/client/gui/AEBaseGui.java +++ b/src/main/java/appeng/client/gui/AEBaseGui.java @@ -18,7 +18,11 @@ package appeng.client.gui; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashSet; +import java.util.List; +import java.util.Set; import java.util.concurrent.TimeUnit; import com.google.common.base.Preconditions; @@ -63,8 +67,17 @@ import appeng.client.me.SlotDisconnected; import appeng.client.me.SlotME; import appeng.client.render.StackSizeRenderer; import appeng.container.AEBaseContainer; -import appeng.container.slot.*; +import appeng.container.slot.AppEngCraftingSlot; +import appeng.container.slot.AppEngSlot; import appeng.container.slot.AppEngSlot.CalculatedValidity; +import appeng.container.slot.IOptionalSlot; +import appeng.container.slot.SlotCraftingTerm; +import appeng.container.slot.SlotDisabled; +import appeng.container.slot.SlotFake; +import appeng.container.slot.SlotInaccessible; +import appeng.container.slot.SlotOutput; +import appeng.container.slot.SlotPatternTerm; +import appeng.container.slot.SlotRestrictedInput; import appeng.core.AELog; import appeng.core.AppEng; import appeng.core.sync.network.NetworkHandler; diff --git a/src/main/java/appeng/client/gui/AEBaseMEGui.java b/src/main/java/appeng/client/gui/AEBaseMEGui.java index f50a24c71..6aed2b746 100644 --- a/src/main/java/appeng/client/gui/AEBaseMEGui.java +++ b/src/main/java/appeng/client/gui/AEBaseMEGui.java @@ -23,7 +23,6 @@ import java.util.List; import java.util.Locale; import net.minecraft.entity.player.PlayerInventory; -import net.minecraft.inventory.container.Container; import net.minecraft.inventory.container.Slot; import net.minecraft.item.ItemStack; import net.minecraft.util.text.ITextComponent; diff --git a/src/main/java/appeng/client/gui/implementations/AESubGui.java b/src/main/java/appeng/client/gui/implementations/AESubGui.java index e1809f9d8..163265104 100644 --- a/src/main/java/appeng/client/gui/implementations/AESubGui.java +++ b/src/main/java/appeng/client/gui/implementations/AESubGui.java @@ -13,7 +13,11 @@ import appeng.api.definitions.IDefinitions; import appeng.api.definitions.IParts; import appeng.client.gui.AEBaseGui; import appeng.client.gui.widgets.GuiTabButton; -import appeng.container.implementations.*; +import appeng.container.implementations.ContainerChest; +import appeng.container.implementations.ContainerCraftingTerm; +import appeng.container.implementations.ContainerMEMonitorable; +import appeng.container.implementations.ContainerPatternTerm; +import appeng.container.implementations.ContainerWirelessTerm; import appeng.core.sync.network.NetworkHandler; import appeng.core.sync.packets.PacketSwitchGuis; import appeng.helpers.IPriorityHost; diff --git a/src/main/java/appeng/client/gui/implementations/GuiChest.java b/src/main/java/appeng/client/gui/implementations/GuiChest.java index 6285a34a1..4eefd5cc7 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiChest.java +++ b/src/main/java/appeng/client/gui/implementations/GuiChest.java @@ -18,7 +18,6 @@ package appeng.client.gui.implementations; -import net.minecraft.client.gui.widget.button.Button; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.util.text.ITextComponent; import net.minecraftforge.fml.client.gui.GuiUtils; diff --git a/src/main/java/appeng/client/gui/implementations/GuiCraftingStatus.java b/src/main/java/appeng/client/gui/implementations/GuiCraftingStatus.java index 3175c9289..5296eb787 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiCraftingStatus.java +++ b/src/main/java/appeng/client/gui/implementations/GuiCraftingStatus.java @@ -22,14 +22,11 @@ package appeng.client.gui.implementations; -import java.io.IOException; - import net.minecraft.client.gui.widget.button.Button; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.util.text.ITextComponent; import appeng.container.implementations.ContainerCraftingStatus; -import appeng.core.AELog; import appeng.core.localization.GuiText; import appeng.core.sync.network.NetworkHandler; import appeng.core.sync.packets.PacketValueConfig; diff --git a/src/main/java/appeng/client/gui/implementations/GuiCraftingTerm.java b/src/main/java/appeng/client/gui/implementations/GuiCraftingTerm.java index 6d3a85383..cd4189b95 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiCraftingTerm.java +++ b/src/main/java/appeng/client/gui/implementations/GuiCraftingTerm.java @@ -23,9 +23,7 @@ import net.minecraft.inventory.container.Slot; import net.minecraft.util.text.ITextComponent; import appeng.api.config.ActionItems; -import appeng.api.config.Settings; import appeng.client.gui.widgets.GuiActionButton; -import appeng.client.gui.widgets.GuiSettingToggleButton; import appeng.container.implementations.ContainerCraftingTerm; import appeng.container.slot.SlotCraftingMatrix; import appeng.core.localization.GuiText; diff --git a/src/main/java/appeng/client/gui/implementations/GuiInterfaceTerminal.java b/src/main/java/appeng/client/gui/implementations/GuiInterfaceTerminal.java index 1780d8586..4a0e8d3d5 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiInterfaceTerminal.java +++ b/src/main/java/appeng/client/gui/implementations/GuiInterfaceTerminal.java @@ -18,7 +18,14 @@ package appeng.client.gui.implementations; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.WeakHashMap; import com.google.common.collect.HashMultimap; import com.mojang.blaze3d.systems.RenderSystem; diff --git a/src/main/java/appeng/client/gui/implementations/GuiMEMonitorable.java b/src/main/java/appeng/client/gui/implementations/GuiMEMonitorable.java index edb30a112..b08c1ea2a 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiMEMonitorable.java +++ b/src/main/java/appeng/client/gui/implementations/GuiMEMonitorable.java @@ -27,9 +27,13 @@ import net.minecraft.entity.player.PlayerInventory; import net.minecraft.inventory.container.Slot; import net.minecraft.item.ItemStack; import net.minecraft.util.text.ITextComponent; -import net.minecraftforge.fml.client.gui.GuiUtils; -import appeng.api.config.*; +import appeng.api.config.SearchBoxMode; +import appeng.api.config.Settings; +import appeng.api.config.SortDir; +import appeng.api.config.SortOrder; +import appeng.api.config.TerminalStyle; +import appeng.api.config.ViewItems; import appeng.api.implementations.guiobjects.IPortableCell; import appeng.api.implementations.tiles.IMEChest; import appeng.api.implementations.tiles.IViewCellStorage; diff --git a/src/main/java/appeng/client/gui/implementations/GuiMEPortableCell.java b/src/main/java/appeng/client/gui/implementations/GuiMEPortableCell.java index b37c89174..51c342ee5 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiMEPortableCell.java +++ b/src/main/java/appeng/client/gui/implementations/GuiMEPortableCell.java @@ -21,7 +21,6 @@ package appeng.client.gui.implementations; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.util.text.ITextComponent; -import appeng.api.implementations.guiobjects.IPortableCell; import appeng.container.implementations.ContainerMEPortableCell; public class GuiMEPortableCell extends GuiMEMonitorable { diff --git a/src/main/java/appeng/client/gui/implementations/GuiStorageBus.java b/src/main/java/appeng/client/gui/implementations/GuiStorageBus.java index 1af9af749..3b94dbfad 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiStorageBus.java +++ b/src/main/java/appeng/client/gui/implementations/GuiStorageBus.java @@ -21,7 +21,11 @@ package appeng.client.gui.implementations; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.util.text.ITextComponent; -import appeng.api.config.*; +import appeng.api.config.AccessRestriction; +import appeng.api.config.ActionItems; +import appeng.api.config.FuzzyMode; +import appeng.api.config.Settings; +import appeng.api.config.StorageFilter; import appeng.client.gui.widgets.GuiActionButton; import appeng.client.gui.widgets.GuiServerSettingToggleButton; import appeng.client.gui.widgets.GuiSettingToggleButton; diff --git a/src/main/java/appeng/client/gui/implementations/GuiWireless.java b/src/main/java/appeng/client/gui/implementations/GuiWireless.java index 9e65cf512..dd0a0f7aa 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiWireless.java +++ b/src/main/java/appeng/client/gui/implementations/GuiWireless.java @@ -22,12 +22,9 @@ import net.minecraft.entity.player.PlayerInventory; import net.minecraft.util.text.ITextComponent; import net.minecraftforge.fml.client.gui.GuiUtils; -import appeng.api.config.Settings; import appeng.client.gui.AEBaseGui; import appeng.client.gui.widgets.CommonButtons; -import appeng.client.gui.widgets.GuiSettingToggleButton; import appeng.container.implementations.ContainerWireless; -import appeng.core.AEConfig; import appeng.core.localization.GuiText; import appeng.util.Platform; diff --git a/src/main/java/appeng/client/gui/widgets/CommonButtons.java b/src/main/java/appeng/client/gui/widgets/CommonButtons.java index 04279da44..cea78e7b5 100644 --- a/src/main/java/appeng/client/gui/widgets/CommonButtons.java +++ b/src/main/java/appeng/client/gui/widgets/CommonButtons.java @@ -1,8 +1,6 @@ package appeng.client.gui.widgets; -import appeng.api.config.FuzzyMode; import appeng.api.config.PowerUnits; -import appeng.api.config.RedstoneMode; import appeng.api.config.Settings; import appeng.core.AEConfig; diff --git a/src/main/java/appeng/client/gui/widgets/GuiActionButton.java b/src/main/java/appeng/client/gui/widgets/GuiActionButton.java index 434e3bb46..cbe9e1a3f 100644 --- a/src/main/java/appeng/client/gui/widgets/GuiActionButton.java +++ b/src/main/java/appeng/client/gui/widgets/GuiActionButton.java @@ -18,22 +18,10 @@ package appeng.client.gui.widgets; -import java.util.EnumMap; -import java.util.HashMap; -import java.util.Map; import java.util.function.Consumer; import java.util.regex.Pattern; -import com.mojang.blaze3d.systems.RenderSystem; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.widget.button.Button; -import net.minecraft.client.renderer.texture.TextureManager; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.text.ITextComponent; -import net.minecraftforge.fml.client.gui.GuiUtils; - -import appeng.api.config.*; +import appeng.api.config.ActionItems; import appeng.core.localization.ButtonToolTips; public class GuiActionButton extends GuiIconButton implements ITooltip { diff --git a/src/main/java/appeng/client/gui/widgets/GuiIconButton.java b/src/main/java/appeng/client/gui/widgets/GuiIconButton.java index 088f98a94..c92eaa8a4 100644 --- a/src/main/java/appeng/client/gui/widgets/GuiIconButton.java +++ b/src/main/java/appeng/client/gui/widgets/GuiIconButton.java @@ -18,22 +18,14 @@ package appeng.client.gui.widgets; -import java.util.HashMap; -import java.util.Map; -import java.util.regex.Pattern; - import com.mojang.blaze3d.systems.RenderSystem; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.widget.button.Button; import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.util.ResourceLocation; -import net.minecraft.util.text.ITextComponent; import net.minecraftforge.fml.client.gui.GuiUtils; -import appeng.api.config.*; -import appeng.core.localization.ButtonToolTips; - public abstract class GuiIconButton extends Button implements ITooltip { public static final ResourceLocation TEXTURE_STATES = new ResourceLocation("appliedenergistics2", "textures/guis/states.png"); diff --git a/src/main/java/appeng/client/gui/widgets/GuiProgressBar.java b/src/main/java/appeng/client/gui/widgets/GuiProgressBar.java index 9634984e6..f64ad2ad0 100644 --- a/src/main/java/appeng/client/gui/widgets/GuiProgressBar.java +++ b/src/main/java/appeng/client/gui/widgets/GuiProgressBar.java @@ -20,7 +20,6 @@ package appeng.client.gui.widgets; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.widget.Widget; -import net.minecraft.client.gui.widget.button.Button; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.client.gui.GuiUtils; diff --git a/src/main/java/appeng/client/gui/widgets/GuiServerSettingToggleButton.java b/src/main/java/appeng/client/gui/widgets/GuiServerSettingToggleButton.java index e1af945fc..d449f68ab 100644 --- a/src/main/java/appeng/client/gui/widgets/GuiServerSettingToggleButton.java +++ b/src/main/java/appeng/client/gui/widgets/GuiServerSettingToggleButton.java @@ -18,16 +18,7 @@ package appeng.client.gui.widgets; -import java.util.HashMap; -import java.util.Map; -import java.util.regex.Pattern; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.widget.button.Button; -import net.minecraft.util.text.ITextComponent; - -import appeng.api.config.*; -import appeng.core.localization.ButtonToolTips; +import appeng.api.config.Settings; import appeng.core.sync.network.NetworkHandler; import appeng.core.sync.packets.PacketConfigButton; diff --git a/src/main/java/appeng/client/gui/widgets/GuiSettingToggleButton.java b/src/main/java/appeng/client/gui/widgets/GuiSettingToggleButton.java index 52483fbc1..43cc0789d 100644 --- a/src/main/java/appeng/client/gui/widgets/GuiSettingToggleButton.java +++ b/src/main/java/appeng/client/gui/widgets/GuiSettingToggleButton.java @@ -28,7 +28,24 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.gui.widget.button.Button; import net.minecraft.util.text.ITextComponent; -import appeng.api.config.*; +import appeng.api.config.AccessRestriction; +import appeng.api.config.CondenserOutput; +import appeng.api.config.FullnessMode; +import appeng.api.config.FuzzyMode; +import appeng.api.config.LevelType; +import appeng.api.config.OperationMode; +import appeng.api.config.PowerUnits; +import appeng.api.config.RedstoneMode; +import appeng.api.config.RelativeDirection; +import appeng.api.config.SchedulingMode; +import appeng.api.config.SearchBoxMode; +import appeng.api.config.Settings; +import appeng.api.config.SortDir; +import appeng.api.config.SortOrder; +import appeng.api.config.StorageFilter; +import appeng.api.config.TerminalStyle; +import appeng.api.config.ViewItems; +import appeng.api.config.YesNo; import appeng.core.localization.ButtonToolTips; import appeng.util.EnumCycler; diff --git a/src/main/java/appeng/client/gui/widgets/GuiTabButton.java b/src/main/java/appeng/client/gui/widgets/GuiTabButton.java index 34f44da37..43f835aee 100644 --- a/src/main/java/appeng/client/gui/widgets/GuiTabButton.java +++ b/src/main/java/appeng/client/gui/widgets/GuiTabButton.java @@ -21,14 +21,11 @@ package appeng.client.gui.widgets; import com.mojang.blaze3d.systems.RenderSystem; import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.widget.Widget; import net.minecraft.client.gui.widget.button.Button; import net.minecraft.client.renderer.ItemRenderer; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.item.ItemStack; -import net.minecraft.server.MinecraftServer; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.fml.client.gui.GuiUtils; public class GuiTabButton extends Button implements ITooltip { public static final ResourceLocation TEXTURE_STATES = new ResourceLocation("appliedenergistics2", diff --git a/src/main/java/appeng/client/me/SlotDisconnected.java b/src/main/java/appeng/client/me/SlotDisconnected.java index 25d3896ba..8c06ee81c 100644 --- a/src/main/java/appeng/client/me/SlotDisconnected.java +++ b/src/main/java/appeng/client/me/SlotDisconnected.java @@ -19,7 +19,6 @@ package appeng.client.me; import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import appeng.container.slot.AppEngSlot; diff --git a/src/main/java/appeng/client/me/SlotFluidME.java b/src/main/java/appeng/client/me/SlotFluidME.java index d771d8700..ea271cc87 100644 --- a/src/main/java/appeng/client/me/SlotFluidME.java +++ b/src/main/java/appeng/client/me/SlotFluidME.java @@ -21,7 +21,6 @@ package appeng.client.me; import javax.annotation.Nonnull; import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraftforge.items.SlotItemHandler; diff --git a/src/main/java/appeng/client/me/SlotME.java b/src/main/java/appeng/client/me/SlotME.java index b8beaa302..43c54c5e6 100644 --- a/src/main/java/appeng/client/me/SlotME.java +++ b/src/main/java/appeng/client/me/SlotME.java @@ -19,7 +19,6 @@ package appeng.client.me; import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraftforge.items.SlotItemHandler; diff --git a/src/main/java/appeng/client/render/ColorableTileBlockColor.java b/src/main/java/appeng/client/render/ColorableTileBlockColor.java index 04a386cc3..0a629ed33 100644 --- a/src/main/java/appeng/client/render/ColorableTileBlockColor.java +++ b/src/main/java/appeng/client/render/ColorableTileBlockColor.java @@ -24,7 +24,6 @@ import net.minecraft.block.BlockState; import net.minecraft.client.renderer.color.IBlockColor; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; -import net.minecraft.world.IBlockReader; import net.minecraft.world.ILightReader; import appeng.api.implementations.tiles.IColorableTile; diff --git a/src/main/java/appeng/client/render/DelegateBakedModel.java b/src/main/java/appeng/client/render/DelegateBakedModel.java index 3648d8b88..75deace5e 100644 --- a/src/main/java/appeng/client/render/DelegateBakedModel.java +++ b/src/main/java/appeng/client/render/DelegateBakedModel.java @@ -25,8 +25,6 @@ import javax.annotation.Nullable; import com.mojang.blaze3d.matrix.MatrixStack; -import org.apache.commons.lang3.tuple.Pair; - import net.minecraft.block.BlockState; import net.minecraft.client.renderer.model.BakedQuad; import net.minecraft.client.renderer.model.IBakedModel; diff --git a/src/main/java/appeng/client/render/DummyFluidItemModel.java b/src/main/java/appeng/client/render/DummyFluidItemModel.java index 3de3294c5..80770b11d 100644 --- a/src/main/java/appeng/client/render/DummyFluidItemModel.java +++ b/src/main/java/appeng/client/render/DummyFluidItemModel.java @@ -25,7 +25,12 @@ import java.util.function.Function; import com.mojang.datafixers.util.Pair; -import net.minecraft.client.renderer.model.*; +import net.minecraft.client.renderer.model.IBakedModel; +import net.minecraft.client.renderer.model.IModelTransform; +import net.minecraft.client.renderer.model.IUnbakedModel; +import net.minecraft.client.renderer.model.ItemOverrideList; +import net.minecraft.client.renderer.model.Material; +import net.minecraft.client.renderer.model.ModelBakery; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.model.IModelConfiguration; diff --git a/src/main/java/appeng/client/render/FacingToRotation.java b/src/main/java/appeng/client/render/FacingToRotation.java index 889f9d1d8..323d327ce 100644 --- a/src/main/java/appeng/client/render/FacingToRotation.java +++ b/src/main/java/appeng/client/render/FacingToRotation.java @@ -20,7 +20,10 @@ package appeng.client.render; import com.mojang.blaze3d.matrix.MatrixStack; -import net.minecraft.client.renderer.*; +import net.minecraft.client.renderer.Matrix4f; +import net.minecraft.client.renderer.Quaternion; +import net.minecraft.client.renderer.Vector3f; +import net.minecraft.client.renderer.Vector4f; import net.minecraft.util.Direction; import net.minecraft.util.IStringSerializable; import net.minecraft.util.math.Vec3i; diff --git a/src/main/java/appeng/client/render/StackSizeRenderer.java b/src/main/java/appeng/client/render/StackSizeRenderer.java index 55eddb7b8..442238354 100644 --- a/src/main/java/appeng/client/render/StackSizeRenderer.java +++ b/src/main/java/appeng/client/render/StackSizeRenderer.java @@ -20,9 +20,11 @@ package appeng.client.render; import com.mojang.blaze3d.systems.RenderSystem; -import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; -import net.minecraft.client.renderer.*; +import net.minecraft.client.renderer.IRenderTypeBuffer; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.TransformationMatrix; +import net.minecraft.client.renderer.Vector3f; import appeng.api.storage.data.IAEItemStack; import appeng.core.AEConfig; diff --git a/src/main/java/appeng/client/render/StaticBlockColor.java b/src/main/java/appeng/client/render/StaticBlockColor.java index 8fd85ca9f..53ff4d178 100644 --- a/src/main/java/appeng/client/render/StaticBlockColor.java +++ b/src/main/java/appeng/client/render/StaticBlockColor.java @@ -23,7 +23,6 @@ import javax.annotation.Nullable; import net.minecraft.block.BlockState; import net.minecraft.client.renderer.color.IBlockColor; import net.minecraft.util.math.BlockPos; -import net.minecraft.world.IBlockReader; import net.minecraft.world.ILightReader; import appeng.api.util.AEColor; diff --git a/src/main/java/appeng/client/render/TesrRenderHelper.java b/src/main/java/appeng/client/render/TesrRenderHelper.java index 3de94f16f..1904b94cf 100644 --- a/src/main/java/appeng/client/render/TesrRenderHelper.java +++ b/src/main/java/appeng/client/render/TesrRenderHelper.java @@ -48,7 +48,7 @@ public class TesrRenderHelper { switch (face) { case UP: mStack.rotate(Vector3f.XP.rotationDegrees(270)); - mStack.rotate(Vector3f.ZP.rotationDegrees(- spin * 90.0F)); + mStack.rotate(Vector3f.ZP.rotationDegrees(-spin * 90.0F)); break; case DOWN: @@ -102,7 +102,7 @@ public class TesrRenderHelper { /** * Render an item in 2D and the given text below it. - * + * * @param matrixStack * @param buffers * @param spacing Specifies how far apart the item and the item stack diff --git a/src/main/java/appeng/client/render/cablebus/CableBusBreakingParticle.java b/src/main/java/appeng/client/render/cablebus/CableBusBreakingParticle.java index 389155470..bd239903f 100644 --- a/src/main/java/appeng/client/render/cablebus/CableBusBreakingParticle.java +++ b/src/main/java/appeng/client/render/cablebus/CableBusBreakingParticle.java @@ -29,22 +29,27 @@ public class CableBusBreakingParticle extends SpriteTexturedParticle { this(world, x, y, z, 0, 0, 0, sprite); } + @Override public IParticleRenderType getRenderType() { return IParticleRenderType.TERRAIN_SHEET; } + @Override protected float getMinU() { return this.sprite.getInterpolatedU((this.field_217571_C + 1.0F) / 4.0F * 16.0F); } + @Override protected float getMaxU() { return this.sprite.getInterpolatedU(this.field_217571_C / 4.0F * 16.0F); } + @Override protected float getMinV() { return this.sprite.getInterpolatedV(this.field_217572_F / 4.0F * 16.0F); } + @Override protected float getMaxV() { return this.sprite.getInterpolatedV((this.field_217572_F + 1.0F) / 4.0F * 16.0F); } diff --git a/src/main/java/appeng/client/render/cablebus/CableBusModel.java b/src/main/java/appeng/client/render/cablebus/CableBusModel.java index 1a7e341bc..5c14b2f82 100644 --- a/src/main/java/appeng/client/render/cablebus/CableBusModel.java +++ b/src/main/java/appeng/client/render/cablebus/CableBusModel.java @@ -27,7 +27,12 @@ import java.util.function.Function; import com.google.common.collect.ImmutableMap; import com.mojang.datafixers.util.Pair; -import net.minecraft.client.renderer.model.*; +import net.minecraft.client.renderer.model.IBakedModel; +import net.minecraft.client.renderer.model.IModelTransform; +import net.minecraft.client.renderer.model.IUnbakedModel; +import net.minecraft.client.renderer.model.ItemOverrideList; +import net.minecraft.client.renderer.model.Material; +import net.minecraft.client.renderer.model.ModelBakery; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.model.IModelConfiguration; diff --git a/src/main/java/appeng/client/render/cablebus/FacadeBuilder.java b/src/main/java/appeng/client/render/cablebus/FacadeBuilder.java index 6b7871397..f9b52de7f 100644 --- a/src/main/java/appeng/client/render/cablebus/FacadeBuilder.java +++ b/src/main/java/appeng/client/render/cablebus/FacadeBuilder.java @@ -44,7 +44,6 @@ import net.minecraft.util.Direction.Axis; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; -import net.minecraft.world.IBlockReader; import net.minecraft.world.ILightReader; import net.minecraftforge.client.ForgeHooksClient; import net.minecraftforge.client.model.data.EmptyModelData; diff --git a/src/main/java/appeng/client/render/cablebus/P2PTunnelFrequencyModel.java b/src/main/java/appeng/client/render/cablebus/P2PTunnelFrequencyModel.java index 1329ae697..d89254a7f 100644 --- a/src/main/java/appeng/client/render/cablebus/P2PTunnelFrequencyModel.java +++ b/src/main/java/appeng/client/render/cablebus/P2PTunnelFrequencyModel.java @@ -5,11 +5,14 @@ import java.util.Collections; import java.util.Set; import java.util.function.Function; -import javax.annotation.Nullable; - import com.mojang.datafixers.util.Pair; -import net.minecraft.client.renderer.model.*; +import net.minecraft.client.renderer.model.IBakedModel; +import net.minecraft.client.renderer.model.IModelTransform; +import net.minecraft.client.renderer.model.IUnbakedModel; +import net.minecraft.client.renderer.model.ItemOverrideList; +import net.minecraft.client.renderer.model.Material; +import net.minecraft.client.renderer.model.ModelBakery; import net.minecraft.client.renderer.texture.AtlasTexture; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/appeng/client/render/cablebus/P2PTunnelFrequencyModelData.java b/src/main/java/appeng/client/render/cablebus/P2PTunnelFrequencyModelData.java index 2bc7d0ece..e8eaf95cc 100644 --- a/src/main/java/appeng/client/render/cablebus/P2PTunnelFrequencyModelData.java +++ b/src/main/java/appeng/client/render/cablebus/P2PTunnelFrequencyModelData.java @@ -1,8 +1,5 @@ package appeng.client.render.cablebus; -import javax.annotation.Nullable; - -import net.minecraftforge.client.model.data.IModelData; import net.minecraftforge.client.model.data.ModelProperty; import appeng.client.render.model.AEInternalModelData; diff --git a/src/main/java/appeng/client/render/crafting/CraftingCubeBakedModel.java b/src/main/java/appeng/client/render/crafting/CraftingCubeBakedModel.java index 0e5697cc3..227a8d263 100644 --- a/src/main/java/appeng/client/render/crafting/CraftingCubeBakedModel.java +++ b/src/main/java/appeng/client/render/crafting/CraftingCubeBakedModel.java @@ -18,7 +18,11 @@ package appeng.client.render.crafting; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.EnumSet; +import java.util.List; +import java.util.Random; import javax.annotation.Nonnull; import javax.annotation.Nullable; @@ -33,7 +37,6 @@ import net.minecraftforge.client.model.data.IModelData; import appeng.client.render.cablebus.CubeBuilder; import appeng.tile.crafting.CraftingCubeModelData; -import appeng.tile.crafting.TileCraftingTile; import appeng.util.Platform; /** diff --git a/src/main/java/appeng/client/render/crafting/CraftingCubeModel.java b/src/main/java/appeng/client/render/crafting/CraftingCubeModel.java index 6593da4d9..728af1061 100644 --- a/src/main/java/appeng/client/render/crafting/CraftingCubeModel.java +++ b/src/main/java/appeng/client/render/crafting/CraftingCubeModel.java @@ -25,7 +25,12 @@ import java.util.function.Function; import com.google.common.collect.ImmutableList; import com.mojang.datafixers.util.Pair; -import net.minecraft.client.renderer.model.*; +import net.minecraft.client.renderer.model.IBakedModel; +import net.minecraft.client.renderer.model.IModelTransform; +import net.minecraft.client.renderer.model.IUnbakedModel; +import net.minecraft.client.renderer.model.ItemOverrideList; +import net.minecraft.client.renderer.model.Material; +import net.minecraft.client.renderer.model.ModelBakery; import net.minecraft.client.renderer.texture.AtlasTexture; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/appeng/client/render/crafting/CraftingMonitorTESR.java b/src/main/java/appeng/client/render/crafting/CraftingMonitorTESR.java index 799874ab2..9c7799006 100644 --- a/src/main/java/appeng/client/render/crafting/CraftingMonitorTESR.java +++ b/src/main/java/appeng/client/render/crafting/CraftingMonitorTESR.java @@ -23,18 +23,12 @@ import com.mojang.blaze3d.matrix.MatrixStack; import net.minecraft.client.renderer.IRenderTypeBuffer; import net.minecraft.client.renderer.tileentity.TileEntityRenderer; import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; -import net.minecraft.item.ItemStack; import net.minecraft.util.Direction; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.registry.Registry; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -import net.minecraftforge.registries.ForgeRegistries; -import appeng.api.storage.channels.IItemStorageChannel; import appeng.api.storage.data.IAEItemStack; import appeng.client.render.TesrRenderHelper; -import appeng.core.Api; import appeng.tile.crafting.TileCraftingMonitorTile; /** diff --git a/src/main/java/appeng/client/render/crafting/EncodedPatternBakedModel.java b/src/main/java/appeng/client/render/crafting/EncodedPatternBakedModel.java index 87caebfce..ad0c6ea8d 100644 --- a/src/main/java/appeng/client/render/crafting/EncodedPatternBakedModel.java +++ b/src/main/java/appeng/client/render/crafting/EncodedPatternBakedModel.java @@ -1,30 +1,20 @@ package appeng.client.render.crafting; -import java.util.List; -import java.util.Random; - -import javax.annotation.Nonnull; import javax.annotation.Nullable; import com.google.common.collect.ImmutableMap; import com.mojang.blaze3d.matrix.MatrixStack; -import net.minecraft.block.BlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.renderer.TransformationMatrix; -import net.minecraft.client.renderer.model.BakedQuad; import net.minecraft.client.renderer.model.IBakedModel; import net.minecraft.client.renderer.model.ItemCameraTransforms; import net.minecraft.client.renderer.model.ItemOverrideList; -import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.entity.LivingEntity; import net.minecraft.item.ItemStack; -import net.minecraft.util.Direction; import net.minecraft.world.World; import net.minecraftforge.client.model.PerspectiveMapWrapper; -import net.minecraftforge.client.model.data.IDynamicBakedModel; -import net.minecraftforge.client.model.data.IModelData; import appeng.client.render.DelegateBakedModel; import appeng.items.misc.ItemEncodedPattern; diff --git a/src/main/java/appeng/client/render/crafting/EncodedPatternModel.java b/src/main/java/appeng/client/render/crafting/EncodedPatternModel.java index 5f046b061..336b33f4d 100644 --- a/src/main/java/appeng/client/render/crafting/EncodedPatternModel.java +++ b/src/main/java/appeng/client/render/crafting/EncodedPatternModel.java @@ -6,7 +6,12 @@ import java.util.function.Function; import com.mojang.datafixers.util.Pair; -import net.minecraft.client.renderer.model.*; +import net.minecraft.client.renderer.model.IBakedModel; +import net.minecraft.client.renderer.model.IModelTransform; +import net.minecraft.client.renderer.model.IUnbakedModel; +import net.minecraft.client.renderer.model.ItemOverrideList; +import net.minecraft.client.renderer.model.Material; +import net.minecraft.client.renderer.model.ModelBakery; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.model.IModelConfiguration; diff --git a/src/main/java/appeng/client/render/crafting/LightBakedModel.java b/src/main/java/appeng/client/render/crafting/LightBakedModel.java index eca8b8811..b279b98d3 100644 --- a/src/main/java/appeng/client/render/crafting/LightBakedModel.java +++ b/src/main/java/appeng/client/render/crafting/LightBakedModel.java @@ -20,7 +20,6 @@ package appeng.client.render.crafting; import net.minecraft.block.BlockState; import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.client.renderer.vertex.VertexFormat; import net.minecraft.util.Direction; import net.minecraftforge.client.model.data.IModelData; diff --git a/src/main/java/appeng/client/render/effects/ChargedOreFX.java b/src/main/java/appeng/client/render/effects/ChargedOreFX.java index 012399797..53dc758a5 100644 --- a/src/main/java/appeng/client/render/effects/ChargedOreFX.java +++ b/src/main/java/appeng/client/render/effects/ChargedOreFX.java @@ -64,6 +64,7 @@ public class ChargedOreFX extends RedstoneParticle { this.spriteSet = p_i50477_1_; } + @Override public Particle makeParticle(BasicParticleType typeIn, World worldIn, double x, double y, double z, double xSpeed, double ySpeed, double zSpeed) { return new ChargedOreFX(worldIn, x, y, z, xSpeed, ySpeed, zSpeed, this.spriteSet); diff --git a/src/main/java/appeng/client/render/effects/CraftingFx.java b/src/main/java/appeng/client/render/effects/CraftingFx.java index b470e0029..e987a4b9d 100644 --- a/src/main/java/appeng/client/render/effects/CraftingFx.java +++ b/src/main/java/appeng/client/render/effects/CraftingFx.java @@ -20,7 +20,11 @@ package appeng.client.render.effects; import com.mojang.blaze3d.vertex.IVertexBuilder; -import net.minecraft.client.particle.*; +import net.minecraft.client.particle.IAnimatedSprite; +import net.minecraft.client.particle.IParticleFactory; +import net.minecraft.client.particle.IParticleRenderType; +import net.minecraft.client.particle.Particle; +import net.minecraft.client.particle.SpriteTexturedParticle; import net.minecraft.client.renderer.ActiveRenderInfo; import net.minecraft.client.renderer.Vector3f; import net.minecraft.particles.BasicParticleType; @@ -71,7 +75,7 @@ public class CraftingFx extends SpriteTexturedParticle { @Override public void renderParticle(IVertexBuilder buffer, ActiveRenderInfo renderInfo, float partialTicks) { - float f = (this.age + partialTicks) / (float) this.maxAge; + float f = (this.age + partialTicks) / this.maxAge; float offX = (float) posX + MathHelper.lerp(f, offsetX, 0); float offY = (float) posY + MathHelper.lerp(f, offsetY, 0); @@ -137,6 +141,7 @@ public class CraftingFx extends SpriteTexturedParticle { this.spriteSet = p_i50477_1_; } + @Override public Particle makeParticle(BasicParticleType data, World worldIn, double x, double y, double z, double xSpeed, double ySpeed, double zSpeed) { return new CraftingFx(worldIn, x, y, z, spriteSet); diff --git a/src/main/java/appeng/client/render/effects/EnergyFx.java b/src/main/java/appeng/client/render/effects/EnergyFx.java index 3f25cd374..b3dcd2ee3 100644 --- a/src/main/java/appeng/client/render/effects/EnergyFx.java +++ b/src/main/java/appeng/client/render/effects/EnergyFx.java @@ -18,11 +18,10 @@ package appeng.client.render.effects; -import net.minecraft.client.particle.*; -import net.minecraft.client.renderer.BufferBuilder; -import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.entity.Entity; -import net.minecraft.item.Item; +import net.minecraft.client.particle.BreakingParticle; +import net.minecraft.client.particle.IAnimatedSprite; +import net.minecraft.client.particle.IParticleFactory; +import net.minecraft.client.particle.Particle; import net.minecraft.item.ItemStack; import net.minecraft.item.Items; import net.minecraft.particles.BasicParticleType; @@ -172,6 +171,7 @@ public class EnergyFx extends BreakingParticle { this.spriteSet = spriteSet; } + @Override public Particle makeParticle(BasicParticleType typeIn, World worldIn, double x, double y, double z, double xSpeed, double ySpeed, double zSpeed) { EnergyFx result = new EnergyFx(worldIn, x, y, z, spriteSet); diff --git a/src/main/java/appeng/client/render/effects/LightningArcFX.java b/src/main/java/appeng/client/render/effects/LightningArcFX.java index 43d580d99..f31283276 100644 --- a/src/main/java/appeng/client/render/effects/LightningArcFX.java +++ b/src/main/java/appeng/client/render/effects/LightningArcFX.java @@ -20,8 +20,10 @@ package appeng.client.render.effects; import java.util.Random; -import net.minecraft.client.particle.*; -import net.minecraft.particles.BasicParticleType; +import net.minecraft.client.particle.IAnimatedSprite; +import net.minecraft.client.particle.IParticleFactory; +import net.minecraft.client.particle.Particle; +import net.minecraft.client.particle.SpriteTexturedParticle; import net.minecraft.particles.ParticleType; import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; @@ -80,6 +82,7 @@ public class LightningArcFX extends LightningFX { this.spriteSet = spriteSet; } + @Override public Particle makeParticle(LightningArcParticleData data, World worldIn, double x, double y, double z, double xSpeed, double ySpeed, double zSpeed) { SpriteTexturedParticle lightningFX = new LightningArcFX(worldIn, x, y, z, data.target.x, data.target.y, diff --git a/src/main/java/appeng/client/render/effects/LightningFX.java b/src/main/java/appeng/client/render/effects/LightningFX.java index 4d5723ca0..67cacea32 100644 --- a/src/main/java/appeng/client/render/effects/LightningFX.java +++ b/src/main/java/appeng/client/render/effects/LightningFX.java @@ -23,12 +23,12 @@ import java.util.Random; import com.mojang.blaze3d.vertex.IVertexBuilder; import net.minecraft.client.Minecraft; -import net.minecraft.client.particle.*; +import net.minecraft.client.particle.IAnimatedSprite; +import net.minecraft.client.particle.IParticleFactory; +import net.minecraft.client.particle.IParticleRenderType; +import net.minecraft.client.particle.Particle; +import net.minecraft.client.particle.SpriteTexturedParticle; import net.minecraft.client.renderer.ActiveRenderInfo; -import net.minecraft.client.renderer.BufferBuilder; -import net.minecraft.client.renderer.Quaternion; -import net.minecraft.client.renderer.Vector3f; -import net.minecraft.entity.Entity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.particles.BasicParticleType; import net.minecraft.util.math.MathHelper; @@ -259,6 +259,7 @@ public class LightningFX extends SpriteTexturedParticle { this.spriteSet = spriteSet; } + @Override public Particle makeParticle(BasicParticleType typeIn, World worldIn, double x, double y, double z, double xSpeed, double ySpeed, double zSpeed) { LightningFX lightningFX = new LightningFX(worldIn, x, y, z, xSpeed, ySpeed, zSpeed); diff --git a/src/main/java/appeng/client/render/effects/MatterCannonFX.java b/src/main/java/appeng/client/render/effects/MatterCannonFX.java index 694fdfeb3..36d0f6054 100644 --- a/src/main/java/appeng/client/render/effects/MatterCannonFX.java +++ b/src/main/java/appeng/client/render/effects/MatterCannonFX.java @@ -18,15 +18,10 @@ package appeng.client.render.effects; -import com.mojang.blaze3d.vertex.IVertexBuilder; - import net.minecraft.client.particle.BreakingParticle; import net.minecraft.client.particle.IAnimatedSprite; import net.minecraft.client.particle.IParticleFactory; import net.minecraft.client.particle.Particle; -import net.minecraft.client.renderer.ActiveRenderInfo; -import net.minecraft.client.renderer.BufferBuilder; -import net.minecraft.entity.Entity; import net.minecraft.item.ItemStack; import net.minecraft.item.Items; import net.minecraft.particles.BasicParticleType; @@ -92,6 +87,7 @@ public class MatterCannonFX extends BreakingParticle { this.spriteSet = spriteSet; } + @Override public Particle makeParticle(BasicParticleType data, World world, double x, double y, double z, double xSpeed, double ySpeed, double zSpeed) { return new MatterCannonFX(world, x, y, z, spriteSet); diff --git a/src/main/java/appeng/client/render/effects/VibrantFX.java b/src/main/java/appeng/client/render/effects/VibrantFX.java index 34a745bee..bfdef56a4 100644 --- a/src/main/java/appeng/client/render/effects/VibrantFX.java +++ b/src/main/java/appeng/client/render/effects/VibrantFX.java @@ -18,7 +18,11 @@ package appeng.client.render.effects; -import net.minecraft.client.particle.*; +import net.minecraft.client.particle.IAnimatedSprite; +import net.minecraft.client.particle.IParticleFactory; +import net.minecraft.client.particle.IParticleRenderType; +import net.minecraft.client.particle.Particle; +import net.minecraft.client.particle.SpriteTexturedParticle; import net.minecraft.particles.BasicParticleType; import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; @@ -91,6 +95,7 @@ public class VibrantFX extends SpriteTexturedParticle { this.spriteSet = spriteSet; } + @Override public Particle makeParticle(BasicParticleType typeIn, World worldIn, double x, double y, double z, double xSpeed, double ySpeed, double zSpeed) { return new VibrantFX(worldIn, x, y, z, xSpeed, ySpeed, zSpeed, spriteSet); diff --git a/src/main/java/appeng/client/render/model/AEModelData.java b/src/main/java/appeng/client/render/model/AEModelData.java index 39fb29a58..8d42bb3ae 100644 --- a/src/main/java/appeng/client/render/model/AEModelData.java +++ b/src/main/java/appeng/client/render/model/AEModelData.java @@ -39,10 +39,12 @@ public class AEModelData implements IModelData { @Override public boolean equals(Object o) { - if (this == o) + if (this == o) { return true; - if (o == null || getClass() != o.getClass()) + } + if (o == null || getClass() != o.getClass()) { return false; + } AEModelData that = (AEModelData) o; return up == that.up && forward == that.forward; } diff --git a/src/main/java/appeng/client/render/model/BiometricCardModel.java b/src/main/java/appeng/client/render/model/BiometricCardModel.java index 9f173bf05..b3738cc4d 100644 --- a/src/main/java/appeng/client/render/model/BiometricCardModel.java +++ b/src/main/java/appeng/client/render/model/BiometricCardModel.java @@ -9,7 +9,12 @@ import javax.annotation.Nullable; import com.mojang.datafixers.util.Pair; -import net.minecraft.client.renderer.model.*; +import net.minecraft.client.renderer.model.IBakedModel; +import net.minecraft.client.renderer.model.IModelTransform; +import net.minecraft.client.renderer.model.IUnbakedModel; +import net.minecraft.client.renderer.model.ItemOverrideList; +import net.minecraft.client.renderer.model.Material; +import net.minecraft.client.renderer.model.ModelBakery; import net.minecraft.client.renderer.texture.AtlasTexture; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/appeng/client/render/model/ColorApplicatorModel.java b/src/main/java/appeng/client/render/model/ColorApplicatorModel.java index 1472641f3..03e6a1dbd 100644 --- a/src/main/java/appeng/client/render/model/ColorApplicatorModel.java +++ b/src/main/java/appeng/client/render/model/ColorApplicatorModel.java @@ -2,20 +2,21 @@ package appeng.client.render.model; import java.util.Arrays; import java.util.Collection; -import java.util.Collections; import java.util.Set; import java.util.function.Function; -import javax.annotation.Nullable; - import com.mojang.datafixers.util.Pair; -import net.minecraft.client.renderer.model.*; +import net.minecraft.client.renderer.model.IBakedModel; +import net.minecraft.client.renderer.model.IModelTransform; +import net.minecraft.client.renderer.model.IUnbakedModel; +import net.minecraft.client.renderer.model.ItemOverrideList; +import net.minecraft.client.renderer.model.Material; +import net.minecraft.client.renderer.model.ModelBakery; import net.minecraft.client.renderer.texture.AtlasTexture; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.model.IModelConfiguration; -import net.minecraftforge.client.model.ModelLoaderRegistry; import net.minecraftforge.client.model.geometry.IModelGeometry; import appeng.core.AppEng; diff --git a/src/main/java/appeng/client/render/model/DriveBakedModel.java b/src/main/java/appeng/client/render/model/DriveBakedModel.java index 24e0b466d..89d032650 100644 --- a/src/main/java/appeng/client/render/model/DriveBakedModel.java +++ b/src/main/java/appeng/client/render/model/DriveBakedModel.java @@ -31,7 +31,6 @@ import net.minecraft.client.renderer.Matrix4f; import net.minecraft.client.renderer.model.BakedQuad; import net.minecraft.client.renderer.model.IBakedModel; import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; import net.minecraft.util.Direction; import net.minecraftforge.client.model.data.IModelData; import net.minecraftforge.client.model.pipeline.BakedQuadBuilder; diff --git a/src/main/java/appeng/client/render/model/DriveModel.java b/src/main/java/appeng/client/render/model/DriveModel.java index 1ba54aa6c..e5cf9100f 100644 --- a/src/main/java/appeng/client/render/model/DriveModel.java +++ b/src/main/java/appeng/client/render/model/DriveModel.java @@ -18,22 +18,29 @@ package appeng.client.render.model; -import java.util.*; +import java.util.Collection; +import java.util.Collections; +import java.util.EnumMap; +import java.util.Map; +import java.util.Set; import java.util.function.Function; -import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.mojang.datafixers.util.Pair; -import net.minecraft.client.renderer.model.*; +import net.minecraft.client.renderer.model.IBakedModel; +import net.minecraft.client.renderer.model.IModelTransform; +import net.minecraft.client.renderer.model.IUnbakedModel; +import net.minecraft.client.renderer.model.ItemOverrideList; +import net.minecraft.client.renderer.model.Material; +import net.minecraft.client.renderer.model.ModelBakery; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.model.IModelConfiguration; import net.minecraftforge.client.model.geometry.IModelGeometry; import appeng.block.storage.DriveSlotCellType; -import appeng.block.storage.DriveSlotState; public class DriveModel implements IModelGeometry { diff --git a/src/main/java/appeng/client/render/model/DriveModelData.java b/src/main/java/appeng/client/render/model/DriveModelData.java index 9f9882093..730b41a51 100644 --- a/src/main/java/appeng/client/render/model/DriveModelData.java +++ b/src/main/java/appeng/client/render/model/DriveModelData.java @@ -2,13 +2,7 @@ package appeng.client.render.model; import java.util.Objects; -import javax.annotation.Nullable; - -import com.google.common.base.Preconditions; - import net.minecraft.util.Direction; -import net.minecraftforge.client.model.data.IModelData; -import net.minecraftforge.client.model.data.ModelProperty; import appeng.block.storage.DriveSlotsState; @@ -32,12 +26,15 @@ public class DriveModelData extends AEModelData { @Override public boolean equals(Object o) { - if (this == o) + if (this == o) { return true; - if (o == null || getClass() != o.getClass()) + } + if (o == null || getClass() != o.getClass()) { return false; - if (!super.equals(o)) + } + if (!super.equals(o)) { return false; + } DriveModelData that = (DriveModelData) o; return slotsState.equals(that.slotsState); } diff --git a/src/main/java/appeng/client/render/model/GlassBakedModel.java b/src/main/java/appeng/client/render/model/GlassBakedModel.java index 02374c4c9..0c4161405 100644 --- a/src/main/java/appeng/client/render/model/GlassBakedModel.java +++ b/src/main/java/appeng/client/render/model/GlassBakedModel.java @@ -18,7 +18,11 @@ package appeng.client.render.model; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.EnumSet; +import java.util.List; +import java.util.Random; import java.util.function.Function; import java.util.stream.IntStream; diff --git a/src/main/java/appeng/client/render/model/GlassModel.java b/src/main/java/appeng/client/render/model/GlassModel.java index 91befb96c..0773803aa 100644 --- a/src/main/java/appeng/client/render/model/GlassModel.java +++ b/src/main/java/appeng/client/render/model/GlassModel.java @@ -18,18 +18,19 @@ package appeng.client.render.model; -import java.util.Arrays; import java.util.Collection; -import java.util.Collections; import java.util.Set; import java.util.function.Function; -import javax.annotation.Nullable; - import com.google.common.collect.ImmutableSet; import com.mojang.datafixers.util.Pair; -import net.minecraft.client.renderer.model.*; +import net.minecraft.client.renderer.model.IBakedModel; +import net.minecraft.client.renderer.model.IModelTransform; +import net.minecraft.client.renderer.model.IUnbakedModel; +import net.minecraft.client.renderer.model.ItemOverrideList; +import net.minecraft.client.renderer.model.Material; +import net.minecraft.client.renderer.model.ModelBakery; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.model.IModelConfiguration; diff --git a/src/main/java/appeng/client/render/model/MemoryCardBakedModel.java b/src/main/java/appeng/client/render/model/MemoryCardBakedModel.java index 5bb634586..da8dab492 100644 --- a/src/main/java/appeng/client/render/model/MemoryCardBakedModel.java +++ b/src/main/java/appeng/client/render/model/MemoryCardBakedModel.java @@ -2,7 +2,6 @@ package appeng.client.render.model; import java.util.ArrayList; import java.util.Arrays; -import java.util.Collections; import java.util.List; import java.util.Random; import java.util.concurrent.ExecutionException; @@ -14,15 +13,12 @@ import com.google.common.cache.CacheBuilder; import com.google.common.collect.ImmutableList; import com.mojang.blaze3d.matrix.MatrixStack; -import org.apache.commons.lang3.tuple.Pair; - import net.minecraft.block.BlockState; import net.minecraft.client.renderer.model.BakedQuad; import net.minecraft.client.renderer.model.IBakedModel; import net.minecraft.client.renderer.model.ItemCameraTransforms; import net.minecraft.client.renderer.model.ItemOverrideList; import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.client.renderer.vertex.VertexFormat; import net.minecraft.entity.LivingEntity; import net.minecraft.item.ItemStack; import net.minecraft.util.Direction; diff --git a/src/main/java/appeng/client/render/model/MemoryCardModel.java b/src/main/java/appeng/client/render/model/MemoryCardModel.java index 1fe9a06ba..e6e82260e 100644 --- a/src/main/java/appeng/client/render/model/MemoryCardModel.java +++ b/src/main/java/appeng/client/render/model/MemoryCardModel.java @@ -9,7 +9,12 @@ import javax.annotation.Nullable; import com.mojang.datafixers.util.Pair; -import net.minecraft.client.renderer.model.*; +import net.minecraft.client.renderer.model.IBakedModel; +import net.minecraft.client.renderer.model.IModelTransform; +import net.minecraft.client.renderer.model.IUnbakedModel; +import net.minecraft.client.renderer.model.ItemOverrideList; +import net.minecraft.client.renderer.model.Material; +import net.minecraft.client.renderer.model.ModelBakery; import net.minecraft.client.renderer.texture.AtlasTexture; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/appeng/client/render/model/SkyCompassBakedModel.java b/src/main/java/appeng/client/render/model/SkyCompassBakedModel.java index e879be048..7b7cf97cb 100644 --- a/src/main/java/appeng/client/render/model/SkyCompassBakedModel.java +++ b/src/main/java/appeng/client/render/model/SkyCompassBakedModel.java @@ -19,7 +19,6 @@ package appeng.client.render.model; import java.util.ArrayList; -import java.util.Collections; import java.util.List; import java.util.Random; diff --git a/src/main/java/appeng/client/render/model/SkyCompassModel.java b/src/main/java/appeng/client/render/model/SkyCompassModel.java index 13b1a8e4f..2e7ef4592 100644 --- a/src/main/java/appeng/client/render/model/SkyCompassModel.java +++ b/src/main/java/appeng/client/render/model/SkyCompassModel.java @@ -27,7 +27,12 @@ import java.util.function.Function; import com.google.common.collect.ImmutableList; import com.mojang.datafixers.util.Pair; -import net.minecraft.client.renderer.model.*; +import net.minecraft.client.renderer.model.IBakedModel; +import net.minecraft.client.renderer.model.IModelTransform; +import net.minecraft.client.renderer.model.IUnbakedModel; +import net.minecraft.client.renderer.model.ItemOverrideList; +import net.minecraft.client.renderer.model.Material; +import net.minecraft.client.renderer.model.ModelBakery; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.model.IModelConfiguration; diff --git a/src/main/java/appeng/client/render/model/UVLModelLoader.java b/src/main/java/appeng/client/render/model/UVLModelLoader.java index ed9cd63e7..de16a9194 100644 --- a/src/main/java/appeng/client/render/model/UVLModelLoader.java +++ b/src/main/java/appeng/client/render/model/UVLModelLoader.java @@ -20,26 +20,39 @@ package appeng.client.render.model; import java.lang.reflect.Type; import java.util.Collection; -import java.util.HashMap; -import java.util.Map; import java.util.Set; import java.util.function.Function; import javax.annotation.Nullable; -import com.google.gson.*; +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; +import com.google.gson.JsonDeserializationContext; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.google.gson.JsonParseException; import com.mojang.blaze3d.matrix.MatrixStack; import org.apache.commons.lang3.tuple.ImmutablePair; import org.apache.commons.lang3.tuple.Pair; import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.Matrix4f; import net.minecraft.client.renderer.TransformationMatrix; -import net.minecraft.client.renderer.model.*; +import net.minecraft.client.renderer.model.BakedQuad; +import net.minecraft.client.renderer.model.BlockFaceUV; +import net.minecraft.client.renderer.model.BlockModel; +import net.minecraft.client.renderer.model.BlockPart; +import net.minecraft.client.renderer.model.BlockPartFace; +import net.minecraft.client.renderer.model.IBakedModel; +import net.minecraft.client.renderer.model.IModelTransform; +import net.minecraft.client.renderer.model.IUnbakedModel; +import net.minecraft.client.renderer.model.ItemCameraTransforms; +import net.minecraft.client.renderer.model.ItemOverride; +import net.minecraft.client.renderer.model.ItemOverrideList; +import net.minecraft.client.renderer.model.ItemTransformVec3f; +import net.minecraft.client.renderer.model.Material; +import net.minecraft.client.renderer.model.ModelBakery; import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.client.renderer.vertex.DefaultVertexFormats; -import net.minecraft.client.renderer.vertex.VertexFormat; import net.minecraft.resources.IResourceManager; import net.minecraft.util.Direction; import net.minecraft.util.JSONUtils; diff --git a/src/main/java/appeng/client/render/renderable/ItemRenderable.java b/src/main/java/appeng/client/render/renderable/ItemRenderable.java index bce7ab55e..2330c27df 100644 --- a/src/main/java/appeng/client/render/renderable/ItemRenderable.java +++ b/src/main/java/appeng/client/render/renderable/ItemRenderable.java @@ -18,15 +18,12 @@ package appeng.client.render.renderable; -import java.nio.FloatBuffer; import java.util.function.Function; import org.apache.commons.lang3.tuple.Pair; -import org.lwjgl.BufferUtils; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.IRenderTypeBuffer; -import net.minecraft.client.renderer.Matrix4f; import net.minecraft.client.renderer.TransformationMatrix; import net.minecraft.client.renderer.model.ItemCameraTransforms; import net.minecraft.item.ItemStack; diff --git a/src/main/java/appeng/client/render/spatial/SpatialPylonModel.java b/src/main/java/appeng/client/render/spatial/SpatialPylonModel.java index f5484f443..2b60c7b5c 100644 --- a/src/main/java/appeng/client/render/spatial/SpatialPylonModel.java +++ b/src/main/java/appeng/client/render/spatial/SpatialPylonModel.java @@ -18,13 +18,22 @@ package appeng.client.render.spatial; -import java.util.*; +import java.util.Arrays; +import java.util.Collection; +import java.util.EnumMap; +import java.util.Map; +import java.util.Set; import java.util.function.Function; import java.util.stream.Collectors; import com.mojang.datafixers.util.Pair; -import net.minecraft.client.renderer.model.*; +import net.minecraft.client.renderer.model.IBakedModel; +import net.minecraft.client.renderer.model.IModelTransform; +import net.minecraft.client.renderer.model.IUnbakedModel; +import net.minecraft.client.renderer.model.ItemOverrideList; +import net.minecraft.client.renderer.model.Material; +import net.minecraft.client.renderer.model.ModelBakery; import net.minecraft.client.renderer.texture.AtlasTexture; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/appeng/client/render/spatial/SpatialPylonRendering.java b/src/main/java/appeng/client/render/spatial/SpatialPylonRendering.java index 242961876..8c3b450ad 100644 --- a/src/main/java/appeng/client/render/spatial/SpatialPylonRendering.java +++ b/src/main/java/appeng/client/render/spatial/SpatialPylonRendering.java @@ -18,12 +18,6 @@ package appeng.client.render.spatial; -import java.util.Map; - -import com.google.common.collect.ImmutableMap; - -import net.minecraft.block.Block; -import net.minecraft.block.BlockState; import net.minecraft.client.renderer.RenderType; import net.minecraft.util.ResourceLocation; import net.minecraftforge.api.distmarker.Dist; diff --git a/src/main/java/appeng/client/render/tesr/CrankTESR.java b/src/main/java/appeng/client/render/tesr/CrankTESR.java index 13f8a22f1..e746e5b92 100644 --- a/src/main/java/appeng/client/render/tesr/CrankTESR.java +++ b/src/main/java/appeng/client/render/tesr/CrankTESR.java @@ -19,20 +19,17 @@ package appeng.client.render.tesr; import com.mojang.blaze3d.matrix.MatrixStack; -import com.mojang.blaze3d.platform.GlStateManager; -import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.vertex.IVertexBuilder; -import org.lwjgl.opengl.GL11; - import net.minecraft.block.BlockState; import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.*; +import net.minecraft.client.renderer.Atlases; +import net.minecraft.client.renderer.BlockRendererDispatcher; +import net.minecraft.client.renderer.IRenderTypeBuffer; +import net.minecraft.client.renderer.Quaternion; import net.minecraft.client.renderer.model.IBakedModel; -import net.minecraft.client.renderer.texture.AtlasTexture; import net.minecraft.client.renderer.tileentity.TileEntityRenderer; import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; -import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; diff --git a/src/main/java/appeng/client/render/tesr/DriveLedTileEntityRenderer.java b/src/main/java/appeng/client/render/tesr/DriveLedTileEntityRenderer.java index 9584c0728..02a176760 100644 --- a/src/main/java/appeng/client/render/tesr/DriveLedTileEntityRenderer.java +++ b/src/main/java/appeng/client/render/tesr/DriveLedTileEntityRenderer.java @@ -5,7 +5,10 @@ import java.util.EnumMap; import com.mojang.blaze3d.matrix.MatrixStack; import com.mojang.blaze3d.vertex.IVertexBuilder; -import net.minecraft.client.renderer.*; +import net.minecraft.client.renderer.IRenderTypeBuffer; +import net.minecraft.client.renderer.RenderState; +import net.minecraft.client.renderer.RenderType; +import net.minecraft.client.renderer.Vector3f; import net.minecraft.client.renderer.tileentity.TileEntityRenderer; import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; diff --git a/src/main/java/appeng/client/render/tesr/InscriberTESR.java b/src/main/java/appeng/client/render/tesr/InscriberTESR.java index f75c8ae74..e2706ae2a 100644 --- a/src/main/java/appeng/client/render/tesr/InscriberTESR.java +++ b/src/main/java/appeng/client/render/tesr/InscriberTESR.java @@ -5,7 +5,10 @@ import com.mojang.blaze3d.matrix.MatrixStack; import com.mojang.blaze3d.vertex.IVertexBuilder; import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.*; +import net.minecraft.client.renderer.IRenderTypeBuffer; +import net.minecraft.client.renderer.ItemRenderer; +import net.minecraft.client.renderer.Quaternion; +import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.model.ItemCameraTransforms; import net.minecraft.client.renderer.model.Material; import net.minecraft.client.renderer.texture.TextureAtlasSprite; diff --git a/src/main/java/appeng/client/render/tesr/SkyChestTESR.java b/src/main/java/appeng/client/render/tesr/SkyChestTESR.java index 497b78ff9..406f8a0f5 100644 --- a/src/main/java/appeng/client/render/tesr/SkyChestTESR.java +++ b/src/main/java/appeng/client/render/tesr/SkyChestTESR.java @@ -67,6 +67,7 @@ public class SkyChestTESR extends TileEntityRenderer { this.singleLatch.rotationPointY = 8.0F; } + @Override public void render(TileSkyChest tileEntityIn, float partialTicks, MatrixStack matrixStackIn, IRenderTypeBuffer bufferIn, int combinedLightIn, int combinedOverlayIn) { matrixStackIn.push(); diff --git a/src/main/java/appeng/client/render/tesr/SkyCompassTESR.java b/src/main/java/appeng/client/render/tesr/SkyCompassTESR.java index f29f417da..eb4bc4de0 100644 --- a/src/main/java/appeng/client/render/tesr/SkyCompassTESR.java +++ b/src/main/java/appeng/client/render/tesr/SkyCompassTESR.java @@ -25,25 +25,17 @@ import net.minecraft.block.BlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.Atlases; import net.minecraft.client.renderer.BlockRendererDispatcher; -import net.minecraft.client.renderer.BufferBuilder; import net.minecraft.client.renderer.IRenderTypeBuffer; import net.minecraft.client.renderer.model.IBakedModel; import net.minecraft.client.renderer.tileentity.TileEntityRenderer; import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; import net.minecraft.util.Direction; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.IBlockReader; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -import net.minecraftforge.client.MinecraftForgeClient; import net.minecraftforge.client.model.data.ModelDataMap; -import net.minecraftforge.common.property.Properties; -import appeng.block.AEBaseTileBlock; -import appeng.block.misc.BlockSkyCompass; import appeng.client.render.FacingToRotation; import appeng.client.render.model.SkyCompassBakedModel; -import appeng.client.render.model.SkyCompassModel; import appeng.tile.misc.TileSkyCompass; @OnlyIn(Dist.CLIENT) diff --git a/src/main/java/appeng/container/AEBaseContainer.java b/src/main/java/appeng/container/AEBaseContainer.java index 457689f7b..d91857eea 100644 --- a/src/main/java/appeng/container/AEBaseContainer.java +++ b/src/main/java/appeng/container/AEBaseContainer.java @@ -18,7 +18,6 @@ package appeng.container; -import java.io.IOException; import java.lang.reflect.Field; import java.util.ArrayList; import java.util.HashMap; @@ -29,7 +28,10 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.inventory.IInventory; -import net.minecraft.inventory.container.*; +import net.minecraft.inventory.container.Container; +import net.minecraft.inventory.container.ContainerType; +import net.minecraft.inventory.container.IContainerListener; +import net.minecraft.inventory.container.Slot; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.items.IItemHandler; @@ -53,7 +55,14 @@ import appeng.api.storage.data.IAEItemStack; import appeng.client.me.SlotME; import appeng.container.guisync.GuiSync; import appeng.container.guisync.SyncData; -import appeng.container.slot.*; +import appeng.container.slot.AppEngSlot; +import appeng.container.slot.SlotCraftingMatrix; +import appeng.container.slot.SlotCraftingTerm; +import appeng.container.slot.SlotDisabled; +import appeng.container.slot.SlotFake; +import appeng.container.slot.SlotInaccessible; +import appeng.container.slot.SlotPlayerHotBar; +import appeng.container.slot.SlotPlayerInv; import appeng.core.AELog; import appeng.core.sync.network.NetworkHandler; import appeng.core.sync.packets.PacketInventoryAction; diff --git a/src/main/java/appeng/container/ContainerOpener.java b/src/main/java/appeng/container/ContainerOpener.java index 2ad52b172..c677f0144 100644 --- a/src/main/java/appeng/container/ContainerOpener.java +++ b/src/main/java/appeng/container/ContainerOpener.java @@ -4,8 +4,6 @@ import java.util.HashMap; import java.util.Map; import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.entity.player.PlayerInventory; -import net.minecraft.inventory.container.Container; import net.minecraft.inventory.container.ContainerType; import appeng.core.AELog; diff --git a/src/main/java/appeng/container/implementations/ContainerCellWorkbench.java b/src/main/java/appeng/container/implementations/ContainerCellWorkbench.java index f5e258b1f..ab02cca8c 100644 --- a/src/main/java/appeng/container/implementations/ContainerCellWorkbench.java +++ b/src/main/java/appeng/container/implementations/ContainerCellWorkbench.java @@ -23,7 +23,9 @@ import java.util.Iterator; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.entity.player.ServerPlayerEntity; -import net.minecraft.inventory.container.*; +import net.minecraft.inventory.container.ContainerType; +import net.minecraft.inventory.container.IContainerListener; +import net.minecraft.inventory.container.Slot; import net.minecraft.item.ItemStack; import net.minecraft.network.PacketBuffer; import net.minecraftforge.items.IItemHandler; @@ -42,7 +44,6 @@ import appeng.api.storage.data.IAEStack; import appeng.api.storage.data.IItemList; import appeng.container.ContainerLocator; import appeng.container.guisync.GuiSync; -import appeng.container.implementations.ContainerHelper; import appeng.container.slot.OptionalSlotRestrictedInput; import appeng.container.slot.SlotFakeTypeOnly; import appeng.container.slot.SlotRestrictedInput; diff --git a/src/main/java/appeng/container/implementations/ContainerChest.java b/src/main/java/appeng/container/implementations/ContainerChest.java index f6f839ac7..35a689d01 100644 --- a/src/main/java/appeng/container/implementations/ContainerChest.java +++ b/src/main/java/appeng/container/implementations/ContainerChest.java @@ -26,7 +26,6 @@ import net.minecraft.network.PacketBuffer; import appeng.api.config.SecurityPermissions; import appeng.container.AEBaseContainer; import appeng.container.ContainerLocator; -import appeng.container.implementations.ContainerHelper; import appeng.container.slot.SlotRestrictedInput; import appeng.tile.storage.TileChest; diff --git a/src/main/java/appeng/container/implementations/ContainerCondenser.java b/src/main/java/appeng/container/implementations/ContainerCondenser.java index b15daa2c3..f4c910eb3 100644 --- a/src/main/java/appeng/container/implementations/ContainerCondenser.java +++ b/src/main/java/appeng/container/implementations/ContainerCondenser.java @@ -29,7 +29,6 @@ import appeng.api.config.Settings; import appeng.container.AEBaseContainer; import appeng.container.ContainerLocator; import appeng.container.guisync.GuiSync; -import appeng.container.implementations.ContainerHelper; import appeng.container.interfaces.IProgressProvider; import appeng.container.slot.SlotOutput; import appeng.container.slot.SlotRestrictedInput; diff --git a/src/main/java/appeng/container/implementations/ContainerCraftConfirm.java b/src/main/java/appeng/container/implementations/ContainerCraftConfirm.java index 579309ec8..ebcc6f763 100644 --- a/src/main/java/appeng/container/implementations/ContainerCraftConfirm.java +++ b/src/main/java/appeng/container/implementations/ContainerCraftConfirm.java @@ -23,7 +23,6 @@ import java.util.ArrayList; import java.util.Collections; import java.util.concurrent.Future; -import javax.annotation.Nonnull; import javax.annotation.Nullable; import com.google.common.collect.ImmutableSet; diff --git a/src/main/java/appeng/container/implementations/ContainerCraftingCPU.java b/src/main/java/appeng/container/implementations/ContainerCraftingCPU.java index 384152478..6ff4ed501 100644 --- a/src/main/java/appeng/container/implementations/ContainerCraftingCPU.java +++ b/src/main/java/appeng/container/implementations/ContainerCraftingCPU.java @@ -43,7 +43,6 @@ import appeng.api.storage.data.IItemList; import appeng.container.AEBaseContainer; import appeng.container.ContainerLocator; import appeng.container.guisync.GuiSync; -import appeng.container.implementations.ContainerHelper; import appeng.core.sync.network.NetworkHandler; import appeng.core.sync.packets.PacketMEInventoryUpdate; import appeng.core.sync.packets.PacketValueConfig; diff --git a/src/main/java/appeng/container/implementations/ContainerDrive.java b/src/main/java/appeng/container/implementations/ContainerDrive.java index 01a0baa60..5e855e18e 100644 --- a/src/main/java/appeng/container/implementations/ContainerDrive.java +++ b/src/main/java/appeng/container/implementations/ContainerDrive.java @@ -25,7 +25,6 @@ import net.minecraft.network.PacketBuffer; import appeng.container.AEBaseContainer; import appeng.container.ContainerLocator; -import appeng.container.implementations.ContainerHelper; import appeng.container.slot.SlotRestrictedInput; import appeng.tile.storage.TileDrive; diff --git a/src/main/java/appeng/container/implementations/ContainerFormationPlane.java b/src/main/java/appeng/container/implementations/ContainerFormationPlane.java index 301445a76..e0d6dbda3 100644 --- a/src/main/java/appeng/container/implementations/ContainerFormationPlane.java +++ b/src/main/java/appeng/container/implementations/ContainerFormationPlane.java @@ -31,7 +31,6 @@ import appeng.api.config.Upgrades; import appeng.api.config.YesNo; import appeng.container.ContainerLocator; import appeng.container.guisync.GuiSync; -import appeng.container.implementations.ContainerHelper; import appeng.container.slot.OptionalSlotFakeTypeOnly; import appeng.container.slot.SlotFakeTypeOnly; import appeng.container.slot.SlotRestrictedInput; diff --git a/src/main/java/appeng/container/implementations/ContainerGrinder.java b/src/main/java/appeng/container/implementations/ContainerGrinder.java index 8d9a7e849..afbc8b58e 100644 --- a/src/main/java/appeng/container/implementations/ContainerGrinder.java +++ b/src/main/java/appeng/container/implementations/ContainerGrinder.java @@ -26,7 +26,6 @@ import net.minecraftforge.items.IItemHandler; import appeng.container.AEBaseContainer; import appeng.container.ContainerLocator; -import appeng.container.implementations.ContainerHelper; import appeng.container.slot.SlotInaccessible; import appeng.container.slot.SlotOutput; import appeng.container.slot.SlotRestrictedInput; diff --git a/src/main/java/appeng/container/implementations/ContainerIOPort.java b/src/main/java/appeng/container/implementations/ContainerIOPort.java index 1c16fd4d6..233528fa7 100644 --- a/src/main/java/appeng/container/implementations/ContainerIOPort.java +++ b/src/main/java/appeng/container/implementations/ContainerIOPort.java @@ -31,7 +31,6 @@ import appeng.api.config.SecurityPermissions; import appeng.api.config.Settings; import appeng.container.ContainerLocator; import appeng.container.guisync.GuiSync; -import appeng.container.implementations.ContainerHelper; import appeng.container.slot.SlotOutput; import appeng.container.slot.SlotRestrictedInput; import appeng.tile.storage.TileIOPort; diff --git a/src/main/java/appeng/container/implementations/ContainerInscriber.java b/src/main/java/appeng/container/implementations/ContainerInscriber.java index 1d5bf2c89..fc2e8622a 100644 --- a/src/main/java/appeng/container/implementations/ContainerInscriber.java +++ b/src/main/java/appeng/container/implementations/ContainerInscriber.java @@ -30,7 +30,6 @@ import appeng.api.AEApi; import appeng.api.definitions.IItemDefinition; import appeng.container.ContainerLocator; import appeng.container.guisync.GuiSync; -import appeng.container.implementations.ContainerHelper; import appeng.container.interfaces.IProgressProvider; import appeng.container.slot.SlotOutput; import appeng.container.slot.SlotRestrictedInput; diff --git a/src/main/java/appeng/container/implementations/ContainerPatternTerm.java b/src/main/java/appeng/container/implementations/ContainerPatternTerm.java index c564b3d69..67f0d90ba 100644 --- a/src/main/java/appeng/container/implementations/ContainerPatternTerm.java +++ b/src/main/java/appeng/container/implementations/ContainerPatternTerm.java @@ -54,7 +54,12 @@ import appeng.api.storage.data.IItemList; import appeng.container.ContainerLocator; import appeng.container.ContainerNull; import appeng.container.guisync.GuiSync; -import appeng.container.slot.*; +import appeng.container.slot.IOptionalSlotHost; +import appeng.container.slot.OptionalSlotFake; +import appeng.container.slot.SlotFakeCraftingMatrix; +import appeng.container.slot.SlotPatternOutputs; +import appeng.container.slot.SlotPatternTerm; +import appeng.container.slot.SlotRestrictedInput; import appeng.core.sync.packets.PacketPatternSlot; import appeng.helpers.IContainerCraftingPacket; import appeng.items.storage.ItemViewCell; diff --git a/src/main/java/appeng/container/implementations/ContainerQNB.java b/src/main/java/appeng/container/implementations/ContainerQNB.java index 2db833c8d..b563355b3 100644 --- a/src/main/java/appeng/container/implementations/ContainerQNB.java +++ b/src/main/java/appeng/container/implementations/ContainerQNB.java @@ -26,7 +26,6 @@ import net.minecraft.network.PacketBuffer; import appeng.api.config.SecurityPermissions; import appeng.container.AEBaseContainer; import appeng.container.ContainerLocator; -import appeng.container.implementations.ContainerHelper; import appeng.container.slot.SlotRestrictedInput; import appeng.tile.qnb.TileQuantumBridge; diff --git a/src/main/java/appeng/container/implementations/ContainerSkyChest.java b/src/main/java/appeng/container/implementations/ContainerSkyChest.java index 9638619db..bec5696d0 100644 --- a/src/main/java/appeng/container/implementations/ContainerSkyChest.java +++ b/src/main/java/appeng/container/implementations/ContainerSkyChest.java @@ -25,7 +25,6 @@ import net.minecraft.network.PacketBuffer; import appeng.container.AEBaseContainer; import appeng.container.ContainerLocator; -import appeng.container.implementations.ContainerHelper; import appeng.container.slot.SlotNormal; import appeng.tile.storage.TileSkyChest; diff --git a/src/main/java/appeng/container/implementations/ContainerSpatialIOPort.java b/src/main/java/appeng/container/implementations/ContainerSpatialIOPort.java index 677af34cc..1230d8154 100644 --- a/src/main/java/appeng/container/implementations/ContainerSpatialIOPort.java +++ b/src/main/java/appeng/container/implementations/ContainerSpatialIOPort.java @@ -32,7 +32,6 @@ import appeng.api.util.DimensionalCoord; import appeng.container.AEBaseContainer; import appeng.container.ContainerLocator; import appeng.container.guisync.GuiSync; -import appeng.container.implementations.ContainerHelper; import appeng.container.slot.SlotOutput; import appeng.container.slot.SlotRestrictedInput; import appeng.tile.spatial.TileSpatialIOPort; diff --git a/src/main/java/appeng/container/implementations/ContainerVibrationChamber.java b/src/main/java/appeng/container/implementations/ContainerVibrationChamber.java index 18b607b8d..cb66deef9 100644 --- a/src/main/java/appeng/container/implementations/ContainerVibrationChamber.java +++ b/src/main/java/appeng/container/implementations/ContainerVibrationChamber.java @@ -26,7 +26,6 @@ import net.minecraft.network.PacketBuffer; import appeng.container.AEBaseContainer; import appeng.container.ContainerLocator; import appeng.container.guisync.GuiSync; -import appeng.container.implementations.ContainerHelper; import appeng.container.interfaces.IProgressProvider; import appeng.container.slot.SlotRestrictedInput; import appeng.tile.misc.TileVibrationChamber; diff --git a/src/main/java/appeng/container/implementations/ContainerWireless.java b/src/main/java/appeng/container/implementations/ContainerWireless.java index 2d5901099..ecba86b4f 100644 --- a/src/main/java/appeng/container/implementations/ContainerWireless.java +++ b/src/main/java/appeng/container/implementations/ContainerWireless.java @@ -27,7 +27,6 @@ import appeng.api.config.SecurityPermissions; import appeng.container.AEBaseContainer; import appeng.container.ContainerLocator; import appeng.container.guisync.GuiSync; -import appeng.container.implementations.ContainerHelper; import appeng.container.slot.SlotRestrictedInput; import appeng.core.AEConfig; import appeng.tile.networking.TileWireless; diff --git a/src/main/java/appeng/container/implementations/CraftingCPURecord.java b/src/main/java/appeng/container/implementations/CraftingCPURecord.java index f15ec32fb..d2d0ee459 100644 --- a/src/main/java/appeng/container/implementations/CraftingCPURecord.java +++ b/src/main/java/appeng/container/implementations/CraftingCPURecord.java @@ -20,7 +20,6 @@ package appeng.container.implementations; import javax.annotation.Nonnull; -import net.minecraft.inventory.container.ContainerType; import net.minecraft.util.text.ITextComponent; import appeng.api.networking.crafting.ICraftingCPU; diff --git a/src/main/java/appeng/container/slot/SlotPatternTerm.java b/src/main/java/appeng/container/slot/SlotPatternTerm.java index 2b414d5e6..79f6b6951 100644 --- a/src/main/java/appeng/container/slot/SlotPatternTerm.java +++ b/src/main/java/appeng/container/slot/SlotPatternTerm.java @@ -18,8 +18,6 @@ package appeng.container.slot; -import java.io.IOException; - import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraftforge.items.IItemHandler; diff --git a/src/main/java/appeng/core/AEConfig.java b/src/main/java/appeng/core/AEConfig.java index 71f060c4a..f4f0b269f 100644 --- a/src/main/java/appeng/core/AEConfig.java +++ b/src/main/java/appeng/core/AEConfig.java @@ -18,9 +18,17 @@ package appeng.core; -import static net.minecraftforge.common.ForgeConfigSpec.*; - -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.EnumMap; +import java.util.EnumSet; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; import java.util.function.DoubleSupplier; import java.util.stream.Collectors; import java.util.stream.Stream; @@ -31,11 +39,21 @@ import org.apache.commons.lang3.tuple.Pair; import net.minecraft.world.dimension.DimensionType; import net.minecraftforge.common.ForgeConfigSpec; +import net.minecraftforge.common.ForgeConfigSpec.BooleanValue; +import net.minecraftforge.common.ForgeConfigSpec.ConfigValue; +import net.minecraftforge.common.ForgeConfigSpec.DoubleValue; +import net.minecraftforge.common.ForgeConfigSpec.EnumValue; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.config.ModConfig; -import appeng.api.config.*; +import appeng.api.config.CondenserOutput; +import appeng.api.config.PowerMultiplier; +import appeng.api.config.PowerUnits; +import appeng.api.config.SearchBoxMode; +import appeng.api.config.Settings; +import appeng.api.config.TerminalStyle; +import appeng.api.config.YesNo; import appeng.api.features.AEFeature; import appeng.api.util.IConfigManager; import appeng.api.util.IConfigurableObject; diff --git a/src/main/java/appeng/core/AERecipeType.java b/src/main/java/appeng/core/AERecipeType.java index 7439cfb8a..8d7a572df 100644 --- a/src/main/java/appeng/core/AERecipeType.java +++ b/src/main/java/appeng/core/AERecipeType.java @@ -4,8 +4,6 @@ import net.minecraft.item.crafting.IRecipe; import net.minecraft.item.crafting.IRecipeType; import net.minecraft.util.ResourceLocation; -import appeng.recipes.handlers.GrinderRecipe; - public class AERecipeType> implements IRecipeType { private final String id; diff --git a/src/main/java/appeng/core/AppEng.java b/src/main/java/appeng/core/AppEng.java index 6e409c153..2b345aa5b 100644 --- a/src/main/java/appeng/core/AppEng.java +++ b/src/main/java/appeng/core/AppEng.java @@ -70,14 +70,24 @@ import appeng.client.render.cablebus.CableBusModelLoader; import appeng.client.render.cablebus.P2PTunnelFrequencyModel; import appeng.client.render.crafting.CraftingCubeModelLoader; import appeng.client.render.crafting.EncodedPatternModelLoader; -import appeng.client.render.model.*; +import appeng.client.render.model.BiometricCardModel; +import appeng.client.render.model.ColorApplicatorModel; +import appeng.client.render.model.DriveModel; +import appeng.client.render.model.GlassModel; +import appeng.client.render.model.MemoryCardModel; +import appeng.client.render.model.SkyCompassModel; +import appeng.client.render.model.UVLModelLoader; import appeng.client.render.spatial.SpatialPylonModel; import appeng.core.crash.ModCrashEnhancement; import appeng.core.features.registries.PartModels; import appeng.core.stats.AdvancementTriggers; import appeng.core.sync.network.NetworkHandler; import appeng.core.worlddata.WorldData; -import appeng.entity.*; +import appeng.entity.EntityChargedQuartz; +import appeng.entity.EntityGrowingCrystal; +import appeng.entity.EntitySingularity; +import appeng.entity.EntityTinyTNTPrimed; +import appeng.entity.RenderTinyTNTPrimed; import appeng.hooks.TickHandler; import appeng.integration.Integrations; import appeng.parts.PartPlacement; diff --git a/src/main/java/appeng/core/CreativeTabFacade.java b/src/main/java/appeng/core/CreativeTabFacade.java index f70a63c91..7ea1cf381 100644 --- a/src/main/java/appeng/core/CreativeTabFacade.java +++ b/src/main/java/appeng/core/CreativeTabFacade.java @@ -18,15 +18,10 @@ package appeng.core; -import java.util.Optional; - import net.minecraft.block.Blocks; -import net.minecraft.item.Item; import net.minecraft.item.ItemGroup; import net.minecraft.item.ItemStack; -import appeng.api.AEApi; - public final class CreativeTabFacade { public static ItemGroup instance = null; diff --git a/src/main/java/appeng/core/Registration.java b/src/main/java/appeng/core/Registration.java index a35a6999a..ae4bb61f8 100644 --- a/src/main/java/appeng/core/Registration.java +++ b/src/main/java/appeng/core/Registration.java @@ -22,7 +22,6 @@ import net.minecraft.advancements.CriteriaTriggers; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScreenManager; -import net.minecraft.entity.EntityClassification; import net.minecraft.entity.EntityType; import net.minecraft.inventory.container.ContainerType; import net.minecraft.item.Item; @@ -39,7 +38,11 @@ import net.minecraft.world.gen.feature.IFeatureConfig; import net.minecraft.world.gen.feature.NoFeatureConfig; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -import net.minecraftforge.client.event.*; +import net.minecraftforge.client.event.ColorHandlerEvent; +import net.minecraftforge.client.event.ModelBakeEvent; +import net.minecraftforge.client.event.ModelRegistryEvent; +import net.minecraftforge.client.event.ParticleFactoryRegisterEvent; +import net.minecraftforge.client.event.TextureStitchEvent; import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.common.ModDimension; import net.minecraftforge.common.crafting.CraftingHelper; @@ -70,9 +73,53 @@ import appeng.api.networking.spatial.ISpatialCache; import appeng.api.networking.storage.IStorageGrid; import appeng.api.networking.ticking.ITickManager; import appeng.bootstrap.IModelRegistry; -import appeng.bootstrap.components.*; -import appeng.client.gui.implementations.*; -import appeng.client.render.effects.*; +import appeng.bootstrap.components.IBlockRegistrationComponent; +import appeng.bootstrap.components.IEntityRegistrationComponent; +import appeng.bootstrap.components.IItemColorRegistrationComponent; +import appeng.bootstrap.components.IItemRegistrationComponent; +import appeng.bootstrap.components.IModelBakeComponent; +import appeng.bootstrap.components.IModelRegistrationComponent; +import appeng.bootstrap.components.ITileEntityRegistrationComponent; +import appeng.client.gui.implementations.GuiCellWorkbench; +import appeng.client.gui.implementations.GuiChest; +import appeng.client.gui.implementations.GuiCondenser; +import appeng.client.gui.implementations.GuiCraftAmount; +import appeng.client.gui.implementations.GuiCraftConfirm; +import appeng.client.gui.implementations.GuiCraftingCPU; +import appeng.client.gui.implementations.GuiCraftingStatus; +import appeng.client.gui.implementations.GuiCraftingTerm; +import appeng.client.gui.implementations.GuiDrive; +import appeng.client.gui.implementations.GuiFormationPlane; +import appeng.client.gui.implementations.GuiGrinder; +import appeng.client.gui.implementations.GuiIOPort; +import appeng.client.gui.implementations.GuiInscriber; +import appeng.client.gui.implementations.GuiInterface; +import appeng.client.gui.implementations.GuiInterfaceTerminal; +import appeng.client.gui.implementations.GuiLevelEmitter; +import appeng.client.gui.implementations.GuiMEMonitorable; +import appeng.client.gui.implementations.GuiMEPortableCell; +import appeng.client.gui.implementations.GuiMolecularAssembler; +import appeng.client.gui.implementations.GuiNetworkStatus; +import appeng.client.gui.implementations.GuiNetworkTool; +import appeng.client.gui.implementations.GuiPatternTerm; +import appeng.client.gui.implementations.GuiPriority; +import appeng.client.gui.implementations.GuiQNB; +import appeng.client.gui.implementations.GuiQuartzKnife; +import appeng.client.gui.implementations.GuiSecurityStation; +import appeng.client.gui.implementations.GuiSkyChest; +import appeng.client.gui.implementations.GuiSpatialIOPort; +import appeng.client.gui.implementations.GuiStorageBus; +import appeng.client.gui.implementations.GuiUpgradeable; +import appeng.client.gui.implementations.GuiVibrationChamber; +import appeng.client.gui.implementations.GuiWireless; +import appeng.client.gui.implementations.GuiWirelessTerm; +import appeng.client.render.effects.ChargedOreFX; +import appeng.client.render.effects.CraftingFx; +import appeng.client.render.effects.EnergyFx; +import appeng.client.render.effects.LightningArcFX; +import appeng.client.render.effects.LightningFX; +import appeng.client.render.effects.MatterCannonFX; +import appeng.client.render.effects.VibrantFX; import appeng.client.render.model.BiometricCardModel; import appeng.client.render.model.DriveModel; import appeng.client.render.model.MemoryCardModel; @@ -81,7 +128,39 @@ import appeng.client.render.tesr.InscriberTESR; import appeng.client.render.tesr.SkyChestTESR; import appeng.container.AEBaseContainer; import appeng.container.ContainerOpener; -import appeng.container.implementations.*; +import appeng.container.implementations.ContainerCellWorkbench; +import appeng.container.implementations.ContainerChest; +import appeng.container.implementations.ContainerCondenser; +import appeng.container.implementations.ContainerCraftAmount; +import appeng.container.implementations.ContainerCraftConfirm; +import appeng.container.implementations.ContainerCraftingCPU; +import appeng.container.implementations.ContainerCraftingStatus; +import appeng.container.implementations.ContainerCraftingTerm; +import appeng.container.implementations.ContainerDrive; +import appeng.container.implementations.ContainerFormationPlane; +import appeng.container.implementations.ContainerGrinder; +import appeng.container.implementations.ContainerIOPort; +import appeng.container.implementations.ContainerInscriber; +import appeng.container.implementations.ContainerInterface; +import appeng.container.implementations.ContainerInterfaceTerminal; +import appeng.container.implementations.ContainerLevelEmitter; +import appeng.container.implementations.ContainerMEMonitorable; +import appeng.container.implementations.ContainerMEPortableCell; +import appeng.container.implementations.ContainerMolecularAssembler; +import appeng.container.implementations.ContainerNetworkStatus; +import appeng.container.implementations.ContainerNetworkTool; +import appeng.container.implementations.ContainerPatternTerm; +import appeng.container.implementations.ContainerPriority; +import appeng.container.implementations.ContainerQNB; +import appeng.container.implementations.ContainerQuartzKnife; +import appeng.container.implementations.ContainerSecurityStation; +import appeng.container.implementations.ContainerSkyChest; +import appeng.container.implementations.ContainerSpatialIOPort; +import appeng.container.implementations.ContainerStorageBus; +import appeng.container.implementations.ContainerUpgradeable; +import appeng.container.implementations.ContainerVibrationChamber; +import appeng.container.implementations.ContainerWireless; +import appeng.container.implementations.ContainerWirelessTerm; import appeng.core.features.registries.P2PTunnelRegistry; import appeng.core.features.registries.PartModels; import appeng.core.features.registries.cell.BasicCellHandler; @@ -90,10 +169,27 @@ import appeng.core.features.registries.cell.CreativeCellHandler; import appeng.core.stats.AdvancementTriggers; import appeng.core.stats.AeStats; import appeng.core.stats.PartItemPredicate; -import appeng.fluids.client.gui.*; -import appeng.fluids.container.*; +import appeng.fluids.client.gui.GuiFluidFormationPlane; +import appeng.fluids.client.gui.GuiFluidIO; +import appeng.fluids.client.gui.GuiFluidInterface; +import appeng.fluids.client.gui.GuiFluidLevelEmitter; +import appeng.fluids.client.gui.GuiFluidStorageBus; +import appeng.fluids.client.gui.GuiFluidTerminal; +import appeng.fluids.container.ContainerFluidFormationPlane; +import appeng.fluids.container.ContainerFluidIO; +import appeng.fluids.container.ContainerFluidInterface; +import appeng.fluids.container.ContainerFluidLevelEmitter; +import appeng.fluids.container.ContainerFluidStorageBus; +import appeng.fluids.container.ContainerFluidTerminal; import appeng.fluids.registries.BasicFluidCellGuiHandler; -import appeng.me.cache.*; +import appeng.me.cache.CraftingGridCache; +import appeng.me.cache.EnergyGridCache; +import appeng.me.cache.GridStorageCache; +import appeng.me.cache.P2PCache; +import appeng.me.cache.PathGridCache; +import appeng.me.cache.SecurityCache; +import appeng.me.cache.SpatialPylonCache; +import appeng.me.cache.TickManagerCache; import appeng.recipes.conditions.FeaturesEnabled; import appeng.recipes.game.DisassembleRecipe; import appeng.recipes.handlers.GrinderRecipe; @@ -151,12 +247,8 @@ final class Registration { // TODO: Do not use the internal API final ApiDefinitions definitions = Api.INSTANCE.definitions(); - final IModelRegistry registry = new IModelRegistry() { - @Override - public void registerItemVariants(Item item, ResourceLocation... names) { + final IModelRegistry registry = (item, names) -> { // FIXME REMOVE OR IMPL - } - }; final Dist dist = FMLEnvironment.dist; definitions.getRegistry().getBootstrapComponents(IModelRegistrationComponent.class) diff --git a/src/main/java/appeng/core/api/ApiStorage.java b/src/main/java/appeng/core/api/ApiStorage.java index 3f347311f..7d7168b63 100644 --- a/src/main/java/appeng/core/api/ApiStorage.java +++ b/src/main/java/appeng/core/api/ApiStorage.java @@ -18,7 +18,6 @@ package appeng.core.api; -import java.io.IOException; import java.util.Collection; import java.util.Collections; diff --git a/src/main/java/appeng/core/api/definitions/ApiBlocks.java b/src/main/java/appeng/core/api/definitions/ApiBlocks.java index 519aba631..b5f041f98 100644 --- a/src/main/java/appeng/core/api/definitions/ApiBlocks.java +++ b/src/main/java/appeng/core/api/definitions/ApiBlocks.java @@ -19,10 +19,12 @@ package appeng.core.api.definitions; import static appeng.block.AEBaseBlock.defaultProps; -import static appeng.block.crafting.AbstractCraftingUnitBlock.CraftingUnitType; -import static appeng.decorative.solid.BlockSkyStone.SkystoneType; -import net.minecraft.block.*; +import net.minecraft.block.Block; +import net.minecraft.block.DispenserBlock; +import net.minecraft.block.SlabBlock; +import net.minecraft.block.SoundType; +import net.minecraft.block.StairsBlock; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.RenderType; import net.minecraft.entity.EntityClassification; @@ -36,11 +38,40 @@ import appeng.api.definitions.IBlocks; import appeng.api.definitions.ITileDefinition; import appeng.api.features.AEFeature; import appeng.block.AEBaseBlockItemChargeable; -import appeng.block.crafting.*; +import appeng.block.crafting.AbstractCraftingUnitBlock.CraftingUnitType; +import appeng.block.crafting.BlockCraftingMonitor; +import appeng.block.crafting.BlockCraftingStorage; +import appeng.block.crafting.BlockMolecularAssembler; +import appeng.block.crafting.CraftingUnitBlock; +import appeng.block.crafting.ItemCraftingStorage; import appeng.block.grindstone.BlockCrank; import appeng.block.grindstone.BlockGrinder; -import appeng.block.misc.*; -import appeng.block.networking.*; +import appeng.block.misc.BlockCellWorkbench; +import appeng.block.misc.BlockCharger; +import appeng.block.misc.BlockCondenser; +import appeng.block.misc.BlockInscriber; +import appeng.block.misc.BlockInterface; +import appeng.block.misc.BlockLightDetector; +import appeng.block.misc.BlockQuartzFixture; +import appeng.block.misc.BlockQuartzGrowthAccelerator; +import appeng.block.misc.BlockSecurityStation; +import appeng.block.misc.BlockSkyCompass; +import appeng.block.misc.BlockTinyTNT; +import appeng.block.misc.BlockVibrationChamber; +import appeng.block.misc.InscriberRendering; +import appeng.block.misc.SecurityStationRendering; +import appeng.block.misc.SkyCompassRendering; +import appeng.block.networking.BlockCableBus; +import appeng.block.networking.BlockController; +import appeng.block.networking.BlockCreativeEnergyCell; +import appeng.block.networking.BlockDenseEnergyCell; +import appeng.block.networking.BlockEnergyAcceptor; +import appeng.block.networking.BlockEnergyCell; +import appeng.block.networking.BlockEnergyCellRendering; +import appeng.block.networking.BlockWireless; +import appeng.block.networking.CableBusRendering; +import appeng.block.networking.ControllerRendering; +import appeng.block.networking.WirelessRendering; import appeng.block.paint.BlockPaint; import appeng.block.paint.PaintRendering; import appeng.block.qnb.BlockQuantumLinkChamber; @@ -49,8 +80,18 @@ import appeng.block.qnb.QuantumBridgeRendering; import appeng.block.spatial.BlockMatrixFrame; import appeng.block.spatial.BlockSpatialIOPort; import appeng.block.spatial.BlockSpatialPylon; -import appeng.block.storage.*; -import appeng.bootstrap.*; +import appeng.block.storage.BlockChest; +import appeng.block.storage.BlockDrive; +import appeng.block.storage.BlockIOPort; +import appeng.block.storage.BlockSkyChest; +import appeng.block.storage.ChestRendering; +import appeng.block.storage.DriveRendering; +import appeng.bootstrap.BlockRenderingCustomizer; +import appeng.bootstrap.FeatureFactory; +import appeng.bootstrap.IBlockRendering; +import appeng.bootstrap.IItemRendering; +import appeng.bootstrap.TileEntityRendering; +import appeng.bootstrap.TileEntityRenderingCustomizer; import appeng.bootstrap.components.IInitComponent; import appeng.bootstrap.definitions.TileEntityDefinition; import appeng.client.render.crafting.CraftingCubeRendering; @@ -62,18 +103,54 @@ import appeng.client.render.tesr.CrankTESR; import appeng.client.render.tesr.DriveLedTileEntityRenderer; import appeng.client.render.tesr.SkyChestTESR; import appeng.core.AppEng; -import appeng.debug.*; +import appeng.debug.BlockChunkloader; +import appeng.debug.BlockCubeGenerator; +import appeng.debug.BlockEnergyGenerator; +import appeng.debug.BlockItemGen; +import appeng.debug.BlockPhantomNode; +import appeng.debug.TileChunkLoader; +import appeng.debug.TileCubeGenerator; +import appeng.debug.TileEnergyGenerator; +import appeng.debug.TileItemGen; +import appeng.debug.TilePhantomNode; import appeng.decorative.AEDecorativeBlock; -import appeng.decorative.solid.*; +import appeng.decorative.solid.BlockChargedQuartzOre; +import appeng.decorative.solid.BlockQuartzGlass; +import appeng.decorative.solid.BlockQuartzLamp; +import appeng.decorative.solid.BlockQuartzOre; +import appeng.decorative.solid.BlockQuartzPillar; +import appeng.decorative.solid.BlockSkyStone; +import appeng.decorative.solid.BlockSkyStone.SkystoneType; import appeng.entity.EntityTinyTNTPrimed; import appeng.fluids.block.BlockFluidInterface; import appeng.fluids.tile.TileFluidInterface; import appeng.hooks.DispenserBehaviorTinyTNT; -import appeng.tile.crafting.*; +import appeng.tile.crafting.MolecularAssemblerRenderer; +import appeng.tile.crafting.TileCraftingMonitorTile; +import appeng.tile.crafting.TileCraftingStorageTile; +import appeng.tile.crafting.TileCraftingTile; +import appeng.tile.crafting.TileMolecularAssembler; import appeng.tile.grindstone.TileCrank; import appeng.tile.grindstone.TileGrinder; -import appeng.tile.misc.*; -import appeng.tile.networking.*; +import appeng.tile.misc.TileCellWorkbench; +import appeng.tile.misc.TileCharger; +import appeng.tile.misc.TileCondenser; +import appeng.tile.misc.TileInscriber; +import appeng.tile.misc.TileInterface; +import appeng.tile.misc.TileLightDetector; +import appeng.tile.misc.TilePaint; +import appeng.tile.misc.TileQuartzGrowthAccelerator; +import appeng.tile.misc.TileSecurityStation; +import appeng.tile.misc.TileSkyCompass; +import appeng.tile.misc.TileVibrationChamber; +import appeng.tile.networking.CableBusTESR; +import appeng.tile.networking.TileCableBus; +import appeng.tile.networking.TileController; +import appeng.tile.networking.TileCreativeEnergyCell; +import appeng.tile.networking.TileDenseEnergyCell; +import appeng.tile.networking.TileEnergyAcceptor; +import appeng.tile.networking.TileEnergyCell; +import appeng.tile.networking.TileWireless; import appeng.tile.qnb.TileQuantumBridge; import appeng.tile.spatial.TileSpatialIOPort; import appeng.tile.spatial.TileSpatialPylon; diff --git a/src/main/java/appeng/core/api/definitions/ApiItems.java b/src/main/java/appeng/core/api/definitions/ApiItems.java index c6b8e3d0a..89e6033fe 100644 --- a/src/main/java/appeng/core/api/definitions/ApiItems.java +++ b/src/main/java/appeng/core/api/definitions/ApiItems.java @@ -35,7 +35,11 @@ import appeng.core.CreativeTabFacade; import appeng.core.features.ActivityState; import appeng.core.features.ColoredItemDefinition; import appeng.core.features.ItemStackSrc; -import appeng.debug.*; +import appeng.debug.ToolDebugCard; +import appeng.debug.ToolDebugPartPlacer; +import appeng.debug.ToolEraser; +import appeng.debug.ToolMeteoritePlacer; +import appeng.debug.ToolReplicatorCard; import appeng.entity.EntityGrowingCrystal; import appeng.fluids.items.BasicFluidStorageCell; import appeng.fluids.items.FluidDummyItem; @@ -43,16 +47,33 @@ import appeng.fluids.items.FluidDummyItemRendering; import appeng.hooks.DispenserBlockTool; import appeng.hooks.DispenserMatterCannon; import appeng.items.materials.MaterialType; -import appeng.items.misc.*; +import appeng.items.misc.ItemCrystalSeed; +import appeng.items.misc.ItemEncodedPattern; +import appeng.items.misc.ItemPaintBall; +import appeng.items.misc.ItemPaintBallRendering; import appeng.items.parts.FacadeRendering; import appeng.items.parts.ItemFacade; import appeng.items.storage.BasicItemStorageCell; import appeng.items.storage.ItemCreativeStorageCell; import appeng.items.storage.ItemSpatialStorageCell; import appeng.items.storage.ItemViewCell; -import appeng.items.tools.*; -import appeng.items.tools.powered.*; -import appeng.items.tools.quartz.*; +import appeng.items.tools.ToolBiometricCard; +import appeng.items.tools.ToolMemoryCard; +import appeng.items.tools.ToolNetworkTool; +import appeng.items.tools.powered.ToolChargedStaff; +import appeng.items.tools.powered.ToolColorApplicator; +import appeng.items.tools.powered.ToolColorApplicatorRendering; +import appeng.items.tools.powered.ToolEntropyManipulator; +import appeng.items.tools.powered.ToolMatterCannon; +import appeng.items.tools.powered.ToolPortableCell; +import appeng.items.tools.powered.ToolWirelessTerminal; +import appeng.items.tools.quartz.ToolQuartzAxe; +import appeng.items.tools.quartz.ToolQuartzCuttingKnife; +import appeng.items.tools.quartz.ToolQuartzHoe; +import appeng.items.tools.quartz.ToolQuartzPickaxe; +import appeng.items.tools.quartz.ToolQuartzSpade; +import appeng.items.tools.quartz.ToolQuartzSword; +import appeng.items.tools.quartz.ToolQuartzWrench; /** * Internal implementation for the API items @@ -540,6 +561,7 @@ public final class ApiItems implements IItems { return this.toolReplicatorCard; } + @Override public IItemDefinition dummyFluidItem() { return this.dummyFluidItem; } diff --git a/src/main/java/appeng/core/api/definitions/ApiParts.java b/src/main/java/appeng/core/api/definitions/ApiParts.java index 5280f0638..10cf74521 100644 --- a/src/main/java/appeng/core/api/definitions/ApiParts.java +++ b/src/main/java/appeng/core/api/definitions/ApiParts.java @@ -18,10 +18,7 @@ package appeng.core.api.definitions; -import java.util.ArrayList; -import java.util.List; import java.util.function.Function; -import java.util.stream.Collectors; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; @@ -32,21 +29,56 @@ import appeng.api.parts.IPart; import appeng.api.util.AEColor; import appeng.api.util.AEColoredItemDefinition; import appeng.bootstrap.FeatureFactory; -import appeng.client.render.cablebus.P2PTunnelFrequencyModel; import appeng.core.AppEng; import appeng.core.CreativeTab; -import appeng.core.features.*; +import appeng.core.features.ActivityState; +import appeng.core.features.ColoredItemDefinition; +import appeng.core.features.ItemStackSrc; import appeng.core.features.registries.PartModels; -import appeng.fluids.parts.*; +import appeng.fluids.parts.PartFluidAnnihilationPlane; +import appeng.fluids.parts.PartFluidExportBus; +import appeng.fluids.parts.PartFluidFormationPlane; +import appeng.fluids.parts.PartFluidImportBus; +import appeng.fluids.parts.PartFluidInterface; +import appeng.fluids.parts.PartFluidLevelEmitter; +import appeng.fluids.parts.PartFluidStorageBus; +import appeng.fluids.parts.PartFluidTerminal; import appeng.items.parts.ColoredPartItem; import appeng.items.parts.ItemPart; import appeng.items.parts.ItemPartRendering; import appeng.items.parts.PartType; -import appeng.parts.automation.*; -import appeng.parts.misc.*; -import appeng.parts.networking.*; -import appeng.parts.p2p.*; -import appeng.parts.reporting.*; +import appeng.parts.automation.PartAnnihilationPlane; +import appeng.parts.automation.PartExportBus; +import appeng.parts.automation.PartFormationPlane; +import appeng.parts.automation.PartIdentityAnnihilationPlane; +import appeng.parts.automation.PartImportBus; +import appeng.parts.automation.PartLevelEmitter; +import appeng.parts.misc.PartCableAnchor; +import appeng.parts.misc.PartInterface; +import appeng.parts.misc.PartInvertedToggleBus; +import appeng.parts.misc.PartStorageBus; +import appeng.parts.misc.PartToggleBus; +import appeng.parts.networking.PartCableCovered; +import appeng.parts.networking.PartCableGlass; +import appeng.parts.networking.PartCableSmart; +import appeng.parts.networking.PartDenseCableCovered; +import appeng.parts.networking.PartDenseCableSmart; +import appeng.parts.networking.PartQuartzFiber; +import appeng.parts.p2p.PartP2PFEPower; +import appeng.parts.p2p.PartP2PFluids; +import appeng.parts.p2p.PartP2PItems; +import appeng.parts.p2p.PartP2PLight; +import appeng.parts.p2p.PartP2PRedstone; +import appeng.parts.p2p.PartP2PTunnelME; +import appeng.parts.reporting.PartConversionMonitor; +import appeng.parts.reporting.PartCraftingTerminal; +import appeng.parts.reporting.PartDarkPanel; +import appeng.parts.reporting.PartInterfaceTerminal; +import appeng.parts.reporting.PartPanel; +import appeng.parts.reporting.PartPatternTerminal; +import appeng.parts.reporting.PartSemiDarkPanel; +import appeng.parts.reporting.PartStorageMonitor; +import appeng.parts.reporting.PartTerminal; /** * Internal implementation for the API parts diff --git a/src/main/java/appeng/core/features/registries/WirelessRegistry.java b/src/main/java/appeng/core/features/registries/WirelessRegistry.java index 9dd347fe5..f86ead8a4 100644 --- a/src/main/java/appeng/core/features/registries/WirelessRegistry.java +++ b/src/main/java/appeng/core/features/registries/WirelessRegistry.java @@ -32,7 +32,6 @@ import appeng.api.features.IWirelessTermHandler; import appeng.api.features.IWirelessTermRegistry; import appeng.container.ContainerLocator; import appeng.container.ContainerOpener; -import appeng.container.implementations.ContainerMEPortableCell; import appeng.container.implementations.ContainerWirelessTerm; import appeng.core.localization.PlayerMessages; import appeng.util.Platform; diff --git a/src/main/java/appeng/core/features/registries/WorldGenRegistry.java b/src/main/java/appeng/core/features/registries/WorldGenRegistry.java index 34b959191..43acec58f 100644 --- a/src/main/java/appeng/core/features/registries/WorldGenRegistry.java +++ b/src/main/java/appeng/core/features/registries/WorldGenRegistry.java @@ -23,8 +23,6 @@ import java.util.HashSet; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; import net.minecraft.world.dimension.Dimension; -import net.minecraft.world.dimension.DimensionType; -import net.minecraftforge.common.extensions.IForgeDimension; import appeng.api.features.IWorldGen; diff --git a/src/main/java/appeng/core/features/registries/cell/BasicItemCellGuiHandler.java b/src/main/java/appeng/core/features/registries/cell/BasicItemCellGuiHandler.java index f0afd54ef..d56b9b572 100644 --- a/src/main/java/appeng/core/features/registries/cell/BasicItemCellGuiHandler.java +++ b/src/main/java/appeng/core/features/registries/cell/BasicItemCellGuiHandler.java @@ -13,12 +13,9 @@ import appeng.api.storage.IMEInventoryHandler; import appeng.api.storage.IStorageChannel; import appeng.api.storage.channels.IItemStorageChannel; import appeng.api.storage.data.IAEStack; -import appeng.api.util.AEPartLocation; import appeng.container.ContainerLocator; import appeng.container.ContainerOpener; import appeng.container.implementations.ContainerMEMonitorable; -import appeng.container.implementations.ContainerWireless; -import appeng.util.Platform; public class BasicItemCellGuiHandler implements ICellGuiHandler { @Override diff --git a/src/main/java/appeng/core/localization/ButtonToolTips.java b/src/main/java/appeng/core/localization/ButtonToolTips.java index 8c8d7a6b9..34bbb16dd 100644 --- a/src/main/java/appeng/core/localization/ButtonToolTips.java +++ b/src/main/java/appeng/core/localization/ButtonToolTips.java @@ -18,7 +18,6 @@ package appeng.core.localization; -import net.minecraft.client.resources.I18n; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.TranslationTextComponent; diff --git a/src/main/java/appeng/core/stats/IAdvancementTrigger.java b/src/main/java/appeng/core/stats/IAdvancementTrigger.java index f6d73287a..ab52947dd 100644 --- a/src/main/java/appeng/core/stats/IAdvancementTrigger.java +++ b/src/main/java/appeng/core/stats/IAdvancementTrigger.java @@ -18,7 +18,6 @@ package appeng.core.stats; -import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.ServerPlayerEntity; @FunctionalInterface diff --git a/src/main/java/appeng/core/sync/AppEngPacketHandlerBase.java b/src/main/java/appeng/core/sync/AppEngPacketHandlerBase.java index 5b3401ff9..51b8a5375 100644 --- a/src/main/java/appeng/core/sync/AppEngPacketHandlerBase.java +++ b/src/main/java/appeng/core/sync/AppEngPacketHandlerBase.java @@ -18,12 +18,10 @@ package appeng.core.sync; -import java.lang.reflect.Type; import java.util.HashMap; import java.util.Map; import java.util.function.Function; -import net.jodah.typetools.TypeResolver; import net.minecraft.network.PacketBuffer; import appeng.core.sync.packets.PacketAssemblerAnimation; diff --git a/src/main/java/appeng/core/sync/network/AppEngClientPacketHandler.java b/src/main/java/appeng/core/sync/network/AppEngClientPacketHandler.java index 25f2593da..b492222e0 100644 --- a/src/main/java/appeng/core/sync/network/AppEngClientPacketHandler.java +++ b/src/main/java/appeng/core/sync/network/AppEngClientPacketHandler.java @@ -18,8 +18,6 @@ package appeng.core.sync.network; -import java.lang.reflect.InvocationTargetException; - import net.minecraft.client.Minecraft; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.network.INetHandler; diff --git a/src/main/java/appeng/core/sync/network/AppEngServerPacketHandler.java b/src/main/java/appeng/core/sync/network/AppEngServerPacketHandler.java index c3229fe0d..be9c1eeb2 100644 --- a/src/main/java/appeng/core/sync/network/AppEngServerPacketHandler.java +++ b/src/main/java/appeng/core/sync/network/AppEngServerPacketHandler.java @@ -18,8 +18,6 @@ package appeng.core.sync.network; -import java.lang.reflect.InvocationTargetException; - import net.minecraft.entity.player.PlayerEntity; import net.minecraft.network.INetHandler; import net.minecraft.network.PacketBuffer; diff --git a/src/main/java/appeng/core/sync/packets/PacketConfigButton.java b/src/main/java/appeng/core/sync/packets/PacketConfigButton.java index 67d4858b4..bda305d6a 100644 --- a/src/main/java/appeng/core/sync/packets/PacketConfigButton.java +++ b/src/main/java/appeng/core/sync/packets/PacketConfigButton.java @@ -25,11 +25,8 @@ import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.network.PacketBuffer; import appeng.api.config.Settings; -import appeng.api.util.IConfigManager; -import appeng.api.util.IConfigurableObject; import appeng.core.sync.AppEngPacket; import appeng.core.sync.network.INetworkInfo; -import appeng.util.Platform; public final class PacketConfigButton extends AppEngPacket { private final Settings option; diff --git a/src/main/java/appeng/core/sync/packets/PacketCraftRequest.java b/src/main/java/appeng/core/sync/packets/PacketCraftRequest.java index 5a71c8e2a..7a08216ae 100644 --- a/src/main/java/appeng/core/sync/packets/PacketCraftRequest.java +++ b/src/main/java/appeng/core/sync/packets/PacketCraftRequest.java @@ -24,7 +24,6 @@ import io.netty.buffer.Unpooled; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.network.PacketBuffer; -import net.minecraft.tileentity.TileEntity; import appeng.api.networking.IGrid; import appeng.api.networking.IGridNode; @@ -35,7 +34,6 @@ import appeng.container.ContainerLocator; import appeng.container.ContainerOpener; import appeng.container.implementations.ContainerCraftAmount; import appeng.container.implementations.ContainerCraftConfirm; -import appeng.container.implementations.ContainerInscriber; import appeng.core.AELog; import appeng.core.sync.AppEngPacket; import appeng.core.sync.network.INetworkInfo; diff --git a/src/main/java/appeng/core/sync/packets/PacketJEIRecipe.java b/src/main/java/appeng/core/sync/packets/PacketJEIRecipe.java index e7f3cec83..3c7412336 100644 --- a/src/main/java/appeng/core/sync/packets/PacketJEIRecipe.java +++ b/src/main/java/appeng/core/sync/packets/PacketJEIRecipe.java @@ -18,8 +18,6 @@ package appeng.core.sync.packets; -import java.io.IOException; - import io.netty.buffer.Unpooled; import net.minecraft.entity.player.PlayerEntity; @@ -188,7 +186,7 @@ public class PacketJEIRecipe extends AppEngPacket { } /** - * + * * @param slot * @param is itemstack * @return is if it can be used, else EMPTY diff --git a/src/main/java/appeng/core/sync/packets/PacketPatternSlot.java b/src/main/java/appeng/core/sync/packets/PacketPatternSlot.java index 84ff6f3d7..f489a67b5 100644 --- a/src/main/java/appeng/core/sync/packets/PacketPatternSlot.java +++ b/src/main/java/appeng/core/sync/packets/PacketPatternSlot.java @@ -18,8 +18,6 @@ package appeng.core.sync.packets; -import java.io.IOException; - import io.netty.buffer.Unpooled; import net.minecraft.entity.player.PlayerEntity; diff --git a/src/main/java/appeng/core/sync/packets/PacketSwitchGuis.java b/src/main/java/appeng/core/sync/packets/PacketSwitchGuis.java index 4b4c93e6e..ebdc276d1 100644 --- a/src/main/java/appeng/core/sync/packets/PacketSwitchGuis.java +++ b/src/main/java/appeng/core/sync/packets/PacketSwitchGuis.java @@ -24,7 +24,6 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.inventory.container.Container; import net.minecraft.inventory.container.ContainerType; import net.minecraft.network.PacketBuffer; -import net.minecraft.tileentity.TileEntity; import net.minecraftforge.registries.ForgeRegistries; import appeng.container.AEBaseContainer; @@ -32,7 +31,6 @@ import appeng.container.ContainerLocator; import appeng.container.ContainerOpener; import appeng.core.sync.AppEngPacket; import appeng.core.sync.network.INetworkInfo; -import appeng.util.Platform; public class PacketSwitchGuis extends AppEngPacket { diff --git a/src/main/java/appeng/core/sync/packets/PacketTransitionEffect.java b/src/main/java/appeng/core/sync/packets/PacketTransitionEffect.java index 0a3a69a09..dcaf02236 100644 --- a/src/main/java/appeng/core/sync/packets/PacketTransitionEffect.java +++ b/src/main/java/appeng/core/sync/packets/PacketTransitionEffect.java @@ -24,10 +24,7 @@ import net.minecraft.block.BlockState; import net.minecraft.block.SoundType; import net.minecraft.client.Minecraft; import net.minecraft.client.audio.SimpleSound; -import net.minecraft.client.particle.Particle; import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.ItemStack; -import net.minecraft.item.Items; import net.minecraft.network.PacketBuffer; import net.minecraft.util.SoundCategory; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/appeng/core/sync/packets/PacketValueConfig.java b/src/main/java/appeng/core/sync/packets/PacketValueConfig.java index fee470deb..ac4c22fd2 100644 --- a/src/main/java/appeng/core/sync/packets/PacketValueConfig.java +++ b/src/main/java/appeng/core/sync/packets/PacketValueConfig.java @@ -18,8 +18,6 @@ package appeng.core.sync.packets; -import java.io.IOException; - import io.netty.buffer.Unpooled; import net.minecraft.client.Minecraft; diff --git a/src/main/java/appeng/core/worlddata/CompassData.java b/src/main/java/appeng/core/worlddata/CompassData.java index 8a2c5c971..1e72a484c 100644 --- a/src/main/java/appeng/core/worlddata/CompassData.java +++ b/src/main/java/appeng/core/worlddata/CompassData.java @@ -18,8 +18,6 @@ package appeng.core.worlddata; -import java.io.File; - import javax.annotation.Nonnull; import com.google.common.base.Preconditions; diff --git a/src/main/java/appeng/core/worlddata/IWorldGridStorageData.java b/src/main/java/appeng/core/worlddata/IWorldGridStorageData.java index 4d49f349c..05b9cf940 100644 --- a/src/main/java/appeng/core/worlddata/IWorldGridStorageData.java +++ b/src/main/java/appeng/core/worlddata/IWorldGridStorageData.java @@ -19,7 +19,6 @@ package appeng.core.worlddata; import javax.annotation.Nonnull; -import javax.annotation.Nullable; import appeng.me.GridStorage; diff --git a/src/main/java/appeng/core/worlddata/IWorldPlayerData.java b/src/main/java/appeng/core/worlddata/IWorldPlayerData.java index 99447f347..84a6db1b6 100644 --- a/src/main/java/appeng/core/worlddata/IWorldPlayerData.java +++ b/src/main/java/appeng/core/worlddata/IWorldPlayerData.java @@ -24,8 +24,6 @@ import javax.annotation.Nullable; import com.mojang.authlib.GameProfile; -import net.minecraft.entity.player.PlayerEntity; - /** * @author thatsIch * @version rv3 - 30.05.2015 @@ -35,7 +33,7 @@ public interface IWorldPlayerData { /** * Gets the UUID of the Minecraft profile associated with the given ME player * id. - * + * * @param playerID An ME player id. * @return Null if the ME player id is unknown, otherwise the unique id of the * Minecraft profile it originates from. diff --git a/src/main/java/appeng/core/worlddata/MeteorDataNameEncoder.java b/src/main/java/appeng/core/worlddata/MeteorDataNameEncoder.java index 33bee368e..9f42ad71a 100644 --- a/src/main/java/appeng/core/worlddata/MeteorDataNameEncoder.java +++ b/src/main/java/appeng/core/worlddata/MeteorDataNameEncoder.java @@ -18,8 +18,6 @@ package appeng.core.worlddata; -import javax.annotation.Nonnull; - import com.google.common.base.Preconditions; /** diff --git a/src/main/java/appeng/debug/BlockChunkloader.java b/src/main/java/appeng/debug/BlockChunkloader.java index 1a493a620..1e9ef8fef 100644 --- a/src/main/java/appeng/debug/BlockChunkloader.java +++ b/src/main/java/appeng/debug/BlockChunkloader.java @@ -18,7 +18,6 @@ package appeng.debug; -import net.minecraft.block.Block; import net.minecraft.block.material.Material; import appeng.block.AEBaseTileBlock; diff --git a/src/main/java/appeng/debug/BlockCubeGenerator.java b/src/main/java/appeng/debug/BlockCubeGenerator.java index 46081d3eb..4ede00ca2 100644 --- a/src/main/java/appeng/debug/BlockCubeGenerator.java +++ b/src/main/java/appeng/debug/BlockCubeGenerator.java @@ -20,7 +20,6 @@ package appeng.debug; import javax.annotation.Nullable; -import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; diff --git a/src/main/java/appeng/debug/BlockEnergyGenerator.java b/src/main/java/appeng/debug/BlockEnergyGenerator.java index 96758bbbd..bc707c471 100644 --- a/src/main/java/appeng/debug/BlockEnergyGenerator.java +++ b/src/main/java/appeng/debug/BlockEnergyGenerator.java @@ -18,7 +18,6 @@ package appeng.debug; -import net.minecraft.block.Block; import net.minecraft.block.material.Material; import appeng.block.AEBaseTileBlock; diff --git a/src/main/java/appeng/debug/BlockItemGen.java b/src/main/java/appeng/debug/BlockItemGen.java index e8b1ece9d..48ce88bd7 100644 --- a/src/main/java/appeng/debug/BlockItemGen.java +++ b/src/main/java/appeng/debug/BlockItemGen.java @@ -18,7 +18,6 @@ package appeng.debug; -import net.minecraft.block.Block; import net.minecraft.block.material.Material; import appeng.block.AEBaseTileBlock; diff --git a/src/main/java/appeng/debug/BlockPhantomNode.java b/src/main/java/appeng/debug/BlockPhantomNode.java index d92bf8548..94c2b9d60 100644 --- a/src/main/java/appeng/debug/BlockPhantomNode.java +++ b/src/main/java/appeng/debug/BlockPhantomNode.java @@ -20,7 +20,6 @@ package appeng.debug; import javax.annotation.Nullable; -import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; diff --git a/src/main/java/appeng/debug/TileEnergyGenerator.java b/src/main/java/appeng/debug/TileEnergyGenerator.java index 27e98e83f..8e3eb0152 100644 --- a/src/main/java/appeng/debug/TileEnergyGenerator.java +++ b/src/main/java/appeng/debug/TileEnergyGenerator.java @@ -18,8 +18,6 @@ package appeng.debug; -import java.util.EnumSet; - import javax.annotation.Nullable; import com.google.common.math.IntMath; @@ -28,7 +26,6 @@ import net.minecraft.tileentity.ITickableTileEntity; import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.Direction; -import net.minecraft.world.IWorld; import net.minecraft.world.World; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.common.util.LazyOptional; diff --git a/src/main/java/appeng/debug/TileItemGen.java b/src/main/java/appeng/debug/TileItemGen.java index 5064e9dc1..5c7583104 100644 --- a/src/main/java/appeng/debug/TileItemGen.java +++ b/src/main/java/appeng/debug/TileItemGen.java @@ -30,7 +30,6 @@ import net.minecraft.item.Items; import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.Direction; import net.minecraft.util.NonNullList; -import net.minecraft.util.registry.Registry; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.common.util.LazyOptional; import net.minecraftforge.items.CapabilityItemHandler; diff --git a/src/main/java/appeng/debug/ToolDebugCard.java b/src/main/java/appeng/debug/ToolDebugCard.java index 7c45cd686..3937fa824 100644 --- a/src/main/java/appeng/debug/ToolDebugCard.java +++ b/src/main/java/appeng/debug/ToolDebugCard.java @@ -50,7 +50,6 @@ import appeng.me.GridNode; import appeng.me.cache.TickManagerCache; import appeng.parts.p2p.PartP2PTunnel; import appeng.tile.networking.TileController; -import appeng.util.Platform; public class ToolDebugCard extends AEBaseItem { diff --git a/src/main/java/appeng/debug/ToolEraser.java b/src/main/java/appeng/debug/ToolEraser.java index ddedfd148..065def833 100644 --- a/src/main/java/appeng/debug/ToolEraser.java +++ b/src/main/java/appeng/debug/ToolEraser.java @@ -31,7 +31,6 @@ import net.minecraft.world.World; import appeng.core.AELog; import appeng.items.AEBaseItem; -import appeng.util.Platform; public class ToolEraser extends AEBaseItem { diff --git a/src/main/java/appeng/debug/ToolMeteoritePlacer.java b/src/main/java/appeng/debug/ToolMeteoritePlacer.java index 458d025c3..fc6e7e8db 100644 --- a/src/main/java/appeng/debug/ToolMeteoritePlacer.java +++ b/src/main/java/appeng/debug/ToolMeteoritePlacer.java @@ -18,7 +18,6 @@ package appeng.debug; -import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.item.ItemStack; import net.minecraft.item.ItemUseContext; @@ -27,16 +26,13 @@ import net.minecraft.util.ActionResultType; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.ChunkPos; import net.minecraft.util.text.StringTextComponent; -import net.minecraft.world.World; import net.minecraft.world.chunk.Chunk; -import net.minecraft.world.chunk.ChunkSection; import net.minecraft.world.server.ServerWorld; import appeng.items.AEBaseItem; import appeng.worldgen.MeteoritePlacer; import appeng.worldgen.MeteoriteSpawner; import appeng.worldgen.PlacedMeteoriteSettings; -import appeng.worldgen.meteorite.StandardWorld; public class ToolMeteoritePlacer extends AEBaseItem { diff --git a/src/main/java/appeng/debug/ToolReplicatorCard.java b/src/main/java/appeng/debug/ToolReplicatorCard.java index 01fbf9834..f0b1d3c74 100644 --- a/src/main/java/appeng/debug/ToolReplicatorCard.java +++ b/src/main/java/appeng/debug/ToolReplicatorCard.java @@ -41,7 +41,6 @@ import appeng.api.networking.spatial.ISpatialCache; import appeng.api.util.AEPartLocation; import appeng.api.util.DimensionalCoord; import appeng.items.AEBaseItem; -import appeng.util.Platform; public class ToolReplicatorCard extends AEBaseItem { diff --git a/src/main/java/appeng/decorative/solid/BlockQuartzGlass.java b/src/main/java/appeng/decorative/solid/BlockQuartzGlass.java index 37d0e055f..49e359a03 100644 --- a/src/main/java/appeng/decorative/solid/BlockQuartzGlass.java +++ b/src/main/java/appeng/decorative/solid/BlockQuartzGlass.java @@ -19,9 +19,7 @@ package appeng.decorative.solid; import net.minecraft.block.AbstractGlassBlock; -import net.minecraft.block.Block; import net.minecraft.block.BlockState; -import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.util.Direction; diff --git a/src/main/java/appeng/decorative/solid/BlockSkyStone.java b/src/main/java/appeng/decorative/solid/BlockSkyStone.java index 9803096d5..0fe08a17d 100644 --- a/src/main/java/appeng/decorative/solid/BlockSkyStone.java +++ b/src/main/java/appeng/decorative/solid/BlockSkyStone.java @@ -33,7 +33,6 @@ import net.minecraftforge.eventbus.api.SubscribeEvent; import appeng.block.AEBaseBlock; import appeng.core.worlddata.WorldData; -import appeng.util.Platform; public class BlockSkyStone extends AEBaseBlock { private static final float BREAK_SPEAK_SCALAR = 0.1f; @@ -67,8 +66,8 @@ public class BlockSkyStone extends AEBaseBlock { public BlockState updatePostPlacement(BlockState stateIn, Direction facing, BlockState facingState, IWorld worldIn, BlockPos currentPos, BlockPos facingPos) { if (worldIn instanceof ServerWorld) { - WorldData.instance().compassData().service().updateArea((ServerWorld) worldIn, currentPos.getX(), - currentPos.getY(), currentPos.getZ()); + WorldData.instance().compassData().service().updateArea(worldIn, currentPos.getX(), currentPos.getY(), + currentPos.getZ()); } return super.updatePostPlacement(stateIn, facing, facingState, worldIn, currentPos, facingPos); @@ -83,8 +82,7 @@ public class BlockSkyStone extends AEBaseBlock { super.onReplaced(state, w, pos, newState, isMoving); if (w instanceof ServerWorld) { - WorldData.instance().compassData().service().updateArea((ServerWorld) w, pos.getX(), pos.getY(), - pos.getZ()); + WorldData.instance().compassData().service().updateArea(w, pos.getX(), pos.getY(), pos.getZ()); } } diff --git a/src/main/java/appeng/entity/EntityGrowingCrystal.java b/src/main/java/appeng/entity/EntityGrowingCrystal.java index 7e623ae8b..0a41f541e 100644 --- a/src/main/java/appeng/entity/EntityGrowingCrystal.java +++ b/src/main/java/appeng/entity/EntityGrowingCrystal.java @@ -21,7 +21,6 @@ package appeng.entity; import net.minecraft.block.BlockState; import net.minecraft.block.material.Material; import net.minecraft.entity.EntityType; -import net.minecraft.entity.item.ItemEntity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/appeng/entity/EntitySingularity.java b/src/main/java/appeng/entity/EntitySingularity.java index 2e35dc1ce..f1d95514f 100644 --- a/src/main/java/appeng/entity/EntitySingularity.java +++ b/src/main/java/appeng/entity/EntitySingularity.java @@ -34,7 +34,6 @@ import appeng.api.AEApi; import appeng.api.definitions.IMaterials; import appeng.api.features.AEFeature; import appeng.core.AEConfig; -import appeng.helpers.Reflected; import appeng.util.Platform; public final class EntitySingularity extends AEBaseEntityItem { diff --git a/src/main/java/appeng/entity/EntityTinyTNTPrimed.java b/src/main/java/appeng/entity/EntityTinyTNTPrimed.java index a174b8204..e8f6323af 100644 --- a/src/main/java/appeng/entity/EntityTinyTNTPrimed.java +++ b/src/main/java/appeng/entity/EntityTinyTNTPrimed.java @@ -46,7 +46,6 @@ import appeng.api.features.AEFeature; import appeng.core.AEConfig; import appeng.core.AppEng; import appeng.core.sync.packets.PacketMockExplosion; -import appeng.helpers.Reflected; import appeng.util.Platform; public final class EntityTinyTNTPrimed extends TNTEntity implements IEntityAdditionalSpawnData { diff --git a/src/main/java/appeng/fluids/client/gui/widgets/GuiFluidSlot.java b/src/main/java/appeng/fluids/client/gui/widgets/GuiFluidSlot.java index a0b5e0e0d..ebc1fb686 100644 --- a/src/main/java/appeng/fluids/client/gui/widgets/GuiFluidSlot.java +++ b/src/main/java/appeng/fluids/client/gui/widgets/GuiFluidSlot.java @@ -16,7 +16,6 @@ import net.minecraftforge.fluids.FluidAttributes; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidUtil; import net.minecraftforge.fluids.capability.CapabilityFluidHandler; -import net.minecraftforge.fml.client.gui.GuiUtils; import appeng.api.storage.data.IAEFluidStack; import appeng.client.gui.widgets.GuiCustomSlot; diff --git a/src/main/java/appeng/fluids/client/render/FluidStackSizeRenderer.java b/src/main/java/appeng/fluids/client/render/FluidStackSizeRenderer.java index f5e90cfaa..738c514c0 100644 --- a/src/main/java/appeng/fluids/client/render/FluidStackSizeRenderer.java +++ b/src/main/java/appeng/fluids/client/render/FluidStackSizeRenderer.java @@ -22,8 +22,6 @@ import java.math.RoundingMode; import java.text.DecimalFormat; import java.text.DecimalFormatSymbols; -import com.mojang.blaze3d.systems.RenderSystem; - import net.minecraft.client.gui.FontRenderer; import appeng.api.storage.data.IAEFluidStack; diff --git a/src/main/java/appeng/fluids/container/ContainerFluidTerminal.java b/src/main/java/appeng/fluids/container/ContainerFluidTerminal.java index b4d05d868..5000e74eb 100644 --- a/src/main/java/appeng/fluids/container/ContainerFluidTerminal.java +++ b/src/main/java/appeng/fluids/container/ContainerFluidTerminal.java @@ -37,7 +37,13 @@ import net.minecraftforge.fluids.capability.IFluidHandler.FluidAction; import net.minecraftforge.fluids.capability.IFluidHandlerItem; import appeng.api.AEApi; -import appeng.api.config.*; +import appeng.api.config.Actionable; +import appeng.api.config.PowerMultiplier; +import appeng.api.config.SecurityPermissions; +import appeng.api.config.Settings; +import appeng.api.config.SortDir; +import appeng.api.config.SortOrder; +import appeng.api.config.ViewItems; import appeng.api.networking.IGrid; import appeng.api.networking.IGridHost; import appeng.api.networking.IGridNode; diff --git a/src/main/java/appeng/fluids/helper/FluidCellConfig.java b/src/main/java/appeng/fluids/helper/FluidCellConfig.java index bf155b7ed..3a6b97d94 100644 --- a/src/main/java/appeng/fluids/helper/FluidCellConfig.java +++ b/src/main/java/appeng/fluids/helper/FluidCellConfig.java @@ -20,7 +20,6 @@ package appeng.fluids.helper; import javax.annotation.Nonnull; -import net.minecraft.fluid.Fluid; import net.minecraft.item.ItemStack; import net.minecraftforge.common.util.LazyOptional; import net.minecraftforge.fluids.FluidAttributes; diff --git a/src/main/java/appeng/fluids/parts/PartFluidAnnihilationPlane.java b/src/main/java/appeng/fluids/parts/PartFluidAnnihilationPlane.java index 5339bc44c..a360ca91d 100644 --- a/src/main/java/appeng/fluids/parts/PartFluidAnnihilationPlane.java +++ b/src/main/java/appeng/fluids/parts/PartFluidAnnihilationPlane.java @@ -5,32 +5,20 @@ import java.util.List; import javax.annotation.Nonnull; -import net.minecraft.advancements.CriteriaTriggers; -import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.IBucketPickupHandler; -import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.fluid.Fluid; -import net.minecraft.fluid.FluidState; import net.minecraft.fluid.Fluids; import net.minecraft.fluid.IFluidState; import net.minecraft.item.ItemStack; -import net.minecraft.stats.Stats; -import net.minecraft.tags.FluidTags; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ActionResult; import net.minecraft.util.Direction; -import net.minecraft.util.SoundEvent; -import net.minecraft.util.SoundEvents; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockReader; import net.minecraft.world.World; import net.minecraftforge.client.model.data.IModelData; import net.minecraftforge.fluids.FluidAttributes; import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.FluidUtil; -import net.minecraftforge.fluids.IFluidBlock; -import net.minecraftforge.fluids.capability.IFluidHandler; import appeng.api.AEApi; import appeng.api.config.Actionable; diff --git a/src/main/java/appeng/fluids/parts/PartFluidFormationPlane.java b/src/main/java/appeng/fluids/parts/PartFluidFormationPlane.java index 5e5f75cee..afecd55f5 100644 --- a/src/main/java/appeng/fluids/parts/PartFluidFormationPlane.java +++ b/src/main/java/appeng/fluids/parts/PartFluidFormationPlane.java @@ -7,10 +7,8 @@ import java.util.List; import javax.annotation.Nonnull; -import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.fluid.Fluid; import net.minecraft.inventory.container.ContainerType; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundNBT; @@ -23,7 +21,6 @@ import net.minecraftforge.client.model.data.IModelData; import net.minecraftforge.fluids.FluidAttributes; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidUtil; -import net.minecraftforge.fluids.IFluidBlock; import net.minecraftforge.fluids.capability.templates.FluidTank; import appeng.api.AEApi; @@ -45,7 +42,6 @@ import appeng.api.storage.data.IItemList; import appeng.api.util.AEPartLocation; import appeng.container.ContainerLocator; import appeng.container.ContainerOpener; -import appeng.container.implementations.ContainerFormationPlane; import appeng.fluids.container.ContainerFluidFormationPlane; import appeng.fluids.util.AEFluidInventory; import appeng.fluids.util.IAEFluidInventory; diff --git a/src/main/java/appeng/fluids/parts/PartFluidStorageBus.java b/src/main/java/appeng/fluids/parts/PartFluidStorageBus.java index f7288c24b..d812880a7 100644 --- a/src/main/java/appeng/fluids/parts/PartFluidStorageBus.java +++ b/src/main/java/appeng/fluids/parts/PartFluidStorageBus.java @@ -68,7 +68,6 @@ import appeng.container.ContainerLocator; import appeng.container.ContainerOpener; import appeng.core.AppEng; import appeng.core.settings.TickRates; -import appeng.fluids.container.ContainerFluidInterface; import appeng.fluids.container.ContainerFluidStorageBus; import appeng.fluids.util.AEFluidInventory; import appeng.fluids.util.IAEFluidInventory; diff --git a/src/main/java/appeng/fluids/parts/PartSharedFluidBus.java b/src/main/java/appeng/fluids/parts/PartSharedFluidBus.java index 4159de88c..9eb2caafa 100644 --- a/src/main/java/appeng/fluids/parts/PartSharedFluidBus.java +++ b/src/main/java/appeng/fluids/parts/PartSharedFluidBus.java @@ -41,7 +41,6 @@ import appeng.api.util.AECableType; import appeng.container.ContainerLocator; import appeng.container.ContainerOpener; import appeng.fluids.container.ContainerFluidIO; -import appeng.fluids.container.ContainerFluidInterface; import appeng.fluids.util.AEFluidInventory; import appeng.fluids.util.IAEFluidTank; import appeng.me.GridAccessException; diff --git a/src/main/java/appeng/fluids/registries/BasicFluidCellGuiHandler.java b/src/main/java/appeng/fluids/registries/BasicFluidCellGuiHandler.java index cab4876a1..366c438dd 100644 --- a/src/main/java/appeng/fluids/registries/BasicFluidCellGuiHandler.java +++ b/src/main/java/appeng/fluids/registries/BasicFluidCellGuiHandler.java @@ -30,12 +30,9 @@ import appeng.api.storage.IMEInventoryHandler; import appeng.api.storage.IStorageChannel; import appeng.api.storage.channels.IFluidStorageChannel; import appeng.api.storage.data.IAEStack; -import appeng.api.util.AEPartLocation; import appeng.container.ContainerLocator; import appeng.container.ContainerOpener; -import appeng.container.implementations.ContainerFormationPlane; import appeng.fluids.container.ContainerFluidTerminal; -import appeng.util.Platform; public class BasicFluidCellGuiHandler implements ICellGuiHandler { diff --git a/src/main/java/appeng/forge/data/providers/IAE2DataProvider.java b/src/main/java/appeng/forge/data/providers/IAE2DataProvider.java index acd0bfb3e..3548de4b6 100644 --- a/src/main/java/appeng/forge/data/providers/IAE2DataProvider.java +++ b/src/main/java/appeng/forge/data/providers/IAE2DataProvider.java @@ -1,23 +1,11 @@ package appeng.forge.data.providers; -import java.nio.file.Path; - -import javax.annotation.Nonnull; - -import com.google.gson.JsonElement; - import net.minecraft.data.IDataProvider; -import net.minecraft.util.ResourceLocation; -import net.minecraft.world.storage.loot.LootParameterSet; -import net.minecraft.world.storage.loot.LootParameterSets; -import net.minecraft.world.storage.loot.LootTable; -import net.minecraft.world.storage.loot.LootTableManager; import appeng.api.AEApi; import appeng.api.definitions.IBlocks; import appeng.api.definitions.IItems; import appeng.api.definitions.IMaterials; -import appeng.core.AppEng; public interface IAE2DataProvider extends IDataProvider { IBlocks BLOCKS = AEApi.instance().definitions().blocks(); diff --git a/src/main/java/appeng/forge/data/providers/loot/BlockDropProvider.java b/src/main/java/appeng/forge/data/providers/loot/BlockDropProvider.java index 41da17154..aafba126f 100644 --- a/src/main/java/appeng/forge/data/providers/loot/BlockDropProvider.java +++ b/src/main/java/appeng/forge/data/providers/loot/BlockDropProvider.java @@ -18,7 +18,14 @@ import net.minecraft.data.IDataProvider; import net.minecraft.data.loot.BlockLootTables; import net.minecraft.enchantment.Enchantments; import net.minecraft.util.ResourceLocation; -import net.minecraft.world.storage.loot.*; +import net.minecraft.world.storage.loot.ConstantRange; +import net.minecraft.world.storage.loot.ItemLootEntry; +import net.minecraft.world.storage.loot.LootEntry; +import net.minecraft.world.storage.loot.LootParameterSets; +import net.minecraft.world.storage.loot.LootPool; +import net.minecraft.world.storage.loot.LootTable; +import net.minecraft.world.storage.loot.LootTableManager; +import net.minecraft.world.storage.loot.RandomValueRange; import net.minecraft.world.storage.loot.conditions.SurvivesExplosion; import net.minecraft.world.storage.loot.functions.ApplyBonus; import net.minecraft.world.storage.loot.functions.SetCount; diff --git a/src/main/java/appeng/forge/data/providers/recipes/SlabStairRecipes.java b/src/main/java/appeng/forge/data/providers/recipes/SlabStairRecipes.java index f59b806ba..0e87735a6 100644 --- a/src/main/java/appeng/forge/data/providers/recipes/SlabStairRecipes.java +++ b/src/main/java/appeng/forge/data/providers/recipes/SlabStairRecipes.java @@ -1,6 +1,5 @@ package appeng.forge.data.providers.recipes; -import java.nio.file.Path; import java.util.function.Consumer; import javax.annotation.Nonnull; @@ -8,7 +7,11 @@ import javax.annotation.Nonnull; import com.google.common.collect.Sets; import net.minecraft.block.Block; -import net.minecraft.data.*; +import net.minecraft.data.DataGenerator; +import net.minecraft.data.IFinishedRecipe; +import net.minecraft.data.RecipeProvider; +import net.minecraft.data.ShapedRecipeBuilder; +import net.minecraft.data.SingleItemRecipeBuilder; import net.minecraft.item.crafting.Ingredient; import net.minecraft.util.ResourceLocation; import net.minecraftforge.common.crafting.ConditionalRecipe; diff --git a/src/main/java/appeng/helpers/PatternHelper.java b/src/main/java/appeng/helpers/PatternHelper.java index a6496a284..383ba4355 100644 --- a/src/main/java/appeng/helpers/PatternHelper.java +++ b/src/main/java/appeng/helpers/PatternHelper.java @@ -18,7 +18,12 @@ package appeng.helpers; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; import net.minecraft.inventory.CraftingInventory; import net.minecraft.item.Item; diff --git a/src/main/java/appeng/helpers/WirelessTerminalGuiObject.java b/src/main/java/appeng/helpers/WirelessTerminalGuiObject.java index 69c13b080..b1317cf3a 100644 --- a/src/main/java/appeng/helpers/WirelessTerminalGuiObject.java +++ b/src/main/java/appeng/helpers/WirelessTerminalGuiObject.java @@ -20,7 +20,6 @@ package appeng.helpers; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; -import net.minecraft.world.World; import appeng.api.AEApi; import appeng.api.config.AccessRestriction; diff --git a/src/main/java/appeng/hooks/TickHandler.java b/src/main/java/appeng/hooks/TickHandler.java index adb20a24f..9d5cc146d 100644 --- a/src/main/java/appeng/hooks/TickHandler.java +++ b/src/main/java/appeng/hooks/TickHandler.java @@ -41,7 +41,6 @@ import net.minecraftforge.event.TickEvent.Phase; import net.minecraftforge.event.TickEvent.Type; import net.minecraftforge.event.TickEvent.WorldTickEvent; import net.minecraftforge.event.world.WorldEvent; -import net.minecraftforge.eventbus.api.SubscribeEvent; import appeng.api.AEApi; import appeng.api.networking.IGridNode; diff --git a/src/main/java/appeng/integration/modules/jei/CondenserCategory.java b/src/main/java/appeng/integration/modules/jei/CondenserCategory.java index 351f13b02..6b94dcc41 100644 --- a/src/main/java/appeng/integration/modules/jei/CondenserCategory.java +++ b/src/main/java/appeng/integration/modules/jei/CondenserCategory.java @@ -18,7 +18,11 @@ package appeng.integration.modules.jei; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.EnumMap; +import java.util.List; +import java.util.Map; import com.google.common.base.Splitter; diff --git a/src/main/java/appeng/integration/modules/jei/GrinderRecipeCategory.java b/src/main/java/appeng/integration/modules/jei/GrinderRecipeCategory.java index 7e903dbad..88de2fc01 100644 --- a/src/main/java/appeng/integration/modules/jei/GrinderRecipeCategory.java +++ b/src/main/java/appeng/integration/modules/jei/GrinderRecipeCategory.java @@ -18,7 +18,6 @@ package appeng.integration.modules.jei; -import java.awt.*; import java.util.ArrayList; import java.util.Collections; import java.util.List; diff --git a/src/main/java/appeng/integration/modules/jei/InscriberRecipeCategory.java b/src/main/java/appeng/integration/modules/jei/InscriberRecipeCategory.java index 3700db074..0d9b1d408 100644 --- a/src/main/java/appeng/integration/modules/jei/InscriberRecipeCategory.java +++ b/src/main/java/appeng/integration/modules/jei/InscriberRecipeCategory.java @@ -18,15 +18,11 @@ package appeng.integration.modules.jei; -import java.util.ArrayList; -import java.util.List; - import net.minecraft.client.resources.I18n; -import net.minecraft.item.crafting.Ingredient; import net.minecraft.util.ResourceLocation; import mezz.jei.api.constants.VanillaTypes; -import mezz.jei.api.gui.*; +import mezz.jei.api.gui.IRecipeLayout; import mezz.jei.api.gui.drawable.IDrawable; import mezz.jei.api.gui.drawable.IDrawableAnimated; import mezz.jei.api.gui.drawable.IDrawableStatic; diff --git a/src/main/java/appeng/integration/modules/jei/JEIPlugin.java b/src/main/java/appeng/integration/modules/jei/JEIPlugin.java index 0e67ba5ad..736aedf96 100644 --- a/src/main/java/appeng/integration/modules/jei/JEIPlugin.java +++ b/src/main/java/appeng/integration/modules/jei/JEIPlugin.java @@ -32,7 +32,11 @@ import mezz.jei.api.IModPlugin; import mezz.jei.api.JeiPlugin; import mezz.jei.api.constants.VanillaRecipeCategoryUid; import mezz.jei.api.constants.VanillaTypes; -import mezz.jei.api.registration.*; +import mezz.jei.api.registration.IRecipeCatalystRegistration; +import mezz.jei.api.registration.IRecipeCategoryRegistration; +import mezz.jei.api.registration.IRecipeRegistration; +import mezz.jei.api.registration.IRecipeTransferRegistration; +import mezz.jei.api.registration.ISubtypeRegistration; import mezz.jei.api.runtime.IJeiRuntime; import appeng.api.AEApi; diff --git a/src/main/java/appeng/integration/modules/jei/RecipeTransferHandler.java b/src/main/java/appeng/integration/modules/jei/RecipeTransferHandler.java index 813dffd16..01d3056d2 100644 --- a/src/main/java/appeng/integration/modules/jei/RecipeTransferHandler.java +++ b/src/main/java/appeng/integration/modules/jei/RecipeTransferHandler.java @@ -38,7 +38,6 @@ import mezz.jei.api.recipe.transfer.IRecipeTransferHandler; import appeng.container.slot.SlotCraftingMatrix; import appeng.container.slot.SlotFakeCraftingMatrix; -import appeng.core.AELog; import appeng.core.sync.network.NetworkHandler; import appeng.core.sync.packets.PacketJEIRecipe; import appeng.util.Platform; diff --git a/src/main/java/appeng/items/materials/ItemMaterial.java b/src/main/java/appeng/items/materials/ItemMaterial.java index d5d9166f7..dc1863ffd 100644 --- a/src/main/java/appeng/items/materials/ItemMaterial.java +++ b/src/main/java/appeng/items/materials/ItemMaterial.java @@ -19,30 +19,22 @@ package appeng.items.materials; import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; import java.util.Comparator; -import java.util.HashMap; import java.util.List; -import java.util.Map; import java.util.Map.Entry; import java.util.regex.Matcher; import java.util.regex.Pattern; -import com.google.common.base.Preconditions; - import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.Entity; import net.minecraft.entity.item.ItemEntity; import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.ItemGroup; import net.minecraft.item.ItemStack; import net.minecraft.item.ItemUseContext; import net.minecraft.nbt.CompoundNBT; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ActionResultType; import net.minecraft.util.Hand; -import net.minecraft.util.NonNullList; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.StringTextComponent; import net.minecraft.util.text.TranslationTextComponent; @@ -52,7 +44,6 @@ import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.items.IItemHandler; import appeng.api.config.Upgrades; -import appeng.api.features.AEFeature; import appeng.api.implementations.IUpgradeableHost; import appeng.api.implementations.items.IItemGroup; import appeng.api.implementations.items.IStorageComponent; @@ -60,13 +51,8 @@ import appeng.api.implementations.items.IUpgradeModule; import appeng.api.implementations.tiles.ISegmentedInventory; import appeng.api.parts.IPartHost; import appeng.api.parts.SelectedPart; -import appeng.core.AEConfig; -import appeng.core.features.IStackSrc; -import appeng.core.features.MaterialStackSrc; -import appeng.entity.EntitySingularity; import appeng.items.AEBaseItem; import appeng.util.InventoryAdaptor; -import appeng.util.Platform; import appeng.util.inv.AdaptorItemHandler; public final class ItemMaterial extends AEBaseItem implements IStorageComponent, IUpgradeModule { diff --git a/src/main/java/appeng/items/misc/ItemPaintBall.java b/src/main/java/appeng/items/misc/ItemPaintBall.java index 30f9f62d7..69cdee394 100644 --- a/src/main/java/appeng/items/misc/ItemPaintBall.java +++ b/src/main/java/appeng/items/misc/ItemPaintBall.java @@ -18,14 +18,6 @@ package appeng.items.misc; -import net.minecraft.item.Item; -import net.minecraft.item.ItemGroup; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.util.NonNullList; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.TranslationTextComponent; - import appeng.api.util.AEColor; import appeng.items.AEBaseItem; diff --git a/src/main/java/appeng/items/parts/ItemFacade.java b/src/main/java/appeng/items/parts/ItemFacade.java index 3d65d3d63..f4a82ff94 100644 --- a/src/main/java/appeng/items/parts/ItemFacade.java +++ b/src/main/java/appeng/items/parts/ItemFacade.java @@ -27,7 +27,11 @@ import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.RenderTypeLookup; -import net.minecraft.item.*; +import net.minecraft.item.Item; +import net.minecraft.item.ItemGroup; +import net.minecraft.item.ItemStack; +import net.minecraft.item.ItemUseContext; +import net.minecraft.item.Items; import net.minecraft.nbt.CompoundNBT; import net.minecraft.util.ActionResultType; import net.minecraft.util.NonNullList; diff --git a/src/main/java/appeng/items/parts/ItemPart.java b/src/main/java/appeng/items/parts/ItemPart.java index 4fb09756f..7c38aebdf 100644 --- a/src/main/java/appeng/items/parts/ItemPart.java +++ b/src/main/java/appeng/items/parts/ItemPart.java @@ -18,32 +18,20 @@ package appeng.items.parts; -import java.lang.reflect.InvocationTargetException; -import java.util.*; -import java.util.Map.Entry; +import java.util.Set; import java.util.function.Function; -import javax.annotation.Nonnull; import javax.annotation.Nullable; -import com.google.common.base.Preconditions; - import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.ItemGroup; import net.minecraft.item.ItemStack; import net.minecraft.item.ItemUseContext; import net.minecraft.util.ActionResultType; -import net.minecraft.util.NonNullList; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.TranslationTextComponent; import appeng.api.AEApi; import appeng.api.implementations.items.IItemGroup; import appeng.api.parts.IPart; import appeng.api.parts.IPartItem; -import appeng.api.util.AEColor; -import appeng.core.features.ActivityState; -import appeng.core.features.ItemStackSrc; import appeng.core.localization.GuiText; import appeng.items.AEBaseItem; diff --git a/src/main/java/appeng/items/parts/PartType.java b/src/main/java/appeng/items/parts/PartType.java index a46dac06e..cb657cd7e 100644 --- a/src/main/java/appeng/items/parts/PartType.java +++ b/src/main/java/appeng/items/parts/PartType.java @@ -29,7 +29,14 @@ import net.minecraftforge.api.distmarker.OnlyIn; import appeng.api.features.AEFeature; import appeng.api.parts.IPart; -import appeng.fluids.parts.*; +import appeng.fluids.parts.PartFluidAnnihilationPlane; +import appeng.fluids.parts.PartFluidExportBus; +import appeng.fluids.parts.PartFluidFormationPlane; +import appeng.fluids.parts.PartFluidImportBus; +import appeng.fluids.parts.PartFluidInterface; +import appeng.fluids.parts.PartFluidLevelEmitter; +import appeng.fluids.parts.PartFluidStorageBus; +import appeng.fluids.parts.PartFluidTerminal; import appeng.parts.automation.PartAnnihilationPlane; import appeng.parts.automation.PartExportBus; import appeng.parts.automation.PartFormationPlane; @@ -47,7 +54,12 @@ import appeng.parts.networking.PartCableSmart; import appeng.parts.networking.PartDenseCableCovered; import appeng.parts.networking.PartDenseCableSmart; import appeng.parts.networking.PartQuartzFiber; -import appeng.parts.p2p.*; +import appeng.parts.p2p.PartP2PFEPower; +import appeng.parts.p2p.PartP2PFluids; +import appeng.parts.p2p.PartP2PItems; +import appeng.parts.p2p.PartP2PLight; +import appeng.parts.p2p.PartP2PRedstone; +import appeng.parts.p2p.PartP2PTunnelME; import appeng.parts.reporting.PartConversionMonitor; import appeng.parts.reporting.PartCraftingTerminal; import appeng.parts.reporting.PartDarkPanel; diff --git a/src/main/java/appeng/items/storage/AbstractStorageCell.java b/src/main/java/appeng/items/storage/AbstractStorageCell.java index 9e9cb7467..4a1f65dbf 100644 --- a/src/main/java/appeng/items/storage/AbstractStorageCell.java +++ b/src/main/java/appeng/items/storage/AbstractStorageCell.java @@ -28,9 +28,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.ItemUseContext; import net.minecraft.util.ActionResult; import net.minecraft.util.ActionResultType; -import net.minecraft.util.Direction; import net.minecraft.util.Hand; -import net.minecraft.util.math.BlockPos; import net.minecraft.util.text.ITextComponent; import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; diff --git a/src/main/java/appeng/items/storage/ItemViewCell.java b/src/main/java/appeng/items/storage/ItemViewCell.java index 0606f377b..57c5d0346 100644 --- a/src/main/java/appeng/items/storage/ItemViewCell.java +++ b/src/main/java/appeng/items/storage/ItemViewCell.java @@ -18,7 +18,6 @@ package appeng.items.storage; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraftforge.items.IItemHandler; diff --git a/src/main/java/appeng/items/tools/ToolBiometricCard.java b/src/main/java/appeng/items/tools/ToolBiometricCard.java index 326d3a122..b96795e67 100644 --- a/src/main/java/appeng/items/tools/ToolBiometricCard.java +++ b/src/main/java/appeng/items/tools/ToolBiometricCard.java @@ -43,7 +43,6 @@ import appeng.api.implementations.items.IBiometricCard; import appeng.api.networking.security.ISecurityRegistry; import appeng.core.localization.GuiText; import appeng.items.AEBaseItem; -import appeng.util.Platform; public class ToolBiometricCard extends AEBaseItem implements IBiometricCard { public ToolBiometricCard(Properties properties) { diff --git a/src/main/java/appeng/items/tools/ToolNetworkTool.java b/src/main/java/appeng/items/tools/ToolNetworkTool.java index 3139352d7..7594f442f 100644 --- a/src/main/java/appeng/items/tools/ToolNetworkTool.java +++ b/src/main/java/appeng/items/tools/ToolNetworkTool.java @@ -18,22 +18,21 @@ package appeng.items.tools; -import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.ItemUseContext; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.*; +import net.minecraft.util.ActionResult; +import net.minecraft.util.ActionResultType; +import net.minecraft.util.Direction; +import net.minecraft.util.Hand; +import net.minecraft.util.Rotation; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockRayTraceResult; import net.minecraft.util.math.RayTraceResult; -import net.minecraft.util.math.Vec3d; -import net.minecraft.world.IBlockReader; import net.minecraft.world.IWorldReader; import net.minecraft.world.World; -import net.minecraftforge.common.ToolType; import appeng.api.implementations.guiobjects.IGuiItem; import appeng.api.implementations.guiobjects.IGuiItemObject; @@ -41,7 +40,6 @@ import appeng.api.implementations.items.IAEWrench; import appeng.api.networking.IGridHost; import appeng.api.parts.IPartHost; import appeng.api.parts.SelectedPart; -import appeng.api.util.AEPartLocation; import appeng.api.util.DimensionalCoord; import appeng.api.util.INetworkToolAgent; import appeng.container.AEBaseContainer; diff --git a/src/main/java/appeng/items/tools/powered/ToolColorApplicator.java b/src/main/java/appeng/items/tools/powered/ToolColorApplicator.java index 0e443f780..9db31ec0f 100644 --- a/src/main/java/appeng/items/tools/powered/ToolColorApplicator.java +++ b/src/main/java/appeng/items/tools/powered/ToolColorApplicator.java @@ -18,7 +18,12 @@ package appeng.items.tools.powered; -import java.util.*; +import java.util.Collections; +import java.util.HashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Set; import org.apache.commons.lang3.text.WordUtils; diff --git a/src/main/java/appeng/items/tools/powered/ToolMatterCannon.java b/src/main/java/appeng/items/tools/powered/ToolMatterCannon.java index 299caf936..15b3b44e5 100644 --- a/src/main/java/appeng/items/tools/powered/ToolMatterCannon.java +++ b/src/main/java/appeng/items/tools/powered/ToolMatterCannon.java @@ -32,8 +32,19 @@ import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.*; -import net.minecraft.util.math.*; +import net.minecraft.util.ActionResult; +import net.minecraft.util.ActionResultType; +import net.minecraft.util.DamageSource; +import net.minecraft.util.Direction; +import net.minecraft.util.EntityDamageSource; +import net.minecraft.util.Hand; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.BlockRayTraceResult; +import net.minecraft.util.math.EntityRayTraceResult; +import net.minecraft.util.math.RayTraceContext; +import net.minecraft.util.math.RayTraceResult; +import net.minecraft.util.math.Vec3d; import net.minecraft.util.text.ITextComponent; import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; diff --git a/src/main/java/appeng/items/tools/powered/ToolPortableCell.java b/src/main/java/appeng/items/tools/powered/ToolPortableCell.java index 90d766a45..0a9845029 100644 --- a/src/main/java/appeng/items/tools/powered/ToolPortableCell.java +++ b/src/main/java/appeng/items/tools/powered/ToolPortableCell.java @@ -45,7 +45,6 @@ import appeng.api.storage.ICellInventoryHandler; import appeng.api.storage.IStorageChannel; import appeng.api.storage.channels.IItemStorageChannel; import appeng.api.storage.data.IAEItemStack; -import appeng.api.util.AEPartLocation; import appeng.container.ContainerLocator; import appeng.container.ContainerOpener; import appeng.container.implementations.ContainerMEPortableCell; @@ -55,7 +54,6 @@ import appeng.items.contents.CellConfig; import appeng.items.contents.CellUpgrades; import appeng.items.contents.PortableCellViewer; import appeng.items.tools.powered.powersink.AEBasePoweredItem; -import appeng.util.Platform; public class ToolPortableCell extends AEBasePoweredItem implements IStorageCell, IGuiItem, IItemGroup { public ToolPortableCell(Item.Properties props) { diff --git a/src/main/java/appeng/items/tools/powered/powersink/AEBasePoweredItem.java b/src/main/java/appeng/items/tools/powered/powersink/AEBasePoweredItem.java index ae875e066..0f47a8bca 100644 --- a/src/main/java/appeng/items/tools/powered/powersink/AEBasePoweredItem.java +++ b/src/main/java/appeng/items/tools/powered/powersink/AEBasePoweredItem.java @@ -40,7 +40,6 @@ import appeng.api.config.PowerUnits; import appeng.api.implementations.items.IAEItemPowerStorage; import appeng.core.localization.GuiText; import appeng.items.AEBaseItem; -import appeng.util.Platform; public abstract class AEBasePoweredItem extends AEBaseItem implements IAEItemPowerStorage { private static final String CURRENT_POWER_NBT_KEY = "internalCurrentPower"; diff --git a/src/main/java/appeng/items/tools/quartz/ToolQuartzAxe.java b/src/main/java/appeng/items/tools/quartz/ToolQuartzAxe.java index 4639b8470..a5d70ed2f 100644 --- a/src/main/java/appeng/items/tools/quartz/ToolQuartzAxe.java +++ b/src/main/java/appeng/items/tools/quartz/ToolQuartzAxe.java @@ -20,7 +20,6 @@ package appeng.items.tools.quartz; import net.minecraft.item.AxeItem; import net.minecraft.item.Item; -import net.minecraft.item.ItemGroup; import net.minecraft.item.ItemStack; import net.minecraft.item.ItemTier; diff --git a/src/main/java/appeng/items/tools/quartz/ToolQuartzHoe.java b/src/main/java/appeng/items/tools/quartz/ToolQuartzHoe.java index 11856cce1..8cd663981 100644 --- a/src/main/java/appeng/items/tools/quartz/ToolQuartzHoe.java +++ b/src/main/java/appeng/items/tools/quartz/ToolQuartzHoe.java @@ -20,7 +20,6 @@ package appeng.items.tools.quartz; import net.minecraft.item.HoeItem; import net.minecraft.item.Item; -import net.minecraft.item.ItemGroup; import net.minecraft.item.ItemStack; import net.minecraft.item.ItemTier; diff --git a/src/main/java/appeng/items/tools/quartz/ToolQuartzPickaxe.java b/src/main/java/appeng/items/tools/quartz/ToolQuartzPickaxe.java index ea94b2719..84e861824 100644 --- a/src/main/java/appeng/items/tools/quartz/ToolQuartzPickaxe.java +++ b/src/main/java/appeng/items/tools/quartz/ToolQuartzPickaxe.java @@ -19,7 +19,6 @@ package appeng.items.tools.quartz; import net.minecraft.item.Item; -import net.minecraft.item.ItemGroup; import net.minecraft.item.ItemStack; import net.minecraft.item.ItemTier; import net.minecraft.item.PickaxeItem; diff --git a/src/main/java/appeng/items/tools/quartz/ToolQuartzSpade.java b/src/main/java/appeng/items/tools/quartz/ToolQuartzSpade.java index d4073c32b..22b55b11e 100644 --- a/src/main/java/appeng/items/tools/quartz/ToolQuartzSpade.java +++ b/src/main/java/appeng/items/tools/quartz/ToolQuartzSpade.java @@ -19,7 +19,6 @@ package appeng.items.tools.quartz; import net.minecraft.item.Item; -import net.minecraft.item.ItemGroup; import net.minecraft.item.ItemStack; import net.minecraft.item.ItemTier; import net.minecraft.item.ShovelItem; diff --git a/src/main/java/appeng/items/tools/quartz/ToolQuartzSword.java b/src/main/java/appeng/items/tools/quartz/ToolQuartzSword.java index ed5fd5105..0e93f1d9a 100644 --- a/src/main/java/appeng/items/tools/quartz/ToolQuartzSword.java +++ b/src/main/java/appeng/items/tools/quartz/ToolQuartzSword.java @@ -19,7 +19,6 @@ package appeng.items.tools.quartz; import net.minecraft.item.Item; -import net.minecraft.item.ItemGroup; import net.minecraft.item.ItemStack; import net.minecraft.item.ItemTier; import net.minecraft.item.SwordItem; diff --git a/src/main/java/appeng/parts/PartPlacement.java b/src/main/java/appeng/parts/PartPlacement.java index 41065911e..6a7cd5b15 100644 --- a/src/main/java/appeng/parts/PartPlacement.java +++ b/src/main/java/appeng/parts/PartPlacement.java @@ -27,10 +27,21 @@ import net.minecraft.block.BlockState; import net.minecraft.block.SoundType; import net.minecraft.client.Minecraft; import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.*; +import net.minecraft.item.BlockItem; +import net.minecraft.item.BlockItemUseContext; +import net.minecraft.item.DirectionalPlaceContext; +import net.minecraft.item.ItemStack; +import net.minecraft.item.ItemUseContext; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.*; -import net.minecraft.util.math.*; +import net.minecraft.util.ActionResultType; +import net.minecraft.util.Direction; +import net.minecraft.util.Hand; +import net.minecraft.util.SoundCategory; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.BlockRayTraceResult; +import net.minecraft.util.math.RayTraceContext; +import net.minecraft.util.math.RayTraceResult; +import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.TickEvent; @@ -41,7 +52,11 @@ import net.minecraftforge.eventbus.api.SubscribeEvent; import appeng.api.AEApi; import appeng.api.definitions.IBlockDefinition; import appeng.api.definitions.IItems; -import appeng.api.parts.*; +import appeng.api.parts.IFacadePart; +import appeng.api.parts.IPartHost; +import appeng.api.parts.IPartItem; +import appeng.api.parts.PartItemStack; +import appeng.api.parts.SelectedPart; import appeng.api.util.AEPartLocation; import appeng.api.util.DimensionalCoord; import appeng.core.AppEng; diff --git a/src/main/java/appeng/parts/automation/PartAnnihilationPlane.java b/src/main/java/appeng/parts/automation/PartAnnihilationPlane.java index 871fd7279..2bed78919 100644 --- a/src/main/java/appeng/parts/automation/PartAnnihilationPlane.java +++ b/src/main/java/appeng/parts/automation/PartAnnihilationPlane.java @@ -23,8 +23,6 @@ import java.util.List; import javax.annotation.Nonnull; -import com.google.common.collect.Lists; - import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; import net.minecraft.block.material.Material; @@ -551,7 +549,7 @@ public class PartAnnihilationPlane extends PartBasicState implements IGridTickab /** * Creates the fake (and temporary) tool that will be used to calculate the loot * tables of a block this plane wants to break. - * + * * @param state The state of the block about to be broken. */ protected ItemStack createHarvestTool(BlockState state) { diff --git a/src/main/java/appeng/parts/automation/PartExportBus.java b/src/main/java/appeng/parts/automation/PartExportBus.java index 1491c2239..a3eb08088 100644 --- a/src/main/java/appeng/parts/automation/PartExportBus.java +++ b/src/main/java/appeng/parts/automation/PartExportBus.java @@ -58,7 +58,6 @@ import appeng.container.implementations.ContainerUpgradeable; import appeng.core.AELog; import appeng.core.AppEng; import appeng.core.settings.TickRates; -import appeng.fluids.container.ContainerFluidInterface; import appeng.helpers.MultiCraftingTracker; import appeng.helpers.Reflected; import appeng.items.parts.PartModels; diff --git a/src/main/java/appeng/parts/automation/PartFormationPlane.java b/src/main/java/appeng/parts/automation/PartFormationPlane.java index 3694e988f..436e3b7c5 100644 --- a/src/main/java/appeng/parts/automation/PartFormationPlane.java +++ b/src/main/java/appeng/parts/automation/PartFormationPlane.java @@ -29,7 +29,14 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.item.ItemEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.inventory.container.ContainerType; -import net.minecraft.item.*; +import net.minecraft.item.BlockItem; +import net.minecraft.item.DirectionalPlaceContext; +import net.minecraft.item.FireworkRocketItem; +import net.minecraft.item.FireworkStarItem; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.item.ItemUseContext; +import net.minecraft.item.WallOrFloorItem; import net.minecraft.nbt.CompoundNBT; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ActionResultType; @@ -70,7 +77,6 @@ import appeng.container.ContainerLocator; import appeng.container.ContainerOpener; import appeng.container.implementations.ContainerFormationPlane; import appeng.core.AEConfig; -import appeng.fluids.container.ContainerFluidInterface; import appeng.items.parts.PartModels; import appeng.me.GridAccessException; import appeng.me.storage.MEInventoryHandler; diff --git a/src/main/java/appeng/parts/automation/PartImportBus.java b/src/main/java/appeng/parts/automation/PartImportBus.java index d047d979b..ca3275bac 100644 --- a/src/main/java/appeng/parts/automation/PartImportBus.java +++ b/src/main/java/appeng/parts/automation/PartImportBus.java @@ -48,7 +48,6 @@ import appeng.container.ContainerOpener; import appeng.container.implementations.ContainerUpgradeable; import appeng.core.AppEng; import appeng.core.settings.TickRates; -import appeng.fluids.container.ContainerFluidInterface; import appeng.helpers.Reflected; import appeng.items.parts.PartModels; import appeng.me.GridAccessException; diff --git a/src/main/java/appeng/parts/automation/PlaneBakedModel.java b/src/main/java/appeng/parts/automation/PlaneBakedModel.java index bed6cbf20..24d84489e 100644 --- a/src/main/java/appeng/parts/automation/PlaneBakedModel.java +++ b/src/main/java/appeng/parts/automation/PlaneBakedModel.java @@ -18,7 +18,12 @@ package appeng.parts.automation; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Random; import javax.annotation.Nullable; diff --git a/src/main/java/appeng/parts/automation/PlaneModel.java b/src/main/java/appeng/parts/automation/PlaneModel.java index d8019ada6..71cd67332 100644 --- a/src/main/java/appeng/parts/automation/PlaneModel.java +++ b/src/main/java/appeng/parts/automation/PlaneModel.java @@ -20,15 +20,17 @@ package appeng.parts.automation; import java.util.Arrays; import java.util.Collection; -import java.util.Collections; import java.util.Set; import java.util.function.Function; -import javax.annotation.Nullable; - import com.mojang.datafixers.util.Pair; -import net.minecraft.client.renderer.model.*; +import net.minecraft.client.renderer.model.IBakedModel; +import net.minecraft.client.renderer.model.IModelTransform; +import net.minecraft.client.renderer.model.IUnbakedModel; +import net.minecraft.client.renderer.model.ItemOverrideList; +import net.minecraft.client.renderer.model.Material; +import net.minecraft.client.renderer.model.ModelBakery; import net.minecraft.client.renderer.texture.AtlasTexture; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/appeng/parts/automation/PlaneModels.java b/src/main/java/appeng/parts/automation/PlaneModels.java index 4223ca3a0..ccf9c9ad3 100644 --- a/src/main/java/appeng/parts/automation/PlaneModels.java +++ b/src/main/java/appeng/parts/automation/PlaneModels.java @@ -18,13 +18,9 @@ package appeng.parts.automation; -import java.util.ArrayList; -import java.util.HashMap; import java.util.List; -import java.util.Map; import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableMap; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/appeng/parts/misc/PartStorageBus.java b/src/main/java/appeng/parts/misc/PartStorageBus.java index 8ab1b16ba..749c559e2 100644 --- a/src/main/java/appeng/parts/misc/PartStorageBus.java +++ b/src/main/java/appeng/parts/misc/PartStorageBus.java @@ -535,7 +535,7 @@ public class PartStorageBus extends PartUpgradeable // TODO: BC PIPE INTEGRATION /* * @Override - * + * * @Method( iname = IntegrationType.BuildCraftTransport ) public ConnectOverride * overridePipeConnection( PipeType type, ForgeDirection with ) { return type == * PipeType.ITEM && with == this.getSide() ? ConnectOverride.CONNECT : diff --git a/src/main/java/appeng/parts/p2p/PartP2PTunnel.java b/src/main/java/appeng/parts/p2p/PartP2PTunnel.java index 11df822ea..4b9bd26f2 100644 --- a/src/main/java/appeng/parts/p2p/PartP2PTunnel.java +++ b/src/main/java/appeng/parts/p2p/PartP2PTunnel.java @@ -30,8 +30,6 @@ import net.minecraft.network.PacketBuffer; import net.minecraft.util.Hand; import net.minecraft.util.math.Vec3d; import net.minecraftforge.client.model.data.IModelData; -import net.minecraftforge.client.model.data.ModelDataMap; -import net.minecraftforge.client.model.data.ModelProperty; import appeng.api.AEApi; import appeng.api.config.Actionable; diff --git a/src/main/java/appeng/parts/reporting/AbstractPartMonitor.java b/src/main/java/appeng/parts/reporting/AbstractPartMonitor.java index c226ef8e8..3fb849c68 100644 --- a/src/main/java/appeng/parts/reporting/AbstractPartMonitor.java +++ b/src/main/java/appeng/parts/reporting/AbstractPartMonitor.java @@ -242,8 +242,7 @@ public abstract class AbstractPartMonitor extends AbstractPartDisplay matrixStack.translate(0, 0.05, 0.5); - TesrRenderHelper.renderItem2dWithAmount(matrixStack, buffers, ais, 0.4f, -0.23f, 15728880, - combinedOverlayIn); + TesrRenderHelper.renderItem2dWithAmount(matrixStack, buffers, ais, 0.4f, -0.23f, 15728880, combinedOverlayIn); matrixStack.pop(); diff --git a/src/main/java/appeng/parts/reporting/PartCraftingTerminal.java b/src/main/java/appeng/parts/reporting/PartCraftingTerminal.java index ddc9e43ed..71f57d925 100644 --- a/src/main/java/appeng/parts/reporting/PartCraftingTerminal.java +++ b/src/main/java/appeng/parts/reporting/PartCraftingTerminal.java @@ -28,7 +28,6 @@ import net.minecraft.util.ResourceLocation; import net.minecraftforge.items.IItemHandler; import appeng.api.config.SecurityPermissions; -import appeng.api.networking.security.IActionHost; import appeng.api.parts.IPartModel; import appeng.container.implementations.ContainerCraftingTerm; import appeng.container.implementations.ContainerMEMonitorable; diff --git a/src/main/java/appeng/parts/reporting/PartInterfaceTerminal.java b/src/main/java/appeng/parts/reporting/PartInterfaceTerminal.java index 2fe258146..de05fedb6 100644 --- a/src/main/java/appeng/parts/reporting/PartInterfaceTerminal.java +++ b/src/main/java/appeng/parts/reporting/PartInterfaceTerminal.java @@ -27,7 +27,6 @@ import net.minecraft.util.math.Vec3d; import appeng.api.parts.IPartModel; import appeng.container.ContainerLocator; import appeng.container.ContainerOpener; -import appeng.container.implementations.ContainerInscriber; import appeng.container.implementations.ContainerInterfaceTerminal; import appeng.core.AppEng; import appeng.items.parts.PartModels; diff --git a/src/main/java/appeng/recipes/game/DisassembleRecipe.java b/src/main/java/appeng/recipes/game/DisassembleRecipe.java index a07411c40..017333155 100644 --- a/src/main/java/appeng/recipes/game/DisassembleRecipe.java +++ b/src/main/java/appeng/recipes/game/DisassembleRecipe.java @@ -34,7 +34,11 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; import appeng.api.AEApi; -import appeng.api.definitions.*; +import appeng.api.definitions.IBlocks; +import appeng.api.definitions.IDefinitions; +import appeng.api.definitions.IItemDefinition; +import appeng.api.definitions.IItems; +import appeng.api.definitions.IMaterials; import appeng.api.storage.IMEInventory; import appeng.api.storage.channels.IItemStorageChannel; import appeng.api.storage.data.IAEItemStack; diff --git a/src/main/java/appeng/recipes/handlers/InscriberRecipe.java b/src/main/java/appeng/recipes/handlers/InscriberRecipe.java index 3cab16686..ac7adc7fe 100644 --- a/src/main/java/appeng/recipes/handlers/InscriberRecipe.java +++ b/src/main/java/appeng/recipes/handlers/InscriberRecipe.java @@ -1,7 +1,5 @@ package appeng.recipes.handlers; -import javax.annotation.Nullable; - import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; diff --git a/src/main/java/appeng/services/CompassService.java b/src/main/java/appeng/services/CompassService.java index af1c2d932..4e38e7d20 100644 --- a/src/main/java/appeng/services/CompassService.java +++ b/src/main/java/appeng/services/CompassService.java @@ -20,7 +20,11 @@ package appeng.services; import java.util.HashMap; import java.util.Map; -import java.util.concurrent.*; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.Future; +import java.util.concurrent.ThreadFactory; +import java.util.concurrent.TimeUnit; import javax.annotation.Nonnull; diff --git a/src/main/java/appeng/spatial/StorageCellBiome.java b/src/main/java/appeng/spatial/StorageCellBiome.java index 9da3c6d7b..2e2722490 100644 --- a/src/main/java/appeng/spatial/StorageCellBiome.java +++ b/src/main/java/appeng/spatial/StorageCellBiome.java @@ -48,6 +48,7 @@ public class StorageCellBiome extends Biome { // FIXME this.spawnableCaveCreatureList.clear(); } + @Override @OnlyIn(Dist.CLIENT) public int getSkyColor() { return 0x111111; diff --git a/src/main/java/appeng/spatial/StorageCellDimension.java b/src/main/java/appeng/spatial/StorageCellDimension.java index 3a7647710..135ef247c 100644 --- a/src/main/java/appeng/spatial/StorageCellDimension.java +++ b/src/main/java/appeng/spatial/StorageCellDimension.java @@ -24,7 +24,6 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.ChunkPos; import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; -import net.minecraft.world.biome.Biome; import net.minecraft.world.chunk.Chunk; import net.minecraft.world.dimension.Dimension; import net.minecraft.world.dimension.DimensionType; @@ -34,7 +33,6 @@ import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.client.IRenderHandler; import appeng.client.render.SpatialSkyRender; -import appeng.core.AppEng; public class StorageCellDimension extends Dimension { diff --git a/src/main/java/appeng/tile/AEBaseTile.java b/src/main/java/appeng/tile/AEBaseTile.java index 891e60606..1e6581a8a 100644 --- a/src/main/java/appeng/tile/AEBaseTile.java +++ b/src/main/java/appeng/tile/AEBaseTile.java @@ -44,7 +44,6 @@ import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.StringTextComponent; import net.minecraft.world.World; import net.minecraftforge.client.model.data.IModelData; -import net.minecraftforge.client.model.data.ModelDataMap; import net.minecraftforge.items.IItemHandler; import appeng.api.implementations.tiles.ISegmentedInventory; diff --git a/src/main/java/appeng/tile/crafting/CraftingCubeModelData.java b/src/main/java/appeng/tile/crafting/CraftingCubeModelData.java index 89763c7ca..b453b5459 100644 --- a/src/main/java/appeng/tile/crafting/CraftingCubeModelData.java +++ b/src/main/java/appeng/tile/crafting/CraftingCubeModelData.java @@ -31,12 +31,15 @@ public class CraftingCubeModelData extends AEModelData { @Override public boolean equals(Object o) { - if (this == o) + if (this == o) { return true; - if (o == null || getClass() != o.getClass()) + } + if (o == null || getClass() != o.getClass()) { return false; - if (!super.equals(o)) + } + if (!super.equals(o)) { return false; + } CraftingCubeModelData that = (CraftingCubeModelData) o; return connections.equals(that.connections); } diff --git a/src/main/java/appeng/tile/crafting/CraftingMonitorModelData.java b/src/main/java/appeng/tile/crafting/CraftingMonitorModelData.java index 40d426470..13e393ff4 100644 --- a/src/main/java/appeng/tile/crafting/CraftingMonitorModelData.java +++ b/src/main/java/appeng/tile/crafting/CraftingMonitorModelData.java @@ -24,12 +24,15 @@ public class CraftingMonitorModelData extends CraftingCubeModelData { @Override public boolean equals(Object o) { - if (this == o) + if (this == o) { return true; - if (o == null || getClass() != o.getClass()) + } + if (o == null || getClass() != o.getClass()) { return false; - if (!super.equals(o)) + } + if (!super.equals(o)) { return false; + } CraftingMonitorModelData that = (CraftingMonitorModelData) o; return color == that.color; } diff --git a/src/main/java/appeng/tile/crafting/TileCraftingTile.java b/src/main/java/appeng/tile/crafting/TileCraftingTile.java index 49c336511..fd8fa8110 100644 --- a/src/main/java/appeng/tile/crafting/TileCraftingTile.java +++ b/src/main/java/appeng/tile/crafting/TileCraftingTile.java @@ -34,9 +34,7 @@ import net.minecraft.tileentity.TileEntityType; import net.minecraft.util.Direction; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockReader; -import net.minecraftforge.client.model.data.EmptyModelData; import net.minecraftforge.client.model.data.IModelData; -import net.minecraftforge.client.model.data.ModelDataMap; import net.minecraftforge.common.util.Constants; import appeng.api.AEApi; diff --git a/src/main/java/appeng/tile/networking/CableBusTESR.java b/src/main/java/appeng/tile/networking/CableBusTESR.java index 6ee117b28..1801c760c 100644 --- a/src/main/java/appeng/tile/networking/CableBusTESR.java +++ b/src/main/java/appeng/tile/networking/CableBusTESR.java @@ -18,7 +18,6 @@ package appeng.tile.networking; -import appeng.client.render.TesrRenderHelper; import com.mojang.blaze3d.matrix.MatrixStack; import net.minecraft.client.renderer.IRenderTypeBuffer; @@ -27,7 +26,6 @@ import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; import net.minecraft.util.Direction; import appeng.api.parts.IPart; -import appeng.tile.AEBaseTile; public class CableBusTESR extends TileEntityRenderer { diff --git a/src/main/java/appeng/tile/networking/TileCableBus.java b/src/main/java/appeng/tile/networking/TileCableBus.java index ed8ce2261..8156d023e 100644 --- a/src/main/java/appeng/tile/networking/TileCableBus.java +++ b/src/main/java/appeng/tile/networking/TileCableBus.java @@ -38,7 +38,6 @@ import net.minecraft.world.World; import net.minecraftforge.client.model.data.EmptyModelData; import net.minecraftforge.client.model.data.IModelData; import net.minecraftforge.client.model.data.ModelDataMap; -import net.minecraftforge.client.model.data.ModelProperty; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.common.util.LazyOptional; @@ -51,7 +50,6 @@ import appeng.api.util.AECableType; import appeng.api.util.AEColor; import appeng.api.util.AEPartLocation; import appeng.api.util.DimensionalCoord; -import appeng.block.networking.BlockCableBus; import appeng.client.render.cablebus.CableBusRenderState; import appeng.helpers.AEMultiTile; import appeng.hooks.TickHandler; diff --git a/src/main/java/appeng/tile/networking/TileCableBusTESR.java b/src/main/java/appeng/tile/networking/TileCableBusTESR.java index 8ca2df45b..75a0c9230 100644 --- a/src/main/java/appeng/tile/networking/TileCableBusTESR.java +++ b/src/main/java/appeng/tile/networking/TileCableBusTESR.java @@ -20,8 +20,6 @@ package appeng.tile.networking; import net.minecraft.tileentity.TileEntityType; -import appeng.block.networking.BlockCableBus; - public class TileCableBusTESR extends TileCableBus { public TileCableBusTESR(TileEntityType tileEntityTypeIn) { diff --git a/src/main/java/appeng/tile/networking/TileWireless.java b/src/main/java/appeng/tile/networking/TileWireless.java index c79cdec3f..42300fcee 100644 --- a/src/main/java/appeng/tile/networking/TileWireless.java +++ b/src/main/java/appeng/tile/networking/TileWireless.java @@ -42,7 +42,6 @@ import appeng.core.AEConfig; import appeng.me.GridAccessException; import appeng.tile.grid.AENetworkInvTile; import appeng.tile.inventory.AppEngInternalInventory; -import appeng.util.Platform; import appeng.util.inv.InvOperation; import appeng.util.inv.filter.AEItemDefinitionFilter; diff --git a/src/main/java/appeng/tile/powersink/IExternalPowerSink.java b/src/main/java/appeng/tile/powersink/IExternalPowerSink.java index e9ef88125..e36f29fe8 100644 --- a/src/main/java/appeng/tile/powersink/IExternalPowerSink.java +++ b/src/main/java/appeng/tile/powersink/IExternalPowerSink.java @@ -26,7 +26,7 @@ public interface IExternalPowerSink extends IAEPowerStorage { /** * Inject power into the network - * + * * @param externalUnit The {@link PowerUnits} used by the input * @param amount The amount offered to the sink. * @param mode Modulate or simulate the operation. @@ -35,7 +35,7 @@ public interface IExternalPowerSink extends IAEPowerStorage { double injectExternalPower(PowerUnits externalUnit, double amount, Actionable mode); /** - * + * * @param externalUnit The {@link PowerUnits} used by the input * @param maxPowerRequired Limit the demand to this upper bound. * @return The amount of power demanded by the sink. diff --git a/src/main/java/appeng/tile/qnb/TileQuantumBridge.java b/src/main/java/appeng/tile/qnb/TileQuantumBridge.java index 731ad9258..f1082afab 100644 --- a/src/main/java/appeng/tile/qnb/TileQuantumBridge.java +++ b/src/main/java/appeng/tile/qnb/TileQuantumBridge.java @@ -54,7 +54,6 @@ import appeng.me.cluster.implementations.QuantumCalculator; import appeng.me.cluster.implementations.QuantumCluster; import appeng.tile.grid.AENetworkInvTile; import appeng.tile.inventory.AppEngInternalInventory; -import appeng.util.Platform; import appeng.util.inv.InvOperation; public class TileQuantumBridge extends AENetworkInvTile implements IAEMultiBlock, ITickableTileEntity { diff --git a/src/main/java/appeng/tile/storage/TileDrive.java b/src/main/java/appeng/tile/storage/TileDrive.java index 96eb9cb18..70a883b30 100644 --- a/src/main/java/appeng/tile/storage/TileDrive.java +++ b/src/main/java/appeng/tile/storage/TileDrive.java @@ -59,7 +59,6 @@ import appeng.api.storage.data.IAEStack; import appeng.api.util.AECableType; import appeng.api.util.AEPartLocation; import appeng.api.util.DimensionalCoord; -import appeng.block.storage.DriveSlotCellType; import appeng.block.storage.DriveSlotsState; import appeng.client.render.model.DriveModelData; import appeng.container.implementations.ContainerDrive; diff --git a/src/main/java/appeng/tile/storage/TileSkyChest.java b/src/main/java/appeng/tile/storage/TileSkyChest.java index 04737f2dc..b9dfa5b74 100644 --- a/src/main/java/appeng/tile/storage/TileSkyChest.java +++ b/src/main/java/appeng/tile/storage/TileSkyChest.java @@ -22,7 +22,6 @@ import java.io.IOException; import net.minecraft.block.Block; import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.inventory.container.IContainerProvider; import net.minecraft.item.ItemStack; import net.minecraft.network.PacketBuffer; import net.minecraft.tileentity.IChestLid; diff --git a/src/main/java/appeng/util/Platform.java b/src/main/java/appeng/util/Platform.java index 6fb6f499a..5ccfea92f 100644 --- a/src/main/java/appeng/util/Platform.java +++ b/src/main/java/appeng/util/Platform.java @@ -19,8 +19,13 @@ package appeng.util; import java.text.DecimalFormat; -import java.util.*; -import java.util.stream.Collectors; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.List; +import java.util.Objects; +import java.util.Random; +import java.util.WeakHashMap; import javax.annotation.Nullable; @@ -43,7 +48,13 @@ import net.minecraft.item.crafting.IRecipe; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.Direction; import net.minecraft.util.ResourceLocation; -import net.minecraft.util.math.*; +import net.minecraft.util.math.AxisAlignedBB; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.EntityRayTraceResult; +import net.minecraft.util.math.MathHelper; +import net.minecraft.util.math.RayTraceContext; +import net.minecraft.util.math.RayTraceResult; +import net.minecraft.util.math.Vec3d; import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.StringTextComponent; import net.minecraft.util.text.TextFormatting; @@ -60,7 +71,13 @@ import net.minecraftforge.fml.loading.FMLEnvironment; import net.minecraftforge.registries.ForgeRegistries; import appeng.api.AEApi; -import appeng.api.config.*; +import appeng.api.config.AccessRestriction; +import appeng.api.config.Actionable; +import appeng.api.config.PowerMultiplier; +import appeng.api.config.PowerUnits; +import appeng.api.config.SearchBoxMode; +import appeng.api.config.SecurityPermissions; +import appeng.api.config.SortOrder; import appeng.api.definitions.IItemDefinition; import appeng.api.definitions.IMaterials; import appeng.api.features.AEFeature; diff --git a/src/main/java/appeng/util/inv/WrapperInvItemHandler.java b/src/main/java/appeng/util/inv/WrapperInvItemHandler.java index d714fd1a2..01356e8b1 100644 --- a/src/main/java/appeng/util/inv/WrapperInvItemHandler.java +++ b/src/main/java/appeng/util/inv/WrapperInvItemHandler.java @@ -21,7 +21,6 @@ package appeng.util.inv; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; -import net.minecraft.util.text.ITextComponent; import net.minecraftforge.items.IItemHandler; import appeng.util.helpers.ItemHandlerUtil; diff --git a/src/main/java/appeng/worldgen/MeteoritePiece.java b/src/main/java/appeng/worldgen/MeteoritePiece.java index 89016abcc..774c98ee9 100644 --- a/src/main/java/appeng/worldgen/MeteoritePiece.java +++ b/src/main/java/appeng/worldgen/MeteoritePiece.java @@ -9,7 +9,6 @@ import net.minecraft.world.IWorld; import net.minecraft.world.gen.ChunkGenerator; import net.minecraft.world.gen.feature.structure.IStructurePieceType; import net.minecraft.world.gen.feature.structure.ScatteredStructurePiece; -import net.minecraft.world.gen.feature.structure.StructurePiece; import net.minecraft.world.gen.feature.template.TemplateManager; public class MeteoritePiece extends ScatteredStructurePiece { diff --git a/src/main/java/appeng/worldgen/MeteoritePlacer.java b/src/main/java/appeng/worldgen/MeteoritePlacer.java index d113dcf42..b3d9c267d 100644 --- a/src/main/java/appeng/worldgen/MeteoritePlacer.java +++ b/src/main/java/appeng/worldgen/MeteoritePlacer.java @@ -18,7 +18,8 @@ package appeng.worldgen; -import java.util.*; +import java.util.ArrayList; +import java.util.List; import net.minecraft.block.Block; import net.minecraft.block.BlockState; @@ -47,7 +48,6 @@ import appeng.worldgen.meteorite.Fallout; import appeng.worldgen.meteorite.FalloutCopy; import appeng.worldgen.meteorite.FalloutSand; import appeng.worldgen.meteorite.FalloutSnow; -import appeng.worldgen.meteorite.IMeteoriteWorld; import appeng.worldgen.meteorite.MeteoriteBlockPutter; public final class MeteoritePlacer { diff --git a/src/main/java/appeng/worldgen/MeteoriteSpawner.java b/src/main/java/appeng/worldgen/MeteoriteSpawner.java index 930fcb5ef..00a863835 100644 --- a/src/main/java/appeng/worldgen/MeteoriteSpawner.java +++ b/src/main/java/appeng/worldgen/MeteoriteSpawner.java @@ -12,9 +12,6 @@ import net.minecraft.world.IWorldReader; import appeng.api.AEApi; import appeng.api.definitions.IBlocks; -import appeng.core.AEConfig; -import appeng.worldgen.meteorite.IMeteoriteWorld; -import appeng.worldgen.meteorite.StandardWorld; /** * Makes decisions about spawning meteorites in the world. diff --git a/src/main/java/appeng/worldgen/MeteoriteWorldGen.java b/src/main/java/appeng/worldgen/MeteoriteWorldGen.java index b67a505fc..390082069 100644 --- a/src/main/java/appeng/worldgen/MeteoriteWorldGen.java +++ b/src/main/java/appeng/worldgen/MeteoriteWorldGen.java @@ -29,7 +29,6 @@ import net.minecraft.world.gen.ChunkGenerator; import net.minecraft.world.gen.GenerationSettings; import net.minecraft.world.gen.feature.Feature; import net.minecraft.world.gen.feature.NoFeatureConfig; -import net.minecraft.world.server.ServerWorld; import appeng.api.features.AEFeature; import appeng.api.features.IWorldGen.WorldGenType; diff --git a/src/main/java/appeng/worldgen/PlacedMeteoriteSettings.java b/src/main/java/appeng/worldgen/PlacedMeteoriteSettings.java index aaca370a8..720efe226 100644 --- a/src/main/java/appeng/worldgen/PlacedMeteoriteSettings.java +++ b/src/main/java/appeng/worldgen/PlacedMeteoriteSettings.java @@ -1,12 +1,8 @@ package appeng.worldgen; -import java.util.Objects; - import net.minecraft.nbt.CompoundNBT; -import net.minecraft.nbt.NBTUtil; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; -import net.minecraftforge.common.util.INBTSerializable; public final class PlacedMeteoriteSettings { diff --git a/src/main/java/appeng/worldgen/QuartzWorldGen.java b/src/main/java/appeng/worldgen/QuartzWorldGen.java index 44745371e..cbd9a9c66 100644 --- a/src/main/java/appeng/worldgen/QuartzWorldGen.java +++ b/src/main/java/appeng/worldgen/QuartzWorldGen.java @@ -68,28 +68,28 @@ public final class QuartzWorldGen extends ReplaceBlockFeature { ReplaceBlockConfig config) { /* * if( this.oreNormal == null && this.oreCharged == null ) { return false; } - * + * * World w = worldIn.getWorld(); - * + * * int seaLevel = w.getSeaLevel(); - * + * * ChunkPos chunkPos = new ChunkPos( pos ); - * + * * if( seaLevel < 20 ) { final int x = ( chunkPos.x << 4 ) + 8; final int z = ( * chunkPos.z << 4 ) + 8; seaLevel = w.getHeight( Heightmap.Type.WORLD_SURFACE, * x, z ); } - * + * * final int oreDepthMultiplier = * AEConfig.instance().getQuartzOresClusterAmount() * seaLevel / 64; final int * scale = (int) Math.round( r.nextGaussian() * Math.sqrt( oreDepthMultiplier ) * + oreDepthMultiplier ); - * + * * for( int cnt = 0; cnt < ( r.nextBoolean() ? scale * 2 : scale ) / 2; ++cnt ) * { boolean isCharged = false; - * + * * if( this.oreCharged != null ) { isCharged = r.nextFloat() > * AEConfig.instance().getSpawnChargedChance(); } - * + * * final WorldGenMinable whichOre = isCharged ? this.oreCharged : * this.oreNormal; if( whichOre != null && shouldGenerate( isCharged, w ) ) { * final int cx = chunkPos.x * 16 + r.nextInt( 16 ); final int cy = r.nextInt( diff --git a/src/main/java/appeng/worldgen/meteorite/ChunkOnly.java b/src/main/java/appeng/worldgen/meteorite/ChunkOnly.java index 7628e9710..e7ecf841f 100644 --- a/src/main/java/appeng/worldgen/meteorite/ChunkOnly.java +++ b/src/main/java/appeng/worldgen/meteorite/ChunkOnly.java @@ -22,8 +22,6 @@ import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IWorld; -import net.minecraft.world.World; -import net.minecraft.world.chunk.Chunk; import net.minecraft.world.chunk.IChunk; import appeng.util.Platform; diff --git a/src/main/java/appeng/worldgen/meteorite/FalloutCopy.java b/src/main/java/appeng/worldgen/meteorite/FalloutCopy.java index 461861187..dc2808b77 100644 --- a/src/main/java/appeng/worldgen/meteorite/FalloutCopy.java +++ b/src/main/java/appeng/worldgen/meteorite/FalloutCopy.java @@ -18,15 +18,11 @@ package appeng.worldgen.meteorite; -import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IWorld; -import appeng.api.definitions.IBlockDefinition; -import appeng.util.Platform; - public class FalloutCopy extends Fallout { private static final double SPECIFIED_BLOCK_THRESHOLD = 0.9; private static final double AIR_BLOCK_THRESHOLD = 0.8; diff --git a/src/main/java/appeng/worldgen/meteorite/FalloutSand.java b/src/main/java/appeng/worldgen/meteorite/FalloutSand.java index 18f7233a3..d9705fb21 100644 --- a/src/main/java/appeng/worldgen/meteorite/FalloutSand.java +++ b/src/main/java/appeng/worldgen/meteorite/FalloutSand.java @@ -23,8 +23,6 @@ import net.minecraft.block.Blocks; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IWorld; -import appeng.api.definitions.IBlockDefinition; - public class FalloutSand extends FalloutCopy { private static final double GLASS_THRESHOLD = 0.66; private final MeteoriteBlockPutter putter; diff --git a/src/main/java/appeng/worldgen/meteorite/FalloutSnow.java b/src/main/java/appeng/worldgen/meteorite/FalloutSnow.java index 6273d67b9..8116916ff 100644 --- a/src/main/java/appeng/worldgen/meteorite/FalloutSnow.java +++ b/src/main/java/appeng/worldgen/meteorite/FalloutSnow.java @@ -23,8 +23,6 @@ import net.minecraft.block.Blocks; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IWorld; -import appeng.api.definitions.IBlockDefinition; - public class FalloutSnow extends FalloutCopy { private static final double SNOW_THRESHOLD = 0.7; private static final double ICE_THRESHOLD = 0.5; diff --git a/src/main/java/appeng/worldgen/meteorite/IMeteoriteWorld.java b/src/main/java/appeng/worldgen/meteorite/IMeteoriteWorld.java index 57d12a1df..3e423546f 100644 --- a/src/main/java/appeng/worldgen/meteorite/IMeteoriteWorld.java +++ b/src/main/java/appeng/worldgen/meteorite/IMeteoriteWorld.java @@ -23,7 +23,6 @@ import net.minecraft.block.BlockState; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IWorld; -import net.minecraft.world.World; public interface IMeteoriteWorld { int minX(int in); diff --git a/src/main/java/appeng/worldgen/meteorite/MeteoriteBlockPutter.java b/src/main/java/appeng/worldgen/meteorite/MeteoriteBlockPutter.java index e9dfafb2b..8e7d796fc 100644 --- a/src/main/java/appeng/worldgen/meteorite/MeteoriteBlockPutter.java +++ b/src/main/java/appeng/worldgen/meteorite/MeteoriteBlockPutter.java @@ -18,7 +18,6 @@ package appeng.worldgen.meteorite; -import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/appeng/worldgen/meteorite/StandardWorld.java b/src/main/java/appeng/worldgen/meteorite/StandardWorld.java index fc5862e06..7607d063e 100644 --- a/src/main/java/appeng/worldgen/meteorite/StandardWorld.java +++ b/src/main/java/appeng/worldgen/meteorite/StandardWorld.java @@ -24,7 +24,6 @@ import net.minecraft.block.Blocks; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IWorld; -import net.minecraft.world.World; import appeng.util.Platform;