add in method to get unique names for blocks/items for use in things …

…like IMC, run repo through formatter/import organization

src/mantle/Mantle.java

@@ -8,15 +8,8 @@
 import mantle.books.BookDataStore;
 import mantle.common.MProxyCommon;
 import mantle.items.Manual;
-import mantle.lib.CoreConfig;
 import mantle.lib.CoreRepo;
 import mantle.lib.environment.EnvironmentChecks;
-import net.minecraft.item.Item;
-
-import org.apache.logging.log4j.Level;
-import org.apache.logging.log4j.core.config.LoggerConfig;
-
-import cpw.mods.fml.common.FMLCommonHandler;
 import cpw.mods.fml.common.Mod;
 import cpw.mods.fml.common.Mod.EventHandler;
 import cpw.mods.fml.common.Mod.Instance;

src/mantle/blocks/BlockUtils.java

@@ -3,6 +3,7 @@
 import net.minecraft.block.Block;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
+import cpw.mods.fml.common.registry.GameData;
 
 public class BlockUtils
 {
@@ -16,4 +17,9 @@ public static Block getBlockFromItemStack (ItemStack itemStack)
         return getBlockFromItem(itemStack.getItem());
     }
 
+    public static String getUniqueName (Block block)
+    {
+        return GameData.blockRegistry.getNameForObject(block);
+    }
+
 }

src/mantle/blocks/MantleBlock.java

@@ -1,7 +1,5 @@
 package mantle.blocks;
 
-import cpw.mods.fml.common.FMLCommonHandler;
-import cpw.mods.fml.relauncher.Side;
 import mantle.debug.DebugHelper;
 import mantle.debug.IDebuggable;
 import net.minecraft.block.Block;
@@ -10,6 +8,8 @@
 import net.minecraft.item.Item;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
+import cpw.mods.fml.common.FMLCommonHandler;
+import cpw.mods.fml.relauncher.Side;
 
 /**
  * Root class for inheriting the Minecraft Block.

src/mantle/blocks/abstracts/AdaptiveInventoryLogic.java

@@ -2,12 +2,11 @@
 
 import java.util.Random;
 
+import mantle.blocks.iface.IFacingLogic;
 import net.minecraft.entity.item.EntityItem;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.world.World;
-import mantle.blocks.iface.IFacingLogic;
-import mantle.blocks.abstracts.InventoryLogic;
 
 public abstract class AdaptiveInventoryLogic extends InventoryLogic implements IFacingLogic
 {

src/mantle/blocks/abstracts/ExpandableInventoryLogic.java

@@ -1,12 +1,16 @@
 package mantle.blocks.abstracts;
 
-import java.util.*;
-import net.minecraft.entity.player.*;
-import net.minecraft.inventory.*;
+import java.util.ArrayList;
+import java.util.Iterator;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.inventory.Container;
+import net.minecraft.inventory.IInventory;
 import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.*;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.NBTTagList;
 import net.minecraft.world.World;
-import mantle.blocks.abstracts.InventoryLogic;
 
 public abstract class ExpandableInventoryLogic extends InventoryLogic implements IInventory
 {

src/mantle/blocks/abstracts/InventoryBlock.java

@@ -1,7 +1,9 @@
 package mantle.blocks.abstracts;
 
-import cpw.mods.fml.common.FMLCommonHandler;
-import cpw.mods.fml.relauncher.Side;
+import java.util.Random;
+
+import mantle.blocks.iface.IActiveLogic;
+import mantle.blocks.iface.IFacingLogic;
 import mantle.debug.DebugHelper;
 import mantle.debug.IDebuggable;
 import net.minecraft.block.Block;
@@ -18,10 +20,8 @@
 import net.minecraft.util.IIcon;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
-import mantle.blocks.iface.IActiveLogic;
-import mantle.blocks.iface.IFacingLogic;
-
-import java.util.Random;
+import cpw.mods.fml.common.FMLCommonHandler;
+import cpw.mods.fml.relauncher.Side;
 
 /**
  * Abstract for blocks with inventories.

src/mantle/blocks/abstracts/InventorySlab.java

@@ -1,11 +1,12 @@
 package mantle.blocks.abstracts;
 
+import java.util.List;
+
 import net.minecraft.block.material.Material;
 import net.minecraft.entity.Entity;
 import net.minecraft.util.AxisAlignedBB;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
-import java.util.List;
 
 /**
  * Slab version of InventoryBlock.

src/mantle/blocks/abstracts/MultiItemBlock.java

@@ -1,12 +1,11 @@
 package mantle.blocks.abstracts;
 
+import static mantle.lib.CoreRepo.logger;
 import net.minecraft.block.Block;
 import net.minecraft.item.ItemBlock;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.MathHelper;
 
-import static mantle.lib.CoreRepo.*;
-
 /**
  * 
  * @author progwml6

src/mantle/blocks/abstracts/MultiServantLogic.java

@@ -1,20 +1,19 @@
 package mantle.blocks.abstracts;
 
-import cpw.mods.fml.common.registry.GameRegistry;
+import mantle.blocks.iface.IMasterLogic;
+import mantle.blocks.iface.IServantLogic;
 import mantle.debug.DebugData;
 import mantle.debug.IDebuggable;
 import mantle.world.CoordTuple;
-import mantle.blocks.iface.IMasterLogic;
-import mantle.blocks.iface.IServantLogic;
 import net.minecraft.block.Block;
-import net.minecraft.client.Minecraft;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.network.NetworkManager;
 import net.minecraft.network.Packet;
 import net.minecraft.network.play.server.S35PacketUpdateTileEntity;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
+import cpw.mods.fml.common.registry.GameRegistry;
 
 public class MultiServantLogic extends TileEntity implements IServantLogic, IDebuggable
 {

src/mantle/blocks/iface/IFacingLogic.java

@@ -1,7 +1,7 @@
 package mantle.blocks.iface;
 
-import net.minecraftforge.common.util.ForgeDirection;
 import net.minecraft.entity.EntityLivingBase;
+import net.minecraftforge.common.util.ForgeDirection;
 
 /**
  * Logic for blocks which have a specific direction facing.

src/mantle/books/ManualReader.java

@@ -1,12 +1,13 @@
 package mantle.books;
 
+import static mantle.lib.CoreRepo.logger;
+
 import java.io.InputStream;
 
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 
 import mantle.Mantle;
-import static mantle.lib.CoreRepo.logger;
 
 import org.w3c.dom.Document;
 

src/mantle/client/MProxyClient.java

@@ -1,21 +1,30 @@
 package mantle.client;
 
-import mantle.books.BookData;
-import mantle.books.BookDataStore;
-import mantle.common.MProxyCommon;
+import static mantle.lib.CoreRepo.logger;
 
 import java.util.HashMap;
 import java.util.Map;
 
+import mantle.books.BookData;
+import mantle.books.BookDataStore;
+import mantle.client.block.SmallFontRenderer;
+import mantle.client.gui.GuiManual;
+import mantle.client.pages.BlankPage;
+import mantle.client.pages.BookPage;
+import mantle.client.pages.ContentsTablePage;
+import mantle.client.pages.CraftingPage;
+import mantle.client.pages.FurnacePage;
+import mantle.client.pages.PicturePage;
+import mantle.client.pages.SectionPage;
+import mantle.client.pages.SidebarPage;
+import mantle.client.pages.TextPage;
+import mantle.client.pages.TitlePage;
+import mantle.common.MProxyCommon;
 import net.minecraft.client.Minecraft;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.world.World;
-import mantle.client.block.SmallFontRenderer;
-import mantle.client.gui.GuiManual;
-import mantle.client.pages.*;
-import static mantle.lib.CoreRepo.logger;
 
 public class MProxyClient extends MProxyCommon
 {

src/mantle/client/RenderItemCopy.java

@@ -2,6 +2,7 @@
 
 import java.util.Random;
 
+import mantle.client.block.SmallFontRenderer;
 import net.minecraft.block.Block;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.ItemRenderer;
@@ -22,8 +23,6 @@
 import org.lwjgl.opengl.GL11;
 import org.lwjgl.opengl.GL12;
 
-import mantle.client.block.SmallFontRenderer;
-
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 

src/mantle/client/block/SmallFontRenderer.java

@@ -1,5 +1,7 @@
 package mantle.client.block;
 
+import static mantle.lib.CoreRepo.logger;
+
 import java.awt.image.BufferedImage;
 import java.io.IOException;
 import java.io.InputStream;
@@ -8,7 +10,6 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Random;
-import static mantle.lib.CoreRepo.*;
 
 import javax.imageio.ImageIO;
 

src/mantle/client/gui/GuiManual.java

@@ -1,5 +1,10 @@
 package mantle.client.gui;
 
+import mantle.books.BookData;
+import mantle.client.MProxyClient;
+import mantle.client.RenderItemCopy;
+import mantle.client.block.SmallFontRenderer;
+import mantle.client.pages.BookPage;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.client.gui.GuiScreen;
@@ -12,11 +17,6 @@
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 
-import mantle.books.BookData;
-import mantle.client.RenderItemCopy;
-import mantle.client.MProxyClient;
-import mantle.client.block.SmallFontRenderer;
-import mantle.client.pages.BookPage;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 

src/mantle/client/gui/TurnPageButton.java

@@ -1,5 +1,6 @@
 package mantle.client.gui;
 
+import static mantle.lib.CoreRepo.logger;
 import mantle.books.BookData;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiButton;
@@ -9,7 +10,6 @@
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import static mantle.lib.CoreRepo.logger;
 
 @SideOnly(Side.CLIENT)
 public class TurnPageButton extends GuiButton

src/mantle/client/pages/BookPage.java

@@ -1,9 +1,9 @@
 package mantle.client.pages;
 
-import org.w3c.dom.Element;
-
 import mantle.client.gui.GuiManual;
 
+import org.w3c.dom.Element;
+
 public abstract class BookPage
 {
     protected GuiManual manual;

src/mantle/client/pages/ContentsTablePage.java

@@ -1,5 +1,6 @@
 package mantle.client.pages;
 
+import mantle.lib.client.MantleClientRegistry;
 import net.minecraft.client.renderer.RenderHelper;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.StatCollector;
@@ -9,8 +10,6 @@
 import org.w3c.dom.Element;
 import org.w3c.dom.NodeList;
 
-import mantle.lib.client.MantleClientRegistry;
-
 public class ContentsTablePage extends BookPage
 {
     String text;

src/mantle/client/pages/CraftingPage.java

@@ -1,5 +1,6 @@
 package mantle.client.pages;
 
+import mantle.lib.client.MantleClientRegistry;
 import net.minecraft.client.renderer.RenderHelper;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.ResourceLocation;
@@ -10,8 +11,6 @@
 import org.w3c.dom.Element;
 import org.w3c.dom.NodeList;
 
-import mantle.lib.client.MantleClientRegistry;
-
 public class CraftingPage extends BookPage
 {
     String text;

src/mantle/client/pages/FurnacePage.java

@@ -1,5 +1,6 @@
 package mantle.client.pages;
 
+import mantle.lib.client.MantleClientRegistry;
 import net.minecraft.client.renderer.RenderHelper;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.ResourceLocation;
@@ -10,8 +11,6 @@
 import org.w3c.dom.Element;
 import org.w3c.dom.NodeList;
 
-import mantle.lib.client.MantleClientRegistry;
-
 public class FurnacePage extends BookPage
 {
     String text;

src/mantle/client/pages/TextPage.java

@@ -4,7 +4,6 @@
 
 import org.w3c.dom.Element;
 import org.w3c.dom.NodeList;
-import static mantle.lib.CoreRepo.logger;
 
 public class TextPage extends BookPage
 {

src/mantle/common/MProxyCommon.java

@@ -1,8 +1,8 @@
 package mantle.common;
 
-import cpw.mods.fml.common.network.IGuiHandler;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.world.World;
+import cpw.mods.fml.common.network.IGuiHandler;
 
 public class MProxyCommon implements IGuiHandler
 {

src/mantle/crash/CallableUnsuppConfig.java

@@ -1,9 +1,9 @@
 package mantle.crash;
 
-import cpw.mods.fml.common.ICrashCallable;
-
 import java.util.List;
 
+import cpw.mods.fml.common.ICrashCallable;
+
 // Crash handler for when an unsupported mod is running alongside us
 public class CallableUnsuppConfig implements ICrashCallable
 {