From dfc63b617f13887ff3002371d47895471005defb Mon Sep 17 00:00:00 2001 From: Arona Jones Date: Tue, 16 Dec 2014 22:27:44 +0000 Subject: [PATCH] Import Opts --- .../chisel/BlockNameConversion.java | 5 +- .../java/com/cricketcraft/chisel/Chisel.java | 15 +++--- .../cricketcraft/chisel/ChiselLeftClick.java | 15 +++--- .../com/cricketcraft/chisel/Crafting.java | 7 +-- .../java/com/cricketcraft/chisel/Waila.java | 4 +- .../chisel/block/BlockAutoChisel.java | 11 +++-- .../chisel/block/BlockCarvable.java | 13 ++--- .../chisel/block/BlockCarvableGlass.java | 13 ++--- .../chisel/block/BlockCarvablePane.java | 13 ++--- .../chisel/block/BlockCarvablePumpkin.java | 8 +-- .../cricketcraft/chisel/block/BlockCloud.java | 4 +- .../chisel/block/BlockConcrete.java | 7 +-- .../chisel/block/BlockGrimstone.java | 10 ++-- .../chisel/block/BlockHolystone.java | 6 +-- .../chisel/block/BlockLavastone.java | 4 +- .../chisel/block/BlockMarbleCarpet.java | 12 ++--- .../chisel/block/BlockMarbleIce.java | 10 ++-- .../chisel/block/BlockMarbleIceStairs.java | 6 +-- .../chisel/block/BlockMarblePillar.java | 6 +-- .../chisel/block/BlockMarbleStairs.java | 12 ++--- .../chisel/block/BlockMarbleStairsMaker.java | 7 +-- .../block/BlockMarbleStairsMakerCreator.java | 4 +- .../chisel/block/BlockMarbleTexturedOre.java | 10 ++-- .../chisel/block/BlockMarbleWall.java | 6 +-- .../chisel/block/BlockPresent.java | 17 ++++--- .../chisel/block/BlockRoadLine.java | 6 +-- .../chisel/block/BlockSnakestone.java | 6 +-- .../chisel/block/BlockSnakestoneObsidian.java | 4 +- .../chisel/block/BlockTexturedOre.java | 4 +- .../chisel/block/BlockVoidstonePillar.java | 10 ++-- .../chisel/block/BlockVoidstonePillar2.java | 10 ++-- .../block/tileentity/TileEntityPresent.java | 8 +-- .../chisel/carving/CarvableHelper.java | 28 ++++++----- .../chisel/carving/CarvableVariation.java | 4 +- .../cricketcraft/chisel/carving/Carving.java | 4 +- .../chisel/client/GeneralChiselClient.java | 4 +- .../chisel/client/gui/GuiChiselConfig.java | 7 +-- .../client/render/BlockRoadLineRenderer.java | 7 +-- .../chisel/client/render/CTM.java | 4 +- .../chisel/compat/FMPIntegration.java | 5 +- .../chisel/compat/MarbleCompatibility.java | 3 +- .../chisel/entity/EntityBallOMoss.java | 10 ++-- .../chisel/entity/EntityCloudInABottle.java | 4 +- .../chisel/entity/EntitySmashingRock.java | 4 +- .../chisel/entity/fx/EntityGrimstoneFX.java | 6 +-- .../chisel/entity/fx/EntityHolystoneFX.java | 6 +-- .../cricketcraft/chisel/init/ModBlocks.java | 49 ++++++++++++++++--- .../chisel/inventory/ContainerAutoChisel.java | 4 +- .../chisel/inventory/ContainerChisel.java | 8 +-- .../inventory/InventoryChiselSelection.java | 4 +- .../chisel/inventory/SlotChiselSelection.java | 4 +- .../chisel/item/ItemBallOMoss.java | 10 ++-- .../chisel/item/ItemCarvable.java | 10 ++-- .../chisel/item/ItemCloudInABottle.java | 10 ++-- .../chisel/item/ItemMarbleSlab.java | 4 +- .../chisel/item/ItemSmashingRock.java | 10 ++-- .../cricketcraft/chisel/item/ItemUpgrade.java | 7 ++- 57 files changed, 265 insertions(+), 224 deletions(-) diff --git a/src/main/java/com/cricketcraft/chisel/BlockNameConversion.java b/src/main/java/com/cricketcraft/chisel/BlockNameConversion.java index 2fc33145..d994313d 100644 --- a/src/main/java/com/cricketcraft/chisel/BlockNameConversion.java +++ b/src/main/java/com/cricketcraft/chisel/BlockNameConversion.java @@ -2,10 +2,11 @@ package com.cricketcraft.chisel; import java.util.HashMap; -import com.cricketcraft.chisel.utils.General; - import net.minecraft.block.Block; import net.minecraft.item.Item; + +import com.cricketcraft.chisel.utils.General; + import cpw.mods.fml.common.FMLLog; import cpw.mods.fml.common.registry.GameRegistry; diff --git a/src/main/java/com/cricketcraft/chisel/Chisel.java b/src/main/java/com/cricketcraft/chisel/Chisel.java index 057a2e85..48d5c0ba 100644 --- a/src/main/java/com/cricketcraft/chisel/Chisel.java +++ b/src/main/java/com/cricketcraft/chisel/Chisel.java @@ -2,6 +2,14 @@ package com.cricketcraft.chisel; import java.io.File; +import net.minecraft.block.Block; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.common.config.Configuration; + import com.cricketcraft.chisel.block.BlockCarvable; import com.cricketcraft.chisel.block.tileentity.TileEntityAutoChisel; import com.cricketcraft.chisel.block.tileentity.TileEntityPresent; @@ -23,13 +31,6 @@ import com.cricketcraft.chisel.utils.General; import com.cricketcraft.chisel.world.GeneratorLimestone; import com.cricketcraft.chisel.world.GeneratorMarble; -import net.minecraft.block.Block; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.common.config.Configuration; import cpw.mods.fml.client.event.ConfigChangedEvent; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.FMLLog; diff --git a/src/main/java/com/cricketcraft/chisel/ChiselLeftClick.java b/src/main/java/com/cricketcraft/chisel/ChiselLeftClick.java index 344a4236..f3602616 100644 --- a/src/main/java/com/cricketcraft/chisel/ChiselLeftClick.java +++ b/src/main/java/com/cricketcraft/chisel/ChiselLeftClick.java @@ -3,13 +3,6 @@ package com.cricketcraft.chisel; import java.util.HashMap; import java.util.Random; -import com.cricketcraft.chisel.api.ChiselMode; -import com.cricketcraft.chisel.carving.CarvingVariation; -import com.cricketcraft.chisel.client.GeneralChiselClient; -import com.cricketcraft.chisel.init.ModBlocks; -import com.cricketcraft.chisel.init.ModItems; -import com.cricketcraft.chisel.item.ItemChisel; - import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; @@ -19,6 +12,14 @@ import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.event.entity.player.PlayerInteractEvent; import net.minecraftforge.event.world.BlockEvent; + +import com.cricketcraft.chisel.api.ChiselMode; +import com.cricketcraft.chisel.carving.CarvingVariation; +import com.cricketcraft.chisel.client.GeneralChiselClient; +import com.cricketcraft.chisel.init.ModBlocks; +import com.cricketcraft.chisel.init.ModItems; +import com.cricketcraft.chisel.item.ItemChisel; + import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.eventhandler.SubscribeEvent; diff --git a/src/main/java/com/cricketcraft/chisel/Crafting.java b/src/main/java/com/cricketcraft/chisel/Crafting.java index f7b64fe1..bc00d30e 100644 --- a/src/main/java/com/cricketcraft/chisel/Crafting.java +++ b/src/main/java/com/cricketcraft/chisel/Crafting.java @@ -1,8 +1,5 @@ package com.cricketcraft.chisel; -import com.cricketcraft.chisel.init.ModBlocks; -import com.cricketcraft.chisel.init.ModItems; - import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.init.Items; @@ -11,6 +8,10 @@ import net.minecraft.item.crafting.FurnaceRecipes; import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.oredict.ShapedOreRecipe; import net.minecraftforge.oredict.ShapelessOreRecipe; + +import com.cricketcraft.chisel.init.ModBlocks; +import com.cricketcraft.chisel.init.ModItems; + import cpw.mods.fml.common.registry.GameRegistry; public class Crafting { diff --git a/src/main/java/com/cricketcraft/chisel/Waila.java b/src/main/java/com/cricketcraft/chisel/Waila.java index 40dfeaed..3fea4565 100644 --- a/src/main/java/com/cricketcraft/chisel/Waila.java +++ b/src/main/java/com/cricketcraft/chisel/Waila.java @@ -2,14 +2,14 @@ package com.cricketcraft.chisel; import java.util.List; -import com.cricketcraft.chisel.block.BlockCarvable; - import mcp.mobius.waila.api.IWailaConfigHandler; import mcp.mobius.waila.api.IWailaDataAccessor; import mcp.mobius.waila.api.IWailaDataProvider; import mcp.mobius.waila.api.IWailaRegistrar; import net.minecraft.item.ItemStack; +import com.cricketcraft.chisel.block.BlockCarvable; + public class Waila implements IWailaDataProvider { diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockAutoChisel.java b/src/main/java/com/cricketcraft/chisel/block/BlockAutoChisel.java index 01f31421..94a3dfc5 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockAutoChisel.java +++ b/src/main/java/com/cricketcraft/chisel/block/BlockAutoChisel.java @@ -3,11 +3,6 @@ package com.cricketcraft.chisel.block; import java.util.List; import java.util.Random; -import com.cricketcraft.chisel.Chisel; -import com.cricketcraft.chisel.block.tileentity.TileEntityAutoChisel; -import com.cricketcraft.chisel.init.ModBlocks; -import com.cricketcraft.chisel.init.ModItems; - import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; @@ -19,6 +14,12 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; + +import com.cricketcraft.chisel.Chisel; +import com.cricketcraft.chisel.block.tileentity.TileEntityAutoChisel; +import com.cricketcraft.chisel.init.ModBlocks; +import com.cricketcraft.chisel.init.ModItems; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockCarvable.java b/src/main/java/com/cricketcraft/chisel/block/BlockCarvable.java index af6c1b2a..38e6b4cd 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockCarvable.java +++ b/src/main/java/com/cricketcraft/chisel/block/BlockCarvable.java @@ -2,12 +2,6 @@ package com.cricketcraft.chisel.block; import java.util.List; -import com.cricketcraft.chisel.Chisel; -import com.cricketcraft.chisel.api.ICarvable; -import com.cricketcraft.chisel.carving.CarvableHelper; -import com.cricketcraft.chisel.carving.CarvableVariation; -import com.cricketcraft.chisel.init.ModTabs; - import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -15,6 +9,13 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; + +import com.cricketcraft.chisel.Chisel; +import com.cricketcraft.chisel.api.ICarvable; +import com.cricketcraft.chisel.carving.CarvableHelper; +import com.cricketcraft.chisel.carving.CarvableVariation; +import com.cricketcraft.chisel.init.ModTabs; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableGlass.java b/src/main/java/com/cricketcraft/chisel/block/BlockCarvableGlass.java index 78927ca4..ddd95cdd 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableGlass.java +++ b/src/main/java/com/cricketcraft/chisel/block/BlockCarvableGlass.java @@ -2,18 +2,19 @@ package com.cricketcraft.chisel.block; import java.util.List; -import com.cricketcraft.chisel.Chisel; -import com.cricketcraft.chisel.api.ICarvable; -import com.cricketcraft.chisel.carving.CarvableHelper; -import com.cricketcraft.chisel.carving.CarvableVariation; -import com.cricketcraft.chisel.init.ModTabs; - import net.minecraft.block.BlockGlass; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.util.IIcon; + +import com.cricketcraft.chisel.Chisel; +import com.cricketcraft.chisel.api.ICarvable; +import com.cricketcraft.chisel.carving.CarvableHelper; +import com.cricketcraft.chisel.carving.CarvableVariation; +import com.cricketcraft.chisel.init.ModTabs; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockCarvablePane.java b/src/main/java/com/cricketcraft/chisel/block/BlockCarvablePane.java index 9a07bfeb..e3d012ef 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockCarvablePane.java +++ b/src/main/java/com/cricketcraft/chisel/block/BlockCarvablePane.java @@ -2,18 +2,19 @@ package com.cricketcraft.chisel.block; import java.util.List; -import com.cricketcraft.chisel.api.ICarvable; -import com.cricketcraft.chisel.carving.CarvableHelper; -import com.cricketcraft.chisel.carving.CarvableVariation; -import com.cricketcraft.chisel.client.render.BlockMarblePaneRenderer; -import com.cricketcraft.chisel.init.ModTabs; - import net.minecraft.block.BlockPane; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.util.IIcon; + +import com.cricketcraft.chisel.api.ICarvable; +import com.cricketcraft.chisel.carving.CarvableHelper; +import com.cricketcraft.chisel.carving.CarvableVariation; +import com.cricketcraft.chisel.client.render.BlockMarblePaneRenderer; +import com.cricketcraft.chisel.init.ModTabs; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockCarvablePumpkin.java b/src/main/java/com/cricketcraft/chisel/block/BlockCarvablePumpkin.java index 9fa183fc..4c78376f 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockCarvablePumpkin.java +++ b/src/main/java/com/cricketcraft/chisel/block/BlockCarvablePumpkin.java @@ -1,14 +1,16 @@ package com.cricketcraft.chisel.block; +import net.minecraft.block.BlockPumpkin; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.util.IIcon; + import com.cricketcraft.chisel.Chisel; import com.cricketcraft.chisel.api.ICarvable; import com.cricketcraft.chisel.carving.CarvableHelper; import com.cricketcraft.chisel.carving.CarvableVariation; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.block.BlockPumpkin; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.util.IIcon; public class BlockCarvablePumpkin extends BlockPumpkin implements ICarvable{ public CarvableHelper carverHelper; diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockCloud.java b/src/main/java/com/cricketcraft/chisel/block/BlockCloud.java index 232fd2d7..aeed065e 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockCloud.java +++ b/src/main/java/com/cricketcraft/chisel/block/BlockCloud.java @@ -3,8 +3,6 @@ package com.cricketcraft.chisel.block; import java.util.Random; -import com.cricketcraft.chisel.Configurations; - import net.minecraft.block.material.Material; import net.minecraft.entity.Entity; import net.minecraft.item.Item; @@ -12,6 +10,8 @@ import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import com.cricketcraft.chisel.Configurations; + public class BlockCloud extends BlockCarvable { public BlockCloud() { diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockConcrete.java b/src/main/java/com/cricketcraft/chisel/block/BlockConcrete.java index 98725b3d..e299913d 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockConcrete.java +++ b/src/main/java/com/cricketcraft/chisel/block/BlockConcrete.java @@ -1,11 +1,12 @@ package com.cricketcraft.chisel.block; -import com.cricketcraft.chisel.Configurations; -import com.cricketcraft.chisel.client.GeneralChiselClient; - import net.minecraft.entity.Entity; import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.World; + +import com.cricketcraft.chisel.Configurations; +import com.cricketcraft.chisel.client.GeneralChiselClient; + import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockGrimstone.java b/src/main/java/com/cricketcraft/chisel/block/BlockGrimstone.java index da0edc81..af201dbd 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockGrimstone.java +++ b/src/main/java/com/cricketcraft/chisel/block/BlockGrimstone.java @@ -2,16 +2,16 @@ package com.cricketcraft.chisel.block; import java.util.Random; -import com.cricketcraft.chisel.Chisel; -import com.cricketcraft.chisel.client.GeneralChiselClient; -import com.cricketcraft.chisel.init.ModTabs; -import com.cricketcraft.chisel.utils.General; - import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.IIcon; import net.minecraft.world.World; +import com.cricketcraft.chisel.Chisel; +import com.cricketcraft.chisel.client.GeneralChiselClient; +import com.cricketcraft.chisel.init.ModTabs; +import com.cricketcraft.chisel.utils.General; + public class BlockGrimstone extends BlockCarvable { public IIcon iconStar; diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockHolystone.java b/src/main/java/com/cricketcraft/chisel/block/BlockHolystone.java index baab41c4..e00c344f 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockHolystone.java +++ b/src/main/java/com/cricketcraft/chisel/block/BlockHolystone.java @@ -2,14 +2,14 @@ package com.cricketcraft.chisel.block; import java.util.Random; -import com.cricketcraft.chisel.client.GeneralChiselClient; -import com.cricketcraft.chisel.utils.General; - import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.IIcon; import net.minecraft.world.World; +import com.cricketcraft.chisel.client.GeneralChiselClient; +import com.cricketcraft.chisel.utils.General; + public class BlockHolystone extends BlockCarvable { public IIcon iconStar; diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockLavastone.java b/src/main/java/com/cricketcraft/chisel/block/BlockLavastone.java index 10393d4a..dda0a1e8 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockLavastone.java +++ b/src/main/java/com/cricketcraft/chisel/block/BlockLavastone.java @@ -3,11 +3,11 @@ package com.cricketcraft.chisel.block; import java.util.Random; -import com.cricketcraft.chisel.client.GeneralChiselClient; - import net.minecraft.block.material.Material; import net.minecraft.world.World; +import com.cricketcraft.chisel.client.GeneralChiselClient; + public class BlockLavastone extends BlockMarbleTexturedOre { public BlockLavastone(Material mat, String baseIcon) diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockMarbleCarpet.java b/src/main/java/com/cricketcraft/chisel/block/BlockMarbleCarpet.java index a37ead66..092dd56a 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockMarbleCarpet.java +++ b/src/main/java/com/cricketcraft/chisel/block/BlockMarbleCarpet.java @@ -2,12 +2,6 @@ package com.cricketcraft.chisel.block; import java.util.List; -import com.cricketcraft.chisel.Chisel; -import com.cricketcraft.chisel.api.ICarvable; -import com.cricketcraft.chisel.carving.CarvableHelper; -import com.cricketcraft.chisel.carving.CarvableVariation; -import com.cricketcraft.chisel.init.ModTabs; - import net.minecraft.block.BlockCarpet; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -16,6 +10,12 @@ import net.minecraft.item.Item; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; +import com.cricketcraft.chisel.Chisel; +import com.cricketcraft.chisel.api.ICarvable; +import com.cricketcraft.chisel.carving.CarvableHelper; +import com.cricketcraft.chisel.carving.CarvableVariation; +import com.cricketcraft.chisel.init.ModTabs; + public class BlockMarbleCarpet extends BlockCarpet implements ICarvable { public CarvableHelper carverHelper; diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockMarbleIce.java b/src/main/java/com/cricketcraft/chisel/block/BlockMarbleIce.java index 8e26f472..a77cfcdd 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockMarbleIce.java +++ b/src/main/java/com/cricketcraft/chisel/block/BlockMarbleIce.java @@ -2,11 +2,6 @@ package com.cricketcraft.chisel.block; import java.util.List; -import com.cricketcraft.chisel.api.ICarvable; -import com.cricketcraft.chisel.carving.CarvableHelper; -import com.cricketcraft.chisel.carving.CarvableVariation; -import com.cricketcraft.chisel.init.ModTabs; - import net.minecraft.block.Block; import net.minecraft.block.BlockIce; import net.minecraft.client.renderer.texture.IIconRegister; @@ -17,6 +12,11 @@ import net.minecraft.stats.StatList; import net.minecraft.util.IIcon; import net.minecraft.world.World; +import com.cricketcraft.chisel.api.ICarvable; +import com.cricketcraft.chisel.carving.CarvableHelper; +import com.cricketcraft.chisel.carving.CarvableVariation; +import com.cricketcraft.chisel.init.ModTabs; + public class BlockMarbleIce extends BlockIce implements ICarvable { public CarvableHelper carverHelper; diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockMarbleIceStairs.java b/src/main/java/com/cricketcraft/chisel/block/BlockMarbleIceStairs.java index 6822906f..0ca59f52 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockMarbleIceStairs.java +++ b/src/main/java/com/cricketcraft/chisel/block/BlockMarbleIceStairs.java @@ -2,13 +2,13 @@ package com.cricketcraft.chisel.block; import java.util.Random; -import com.cricketcraft.chisel.carving.CarvableHelper; -import com.cricketcraft.chisel.init.ModBlocks; - import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; +import com.cricketcraft.chisel.carving.CarvableHelper; +import com.cricketcraft.chisel.init.ModBlocks; + public class BlockMarbleIceStairs extends BlockMarbleStairs { public BlockMarbleIceStairs(Block block, int meta, CarvableHelper helper) diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockMarblePillar.java b/src/main/java/com/cricketcraft/chisel/block/BlockMarblePillar.java index 1b960089..04778a49 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockMarblePillar.java +++ b/src/main/java/com/cricketcraft/chisel/block/BlockMarblePillar.java @@ -1,12 +1,12 @@ package com.cricketcraft.chisel.block; -import com.cricketcraft.chisel.carving.CarvableVariation; -import com.cricketcraft.chisel.client.render.BlockMarblePillarRenderer; - import net.minecraft.block.material.Material; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; +import com.cricketcraft.chisel.carving.CarvableVariation; +import com.cricketcraft.chisel.client.render.BlockMarblePillarRenderer; + public class BlockMarblePillar extends BlockCarvable { public IIcon sides[] = new IIcon[6]; diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockMarbleStairs.java b/src/main/java/com/cricketcraft/chisel/block/BlockMarbleStairs.java index 8ea42e8a..161048b4 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockMarbleStairs.java +++ b/src/main/java/com/cricketcraft/chisel/block/BlockMarbleStairs.java @@ -2,12 +2,6 @@ package com.cricketcraft.chisel.block; import java.util.List; -import com.cricketcraft.chisel.api.ICarvable; -import com.cricketcraft.chisel.carving.CarvableHelper; -import com.cricketcraft.chisel.carving.CarvableVariation; -import com.cricketcraft.chisel.client.render.BlockMarbleStairsRenderer; -import com.cricketcraft.chisel.init.ModTabs; - import net.minecraft.block.Block; import net.minecraft.block.BlockStairs; import net.minecraft.client.renderer.texture.IIconRegister; @@ -19,6 +13,12 @@ import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; import net.minecraft.world.World; +import com.cricketcraft.chisel.api.ICarvable; +import com.cricketcraft.chisel.carving.CarvableHelper; +import com.cricketcraft.chisel.carving.CarvableVariation; +import com.cricketcraft.chisel.client.render.BlockMarbleStairsRenderer; +import com.cricketcraft.chisel.init.ModTabs; + public class BlockMarbleStairs extends BlockStairs implements ICarvable { CarvableHelper carverHelper; diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockMarbleStairsMaker.java b/src/main/java/com/cricketcraft/chisel/block/BlockMarbleStairsMaker.java index aa9884ec..b0353a4d 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockMarbleStairsMaker.java +++ b/src/main/java/com/cricketcraft/chisel/block/BlockMarbleStairsMaker.java @@ -1,12 +1,13 @@ package com.cricketcraft.chisel.block; +import net.minecraft.block.Block; +import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.CraftingManager; + import com.cricketcraft.chisel.carving.CarvableHelper; import com.cricketcraft.chisel.carving.CarvableVariation; import com.cricketcraft.chisel.item.ItemCarvable; -import net.minecraft.block.Block; -import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.CraftingManager; import cpw.mods.fml.common.registry.GameRegistry; public class BlockMarbleStairsMaker diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockMarbleStairsMakerCreator.java b/src/main/java/com/cricketcraft/chisel/block/BlockMarbleStairsMakerCreator.java index ac07a891..5f336319 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockMarbleStairsMakerCreator.java +++ b/src/main/java/com/cricketcraft/chisel/block/BlockMarbleStairsMakerCreator.java @@ -1,9 +1,9 @@ package com.cricketcraft.chisel.block; -import com.cricketcraft.chisel.carving.CarvableHelper; - import net.minecraft.block.Block; +import com.cricketcraft.chisel.carving.CarvableHelper; + public interface BlockMarbleStairsMakerCreator { public BlockMarbleStairs create(Block block, int meta, CarvableHelper helper); diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockMarbleTexturedOre.java b/src/main/java/com/cricketcraft/chisel/block/BlockMarbleTexturedOre.java index 49bc1f14..e2cb75c0 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockMarbleTexturedOre.java +++ b/src/main/java/com/cricketcraft/chisel/block/BlockMarbleTexturedOre.java @@ -2,11 +2,6 @@ package com.cricketcraft.chisel.block; import java.util.List; -import com.cricketcraft.chisel.api.ICarvable; -import com.cricketcraft.chisel.carving.CarvableHelper; -import com.cricketcraft.chisel.carving.CarvableVariation; -import com.cricketcraft.chisel.init.ModTabs; - import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -14,6 +9,11 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.util.IIcon; +import com.cricketcraft.chisel.api.ICarvable; +import com.cricketcraft.chisel.carving.CarvableHelper; +import com.cricketcraft.chisel.carving.CarvableVariation; +import com.cricketcraft.chisel.init.ModTabs; + public class BlockMarbleTexturedOre extends BlockTexturedOre implements ICarvable { public CarvableHelper carverHelper; diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockMarbleWall.java b/src/main/java/com/cricketcraft/chisel/block/BlockMarbleWall.java index e8b2c6e7..56cc018a 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockMarbleWall.java +++ b/src/main/java/com/cricketcraft/chisel/block/BlockMarbleWall.java @@ -2,9 +2,6 @@ package com.cricketcraft.chisel.block; import java.util.List; -import com.cricketcraft.chisel.carving.CarvableHelper; -import com.cricketcraft.chisel.init.ModTabs; - import net.minecraft.block.Block; import net.minecraft.block.BlockWall; import net.minecraft.client.renderer.texture.IIconRegister; @@ -12,6 +9,9 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.util.IIcon; +import com.cricketcraft.chisel.carving.CarvableHelper; +import com.cricketcraft.chisel.init.ModTabs; + public class BlockMarbleWall extends BlockWall { CarvableHelper carverHelper; diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockPresent.java b/src/main/java/com/cricketcraft/chisel/block/BlockPresent.java index 7fea0b89..583ec06b 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockPresent.java +++ b/src/main/java/com/cricketcraft/chisel/block/BlockPresent.java @@ -4,14 +4,6 @@ import java.util.Calendar; import java.util.Iterator; import java.util.Random; -import com.cricketcraft.chisel.Chisel; -import com.cricketcraft.chisel.api.ICarvable; -import com.cricketcraft.chisel.block.tileentity.TileEntityPresent; -import com.cricketcraft.chisel.carving.CarvableHelper; -import com.cricketcraft.chisel.carving.CarvableVariation; -import com.cricketcraft.chisel.init.ModTabs; -import com.cricketcraft.chisel.inventory.InventoryLargePresent; - import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; @@ -32,6 +24,15 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; + +import com.cricketcraft.chisel.Chisel; +import com.cricketcraft.chisel.api.ICarvable; +import com.cricketcraft.chisel.block.tileentity.TileEntityPresent; +import com.cricketcraft.chisel.carving.CarvableHelper; +import com.cricketcraft.chisel.carving.CarvableVariation; +import com.cricketcraft.chisel.init.ModTabs; +import com.cricketcraft.chisel.inventory.InventoryLargePresent; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockRoadLine.java b/src/main/java/com/cricketcraft/chisel/block/BlockRoadLine.java index cc0a05e3..e25efbbd 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockRoadLine.java +++ b/src/main/java/com/cricketcraft/chisel/block/BlockRoadLine.java @@ -1,8 +1,5 @@ package com.cricketcraft.chisel.block; -import com.cricketcraft.chisel.client.render.BlockRoadLineRenderer; -import com.cricketcraft.chisel.init.ModTabs; - import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -11,6 +8,9 @@ import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.IIcon; import net.minecraft.world.World; +import com.cricketcraft.chisel.client.render.BlockRoadLineRenderer; +import com.cricketcraft.chisel.init.ModTabs; + public class BlockRoadLine extends Block { public IIcon aloneIcon; diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockSnakestone.java b/src/main/java/com/cricketcraft/chisel/block/BlockSnakestone.java index e9b07cd5..a7291698 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockSnakestone.java +++ b/src/main/java/com/cricketcraft/chisel/block/BlockSnakestone.java @@ -2,9 +2,6 @@ package com.cricketcraft.chisel.block; import java.util.List; -import com.cricketcraft.chisel.client.render.BlockSnakeStoneRenderer; -import com.cricketcraft.chisel.init.ModTabs; - import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -16,6 +13,9 @@ import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; import net.minecraft.world.World; +import com.cricketcraft.chisel.client.render.BlockSnakeStoneRenderer; +import com.cricketcraft.chisel.init.ModTabs; + public class BlockSnakestone extends Block { static final int SEC_HEAD = 0; diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockSnakestoneObsidian.java b/src/main/java/com/cricketcraft/chisel/block/BlockSnakestoneObsidian.java index db7038aa..b36001de 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockSnakestoneObsidian.java +++ b/src/main/java/com/cricketcraft/chisel/block/BlockSnakestoneObsidian.java @@ -3,12 +3,12 @@ package com.cricketcraft.chisel.block; import java.util.Random; -import com.cricketcraft.chisel.client.GeneralChiselClient; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.IIcon; import net.minecraft.world.World; +import com.cricketcraft.chisel.client.GeneralChiselClient; + public class BlockSnakestoneObsidian extends BlockSnakestone { public IIcon[] particles = new IIcon[8]; diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockTexturedOre.java b/src/main/java/com/cricketcraft/chisel/block/BlockTexturedOre.java index d8e7c7cc..390c9abb 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockTexturedOre.java +++ b/src/main/java/com/cricketcraft/chisel/block/BlockTexturedOre.java @@ -1,12 +1,12 @@ package com.cricketcraft.chisel.block; -import com.cricketcraft.chisel.client.render.BlockTexturedOreRenderer; - import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.IIcon; +import com.cricketcraft.chisel.client.render.BlockTexturedOreRenderer; + public class BlockTexturedOre extends Block { public int currentPass; diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockVoidstonePillar.java b/src/main/java/com/cricketcraft/chisel/block/BlockVoidstonePillar.java index 8dbf235c..7a56576a 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockVoidstonePillar.java +++ b/src/main/java/com/cricketcraft/chisel/block/BlockVoidstonePillar.java @@ -1,16 +1,16 @@ package com.cricketcraft.chisel.block; +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.util.IIcon; + import com.cricketcraft.chisel.Chisel; import com.cricketcraft.chisel.api.ICarvable; import com.cricketcraft.chisel.carving.CarvableHelper; import com.cricketcraft.chisel.carving.CarvableVariation; import com.cricketcraft.chisel.init.ModTabs; -import net.minecraft.block.Block; -import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.util.IIcon; - public class BlockVoidstonePillar extends Block implements ICarvable{ public static IIcon topBottom, pillarSide; diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockVoidstonePillar2.java b/src/main/java/com/cricketcraft/chisel/block/BlockVoidstonePillar2.java index c4a7c064..22da2ad9 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockVoidstonePillar2.java +++ b/src/main/java/com/cricketcraft/chisel/block/BlockVoidstonePillar2.java @@ -1,16 +1,16 @@ package com.cricketcraft.chisel.block; +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.util.IIcon; + import com.cricketcraft.chisel.Chisel; import com.cricketcraft.chisel.api.ICarvable; import com.cricketcraft.chisel.carving.CarvableHelper; import com.cricketcraft.chisel.carving.CarvableVariation; import com.cricketcraft.chisel.init.ModTabs; -import net.minecraft.block.Block; -import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.util.IIcon; - public class BlockVoidstonePillar2 extends Block implements ICarvable{ public static IIcon topBottom, pillarSide; diff --git a/src/main/java/com/cricketcraft/chisel/block/tileentity/TileEntityPresent.java b/src/main/java/com/cricketcraft/chisel/block/tileentity/TileEntityPresent.java index e61b03dc..34e52b7a 100644 --- a/src/main/java/com/cricketcraft/chisel/block/tileentity/TileEntityPresent.java +++ b/src/main/java/com/cricketcraft/chisel/block/tileentity/TileEntityPresent.java @@ -3,16 +3,16 @@ package com.cricketcraft.chisel.block.tileentity; import java.util.Iterator; import java.util.List; -import com.cricketcraft.chisel.block.BlockPresent; -import com.cricketcraft.chisel.inventory.ContainerPresent; -import com.cricketcraft.chisel.inventory.InventoryLargePresent; - import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.tileentity.TileEntityChest; import net.minecraft.util.AxisAlignedBB; +import com.cricketcraft.chisel.block.BlockPresent; +import com.cricketcraft.chisel.inventory.ContainerPresent; +import com.cricketcraft.chisel.inventory.InventoryLargePresent; + public class TileEntityPresent extends TileEntityChest { public TileEntityPresent() { diff --git a/src/main/java/com/cricketcraft/chisel/carving/CarvableHelper.java b/src/main/java/com/cricketcraft/chisel/carving/CarvableHelper.java index 2b0ca133..330a450c 100644 --- a/src/main/java/com/cricketcraft/chisel/carving/CarvableHelper.java +++ b/src/main/java/com/cricketcraft/chisel/carving/CarvableHelper.java @@ -1,14 +1,10 @@ package com.cricketcraft.chisel.carving; -import com.cricketcraft.chisel.Chisel; -import com.cricketcraft.chisel.Configurations; -import com.cricketcraft.chisel.block.BlockMarbleSlab; -import com.cricketcraft.chisel.carving.CarvableVariation.CarvableVariationCTM; -import com.cricketcraft.chisel.client.render.CTM; -import com.cricketcraft.chisel.client.render.TextureSubmap; -import com.cricketcraft.chisel.item.ItemCarvable; -import com.cricketcraft.chisel.utils.GeneralClient; -import cpw.mods.fml.common.registry.GameRegistry; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + import net.minecraft.block.Block; import net.minecraft.block.BlockPane; import net.minecraft.block.material.Material; @@ -18,10 +14,16 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; -import java.util.ArrayList; -import java.util.HashSet; -import java.util.List; -import java.util.Set; +import com.cricketcraft.chisel.Chisel; +import com.cricketcraft.chisel.Configurations; +import com.cricketcraft.chisel.block.BlockMarbleSlab; +import com.cricketcraft.chisel.carving.CarvableVariation.CarvableVariationCTM; +import com.cricketcraft.chisel.client.render.CTM; +import com.cricketcraft.chisel.client.render.TextureSubmap; +import com.cricketcraft.chisel.item.ItemCarvable; +import com.cricketcraft.chisel.utils.GeneralClient; + +import cpw.mods.fml.common.registry.GameRegistry; public class CarvableHelper { diff --git a/src/main/java/com/cricketcraft/chisel/carving/CarvableVariation.java b/src/main/java/com/cricketcraft/chisel/carving/CarvableVariation.java index ad535790..cb1918df 100644 --- a/src/main/java/com/cricketcraft/chisel/carving/CarvableVariation.java +++ b/src/main/java/com/cricketcraft/chisel/carving/CarvableVariation.java @@ -1,10 +1,10 @@ package com.cricketcraft.chisel.carving; -import com.cricketcraft.chisel.client.render.TextureSubmap; - import net.minecraft.block.Block; import net.minecraft.util.IIcon; +import com.cricketcraft.chisel.client.render.TextureSubmap; + public class CarvableVariation { public String blockName; diff --git a/src/main/java/com/cricketcraft/chisel/carving/Carving.java b/src/main/java/com/cricketcraft/chisel/carving/Carving.java index b7970d70..24d624aa 100644 --- a/src/main/java/com/cricketcraft/chisel/carving/Carving.java +++ b/src/main/java/com/cricketcraft/chisel/carving/Carving.java @@ -4,14 +4,14 @@ import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; -import com.cricketcraft.chisel.Chisel; - import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; +import com.cricketcraft.chisel.Chisel; + public class Carving { HashMap carvingGroupsByName = new HashMap(); diff --git a/src/main/java/com/cricketcraft/chisel/client/GeneralChiselClient.java b/src/main/java/com/cricketcraft/chisel/client/GeneralChiselClient.java index a79b7ba3..78505c33 100644 --- a/src/main/java/com/cricketcraft/chisel/client/GeneralChiselClient.java +++ b/src/main/java/com/cricketcraft/chisel/client/GeneralChiselClient.java @@ -1,5 +1,7 @@ package com.cricketcraft.chisel.client; +import java.util.Random; + import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.entity.EntityPlayerSP; @@ -9,8 +11,6 @@ import net.minecraft.client.particle.EntityLavaFX; import net.minecraft.entity.Entity; import net.minecraft.world.World; -import java.util.Random; - import com.cricketcraft.chisel.Configurations; import com.cricketcraft.chisel.block.BlockGrimstone; import com.cricketcraft.chisel.block.BlockHolystone; diff --git a/src/main/java/com/cricketcraft/chisel/client/gui/GuiChiselConfig.java b/src/main/java/com/cricketcraft/chisel/client/gui/GuiChiselConfig.java index 6fdfed01..f4cb4bf7 100644 --- a/src/main/java/com/cricketcraft/chisel/client/gui/GuiChiselConfig.java +++ b/src/main/java/com/cricketcraft/chisel/client/gui/GuiChiselConfig.java @@ -1,11 +1,12 @@ package com.cricketcraft.chisel.client.gui; -import com.cricketcraft.chisel.Chisel; -import com.cricketcraft.chisel.Configurations; - import net.minecraft.client.gui.GuiScreen; import net.minecraftforge.common.config.ConfigElement; import net.minecraftforge.common.config.Configuration; + +import com.cricketcraft.chisel.Chisel; +import com.cricketcraft.chisel.Configurations; + import cpw.mods.fml.client.config.GuiConfig; public class GuiChiselConfig extends GuiConfig diff --git a/src/main/java/com/cricketcraft/chisel/client/render/BlockRoadLineRenderer.java b/src/main/java/com/cricketcraft/chisel/client/render/BlockRoadLineRenderer.java index d7242329..a9e6325d 100644 --- a/src/main/java/com/cricketcraft/chisel/client/render/BlockRoadLineRenderer.java +++ b/src/main/java/com/cricketcraft/chisel/client/render/BlockRoadLineRenderer.java @@ -1,14 +1,15 @@ package com.cricketcraft.chisel.client.render; -import com.cricketcraft.chisel.block.BlockRoadLine; -import com.cricketcraft.chisel.utils.Drawing; - import net.minecraft.block.Block; import net.minecraft.client.renderer.EntityRenderer; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.Tessellator; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; + +import com.cricketcraft.chisel.block.BlockRoadLine; +import com.cricketcraft.chisel.utils.Drawing; + import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import cpw.mods.fml.client.registry.RenderingRegistry; diff --git a/src/main/java/com/cricketcraft/chisel/client/render/CTM.java b/src/main/java/com/cricketcraft/chisel/client/render/CTM.java index 4cd57e76..5625749b 100644 --- a/src/main/java/com/cricketcraft/chisel/client/render/CTM.java +++ b/src/main/java/com/cricketcraft/chisel/client/render/CTM.java @@ -1,10 +1,10 @@ package com.cricketcraft.chisel.client.render; -import com.cricketcraft.chisel.api.IFacade; - import net.minecraft.block.Block; import net.minecraft.world.IBlockAccess; +import com.cricketcraft.chisel.api.IFacade; + public class CTM { static int submaps[][] = { diff --git a/src/main/java/com/cricketcraft/chisel/compat/FMPIntegration.java b/src/main/java/com/cricketcraft/chisel/compat/FMPIntegration.java index ff7fbf40..4270044d 100644 --- a/src/main/java/com/cricketcraft/chisel/compat/FMPIntegration.java +++ b/src/main/java/com/cricketcraft/chisel/compat/FMPIntegration.java @@ -1,10 +1,11 @@ package com.cricketcraft.chisel.compat; +import net.minecraft.block.Block; +import net.minecraft.item.ItemStack; + import com.cricketcraft.chisel.compat.ModIntegration.IModIntegration; import com.cricketcraft.chisel.init.ModBlocks; -import net.minecraft.block.Block; -import net.minecraft.item.ItemStack; import cpw.mods.fml.common.event.FMLInterModComms; public class FMPIntegration implements IModIntegration{ diff --git a/src/main/java/com/cricketcraft/chisel/compat/MarbleCompatibility.java b/src/main/java/com/cricketcraft/chisel/compat/MarbleCompatibility.java index 39d475a4..780fdf76 100644 --- a/src/main/java/com/cricketcraft/chisel/compat/MarbleCompatibility.java +++ b/src/main/java/com/cricketcraft/chisel/compat/MarbleCompatibility.java @@ -1,8 +1,9 @@ package com.cricketcraft.chisel.compat; +import net.minecraft.block.Block; + import com.cricketcraft.chisel.carving.Carving; -import net.minecraft.block.Block; import cpw.mods.fml.common.event.FMLPostInitializationEvent; public class MarbleCompatibility diff --git a/src/main/java/com/cricketcraft/chisel/entity/EntityBallOMoss.java b/src/main/java/com/cricketcraft/chisel/entity/EntityBallOMoss.java index 88d2f59f..f5e67d9a 100644 --- a/src/main/java/com/cricketcraft/chisel/entity/EntityBallOMoss.java +++ b/src/main/java/com/cricketcraft/chisel/entity/EntityBallOMoss.java @@ -1,10 +1,5 @@ package com.cricketcraft.chisel.entity; -import com.cricketcraft.chisel.Chisel; -import com.cricketcraft.chisel.client.GeneralChiselClient; -import com.cricketcraft.chisel.init.ModBlocks; -import com.cricketcraft.chisel.utils.General; - import net.minecraft.block.Block; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.projectile.EntityThrowable; @@ -12,6 +7,11 @@ import net.minecraft.init.Blocks; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; +import com.cricketcraft.chisel.Chisel; +import com.cricketcraft.chisel.client.GeneralChiselClient; +import com.cricketcraft.chisel.init.ModBlocks; +import com.cricketcraft.chisel.utils.General; + public class EntityBallOMoss extends EntityThrowable { diff --git a/src/main/java/com/cricketcraft/chisel/entity/EntityCloudInABottle.java b/src/main/java/com/cricketcraft/chisel/entity/EntityCloudInABottle.java index a80966fb..2ca6823f 100644 --- a/src/main/java/com/cricketcraft/chisel/entity/EntityCloudInABottle.java +++ b/src/main/java/com/cricketcraft/chisel/entity/EntityCloudInABottle.java @@ -2,13 +2,13 @@ package com.cricketcraft.chisel.entity; import java.util.Random; -import com.cricketcraft.chisel.init.ModBlocks; - import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.projectile.EntityThrowable; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; +import com.cricketcraft.chisel.init.ModBlocks; + public class EntityCloudInABottle extends EntityThrowable { Random rand = new Random(); diff --git a/src/main/java/com/cricketcraft/chisel/entity/EntitySmashingRock.java b/src/main/java/com/cricketcraft/chisel/entity/EntitySmashingRock.java index 71510ff7..6c9ec204 100644 --- a/src/main/java/com/cricketcraft/chisel/entity/EntitySmashingRock.java +++ b/src/main/java/com/cricketcraft/chisel/entity/EntitySmashingRock.java @@ -1,7 +1,5 @@ package com.cricketcraft.chisel.entity; -import com.cricketcraft.chisel.utils.General; - import net.minecraft.block.Block; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.projectile.EntityThrowable; @@ -9,6 +7,8 @@ import net.minecraft.init.Blocks; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; +import com.cricketcraft.chisel.utils.General; + public class EntitySmashingRock extends EntityThrowable { diff --git a/src/main/java/com/cricketcraft/chisel/entity/fx/EntityGrimstoneFX.java b/src/main/java/com/cricketcraft/chisel/entity/fx/EntityGrimstoneFX.java index f487fb99..b00b1619 100644 --- a/src/main/java/com/cricketcraft/chisel/entity/fx/EntityGrimstoneFX.java +++ b/src/main/java/com/cricketcraft/chisel/entity/fx/EntityGrimstoneFX.java @@ -1,12 +1,12 @@ package com.cricketcraft.chisel.entity.fx; -import com.cricketcraft.chisel.block.BlockGrimstone; -import com.cricketcraft.chisel.utils.General; - import net.minecraft.client.particle.EntityFX; import net.minecraft.client.renderer.Tessellator; import net.minecraft.world.World; +import com.cricketcraft.chisel.block.BlockGrimstone; +import com.cricketcraft.chisel.utils.General; + public class EntityGrimstoneFX extends EntityFX { float initialScale; diff --git a/src/main/java/com/cricketcraft/chisel/entity/fx/EntityHolystoneFX.java b/src/main/java/com/cricketcraft/chisel/entity/fx/EntityHolystoneFX.java index 289e1d50..2344f67f 100644 --- a/src/main/java/com/cricketcraft/chisel/entity/fx/EntityHolystoneFX.java +++ b/src/main/java/com/cricketcraft/chisel/entity/fx/EntityHolystoneFX.java @@ -1,12 +1,12 @@ package com.cricketcraft.chisel.entity.fx; -import com.cricketcraft.chisel.block.BlockHolystone; -import com.cricketcraft.chisel.utils.General; - import net.minecraft.client.particle.EntityFX; import net.minecraft.client.renderer.Tessellator; import net.minecraft.world.World; +import com.cricketcraft.chisel.block.BlockHolystone; +import com.cricketcraft.chisel.utils.General; + public class EntityHolystoneFX extends EntityFX { float initialScale; diff --git a/src/main/java/com/cricketcraft/chisel/init/ModBlocks.java b/src/main/java/com/cricketcraft/chisel/init/ModBlocks.java index c987a637..9ebe7d98 100644 --- a/src/main/java/com/cricketcraft/chisel/init/ModBlocks.java +++ b/src/main/java/com/cricketcraft/chisel/init/ModBlocks.java @@ -1,8 +1,49 @@ package com.cricketcraft.chisel.init; +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; +import net.minecraft.init.Blocks; +import net.minecraft.item.ItemStack; +import net.minecraft.util.StatCollector; +import net.minecraftforge.oredict.OreDictionary; + import com.cricketcraft.chisel.Chisel; import com.cricketcraft.chisel.Configurations; -import com.cricketcraft.chisel.block.*; +import com.cricketcraft.chisel.block.BlockAutoChisel; +import com.cricketcraft.chisel.block.BlockBeaconBase; +import com.cricketcraft.chisel.block.BlockCarvable; +import com.cricketcraft.chisel.block.BlockCarvableGlass; +import com.cricketcraft.chisel.block.BlockCarvablePane; +import com.cricketcraft.chisel.block.BlockCarvablePowered; +import com.cricketcraft.chisel.block.BlockCarvablePumpkin; +import com.cricketcraft.chisel.block.BlockCarvableTorch; +import com.cricketcraft.chisel.block.BlockCloud; +import com.cricketcraft.chisel.block.BlockConcrete; +import com.cricketcraft.chisel.block.BlockEldritch; +import com.cricketcraft.chisel.block.BlockGrimstone; +import com.cricketcraft.chisel.block.BlockHolystone; +import com.cricketcraft.chisel.block.BlockLavastone; +import com.cricketcraft.chisel.block.BlockLeaf; +import com.cricketcraft.chisel.block.BlockLightstoneCarvable; +import com.cricketcraft.chisel.block.BlockMarbleBookshelf; +import com.cricketcraft.chisel.block.BlockMarbleCarpet; +import com.cricketcraft.chisel.block.BlockMarbleIce; +import com.cricketcraft.chisel.block.BlockMarbleIceStairs; +import com.cricketcraft.chisel.block.BlockMarblePillar; +import com.cricketcraft.chisel.block.BlockMarbleSlab; +import com.cricketcraft.chisel.block.BlockMarbleStairs; +import com.cricketcraft.chisel.block.BlockMarbleStairsMaker; +import com.cricketcraft.chisel.block.BlockMarbleStairsMakerCreator; +import com.cricketcraft.chisel.block.BlockMarbleWall; +import com.cricketcraft.chisel.block.BlockPresent; +import com.cricketcraft.chisel.block.BlockRoadLine; +import com.cricketcraft.chisel.block.BlockSnakestone; +import com.cricketcraft.chisel.block.BlockSnakestoneObsidian; +import com.cricketcraft.chisel.block.BlockVoidstone; +import com.cricketcraft.chisel.block.BlockVoidstonePillar; +import com.cricketcraft.chisel.block.BlockVoidstonePillar2; +import com.cricketcraft.chisel.block.BlockWaterstone; +import com.cricketcraft.chisel.block.ItemBlockAutoChisel; import com.cricketcraft.chisel.carving.CarvableHelper; import com.cricketcraft.chisel.carving.CarvableVariation; import com.cricketcraft.chisel.carving.Carving; @@ -10,12 +51,6 @@ import com.cricketcraft.chisel.item.ItemCarvable; import com.cricketcraft.chisel.item.ItemMarbleSlab; import cpw.mods.fml.common.registry.GameRegistry; -import net.minecraft.block.Block; -import net.minecraft.block.material.Material; -import net.minecraft.init.Blocks; -import net.minecraft.item.ItemStack; -import net.minecraft.util.StatCollector; -import net.minecraftforge.oredict.OreDictionary; public class ModBlocks { public static BlockCarvable marble; diff --git a/src/main/java/com/cricketcraft/chisel/inventory/ContainerAutoChisel.java b/src/main/java/com/cricketcraft/chisel/inventory/ContainerAutoChisel.java index 417570ea..c2851419 100644 --- a/src/main/java/com/cricketcraft/chisel/inventory/ContainerAutoChisel.java +++ b/src/main/java/com/cricketcraft/chisel/inventory/ContainerAutoChisel.java @@ -1,13 +1,13 @@ package com.cricketcraft.chisel.inventory; -import com.cricketcraft.chisel.block.tileentity.TileEntityAutoChisel; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import com.cricketcraft.chisel.block.tileentity.TileEntityAutoChisel; + public class ContainerAutoChisel extends Container { public static TileEntityAutoChisel autoChisel; diff --git a/src/main/java/com/cricketcraft/chisel/inventory/ContainerChisel.java b/src/main/java/com/cricketcraft/chisel/inventory/ContainerChisel.java index f2492556..e3a272ba 100644 --- a/src/main/java/com/cricketcraft/chisel/inventory/ContainerChisel.java +++ b/src/main/java/com/cricketcraft/chisel/inventory/ContainerChisel.java @@ -1,9 +1,5 @@ package com.cricketcraft.chisel.inventory; -import com.cricketcraft.chisel.carving.Carving; -import com.cricketcraft.chisel.item.ItemChisel; -import com.cricketcraft.chisel.utils.General; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; @@ -12,6 +8,10 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import com.cricketcraft.chisel.carving.Carving; +import com.cricketcraft.chisel.item.ItemChisel; +import com.cricketcraft.chisel.utils.General; + public class ContainerChisel extends Container { public final InventoryChiselSelection inventory; diff --git a/src/main/java/com/cricketcraft/chisel/inventory/InventoryChiselSelection.java b/src/main/java/com/cricketcraft/chisel/inventory/InventoryChiselSelection.java index 76727bfc..1494c397 100644 --- a/src/main/java/com/cricketcraft/chisel/inventory/InventoryChiselSelection.java +++ b/src/main/java/com/cricketcraft/chisel/inventory/InventoryChiselSelection.java @@ -2,14 +2,14 @@ package com.cricketcraft.chisel.inventory; import java.util.ArrayList; -import com.cricketcraft.chisel.item.ItemChisel; - import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import com.cricketcraft.chisel.item.ItemChisel; + public class InventoryChiselSelection implements IInventory { ItemStack chisel = null; diff --git a/src/main/java/com/cricketcraft/chisel/inventory/SlotChiselSelection.java b/src/main/java/com/cricketcraft/chisel/inventory/SlotChiselSelection.java index 509ac6d7..a9775794 100644 --- a/src/main/java/com/cricketcraft/chisel/inventory/SlotChiselSelection.java +++ b/src/main/java/com/cricketcraft/chisel/inventory/SlotChiselSelection.java @@ -1,12 +1,12 @@ package com.cricketcraft.chisel.inventory; -import com.cricketcraft.chisel.utils.General; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import com.cricketcraft.chisel.utils.General; + public class SlotChiselSelection extends Slot { public SlotChiselSelection(ContainerChisel container, InventoryChiselSelection inv, IInventory iinventory, int i, int j, int k) diff --git a/src/main/java/com/cricketcraft/chisel/item/ItemBallOMoss.java b/src/main/java/com/cricketcraft/chisel/item/ItemBallOMoss.java index e531e47e..75c07b96 100644 --- a/src/main/java/com/cricketcraft/chisel/item/ItemBallOMoss.java +++ b/src/main/java/com/cricketcraft/chisel/item/ItemBallOMoss.java @@ -1,15 +1,11 @@ package com.cricketcraft.chisel.item; -import java.util.List; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; import com.cricketcraft.chisel.entity.EntityBallOMoss; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.StatCollector; -import net.minecraft.world.World; - public class ItemBallOMoss extends BaseItem { diff --git a/src/main/java/com/cricketcraft/chisel/item/ItemCarvable.java b/src/main/java/com/cricketcraft/chisel/item/ItemCarvable.java index de14630e..3a79cb55 100644 --- a/src/main/java/com/cricketcraft/chisel/item/ItemCarvable.java +++ b/src/main/java/com/cricketcraft/chisel/item/ItemCarvable.java @@ -2,11 +2,6 @@ package com.cricketcraft.chisel.item; import java.util.List; -import com.cricketcraft.chisel.Configurations; -import com.cricketcraft.chisel.api.ICarvable; -import com.cricketcraft.chisel.carving.CarvableVariation; -import com.cricketcraft.chisel.utils.General; - import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -14,6 +9,11 @@ import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; +import com.cricketcraft.chisel.Configurations; +import com.cricketcraft.chisel.api.ICarvable; +import com.cricketcraft.chisel.carving.CarvableVariation; +import com.cricketcraft.chisel.utils.General; + public class ItemCarvable extends ItemBlock { diff --git a/src/main/java/com/cricketcraft/chisel/item/ItemCloudInABottle.java b/src/main/java/com/cricketcraft/chisel/item/ItemCloudInABottle.java index ca0d3533..76f13860 100644 --- a/src/main/java/com/cricketcraft/chisel/item/ItemCloudInABottle.java +++ b/src/main/java/com/cricketcraft/chisel/item/ItemCloudInABottle.java @@ -1,15 +1,11 @@ package com.cricketcraft.chisel.item; -import java.util.List; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; import com.cricketcraft.chisel.entity.EntityCloudInABottle; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.StatCollector; -import net.minecraft.world.World; - public class ItemCloudInABottle extends BaseItem { diff --git a/src/main/java/com/cricketcraft/chisel/item/ItemMarbleSlab.java b/src/main/java/com/cricketcraft/chisel/item/ItemMarbleSlab.java index 7e6507f4..a30374ae 100644 --- a/src/main/java/com/cricketcraft/chisel/item/ItemMarbleSlab.java +++ b/src/main/java/com/cricketcraft/chisel/item/ItemMarbleSlab.java @@ -1,13 +1,13 @@ package com.cricketcraft.chisel.item; -import com.cricketcraft.chisel.block.BlockMarbleSlab; - import net.minecraft.block.Block; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.world.World; +import com.cricketcraft.chisel.block.BlockMarbleSlab; + public class ItemMarbleSlab extends ItemCarvable { diff --git a/src/main/java/com/cricketcraft/chisel/item/ItemSmashingRock.java b/src/main/java/com/cricketcraft/chisel/item/ItemSmashingRock.java index bca3a686..7a496d39 100644 --- a/src/main/java/com/cricketcraft/chisel/item/ItemSmashingRock.java +++ b/src/main/java/com/cricketcraft/chisel/item/ItemSmashingRock.java @@ -1,15 +1,11 @@ package com.cricketcraft.chisel.item; -import java.util.List; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; import com.cricketcraft.chisel.entity.EntitySmashingRock; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.StatCollector; -import net.minecraft.world.World; - public class ItemSmashingRock extends BaseItem { diff --git a/src/main/java/com/cricketcraft/chisel/item/ItemUpgrade.java b/src/main/java/com/cricketcraft/chisel/item/ItemUpgrade.java index f892630e..7c33cc92 100644 --- a/src/main/java/com/cricketcraft/chisel/item/ItemUpgrade.java +++ b/src/main/java/com/cricketcraft/chisel/item/ItemUpgrade.java @@ -2,9 +2,6 @@ package com.cricketcraft.chisel.item; import java.util.List; -import com.cricketcraft.chisel.Chisel; -import com.cricketcraft.chisel.block.tileentity.TileEntityAutoChisel; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; @@ -12,9 +9,11 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; -import net.minecraft.util.StatCollector; import net.minecraft.world.World; +import com.cricketcraft.chisel.Chisel; +import com.cricketcraft.chisel.block.tileentity.TileEntityAutoChisel; + public class ItemUpgrade extends BaseItem{ public IIcon[] icons = new IIcon[6];