Organize and clean imports

2020-07-28 10:29:57 +02:00
parent e640918ca0
commit a65be62cd1
57 changed files with 125 additions and 157 deletions
@@ -28,7 +28,6 @@ import net.minecraft.entity.player.PlayerInventory;
 import net.minecraft.inventory.container.Slot;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.text.ITextComponent;
-import net.minecraft.util.text.StringTextComponent;
 import net.minecraft.util.text.TextFormatting;

 import appeng.api.storage.data.IAEItemStack;
@@ -28,11 +28,9 @@ import java.util.stream.Collectors;

 import com.google.common.base.Preconditions;
 import com.google.common.base.Stopwatch;
-import com.google.common.collect.Lists;
 import com.mojang.blaze3d.matrix.MatrixStack;
 import com.mojang.blaze3d.systems.RenderSystem;

-import net.minecraft.util.text.Style;
 import org.lwjgl.glfw.GLFW;
 import org.lwjgl.opengl.GL11;

@@ -58,6 +56,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.text.ITextComponent;
 import net.minecraft.util.text.StringTextComponent;
+import net.minecraft.util.text.Style;
 import net.minecraft.util.text.TextFormatting;
 import net.minecraftforge.fluids.FluidAttributes;
 import net.minecraftforge.fml.client.gui.GuiUtils;
@@ -21,11 +21,12 @@ package appeng.client.gui.widgets;
 import java.util.function.Consumer;
 import java.util.regex.Pattern;

-import appeng.api.config.ActionItems;
-import appeng.core.localization.ButtonToolTips;
 import net.minecraft.util.text.ITextComponent;
 import net.minecraft.util.text.StringTextComponent;

+import appeng.api.config.ActionItems;
+import appeng.core.localization.ButtonToolTips;
+
 public class ActionButton extends IconButton implements ITooltip {
    private static final Pattern PATTERN_NEW_LINE = Pattern.compile("\\n", Pattern.LITERAL);
    private final int iconIndex;
@@ -27,6 +27,7 @@ import java.util.regex.Pattern;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.widget.button.Button;
 import net.minecraft.util.text.ITextComponent;
+import net.minecraft.util.text.StringTextComponent;

 import appeng.api.config.AccessRestriction;
 import appeng.api.config.CondenserOutput;
@@ -48,7 +49,6 @@ import appeng.api.config.ViewItems;
 import appeng.api.config.YesNo;
 import appeng.core.localization.ButtonToolTips;
 import appeng.util.EnumCycler;
-import net.minecraft.util.text.StringTextComponent;

 public class SettingToggleButton<T extends Enum<T>> extends IconButton {
    private static final Pattern COMPILE = Pattern.compile("%s");
@@ -25,7 +25,6 @@ import net.minecraft.client.renderer.model.ItemOverrideList;
 import net.minecraft.client.world.ClientWorld;
 import net.minecraft.entity.LivingEntity;
 import net.minecraft.item.ItemStack;
-import net.minecraft.world.World;

 import it.unimi.dsi.fastutil.ints.Int2ObjectArrayMap;
 import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
@@ -25,15 +25,11 @@ import com.mojang.blaze3d.systems.RenderSystem;

 import org.lwjgl.opengl.GL11;

-import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.BufferBuilder;
 import net.minecraft.client.renderer.RenderHelper;
 import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
-import net.minecraft.client.world.ClientWorld;
 import net.minecraft.util.math.vector.Quaternion;
-import net.minecraftforge.client.IRenderHandler;
-import net.minecraftforge.client.SkyRenderHandler;

 public class SpatialSkyRender {

@@ -25,7 +25,6 @@ import java.util.EnumSet;
 import java.util.List;
 import java.util.function.Function;

-import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.model.BakedQuad;
 import net.minecraft.client.renderer.model.RenderMaterial;
 import net.minecraft.client.renderer.texture.AtlasTexture;
@@ -14,7 +14,6 @@ import net.minecraft.client.world.ClientWorld;
 import net.minecraft.entity.LivingEntity;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.math.vector.TransformationMatrix;
-import net.minecraft.world.World;
 import net.minecraftforge.client.model.PerspectiveMapWrapper;

 import appeng.client.render.DelegateBakedModel;
@@ -25,7 +25,6 @@ import net.minecraft.client.particle.RedstoneParticle;
 import net.minecraft.client.world.ClientWorld;
 import net.minecraft.particles.BasicParticleType;
 import net.minecraft.particles.RedstoneParticleData;
-import net.minecraft.world.World;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;

@@ -31,7 +31,6 @@ import net.minecraft.particles.BasicParticleType;
 import net.minecraft.util.math.MathHelper;
 import net.minecraft.util.math.vector.Vector3d;
 import net.minecraft.util.math.vector.Vector3f;
-import net.minecraft.world.World;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;

@@ -25,7 +25,6 @@ import net.minecraft.client.particle.IParticleFactory;
 import net.minecraft.client.particle.Particle;
 import net.minecraft.client.particle.SpriteTexturedParticle;
 import net.minecraft.client.world.ClientWorld;
-import net.minecraft.world.World;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;

@@ -1,6 +1,7 @@
 package appeng.client.render.effects;

 import com.mojang.serialization.Codec;
+
 import net.minecraft.particles.BasicParticleType;
 import net.minecraft.particles.ParticleType;

@@ -23,7 +23,6 @@ import net.minecraft.client.world.ClientWorld;
 import net.minecraft.entity.LivingEntity;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.Direction;
-import net.minecraft.world.World;
 import net.minecraftforge.client.model.data.EmptyModelData;

 import appeng.api.implementations.items.IBiometricCard;
@@ -23,7 +23,6 @@ import net.minecraft.client.world.ClientWorld;
 import net.minecraft.entity.LivingEntity;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.Direction;
-import net.minecraft.world.World;
 import net.minecraftforge.client.model.data.EmptyModelData;

 import appeng.api.implementations.items.IMemoryCard;
@@ -9,7 +9,6 @@ import javax.annotation.Nullable;

 import com.mojang.datafixers.util.Pair;

-import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.model.IBakedModel;
 import net.minecraft.client.renderer.model.IModelTransform;
 import net.minecraft.client.renderer.model.IUnbakedModel;
@@ -39,7 +39,6 @@ import net.minecraft.util.Direction;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.vector.Matrix4f;
 import net.minecraft.util.math.vector.Quaternion;
-import net.minecraft.world.World;
 import net.minecraftforge.client.model.data.IDynamicBakedModel;
 import net.minecraftforge.client.model.data.IModelData;
 import net.minecraftforge.client.model.data.ModelProperty;