diff --git a/src/main/java/appeng/client/gui/AEBaseScreen.java b/src/main/java/appeng/client/gui/AEBaseScreen.java index ef6e9548f..fe2166933 100644 --- a/src/main/java/appeng/client/gui/AEBaseScreen.java +++ b/src/main/java/appeng/client/gui/AEBaseScreen.java @@ -18,6 +18,46 @@ package appeng.client.gui; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashSet; +import java.util.List; +import java.util.Set; +import java.util.concurrent.TimeUnit; + +import com.google.common.base.Preconditions; +import com.google.common.base.Stopwatch; +import com.google.common.collect.Lists; +import com.mojang.blaze3d.systems.RenderSystem; + +import org.lwjgl.glfw.GLFW; +import org.lwjgl.opengl.GL11; + +import net.minecraft.client.Minecraft; +import net.minecraft.client.entity.player.ClientPlayerEntity; +import net.minecraft.client.gui.IGuiEventListener; +import net.minecraft.client.gui.screen.inventory.ContainerScreen; +import net.minecraft.client.gui.widget.Widget; +import net.minecraft.client.renderer.BufferBuilder; +import net.minecraft.client.renderer.RenderHelper; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.texture.AtlasTexture; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.client.renderer.vertex.DefaultVertexFormats; +import net.minecraft.client.util.InputMappings; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.entity.player.PlayerInventory; +import net.minecraft.fluid.Fluid; +import net.minecraft.inventory.container.ClickType; +import net.minecraft.inventory.container.Container; +import net.minecraft.inventory.container.Slot; +import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.text.ITextComponent; +import net.minecraft.util.text.TextFormatting; +import net.minecraftforge.fluids.FluidAttributes; +import net.minecraftforge.fml.client.gui.GuiUtils; + import appeng.api.storage.data.IAEFluidStack; import appeng.api.storage.data.IAEItemStack; import appeng.client.gui.widgets.CustomSlotWidget; @@ -48,43 +88,6 @@ import appeng.core.sync.packets.SwapSlotsPacket; import appeng.fluids.client.render.FluidStackSizeRenderer; import appeng.fluids.container.slots.IMEFluidSlot; import appeng.helpers.InventoryAction; -import com.google.common.base.Preconditions; -import com.google.common.base.Stopwatch; -import com.google.common.collect.Lists; -import com.mojang.blaze3d.systems.RenderSystem; -import net.minecraft.client.Minecraft; -import net.minecraft.client.entity.player.ClientPlayerEntity; -import net.minecraft.client.gui.IGuiEventListener; -import net.minecraft.client.gui.screen.inventory.ContainerScreen; -import net.minecraft.client.gui.widget.Widget; -import net.minecraft.client.renderer.BufferBuilder; -import net.minecraft.client.renderer.RenderHelper; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.texture.AtlasTexture; -import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.client.renderer.vertex.DefaultVertexFormats; -import net.minecraft.client.util.InputMappings; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.entity.player.PlayerInventory; -import net.minecraft.fluid.Fluid; -import net.minecraft.inventory.container.ClickType; -import net.minecraft.inventory.container.Container; -import net.minecraft.inventory.container.Slot; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.TextFormatting; -import net.minecraftforge.fluids.FluidAttributes; -import net.minecraftforge.fml.client.gui.GuiUtils; -import org.lwjgl.glfw.GLFW; -import org.lwjgl.opengl.GL11; - -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; public abstract class AEBaseScreen extends ContainerScreen { diff --git a/src/main/java/appeng/client/gui/implementations/CraftAmountScreen.java b/src/main/java/appeng/client/gui/implementations/CraftAmountScreen.java index b7cd439f1..418579bee 100644 --- a/src/main/java/appeng/client/gui/implementations/CraftAmountScreen.java +++ b/src/main/java/appeng/client/gui/implementations/CraftAmountScreen.java @@ -18,16 +18,17 @@ package appeng.client.gui.implementations; +import net.minecraft.client.gui.widget.button.Button; +import net.minecraft.entity.player.PlayerInventory; +import net.minecraft.util.text.ITextComponent; +import net.minecraftforge.fml.client.gui.GuiUtils; + import appeng.client.gui.AEBaseScreen; import appeng.client.gui.NumberEntryType; import appeng.container.implementations.CraftAmountContainer; import appeng.core.localization.GuiText; import appeng.core.sync.network.NetworkHandler; import appeng.core.sync.packets.CraftRequestPacket; -import net.minecraft.client.gui.widget.button.Button; -import net.minecraft.entity.player.PlayerInventory; -import net.minecraft.util.text.ITextComponent; -import net.minecraftforge.fml.client.gui.GuiUtils; public class CraftAmountScreen extends AEBaseScreen { private final AESubScreen subGui; diff --git a/src/main/java/appeng/client/gui/implementations/LevelEmitterScreen.java b/src/main/java/appeng/client/gui/implementations/LevelEmitterScreen.java index 61298f58b..a9c608bbb 100644 --- a/src/main/java/appeng/client/gui/implementations/LevelEmitterScreen.java +++ b/src/main/java/appeng/client/gui/implementations/LevelEmitterScreen.java @@ -18,6 +18,9 @@ package appeng.client.gui.implementations; +import net.minecraft.entity.player.PlayerInventory; +import net.minecraft.util.text.ITextComponent; + import appeng.api.config.FuzzyMode; import appeng.api.config.LevelType; import appeng.api.config.PowerUnits; @@ -32,8 +35,6 @@ import appeng.container.implementations.LevelEmitterContainer; import appeng.core.localization.GuiText; import appeng.core.sync.network.NetworkHandler; import appeng.core.sync.packets.ConfigValuePacket; -import net.minecraft.entity.player.PlayerInventory; -import net.minecraft.util.text.ITextComponent; public class LevelEmitterScreen extends UpgradeableScreen { diff --git a/src/main/java/appeng/client/gui/implementations/NumberEntryWidget.java b/src/main/java/appeng/client/gui/implementations/NumberEntryWidget.java index 0e9bef1f0..ccabecad7 100644 --- a/src/main/java/appeng/client/gui/implementations/NumberEntryWidget.java +++ b/src/main/java/appeng/client/gui/implementations/NumberEntryWidget.java @@ -1,16 +1,17 @@ package appeng.client.gui.implementations; +import java.util.function.Consumer; +import java.util.function.LongConsumer; + +import net.minecraft.client.gui.FontRenderer; +import net.minecraft.client.gui.IGuiEventListener; +import net.minecraft.client.gui.widget.button.Button; + import appeng.client.gui.AEBaseScreen; import appeng.client.gui.NumberEntryType; import appeng.client.gui.widgets.ITickingWidget; import appeng.client.gui.widgets.NumberBox; import appeng.core.AEConfig; -import net.minecraft.client.gui.FontRenderer; -import net.minecraft.client.gui.IGuiEventListener; -import net.minecraft.client.gui.widget.button.Button; - -import java.util.function.Consumer; -import java.util.function.LongConsumer; /** * A utility widget that consists of a text-field to enter a number with diff --git a/src/main/java/appeng/client/gui/implementations/PriorityScreen.java b/src/main/java/appeng/client/gui/implementations/PriorityScreen.java index 20a0ab639..46bf4e7d3 100644 --- a/src/main/java/appeng/client/gui/implementations/PriorityScreen.java +++ b/src/main/java/appeng/client/gui/implementations/PriorityScreen.java @@ -18,14 +18,15 @@ package appeng.client.gui.implementations; +import net.minecraft.entity.player.PlayerInventory; +import net.minecraft.util.text.ITextComponent; + import appeng.client.gui.AEBaseScreen; import appeng.client.gui.NumberEntryType; import appeng.container.implementations.PriorityContainer; import appeng.core.localization.GuiText; import appeng.core.sync.network.NetworkHandler; import appeng.core.sync.packets.ConfigValuePacket; -import net.minecraft.entity.player.PlayerInventory; -import net.minecraft.util.text.ITextComponent; public class PriorityScreen extends AEBaseScreen { diff --git a/src/main/java/appeng/client/gui/widgets/NumberBox.java b/src/main/java/appeng/client/gui/widgets/NumberBox.java index 0efac7702..043405156 100644 --- a/src/main/java/appeng/client/gui/widgets/NumberBox.java +++ b/src/main/java/appeng/client/gui/widgets/NumberBox.java @@ -18,11 +18,11 @@ package appeng.client.gui.widgets; +import java.util.function.LongConsumer; + import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.widget.TextFieldWidget; -import java.util.function.LongConsumer; - public class NumberBox extends TextFieldWidget { private final LongConsumer changeListener; diff --git a/src/main/java/appeng/container/implementations/LevelEmitterContainer.java b/src/main/java/appeng/container/implementations/LevelEmitterContainer.java index 24a24da53..5493fdac7 100644 --- a/src/main/java/appeng/container/implementations/LevelEmitterContainer.java +++ b/src/main/java/appeng/container/implementations/LevelEmitterContainer.java @@ -18,6 +18,14 @@ package appeng.container.implementations; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.entity.player.PlayerInventory; +import net.minecraft.inventory.container.ContainerType; +import net.minecraft.network.PacketBuffer; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; +import net.minecraftforge.items.IItemHandler; + import appeng.api.config.FuzzyMode; import appeng.api.config.LevelType; import appeng.api.config.RedstoneMode; @@ -31,13 +39,6 @@ import appeng.container.slot.FakeTypeOnlySlot; import appeng.container.slot.RestrictedInputSlot; import appeng.parts.automation.LevelEmitterPart; import appeng.util.Platform; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.entity.player.PlayerInventory; -import net.minecraft.inventory.container.ContainerType; -import net.minecraft.network.PacketBuffer; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -import net.minecraftforge.items.IItemHandler; public class LevelEmitterContainer extends UpgradeableContainer { diff --git a/src/main/java/appeng/container/implementations/PriorityContainer.java b/src/main/java/appeng/container/implementations/PriorityContainer.java index e195ef914..57a03023e 100644 --- a/src/main/java/appeng/container/implementations/PriorityContainer.java +++ b/src/main/java/appeng/container/implementations/PriorityContainer.java @@ -18,6 +18,14 @@ package appeng.container.implementations; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.entity.player.PlayerInventory; +import net.minecraft.inventory.container.ContainerType; +import net.minecraft.network.PacketBuffer; +import net.minecraft.tileentity.TileEntity; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; + import appeng.api.config.SecurityPermissions; import appeng.api.parts.IPart; import appeng.client.gui.implementations.NumberEntryWidget; @@ -26,13 +34,6 @@ import appeng.container.ContainerLocator; import appeng.container.guisync.GuiSync; import appeng.helpers.IPriorityHost; import appeng.util.Platform; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.entity.player.PlayerInventory; -import net.minecraft.inventory.container.ContainerType; -import net.minecraft.network.PacketBuffer; -import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; public class PriorityContainer extends AEBaseContainer { diff --git a/src/main/java/appeng/core/AEConfig.java b/src/main/java/appeng/core/AEConfig.java index 7c4fd2d8b..0783f11a7 100644 --- a/src/main/java/appeng/core/AEConfig.java +++ b/src/main/java/appeng/core/AEConfig.java @@ -18,29 +18,6 @@ package appeng.core; -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.settings.TickRates; -import appeng.util.EnumCycler; -import com.google.common.base.Strings; -import net.minecraft.world.dimension.DimensionType; -import net.minecraftforge.common.ForgeConfigSpec; -import net.minecraftforge.common.ForgeConfigSpec.BooleanValue; -import net.minecraftforge.common.ForgeConfigSpec.ConfigValue; -import net.minecraftforge.common.ForgeConfigSpec.DoubleValue; -import net.minecraftforge.common.ForgeConfigSpec.EnumValue; -import net.minecraftforge.eventbus.api.SubscribeEvent; -import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.config.ModConfig; -import org.apache.commons.lang3.tuple.Pair; - import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; @@ -54,6 +31,32 @@ import java.util.Set; import java.util.function.DoubleSupplier; import java.util.stream.Collectors; +import com.google.common.base.Strings; + +import org.apache.commons.lang3.tuple.Pair; + +import net.minecraft.world.dimension.DimensionType; +import net.minecraftforge.common.ForgeConfigSpec; +import net.minecraftforge.common.ForgeConfigSpec.BooleanValue; +import net.minecraftforge.common.ForgeConfigSpec.ConfigValue; +import net.minecraftforge.common.ForgeConfigSpec.DoubleValue; +import net.minecraftforge.common.ForgeConfigSpec.EnumValue; +import net.minecraftforge.eventbus.api.SubscribeEvent; +import net.minecraftforge.fml.common.Mod; +import net.minecraftforge.fml.config.ModConfig; + +import appeng.api.config.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.settings.TickRates; +import appeng.util.EnumCycler; + @Mod.EventBusSubscriber(modid = AppEng.MOD_ID, bus = Mod.EventBusSubscriber.Bus.MOD) public final class AEConfig { @@ -272,8 +275,8 @@ public final class AEConfig { } /** - * Returns an array with the quantity-steps for the +/- buttons in number entry dialogs of the given type. - * Guaranteed to have 4 entries. + * Returns an array with the quantity-steps for the +/- buttons in number entry + * dialogs of the given type. Guaranteed to have 4 entries. */ public int[] getNumberEntrySteps(NumberEntryType type) { switch (type) { diff --git a/src/main/java/appeng/fluids/client/gui/FluidLevelEmitterScreen.java b/src/main/java/appeng/fluids/client/gui/FluidLevelEmitterScreen.java index 4ae6d442f..c4f58d631 100644 --- a/src/main/java/appeng/fluids/client/gui/FluidLevelEmitterScreen.java +++ b/src/main/java/appeng/fluids/client/gui/FluidLevelEmitterScreen.java @@ -1,6 +1,9 @@ package appeng.fluids.client.gui; +import net.minecraft.entity.player.PlayerInventory; +import net.minecraft.util.text.ITextComponent; + import appeng.api.config.RedstoneMode; import appeng.api.config.Settings; import appeng.client.gui.NumberEntryType; @@ -12,8 +15,6 @@ import appeng.core.sync.network.NetworkHandler; import appeng.core.sync.packets.ConfigValuePacket; import appeng.fluids.client.gui.widgets.FluidSlotWidget; import appeng.fluids.container.FluidLevelEmitterContainer; -import net.minecraft.entity.player.PlayerInventory; -import net.minecraft.util.text.ITextComponent; public class FluidLevelEmitterScreen extends UpgradeableScreen { diff --git a/src/main/java/appeng/fluids/container/FluidLevelEmitterContainer.java b/src/main/java/appeng/fluids/container/FluidLevelEmitterContainer.java index cd4662d54..bbe2b5063 100644 --- a/src/main/java/appeng/fluids/container/FluidLevelEmitterContainer.java +++ b/src/main/java/appeng/fluids/container/FluidLevelEmitterContainer.java @@ -1,5 +1,12 @@ package appeng.fluids.container; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.entity.player.PlayerInventory; +import net.minecraft.inventory.container.ContainerType; +import net.minecraft.network.PacketBuffer; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; + import appeng.api.config.RedstoneMode; import appeng.api.config.SecurityPermissions; import appeng.api.config.Settings; @@ -10,12 +17,6 @@ import appeng.container.implementations.ContainerHelper; import appeng.fluids.parts.FluidLevelEmitterPart; import appeng.fluids.util.IAEFluidTank; import appeng.util.Platform; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.entity.player.PlayerInventory; -import net.minecraft.inventory.container.ContainerType; -import net.minecraft.network.PacketBuffer; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; public class FluidLevelEmitterContainer extends FluidConfigurableContainer { public static ContainerType TYPE;