diff --git a/src/api/java/appeng/api/AEAddon.java b/src/api/java/appeng/api/AEAddon.java index f900fcaed..b6e0fd0df 100644 --- a/src/api/java/appeng/api/AEAddon.java +++ b/src/api/java/appeng/api/AEAddon.java @@ -18,7 +18,11 @@ package appeng.api; -import java.lang.annotation.*; +import java.lang.annotation.Documented; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; /** * Use this annotation on a class in your Mod to have it instantiated during the diff --git a/src/api/java/appeng/api/config/Upgrades.java b/src/api/java/appeng/api/config/Upgrades.java index a373836c0..458d89bfc 100644 --- a/src/api/java/appeng/api/config/Upgrades.java +++ b/src/api/java/appeng/api/config/Upgrades.java @@ -23,7 +23,11 @@ package appeng.api.config; -import java.util.*; +import java.util.ArrayList; +import java.util.Comparator; +import java.util.HashSet; +import java.util.List; +import java.util.Set; import javax.annotation.Nullable; diff --git a/src/datagen/java/appeng/data/providers/loot/BlockDropProvider.java b/src/datagen/java/appeng/data/providers/loot/BlockDropProvider.java index 24370cf79..98a44e682 100644 --- a/src/datagen/java/appeng/data/providers/loot/BlockDropProvider.java +++ b/src/datagen/java/appeng/data/providers/loot/BlockDropProvider.java @@ -17,7 +17,11 @@ import net.minecraft.data.DataCache; import net.minecraft.data.DataProvider; import net.minecraft.data.server.BlockLootTableGenerator; import net.minecraft.enchantment.Enchantments; -import net.minecraft.loot.*; +import net.minecraft.loot.ConstantLootTableRange; +import net.minecraft.loot.LootManager; +import net.minecraft.loot.LootPool; +import net.minecraft.loot.LootTable; +import net.minecraft.loot.UniformLootTableRange; import net.minecraft.loot.condition.SurvivesExplosionLootCondition; import net.minecraft.loot.context.LootContextTypes; import net.minecraft.loot.entry.ItemEntry; diff --git a/src/main/java/appeng/block/misc/LightDetectorBlock.java b/src/main/java/appeng/block/misc/LightDetectorBlock.java index 929d3b5d8..bb5ec13c1 100644 --- a/src/main/java/appeng/block/misc/LightDetectorBlock.java +++ b/src/main/java/appeng/block/misc/LightDetectorBlock.java @@ -18,7 +18,11 @@ package appeng.block.misc; -import net.minecraft.block.*; +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; +import net.minecraft.block.Blocks; +import net.minecraft.block.Material; +import net.minecraft.block.ShapeContext; import net.minecraft.state.StateManager; import net.minecraft.state.property.BooleanProperty; import net.minecraft.state.property.Properties; diff --git a/src/main/java/appeng/block/misc/QuartzFixtureBlock.java b/src/main/java/appeng/block/misc/QuartzFixtureBlock.java index e6a33cfbe..f0ff311b8 100644 --- a/src/main/java/appeng/block/misc/QuartzFixtureBlock.java +++ b/src/main/java/appeng/block/misc/QuartzFixtureBlock.java @@ -26,7 +26,11 @@ import javax.annotation.Nullable; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; -import net.minecraft.block.*; +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; +import net.minecraft.block.Blocks; +import net.minecraft.block.Material; +import net.minecraft.block.ShapeContext; import net.minecraft.item.ItemPlacementContext; import net.minecraft.sound.BlockSoundGroup; import net.minecraft.state.StateManager; diff --git a/src/main/java/appeng/block/paint/PaintSplotchesBlock.java b/src/main/java/appeng/block/paint/PaintSplotchesBlock.java index 988ec09b1..707a95af6 100644 --- a/src/main/java/appeng/block/paint/PaintSplotchesBlock.java +++ b/src/main/java/appeng/block/paint/PaintSplotchesBlock.java @@ -18,7 +18,11 @@ package appeng.block.paint; -import net.minecraft.block.*; +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; +import net.minecraft.block.Material; +import net.minecraft.block.MaterialColor; +import net.minecraft.block.ShapeContext; import net.minecraft.item.ItemGroup; import net.minecraft.item.ItemPlacementContext; import net.minecraft.item.ItemStack; diff --git a/src/main/java/appeng/block/spatial/MatrixFrameBlock.java b/src/main/java/appeng/block/spatial/MatrixFrameBlock.java index 7935eca20..56fba3ff4 100644 --- a/src/main/java/appeng/block/spatial/MatrixFrameBlock.java +++ b/src/main/java/appeng/block/spatial/MatrixFrameBlock.java @@ -18,7 +18,11 @@ package appeng.block.spatial; -import net.minecraft.block.*; +import net.minecraft.block.BlockRenderType; +import net.minecraft.block.BlockState; +import net.minecraft.block.Material; +import net.minecraft.block.MaterialColor; +import net.minecraft.block.ShapeContext; import net.minecraft.block.piston.PistonBehavior; import net.minecraft.item.ItemGroup; import net.minecraft.item.ItemStack; diff --git a/src/main/java/appeng/bootstrap/FeatureFactory.java b/src/main/java/appeng/bootstrap/FeatureFactory.java index fe9fed15f..1c4fa90e5 100644 --- a/src/main/java/appeng/bootstrap/FeatureFactory.java +++ b/src/main/java/appeng/bootstrap/FeatureFactory.java @@ -18,7 +18,13 @@ package appeng.bootstrap; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; import java.util.function.BiFunction; import java.util.function.Function; import java.util.function.Supplier; diff --git a/src/main/java/appeng/client/AppEngClient.java b/src/main/java/appeng/client/AppEngClient.java index 1e42c4556..a3c4958ae 100644 --- a/src/main/java/appeng/client/AppEngClient.java +++ b/src/main/java/appeng/client/AppEngClient.java @@ -1,6 +1,10 @@ package appeng.client; -import java.util.*; +import java.util.Collection; +import java.util.EnumMap; +import java.util.List; +import java.util.Map; +import java.util.Random; import java.util.function.Supplier; import java.util.stream.Collectors; import java.util.stream.Stream; @@ -37,18 +41,94 @@ import appeng.bootstrap.ModelsReloadCallback; import appeng.bootstrap.components.IClientSetupComponent; import appeng.bootstrap.components.IItemColorRegistrationComponent; import appeng.bootstrap.components.IModelBakeComponent; -import appeng.client.gui.implementations.*; +import appeng.client.gui.implementations.CellWorkbenchScreen; +import appeng.client.gui.implementations.ChestScreen; +import appeng.client.gui.implementations.CondenserScreen; +import appeng.client.gui.implementations.CraftAmountScreen; +import appeng.client.gui.implementations.CraftConfirmScreen; +import appeng.client.gui.implementations.CraftingCPUScreen; +import appeng.client.gui.implementations.CraftingStatusScreen; +import appeng.client.gui.implementations.CraftingTermScreen; +import appeng.client.gui.implementations.DriveScreen; +import appeng.client.gui.implementations.FormationPlaneScreen; +import appeng.client.gui.implementations.GrinderScreen; +import appeng.client.gui.implementations.IOPortScreen; +import appeng.client.gui.implementations.InscriberScreen; +import appeng.client.gui.implementations.InterfaceScreen; +import appeng.client.gui.implementations.InterfaceTerminalScreen; +import appeng.client.gui.implementations.LevelEmitterScreen; +import appeng.client.gui.implementations.MEMonitorableScreen; +import appeng.client.gui.implementations.MEPortableCellScreen; +import appeng.client.gui.implementations.MolecularAssemblerScreen; +import appeng.client.gui.implementations.NetworkStatusScreen; +import appeng.client.gui.implementations.NetworkToolScreen; +import appeng.client.gui.implementations.PatternTermScreen; +import appeng.client.gui.implementations.PriorityScreen; +import appeng.client.gui.implementations.QNBScreen; +import appeng.client.gui.implementations.QuartzKnifeScreen; +import appeng.client.gui.implementations.SecurityStationScreen; +import appeng.client.gui.implementations.SkyChestScreen; +import appeng.client.gui.implementations.SpatialIOPortScreen; +import appeng.client.gui.implementations.StorageBusScreen; +import appeng.client.gui.implementations.UpgradeableScreen; +import appeng.client.gui.implementations.VibrationChamberScreen; +import appeng.client.gui.implementations.WirelessScreen; +import appeng.client.gui.implementations.WirelessTermScreen; import appeng.client.render.FacadeItemModel; import appeng.client.render.SimpleModelLoader; import appeng.client.render.cablebus.CableBusModelLoader; import appeng.client.render.cablebus.P2PTunnelFrequencyModel; import appeng.client.render.crafting.CraftingCubeModel; -import appeng.client.render.effects.*; -import appeng.client.render.model.*; +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.ParticleTypes; +import appeng.client.render.effects.VibrantFX; +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.spatial.SpatialPylonModel; import appeng.client.render.tesr.InscriberTESR; import appeng.client.render.tesr.SkyChestTESR; -import appeng.container.implementations.*; +import appeng.container.implementations.CellWorkbenchContainer; +import appeng.container.implementations.ChestContainer; +import appeng.container.implementations.CondenserContainer; +import appeng.container.implementations.CraftAmountContainer; +import appeng.container.implementations.CraftConfirmContainer; +import appeng.container.implementations.CraftingCPUContainer; +import appeng.container.implementations.CraftingStatusContainer; +import appeng.container.implementations.CraftingTermContainer; +import appeng.container.implementations.DriveContainer; +import appeng.container.implementations.FormationPlaneContainer; +import appeng.container.implementations.GrinderContainer; +import appeng.container.implementations.IOPortContainer; +import appeng.container.implementations.InscriberContainer; +import appeng.container.implementations.InterfaceContainer; +import appeng.container.implementations.InterfaceTerminalContainer; +import appeng.container.implementations.LevelEmitterContainer; +import appeng.container.implementations.MEMonitorableContainer; +import appeng.container.implementations.MEPortableCellContainer; +import appeng.container.implementations.MolecularAssemblerContainer; +import appeng.container.implementations.NetworkStatusContainer; +import appeng.container.implementations.NetworkToolContainer; +import appeng.container.implementations.PatternTermContainer; +import appeng.container.implementations.PriorityContainer; +import appeng.container.implementations.QNBContainer; +import appeng.container.implementations.QuartzKnifeContainer; +import appeng.container.implementations.SecurityStationContainer; +import appeng.container.implementations.SkyChestContainer; +import appeng.container.implementations.SpatialIOPortContainer; +import appeng.container.implementations.StorageBusContainer; +import appeng.container.implementations.UpgradeableContainer; +import appeng.container.implementations.VibrationChamberContainer; +import appeng.container.implementations.WirelessContainer; +import appeng.container.implementations.WirelessTermContainer; import appeng.core.Api; import appeng.core.ApiDefinitions; import appeng.core.AppEng; @@ -56,9 +136,23 @@ import appeng.core.AppEngBase; import appeng.core.features.registries.PartModels; import appeng.core.sync.network.ClientNetworkHandler; import appeng.core.worlddata.WorldData; -import appeng.entity.*; -import appeng.fluids.client.gui.*; -import appeng.fluids.container.*; +import appeng.entity.ChargedQuartzEntity; +import appeng.entity.GrowingCrystalEntity; +import appeng.entity.SingularityEntity; +import appeng.entity.TinyTNTPrimedEntity; +import appeng.entity.TinyTNTPrimedRenderer; +import appeng.fluids.client.gui.FluidFormationPlaneScreen; +import appeng.fluids.client.gui.FluidIOScreen; +import appeng.fluids.client.gui.FluidInterfaceScreen; +import appeng.fluids.client.gui.FluidLevelEmitterScreen; +import appeng.fluids.client.gui.FluidStorageBusScreen; +import appeng.fluids.client.gui.FluidTerminalScreen; +import appeng.fluids.container.FluidFormationPlaneContainer; +import appeng.fluids.container.FluidIOContainer; +import appeng.fluids.container.FluidInterfaceContainer; +import appeng.fluids.container.FluidLevelEmitterContainer; +import appeng.fluids.container.FluidStorageBusContainer; +import appeng.fluids.container.FluidTerminalContainer; import appeng.hooks.ClientTickHandler; import appeng.parts.automation.PlaneModel; import appeng.tile.crafting.MolecularAssemblerRenderer; diff --git a/src/main/java/appeng/client/gui/AEBaseScreen.java b/src/main/java/appeng/client/gui/AEBaseScreen.java index 7bd1b2bf1..c5e0fa11e 100644 --- a/src/main/java/appeng/client/gui/AEBaseScreen.java +++ b/src/main/java/appeng/client/gui/AEBaseScreen.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 java.util.stream.Collectors; @@ -66,8 +70,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.CraftingTermSlot; +import appeng.container.slot.DisabledSlot; +import appeng.container.slot.FakeSlot; +import appeng.container.slot.IOptionalSlot; +import appeng.container.slot.InaccessibleSlot; +import appeng.container.slot.OutputSlot; +import appeng.container.slot.PatternTermSlot; +import appeng.container.slot.RestrictedInputSlot; import appeng.core.AELog; import appeng.core.AppEng; import appeng.core.sync.network.NetworkHandler; diff --git a/src/main/java/appeng/client/gui/implementations/AESubScreen.java b/src/main/java/appeng/client/gui/implementations/AESubScreen.java index 9fd98d7cb..aa74e4e1f 100644 --- a/src/main/java/appeng/client/gui/implementations/AESubScreen.java +++ b/src/main/java/appeng/client/gui/implementations/AESubScreen.java @@ -13,7 +13,11 @@ import appeng.api.definitions.IDefinitions; import appeng.api.definitions.IParts; import appeng.client.gui.AEBaseScreen; import appeng.client.gui.widgets.TabButton; -import appeng.container.implementations.*; +import appeng.container.implementations.ChestContainer; +import appeng.container.implementations.CraftingTermContainer; +import appeng.container.implementations.MEMonitorableContainer; +import appeng.container.implementations.PatternTermContainer; +import appeng.container.implementations.WirelessTermContainer; import appeng.core.Api; import appeng.core.sync.network.NetworkHandler; import appeng.core.sync.packets.SwitchGuisPacket; diff --git a/src/main/java/appeng/client/gui/implementations/CellWorkbenchScreen.java b/src/main/java/appeng/client/gui/implementations/CellWorkbenchScreen.java index 71f1f74ec..05560e642 100644 --- a/src/main/java/appeng/client/gui/implementations/CellWorkbenchScreen.java +++ b/src/main/java/appeng/client/gui/implementations/CellWorkbenchScreen.java @@ -25,7 +25,11 @@ import net.minecraft.text.Text; import alexiil.mc.lib.attributes.item.FixedItemInv; -import appeng.api.config.*; +import appeng.api.config.ActionItems; +import appeng.api.config.CopyMode; +import appeng.api.config.FuzzyMode; +import appeng.api.config.Settings; +import appeng.api.config.Upgrades; import appeng.api.implementations.items.IUpgradeModule; import appeng.client.gui.widgets.ActionButton; import appeng.client.gui.widgets.SettingToggleButton; diff --git a/src/main/java/appeng/client/gui/implementations/InterfaceTerminalScreen.java b/src/main/java/appeng/client/gui/implementations/InterfaceTerminalScreen.java index 1de6738b1..4adaa867c 100644 --- a/src/main/java/appeng/client/gui/implementations/InterfaceTerminalScreen.java +++ b/src/main/java/appeng/client/gui/implementations/InterfaceTerminalScreen.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/LevelEmitterScreen.java b/src/main/java/appeng/client/gui/implementations/LevelEmitterScreen.java index 79b09b62e..f9cb89255 100644 --- a/src/main/java/appeng/client/gui/implementations/LevelEmitterScreen.java +++ b/src/main/java/appeng/client/gui/implementations/LevelEmitterScreen.java @@ -22,7 +22,13 @@ import net.minecraft.client.util.math.MatrixStack; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.text.Text; -import appeng.api.config.*; +import appeng.api.config.FuzzyMode; +import appeng.api.config.LevelType; +import appeng.api.config.PowerUnits; +import appeng.api.config.RedstoneMode; +import appeng.api.config.Settings; +import appeng.api.config.Upgrades; +import appeng.api.config.YesNo; import appeng.client.gui.NumberEntryType; import appeng.client.gui.widgets.ServerSettingToggleButton; import appeng.client.gui.widgets.SettingToggleButton; diff --git a/src/main/java/appeng/client/gui/implementations/MEMonitorableScreen.java b/src/main/java/appeng/client/gui/implementations/MEMonitorableScreen.java index 1fcc659fe..0711565f3 100644 --- a/src/main/java/appeng/client/gui/implementations/MEMonitorableScreen.java +++ b/src/main/java/appeng/client/gui/implementations/MEMonitorableScreen.java @@ -28,7 +28,12 @@ import net.minecraft.item.ItemStack; import net.minecraft.screen.slot.Slot; import net.minecraft.text.Text; -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; @@ -37,7 +42,11 @@ import appeng.api.util.IConfigManager; import appeng.api.util.IConfigurableObject; import appeng.client.ActionKey; import appeng.client.gui.AEBaseMEScreen; -import appeng.client.gui.widgets.*; +import appeng.client.gui.widgets.AETextField; +import appeng.client.gui.widgets.ISortSource; +import appeng.client.gui.widgets.Scrollbar; +import appeng.client.gui.widgets.SettingToggleButton; +import appeng.client.gui.widgets.TabButton; import appeng.client.me.InternalSlotME; import appeng.client.me.ItemRepo; import appeng.container.implementations.CraftingStatusContainer; diff --git a/src/main/java/appeng/client/gui/implementations/StorageBusScreen.java b/src/main/java/appeng/client/gui/implementations/StorageBusScreen.java index a96d54878..2f5ae3615 100644 --- a/src/main/java/appeng/client/gui/implementations/StorageBusScreen.java +++ b/src/main/java/appeng/client/gui/implementations/StorageBusScreen.java @@ -22,7 +22,11 @@ import net.minecraft.client.util.math.MatrixStack; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.text.Text; -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.ActionButton; import appeng.client.gui.widgets.ServerSettingToggleButton; import appeng.client.gui.widgets.SettingToggleButton; diff --git a/src/main/java/appeng/client/gui/implementations/UpgradeableScreen.java b/src/main/java/appeng/client/gui/implementations/UpgradeableScreen.java index 4fe5fa495..eb87574fd 100644 --- a/src/main/java/appeng/client/gui/implementations/UpgradeableScreen.java +++ b/src/main/java/appeng/client/gui/implementations/UpgradeableScreen.java @@ -22,7 +22,12 @@ import net.minecraft.client.util.math.MatrixStack; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.text.Text; -import appeng.api.config.*; +import appeng.api.config.FuzzyMode; +import appeng.api.config.RedstoneMode; +import appeng.api.config.SchedulingMode; +import appeng.api.config.Settings; +import appeng.api.config.Upgrades; +import appeng.api.config.YesNo; import appeng.api.implementations.IUpgradeableHost; import appeng.client.gui.AEBaseScreen; import appeng.client.gui.widgets.ServerSettingToggleButton; diff --git a/src/main/java/appeng/client/gui/widgets/SettingToggleButton.java b/src/main/java/appeng/client/gui/widgets/SettingToggleButton.java index 88d59c508..bc788d22a 100644 --- a/src/main/java/appeng/client/gui/widgets/SettingToggleButton.java +++ b/src/main/java/appeng/client/gui/widgets/SettingToggleButton.java @@ -29,7 +29,24 @@ import net.minecraft.client.gui.widget.ButtonWidget; import net.minecraft.text.LiteralText; import net.minecraft.text.Text; -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/render/cablebus/CableBuilder.java b/src/main/java/appeng/client/render/cablebus/CableBuilder.java index fbd005742..8e27bba11 100644 --- a/src/main/java/appeng/client/render/cablebus/CableBuilder.java +++ b/src/main/java/appeng/client/render/cablebus/CableBuilder.java @@ -18,7 +18,12 @@ package appeng.client.render.cablebus; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.EnumMap; +import java.util.EnumSet; +import java.util.List; +import java.util.Locale; import java.util.function.Function; import net.fabricmc.api.EnvType; diff --git a/src/main/java/appeng/client/render/cablebus/CableBusBakedModel.java b/src/main/java/appeng/client/render/cablebus/CableBusBakedModel.java index 409d24cc5..4f2c1937d 100644 --- a/src/main/java/appeng/client/render/cablebus/CableBusBakedModel.java +++ b/src/main/java/appeng/client/render/cablebus/CableBusBakedModel.java @@ -18,8 +18,14 @@ package appeng.client.render.cablebus; -import java.util.*; +import java.util.ArrayList; +import java.util.EnumMap; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; import java.util.Map.Entry; +import java.util.Random; import java.util.function.Supplier; import javax.annotation.Nullable; diff --git a/src/main/java/appeng/client/render/cablebus/CableBusRenderState.java b/src/main/java/appeng/client/render/cablebus/CableBusRenderState.java index 014b18745..9076b2446 100644 --- a/src/main/java/appeng/client/render/cablebus/CableBusRenderState.java +++ b/src/main/java/appeng/client/render/cablebus/CableBusRenderState.java @@ -19,7 +19,11 @@ package appeng.client.render.cablebus; import java.lang.ref.WeakReference; -import java.util.*; +import java.util.ArrayList; +import java.util.EnumMap; +import java.util.EnumSet; +import java.util.List; +import java.util.Objects; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Box; diff --git a/src/main/java/appeng/client/render/cablebus/FacadeBuilder.java b/src/main/java/appeng/client/render/cablebus/FacadeBuilder.java index 2707139ba..7e37d9a63 100644 --- a/src/main/java/appeng/client/render/cablebus/FacadeBuilder.java +++ b/src/main/java/appeng/client/render/cablebus/FacadeBuilder.java @@ -18,8 +18,14 @@ package appeng.client.render.cablebus; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.EnumMap; +import java.util.List; +import java.util.Map; import java.util.Map.Entry; +import java.util.Random; +import java.util.Set; import java.util.function.Function; import java.util.function.Supplier; @@ -53,7 +59,11 @@ import appeng.api.util.AEAxisAlignedBB; import appeng.core.Api; import appeng.mixins.MinecraftClientAccessor; import appeng.parts.misc.CableAnchorPart; -import appeng.thirdparty.codechicken.lib.model.pipeline.transformers.*; +import appeng.thirdparty.codechicken.lib.model.pipeline.transformers.QuadClamper; +import appeng.thirdparty.codechicken.lib.model.pipeline.transformers.QuadCornerKicker; +import appeng.thirdparty.codechicken.lib.model.pipeline.transformers.QuadFaceStripper; +import appeng.thirdparty.codechicken.lib.model.pipeline.transformers.QuadReInterpolator; +import appeng.thirdparty.codechicken.lib.model.pipeline.transformers.QuadTinter; /** * The FacadeBuilder builds for facades.. diff --git a/src/main/java/appeng/client/render/effects/CraftingFx.java b/src/main/java/appeng/client/render/effects/CraftingFx.java index 60b5b435b..fdbafb975 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 net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; -import net.minecraft.client.particle.*; +import net.minecraft.client.particle.Particle; +import net.minecraft.client.particle.ParticleFactory; +import net.minecraft.client.particle.ParticleTextureSheet; +import net.minecraft.client.particle.SpriteBillboardParticle; +import net.minecraft.client.particle.SpriteProvider; import net.minecraft.client.render.Camera; import net.minecraft.client.render.VertexConsumer; import net.minecraft.client.util.math.Vector3f; diff --git a/src/main/java/appeng/client/render/effects/EnergyFx.java b/src/main/java/appeng/client/render/effects/EnergyFx.java index 5106e7fff..a66a91f76 100644 --- a/src/main/java/appeng/client/render/effects/EnergyFx.java +++ b/src/main/java/appeng/client/render/effects/EnergyFx.java @@ -20,7 +20,11 @@ package appeng.client.render.effects; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; -import net.minecraft.client.particle.*; +import net.minecraft.client.particle.Particle; +import net.minecraft.client.particle.ParticleFactory; +import net.minecraft.client.particle.ParticleTextureSheet; +import net.minecraft.client.particle.SpriteBillboardParticle; +import net.minecraft.client.particle.SpriteProvider; import net.minecraft.client.render.Camera; import net.minecraft.client.render.VertexConsumer; import net.minecraft.client.world.ClientWorld; diff --git a/src/main/java/appeng/client/render/effects/LightningFX.java b/src/main/java/appeng/client/render/effects/LightningFX.java index 8aebb6e3b..a08726db8 100644 --- a/src/main/java/appeng/client/render/effects/LightningFX.java +++ b/src/main/java/appeng/client/render/effects/LightningFX.java @@ -23,7 +23,11 @@ import java.util.Random; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.client.MinecraftClient; -import net.minecraft.client.particle.*; +import net.minecraft.client.particle.Particle; +import net.minecraft.client.particle.ParticleFactory; +import net.minecraft.client.particle.ParticleTextureSheet; +import net.minecraft.client.particle.SpriteBillboardParticle; +import net.minecraft.client.particle.SpriteProvider; import net.minecraft.client.render.Camera; import net.minecraft.client.render.VertexConsumer; import net.minecraft.client.world.ClientWorld; diff --git a/src/main/java/appeng/client/render/effects/MatterCannonFX.java b/src/main/java/appeng/client/render/effects/MatterCannonFX.java index 796c95092..5065e7cb0 100644 --- a/src/main/java/appeng/client/render/effects/MatterCannonFX.java +++ b/src/main/java/appeng/client/render/effects/MatterCannonFX.java @@ -20,7 +20,11 @@ package appeng.client.render.effects; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; -import net.minecraft.client.particle.*; +import net.minecraft.client.particle.Particle; +import net.minecraft.client.particle.ParticleFactory; +import net.minecraft.client.particle.ParticleTextureSheet; +import net.minecraft.client.particle.SpriteBillboardParticle; +import net.minecraft.client.particle.SpriteProvider; import net.minecraft.client.world.ClientWorld; import net.minecraft.particle.DefaultParticleType; diff --git a/src/main/java/appeng/client/render/effects/VibrantFX.java b/src/main/java/appeng/client/render/effects/VibrantFX.java index 1ded2d5cb..379ab1a08 100644 --- a/src/main/java/appeng/client/render/effects/VibrantFX.java +++ b/src/main/java/appeng/client/render/effects/VibrantFX.java @@ -20,7 +20,11 @@ package appeng.client.render.effects; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; -import net.minecraft.client.particle.*; +import net.minecraft.client.particle.Particle; +import net.minecraft.client.particle.ParticleFactory; +import net.minecraft.client.particle.ParticleTextureSheet; +import net.minecraft.client.particle.SpriteBillboardParticle; +import net.minecraft.client.particle.SpriteProvider; import net.minecraft.client.world.ClientWorld; import net.minecraft.particle.DefaultParticleType; diff --git a/src/main/java/appeng/container/AEBaseContainer.java b/src/main/java/appeng/container/AEBaseContainer.java index 6b2d95085..8eff993a1 100644 --- a/src/main/java/appeng/container/AEBaseContainer.java +++ b/src/main/java/appeng/container/AEBaseContainer.java @@ -55,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.CraftingMatrixSlot; +import appeng.container.slot.CraftingTermSlot; +import appeng.container.slot.DisabledSlot; +import appeng.container.slot.FakeSlot; +import appeng.container.slot.InaccessibleSlot; +import appeng.container.slot.PlayerHotBarSlot; +import appeng.container.slot.PlayerInvSlot; import appeng.core.AELog; import appeng.core.Api; import appeng.core.sync.network.NetworkHandler; diff --git a/src/main/java/appeng/container/implementations/FormationPlaneContainer.java b/src/main/java/appeng/container/implementations/FormationPlaneContainer.java index 23c1d6917..cad591712 100644 --- a/src/main/java/appeng/container/implementations/FormationPlaneContainer.java +++ b/src/main/java/appeng/container/implementations/FormationPlaneContainer.java @@ -25,7 +25,11 @@ import net.minecraft.screen.ScreenHandlerType; import alexiil.mc.lib.attributes.item.FixedItemInv; -import appeng.api.config.*; +import appeng.api.config.FuzzyMode; +import appeng.api.config.SecurityPermissions; +import appeng.api.config.Settings; +import appeng.api.config.Upgrades; +import appeng.api.config.YesNo; import appeng.container.ContainerLocator; import appeng.container.guisync.GuiSync; import appeng.container.slot.FakeTypeOnlySlot; diff --git a/src/main/java/appeng/container/implementations/IOPortContainer.java b/src/main/java/appeng/container/implementations/IOPortContainer.java index a28e578ee..ab1e9d185 100644 --- a/src/main/java/appeng/container/implementations/IOPortContainer.java +++ b/src/main/java/appeng/container/implementations/IOPortContainer.java @@ -25,7 +25,11 @@ import net.minecraft.screen.ScreenHandlerType; import alexiil.mc.lib.attributes.item.FixedItemInv; -import appeng.api.config.*; +import appeng.api.config.FullnessMode; +import appeng.api.config.OperationMode; +import appeng.api.config.RedstoneMode; +import appeng.api.config.SecurityPermissions; +import appeng.api.config.Settings; import appeng.container.ContainerLocator; import appeng.container.guisync.GuiSync; import appeng.container.slot.OutputSlot; diff --git a/src/main/java/appeng/container/implementations/LevelEmitterContainer.java b/src/main/java/appeng/container/implementations/LevelEmitterContainer.java index f8f03a7b6..dbe123d1f 100644 --- a/src/main/java/appeng/container/implementations/LevelEmitterContainer.java +++ b/src/main/java/appeng/container/implementations/LevelEmitterContainer.java @@ -27,7 +27,12 @@ import net.minecraft.screen.ScreenHandlerType; import alexiil.mc.lib.attributes.item.FixedItemInv; -import appeng.api.config.*; +import appeng.api.config.FuzzyMode; +import appeng.api.config.LevelType; +import appeng.api.config.RedstoneMode; +import appeng.api.config.SecurityPermissions; +import appeng.api.config.Settings; +import appeng.api.config.YesNo; import appeng.client.gui.implementations.NumberEntryWidget; import appeng.container.ContainerLocator; import appeng.container.guisync.GuiSync; diff --git a/src/main/java/appeng/container/implementations/MEMonitorableContainer.java b/src/main/java/appeng/container/implementations/MEMonitorableContainer.java index 0162d34d0..e8d0b45df 100644 --- a/src/main/java/appeng/container/implementations/MEMonitorableContainer.java +++ b/src/main/java/appeng/container/implementations/MEMonitorableContainer.java @@ -32,7 +32,13 @@ import net.minecraft.screen.ScreenHandlerListener; import net.minecraft.screen.ScreenHandlerType; import net.minecraft.server.network.ServerPlayerEntity; -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.implementations.guiobjects.IGuiItemObject; import appeng.api.implementations.guiobjects.IPortableCell; import appeng.api.implementations.tiles.IMEChest; diff --git a/src/main/java/appeng/container/implementations/PatternTermContainer.java b/src/main/java/appeng/container/implementations/PatternTermContainer.java index a820e84cd..6075bb517 100644 --- a/src/main/java/appeng/container/implementations/PatternTermContainer.java +++ b/src/main/java/appeng/container/implementations/PatternTermContainer.java @@ -49,7 +49,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.FakeCraftingMatrixSlot; +import appeng.container.slot.IOptionalSlotHost; +import appeng.container.slot.OptionalFakeSlot; +import appeng.container.slot.PatternOutputsSlot; +import appeng.container.slot.PatternTermSlot; +import appeng.container.slot.RestrictedInputSlot; import appeng.core.Api; import appeng.core.sync.packets.PatternSlotPacket; import appeng.helpers.IContainerCraftingPacket; diff --git a/src/main/java/appeng/container/implementations/StorageBusContainer.java b/src/main/java/appeng/container/implementations/StorageBusContainer.java index 95b31ba80..194cf63fc 100644 --- a/src/main/java/appeng/container/implementations/StorageBusContainer.java +++ b/src/main/java/appeng/container/implementations/StorageBusContainer.java @@ -28,7 +28,12 @@ import net.minecraft.screen.ScreenHandlerType; import alexiil.mc.lib.attributes.item.FixedItemInv; -import appeng.api.config.*; +import appeng.api.config.AccessRestriction; +import appeng.api.config.FuzzyMode; +import appeng.api.config.SecurityPermissions; +import appeng.api.config.Settings; +import appeng.api.config.StorageFilter; +import appeng.api.config.Upgrades; import appeng.api.storage.IMEInventory; import appeng.api.storage.channels.IItemStorageChannel; import appeng.api.storage.data.IAEItemStack; diff --git a/src/main/java/appeng/container/implementations/UpgradeableContainer.java b/src/main/java/appeng/container/implementations/UpgradeableContainer.java index e23c59808..cd754bb91 100644 --- a/src/main/java/appeng/container/implementations/UpgradeableContainer.java +++ b/src/main/java/appeng/container/implementations/UpgradeableContainer.java @@ -30,7 +30,13 @@ import net.minecraft.world.World; import alexiil.mc.lib.attributes.item.FixedItemInv; -import appeng.api.config.*; +import appeng.api.config.FuzzyMode; +import appeng.api.config.RedstoneMode; +import appeng.api.config.SchedulingMode; +import appeng.api.config.SecurityPermissions; +import appeng.api.config.Settings; +import appeng.api.config.Upgrades; +import appeng.api.config.YesNo; import appeng.api.implementations.IUpgradeableHost; import appeng.api.implementations.guiobjects.IGuiItem; import appeng.api.parts.IPart; @@ -38,7 +44,11 @@ import appeng.api.util.IConfigManager; import appeng.container.AEBaseContainer; import appeng.container.ContainerLocator; import appeng.container.guisync.GuiSync; -import appeng.container.slot.*; +import appeng.container.slot.FakeTypeOnlySlot; +import appeng.container.slot.IOptionalSlotHost; +import appeng.container.slot.OptionalFakeSlot; +import appeng.container.slot.OptionalTypeOnlyFakeSlot; +import appeng.container.slot.RestrictedInputSlot; import appeng.items.contents.NetworkToolViewer; import appeng.items.tools.NetworkToolItem; import appeng.parts.automation.ExportBusPart; diff --git a/src/main/java/appeng/core/AEConfig.java b/src/main/java/appeng/core/AEConfig.java index cc9321522..cbf672f9a 100644 --- a/src/main/java/appeng/core/AEConfig.java +++ b/src/main/java/appeng/core/AEConfig.java @@ -19,16 +19,37 @@ package appeng.core; import java.io.File; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +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 net.minecraft.world.dimension.DimensionType; -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.client.gui.NumberEntryType; -import appeng.core.config.*; +import appeng.core.config.BooleanOption; +import appeng.core.config.ConfigFileManager; +import appeng.core.config.ConfigSection; +import appeng.core.config.DoubleOption; +import appeng.core.config.EnumOption; +import appeng.core.config.IntegerOption; +import appeng.core.config.StringListOption; import appeng.core.settings.TickRates; import appeng.util.EnumCycler; diff --git a/src/main/java/appeng/core/Api.java b/src/main/java/appeng/core/Api.java index a71633a3c..02b0608e9 100644 --- a/src/main/java/appeng/core/Api.java +++ b/src/main/java/appeng/core/Api.java @@ -25,7 +25,11 @@ import appeng.api.crafting.ICraftingHelper; import appeng.api.features.IRegistryContainer; import appeng.api.networking.IGridHelper; import appeng.api.storage.IStorageHelper; -import appeng.core.api.*; +import appeng.core.api.ApiClientHelper; +import appeng.core.api.ApiCrafting; +import appeng.core.api.ApiGrid; +import appeng.core.api.ApiPart; +import appeng.core.api.ApiStorage; import appeng.core.features.registries.PartModels; import appeng.core.features.registries.RegistryContainer; diff --git a/src/main/java/appeng/core/AppEngBase.java b/src/main/java/appeng/core/AppEngBase.java index 4fb30be10..a299ab8ca 100644 --- a/src/main/java/appeng/core/AppEngBase.java +++ b/src/main/java/appeng/core/AppEngBase.java @@ -6,7 +6,25 @@ import javax.annotation.Nullable; import net.fabricmc.fabric.api.command.v1.CommandRegistrationCallback; import net.fabricmc.fabric.api.screenhandler.v1.ScreenHandlerRegistry; -import net.minecraft.block.entity.*; +import net.minecraft.block.entity.BannerBlockEntity; +import net.minecraft.block.entity.BeaconBlockEntity; +import net.minecraft.block.entity.BrewingStandBlockEntity; +import net.minecraft.block.entity.ChestBlockEntity; +import net.minecraft.block.entity.CommandBlockBlockEntity; +import net.minecraft.block.entity.ComparatorBlockEntity; +import net.minecraft.block.entity.DaylightDetectorBlockEntity; +import net.minecraft.block.entity.DispenserBlockEntity; +import net.minecraft.block.entity.DropperBlockEntity; +import net.minecraft.block.entity.EnchantingTableBlockEntity; +import net.minecraft.block.entity.EndPortalBlockEntity; +import net.minecraft.block.entity.EnderChestBlockEntity; +import net.minecraft.block.entity.FurnaceBlockEntity; +import net.minecraft.block.entity.HopperBlockEntity; +import net.minecraft.block.entity.MobSpawnerBlockEntity; +import net.minecraft.block.entity.PistonBlockEntity; +import net.minecraft.block.entity.ShulkerBoxBlockEntity; +import net.minecraft.block.entity.SignBlockEntity; +import net.minecraft.block.entity.SkullBlockEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.item.ItemStack; @@ -39,7 +57,39 @@ import appeng.bootstrap.components.ITileEntityRegistrationComponent; import appeng.client.render.effects.ParticleTypes; import appeng.container.AEBaseContainer; import appeng.container.ContainerOpener; -import appeng.container.implementations.*; +import appeng.container.implementations.CellWorkbenchContainer; +import appeng.container.implementations.ChestContainer; +import appeng.container.implementations.CondenserContainer; +import appeng.container.implementations.CraftAmountContainer; +import appeng.container.implementations.CraftConfirmContainer; +import appeng.container.implementations.CraftingCPUContainer; +import appeng.container.implementations.CraftingStatusContainer; +import appeng.container.implementations.CraftingTermContainer; +import appeng.container.implementations.DriveContainer; +import appeng.container.implementations.FormationPlaneContainer; +import appeng.container.implementations.GrinderContainer; +import appeng.container.implementations.IOPortContainer; +import appeng.container.implementations.InscriberContainer; +import appeng.container.implementations.InterfaceContainer; +import appeng.container.implementations.InterfaceTerminalContainer; +import appeng.container.implementations.LevelEmitterContainer; +import appeng.container.implementations.MEMonitorableContainer; +import appeng.container.implementations.MEPortableCellContainer; +import appeng.container.implementations.MolecularAssemblerContainer; +import appeng.container.implementations.NetworkStatusContainer; +import appeng.container.implementations.NetworkToolContainer; +import appeng.container.implementations.PatternTermContainer; +import appeng.container.implementations.PriorityContainer; +import appeng.container.implementations.QNBContainer; +import appeng.container.implementations.QuartzKnifeContainer; +import appeng.container.implementations.SecurityStationContainer; +import appeng.container.implementations.SkyChestContainer; +import appeng.container.implementations.SpatialIOPortContainer; +import appeng.container.implementations.StorageBusContainer; +import appeng.container.implementations.UpgradeableContainer; +import appeng.container.implementations.VibrationChamberContainer; +import appeng.container.implementations.WirelessContainer; +import appeng.container.implementations.WirelessTermContainer; import appeng.core.features.registries.P2PTunnelRegistry; import appeng.core.features.registries.cell.BasicCellHandler; import appeng.core.features.registries.cell.BasicItemCellGuiHandler; @@ -50,16 +100,32 @@ import appeng.core.stats.AeStats; import appeng.core.sync.BasePacket; import appeng.core.sync.network.NetworkHandler; import appeng.core.sync.network.TargetPoint; -import appeng.fluids.container.*; +import appeng.fluids.container.FluidFormationPlaneContainer; +import appeng.fluids.container.FluidIOContainer; +import appeng.fluids.container.FluidInterfaceContainer; +import appeng.fluids.container.FluidLevelEmitterContainer; +import appeng.fluids.container.FluidStorageBusContainer; +import appeng.fluids.container.FluidTerminalContainer; import appeng.fluids.registries.BasicFluidCellGuiHandler; import appeng.hooks.ToolItemHook; import appeng.items.parts.FacadeItem; import appeng.items.tools.NetworkToolItem; -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.mixins.CriteriaRegisterMixin; import appeng.recipes.game.DisassembleRecipe; import appeng.recipes.game.FacadeRecipe; -import appeng.recipes.handlers.*; +import appeng.recipes.handlers.GrinderRecipe; +import appeng.recipes.handlers.GrinderRecipeSerializer; +import appeng.recipes.handlers.InscriberRecipe; +import appeng.recipes.handlers.InscriberRecipeSerializer; +import appeng.recipes.handlers.QuartzKnifeRecipeSerializer; import appeng.server.AECommand; import appeng.tile.AEBaseBlockEntity; diff --git a/src/main/java/appeng/core/AppEngBootstrap.java b/src/main/java/appeng/core/AppEngBootstrap.java index 7e39a4a8f..1e94f2862 100644 --- a/src/main/java/appeng/core/AppEngBootstrap.java +++ b/src/main/java/appeng/core/AppEngBootstrap.java @@ -1,6 +1,5 @@ package appeng.core; -import appeng.mixins.structure.StructureFeatureAccessor; import net.fabricmc.loader.api.FabricLoader; import net.minecraft.block.BlockState; import net.minecraft.util.registry.BuiltinRegistries; @@ -17,6 +16,7 @@ import net.minecraft.world.gen.feature.OreFeatureConfig; import appeng.api.features.AEFeature; import appeng.mixins.feature.ConfiguredFeaturesAccessor; import appeng.mixins.structure.ConfiguredStructureFeaturesAccessor; +import appeng.mixins.structure.StructureFeatureAccessor; import appeng.spatial.SpatialStorageChunkGenerator; import appeng.spatial.SpatialStorageDimensionIds; import appeng.worldgen.BiomeModifier; diff --git a/src/main/java/appeng/core/api/client/ApiCellModelRegistry.java b/src/main/java/appeng/core/api/client/ApiCellModelRegistry.java index 58f378f10..7fa3a8381 100644 --- a/src/main/java/appeng/core/api/client/ApiCellModelRegistry.java +++ b/src/main/java/appeng/core/api/client/ApiCellModelRegistry.java @@ -19,7 +19,11 @@ package appeng.core.api.client; -import java.util.*; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.IdentityHashMap; +import java.util.Map; import javax.annotation.Nonnull; import javax.annotation.Nullable; diff --git a/src/main/java/appeng/core/api/definitions/ApiBlocks.java b/src/main/java/appeng/core/api/definitions/ApiBlocks.java index fb04d2bd3..9635b62d4 100644 --- a/src/main/java/appeng/core/api/definitions/ApiBlocks.java +++ b/src/main/java/appeng/core/api/definitions/ApiBlocks.java @@ -38,12 +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.CraftingMonitorBlock; +import appeng.block.crafting.CraftingMonitorBlockRendering; +import appeng.block.crafting.CraftingStorageBlock; +import appeng.block.crafting.CraftingStorageItem; +import appeng.block.crafting.CraftingUnitBlock; +import appeng.block.crafting.MolecularAssemblerBlock; import appeng.block.grindstone.CrankBlock; import appeng.block.grindstone.GrinderBlock; -import appeng.block.misc.*; -import appeng.block.networking.*; +import appeng.block.misc.CellWorkbenchBlock; +import appeng.block.misc.ChargerBlock; +import appeng.block.misc.CondenserBlock; +import appeng.block.misc.InscriberBlock; +import appeng.block.misc.InscriberRendering; +import appeng.block.misc.InterfaceBlock; +import appeng.block.misc.LightDetectorBlock; +import appeng.block.misc.QuartzFixtureBlock; +import appeng.block.misc.QuartzGrowthAcceleratorBlock; +import appeng.block.misc.SecurityStationBlock; +import appeng.block.misc.SecurityStationRendering; +import appeng.block.misc.SkyCompassBlock; +import appeng.block.misc.SkyCompassRendering; +import appeng.block.misc.TinyTNTBlock; +import appeng.block.misc.VibrationChamberBlock; +import appeng.block.networking.CableBusBlock; +import appeng.block.networking.CableBusRendering; +import appeng.block.networking.ControllerBlock; +import appeng.block.networking.ControllerRendering; +import appeng.block.networking.CreativeEnergyCellBlock; +import appeng.block.networking.DenseEnergyCellBlock; +import appeng.block.networking.EnergyAcceptorBlock; +import appeng.block.networking.EnergyCellBlock; +import appeng.block.networking.WirelessBlock; +import appeng.block.networking.WirelessRendering; import appeng.block.paint.PaintSplotchesBlock; import appeng.block.paint.PaintSplotchesRendering; import appeng.block.qnb.QuantumBridgeRendering; @@ -52,27 +80,75 @@ import appeng.block.qnb.QuantumRingBlock; import appeng.block.spatial.MatrixFrameBlock; import appeng.block.spatial.SpatialIOPortBlock; import appeng.block.spatial.SpatialPylonBlock; -import appeng.block.storage.*; -import appeng.bootstrap.*; +import appeng.block.storage.ChestBlock; +import appeng.block.storage.ChestRendering; +import appeng.block.storage.DriveBlock; +import appeng.block.storage.DriveRendering; +import appeng.block.storage.IOPortBlock; +import appeng.block.storage.SkyChestBlock; +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; import appeng.client.render.crafting.CraftingMonitorTESR; import appeng.client.render.spatial.SpatialPylonRendering; -import appeng.client.render.tesr.*; -import appeng.debug.*; +import appeng.client.render.tesr.ChargerTESR; +import appeng.client.render.tesr.ChestTileEntityRenderer; +import appeng.client.render.tesr.CrankTESR; +import appeng.client.render.tesr.DriveLedTileEntityRenderer; +import appeng.client.render.tesr.SkyChestTESR; +import appeng.debug.ChunkLoaderBlock; +import appeng.debug.ChunkLoaderBlockEntity; +import appeng.debug.CubeGeneratorBlock; +import appeng.debug.CubeGeneratorBlockEntity; +import appeng.debug.ItemGenBlock; +import appeng.debug.ItemGenBlockEntity; +import appeng.debug.PhantomNodeBlock; +import appeng.debug.PhantomNodeBlockEntity; import appeng.decorative.AEDecorativeBlock; -import appeng.decorative.solid.*; +import appeng.decorative.solid.AEStairsBlock; +import appeng.decorative.solid.ChargedQuartzOreBlock; +import appeng.decorative.solid.QuartzGlassBlock; +import appeng.decorative.solid.QuartzLampBlock; +import appeng.decorative.solid.QuartzOreBlock; +import appeng.decorative.solid.QuartzPillarBlock; +import appeng.decorative.solid.SkyStoneBlock; import appeng.decorative.solid.SkyStoneBlock.SkystoneType; import appeng.entity.TinyTNTPrimedEntity; import appeng.fluids.block.FluidInterfaceBlock; import appeng.fluids.tile.FluidInterfaceBlockEntity; import appeng.hooks.TinyTNTDispenseItemBehavior; -import appeng.tile.crafting.*; +import appeng.tile.crafting.CraftingBlockEntity; +import appeng.tile.crafting.CraftingMonitorBlockEntity; +import appeng.tile.crafting.CraftingStorageBlockEntity; +import appeng.tile.crafting.MolecularAssemblerBlockEntity; +import appeng.tile.crafting.MolecularAssemblerRenderer; import appeng.tile.grindstone.CrankBlockEntity; import appeng.tile.grindstone.GrinderBlockEntity; -import appeng.tile.misc.*; -import appeng.tile.networking.*; +import appeng.tile.misc.CellWorkbenchBlockEntity; +import appeng.tile.misc.ChargerBlockEntity; +import appeng.tile.misc.CondenserBlockEntity; +import appeng.tile.misc.InscriberBlockEntity; +import appeng.tile.misc.InterfaceBlockEntity; +import appeng.tile.misc.LightDetectorBlockEntity; +import appeng.tile.misc.PaintSplotchesBlockEntity; +import appeng.tile.misc.QuartzGrowthAcceleratorBlockEntity; +import appeng.tile.misc.SecurityStationBlockEntity; +import appeng.tile.misc.SkyCompassBlockEntity; +import appeng.tile.misc.VibrationChamberBlockEntity; +import appeng.tile.networking.CableBusBlockEntity; +import appeng.tile.networking.CableBusTESR; +import appeng.tile.networking.ControllerBlockEntity; +import appeng.tile.networking.CreativeEnergyCellBlockEntity; +import appeng.tile.networking.DenseEnergyCellBlockEntity; +import appeng.tile.networking.EnergyAcceptorBlockEntity; +import appeng.tile.networking.EnergyCellBlockEntity; +import appeng.tile.networking.WirelessBlockEntity; import appeng.tile.qnb.QuantumBridgeBlockEntity; import appeng.tile.spatial.SpatialIOPortBlockEntity; import appeng.tile.spatial.SpatialPylonBlockEntity; diff --git a/src/main/java/appeng/core/api/definitions/ApiItems.java b/src/main/java/appeng/core/api/definitions/ApiItems.java index 59ec54365..3fce96722 100644 --- a/src/main/java/appeng/core/api/definitions/ApiItems.java +++ b/src/main/java/appeng/core/api/definitions/ApiItems.java @@ -42,7 +42,11 @@ import appeng.core.AppEng; import appeng.core.features.ActivityState; import appeng.core.features.ColoredItemDefinition; import appeng.core.features.ItemStackSrc; -import appeng.debug.*; +import appeng.debug.DebugCardItem; +import appeng.debug.DebugPartPlacerItem; +import appeng.debug.EraserItem; +import appeng.debug.MeteoritePlacerItem; +import appeng.debug.ReplicatorCardItem; import appeng.entity.GrowingCrystalEntity; import appeng.fluids.items.BasicFluidStorageCell; import appeng.fluids.items.FluidDummyItem; @@ -62,8 +66,20 @@ import appeng.items.storage.ViewCellItem; import appeng.items.tools.BiometricCardItem; import appeng.items.tools.MemoryCardItem; import appeng.items.tools.NetworkToolItem; -import appeng.items.tools.powered.*; -import appeng.items.tools.quartz.*; +import appeng.items.tools.powered.ChargedStaffItem; +import appeng.items.tools.powered.ColorApplicatorItem; +import appeng.items.tools.powered.ColorApplicatorItemRendering; +import appeng.items.tools.powered.EntropyManipulatorItem; +import appeng.items.tools.powered.MatterCannonItem; +import appeng.items.tools.powered.PortableCellItem; +import appeng.items.tools.powered.WirelessTerminalItem; +import appeng.items.tools.quartz.QuartzAxeItem; +import appeng.items.tools.quartz.QuartzCuttingKnifeItem; +import appeng.items.tools.quartz.QuartzHoeItem; +import appeng.items.tools.quartz.QuartzPickaxeItem; +import appeng.items.tools.quartz.QuartzSpadeItem; +import appeng.items.tools.quartz.QuartzSwordItem; +import appeng.items.tools.quartz.QuartzWrenchItem; /** * Internal implementation for the API items diff --git a/src/main/java/appeng/core/api/definitions/ApiParts.java b/src/main/java/appeng/core/api/definitions/ApiParts.java index 689c3e229..973bc095d 100644 --- a/src/main/java/appeng/core/api/definitions/ApiParts.java +++ b/src/main/java/appeng/core/api/definitions/ApiParts.java @@ -33,16 +33,49 @@ 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.FluidAnnihilationPlanePart; +import appeng.fluids.parts.FluidExportBusPart; +import appeng.fluids.parts.FluidFormationPlanePart; +import appeng.fluids.parts.FluidImportBusPart; +import appeng.fluids.parts.FluidInterfacePart; +import appeng.fluids.parts.FluidLevelEmitterPart; +import appeng.fluids.parts.FluidStorageBusPart; +import appeng.fluids.parts.FluidTerminalPart; import appeng.items.parts.ColoredPartItem; import appeng.items.parts.PartItem; import appeng.items.parts.PartItemRendering; import appeng.items.parts.PartModelsHelper; -import appeng.parts.automation.*; -import appeng.parts.misc.*; -import appeng.parts.networking.*; -import appeng.parts.p2p.*; -import appeng.parts.reporting.*; +import appeng.parts.automation.AnnihilationPlanePart; +import appeng.parts.automation.ExportBusPart; +import appeng.parts.automation.FormationPlanePart; +import appeng.parts.automation.IdentityAnnihilationPlanePart; +import appeng.parts.automation.ImportBusPart; +import appeng.parts.automation.LevelEmitterPart; +import appeng.parts.misc.CableAnchorPart; +import appeng.parts.misc.InterfacePart; +import appeng.parts.misc.InvertedToggleBusPart; +import appeng.parts.misc.StorageBusPart; +import appeng.parts.misc.ToggleBusPart; +import appeng.parts.networking.CoveredCablePart; +import appeng.parts.networking.CoveredDenseCablePart; +import appeng.parts.networking.GlassCablePart; +import appeng.parts.networking.QuartzFiberPart; +import appeng.parts.networking.SmartCablePart; +import appeng.parts.networking.SmartDenseCablePart; +import appeng.parts.p2p.FluidP2PTunnelPart; +import appeng.parts.p2p.ItemP2PTunnelPart; +import appeng.parts.p2p.LightP2PTunnelPart; +import appeng.parts.p2p.MEP2PTunnelPart; +import appeng.parts.p2p.RedstoneP2PTunnelPart; +import appeng.parts.reporting.ConversionMonitorPart; +import appeng.parts.reporting.CraftingTerminalPart; +import appeng.parts.reporting.DarkPanelPart; +import appeng.parts.reporting.InterfaceTerminalPart; +import appeng.parts.reporting.PanelPart; +import appeng.parts.reporting.PatternTerminalPart; +import appeng.parts.reporting.SemiDarkPanelPart; +import appeng.parts.reporting.StorageMonitorPart; +import appeng.parts.reporting.TerminalPart; /** * Internal implementation for the API parts diff --git a/src/main/java/appeng/core/config/ConfigFileManager.java b/src/main/java/appeng/core/config/ConfigFileManager.java index bf04edf4a..790cad1e9 100644 --- a/src/main/java/appeng/core/config/ConfigFileManager.java +++ b/src/main/java/appeng/core/config/ConfigFileManager.java @@ -1,6 +1,13 @@ package appeng.core.config; -import java.io.*; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.OutputStreamWriter; import java.nio.charset.StandardCharsets; import java.nio.file.Files; diff --git a/src/main/java/appeng/core/features/registries/MovableTileRegistry.java b/src/main/java/appeng/core/features/registries/MovableTileRegistry.java index 4d27af0c0..77ec5326f 100644 --- a/src/main/java/appeng/core/features/registries/MovableTileRegistry.java +++ b/src/main/java/appeng/core/features/registries/MovableTileRegistry.java @@ -18,6 +18,18 @@ package appeng.core.features.registries; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.IdentityHashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import net.minecraft.block.Block; +import net.minecraft.block.entity.BlockEntity; +import net.minecraft.tag.Tag; +import net.minecraft.util.Identifier; + import appeng.api.exceptions.AppEngException; import appeng.api.movable.IMovableHandler; import appeng.api.movable.IMovableRegistry; @@ -26,17 +38,6 @@ import appeng.core.AEConfig; import appeng.core.AppEng; import appeng.mixins.tags.BlockTagsAccessor; import appeng.spatial.DefaultSpatialHandler; -import net.minecraft.block.Block; -import net.minecraft.block.entity.BlockEntity; -import net.minecraft.tag.Tag; -import net.minecraft.util.Identifier; - -import java.util.ArrayList; -import java.util.HashSet; -import java.util.IdentityHashMap; -import java.util.List; -import java.util.Map; -import java.util.Set; public class MovableTileRegistry implements IMovableRegistry { diff --git a/src/main/java/appeng/core/features/registries/RegistryContainer.java b/src/main/java/appeng/core/features/registries/RegistryContainer.java index 6aaab0457..93646e311 100644 --- a/src/main/java/appeng/core/features/registries/RegistryContainer.java +++ b/src/main/java/appeng/core/features/registries/RegistryContainer.java @@ -18,7 +18,14 @@ package appeng.core.features.registries; -import appeng.api.features.*; +import appeng.api.features.IChargerRegistry; +import appeng.api.features.ILocatableRegistry; +import appeng.api.features.IMatterCannonAmmoRegistry; +import appeng.api.features.IP2PTunnelRegistry; +import appeng.api.features.IPlayerRegistry; +import appeng.api.features.IRegistryContainer; +import appeng.api.features.IWirelessTermRegistry; +import appeng.api.features.IWorldGen; import appeng.api.movable.IMovableRegistry; import appeng.api.networking.IGridCacheRegistry; import appeng.api.parts.IPartModels; diff --git a/src/main/java/appeng/core/stats/AppEngAdvancementTrigger.java b/src/main/java/appeng/core/stats/AppEngAdvancementTrigger.java index 12ec7e862..d3aad6f96 100644 --- a/src/main/java/appeng/core/stats/AppEngAdvancementTrigger.java +++ b/src/main/java/appeng/core/stats/AppEngAdvancementTrigger.java @@ -18,7 +18,12 @@ package appeng.core.stats; -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 com.google.gson.JsonObject; diff --git a/src/main/java/appeng/core/sync/BasePacketHandler.java b/src/main/java/appeng/core/sync/BasePacketHandler.java index 320eced95..cca1d33ab 100644 --- a/src/main/java/appeng/core/sync/BasePacketHandler.java +++ b/src/main/java/appeng/core/sync/BasePacketHandler.java @@ -24,7 +24,32 @@ import java.util.function.Function; import net.minecraft.network.PacketByteBuf; -import appeng.core.sync.packets.*; +import appeng.core.sync.packets.AssemblerAnimationPacket; +import appeng.core.sync.packets.BlockTransitionEffectPacket; +import appeng.core.sync.packets.ClickPacket; +import appeng.core.sync.packets.CompassRequestPacket; +import appeng.core.sync.packets.CompassResponsePacket; +import appeng.core.sync.packets.CompressedNBTPacket; +import appeng.core.sync.packets.ConfigButtonPacket; +import appeng.core.sync.packets.ConfigValuePacket; +import appeng.core.sync.packets.CraftRequestPacket; +import appeng.core.sync.packets.FluidSlotPacket; +import appeng.core.sync.packets.InventoryActionPacket; +import appeng.core.sync.packets.ItemTransitionEffectPacket; +import appeng.core.sync.packets.JEIRecipePacket; +import appeng.core.sync.packets.LightningPacket; +import appeng.core.sync.packets.MEFluidInventoryUpdatePacket; +import appeng.core.sync.packets.MEInventoryUpdatePacket; +import appeng.core.sync.packets.MatterCannonPacket; +import appeng.core.sync.packets.PaintedEntityPacket; +import appeng.core.sync.packets.PartPlacementPacket; +import appeng.core.sync.packets.PatternSlotPacket; +import appeng.core.sync.packets.ProgressBarPacket; +import appeng.core.sync.packets.SpawnEntityPacket; +import appeng.core.sync.packets.SwapSlotsPacket; +import appeng.core.sync.packets.SwitchGuisPacket; +import appeng.core.sync.packets.TargetFluidStackPacket; +import appeng.core.sync.packets.TargetItemStackPacket; public class BasePacketHandler { private static final Map, PacketTypes> REVERSE_LOOKUP = new HashMap<>(); diff --git a/src/main/java/appeng/core/sync/packets/CompressedNBTPacket.java b/src/main/java/appeng/core/sync/packets/CompressedNBTPacket.java index b7656e8d9..27efc84e8 100644 --- a/src/main/java/appeng/core/sync/packets/CompressedNBTPacket.java +++ b/src/main/java/appeng/core/sync/packets/CompressedNBTPacket.java @@ -18,7 +18,11 @@ package appeng.core.sync.packets; -import java.io.*; +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; import java.util.zip.GZIPInputStream; import java.util.zip.GZIPOutputStream; diff --git a/src/main/java/appeng/core/sync/packets/ConfigValuePacket.java b/src/main/java/appeng/core/sync/packets/ConfigValuePacket.java index 70ceb015f..e86079935 100644 --- a/src/main/java/appeng/core/sync/packets/ConfigValuePacket.java +++ b/src/main/java/appeng/core/sync/packets/ConfigValuePacket.java @@ -34,7 +34,17 @@ import appeng.api.util.IConfigManager; import appeng.api.util.IConfigurableObject; import appeng.client.gui.implementations.CraftingCPUScreen; import appeng.container.AEBaseContainer; -import appeng.container.implementations.*; +import appeng.container.implementations.CellWorkbenchContainer; +import appeng.container.implementations.CraftConfirmContainer; +import appeng.container.implementations.CraftingCPUContainer; +import appeng.container.implementations.CraftingStatusContainer; +import appeng.container.implementations.LevelEmitterContainer; +import appeng.container.implementations.NetworkToolContainer; +import appeng.container.implementations.PatternTermContainer; +import appeng.container.implementations.PriorityContainer; +import appeng.container.implementations.QuartzKnifeContainer; +import appeng.container.implementations.SecurityStationContainer; +import appeng.container.implementations.StorageBusContainer; import appeng.core.sync.BasePacket; import appeng.core.sync.network.INetworkInfo; import appeng.fluids.container.FluidLevelEmitterContainer; diff --git a/src/main/java/appeng/debug/ReplicatorCardItem.java b/src/main/java/appeng/debug/ReplicatorCardItem.java index 7d226f71a..d190654d4 100644 --- a/src/main/java/appeng/debug/ReplicatorCardItem.java +++ b/src/main/java/appeng/debug/ReplicatorCardItem.java @@ -28,7 +28,11 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.ItemUsageContext; import net.minecraft.nbt.CompoundTag; import net.minecraft.text.LiteralText; -import net.minecraft.util.*; +import net.minecraft.util.ActionResult; +import net.minecraft.util.Hand; +import net.minecraft.util.Identifier; +import net.minecraft.util.TypedActionResult; +import net.minecraft.util.Util; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; import net.minecraft.util.math.MathHelper; diff --git a/src/main/java/appeng/entity/TinyTNTPrimedEntity.java b/src/main/java/appeng/entity/TinyTNTPrimedEntity.java index 660a6f15a..8451ebbd9 100644 --- a/src/main/java/appeng/entity/TinyTNTPrimedEntity.java +++ b/src/main/java/appeng/entity/TinyTNTPrimedEntity.java @@ -26,7 +26,12 @@ import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; import net.minecraft.block.Material; -import net.minecraft.entity.*; +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityType; +import net.minecraft.entity.ItemEntity; +import net.minecraft.entity.LivingEntity; +import net.minecraft.entity.MovementType; +import net.minecraft.entity.TntEntity; import net.minecraft.entity.damage.DamageSource; import net.minecraft.network.Packet; import net.minecraft.network.PacketByteBuf; diff --git a/src/main/java/appeng/fluids/client/gui/FluidStorageBusScreen.java b/src/main/java/appeng/fluids/client/gui/FluidStorageBusScreen.java index 18721be2d..d1418a12b 100644 --- a/src/main/java/appeng/fluids/client/gui/FluidStorageBusScreen.java +++ b/src/main/java/appeng/fluids/client/gui/FluidStorageBusScreen.java @@ -22,7 +22,11 @@ import net.minecraft.client.util.math.MatrixStack; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.text.Text; -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.implementations.UpgradeableScreen; import appeng.client.gui.widgets.ActionButton; import appeng.client.gui.widgets.ServerSettingToggleButton; diff --git a/src/main/java/appeng/fluids/container/FluidStorageBusContainer.java b/src/main/java/appeng/fluids/container/FluidStorageBusContainer.java index d52a34f2d..4f16f3d69 100644 --- a/src/main/java/appeng/fluids/container/FluidStorageBusContainer.java +++ b/src/main/java/appeng/fluids/container/FluidStorageBusContainer.java @@ -27,7 +27,12 @@ import net.minecraft.screen.ScreenHandlerType; import alexiil.mc.lib.attributes.item.FixedItemInv; -import appeng.api.config.*; +import appeng.api.config.AccessRestriction; +import appeng.api.config.FuzzyMode; +import appeng.api.config.SecurityPermissions; +import appeng.api.config.Settings; +import appeng.api.config.StorageFilter; +import appeng.api.config.Upgrades; import appeng.api.storage.IMEInventory; import appeng.api.storage.channels.IFluidStorageChannel; import appeng.api.storage.data.IAEFluidStack; diff --git a/src/main/java/appeng/fluids/container/FluidTerminalContainer.java b/src/main/java/appeng/fluids/container/FluidTerminalContainer.java index f183b793c..41dd925fb 100644 --- a/src/main/java/appeng/fluids/container/FluidTerminalContainer.java +++ b/src/main/java/appeng/fluids/container/FluidTerminalContainer.java @@ -41,7 +41,13 @@ import alexiil.mc.lib.attributes.fluid.filter.ExactFluidFilter; import alexiil.mc.lib.attributes.fluid.volume.FluidVolume; import alexiil.mc.lib.attributes.misc.Ref; -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/DualityFluidInterface.java b/src/main/java/appeng/fluids/helper/DualityFluidInterface.java index f00c0fa05..67176100a 100644 --- a/src/main/java/appeng/fluids/helper/DualityFluidInterface.java +++ b/src/main/java/appeng/fluids/helper/DualityFluidInterface.java @@ -39,7 +39,11 @@ import appeng.api.networking.security.IActionSource; import appeng.api.networking.ticking.IGridTickable; import appeng.api.networking.ticking.TickRateModulation; import appeng.api.networking.ticking.TickingRequest; -import appeng.api.storage.*; +import appeng.api.storage.IMEInventory; +import appeng.api.storage.IMEMonitor; +import appeng.api.storage.IStorageChannel; +import appeng.api.storage.IStorageMonitorable; +import appeng.api.storage.IStorageMonitorableAccessor; import appeng.api.storage.channels.IFluidStorageChannel; import appeng.api.storage.channels.IItemStorageChannel; import appeng.api.storage.data.IAEFluidStack; diff --git a/src/main/java/appeng/fluids/helper/GroupedFluidInvCache.java b/src/main/java/appeng/fluids/helper/GroupedFluidInvCache.java index bd42763b5..c37eb37e9 100644 --- a/src/main/java/appeng/fluids/helper/GroupedFluidInvCache.java +++ b/src/main/java/appeng/fluids/helper/GroupedFluidInvCache.java @@ -1,7 +1,12 @@ package appeng.fluids.helper; import java.math.RoundingMode; -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 alexiil.mc.lib.attributes.fluid.GroupedFluidInv; import alexiil.mc.lib.attributes.fluid.amount.FluidAmount; diff --git a/src/main/java/appeng/fluids/parts/FluidExportBusPart.java b/src/main/java/appeng/fluids/parts/FluidExportBusPart.java index f0a61bf35..a5cfac897 100644 --- a/src/main/java/appeng/fluids/parts/FluidExportBusPart.java +++ b/src/main/java/appeng/fluids/parts/FluidExportBusPart.java @@ -30,7 +30,12 @@ import alexiil.mc.lib.attributes.fluid.FluidAttributes; import alexiil.mc.lib.attributes.fluid.FluidInsertable; import alexiil.mc.lib.attributes.fluid.volume.FluidVolume; -import appeng.api.config.*; +import appeng.api.config.Actionable; +import appeng.api.config.FuzzyMode; +import appeng.api.config.RedstoneMode; +import appeng.api.config.SchedulingMode; +import appeng.api.config.Settings; +import appeng.api.config.YesNo; import appeng.api.networking.IGridNode; import appeng.api.networking.security.IActionSource; import appeng.api.networking.ticking.TickRateModulation; diff --git a/src/main/java/appeng/fluids/parts/FluidImportBusPart.java b/src/main/java/appeng/fluids/parts/FluidImportBusPart.java index 554a3633b..c9e56915d 100644 --- a/src/main/java/appeng/fluids/parts/FluidImportBusPart.java +++ b/src/main/java/appeng/fluids/parts/FluidImportBusPart.java @@ -36,7 +36,12 @@ import alexiil.mc.lib.attributes.fluid.filter.FluidFilter; import alexiil.mc.lib.attributes.fluid.volume.FluidKey; import alexiil.mc.lib.attributes.fluid.volume.FluidVolume; -import appeng.api.config.*; +import appeng.api.config.Actionable; +import appeng.api.config.FuzzyMode; +import appeng.api.config.RedstoneMode; +import appeng.api.config.SchedulingMode; +import appeng.api.config.Settings; +import appeng.api.config.YesNo; import appeng.api.networking.IGridNode; import appeng.api.networking.security.IActionSource; import appeng.api.networking.ticking.TickRateModulation; diff --git a/src/main/java/appeng/fluids/parts/FluidStorageBusPart.java b/src/main/java/appeng/fluids/parts/FluidStorageBusPart.java index d8589320c..b3c199448 100644 --- a/src/main/java/appeng/fluids/parts/FluidStorageBusPart.java +++ b/src/main/java/appeng/fluids/parts/FluidStorageBusPart.java @@ -36,7 +36,12 @@ import net.minecraft.util.math.Vec3d; import alexiil.mc.lib.attributes.fluid.FluidAttributes; import alexiil.mc.lib.attributes.fluid.GroupedFluidInv; -import appeng.api.config.*; +import appeng.api.config.AccessRestriction; +import appeng.api.config.FuzzyMode; +import appeng.api.config.IncludeExclude; +import appeng.api.config.Settings; +import appeng.api.config.StorageFilter; +import appeng.api.config.Upgrades; import appeng.api.networking.IGridNode; import appeng.api.networking.events.MENetworkCellArrayUpdate; import appeng.api.networking.security.IActionSource; @@ -46,7 +51,12 @@ import appeng.api.networking.ticking.TickRateModulation; import appeng.api.networking.ticking.TickingRequest; import appeng.api.parts.IPartHost; import appeng.api.parts.IPartModel; -import appeng.api.storage.*; +import appeng.api.storage.IMEInventory; +import appeng.api.storage.IMEInventoryHandler; +import appeng.api.storage.IMEMonitorHandlerReceiver; +import appeng.api.storage.IStorageChannel; +import appeng.api.storage.IStorageMonitorable; +import appeng.api.storage.IStorageMonitorableAccessor; import appeng.api.storage.channels.IFluidStorageChannel; import appeng.api.storage.data.IAEFluidStack; import appeng.api.storage.data.IItemList; diff --git a/src/main/java/appeng/fluids/util/FluidList.java b/src/main/java/appeng/fluids/util/FluidList.java index 9084c4d59..9a459717d 100644 --- a/src/main/java/appeng/fluids/util/FluidList.java +++ b/src/main/java/appeng/fluids/util/FluidList.java @@ -18,7 +18,11 @@ package appeng.fluids.util; -import java.util.*; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; import appeng.api.config.FuzzyMode; import appeng.api.storage.data.IAEFluidStack; diff --git a/src/main/java/appeng/helpers/CraftingPatternDetails.java b/src/main/java/appeng/helpers/CraftingPatternDetails.java index 7fd38d871..d83b4fa3a 100644 --- a/src/main/java/appeng/helpers/CraftingPatternDetails.java +++ b/src/main/java/appeng/helpers/CraftingPatternDetails.java @@ -18,7 +18,13 @@ package appeng.helpers; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Comparator; +import java.util.HashSet; +import java.util.List; +import java.util.Objects; +import java.util.Set; import java.util.function.Function; import java.util.stream.Collectors; diff --git a/src/main/java/appeng/helpers/DualityInterface.java b/src/main/java/appeng/helpers/DualityInterface.java index 3bacd6706..69d4efee2 100644 --- a/src/main/java/appeng/helpers/DualityInterface.java +++ b/src/main/java/appeng/helpers/DualityInterface.java @@ -18,7 +18,13 @@ package appeng.helpers; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.EnumSet; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Optional; import javax.annotation.Nullable; @@ -67,7 +73,11 @@ import appeng.api.networking.ticking.IGridTickable; import appeng.api.networking.ticking.TickRateModulation; import appeng.api.networking.ticking.TickingRequest; import appeng.api.parts.IPart; -import appeng.api.storage.*; +import appeng.api.storage.IMEInventory; +import appeng.api.storage.IMEMonitor; +import appeng.api.storage.IStorageChannel; +import appeng.api.storage.IStorageMonitorable; +import appeng.api.storage.IStorageMonitorableAccessor; import appeng.api.storage.channels.IFluidStorageChannel; import appeng.api.storage.channels.IItemStorageChannel; import appeng.api.storage.data.IAEFluidStack; diff --git a/src/main/java/appeng/hooks/TickHandler.java b/src/main/java/appeng/hooks/TickHandler.java index de7eaf918..9d9ca3885 100644 --- a/src/main/java/appeng/hooks/TickHandler.java +++ b/src/main/java/appeng/hooks/TickHandler.java @@ -18,7 +18,17 @@ package appeng.hooks; -import java.util.*; +import java.util.ArrayDeque; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Queue; +import java.util.Set; +import java.util.WeakHashMap; import java.util.concurrent.TimeUnit; import com.google.common.base.Stopwatch; diff --git a/src/main/java/appeng/integration/modules/waila/PartWailaDataProvider.java b/src/main/java/appeng/integration/modules/waila/PartWailaDataProvider.java index 90ad93c4b..4c6fcc7cd 100644 --- a/src/main/java/appeng/integration/modules/waila/PartWailaDataProvider.java +++ b/src/main/java/appeng/integration/modules/waila/PartWailaDataProvider.java @@ -38,7 +38,14 @@ import mcp.mobius.waila.api.IServerDataProvider; import appeng.api.parts.IPart; import appeng.api.parts.PartItemStack; -import appeng.integration.modules.waila.part.*; +import appeng.integration.modules.waila.part.ChannelWailaDataProvider; +import appeng.integration.modules.waila.part.IPartWailaDataProvider; +import appeng.integration.modules.waila.part.P2PStateWailaDataProvider; +import appeng.integration.modules.waila.part.PartAccessor; +import appeng.integration.modules.waila.part.PartStackWailaDataProvider; +import appeng.integration.modules.waila.part.PowerStateWailaDataProvider; +import appeng.integration.modules.waila.part.StorageMonitorWailaDataProvider; +import appeng.integration.modules.waila.part.Tracer; /** * Delegation provider for parts through {@link IPartWailaDataProvider} diff --git a/src/main/java/appeng/items/contents/PortableCellViewer.java b/src/main/java/appeng/items/contents/PortableCellViewer.java index f1af8e710..bbcfd28fe 100644 --- a/src/main/java/appeng/items/contents/PortableCellViewer.java +++ b/src/main/java/appeng/items/contents/PortableCellViewer.java @@ -21,7 +21,12 @@ package appeng.items.contents; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundTag; -import appeng.api.config.*; +import appeng.api.config.Actionable; +import appeng.api.config.PowerMultiplier; +import appeng.api.config.Settings; +import appeng.api.config.SortDir; +import appeng.api.config.SortOrder; +import appeng.api.config.ViewItems; import appeng.api.implementations.guiobjects.IPortableCell; import appeng.api.implementations.items.IAEItemPowerStorage; import appeng.api.storage.IMEMonitor; diff --git a/src/main/java/appeng/items/misc/EncodedPatternItem.java b/src/main/java/appeng/items/misc/EncodedPatternItem.java index 121bf27f9..a083bb2bc 100644 --- a/src/main/java/appeng/items/misc/EncodedPatternItem.java +++ b/src/main/java/appeng/items/misc/EncodedPatternItem.java @@ -18,7 +18,11 @@ package appeng.items.misc; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; +import java.util.Map; +import java.util.WeakHashMap; import com.google.common.base.Preconditions; @@ -36,7 +40,11 @@ import net.minecraft.nbt.Tag; import net.minecraft.text.LiteralText; import net.minecraft.text.MutableText; import net.minecraft.text.Text; -import net.minecraft.util.*; +import net.minecraft.util.ActionResult; +import net.minecraft.util.Formatting; +import net.minecraft.util.Hand; +import net.minecraft.util.Identifier; +import net.minecraft.util.TypedActionResult; import net.minecraft.world.World; import appeng.api.networking.crafting.ICraftingPatternDetails; diff --git a/src/main/java/appeng/items/parts/FacadeItem.java b/src/main/java/appeng/items/parts/FacadeItem.java index ca4d5fc73..10c1cc1da 100644 --- a/src/main/java/appeng/items/parts/FacadeItem.java +++ b/src/main/java/appeng/items/parts/FacadeItem.java @@ -18,7 +18,6 @@ package appeng.items.parts; -import appeng.mixins.tags.BlockTagsAccessor; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.fabricmc.api.EnvironmentInterface; @@ -28,9 +27,13 @@ import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; import net.minecraft.client.render.RenderLayer; import net.minecraft.client.render.RenderLayers; -import net.minecraft.item.*; +import net.minecraft.item.BlockItem; +import net.minecraft.item.Item; +import net.minecraft.item.ItemGroup; +import net.minecraft.item.ItemStack; +import net.minecraft.item.ItemUsageContext; +import net.minecraft.item.Items; import net.minecraft.nbt.CompoundTag; -import net.minecraft.tag.BlockTags; import net.minecraft.tag.Tag; import net.minecraft.text.Text; import net.minecraft.util.ActionResult; @@ -51,6 +54,7 @@ import appeng.facade.FacadePart; import appeng.facade.IFacadeItem; import appeng.hooks.AEToolItem; import appeng.items.AEBaseItem; +import appeng.mixins.tags.BlockTagsAccessor; @EnvironmentInterface(value = EnvType.CLIENT, itf = IAlphaPassItem.class) public class FacadeItem extends AEBaseItem implements IFacadeItem, IAlphaPassItem, AEToolItem { diff --git a/src/main/java/appeng/items/tools/MemoryCardItem.java b/src/main/java/appeng/items/tools/MemoryCardItem.java index 89cc1a87d..895459a66 100644 --- a/src/main/java/appeng/items/tools/MemoryCardItem.java +++ b/src/main/java/appeng/items/tools/MemoryCardItem.java @@ -30,7 +30,12 @@ import net.minecraft.item.ItemUsageContext; import net.minecraft.nbt.CompoundTag; import net.minecraft.text.Text; import net.minecraft.text.TranslatableText; -import net.minecraft.util.*; +import net.minecraft.util.ActionResult; +import net.minecraft.util.Formatting; +import net.minecraft.util.Hand; +import net.minecraft.util.Language; +import net.minecraft.util.TypedActionResult; +import net.minecraft.util.Util; import net.minecraft.util.hit.BlockHitResult; import net.minecraft.world.World; diff --git a/src/main/java/appeng/items/tools/powered/EntropyManipulatorItem.java b/src/main/java/appeng/items/tools/powered/EntropyManipulatorItem.java index 0610b2de6..0be2721f4 100644 --- a/src/main/java/appeng/items/tools/powered/EntropyManipulatorItem.java +++ b/src/main/java/appeng/items/tools/powered/EntropyManipulatorItem.java @@ -18,15 +18,28 @@ package appeng.items.tools.powered; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Optional; -import net.minecraft.block.*; +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; +import net.minecraft.block.Blocks; +import net.minecraft.block.Material; +import net.minecraft.block.TntBlock; import net.minecraft.entity.LivingEntity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.fluid.Fluid; import net.minecraft.fluid.Fluids; import net.minecraft.inventory.CraftingInventory; -import net.minecraft.item.*; +import net.minecraft.item.BlockItem; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.item.ItemUsageContext; +import net.minecraft.item.Items; import net.minecraft.particle.ParticleTypes; import net.minecraft.recipe.RecipeType; import net.minecraft.recipe.SmeltingRecipe; diff --git a/src/main/java/appeng/me/Grid.java b/src/main/java/appeng/me/Grid.java index d3a878983..98b22ccf7 100644 --- a/src/main/java/appeng/me/Grid.java +++ b/src/main/java/appeng/me/Grid.java @@ -18,10 +18,19 @@ package appeng.me; -import java.util.*; +import java.util.Collection; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; import java.util.Map.Entry; +import java.util.Set; -import appeng.api.networking.*; +import appeng.api.networking.IGrid; +import appeng.api.networking.IGridCache; +import appeng.api.networking.IGridHost; +import appeng.api.networking.IGridNode; +import appeng.api.networking.IGridStorage; +import appeng.api.networking.IMachineSet; import appeng.api.networking.events.MENetworkEvent; import appeng.api.networking.events.MENetworkPostCacheConstruction; import appeng.api.util.IReadOnlyCollection; diff --git a/src/main/java/appeng/me/GridNode.java b/src/main/java/appeng/me/GridNode.java index 059264db7..49d6f6b85 100644 --- a/src/main/java/appeng/me/GridNode.java +++ b/src/main/java/appeng/me/GridNode.java @@ -18,7 +18,13 @@ package appeng.me; -import java.util.*; +import java.util.ArrayDeque; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; +import java.util.Deque; +import java.util.EnumSet; +import java.util.List; import net.minecraft.block.entity.BlockEntity; import net.minecraft.nbt.CompoundTag; @@ -29,7 +35,16 @@ import net.minecraft.world.WorldAccess; import appeng.api.exceptions.FailedConnectionException; import appeng.api.exceptions.SecurityConnectionException; -import appeng.api.networking.*; +import appeng.api.networking.GridFlags; +import appeng.api.networking.GridNotification; +import appeng.api.networking.IGrid; +import appeng.api.networking.IGridBlock; +import appeng.api.networking.IGridCache; +import appeng.api.networking.IGridConnection; +import appeng.api.networking.IGridConnectionVisitor; +import appeng.api.networking.IGridHost; +import appeng.api.networking.IGridNode; +import appeng.api.networking.IGridVisitor; import appeng.api.networking.energy.IEnergyGrid; import appeng.api.networking.events.MENetworkChannelsChanged; import appeng.api.networking.pathing.IPathingGrid; diff --git a/src/main/java/appeng/me/NetworkEventBus.java b/src/main/java/appeng/me/NetworkEventBus.java index cc4b260b0..3d22cb7ed 100644 --- a/src/main/java/appeng/me/NetworkEventBus.java +++ b/src/main/java/appeng/me/NetworkEventBus.java @@ -19,7 +19,12 @@ package appeng.me; import java.lang.reflect.Method; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; import java.util.Map.Entry; import appeng.api.networking.IGridNode; diff --git a/src/main/java/appeng/me/cache/CraftingGridCache.java b/src/main/java/appeng/me/cache/CraftingGridCache.java index 8ed5eeb0b..2807dc4b7 100644 --- a/src/main/java/appeng/me/cache/CraftingGridCache.java +++ b/src/main/java/appeng/me/cache/CraftingGridCache.java @@ -18,15 +18,29 @@ package appeng.me.cache; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.Comparator; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Map; import java.util.Map.Entry; +import java.util.Set; +import java.util.TreeSet; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.Future; import java.util.concurrent.ThreadFactory; import com.google.common.base.Preconditions; -import com.google.common.collect.*; +import com.google.common.collect.HashMultimap; +import com.google.common.collect.ImmutableCollection; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableSet; +import com.google.common.collect.Multimap; import net.minecraft.world.World; @@ -36,7 +50,18 @@ import appeng.api.networking.IGrid; import appeng.api.networking.IGridHost; import appeng.api.networking.IGridNode; import appeng.api.networking.IGridStorage; -import appeng.api.networking.crafting.*; +import appeng.api.networking.crafting.ICraftingCPU; +import appeng.api.networking.crafting.ICraftingCallback; +import appeng.api.networking.crafting.ICraftingGrid; +import appeng.api.networking.crafting.ICraftingJob; +import appeng.api.networking.crafting.ICraftingLink; +import appeng.api.networking.crafting.ICraftingMedium; +import appeng.api.networking.crafting.ICraftingPatternDetails; +import appeng.api.networking.crafting.ICraftingProvider; +import appeng.api.networking.crafting.ICraftingProviderHelper; +import appeng.api.networking.crafting.ICraftingRequester; +import appeng.api.networking.crafting.ICraftingWatcher; +import appeng.api.networking.crafting.ICraftingWatcherHost; import appeng.api.networking.energy.IEnergyGrid; import appeng.api.networking.events.MENetworkCraftingCpuChange; import appeng.api.networking.events.MENetworkCraftingPatternChange; diff --git a/src/main/java/appeng/me/cache/EnergyGridCache.java b/src/main/java/appeng/me/cache/EnergyGridCache.java index b225e9ffa..9a2ce7e64 100644 --- a/src/main/java/appeng/me/cache/EnergyGridCache.java +++ b/src/main/java/appeng/me/cache/EnergyGridCache.java @@ -18,7 +18,16 @@ package appeng.me.cache; -import java.util.*; +import java.util.Collection; +import java.util.Comparator; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.NavigableSet; +import java.util.PriorityQueue; +import java.util.Queue; +import java.util.Set; +import java.util.SortedSet; import com.google.common.base.Preconditions; import com.google.common.collect.HashMultiset; @@ -30,9 +39,21 @@ import it.unimi.dsi.fastutil.objects.ObjectRBTreeSet; import appeng.api.config.AccessRestriction; import appeng.api.config.Actionable; import appeng.api.config.PowerMultiplier; -import appeng.api.networking.*; -import appeng.api.networking.energy.*; -import appeng.api.networking.events.*; +import appeng.api.networking.IGrid; +import appeng.api.networking.IGridBlock; +import appeng.api.networking.IGridHost; +import appeng.api.networking.IGridNode; +import appeng.api.networking.IGridStorage; +import appeng.api.networking.energy.IAEPowerStorage; +import appeng.api.networking.energy.IEnergyGrid; +import appeng.api.networking.energy.IEnergyGridProvider; +import appeng.api.networking.energy.IEnergyWatcher; +import appeng.api.networking.energy.IEnergyWatcherHost; +import appeng.api.networking.events.MENetworkEventSubscribe; +import appeng.api.networking.events.MENetworkPostCacheConstruction; +import appeng.api.networking.events.MENetworkPowerIdleChange; +import appeng.api.networking.events.MENetworkPowerStatusChange; +import appeng.api.networking.events.MENetworkPowerStorage; import appeng.api.networking.events.MENetworkPowerStorage.PowerEventType; import appeng.api.networking.pathing.IPathingGrid; import appeng.me.Grid; diff --git a/src/main/java/appeng/me/cache/GridStorageCache.java b/src/main/java/appeng/me/cache/GridStorageCache.java index efb31a072..c1996d738 100644 --- a/src/main/java/appeng/me/cache/GridStorageCache.java +++ b/src/main/java/appeng/me/cache/GridStorageCache.java @@ -18,7 +18,12 @@ package appeng.me.cache; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.IdentityHashMap; +import java.util.List; +import java.util.Map; import com.google.common.collect.HashMultimap; import com.google.common.collect.SetMultimap; diff --git a/src/main/java/appeng/me/cache/NetworkMonitor.java b/src/main/java/appeng/me/cache/NetworkMonitor.java index 27b09b091..596a8357f 100644 --- a/src/main/java/appeng/me/cache/NetworkMonitor.java +++ b/src/main/java/appeng/me/cache/NetworkMonitor.java @@ -18,7 +18,11 @@ package appeng.me.cache; -import java.util.*; +import java.util.Collection; +import java.util.Deque; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; import java.util.Map.Entry; import javax.annotation.Nonnegative; diff --git a/src/main/java/appeng/me/cache/P2PCache.java b/src/main/java/appeng/me/cache/P2PCache.java index 519456d78..100270340 100644 --- a/src/main/java/appeng/me/cache/P2PCache.java +++ b/src/main/java/appeng/me/cache/P2PCache.java @@ -24,7 +24,12 @@ import java.util.Random; import com.google.common.collect.LinkedHashMultimap; import com.google.common.collect.Multimap; -import appeng.api.networking.*; +import appeng.api.networking.GridFlags; +import appeng.api.networking.IGrid; +import appeng.api.networking.IGridCache; +import appeng.api.networking.IGridHost; +import appeng.api.networking.IGridNode; +import appeng.api.networking.IGridStorage; import appeng.api.networking.events.MENetworkBootingStatusChange; import appeng.api.networking.events.MENetworkEventSubscribe; import appeng.api.networking.events.MENetworkPowerStatusChange; diff --git a/src/main/java/appeng/me/cache/PathGridCache.java b/src/main/java/appeng/me/cache/PathGridCache.java index 9bc5ca4c5..bf174d154 100644 --- a/src/main/java/appeng/me/cache/PathGridCache.java +++ b/src/main/java/appeng/me/cache/PathGridCache.java @@ -18,13 +18,25 @@ package appeng.me.cache; -import java.util.*; +import java.util.ArrayList; +import java.util.EnumSet; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Set; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.server.network.ServerPlayerEntity; import appeng.api.features.AEFeature; -import appeng.api.networking.*; +import appeng.api.networking.GridFlags; +import appeng.api.networking.IGrid; +import appeng.api.networking.IGridBlock; +import appeng.api.networking.IGridConnection; +import appeng.api.networking.IGridHost; +import appeng.api.networking.IGridMultiblock; +import appeng.api.networking.IGridNode; +import appeng.api.networking.IGridStorage; import appeng.api.networking.events.MENetworkBootingStatusChange; import appeng.api.networking.events.MENetworkChannelChanged; import appeng.api.networking.events.MENetworkControllerChange; @@ -39,7 +51,11 @@ import appeng.core.AppEng; import appeng.core.stats.IAdvancementTrigger; import appeng.me.GridConnection; import appeng.me.GridNode; -import appeng.me.pathfinding.*; +import appeng.me.pathfinding.AdHocChannelUpdater; +import appeng.me.pathfinding.ControllerChannelUpdater; +import appeng.me.pathfinding.ControllerValidator; +import appeng.me.pathfinding.IPathItem; +import appeng.me.pathfinding.PathSegment; import appeng.tile.networking.ControllerBlockEntity; public class PathGridCache implements IPathingGrid { diff --git a/src/main/java/appeng/me/cluster/implementations/CraftingCPUCluster.java b/src/main/java/appeng/me/cluster/implementations/CraftingCPUCluster.java index 1ae7ee84d..1e86d52f7 100644 --- a/src/main/java/appeng/me/cluster/implementations/CraftingCPUCluster.java +++ b/src/main/java/appeng/me/cluster/implementations/CraftingCPUCluster.java @@ -18,7 +18,12 @@ package appeng.me.cluster.implementations; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; import java.util.Map.Entry; import com.google.common.collect.ImmutableList; @@ -37,7 +42,14 @@ import appeng.api.config.PowerMultiplier; import appeng.api.crafting.ICraftingHelper; import appeng.api.networking.IGrid; import appeng.api.networking.IGridNode; -import appeng.api.networking.crafting.*; +import appeng.api.networking.crafting.CraftingItemList; +import appeng.api.networking.crafting.ICraftingCPU; +import appeng.api.networking.crafting.ICraftingGrid; +import appeng.api.networking.crafting.ICraftingJob; +import appeng.api.networking.crafting.ICraftingLink; +import appeng.api.networking.crafting.ICraftingMedium; +import appeng.api.networking.crafting.ICraftingPatternDetails; +import appeng.api.networking.crafting.ICraftingRequester; import appeng.api.networking.energy.IEnergyGrid; import appeng.api.networking.events.MENetworkCraftingCpuChange; import appeng.api.networking.security.IActionSource; @@ -50,7 +62,11 @@ import appeng.api.storage.data.IItemList; import appeng.container.ContainerNull; import appeng.core.AELog; import appeng.core.Api; -import appeng.crafting.*; +import appeng.crafting.CraftBranchFailure; +import appeng.crafting.CraftingJob; +import appeng.crafting.CraftingLink; +import appeng.crafting.CraftingWatcher; +import appeng.crafting.MECraftingInventory; import appeng.me.cache.CraftingGridCache; import appeng.me.cluster.IAECluster; import appeng.me.cluster.MBCalculator; diff --git a/src/main/java/appeng/me/helpers/AENetworkProxy.java b/src/main/java/appeng/me/helpers/AENetworkProxy.java index cf25acc10..bc8520b2d 100644 --- a/src/main/java/appeng/me/helpers/AENetworkProxy.java +++ b/src/main/java/appeng/me/helpers/AENetworkProxy.java @@ -28,7 +28,12 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundTag; import net.minecraft.util.math.Direction; -import appeng.api.networking.*; +import appeng.api.networking.GridFlags; +import appeng.api.networking.GridNotification; +import appeng.api.networking.IGrid; +import appeng.api.networking.IGridBlock; +import appeng.api.networking.IGridHost; +import appeng.api.networking.IGridNode; import appeng.api.networking.crafting.ICraftingGrid; import appeng.api.networking.energy.IEnergyGrid; import appeng.api.networking.events.MENetworkPowerIdleChange; diff --git a/src/main/java/appeng/me/pathfinding/PathSegment.java b/src/main/java/appeng/me/pathfinding/PathSegment.java index dfbaf481f..55bc55c21 100644 --- a/src/main/java/appeng/me/pathfinding/PathSegment.java +++ b/src/main/java/appeng/me/pathfinding/PathSegment.java @@ -18,7 +18,11 @@ package appeng.me.pathfinding; -import java.util.*; +import java.util.ArrayList; +import java.util.EnumSet; +import java.util.Iterator; +import java.util.List; +import java.util.Set; import appeng.api.networking.GridFlags; import appeng.api.networking.IGridMultiblock; diff --git a/src/main/java/appeng/me/storage/MEMonitorIFluidHandler.java b/src/main/java/appeng/me/storage/MEMonitorIFluidHandler.java index d8f098f12..d53eaee5f 100644 --- a/src/main/java/appeng/me/storage/MEMonitorIFluidHandler.java +++ b/src/main/java/appeng/me/storage/MEMonitorIFluidHandler.java @@ -19,8 +19,14 @@ package appeng.me.storage; import java.math.RoundingMode; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Map; import java.util.Map.Entry; +import java.util.Set; import alexiil.mc.lib.attributes.Simulation; import alexiil.mc.lib.attributes.fluid.FluidVolumeUtil; diff --git a/src/main/java/appeng/me/storage/MEMonitorIInventory.java b/src/main/java/appeng/me/storage/MEMonitorIInventory.java index 050b0374b..ed72ad647 100644 --- a/src/main/java/appeng/me/storage/MEMonitorIInventory.java +++ b/src/main/java/appeng/me/storage/MEMonitorIInventory.java @@ -18,8 +18,12 @@ package appeng.me.storage; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; import java.util.Map.Entry; +import java.util.NavigableMap; import java.util.concurrent.ConcurrentSkipListMap; import net.minecraft.item.ItemStack; diff --git a/src/main/java/appeng/me/storage/NetworkInventoryHandler.java b/src/main/java/appeng/me/storage/NetworkInventoryHandler.java index 2042a2f43..4a19902b5 100644 --- a/src/main/java/appeng/me/storage/NetworkInventoryHandler.java +++ b/src/main/java/appeng/me/storage/NetworkInventoryHandler.java @@ -18,7 +18,14 @@ package appeng.me.storage; -import java.util.*; +import java.util.ArrayDeque; +import java.util.ArrayList; +import java.util.Comparator; +import java.util.Deque; +import java.util.Iterator; +import java.util.List; +import java.util.NavigableMap; +import java.util.TreeMap; import appeng.api.config.AccessRestriction; import appeng.api.config.Actionable; diff --git a/src/main/java/appeng/parts/AEBasePart.java b/src/main/java/appeng/parts/AEBasePart.java index 007f4906a..e5eb65b3f 100644 --- a/src/main/java/appeng/parts/AEBasePart.java +++ b/src/main/java/appeng/parts/AEBasePart.java @@ -19,7 +19,11 @@ package appeng.parts; import java.io.IOException; -import java.util.*; +import java.util.ArrayList; +import java.util.EnumSet; +import java.util.List; +import java.util.Optional; +import java.util.Random; import com.google.common.base.Preconditions; @@ -50,8 +54,16 @@ import appeng.api.implementations.items.IMemoryCard; import appeng.api.implementations.items.MemoryCardMessages; import appeng.api.networking.IGridNode; import appeng.api.networking.security.IActionHost; -import appeng.api.parts.*; -import appeng.api.util.*; +import appeng.api.parts.BusSupport; +import appeng.api.parts.IPart; +import appeng.api.parts.IPartCollisionHelper; +import appeng.api.parts.IPartHost; +import appeng.api.parts.PartItemStack; +import appeng.api.util.AECableType; +import appeng.api.util.AEColor; +import appeng.api.util.AEPartLocation; +import appeng.api.util.DimensionalCoord; +import appeng.api.util.IConfigManager; import appeng.core.Api; import appeng.helpers.ICustomNameObject; import appeng.helpers.IPriorityHost; diff --git a/src/main/java/appeng/parts/CableBusContainer.java b/src/main/java/appeng/parts/CableBusContainer.java index 1c976cdf6..cac28ae44 100644 --- a/src/main/java/appeng/parts/CableBusContainer.java +++ b/src/main/java/appeng/parts/CableBusContainer.java @@ -19,7 +19,11 @@ package appeng.parts; import java.io.IOException; -import java.util.*; +import java.util.ArrayList; +import java.util.EnumSet; +import java.util.List; +import java.util.Random; +import java.util.Set; import javax.annotation.Nullable; @@ -48,7 +52,15 @@ import appeng.api.exceptions.FailedConnectionException; import appeng.api.implementations.parts.ICablePart; import appeng.api.networking.IGridHost; import appeng.api.networking.IGridNode; -import appeng.api.parts.*; +import appeng.api.parts.IFacadeContainer; +import appeng.api.parts.IFacadePart; +import appeng.api.parts.IPart; +import appeng.api.parts.IPartCollisionHelper; +import appeng.api.parts.IPartHost; +import appeng.api.parts.IPartItem; +import appeng.api.parts.LayerFlags; +import appeng.api.parts.PartItemStack; +import appeng.api.parts.SelectedPart; import appeng.api.util.AECableType; import appeng.api.util.AEColor; import appeng.api.util.AEPartLocation; diff --git a/src/main/java/appeng/parts/PartPlacement.java b/src/main/java/appeng/parts/PartPlacement.java index 807ede314..9941362fb 100644 --- a/src/main/java/appeng/parts/PartPlacement.java +++ b/src/main/java/appeng/parts/PartPlacement.java @@ -27,7 +27,11 @@ import net.minecraft.block.BlockState; import net.minecraft.block.entity.BlockEntity; import net.minecraft.client.MinecraftClient; import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.*; +import net.minecraft.item.AutomaticItemPlacementContext; +import net.minecraft.item.BlockItem; +import net.minecraft.item.ItemPlacementContext; +import net.minecraft.item.ItemStack; +import net.minecraft.item.ItemUsageContext; import net.minecraft.sound.BlockSoundGroup; import net.minecraft.sound.SoundCategory; import net.minecraft.util.ActionResult; @@ -41,7 +45,11 @@ import net.minecraft.world.RayTraceContext; import net.minecraft.world.World; import appeng.api.definitions.IBlockDefinition; -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.Api; diff --git a/src/main/java/appeng/parts/automation/ExportBusPart.java b/src/main/java/appeng/parts/automation/ExportBusPart.java index 2e6e1b088..699b939d5 100644 --- a/src/main/java/appeng/parts/automation/ExportBusPart.java +++ b/src/main/java/appeng/parts/automation/ExportBusPart.java @@ -28,7 +28,14 @@ import net.minecraft.util.Hand; import net.minecraft.util.Identifier; import net.minecraft.util.math.Vec3d; -import appeng.api.config.*; +import appeng.api.config.Actionable; +import appeng.api.config.FuzzyMode; +import appeng.api.config.PowerMultiplier; +import appeng.api.config.RedstoneMode; +import appeng.api.config.SchedulingMode; +import appeng.api.config.Settings; +import appeng.api.config.Upgrades; +import appeng.api.config.YesNo; import appeng.api.networking.IGridNode; import appeng.api.networking.crafting.ICraftingGrid; import appeng.api.networking.crafting.ICraftingLink; diff --git a/src/main/java/appeng/parts/automation/FormationPlanePart.java b/src/main/java/appeng/parts/automation/FormationPlanePart.java index c1ac9602d..19424bad0 100644 --- a/src/main/java/appeng/parts/automation/FormationPlanePart.java +++ b/src/main/java/appeng/parts/automation/FormationPlanePart.java @@ -45,7 +45,13 @@ import net.minecraft.world.World; import alexiil.mc.lib.attributes.item.FixedItemInv; -import appeng.api.config.*; +import appeng.api.config.AccessRestriction; +import appeng.api.config.Actionable; +import appeng.api.config.FuzzyMode; +import appeng.api.config.IncludeExclude; +import appeng.api.config.Settings; +import appeng.api.config.Upgrades; +import appeng.api.config.YesNo; import appeng.api.networking.events.MENetworkCellArrayUpdate; import appeng.api.networking.events.MENetworkChannelsChanged; import appeng.api.networking.events.MENetworkEventSubscribe; diff --git a/src/main/java/appeng/parts/automation/ImportBusPart.java b/src/main/java/appeng/parts/automation/ImportBusPart.java index fb31ccabb..d2cfa5625 100644 --- a/src/main/java/appeng/parts/automation/ImportBusPart.java +++ b/src/main/java/appeng/parts/automation/ImportBusPart.java @@ -25,7 +25,11 @@ import net.minecraft.util.Hand; import net.minecraft.util.Identifier; import net.minecraft.util.math.Vec3d; -import appeng.api.config.*; +import appeng.api.config.Actionable; +import appeng.api.config.FuzzyMode; +import appeng.api.config.RedstoneMode; +import appeng.api.config.Settings; +import appeng.api.config.Upgrades; import appeng.api.networking.IGridNode; import appeng.api.networking.energy.IEnergyGrid; import appeng.api.networking.energy.IEnergySource; diff --git a/src/main/java/appeng/parts/automation/LevelEmitterPart.java b/src/main/java/appeng/parts/automation/LevelEmitterPart.java index 0def25aec..c596628d5 100644 --- a/src/main/java/appeng/parts/automation/LevelEmitterPart.java +++ b/src/main/java/appeng/parts/automation/LevelEmitterPart.java @@ -35,8 +35,18 @@ import net.minecraft.world.World; import alexiil.mc.lib.attributes.item.FixedItemInv; -import appeng.api.config.*; -import appeng.api.networking.crafting.*; +import appeng.api.config.FuzzyMode; +import appeng.api.config.LevelType; +import appeng.api.config.RedstoneMode; +import appeng.api.config.Settings; +import appeng.api.config.Upgrades; +import appeng.api.config.YesNo; +import appeng.api.networking.crafting.ICraftingGrid; +import appeng.api.networking.crafting.ICraftingPatternDetails; +import appeng.api.networking.crafting.ICraftingProvider; +import appeng.api.networking.crafting.ICraftingProviderHelper; +import appeng.api.networking.crafting.ICraftingWatcher; +import appeng.api.networking.crafting.ICraftingWatcherHost; import appeng.api.networking.energy.IEnergyGrid; import appeng.api.networking.energy.IEnergyWatcher; import appeng.api.networking.energy.IEnergyWatcherHost; diff --git a/src/main/java/appeng/parts/automation/PlaneBakedModel.java b/src/main/java/appeng/parts/automation/PlaneBakedModel.java index 8ca9770ba..a6341d243 100644 --- a/src/main/java/appeng/parts/automation/PlaneBakedModel.java +++ b/src/main/java/appeng/parts/automation/PlaneBakedModel.java @@ -18,7 +18,11 @@ package appeng.parts.automation; -import java.util.*; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Random; import java.util.function.Supplier; import javax.annotation.Nullable; diff --git a/src/main/java/appeng/parts/misc/CableAnchorPart.java b/src/main/java/appeng/parts/misc/CableAnchorPart.java index 83f20344b..bea66b70b 100644 --- a/src/main/java/appeng/parts/misc/CableAnchorPart.java +++ b/src/main/java/appeng/parts/misc/CableAnchorPart.java @@ -37,7 +37,12 @@ import net.minecraft.world.BlockView; import net.minecraft.world.World; import appeng.api.networking.IGridNode; -import appeng.api.parts.*; +import appeng.api.parts.BusSupport; +import appeng.api.parts.IPart; +import appeng.api.parts.IPartCollisionHelper; +import appeng.api.parts.IPartHost; +import appeng.api.parts.IPartModel; +import appeng.api.parts.PartItemStack; import appeng.api.util.AECableType; import appeng.api.util.AEPartLocation; import appeng.core.AppEng; diff --git a/src/main/java/appeng/parts/misc/ItemHandlerAdapter.java b/src/main/java/appeng/parts/misc/ItemHandlerAdapter.java index b7b426d2c..262541319 100644 --- a/src/main/java/appeng/parts/misc/ItemHandlerAdapter.java +++ b/src/main/java/appeng/parts/misc/ItemHandlerAdapter.java @@ -18,7 +18,12 @@ package appeng.parts.misc; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; import net.minecraft.item.ItemStack; diff --git a/src/main/java/appeng/parts/misc/StorageBusPart.java b/src/main/java/appeng/parts/misc/StorageBusPart.java index 4eee5e2d3..e5df01ef8 100644 --- a/src/main/java/appeng/parts/misc/StorageBusPart.java +++ b/src/main/java/appeng/parts/misc/StorageBusPart.java @@ -37,7 +37,12 @@ import net.minecraft.world.BlockView; import alexiil.mc.lib.attributes.item.FixedItemInv; import alexiil.mc.lib.attributes.item.ItemAttributes; -import appeng.api.config.*; +import appeng.api.config.AccessRestriction; +import appeng.api.config.FuzzyMode; +import appeng.api.config.IncludeExclude; +import appeng.api.config.Settings; +import appeng.api.config.StorageFilter; +import appeng.api.config.Upgrades; import appeng.api.networking.IGridNode; import appeng.api.networking.events.MENetworkCellArrayUpdate; import appeng.api.networking.events.MENetworkChannelsChanged; @@ -52,7 +57,12 @@ import appeng.api.networking.ticking.TickingRequest; import appeng.api.parts.IPartCollisionHelper; import appeng.api.parts.IPartHost; import appeng.api.parts.IPartModel; -import appeng.api.storage.*; +import appeng.api.storage.IMEInventory; +import appeng.api.storage.IMEInventoryHandler; +import appeng.api.storage.IMEMonitorHandlerReceiver; +import appeng.api.storage.IStorageChannel; +import appeng.api.storage.IStorageMonitorable; +import appeng.api.storage.IStorageMonitorableAccessor; import appeng.api.storage.cells.ICellContainer; import appeng.api.storage.cells.ICellInventory; import appeng.api.storage.channels.IItemStorageChannel; diff --git a/src/main/java/appeng/recipes/game/DisassembleRecipe.java b/src/main/java/appeng/recipes/game/DisassembleRecipe.java index a0fc0139d..e354f3bd7 100644 --- a/src/main/java/appeng/recipes/game/DisassembleRecipe.java +++ b/src/main/java/appeng/recipes/game/DisassembleRecipe.java @@ -33,7 +33,11 @@ import net.minecraft.recipe.SpecialRecipeSerializer; import net.minecraft.util.Identifier; import net.minecraft.world.World; -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/server/Commands.java b/src/main/java/appeng/server/Commands.java index 77f2e57a6..a2bd40714 100644 --- a/src/main/java/appeng/server/Commands.java +++ b/src/main/java/appeng/server/Commands.java @@ -18,7 +18,11 @@ package appeng.server; -import appeng.server.subcommands.*; +import appeng.server.subcommands.ChunkLogger; +import appeng.server.subcommands.SpatialStorageCommand; +import appeng.server.subcommands.Supporters; +import appeng.server.subcommands.TestMeteoritesCommand; +import appeng.server.subcommands.TestOreGenCommand; public enum Commands { Chunklogger(4, new ChunkLogger(), false), Supporters(0, new Supporters(), false), diff --git a/src/main/java/appeng/server/subcommands/SpatialStorageCommand.java b/src/main/java/appeng/server/subcommands/SpatialStorageCommand.java index fb3263917..d374c088f 100644 --- a/src/main/java/appeng/server/subcommands/SpatialStorageCommand.java +++ b/src/main/java/appeng/server/subcommands/SpatialStorageCommand.java @@ -20,7 +20,12 @@ import net.minecraft.server.MinecraftServer; import net.minecraft.server.command.CommandManager; import net.minecraft.server.command.ServerCommandSource; import net.minecraft.server.network.ServerPlayerEntity; -import net.minecraft.text.*; +import net.minecraft.text.ClickEvent; +import net.minecraft.text.HoverEvent; +import net.minecraft.text.LiteralText; +import net.minecraft.text.MutableText; +import net.minecraft.text.Style; +import net.minecraft.text.Text; import net.minecraft.util.Formatting; import net.minecraft.util.Identifier; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/appeng/server/subcommands/TestMeteoritesCommand.java b/src/main/java/appeng/server/subcommands/TestMeteoritesCommand.java index adbad5b72..65201262b 100644 --- a/src/main/java/appeng/server/subcommands/TestMeteoritesCommand.java +++ b/src/main/java/appeng/server/subcommands/TestMeteoritesCommand.java @@ -35,7 +35,11 @@ import net.minecraft.server.command.ServerCommandSource; import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.server.world.ServerWorld; import net.minecraft.structure.StructureStart; -import net.minecraft.text.*; +import net.minecraft.text.ClickEvent; +import net.minecraft.text.HoverEvent; +import net.minecraft.text.LiteralText; +import net.minecraft.text.MutableText; +import net.minecraft.text.Text; import net.minecraft.util.Formatting; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.ChunkPos; diff --git a/src/main/java/appeng/services/CompassService.java b/src/main/java/appeng/services/CompassService.java index 83539b02b..24f92f086 100644 --- a/src/main/java/appeng/services/CompassService.java +++ b/src/main/java/appeng/services/CompassService.java @@ -19,7 +19,11 @@ package appeng.services; import java.util.WeakHashMap; -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/tile/crafting/CraftingBlockEntity.java b/src/main/java/appeng/tile/crafting/CraftingBlockEntity.java index b2128e61c..6d41ddbd6 100644 --- a/src/main/java/appeng/tile/crafting/CraftingBlockEntity.java +++ b/src/main/java/appeng/tile/crafting/CraftingBlockEntity.java @@ -18,7 +18,11 @@ package appeng.tile.crafting; -import java.util.*; +import java.util.Collections; +import java.util.EnumSet; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.Optional; import net.minecraft.block.BlockState; import net.minecraft.block.entity.BlockEntityType; diff --git a/src/main/java/appeng/tile/crafting/MolecularAssemblerBlockEntity.java b/src/main/java/appeng/tile/crafting/MolecularAssemblerBlockEntity.java index 4e5882709..6a91dc1ab 100644 --- a/src/main/java/appeng/tile/crafting/MolecularAssemblerBlockEntity.java +++ b/src/main/java/appeng/tile/crafting/MolecularAssemblerBlockEntity.java @@ -39,7 +39,11 @@ import net.minecraft.world.World; import alexiil.mc.lib.attributes.Simulation; import alexiil.mc.lib.attributes.item.FixedItemInv; -import appeng.api.config.*; +import appeng.api.config.Actionable; +import appeng.api.config.PowerMultiplier; +import appeng.api.config.RedstoneMode; +import appeng.api.config.Settings; +import appeng.api.config.Upgrades; import appeng.api.definitions.ITileDefinition; import appeng.api.implementations.IPowerChannelState; import appeng.api.implementations.IUpgradeableHost; diff --git a/src/main/java/appeng/tile/crafting/MolecularAssemblerRenderer.java b/src/main/java/appeng/tile/crafting/MolecularAssemblerRenderer.java index 7ed85c63e..5a766b505 100644 --- a/src/main/java/appeng/tile/crafting/MolecularAssemblerRenderer.java +++ b/src/main/java/appeng/tile/crafting/MolecularAssemblerRenderer.java @@ -25,7 +25,12 @@ import org.lwjgl.opengl.GL11; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.client.MinecraftClient; -import net.minecraft.client.render.*; +import net.minecraft.client.render.OverlayTexture; +import net.minecraft.client.render.RenderLayer; +import net.minecraft.client.render.RenderPhase; +import net.minecraft.client.render.VertexConsumer; +import net.minecraft.client.render.VertexConsumerProvider; +import net.minecraft.client.render.VertexFormats; import net.minecraft.client.render.block.entity.BlockEntityRenderDispatcher; import net.minecraft.client.render.block.entity.BlockEntityRenderer; import net.minecraft.client.render.item.ItemRenderer; diff --git a/src/main/java/appeng/tile/misc/PaintSplotchesBlockEntity.java b/src/main/java/appeng/tile/misc/PaintSplotchesBlockEntity.java index 309eb6330..7b5fdb1b4 100644 --- a/src/main/java/appeng/tile/misc/PaintSplotchesBlockEntity.java +++ b/src/main/java/appeng/tile/misc/PaintSplotchesBlockEntity.java @@ -19,7 +19,11 @@ package appeng.tile.misc; import java.io.IOException; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.Iterator; +import java.util.List; import io.netty.buffer.Unpooled; diff --git a/src/main/java/appeng/tile/misc/SecurityStationBlockEntity.java b/src/main/java/appeng/tile/misc/SecurityStationBlockEntity.java index 3943ac918..ef6455e76 100644 --- a/src/main/java/appeng/tile/misc/SecurityStationBlockEntity.java +++ b/src/main/java/appeng/tile/misc/SecurityStationBlockEntity.java @@ -37,7 +37,11 @@ import net.minecraft.world.World; import alexiil.mc.lib.attributes.item.FixedItemInv; -import appeng.api.config.*; +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.events.LocatableEventAnnounce; import appeng.api.events.LocatableEventAnnounce.LocatableEvent; import appeng.api.features.ILocatable; @@ -57,7 +61,11 @@ import appeng.api.storage.ITerminalHost; import appeng.api.storage.channels.IItemStorageChannel; import appeng.api.storage.data.IAEItemStack; import appeng.api.storage.data.IAEStack; -import appeng.api.util.*; +import appeng.api.util.AECableType; +import appeng.api.util.AEColor; +import appeng.api.util.AEPartLocation; +import appeng.api.util.DimensionalCoord; +import appeng.api.util.IConfigManager; import appeng.core.Api; import appeng.helpers.PlayerSecurityWrapper; import appeng.me.GridAccessException; diff --git a/src/main/java/appeng/tile/storage/ChestBlockEntity.java b/src/main/java/appeng/tile/storage/ChestBlockEntity.java index 32a7ca3cd..22b160025 100644 --- a/src/main/java/appeng/tile/storage/ChestBlockEntity.java +++ b/src/main/java/appeng/tile/storage/ChestBlockEntity.java @@ -50,22 +50,43 @@ import alexiil.mc.lib.attributes.fluid.filter.FluidFilter; import alexiil.mc.lib.attributes.fluid.volume.FluidVolume; import alexiil.mc.lib.attributes.item.FixedItemInv; -import appeng.api.config.*; +import appeng.api.config.AccessRestriction; +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.implementations.tiles.IColorableTile; import appeng.api.implementations.tiles.IMEChest; import appeng.api.networking.GridFlags; import appeng.api.networking.IGrid; import appeng.api.networking.IGridNode; import appeng.api.networking.energy.IEnergyGrid; -import appeng.api.networking.events.*; +import appeng.api.networking.events.MENetworkCellArrayUpdate; +import appeng.api.networking.events.MENetworkChannelsChanged; +import appeng.api.networking.events.MENetworkEventSubscribe; +import appeng.api.networking.events.MENetworkPowerStatusChange; +import appeng.api.networking.events.MENetworkPowerStorage; import appeng.api.networking.events.MENetworkPowerStorage.PowerEventType; import appeng.api.networking.security.IActionHost; import appeng.api.networking.security.IActionSource; import appeng.api.networking.security.ISecurityGrid; import appeng.api.networking.storage.IBaseMonitor; import appeng.api.networking.storage.IStorageGrid; -import appeng.api.storage.*; -import appeng.api.storage.cells.*; +import appeng.api.storage.IMEInventoryHandler; +import appeng.api.storage.IMEMonitor; +import appeng.api.storage.IMEMonitorHandlerReceiver; +import appeng.api.storage.IStorageChannel; +import appeng.api.storage.IStorageMonitorable; +import appeng.api.storage.IStorageMonitorableAccessor; +import appeng.api.storage.ITerminalHost; +import appeng.api.storage.cells.CellState; +import appeng.api.storage.cells.ICellGuiHandler; +import appeng.api.storage.cells.ICellHandler; +import appeng.api.storage.cells.ICellInventory; +import appeng.api.storage.cells.ICellInventoryHandler; import appeng.api.storage.channels.IFluidStorageChannel; import appeng.api.storage.channels.IItemStorageChannel; import appeng.api.storage.data.IAEFluidStack; diff --git a/src/main/java/appeng/tile/storage/DriveBlockEntity.java b/src/main/java/appeng/tile/storage/DriveBlockEntity.java index 635ab0384..391095b74 100644 --- a/src/main/java/appeng/tile/storage/DriveBlockEntity.java +++ b/src/main/java/appeng/tile/storage/DriveBlockEntity.java @@ -19,7 +19,13 @@ package appeng.tile.storage; import java.io.IOException; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.EnumSet; +import java.util.IdentityHashMap; +import java.util.List; +import java.util.Map; import javax.annotation.Nullable; diff --git a/src/main/java/appeng/tile/storage/IOPortBlockEntity.java b/src/main/java/appeng/tile/storage/IOPortBlockEntity.java index 644298455..08fd31dcf 100644 --- a/src/main/java/appeng/tile/storage/IOPortBlockEntity.java +++ b/src/main/java/appeng/tile/storage/IOPortBlockEntity.java @@ -34,7 +34,13 @@ import net.minecraft.world.World; import alexiil.mc.lib.attributes.Simulation; import alexiil.mc.lib.attributes.item.FixedItemInv; -import appeng.api.config.*; +import appeng.api.config.Actionable; +import appeng.api.config.FullnessMode; +import appeng.api.config.OperationMode; +import appeng.api.config.RedstoneMode; +import appeng.api.config.Settings; +import appeng.api.config.Upgrades; +import appeng.api.config.YesNo; import appeng.api.implementations.IUpgradeableHost; import appeng.api.networking.GridFlags; import appeng.api.networking.IGridNode; diff --git a/src/main/java/appeng/util/Platform.java b/src/main/java/appeng/util/Platform.java index 533c5ebab..065bab4b2 100644 --- a/src/main/java/appeng/util/Platform.java +++ b/src/main/java/appeng/util/Platform.java @@ -19,7 +19,11 @@ package appeng.util; import java.text.DecimalFormat; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.List; +import java.util.Random; import javax.annotation.Nullable; @@ -51,14 +55,24 @@ import net.minecraft.util.Identifier; import net.minecraft.util.Util; import net.minecraft.util.hit.EntityHitResult; import net.minecraft.util.hit.HitResult; -import net.minecraft.util.math.*; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Box; +import net.minecraft.util.math.Direction; +import net.minecraft.util.math.MathHelper; +import net.minecraft.util.math.Vec3d; import net.minecraft.util.registry.Registry; import net.minecraft.world.RayTraceContext; import net.minecraft.world.World; import alexiil.mc.lib.attributes.fluid.volume.FluidVolume; -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/item/FuzzyItemList.java b/src/main/java/appeng/util/item/FuzzyItemList.java index a66d4d31c..ca9e6dc4e 100644 --- a/src/main/java/appeng/util/item/FuzzyItemList.java +++ b/src/main/java/appeng/util/item/FuzzyItemList.java @@ -18,7 +18,11 @@ package appeng.util.item; -import java.util.*; +import java.util.Collection; +import java.util.Collections; +import java.util.Map; +import java.util.NavigableMap; +import java.util.TreeMap; import appeng.api.config.FuzzyMode; import appeng.api.storage.data.IAEItemStack; diff --git a/src/main/java/appeng/util/item/ItemList.java b/src/main/java/appeng/util/item/ItemList.java index abb3e91cf..d5c4f8aa7 100644 --- a/src/main/java/appeng/util/item/ItemList.java +++ b/src/main/java/appeng/util/item/ItemList.java @@ -18,7 +18,12 @@ package appeng.util.item; -import java.util.*; +import java.util.Collection; +import java.util.Collections; +import java.util.IdentityHashMap; +import java.util.Iterator; +import java.util.Map; +import java.util.NoSuchElementException; import net.minecraft.item.Item; diff --git a/src/main/java/appeng/worldgen/meteorite/MeteoritePlacer.java b/src/main/java/appeng/worldgen/meteorite/MeteoritePlacer.java index 5ec321589..d7c3085c4 100644 --- a/src/main/java/appeng/worldgen/meteorite/MeteoritePlacer.java +++ b/src/main/java/appeng/worldgen/meteorite/MeteoritePlacer.java @@ -44,7 +44,11 @@ import appeng.tile.storage.SkyChestBlockEntity; import appeng.util.InventoryAdaptor; import appeng.util.Platform; import appeng.util.inv.AdaptorFixedInv; -import appeng.worldgen.meteorite.fallout.*; +import appeng.worldgen.meteorite.fallout.Fallout; +import appeng.worldgen.meteorite.fallout.FalloutCopy; +import appeng.worldgen.meteorite.fallout.FalloutMode; +import appeng.worldgen.meteorite.fallout.FalloutSand; +import appeng.worldgen.meteorite.fallout.FalloutSnow; public final class MeteoritePlacer { private static final double PRESSES_SPAWN_CHANCE = 0.7;