From 8b95b6bcfa83de4454d22dc12cc2a1b695703df7 Mon Sep 17 00:00:00 2001 From: alongstringofnumbers Date: Wed, 15 Sep 2021 12:45:26 -0700 Subject: [PATCH] Cleanup unused imports --- .../capability/impl/SteamMultiblockRecipeLogic.java | 1 - .../gregtech/api/enchants/EnchantmentHardHammer.java | 5 ----- src/main/java/gregtech/api/gui/GuiTextures.java | 1 - src/main/java/gregtech/api/gui/Widget.java | 1 - .../java/gregtech/api/gui/impl/FakeModularGui.java | 1 - .../gui/ingredient/IRecipeTransferHandlerWidget.java | 4 ---- .../java/gregtech/api/gui/resources/RenderUtil.java | 5 ----- .../java/gregtech/api/gui/resources/TextTexture.java | 1 - .../java/gregtech/api/gui/resources/TextureArea.java | 1 - .../api/gui/resources/utils/DownloadThread.java | 3 --- .../api/gui/widgets/ImageCycleButtonWidget.java | 6 ------ .../java/gregtech/api/gui/widgets/LabelWidget.java | 3 +-- .../gregtech/api/gui/widgets/PhantomFluidWidget.java | 1 - .../java/gregtech/api/gui/widgets/WidgetGroup.java | 2 -- .../java/gregtech/api/gui/widgets/tab/ItemTabInfo.java | 1 - .../gregtech/api/items/gui/PlayerInventoryHolder.java | 1 - .../java/gregtech/api/multiblock/BlockPattern.java | 1 - .../api/net/PacketClipboardUIWidgetUpdate.java | 4 ---- .../gregtech/api/pipenet/tile/TileEntityPipeBase.java | 1 - src/main/java/gregtech/api/recipes/RecipeMap.java | 1 - src/main/java/gregtech/api/recipes/RecipeMaps.java | 6 ------ .../recipes/crafttweaker/MetaItemBracketHandler.java | 1 - .../java/gregtech/api/render/ClipboardRenderer.java | 9 --------- src/main/java/gregtech/api/render/shader/Shaders.java | 2 -- src/main/java/gregtech/api/util/RenderUtil.java | 10 ---------- .../gregtech/api/util/interpolate/Interpolator.java | 4 ---- .../api/worldgen/config/OreDepositDefinition.java | 3 --- .../java/gregtech/common/blocks/BlockConcrete.java | 3 --- .../common/items/behaviors/ClipboardBehavior.java | 1 - .../common/items/behaviors/TerminalBehaviour.java | 1 - .../metatileentities/MetaTileEntityClipboard.java | 1 - .../electric/MetaTileEntitySimpleOreWasher.java | 2 +- .../electric/MetaTileEntityWorldAccelerator.java | 1 - .../storage/MetaTileEntityCreativeEnergy.java | 4 ---- .../storage/MetaTileEntityWorkbench.java | 1 - .../gregtech/common/pipelike/cable/BlockCable.java | 1 - .../common/pipelike/fluidpipe/net/FluidPipeNet.java | 1 - .../gregtech/common/render/WrenchOverlayRenderer.java | 1 - .../common/terminal/app/guide/ItemGuideApp.java | 1 - .../java/gregtech/common/tools/ToolHardHammer.java | 1 - .../common/tools/largedrills/ToolDrillLarge.java | 1 - .../integration/jei/multiblock/MultiblockInfoPage.java | 1 - .../theoneprobe/provider/DebugPipeNetInfoProvider.java | 2 -- .../java/gregtech/loaders/recipe/CircuitRecipes.java | 1 - .../loaders/recipe/chemistry/SeparationRecipes.java | 1 - .../api/capability/impl/AbstractRecipeLogicTest.java | 1 - .../api/capability/impl/MultiblockRecipeLogicTest.java | 1 - src/test/java/gregtech/api/recipes/RecipeMapTest.java | 1 - 48 files changed, 2 insertions(+), 105 deletions(-) diff --git a/src/main/java/gregtech/api/capability/impl/SteamMultiblockRecipeLogic.java b/src/main/java/gregtech/api/capability/impl/SteamMultiblockRecipeLogic.java index b6e79e10ed6..aff3c943b5f 100644 --- a/src/main/java/gregtech/api/capability/impl/SteamMultiblockRecipeLogic.java +++ b/src/main/java/gregtech/api/capability/impl/SteamMultiblockRecipeLogic.java @@ -15,7 +15,6 @@ import net.minecraft.world.WorldServer; import net.minecraftforge.fluids.FluidTank; import net.minecraftforge.fluids.IFluidTank; -import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.IItemHandlerModifiable; public class SteamMultiblockRecipeLogic extends AbstractRecipeLogic { diff --git a/src/main/java/gregtech/api/enchants/EnchantmentHardHammer.java b/src/main/java/gregtech/api/enchants/EnchantmentHardHammer.java index bd8f078098e..9bba3937f42 100644 --- a/src/main/java/gregtech/api/enchants/EnchantmentHardHammer.java +++ b/src/main/java/gregtech/api/enchants/EnchantmentHardHammer.java @@ -1,18 +1,13 @@ package gregtech.api.enchants; import gregtech.api.GTValues; -import gregtech.common.ConfigHolder; import net.minecraft.enchantment.Enchantment; import net.minecraft.enchantment.EnumEnchantmentType; import net.minecraft.init.Enchantments; import net.minecraft.inventory.EntityEquipmentSlot; -import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraftforge.event.RegistryEvent; -import java.util.List; - - public class EnchantmentHardHammer extends Enchantment { public static final EnchantmentHardHammer INSTANCE = new EnchantmentHardHammer(); diff --git a/src/main/java/gregtech/api/gui/GuiTextures.java b/src/main/java/gregtech/api/gui/GuiTextures.java index 2cc3d1232ad..3fc6886f439 100644 --- a/src/main/java/gregtech/api/gui/GuiTextures.java +++ b/src/main/java/gregtech/api/gui/GuiTextures.java @@ -1,7 +1,6 @@ package gregtech.api.gui; import gregtech.api.gui.resources.AdoptableTextureArea; -import gregtech.api.gui.resources.IGuiTexture; import gregtech.api.gui.resources.SizedTextureArea; import gregtech.api.gui.resources.TextureArea; diff --git a/src/main/java/gregtech/api/gui/Widget.java b/src/main/java/gregtech/api/gui/Widget.java index 81d52b17ba0..e615139e24e 100644 --- a/src/main/java/gregtech/api/gui/Widget.java +++ b/src/main/java/gregtech/api/gui/Widget.java @@ -1,7 +1,6 @@ package gregtech.api.gui; import com.google.common.base.Preconditions; -import gregtech.api.gui.resources.RenderUtil; import gregtech.api.gui.widgets.WidgetUIAccess; import gregtech.api.util.Position; import gregtech.api.util.Size; diff --git a/src/main/java/gregtech/api/gui/impl/FakeModularGui.java b/src/main/java/gregtech/api/gui/impl/FakeModularGui.java index 5698981d9b0..af458434248 100644 --- a/src/main/java/gregtech/api/gui/impl/FakeModularGui.java +++ b/src/main/java/gregtech/api/gui/impl/FakeModularGui.java @@ -3,7 +3,6 @@ import gregtech.api.gui.IRenderContext; import gregtech.api.gui.ModularUI; import gregtech.api.gui.Widget; -import gregtech.api.util.RenderUtil; import gregtech.common.gui.impl.FakeModularUIContainerClipboard; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; diff --git a/src/main/java/gregtech/api/gui/ingredient/IRecipeTransferHandlerWidget.java b/src/main/java/gregtech/api/gui/ingredient/IRecipeTransferHandlerWidget.java index 20f451a8ac2..aef53bf91e8 100644 --- a/src/main/java/gregtech/api/gui/ingredient/IRecipeTransferHandlerWidget.java +++ b/src/main/java/gregtech/api/gui/ingredient/IRecipeTransferHandlerWidget.java @@ -1,12 +1,8 @@ package gregtech.api.gui.ingredient; import gregtech.api.gui.impl.ModularUIContainer; -import mezz.jei.api.gui.IGuiIngredient; import mezz.jei.api.gui.IRecipeLayout; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; - -import java.util.Map; public interface IRecipeTransferHandlerWidget { diff --git a/src/main/java/gregtech/api/gui/resources/RenderUtil.java b/src/main/java/gregtech/api/gui/resources/RenderUtil.java index 63960272bdc..d40c49bac13 100644 --- a/src/main/java/gregtech/api/gui/resources/RenderUtil.java +++ b/src/main/java/gregtech/api/gui/resources/RenderUtil.java @@ -3,21 +3,16 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.BufferBuilder; import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.RenderItem; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; -import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import net.minecraft.client.renderer.GlStateManager.DestFactor; -import net.minecraft.client.renderer.GlStateManager.SourceFactor; -import org.lwjgl.opengl.GL11; @SideOnly(Side.CLIENT) public class RenderUtil { diff --git a/src/main/java/gregtech/api/gui/resources/TextTexture.java b/src/main/java/gregtech/api/gui/resources/TextTexture.java index 1a7c18fc7f2..0f99d68bf76 100644 --- a/src/main/java/gregtech/api/gui/resources/TextTexture.java +++ b/src/main/java/gregtech/api/gui/resources/TextTexture.java @@ -3,7 +3,6 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.resources.I18n; -import net.minecraftforge.fml.common.FMLCommonHandler; public class TextTexture implements IGuiTexture{ public final String text; diff --git a/src/main/java/gregtech/api/gui/resources/TextureArea.java b/src/main/java/gregtech/api/gui/resources/TextureArea.java index 0fc6278276e..4fb6db081af 100644 --- a/src/main/java/gregtech/api/gui/resources/TextureArea.java +++ b/src/main/java/gregtech/api/gui/resources/TextureArea.java @@ -4,7 +4,6 @@ import codechicken.lib.vec.Transformation; import codechicken.lib.vec.Translation; import codechicken.lib.vec.Vector3; -import com.google.gson.JsonObject; import gregtech.api.GTValues; import gregtech.api.util.Position; import gregtech.api.util.PositionedRect; diff --git a/src/main/java/gregtech/api/gui/resources/utils/DownloadThread.java b/src/main/java/gregtech/api/gui/resources/utils/DownloadThread.java index e2fdb63be5f..e44562021d1 100644 --- a/src/main/java/gregtech/api/gui/resources/utils/DownloadThread.java +++ b/src/main/java/gregtech/api/gui/resources/utils/DownloadThread.java @@ -12,9 +12,6 @@ import org.apache.logging.log4j.Logger; import javax.imageio.ImageIO; -import javax.imageio.ImageReadParam; -import javax.imageio.ImageReader; -import javax.imageio.stream.ImageInputStream; import java.awt.image.BufferedImage; import java.io.*; import java.net.HttpURLConnection; diff --git a/src/main/java/gregtech/api/gui/widgets/ImageCycleButtonWidget.java b/src/main/java/gregtech/api/gui/widgets/ImageCycleButtonWidget.java index 3af8493ca4a..7ef3c27d142 100644 --- a/src/main/java/gregtech/api/gui/widgets/ImageCycleButtonWidget.java +++ b/src/main/java/gregtech/api/gui/widgets/ImageCycleButtonWidget.java @@ -1,21 +1,15 @@ package gregtech.api.gui.widgets; -import gregtech.api.gui.GuiTextures; import gregtech.api.gui.IRenderContext; import gregtech.api.gui.Widget; import gregtech.api.gui.resources.SizedTextureArea; import gregtech.api.gui.resources.TextureArea; -import gregtech.api.util.GTUtility; import gregtech.api.util.Position; import gregtech.api.util.Size; import gregtech.api.util.function.BooleanConsumer; -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.FontRenderer; -import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.resources.I18n; import net.minecraft.item.ItemStack; import net.minecraft.network.PacketBuffer; -import net.minecraft.util.IStringSerializable; import net.minecraft.util.math.MathHelper; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/gregtech/api/gui/widgets/LabelWidget.java b/src/main/java/gregtech/api/gui/widgets/LabelWidget.java index 57a7988549b..f6bdad808c9 100644 --- a/src/main/java/gregtech/api/gui/widgets/LabelWidget.java +++ b/src/main/java/gregtech/api/gui/widgets/LabelWidget.java @@ -11,7 +11,6 @@ import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import java.util.Arrays; import java.util.Collections; import java.util.List; @@ -99,7 +98,7 @@ public void drawInBackground(int mouseX, int mouseY, IRenderContext context) { int height = fontRenderer.FONT_HEIGHT * texts.size(); for (int i = 0; i < texts.size(); i++) { String resultText = texts.get(i); - int width = fontRenderer.getStringWidth(resultText);; + int width = fontRenderer.getStringWidth(resultText); float x = pos.x - (xCentered ? width / 2f : 0); float y = pos.y - (yCentered ? height / 2f : 0) + i * fontRenderer.FONT_HEIGHT; fontRenderer.drawString(resultText, x, y, color, dropShadow); diff --git a/src/main/java/gregtech/api/gui/widgets/PhantomFluidWidget.java b/src/main/java/gregtech/api/gui/widgets/PhantomFluidWidget.java index 9a0430674ad..b1429bc4e27 100644 --- a/src/main/java/gregtech/api/gui/widgets/PhantomFluidWidget.java +++ b/src/main/java/gregtech/api/gui/widgets/PhantomFluidWidget.java @@ -8,7 +8,6 @@ import gregtech.api.gui.ingredient.IIngredientSlot; import gregtech.api.gui.resources.IGuiTexture; import gregtech.api.gui.resources.RenderUtil; -import gregtech.api.gui.resources.TextureArea; import gregtech.api.util.Position; import gregtech.api.util.Size; import gregtech.api.util.TextFormattingUtil; diff --git a/src/main/java/gregtech/api/gui/widgets/WidgetGroup.java b/src/main/java/gregtech/api/gui/widgets/WidgetGroup.java index 5bfef5d0d26..a6c429a790a 100644 --- a/src/main/java/gregtech/api/gui/widgets/WidgetGroup.java +++ b/src/main/java/gregtech/api/gui/widgets/WidgetGroup.java @@ -4,8 +4,6 @@ import gregtech.api.util.Position; import gregtech.api.util.Size; -import java.util.ArrayList; - public class WidgetGroup extends AbstractWidgetGroup { public WidgetGroup() { diff --git a/src/main/java/gregtech/api/gui/widgets/tab/ItemTabInfo.java b/src/main/java/gregtech/api/gui/widgets/tab/ItemTabInfo.java index d8ff74a3f4e..0ddd2a077d3 100644 --- a/src/main/java/gregtech/api/gui/widgets/tab/ItemTabInfo.java +++ b/src/main/java/gregtech/api/gui/widgets/tab/ItemTabInfo.java @@ -2,7 +2,6 @@ import com.google.common.collect.Lists; import gregtech.api.gui.resources.IGuiTexture; -import gregtech.api.gui.resources.TextureArea; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.client.renderer.GlStateManager; diff --git a/src/main/java/gregtech/api/items/gui/PlayerInventoryHolder.java b/src/main/java/gregtech/api/items/gui/PlayerInventoryHolder.java index ac15eb23795..50b858fd526 100644 --- a/src/main/java/gregtech/api/items/gui/PlayerInventoryHolder.java +++ b/src/main/java/gregtech/api/items/gui/PlayerInventoryHolder.java @@ -1,6 +1,5 @@ package gregtech.api.items.gui; -import com.google.common.base.Preconditions; import gregtech.api.gui.IUIHolder; import gregtech.api.gui.ModularUI; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/gregtech/api/multiblock/BlockPattern.java b/src/main/java/gregtech/api/multiblock/BlockPattern.java index 2da1b45e0cc..36f65cc1345 100644 --- a/src/main/java/gregtech/api/multiblock/BlockPattern.java +++ b/src/main/java/gregtech/api/multiblock/BlockPattern.java @@ -11,7 +11,6 @@ import org.apache.commons.lang3.tuple.Pair; import java.util.List; -import java.util.function.Function; import java.util.function.Predicate; public class BlockPattern { diff --git a/src/main/java/gregtech/api/net/PacketClipboardUIWidgetUpdate.java b/src/main/java/gregtech/api/net/PacketClipboardUIWidgetUpdate.java index 2200e17c68e..53377aba417 100644 --- a/src/main/java/gregtech/api/net/PacketClipboardUIWidgetUpdate.java +++ b/src/main/java/gregtech/api/net/PacketClipboardUIWidgetUpdate.java @@ -1,11 +1,7 @@ package gregtech.api.net; -import gregtech.api.metatileentity.MetaTileEntityHolder; import gregtech.common.metatileentities.MetaTileEntityClipboard; import net.minecraft.network.PacketBuffer; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.math.BlockPos; -import net.minecraftforge.fml.common.FMLCommonHandler; import java.util.function.Consumer; diff --git a/src/main/java/gregtech/api/pipenet/tile/TileEntityPipeBase.java b/src/main/java/gregtech/api/pipenet/tile/TileEntityPipeBase.java index e0d970f6b5d..07be9f68af2 100644 --- a/src/main/java/gregtech/api/pipenet/tile/TileEntityPipeBase.java +++ b/src/main/java/gregtech/api/pipenet/tile/TileEntityPipeBase.java @@ -8,7 +8,6 @@ import gregtech.api.pipenet.WorldPipeNet; import gregtech.api.pipenet.block.BlockPipe; import gregtech.api.pipenet.block.IPipeType; -import gregtech.common.ConfigHolder; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/main/java/gregtech/api/recipes/RecipeMap.java b/src/main/java/gregtech/api/recipes/RecipeMap.java index ffd80465030..467f34d66c0 100644 --- a/src/main/java/gregtech/api/recipes/RecipeMap.java +++ b/src/main/java/gregtech/api/recipes/RecipeMap.java @@ -23,7 +23,6 @@ import gregtech.api.unification.material.Material; import gregtech.api.unification.ore.OrePrefix; import gregtech.api.util.*; -import gregtech.api.util.ItemStackKey; import gregtech.common.ConfigHolder; import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap; import net.minecraft.item.ItemStack; diff --git a/src/main/java/gregtech/api/recipes/RecipeMaps.java b/src/main/java/gregtech/api/recipes/RecipeMaps.java index 6654a3ceaab..f2312498d9c 100644 --- a/src/main/java/gregtech/api/recipes/RecipeMaps.java +++ b/src/main/java/gregtech/api/recipes/RecipeMaps.java @@ -6,15 +6,9 @@ import gregtech.api.gui.widgets.ProgressWidget.MoveType; import gregtech.api.recipes.builders.*; import gregtech.api.recipes.machines.*; -import gregtech.api.recipes.recipes.CokeOvenRecipe; -import gregtech.api.recipes.recipes.PrimitiveBlastFurnaceRecipe; import stanhebben.zenscript.annotations.ZenClass; -import stanhebben.zenscript.annotations.ZenMethod; import stanhebben.zenscript.annotations.ZenProperty; -import java.util.List; -import java.util.concurrent.CopyOnWriteArrayList; - @ZenClass("mods.gregtech.recipe.RecipeMaps") @ZenRegister public class RecipeMaps { diff --git a/src/main/java/gregtech/api/recipes/crafttweaker/MetaItemBracketHandler.java b/src/main/java/gregtech/api/recipes/crafttweaker/MetaItemBracketHandler.java index b2a221fe99b..4299e493086 100644 --- a/src/main/java/gregtech/api/recipes/crafttweaker/MetaItemBracketHandler.java +++ b/src/main/java/gregtech/api/recipes/crafttweaker/MetaItemBracketHandler.java @@ -10,7 +10,6 @@ import gregtech.api.items.metaitem.MetaItem; import gregtech.api.items.metaitem.MetaItem.MetaValueItem; import gregtech.api.unification.OreDictUnifier; -import gregtech.api.unification.material.Material; import gregtech.api.unification.ore.OrePrefix; import gregtech.api.unification.stack.MaterialStack; import gregtech.api.util.GTLog; diff --git a/src/main/java/gregtech/api/render/ClipboardRenderer.java b/src/main/java/gregtech/api/render/ClipboardRenderer.java index 5b158d3b649..66285377316 100644 --- a/src/main/java/gregtech/api/render/ClipboardRenderer.java +++ b/src/main/java/gregtech/api/render/ClipboardRenderer.java @@ -6,26 +6,17 @@ import codechicken.lib.vec.Cuboid6; import codechicken.lib.vec.Matrix4; import codechicken.lib.vec.Rotation; -import gregtech.api.gui.ModularUI; -import gregtech.api.gui.Widget; -import gregtech.api.gui.impl.FakeModularGui; -import gregtech.common.gui.impl.FakeModularUIContainerClipboard; -import gregtech.api.util.GTLog; -import gregtech.api.util.GregFakePlayer; import gregtech.common.metatileentities.MetaTileEntityClipboard; -import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.common.util.FakePlayer; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; import org.apache.commons.lang3.tuple.Pair; -import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; import java.util.List; diff --git a/src/main/java/gregtech/api/render/shader/Shaders.java b/src/main/java/gregtech/api/render/shader/Shaders.java index 4d9b120c7e3..18e175934d8 100644 --- a/src/main/java/gregtech/api/render/shader/Shaders.java +++ b/src/main/java/gregtech/api/render/shader/Shaders.java @@ -10,8 +10,6 @@ import static codechicken.lib.render.shader.ShaderHelper.getStream; import static codechicken.lib.render.shader.ShaderHelper.readShader; -import static codechicken.lib.render.shader.ShaderObject.ShaderType.FRAGMENT; -import static codechicken.lib.render.shader.ShaderObject.ShaderType.VERTEX; /** * Created with IntelliJ IDEA. diff --git a/src/main/java/gregtech/api/util/RenderUtil.java b/src/main/java/gregtech/api/util/RenderUtil.java index c150c1b1555..353095850d2 100644 --- a/src/main/java/gregtech/api/util/RenderUtil.java +++ b/src/main/java/gregtech/api/util/RenderUtil.java @@ -1,17 +1,7 @@ package gregtech.api.util; import net.minecraft.client.Minecraft; -import net.minecraft.client.entity.EntityPlayerSP; -import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.ScaledResolution; -import net.minecraft.client.renderer.BufferBuilder; -import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.RenderItem; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.vertex.DefaultVertexFormats; -import net.minecraft.inventory.Slot; -import net.minecraft.item.ItemStack; -import net.minecraft.util.math.MathHelper; import net.minecraftforge.client.GuiIngameForge; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/gregtech/api/util/interpolate/Interpolator.java b/src/main/java/gregtech/api/util/interpolate/Interpolator.java index 2c79a927ad0..2938d381f9c 100644 --- a/src/main/java/gregtech/api/util/interpolate/Interpolator.java +++ b/src/main/java/gregtech/api/util/interpolate/Interpolator.java @@ -1,10 +1,6 @@ package gregtech.api.util.interpolate; -import crafttweaker.IAction; -import gregtech.api.util.function.BooleanConsumer; import net.minecraft.util.ITickable; -import scala.Function; -import scala.swing.Action; import java.util.function.Consumer; diff --git a/src/main/java/gregtech/api/worldgen/config/OreDepositDefinition.java b/src/main/java/gregtech/api/worldgen/config/OreDepositDefinition.java index 45889db0615..ccdeed3f65e 100644 --- a/src/main/java/gregtech/api/worldgen/config/OreDepositDefinition.java +++ b/src/main/java/gregtech/api/worldgen/config/OreDepositDefinition.java @@ -5,13 +5,10 @@ import crafttweaker.api.minecraft.CraftTweakerMC; import crafttweaker.api.world.IBiome; import gregtech.api.GTValues; -import gregtech.api.unification.material.Material; -import gregtech.api.unification.material.properties.PropertyKey; import gregtech.api.unification.ore.StoneType; import gregtech.api.util.WorldBlockPredicate; import gregtech.api.worldgen.filler.BlockFiller; import gregtech.api.worldgen.populator.IVeinPopulator; -import gregtech.api.worldgen.populator.SurfaceRockPopulator; import gregtech.api.worldgen.shape.ShapeGenerator; import net.minecraft.block.state.IBlockState; import net.minecraft.util.math.BlockPos; diff --git a/src/main/java/gregtech/common/blocks/BlockConcrete.java b/src/main/java/gregtech/common/blocks/BlockConcrete.java index 945f659702b..90fea4a1ce6 100644 --- a/src/main/java/gregtech/common/blocks/BlockConcrete.java +++ b/src/main/java/gregtech/common/blocks/BlockConcrete.java @@ -4,15 +4,12 @@ import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; -import net.minecraft.client.entity.EntityPlayerSP; import net.minecraft.entity.Entity; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.IStringSerializable; import net.minecraft.util.MovementInput; import net.minecraft.util.MovementInputFromOptions; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import net.minecraftforge.fml.common.gameevent.TickEvent; import javax.annotation.Nonnull; diff --git a/src/main/java/gregtech/common/items/behaviors/ClipboardBehavior.java b/src/main/java/gregtech/common/items/behaviors/ClipboardBehavior.java index e30b3e990f1..0655cd38adf 100644 --- a/src/main/java/gregtech/common/items/behaviors/ClipboardBehavior.java +++ b/src/main/java/gregtech/common/items/behaviors/ClipboardBehavior.java @@ -8,7 +8,6 @@ import gregtech.api.items.gui.PlayerInventoryHolder; import gregtech.api.items.metaitem.stats.IItemBehaviour; import gregtech.api.metatileentity.MetaTileEntityHolder; -import gregtech.api.util.RenderUtil; import gregtech.common.items.MetaItems; import gregtech.common.metatileentities.MetaTileEntityClipboard; import net.minecraft.block.Block; diff --git a/src/main/java/gregtech/common/items/behaviors/TerminalBehaviour.java b/src/main/java/gregtech/common/items/behaviors/TerminalBehaviour.java index 255cf5a9b34..21a32da0371 100644 --- a/src/main/java/gregtech/common/items/behaviors/TerminalBehaviour.java +++ b/src/main/java/gregtech/common/items/behaviors/TerminalBehaviour.java @@ -17,7 +17,6 @@ import net.minecraft.util.EnumHand; import net.minecraft.world.World; -import java.awt.*; import java.util.List; public class TerminalBehaviour implements IItemBehaviour, ItemUIFactory { diff --git a/src/main/java/gregtech/common/metatileentities/MetaTileEntityClipboard.java b/src/main/java/gregtech/common/metatileentities/MetaTileEntityClipboard.java index d5175cb3827..800bd659bda 100644 --- a/src/main/java/gregtech/common/metatileentities/MetaTileEntityClipboard.java +++ b/src/main/java/gregtech/common/metatileentities/MetaTileEntityClipboard.java @@ -7,7 +7,6 @@ import codechicken.lib.vec.Cuboid6; import codechicken.lib.vec.Matrix4; import codechicken.lib.vec.Vector3; -import gregtech.api.block.BlockCustomParticle; import gregtech.api.gui.ModularUI; import gregtech.api.gui.Widget; import gregtech.api.gui.impl.FakeModularGui; diff --git a/src/main/java/gregtech/common/metatileentities/electric/MetaTileEntitySimpleOreWasher.java b/src/main/java/gregtech/common/metatileentities/electric/MetaTileEntitySimpleOreWasher.java index f5d1430ef74..4e6140cb5ca 100644 --- a/src/main/java/gregtech/common/metatileentities/electric/MetaTileEntitySimpleOreWasher.java +++ b/src/main/java/gregtech/common/metatileentities/electric/MetaTileEntitySimpleOreWasher.java @@ -8,7 +8,7 @@ import gregtech.api.render.OrientedOverlayRenderer; import net.minecraft.util.ResourceLocation; import net.minecraftforge.items.IItemHandlerModifiable; -import net.minecraftforge.items.ItemStackHandler; + public class MetaTileEntitySimpleOreWasher extends SimpleMachineMetaTileEntity { public MetaTileEntitySimpleOreWasher(ResourceLocation metaTileEntityId, RecipeMap recipeMap, OrientedOverlayRenderer renderer, int tier) { diff --git a/src/main/java/gregtech/common/metatileentities/electric/MetaTileEntityWorldAccelerator.java b/src/main/java/gregtech/common/metatileentities/electric/MetaTileEntityWorldAccelerator.java index 4d4aaee18ab..b3da04cb57e 100644 --- a/src/main/java/gregtech/common/metatileentities/electric/MetaTileEntityWorldAccelerator.java +++ b/src/main/java/gregtech/common/metatileentities/electric/MetaTileEntityWorldAccelerator.java @@ -11,7 +11,6 @@ import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.metatileentity.MetaTileEntityHolder; import gregtech.api.metatileentity.TieredMetaTileEntity; -import gregtech.api.pipenet.block.material.TileEntityMaterialPipeBase; import gregtech.api.pipenet.tile.TileEntityPipeBase; import gregtech.api.render.Textures; import net.minecraft.block.state.IBlockState; diff --git a/src/main/java/gregtech/common/metatileentities/storage/MetaTileEntityCreativeEnergy.java b/src/main/java/gregtech/common/metatileentities/storage/MetaTileEntityCreativeEnergy.java index 7c7b9d69836..ece226af4d0 100644 --- a/src/main/java/gregtech/common/metatileentities/storage/MetaTileEntityCreativeEnergy.java +++ b/src/main/java/gregtech/common/metatileentities/storage/MetaTileEntityCreativeEnergy.java @@ -18,19 +18,15 @@ import gregtech.api.render.Textures; import gregtech.api.util.GTUtility; import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; -import net.minecraft.world.World; import net.minecraftforge.common.capabilities.Capability; import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.tuple.Pair; -import javax.annotation.Nullable; import java.util.List; public class MetaTileEntityCreativeEnergy extends MetaTileEntity implements IEnergyContainer { diff --git a/src/main/java/gregtech/common/metatileentities/storage/MetaTileEntityWorkbench.java b/src/main/java/gregtech/common/metatileentities/storage/MetaTileEntityWorkbench.java index 5d8eb068918..8cc7c47d337 100644 --- a/src/main/java/gregtech/common/metatileentities/storage/MetaTileEntityWorkbench.java +++ b/src/main/java/gregtech/common/metatileentities/storage/MetaTileEntityWorkbench.java @@ -17,7 +17,6 @@ import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.metatileentity.MetaTileEntityHolder; import gregtech.api.render.Textures; -import gregtech.api.terminal.app.AbstractApplication; import gregtech.api.unification.material.Materials; import gregtech.api.util.GTUtility; import gregtech.api.util.Position; diff --git a/src/main/java/gregtech/common/pipelike/cable/BlockCable.java b/src/main/java/gregtech/common/pipelike/cable/BlockCable.java index bd930ba8217..8363be11e6c 100644 --- a/src/main/java/gregtech/common/pipelike/cable/BlockCable.java +++ b/src/main/java/gregtech/common/pipelike/cable/BlockCable.java @@ -18,7 +18,6 @@ import gregtech.common.pipelike.cable.net.WorldENet; import gregtech.common.pipelike.cable.tile.TileEntityCable; import gregtech.common.pipelike.cable.tile.TileEntityCableTickable; -import gregtech.common.pipelike.fluidpipe.net.FluidPipeNet; import gregtech.common.render.CableRenderer; import gregtech.common.tools.DamageValues; import net.minecraft.block.Block; diff --git a/src/main/java/gregtech/common/pipelike/fluidpipe/net/FluidPipeNet.java b/src/main/java/gregtech/common/pipelike/fluidpipe/net/FluidPipeNet.java index d9ff384d4d5..5b316e406ed 100644 --- a/src/main/java/gregtech/common/pipelike/fluidpipe/net/FluidPipeNet.java +++ b/src/main/java/gregtech/common/pipelike/fluidpipe/net/FluidPipeNet.java @@ -7,7 +7,6 @@ import gregtech.api.pipenet.tile.IPipeTile; import gregtech.api.unification.material.properties.FluidPipeProperties; import gregtech.common.pipelike.fluidpipe.tile.TileEntityFluidPipe; -import gregtech.common.pipelike.fluidpipe.tile.TileEntityFluidPipeTickable; import net.minecraft.init.Blocks; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/gregtech/common/render/WrenchOverlayRenderer.java b/src/main/java/gregtech/common/render/WrenchOverlayRenderer.java index 3d682507a38..c0350f7a47f 100644 --- a/src/main/java/gregtech/common/render/WrenchOverlayRenderer.java +++ b/src/main/java/gregtech/common/render/WrenchOverlayRenderer.java @@ -4,7 +4,6 @@ import codechicken.lib.vec.Vector3; import gregtech.api.capability.GregtechCapabilities; import gregtech.api.capability.GregtechTileCapabilities; -import gregtech.api.cover.ICoverable; import gregtech.api.cover.ICoverable.PrimaryBoxData; import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.metatileentity.MetaTileEntityHolder; diff --git a/src/main/java/gregtech/common/terminal/app/guide/ItemGuideApp.java b/src/main/java/gregtech/common/terminal/app/guide/ItemGuideApp.java index 516cd42e60f..db4a0909efe 100644 --- a/src/main/java/gregtech/common/terminal/app/guide/ItemGuideApp.java +++ b/src/main/java/gregtech/common/terminal/app/guide/ItemGuideApp.java @@ -76,7 +76,6 @@ public static GuideItem ofJson(JsonObject json) { for (MetaItem metaItem : MetaItem.getMetaItems()) { MetaItem.MetaValueItem metaValueItem = metaItem.getAllItems().stream().filter(m -> m.unlocalizedName.equals(metaItemId)).findFirst().orElse(null); if (metaValueItem != null) return new GuideItem(metaValueItem); - ; } } return null; diff --git a/src/main/java/gregtech/common/tools/ToolHardHammer.java b/src/main/java/gregtech/common/tools/ToolHardHammer.java index 12a7e245faa..2953f250ceb 100644 --- a/src/main/java/gregtech/common/tools/ToolHardHammer.java +++ b/src/main/java/gregtech/common/tools/ToolHardHammer.java @@ -6,7 +6,6 @@ import gregtech.api.recipes.RecipeMaps; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; -import net.minecraft.client.resources.I18n; import net.minecraft.enchantment.Enchantment; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.EntityLivingBase; diff --git a/src/main/java/gregtech/common/tools/largedrills/ToolDrillLarge.java b/src/main/java/gregtech/common/tools/largedrills/ToolDrillLarge.java index 6d716c8bf08..458b71290be 100644 --- a/src/main/java/gregtech/common/tools/largedrills/ToolDrillLarge.java +++ b/src/main/java/gregtech/common/tools/largedrills/ToolDrillLarge.java @@ -19,7 +19,6 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; -import net.minecraft.util.math.Vec3d; import net.minecraft.util.math.Vec3i; import net.minecraft.world.World; import net.minecraftforge.common.util.FakePlayer; diff --git a/src/main/java/gregtech/integration/jei/multiblock/MultiblockInfoPage.java b/src/main/java/gregtech/integration/jei/multiblock/MultiblockInfoPage.java index 1f6a30f9db8..bbc872e011a 100644 --- a/src/main/java/gregtech/integration/jei/multiblock/MultiblockInfoPage.java +++ b/src/main/java/gregtech/integration/jei/multiblock/MultiblockInfoPage.java @@ -5,7 +5,6 @@ import gregtech.api.util.ItemStackHashStrategy; import gregtech.common.ConfigHolder; import gregtech.common.metatileentities.MetaTileEntities; -import gregtech.common.metatileentities.electric.multiblockpart.MetaTileEntityMaintenanceHatch; import gregtech.common.metatileentities.electric.multiblockpart.MetaTileEntityMufflerHatch; import it.unimi.dsi.fastutil.Hash; import it.unimi.dsi.fastutil.objects.Object2ObjectOpenCustomHashMap; diff --git a/src/main/java/gregtech/integration/theoneprobe/provider/DebugPipeNetInfoProvider.java b/src/main/java/gregtech/integration/theoneprobe/provider/DebugPipeNetInfoProvider.java index 33c6305b962..e2e9280b866 100644 --- a/src/main/java/gregtech/integration/theoneprobe/provider/DebugPipeNetInfoProvider.java +++ b/src/main/java/gregtech/integration/theoneprobe/provider/DebugPipeNetInfoProvider.java @@ -8,8 +8,6 @@ import gregtech.api.pipenet.tile.IPipeTile; import gregtech.api.pipenet.tile.TileEntityPipeBase; import gregtech.common.ConfigHolder; -import gregtech.common.pipelike.fluidpipe.BlockFluidPipe; -import gregtech.common.pipelike.fluidpipe.tile.TileEntityFluidPipeTickable; import mcjty.theoneprobe.api.IProbeHitData; import mcjty.theoneprobe.api.IProbeInfo; import mcjty.theoneprobe.api.IProbeInfoProvider; diff --git a/src/main/java/gregtech/loaders/recipe/CircuitRecipes.java b/src/main/java/gregtech/loaders/recipe/CircuitRecipes.java index eae71e75548..22b0fac4e4c 100644 --- a/src/main/java/gregtech/loaders/recipe/CircuitRecipes.java +++ b/src/main/java/gregtech/loaders/recipe/CircuitRecipes.java @@ -5,7 +5,6 @@ import gregtech.api.unification.material.MarkerMaterials.Component; import gregtech.api.unification.material.MarkerMaterials.Tier; import gregtech.api.unification.stack.UnificationEntry; -import gregtech.common.ConfigHolder; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; diff --git a/src/main/java/gregtech/loaders/recipe/chemistry/SeparationRecipes.java b/src/main/java/gregtech/loaders/recipe/chemistry/SeparationRecipes.java index adfc844f7ee..bc8a93acd3b 100644 --- a/src/main/java/gregtech/loaders/recipe/chemistry/SeparationRecipes.java +++ b/src/main/java/gregtech/loaders/recipe/chemistry/SeparationRecipes.java @@ -4,7 +4,6 @@ import gregtech.api.recipes.ModHandler; import gregtech.api.unification.ore.OrePrefix; import gregtech.api.util.GTUtility; -import gregtech.common.ConfigHolder; import gregtech.common.blocks.MetaBlocks; import gregtech.common.blocks.wood.BlockGregLog; import gregtech.common.items.MetaItems; diff --git a/src/test/java/gregtech/api/capability/impl/AbstractRecipeLogicTest.java b/src/test/java/gregtech/api/capability/impl/AbstractRecipeLogicTest.java index e40d54b25f8..49e8531cbd5 100644 --- a/src/test/java/gregtech/api/capability/impl/AbstractRecipeLogicTest.java +++ b/src/test/java/gregtech/api/capability/impl/AbstractRecipeLogicTest.java @@ -8,7 +8,6 @@ import gregtech.api.util.world.DummyWorld; import net.minecraft.init.*; import net.minecraft.item.*; -import net.minecraft.tileentity.TileEntity; import net.minecraft.util.*; import net.minecraft.world.World; import org.junit.*; diff --git a/src/test/java/gregtech/api/capability/impl/MultiblockRecipeLogicTest.java b/src/test/java/gregtech/api/capability/impl/MultiblockRecipeLogicTest.java index b2627bffa5f..ac5811a8e45 100644 --- a/src/test/java/gregtech/api/capability/impl/MultiblockRecipeLogicTest.java +++ b/src/test/java/gregtech/api/capability/impl/MultiblockRecipeLogicTest.java @@ -33,7 +33,6 @@ import java.util.List; import static org.junit.Assert.*; -import static org.junit.Assert.assertTrue; public class MultiblockRecipeLogicTest { diff --git a/src/test/java/gregtech/api/recipes/RecipeMapTest.java b/src/test/java/gregtech/api/recipes/RecipeMapTest.java index 2f95a0d78a3..024cdeac951 100644 --- a/src/test/java/gregtech/api/recipes/RecipeMapTest.java +++ b/src/test/java/gregtech/api/recipes/RecipeMapTest.java @@ -19,7 +19,6 @@ import java.util.Collections; import static gregtech.api.unification.material.Materials.*; -import static gregtech.api.unification.material.Materials.Epoxy; import static org.junit.Assert.*; public class RecipeMapTest {