Skip to content

Commit

Permalink
Optimize Imports
Browse files Browse the repository at this point in the history
  • Loading branch information
bonii-xx committed May 31, 2016
1 parent 141ce60 commit bcc4586
Show file tree
Hide file tree
Showing 18 changed files with 58 additions and 39 deletions.
4 changes: 2 additions & 2 deletions src/main/java/slimeknights/mantle/Mantle.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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";
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/slimeknights/mantle/client/ModelHelper.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
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;
import net.minecraft.network.NetHandlerPlayServer;
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;

Expand Down
10 changes: 5 additions & 5 deletions src/main/java/slimeknights/mantle/pulsar/config/ForgeCFG.java
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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.
*
Expand Down
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
Original file line number Diff line number Diff line change
@@ -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.
*
Expand Down
Original file line number Diff line number Diff line change
@@ -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.
*/
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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.
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*/
Expand Down
Original file line number Diff line number Diff line change
@@ -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.
*
Expand Down
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
6 changes: 5 additions & 1 deletion src/main/java/slimeknights/mantle/pulsar/pulse/Pulse.java
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down

0 comments on commit bcc4586

Please sign in to comment.