From bcc4586d5d0bceb0a6d5d96341353ee842db3cf9 Mon Sep 17 00:00:00 2001 From: Bernhard Bonigl Date: Tue, 31 May 2016 19:51:01 +0200 Subject: [PATCH] Optimize Imports --- src/main/java/slimeknights/mantle/Mantle.java | 4 ++-- .../slimeknights/mantle/client/ModelHelper.java | 6 +++--- .../mantle/client/model/TRSRBakedModel.java | 2 +- .../mantle/inventory/SlotWrapper.java | 1 - .../mantle/multiblock/MultiServantLogic.java | 1 - .../network/book/PacketUpdateSavedPage.java | 3 ++- .../mantle/pulsar/config/ForgeCFG.java | 10 +++++----- .../mantle/pulsar/config/IConfiguration.java | 4 ++-- .../mantle/pulsar/flightpath/Airdrop.java | 6 +++++- .../mantle/pulsar/flightpath/Flightpath.java | 10 +++++----- .../pulsar/flightpath/ISubscriberLocator.java | 5 +++-- .../flightpath/lib/AnnotationLocator.java | 12 ++++++++---- .../lib/BlackholeExceptionHandler.java | 4 ++-- .../pulsar/internal/BusExceptionHandler.java | 4 ++-- .../mantle/pulsar/internal/Configuration.java | 17 ++++++++++++----- .../mantle/pulsar/internal/CrashHandler.java | 1 + .../slimeknights/mantle/pulsar/pulse/Pulse.java | 6 +++++- .../mantle/tileentity/TileInventory.java | 1 - 18 files changed, 58 insertions(+), 39 deletions(-) diff --git a/src/main/java/slimeknights/mantle/Mantle.java b/src/main/java/slimeknights/mantle/Mantle.java index 16c955d1..f4dce684 100644 --- a/src/main/java/slimeknights/mantle/Mantle.java +++ b/src/main/java/slimeknights/mantle/Mantle.java @@ -3,8 +3,8 @@ import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.Mod.Instance; import net.minecraftforge.fml.common.SidedProxy; - import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; + import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -21,7 +21,7 @@ name = Mantle.modName, version = Mantle.modVersion, dependencies = "required-after:Forge@[12.16.0.1850,)", - acceptedMinecraftVersions = "[1.9,1.9.1)") + acceptedMinecraftVersions = "[1.9.4,1.10)") public class Mantle { public static final String modId = "mantle"; diff --git a/src/main/java/slimeknights/mantle/client/ModelHelper.java b/src/main/java/slimeknights/mantle/client/ModelHelper.java index 0547b6ec..d6fbbb7f 100644 --- a/src/main/java/slimeknights/mantle/client/ModelHelper.java +++ b/src/main/java/slimeknights/mantle/client/ModelHelper.java @@ -10,12 +10,12 @@ import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.vertex.VertexFormat; import net.minecraft.client.renderer.vertex.VertexFormatElement; -import net.minecraftforge.common.model.IModelPart; -import net.minecraftforge.common.model.IModelState; import net.minecraftforge.client.model.SimpleModelState; -import net.minecraftforge.common.model.TRSRTransformation; import net.minecraftforge.client.model.pipeline.UnpackedBakedQuad; import net.minecraftforge.client.model.pipeline.VertexTransformer; +import net.minecraftforge.common.model.IModelPart; +import net.minecraftforge.common.model.IModelState; +import net.minecraftforge.common.model.TRSRTransformation; import javax.vecmath.Vector3f; diff --git a/src/main/java/slimeknights/mantle/client/model/TRSRBakedModel.java b/src/main/java/slimeknights/mantle/client/model/TRSRBakedModel.java index 1c8728eb..8f5704e0 100644 --- a/src/main/java/slimeknights/mantle/client/model/TRSRBakedModel.java +++ b/src/main/java/slimeknights/mantle/client/model/TRSRBakedModel.java @@ -15,9 +15,9 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; -import net.minecraftforge.common.model.TRSRTransformation; import net.minecraftforge.client.model.pipeline.UnpackedBakedQuad; import net.minecraftforge.client.model.pipeline.VertexTransformer; +import net.minecraftforge.common.model.TRSRTransformation; import java.util.List; diff --git a/src/main/java/slimeknights/mantle/inventory/SlotWrapper.java b/src/main/java/slimeknights/mantle/inventory/SlotWrapper.java index e53d2d6a..6f7d198c 100644 --- a/src/main/java/slimeknights/mantle/inventory/SlotWrapper.java +++ b/src/main/java/slimeknights/mantle/inventory/SlotWrapper.java @@ -1,7 +1,6 @@ package slimeknights.mantle.inventory; import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; diff --git a/src/main/java/slimeknights/mantle/multiblock/MultiServantLogic.java b/src/main/java/slimeknights/mantle/multiblock/MultiServantLogic.java index 73c5ff0a..a9d4f93e 100644 --- a/src/main/java/slimeknights/mantle/multiblock/MultiServantLogic.java +++ b/src/main/java/slimeknights/mantle/multiblock/MultiServantLogic.java @@ -4,7 +4,6 @@ import net.minecraft.block.state.IBlockState; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.network.NetworkManager; -import net.minecraft.network.Packet; import net.minecraft.network.play.server.SPacketUpdateTileEntity; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; diff --git a/src/main/java/slimeknights/mantle/network/book/PacketUpdateSavedPage.java b/src/main/java/slimeknights/mantle/network/book/PacketUpdateSavedPage.java index 71dd5075..9df2cb85 100644 --- a/src/main/java/slimeknights/mantle/network/book/PacketUpdateSavedPage.java +++ b/src/main/java/slimeknights/mantle/network/book/PacketUpdateSavedPage.java @@ -1,6 +1,5 @@ package slimeknights.mantle.network.book; -import io.netty.buffer.ByteBuf; import net.minecraft.client.network.NetHandlerPlayClient; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -8,6 +7,8 @@ import net.minecraft.util.EnumHand; import net.minecraftforge.fml.common.network.ByteBufUtils; import net.minecraftforge.fml.common.network.simpleimpl.IMessage; + +import io.netty.buffer.ByteBuf; import slimeknights.mantle.client.book.BookHelper; import slimeknights.mantle.network.AbstractPacket; diff --git a/src/main/java/slimeknights/mantle/pulsar/config/ForgeCFG.java b/src/main/java/slimeknights/mantle/pulsar/config/ForgeCFG.java index 09628c29..baa0b5ea 100644 --- a/src/main/java/slimeknights/mantle/pulsar/config/ForgeCFG.java +++ b/src/main/java/slimeknights/mantle/pulsar/config/ForgeCFG.java @@ -1,17 +1,17 @@ package slimeknights.mantle.pulsar.config; -import java.io.File; -import java.util.Locale; - -import slimeknights.mantle.pulsar.pulse.PulseMeta; - import net.minecraftforge.common.config.ConfigCategory; import net.minecraftforge.common.config.Configuration; import net.minecraftforge.common.config.Property; import net.minecraftforge.fml.common.Loader; +import java.io.File; +import java.util.Locale; + import javax.annotation.Nonnull; +import slimeknights.mantle.pulsar.pulse.PulseMeta; + /** * Mantle specific pulsar addon class to support using the forge CFG format for configurations * @author progwml6 diff --git a/src/main/java/slimeknights/mantle/pulsar/config/IConfiguration.java b/src/main/java/slimeknights/mantle/pulsar/config/IConfiguration.java index 8da94cbb..a89b315b 100644 --- a/src/main/java/slimeknights/mantle/pulsar/config/IConfiguration.java +++ b/src/main/java/slimeknights/mantle/pulsar/config/IConfiguration.java @@ -1,9 +1,9 @@ package slimeknights.mantle.pulsar.config; -import slimeknights.mantle.pulsar.pulse.PulseMeta; - import javax.annotation.ParametersAreNonnullByDefault; +import slimeknights.mantle.pulsar.pulse.PulseMeta; + /** * Interface for config handlers. * diff --git a/src/main/java/slimeknights/mantle/pulsar/flightpath/Airdrop.java b/src/main/java/slimeknights/mantle/pulsar/flightpath/Airdrop.java index 9299344d..8c9c2da1 100755 --- a/src/main/java/slimeknights/mantle/pulsar/flightpath/Airdrop.java +++ b/src/main/java/slimeknights/mantle/pulsar/flightpath/Airdrop.java @@ -1,6 +1,10 @@ package slimeknights.mantle.pulsar.flightpath; -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; /** * Default annotation for Flightpath subscriptions. diff --git a/src/main/java/slimeknights/mantle/pulsar/flightpath/Flightpath.java b/src/main/java/slimeknights/mantle/pulsar/flightpath/Flightpath.java index 909c39cd..1590fe06 100755 --- a/src/main/java/slimeknights/mantle/pulsar/flightpath/Flightpath.java +++ b/src/main/java/slimeknights/mantle/pulsar/flightpath/Flightpath.java @@ -1,15 +1,15 @@ package slimeknights.mantle.pulsar.flightpath; -import slimeknights.mantle.pulsar.flightpath.lib.AnnotationLocator; -import slimeknights.mantle.pulsar.flightpath.lib.BlackholeExceptionHandler; - -import javax.annotation.ParametersAreNonnullByDefault; import java.lang.reflect.Method; -import java.util.HashSet; import java.util.LinkedHashMap; import java.util.Map; import java.util.Set; +import javax.annotation.ParametersAreNonnullByDefault; + +import slimeknights.mantle.pulsar.flightpath.lib.AnnotationLocator; +import slimeknights.mantle.pulsar.flightpath.lib.BlackholeExceptionHandler; + /** * Flightpath - an ordered event bus implementation. * diff --git a/src/main/java/slimeknights/mantle/pulsar/flightpath/ISubscriberLocator.java b/src/main/java/slimeknights/mantle/pulsar/flightpath/ISubscriberLocator.java index 61291486..39f4a21f 100755 --- a/src/main/java/slimeknights/mantle/pulsar/flightpath/ISubscriberLocator.java +++ b/src/main/java/slimeknights/mantle/pulsar/flightpath/ISubscriberLocator.java @@ -1,11 +1,12 @@ package slimeknights.mantle.pulsar.flightpath; -import javax.annotation.Nonnull; -import javax.annotation.ParametersAreNonnullByDefault; import java.lang.reflect.Method; import java.util.Map; import java.util.Set; +import javax.annotation.Nonnull; +import javax.annotation.ParametersAreNonnullByDefault; + /** * Interface for defining custom subscriber scanners. */ diff --git a/src/main/java/slimeknights/mantle/pulsar/flightpath/lib/AnnotationLocator.java b/src/main/java/slimeknights/mantle/pulsar/flightpath/lib/AnnotationLocator.java index 298fda28..9efc33ec 100755 --- a/src/main/java/slimeknights/mantle/pulsar/flightpath/lib/AnnotationLocator.java +++ b/src/main/java/slimeknights/mantle/pulsar/flightpath/lib/AnnotationLocator.java @@ -1,12 +1,16 @@ package slimeknights.mantle.pulsar.flightpath.lib; -import slimeknights.mantle.pulsar.flightpath.ISubscriberLocator; +import java.lang.annotation.Annotation; +import java.lang.reflect.Method; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; import javax.annotation.Nonnull; import javax.annotation.ParametersAreNonnullByDefault; -import java.lang.annotation.Annotation; -import java.lang.reflect.Method; -import java.util.*; + +import slimeknights.mantle.pulsar.flightpath.ISubscriberLocator; /** * Default implementation of ISubscriberLocator diff --git a/src/main/java/slimeknights/mantle/pulsar/flightpath/lib/BlackholeExceptionHandler.java b/src/main/java/slimeknights/mantle/pulsar/flightpath/lib/BlackholeExceptionHandler.java index 60f5f1b1..ad47b957 100755 --- a/src/main/java/slimeknights/mantle/pulsar/flightpath/lib/BlackholeExceptionHandler.java +++ b/src/main/java/slimeknights/mantle/pulsar/flightpath/lib/BlackholeExceptionHandler.java @@ -1,9 +1,9 @@ package slimeknights.mantle.pulsar.flightpath.lib; -import slimeknights.mantle.pulsar.flightpath.IExceptionHandler; - import javax.annotation.ParametersAreNonnullByDefault; +import slimeknights.mantle.pulsar.flightpath.IExceptionHandler; + /** * Default exception handler when Flightpath has been asked to ignore errors. * diff --git a/src/main/java/slimeknights/mantle/pulsar/internal/BusExceptionHandler.java b/src/main/java/slimeknights/mantle/pulsar/internal/BusExceptionHandler.java index e5dbb2c5..a96eb101 100644 --- a/src/main/java/slimeknights/mantle/pulsar/internal/BusExceptionHandler.java +++ b/src/main/java/slimeknights/mantle/pulsar/internal/BusExceptionHandler.java @@ -3,10 +3,10 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import slimeknights.mantle.pulsar.flightpath.IExceptionHandler; - import javax.annotation.ParametersAreNonnullByDefault; +import slimeknights.mantle.pulsar.flightpath.IExceptionHandler; + /** * Custom exception catcher that logs events. */ diff --git a/src/main/java/slimeknights/mantle/pulsar/internal/Configuration.java b/src/main/java/slimeknights/mantle/pulsar/internal/Configuration.java index b959a668..0fb16d4f 100644 --- a/src/main/java/slimeknights/mantle/pulsar/internal/Configuration.java +++ b/src/main/java/slimeknights/mantle/pulsar/internal/Configuration.java @@ -1,23 +1,30 @@ package slimeknights.mantle.pulsar.internal; -import java.io.*; -import java.util.*; - import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.google.gson.reflect.TypeToken; import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonWriter; + import net.minecraftforge.fml.common.Loader; import org.apache.logging.log4j.Logger; -import slimeknights.mantle.pulsar.config.IConfiguration; -import slimeknights.mantle.pulsar.pulse.PulseMeta; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.FileOutputStream; +import java.io.InputStreamReader; +import java.io.OutputStreamWriter; +import java.util.HashMap; +import java.util.Map; import javax.annotation.Nonnull; import javax.annotation.ParametersAreNonnullByDefault; +import slimeknights.mantle.pulsar.config.IConfiguration; +import slimeknights.mantle.pulsar.pulse.PulseMeta; + /** * Default Gson Configuration helper. * diff --git a/src/main/java/slimeknights/mantle/pulsar/internal/CrashHandler.java b/src/main/java/slimeknights/mantle/pulsar/internal/CrashHandler.java index c45b4e9e..150ae7b1 100644 --- a/src/main/java/slimeknights/mantle/pulsar/internal/CrashHandler.java +++ b/src/main/java/slimeknights/mantle/pulsar/internal/CrashHandler.java @@ -1,6 +1,7 @@ package slimeknights.mantle.pulsar.internal; import net.minecraftforge.fml.common.ICrashCallable; + import slimeknights.mantle.pulsar.control.PulseManager; import slimeknights.mantle.pulsar.pulse.PulseMeta; diff --git a/src/main/java/slimeknights/mantle/pulsar/pulse/Pulse.java b/src/main/java/slimeknights/mantle/pulsar/pulse/Pulse.java index cafd0c43..b9f7c9a5 100644 --- a/src/main/java/slimeknights/mantle/pulsar/pulse/Pulse.java +++ b/src/main/java/slimeknights/mantle/pulsar/pulse/Pulse.java @@ -1,6 +1,10 @@ package slimeknights.mantle.pulsar.pulse; -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; /** * Metadata annotation for IPulse implementations. diff --git a/src/main/java/slimeknights/mantle/tileentity/TileInventory.java b/src/main/java/slimeknights/mantle/tileentity/TileInventory.java index 33c7d684..19a83b5b 100644 --- a/src/main/java/slimeknights/mantle/tileentity/TileInventory.java +++ b/src/main/java/slimeknights/mantle/tileentity/TileInventory.java @@ -13,7 +13,6 @@ import net.minecraft.util.text.TextComponentTranslation; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.items.CapabilityItemHandler; -import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.IItemHandlerModifiable; import net.minecraftforge.items.wrapper.InvWrapper;