From e78364be0406a87e3266e42e9dce0642334977f7 Mon Sep 17 00:00:00 2001 From: Arona Jones Date: Sun, 14 Dec 2014 20:05:39 +0000 Subject: [PATCH] Import Optimization again --- .../minecraft/chisel/BlockNameConversion.java | 9 ++-- .../info/jbcs/minecraft/chisel/Chisel.java | 41 +++++++++++-------- .../minecraft/chisel/ChiselLeftClick.java | 11 ++--- .../info/jbcs/minecraft/chisel/Crafting.java | 2 +- .../info/jbcs/minecraft/chisel/Waila.java | 5 ++- .../chisel/block/BlockAutoChisel.java | 11 ++--- .../minecraft/chisel/block/BlockCarvable.java | 9 ++-- .../chisel/block/BlockCarvableGlass.java | 9 ++-- .../chisel/block/BlockCarvablePane.java | 9 ++-- .../chisel/block/BlockCarvablePumpkin.java | 4 +- .../minecraft/chisel/block/BlockCloud.java | 5 ++- .../minecraft/chisel/block/BlockConcrete.java | 4 +- .../chisel/block/BlockGrimstone.java | 5 ++- .../chisel/block/BlockHolystone.java | 5 ++- .../chisel/block/BlockLavastone.java | 5 ++- .../chisel/block/BlockLightstoneCarvable.java | 4 +- .../chisel/block/BlockMarbleBookshelf.java | 8 ++-- .../chisel/block/BlockMarbleCarpet.java | 5 ++- .../chisel/block/BlockMarbleIce.java | 5 ++- .../chisel/block/BlockMarbleIceStairs.java | 5 ++- .../chisel/block/BlockMarbleLamp.java | 4 +- .../chisel/block/BlockMarbleSlab.java | 10 ++--- .../chisel/block/BlockMarbleStairs.java | 5 ++- .../chisel/block/BlockMarbleStairsMaker.java | 2 +- .../chisel/block/BlockMarbleTexturedOre.java | 5 ++- .../chisel/block/BlockMarbleWall.java | 5 ++- .../minecraft/chisel/block/BlockPresent.java | 13 +++--- .../chisel/block/BlockSnakestone.java | 5 ++- .../chisel/block/BlockSnakestoneObsidian.java | 5 ++- .../minecraft/chisel/block/BlockSpikes.java | 4 +- .../chisel/block/BlockVoidstone.java | 5 ++- .../chisel/block/ItemBlockAutoChisel.java | 4 +- .../tileentity/TileEntityAutoChisel.java | 4 +- .../block/tileentity/TileEntityPresent.java | 7 ++-- .../chisel/carving/CarvableHelper.java | 13 +++--- .../minecraft/chisel/carving/Carving.java | 9 ++-- .../chisel/client/GeneralChiselClient.java | 17 ++++++-- .../chisel/client/gui/GuiAutoChisel.java | 1 + .../chisel/client/gui/GuiChisel.java | 1 + .../chisel/client/gui/GuiChiselConfig.java | 2 +- .../chisel/client/gui/GuiElement.java | 4 +- .../chisel/client/gui/GuiFactory.java | 6 +-- .../chisel/client/gui/GuiPresent.java | 1 + .../chisel/client/gui/GuiScreenPlus.java | 1 + .../chisel/client/gui/GuilScrolledBox.java | 1 + .../chisel/client/gui/Scrollbar.java | 1 + .../render/BlockAdvancedMarbleRenderer.java | 6 ++- .../client/render/BlockCarpetRenderer.java | 2 +- .../client/render/BlockEldritchRenderer.java | 6 ++- .../render/BlockMarblePaneRenderer.java | 6 ++- .../render/BlockMarblePillarRenderer.java | 6 ++- .../render/BlockMarbleStairsRenderer.java | 6 ++- .../client/render/BlockNoCTMRenderer.java | 6 ++- .../client/render/BlockRoadLineRenderer.java | 4 +- .../render/BlockSnakeStoneRenderer.java | 6 ++- .../client/render/BlockSpikesRenderer.java | 9 ++-- .../render/BlockTexturedOreRenderer.java | 6 ++- .../chisel/client/render/TextureSubmap.java | 2 +- .../chisel/client/render/TextureVirtual.java | 2 +- .../render/item/ItemAutoChiselRenderer.java | 4 +- .../render/item/ItemChiselRenderer.java | 1 + .../render/item/ItemPresentRenderer.java | 4 +- .../client/render/tile/RenderAutoChisel.java | 11 +++-- .../client/render/tile/RenderPresent.java | 4 +- .../chisel/compat/Compatibility.java | 2 +- .../chisel/compat/FMPIntegration.java | 2 +- .../chisel/compat/MarbleCompatibility.java | 2 +- .../chisel/compat/ModIntegration.java | 4 +- .../chisel/entity/EntityCloudInABottle.java | 5 ++- .../chisel/entity/fx/EntityBallOMossFX.java | 6 ++- .../entity/fx/EntitySnakestoneObsidianFX.java | 1 + .../jbcs/minecraft/chisel/init/ModBlocks.java | 36 +++++++++++++++- .../jbcs/minecraft/chisel/init/ModItems.java | 10 +++-- .../inventory/InventoryChiselSelection.java | 5 ++- .../minecraft/chisel/item/ItemCarvable.java | 5 ++- .../minecraft/chisel/item/ItemChisel.java | 7 ++-- .../minecraft/chisel/item/ItemUpgrade.java | 5 ++- .../minecraft/chisel/proxy/ClientProxy.java | 16 ++++++-- .../minecraft/chisel/proxy/CommonProxy.java | 2 +- .../utils/BlockTexturedOreRenderer.java | 6 ++- .../jbcs/minecraft/chisel/utils/General.java | 4 +- .../minecraft/chisel/utils/GeneralClient.java | 6 +-- .../minecraft/chisel/utils/GuiHandler.java | 10 ++--- .../chisel/world/GeneratorLimestone.java | 6 +-- .../chisel/world/GeneratorMarble.java | 6 +-- 85 files changed, 331 insertions(+), 202 deletions(-) diff --git a/src/main/java/info/jbcs/minecraft/chisel/BlockNameConversion.java b/src/main/java/info/jbcs/minecraft/chisel/BlockNameConversion.java index 9ec0d908..d3bacc48 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/BlockNameConversion.java +++ b/src/main/java/info/jbcs/minecraft/chisel/BlockNameConversion.java @@ -1,13 +1,14 @@ package info.jbcs.minecraft.chisel; -import cpw.mods.fml.common.FMLLog; -import cpw.mods.fml.common.registry.GameRegistry; import info.jbcs.minecraft.chisel.utils.General; -import net.minecraft.block.Block; -import net.minecraft.item.Item; import java.util.HashMap; +import net.minecraft.block.Block; +import net.minecraft.item.Item; +import cpw.mods.fml.common.FMLLog; +import cpw.mods.fml.common.registry.GameRegistry; + public class BlockNameConversion { static final private HashMap namingConversion = new HashMap(); diff --git a/src/main/java/info/jbcs/minecraft/chisel/Chisel.java b/src/main/java/info/jbcs/minecraft/chisel/Chisel.java index 86e80402..9c79d11d 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/Chisel.java +++ b/src/main/java/info/jbcs/minecraft/chisel/Chisel.java @@ -1,21 +1,5 @@ package info.jbcs.minecraft.chisel; -import cpw.mods.fml.client.event.ConfigChangedEvent; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.FMLLog; -import cpw.mods.fml.common.Mod; -import cpw.mods.fml.common.Mod.EventHandler; -import cpw.mods.fml.common.Mod.Instance; -import cpw.mods.fml.common.SidedProxy; -import cpw.mods.fml.common.event.*; -import cpw.mods.fml.common.event.FMLMissingMappingsEvent.MissingMapping; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.common.network.IGuiHandler; -import cpw.mods.fml.common.network.NetworkRegistry; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.common.registry.GameRegistry.Type; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import info.jbcs.minecraft.chisel.block.BlockCarvable; import info.jbcs.minecraft.chisel.block.tileentity.TileEntityAutoChisel; import info.jbcs.minecraft.chisel.block.tileentity.TileEntityPresent; @@ -36,6 +20,9 @@ import info.jbcs.minecraft.chisel.proxy.CommonProxy; import info.jbcs.minecraft.chisel.utils.General; import info.jbcs.minecraft.chisel.world.GeneratorLimestone; import info.jbcs.minecraft.chisel.world.GeneratorMarble; + +import java.io.File; + import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -43,8 +30,26 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.config.Configuration; - -import java.io.File; +import cpw.mods.fml.client.event.ConfigChangedEvent; +import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.common.FMLLog; +import cpw.mods.fml.common.Mod; +import cpw.mods.fml.common.Mod.EventHandler; +import cpw.mods.fml.common.Mod.Instance; +import cpw.mods.fml.common.SidedProxy; +import cpw.mods.fml.common.event.FMLInitializationEvent; +import cpw.mods.fml.common.event.FMLInterModComms; +import cpw.mods.fml.common.event.FMLMissingMappingsEvent; +import cpw.mods.fml.common.event.FMLMissingMappingsEvent.MissingMapping; +import cpw.mods.fml.common.event.FMLPostInitializationEvent; +import cpw.mods.fml.common.event.FMLPreInitializationEvent; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import cpw.mods.fml.common.network.IGuiHandler; +import cpw.mods.fml.common.network.NetworkRegistry; +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.common.registry.GameRegistry.Type; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; @Mod(modid = Chisel.MOD_ID, name = Chisel.MOD_NAME, version = Chisel.VERSION, guiFactory = "info.jbcs.minecraft.chisel.client.gui.GuiFactory", dependencies = "after:ForgeMultipart;") diff --git a/src/main/java/info/jbcs/minecraft/chisel/ChiselLeftClick.java b/src/main/java/info/jbcs/minecraft/chisel/ChiselLeftClick.java index 21583c17..4d8b442f 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/ChiselLeftClick.java +++ b/src/main/java/info/jbcs/minecraft/chisel/ChiselLeftClick.java @@ -1,13 +1,15 @@ package info.jbcs.minecraft.chisel; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; import info.jbcs.minecraft.chisel.api.ChiselMode; import info.jbcs.minecraft.chisel.carving.CarvingVariation; import info.jbcs.minecraft.chisel.client.GeneralChiselClient; import info.jbcs.minecraft.chisel.init.ModBlocks; import info.jbcs.minecraft.chisel.init.ModItems; import info.jbcs.minecraft.chisel.item.ItemChisel; + +import java.util.HashMap; +import java.util.Random; + import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; @@ -17,9 +19,8 @@ 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 java.util.HashMap; -import java.util.Random; +import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; public class ChiselLeftClick { diff --git a/src/main/java/info/jbcs/minecraft/chisel/Crafting.java b/src/main/java/info/jbcs/minecraft/chisel/Crafting.java index d6584538..b2bd25c4 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/Crafting.java +++ b/src/main/java/info/jbcs/minecraft/chisel/Crafting.java @@ -1,6 +1,5 @@ package info.jbcs.minecraft.chisel; -import cpw.mods.fml.common.registry.GameRegistry; import info.jbcs.minecraft.chisel.init.ModBlocks; import info.jbcs.minecraft.chisel.init.ModItems; import net.minecraft.block.Block; @@ -11,6 +10,7 @@ import net.minecraft.item.crafting.FurnaceRecipes; import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.oredict.ShapedOreRecipe; import net.minecraftforge.oredict.ShapelessOreRecipe; +import cpw.mods.fml.common.registry.GameRegistry; public class Crafting { diff --git a/src/main/java/info/jbcs/minecraft/chisel/Waila.java b/src/main/java/info/jbcs/minecraft/chisel/Waila.java index 38cf3ddc..caed69eb 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/Waila.java +++ b/src/main/java/info/jbcs/minecraft/chisel/Waila.java @@ -1,14 +1,15 @@ package info.jbcs.minecraft.chisel; import info.jbcs.minecraft.chisel.block.BlockCarvable; + +import java.util.List; + 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 java.util.List; - public class Waila implements IWailaDataProvider { diff --git a/src/main/java/info/jbcs/minecraft/chisel/block/BlockAutoChisel.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockAutoChisel.java index a2ebe534..8899a5aa 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/block/BlockAutoChisel.java +++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockAutoChisel.java @@ -1,11 +1,13 @@ package info.jbcs.minecraft.chisel.block; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import info.jbcs.minecraft.chisel.Chisel; import info.jbcs.minecraft.chisel.block.tileentity.TileEntityAutoChisel; import info.jbcs.minecraft.chisel.init.ModBlocks; import info.jbcs.minecraft.chisel.init.ModItems; + +import java.util.List; +import java.util.Random; + import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; @@ -17,9 +19,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; - -import java.util.List; -import java.util.Random; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class BlockAutoChisel extends BlockContainer{ public BlockAutoChisel() { diff --git a/src/main/java/info/jbcs/minecraft/chisel/block/BlockCarvable.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockCarvable.java index a865fff0..30d565f3 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/block/BlockCarvable.java +++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockCarvable.java @@ -1,12 +1,13 @@ package info.jbcs.minecraft.chisel.block; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import info.jbcs.minecraft.chisel.Chisel; import info.jbcs.minecraft.chisel.api.ICarvable; import info.jbcs.minecraft.chisel.carving.CarvableHelper; import info.jbcs.minecraft.chisel.carving.CarvableVariation; import info.jbcs.minecraft.chisel.init.ModTabs; + +import java.util.List; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -14,8 +15,8 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; - -import java.util.List; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class BlockCarvable extends Block implements ICarvable { public CarvableHelper carverHelper; diff --git a/src/main/java/info/jbcs/minecraft/chisel/block/BlockCarvableGlass.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockCarvableGlass.java index b95c3a3f..489fa921 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/block/BlockCarvableGlass.java +++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockCarvableGlass.java @@ -1,20 +1,21 @@ package info.jbcs.minecraft.chisel.block; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import info.jbcs.minecraft.chisel.Chisel; import info.jbcs.minecraft.chisel.api.ICarvable; import info.jbcs.minecraft.chisel.carving.CarvableHelper; import info.jbcs.minecraft.chisel.carving.CarvableVariation; import info.jbcs.minecraft.chisel.init.ModTabs; + +import java.util.List; + 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 java.util.List; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class BlockCarvableGlass extends BlockGlass implements ICarvable { diff --git a/src/main/java/info/jbcs/minecraft/chisel/block/BlockCarvablePane.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockCarvablePane.java index 46279f63..2aa8627d 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/block/BlockCarvablePane.java +++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockCarvablePane.java @@ -1,20 +1,21 @@ package info.jbcs.minecraft.chisel.block; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import info.jbcs.minecraft.chisel.api.ICarvable; import info.jbcs.minecraft.chisel.carving.CarvableHelper; import info.jbcs.minecraft.chisel.carving.CarvableVariation; import info.jbcs.minecraft.chisel.client.render.BlockMarblePaneRenderer; import info.jbcs.minecraft.chisel.init.ModTabs; + +import java.util.List; + 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 java.util.List; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class BlockCarvablePane extends BlockPane implements ICarvable { diff --git a/src/main/java/info/jbcs/minecraft/chisel/block/BlockCarvablePumpkin.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockCarvablePumpkin.java index 40ff1f7f..301452c0 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/block/BlockCarvablePumpkin.java +++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockCarvablePumpkin.java @@ -1,13 +1,13 @@ package info.jbcs.minecraft.chisel.block; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import info.jbcs.minecraft.chisel.api.ICarvable; import info.jbcs.minecraft.chisel.carving.CarvableHelper; import info.jbcs.minecraft.chisel.carving.CarvableVariation; import net.minecraft.block.BlockPumpkin; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.IIcon; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class BlockCarvablePumpkin extends BlockPumpkin implements ICarvable{ public CarvableHelper carverHelper; diff --git a/src/main/java/info/jbcs/minecraft/chisel/block/BlockCloud.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockCloud.java index 131ce946..391b10ee 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/block/BlockCloud.java +++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockCloud.java @@ -2,6 +2,9 @@ package info.jbcs.minecraft.chisel.block; import info.jbcs.minecraft.chisel.Configurations; + +import java.util.Random; + import net.minecraft.block.material.Material; import net.minecraft.entity.Entity; import net.minecraft.item.Item; @@ -9,8 +12,6 @@ import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import java.util.Random; - public class BlockCloud extends BlockCarvable { public BlockCloud() { diff --git a/src/main/java/info/jbcs/minecraft/chisel/block/BlockConcrete.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockConcrete.java index 2369022f..8d5e6f65 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/block/BlockConcrete.java +++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockConcrete.java @@ -1,12 +1,12 @@ package info.jbcs.minecraft.chisel.block; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.relauncher.Side; import info.jbcs.minecraft.chisel.Configurations; import info.jbcs.minecraft.chisel.client.GeneralChiselClient; import net.minecraft.entity.Entity; import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.World; +import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.relauncher.Side; public class BlockConcrete extends BlockCarvable { diff --git a/src/main/java/info/jbcs/minecraft/chisel/block/BlockGrimstone.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockGrimstone.java index 90ff671f..30ce6540 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/block/BlockGrimstone.java +++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockGrimstone.java @@ -4,13 +4,14 @@ import info.jbcs.minecraft.chisel.Chisel; import info.jbcs.minecraft.chisel.client.GeneralChiselClient; import info.jbcs.minecraft.chisel.init.ModTabs; import info.jbcs.minecraft.chisel.utils.General; + +import java.util.Random; + import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.IIcon; import net.minecraft.world.World; -import java.util.Random; - public class BlockGrimstone extends BlockCarvable { public IIcon iconStar; diff --git a/src/main/java/info/jbcs/minecraft/chisel/block/BlockHolystone.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockHolystone.java index 03c78376..359a6e0c 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/block/BlockHolystone.java +++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockHolystone.java @@ -2,13 +2,14 @@ package info.jbcs.minecraft.chisel.block; import info.jbcs.minecraft.chisel.client.GeneralChiselClient; import info.jbcs.minecraft.chisel.utils.General; + +import java.util.Random; + import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.IIcon; import net.minecraft.world.World; -import java.util.Random; - public class BlockHolystone extends BlockCarvable { public IIcon iconStar; diff --git a/src/main/java/info/jbcs/minecraft/chisel/block/BlockLavastone.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockLavastone.java index 5ef96453..d5a74dca 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/block/BlockLavastone.java +++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockLavastone.java @@ -2,11 +2,12 @@ package info.jbcs.minecraft.chisel.block; import info.jbcs.minecraft.chisel.client.GeneralChiselClient; -import net.minecraft.block.material.Material; -import net.minecraft.world.World; import java.util.Random; +import net.minecraft.block.material.Material; +import net.minecraft.world.World; + public class BlockLavastone extends BlockMarbleTexturedOre { public BlockLavastone(Material mat, String baseIcon) diff --git a/src/main/java/info/jbcs/minecraft/chisel/block/BlockLightstoneCarvable.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockLightstoneCarvable.java index a20afd1f..2bd4af4f 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/block/BlockLightstoneCarvable.java +++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockLightstoneCarvable.java @@ -1,12 +1,12 @@ package info.jbcs.minecraft.chisel.block; +import java.util.Random; + import net.minecraft.block.material.Material; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.Item; -import java.util.Random; - public class BlockLightstoneCarvable extends BlockCarvable { public BlockLightstoneCarvable() { super(Material.glass); diff --git a/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleBookshelf.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleBookshelf.java index 4259faed..60faf177 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleBookshelf.java +++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleBookshelf.java @@ -1,15 +1,15 @@ package info.jbcs.minecraft.chisel.block; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import java.util.Random; + import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; - -import java.util.Random; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class BlockMarbleBookshelf extends BlockCarvable { diff --git a/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleCarpet.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleCarpet.java index 53af62b7..006a081c 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleCarpet.java +++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleCarpet.java @@ -5,6 +5,9 @@ import info.jbcs.minecraft.chisel.api.ICarvable; import info.jbcs.minecraft.chisel.carving.CarvableHelper; import info.jbcs.minecraft.chisel.carving.CarvableVariation; import info.jbcs.minecraft.chisel.init.ModTabs; + +import java.util.List; + import net.minecraft.block.BlockCarpet; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -13,8 +16,6 @@ import net.minecraft.item.Item; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; -import java.util.List; - public class BlockMarbleCarpet extends BlockCarpet implements ICarvable { public CarvableHelper carverHelper; diff --git a/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleIce.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleIce.java index 2d30e44f..ebad141a 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleIce.java +++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleIce.java @@ -4,6 +4,9 @@ import info.jbcs.minecraft.chisel.api.ICarvable; import info.jbcs.minecraft.chisel.carving.CarvableHelper; import info.jbcs.minecraft.chisel.carving.CarvableVariation; import info.jbcs.minecraft.chisel.init.ModTabs; + +import java.util.List; + import net.minecraft.block.Block; import net.minecraft.block.BlockIce; import net.minecraft.client.renderer.texture.IIconRegister; @@ -14,8 +17,6 @@ import net.minecraft.stats.StatList; import net.minecraft.util.IIcon; import net.minecraft.world.World; -import java.util.List; - public class BlockMarbleIce extends BlockIce implements ICarvable { public CarvableHelper carverHelper; diff --git a/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleIceStairs.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleIceStairs.java index fb64be98..e1b8262b 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleIceStairs.java +++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleIceStairs.java @@ -2,12 +2,13 @@ package info.jbcs.minecraft.chisel.block; import info.jbcs.minecraft.chisel.carving.CarvableHelper; import info.jbcs.minecraft.chisel.init.ModBlocks; + +import java.util.Random; + import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; -import java.util.Random; - public class BlockMarbleIceStairs extends BlockMarbleStairs { public BlockMarbleIceStairs(Block block, int meta, CarvableHelper helper) diff --git a/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleLamp.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleLamp.java index ec01dca4..335ef726 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleLamp.java +++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleLamp.java @@ -1,5 +1,7 @@ package info.jbcs.minecraft.chisel.block; +import java.util.Random; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.item.Item; @@ -7,8 +9,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; -import java.util.Random; - public class BlockMarbleLamp extends BlockCarvable { BlockMarbleLamp blockUnpowered; BlockMarbleLamp blockPowered; diff --git a/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleSlab.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleSlab.java index f19d8b98..e0df6d64 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleSlab.java +++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleSlab.java @@ -1,7 +1,8 @@ package info.jbcs.minecraft.chisel.block; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import java.util.List; +import java.util.Random; + import net.minecraft.block.Block; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; @@ -12,9 +13,8 @@ import net.minecraft.util.IIcon; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; - -import java.util.List; -import java.util.Random; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class BlockMarbleSlab extends BlockCarvable { diff --git a/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleStairs.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleStairs.java index 0b4d8b64..9e538780 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleStairs.java +++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleStairs.java @@ -5,6 +5,9 @@ import info.jbcs.minecraft.chisel.carving.CarvableHelper; import info.jbcs.minecraft.chisel.carving.CarvableVariation; import info.jbcs.minecraft.chisel.client.render.BlockMarbleStairsRenderer; import info.jbcs.minecraft.chisel.init.ModTabs; + +import java.util.List; + import net.minecraft.block.Block; import net.minecraft.block.BlockStairs; import net.minecraft.client.renderer.texture.IIconRegister; @@ -16,8 +19,6 @@ import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; import net.minecraft.world.World; -import java.util.List; - public class BlockMarbleStairs extends BlockStairs implements ICarvable { CarvableHelper carverHelper; diff --git a/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleStairsMaker.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleStairsMaker.java index c6c7c003..9a29b102 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleStairsMaker.java +++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleStairsMaker.java @@ -1,12 +1,12 @@ package info.jbcs.minecraft.chisel.block; -import cpw.mods.fml.common.registry.GameRegistry; import info.jbcs.minecraft.chisel.carving.CarvableHelper; import info.jbcs.minecraft.chisel.carving.CarvableVariation; import info.jbcs.minecraft.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/info/jbcs/minecraft/chisel/block/BlockMarbleTexturedOre.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleTexturedOre.java index 52d60935..b11d2d32 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleTexturedOre.java +++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleTexturedOre.java @@ -4,6 +4,9 @@ import info.jbcs.minecraft.chisel.api.ICarvable; import info.jbcs.minecraft.chisel.carving.CarvableHelper; import info.jbcs.minecraft.chisel.carving.CarvableVariation; import info.jbcs.minecraft.chisel.init.ModTabs; + +import java.util.List; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -11,8 +14,6 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.util.IIcon; -import java.util.List; - public class BlockMarbleTexturedOre extends BlockTexturedOre implements ICarvable { public CarvableHelper carverHelper; diff --git a/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleWall.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleWall.java index e1486615..67c0bf0b 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleWall.java +++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleWall.java @@ -2,6 +2,9 @@ package info.jbcs.minecraft.chisel.block; import info.jbcs.minecraft.chisel.carving.CarvableHelper; import info.jbcs.minecraft.chisel.init.ModTabs; + +import java.util.List; + import net.minecraft.block.Block; import net.minecraft.block.BlockWall; import net.minecraft.client.renderer.texture.IIconRegister; @@ -9,8 +12,6 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.util.IIcon; -import java.util.List; - public class BlockMarbleWall extends BlockWall { CarvableHelper carverHelper; diff --git a/src/main/java/info/jbcs/minecraft/chisel/block/BlockPresent.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockPresent.java index fed8b0a4..9d00a212 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/block/BlockPresent.java +++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockPresent.java @@ -1,7 +1,5 @@ package info.jbcs.minecraft.chisel.block; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import info.jbcs.minecraft.chisel.Chisel; import info.jbcs.minecraft.chisel.api.ICarvable; import info.jbcs.minecraft.chisel.block.tileentity.TileEntityPresent; @@ -9,6 +7,11 @@ import info.jbcs.minecraft.chisel.carving.CarvableHelper; import info.jbcs.minecraft.chisel.carving.CarvableVariation; import info.jbcs.minecraft.chisel.init.ModTabs; import info.jbcs.minecraft.chisel.inventory.InventoryLargePresent; + +import java.util.Calendar; +import java.util.Iterator; +import java.util.Random; + import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; @@ -29,10 +32,8 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; - -import java.util.Calendar; -import java.util.Iterator; -import java.util.Random; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class BlockPresent extends BlockContainer implements ICarvable { private final Random random = new Random(); diff --git a/src/main/java/info/jbcs/minecraft/chisel/block/BlockSnakestone.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockSnakestone.java index 24d6c1b0..5997eacd 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/block/BlockSnakestone.java +++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockSnakestone.java @@ -2,6 +2,9 @@ package info.jbcs.minecraft.chisel.block; import info.jbcs.minecraft.chisel.client.render.BlockSnakeStoneRenderer; import info.jbcs.minecraft.chisel.init.ModTabs; + +import java.util.List; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -13,8 +16,6 @@ import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; import net.minecraft.world.World; -import java.util.List; - public class BlockSnakestone extends Block { static final int SEC_HEAD = 0; diff --git a/src/main/java/info/jbcs/minecraft/chisel/block/BlockSnakestoneObsidian.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockSnakestoneObsidian.java index be15ed9f..05cf10fc 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/block/BlockSnakestoneObsidian.java +++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockSnakestoneObsidian.java @@ -2,12 +2,13 @@ package info.jbcs.minecraft.chisel.block; import info.jbcs.minecraft.chisel.client.GeneralChiselClient; + +import java.util.Random; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.IIcon; import net.minecraft.world.World; -import java.util.Random; - public class BlockSnakestoneObsidian extends BlockSnakestone { public IIcon[] particles = new IIcon[8]; diff --git a/src/main/java/info/jbcs/minecraft/chisel/block/BlockSpikes.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockSpikes.java index 97d8ad0d..65b0f0fe 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/block/BlockSpikes.java +++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockSpikes.java @@ -1,7 +1,5 @@ package info.jbcs.minecraft.chisel.block; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.relauncher.Side; import info.jbcs.minecraft.chisel.Configurations; import info.jbcs.minecraft.chisel.client.GeneralChiselClient; import info.jbcs.minecraft.chisel.client.render.BlockSpikesRenderer; @@ -14,6 +12,8 @@ import net.minecraft.entity.Entity; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.IIcon; import net.minecraft.world.World; +import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.relauncher.Side; public class BlockSpikes extends Block { diff --git a/src/main/java/info/jbcs/minecraft/chisel/block/BlockVoidstone.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockVoidstone.java index dd7e5f13..3a1f1258 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/block/BlockVoidstone.java +++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockVoidstone.java @@ -6,14 +6,15 @@ import info.jbcs.minecraft.chisel.carving.CarvableHelper; import info.jbcs.minecraft.chisel.carving.CarvableVariation; import info.jbcs.minecraft.chisel.client.GeneralChiselClient; import info.jbcs.minecraft.chisel.utils.General; + +import java.util.Random; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.IIcon; import net.minecraft.world.World; -import java.util.Random; - public class BlockVoidstone extends Block implements ICarvable{ public CarvableHelper carverHelper; public static IIcon iconParticle; diff --git a/src/main/java/info/jbcs/minecraft/chisel/block/ItemBlockAutoChisel.java b/src/main/java/info/jbcs/minecraft/chisel/block/ItemBlockAutoChisel.java index 5fcab449..2b020471 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/block/ItemBlockAutoChisel.java +++ b/src/main/java/info/jbcs/minecraft/chisel/block/ItemBlockAutoChisel.java @@ -1,13 +1,13 @@ package info.jbcs.minecraft.chisel.block; +import java.util.List; + import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; -import java.util.List; - public class ItemBlockAutoChisel extends ItemBlock{ private final String[] names = {"base", "speed", "automation", "stack"}; diff --git a/src/main/java/info/jbcs/minecraft/chisel/block/tileentity/TileEntityAutoChisel.java b/src/main/java/info/jbcs/minecraft/chisel/block/tileentity/TileEntityAutoChisel.java index cc9b4644..d55f37dc 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/block/tileentity/TileEntityAutoChisel.java +++ b/src/main/java/info/jbcs/minecraft/chisel/block/tileentity/TileEntityAutoChisel.java @@ -1,7 +1,5 @@ package info.jbcs.minecraft.chisel.block.tileentity; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.ISidedInventory; @@ -13,6 +11,8 @@ import net.minecraft.network.NetworkManager; import net.minecraft.network.Packet; import net.minecraft.network.play.server.S35PacketUpdateTileEntity; import net.minecraft.tileentity.TileEntity; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class TileEntityAutoChisel extends TileEntity implements ISidedInventory { diff --git a/src/main/java/info/jbcs/minecraft/chisel/block/tileentity/TileEntityPresent.java b/src/main/java/info/jbcs/minecraft/chisel/block/tileentity/TileEntityPresent.java index 16c2b9e3..2d3faaac 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/block/tileentity/TileEntityPresent.java +++ b/src/main/java/info/jbcs/minecraft/chisel/block/tileentity/TileEntityPresent.java @@ -3,15 +3,16 @@ package info.jbcs.minecraft.chisel.block.tileentity; import info.jbcs.minecraft.chisel.block.BlockPresent; import info.jbcs.minecraft.chisel.inventory.ContainerPresent; import info.jbcs.minecraft.chisel.inventory.InventoryLargePresent; + +import java.util.Iterator; +import java.util.List; + 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 java.util.Iterator; -import java.util.List; - public class TileEntityPresent extends TileEntityChest { public TileEntityPresent() { diff --git a/src/main/java/info/jbcs/minecraft/chisel/carving/CarvableHelper.java b/src/main/java/info/jbcs/minecraft/chisel/carving/CarvableHelper.java index 9d2eab19..99885ca4 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/carving/CarvableHelper.java +++ b/src/main/java/info/jbcs/minecraft/chisel/carving/CarvableHelper.java @@ -1,6 +1,5 @@ package info.jbcs.minecraft.chisel.carving; -import cpw.mods.fml.common.registry.GameRegistry; import info.jbcs.minecraft.chisel.Chisel; import info.jbcs.minecraft.chisel.Configurations; import info.jbcs.minecraft.chisel.block.BlockMarbleSlab; @@ -9,6 +8,12 @@ import info.jbcs.minecraft.chisel.client.render.CTM; import info.jbcs.minecraft.chisel.client.render.TextureSubmap; import info.jbcs.minecraft.chisel.item.ItemCarvable; import info.jbcs.minecraft.chisel.utils.GeneralClient; + +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; @@ -17,11 +22,7 @@ import net.minecraft.creativetab.CreativeTabs; 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 cpw.mods.fml.common.registry.GameRegistry; public class CarvableHelper { diff --git a/src/main/java/info/jbcs/minecraft/chisel/carving/Carving.java b/src/main/java/info/jbcs/minecraft/chisel/carving/Carving.java index 01240803..70b34bb1 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/carving/Carving.java +++ b/src/main/java/info/jbcs/minecraft/chisel/carving/Carving.java @@ -1,16 +1,17 @@ package info.jbcs.minecraft.chisel.carving; import info.jbcs.minecraft.chisel.Chisel; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; + 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 java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; - public class Carving { HashMap carvingGroupsByName = new HashMap(); diff --git a/src/main/java/info/jbcs/minecraft/chisel/client/GeneralChiselClient.java b/src/main/java/info/jbcs/minecraft/chisel/client/GeneralChiselClient.java index c4165c11..45ee1528 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/client/GeneralChiselClient.java +++ b/src/main/java/info/jbcs/minecraft/chisel/client/GeneralChiselClient.java @@ -1,9 +1,20 @@ package info.jbcs.minecraft.chisel.client; import info.jbcs.minecraft.chisel.Configurations; -import info.jbcs.minecraft.chisel.block.*; -import info.jbcs.minecraft.chisel.entity.fx.*; +import info.jbcs.minecraft.chisel.block.BlockGrimstone; +import info.jbcs.minecraft.chisel.block.BlockHolystone; +import info.jbcs.minecraft.chisel.block.BlockLavastone; +import info.jbcs.minecraft.chisel.block.BlockSnakestoneObsidian; +import info.jbcs.minecraft.chisel.block.BlockVoidstone; +import info.jbcs.minecraft.chisel.entity.fx.EntityBallOMossFX; +import info.jbcs.minecraft.chisel.entity.fx.EntityGrimstoneFX; +import info.jbcs.minecraft.chisel.entity.fx.EntityHolystoneFX; +import info.jbcs.minecraft.chisel.entity.fx.EntitySnakestoneObsidianFX; +import info.jbcs.minecraft.chisel.entity.fx.EntityVoidstoneFX; import info.jbcs.minecraft.chisel.utils.GeneralClient; + +import java.util.Random; + import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.entity.EntityPlayerSP; @@ -13,8 +24,6 @@ import net.minecraft.client.particle.EntityLavaFX; import net.minecraft.entity.Entity; import net.minecraft.world.World; -import java.util.Random; - public class GeneralChiselClient { public static Random rand = new Random(); diff --git a/src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiAutoChisel.java b/src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiAutoChisel.java index 867c867e..54ff085f 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiAutoChisel.java +++ b/src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiAutoChisel.java @@ -5,6 +5,7 @@ import info.jbcs.minecraft.chisel.inventory.ContainerAutoChisel; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; + import org.lwjgl.opengl.GL11; public class GuiAutoChisel extends GuiContainer { diff --git a/src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiChisel.java b/src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiChisel.java index cff5edc7..950d3002 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiChisel.java +++ b/src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiChisel.java @@ -7,6 +7,7 @@ import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; + import org.lwjgl.opengl.GL11; public class GuiChisel extends GuiContainer diff --git a/src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiChiselConfig.java b/src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiChiselConfig.java index 6ec54413..847b9084 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiChiselConfig.java +++ b/src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiChiselConfig.java @@ -1,11 +1,11 @@ package info.jbcs.minecraft.chisel.client.gui; -import cpw.mods.fml.client.config.GuiConfig; import info.jbcs.minecraft.chisel.Chisel; import info.jbcs.minecraft.chisel.Configurations; import net.minecraft.client.gui.GuiScreen; import net.minecraftforge.common.config.ConfigElement; import net.minecraftforge.common.config.Configuration; +import cpw.mods.fml.client.config.GuiConfig; public class GuiChiselConfig extends GuiConfig { diff --git a/src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiElement.java b/src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiElement.java index 1fe72fe1..15908121 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiElement.java +++ b/src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiElement.java @@ -1,9 +1,9 @@ package info.jbcs.minecraft.chisel.client.gui; -import org.lwjgl.opengl.GL11; - import java.util.ArrayList; +import org.lwjgl.opengl.GL11; + public class GuiElement { public int x; diff --git a/src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiFactory.java b/src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiFactory.java index 45de760b..344f36de 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiFactory.java +++ b/src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiFactory.java @@ -1,10 +1,10 @@ package info.jbcs.minecraft.chisel.client.gui; -import cpw.mods.fml.client.IModGuiFactory; +import java.util.Set; + import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; - -import java.util.Set; +import cpw.mods.fml.client.IModGuiFactory; public class GuiFactory implements IModGuiFactory { diff --git a/src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiPresent.java b/src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiPresent.java index 175160b7..a50a41a7 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiPresent.java +++ b/src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiPresent.java @@ -6,6 +6,7 @@ import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.util.ResourceLocation; + import org.lwjgl.opengl.GL11; public class GuiPresent extends GuiContainer { diff --git a/src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiScreenPlus.java b/src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiScreenPlus.java index 1b434c52..8112be99 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiScreenPlus.java +++ b/src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiScreenPlus.java @@ -7,6 +7,7 @@ import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.renderer.Tessellator; import net.minecraft.inventory.Container; + import org.lwjgl.input.Keyboard; import org.lwjgl.input.Mouse; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/info/jbcs/minecraft/chisel/client/gui/GuilScrolledBox.java b/src/main/java/info/jbcs/minecraft/chisel/client/gui/GuilScrolledBox.java index b96e4429..aa1a8a8e 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/client/gui/GuilScrolledBox.java +++ b/src/main/java/info/jbcs/minecraft/chisel/client/gui/GuilScrolledBox.java @@ -3,6 +3,7 @@ package info.jbcs.minecraft.chisel.client.gui; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Gui; import net.minecraft.client.renderer.Tessellator; + import org.lwjgl.opengl.GL11; public class GuilScrolledBox extends GuiElement diff --git a/src/main/java/info/jbcs/minecraft/chisel/client/gui/Scrollbar.java b/src/main/java/info/jbcs/minecraft/chisel/client/gui/Scrollbar.java index 5d35fd36..1d89172f 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/client/gui/Scrollbar.java +++ b/src/main/java/info/jbcs/minecraft/chisel/client/gui/Scrollbar.java @@ -3,6 +3,7 @@ package info.jbcs.minecraft.chisel.client.gui; import info.jbcs.minecraft.chisel.utils.GeneralClient; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; + import org.lwjgl.input.Mouse; public abstract class Scrollbar extends GuiButton diff --git a/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockAdvancedMarbleRenderer.java b/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockAdvancedMarbleRenderer.java index f6a1acca..f2e91dcd 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockAdvancedMarbleRenderer.java +++ b/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockAdvancedMarbleRenderer.java @@ -1,7 +1,5 @@ package info.jbcs.minecraft.chisel.client.render; -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; -import cpw.mods.fml.client.registry.RenderingRegistry; import info.jbcs.minecraft.chisel.Chisel; import info.jbcs.minecraft.chisel.api.ICarvable; import info.jbcs.minecraft.chisel.carving.CarvableHelper; @@ -10,8 +8,12 @@ import info.jbcs.minecraft.chisel.utils.Drawing; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.world.IBlockAccess; + import org.lwjgl.opengl.GL11; +import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; +import cpw.mods.fml.client.registry.RenderingRegistry; + public class BlockAdvancedMarbleRenderer implements ISimpleBlockRenderingHandler { public RenderBlocksCTM rendererCTM = new RenderBlocksCTM(); diff --git a/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockCarpetRenderer.java b/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockCarpetRenderer.java index c0f676b9..c2ead782 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockCarpetRenderer.java +++ b/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockCarpetRenderer.java @@ -1,7 +1,7 @@ package info.jbcs.minecraft.chisel.client.render; -import cpw.mods.fml.client.registry.RenderingRegistry; import info.jbcs.minecraft.chisel.Chisel; +import cpw.mods.fml.client.registry.RenderingRegistry; public class BlockCarpetRenderer extends BlockAdvancedMarbleRenderer diff --git a/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockEldritchRenderer.java b/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockEldritchRenderer.java index 25bbdaa9..3866114d 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockEldritchRenderer.java +++ b/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockEldritchRenderer.java @@ -1,14 +1,16 @@ package info.jbcs.minecraft.chisel.client.render; -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; -import cpw.mods.fml.client.registry.RenderingRegistry; import info.jbcs.minecraft.chisel.Chisel; import info.jbcs.minecraft.chisel.utils.Drawing; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.world.IBlockAccess; + import org.lwjgl.opengl.GL11; +import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; +import cpw.mods.fml.client.registry.RenderingRegistry; + public class BlockEldritchRenderer implements ISimpleBlockRenderingHandler { public BlockEldritchRenderer() diff --git a/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockMarblePaneRenderer.java b/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockMarblePaneRenderer.java index 451b32d5..12e1b0d8 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockMarblePaneRenderer.java +++ b/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockMarblePaneRenderer.java @@ -1,7 +1,5 @@ package info.jbcs.minecraft.chisel.client.render; -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; -import cpw.mods.fml.client.registry.RenderingRegistry; import info.jbcs.minecraft.chisel.utils.Drawing; import net.minecraft.block.Block; import net.minecraft.block.BlockPane; @@ -10,8 +8,12 @@ import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.Tessellator; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; + import org.lwjgl.opengl.GL11; +import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; +import cpw.mods.fml.client.registry.RenderingRegistry; + public class BlockMarblePaneRenderer implements ISimpleBlockRenderingHandler { public static int id; diff --git a/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockMarblePillarRenderer.java b/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockMarblePillarRenderer.java index 04e9a0ea..9f4b2c04 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockMarblePillarRenderer.java +++ b/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockMarblePillarRenderer.java @@ -1,15 +1,17 @@ package info.jbcs.minecraft.chisel.client.render; -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; -import cpw.mods.fml.client.registry.RenderingRegistry; import info.jbcs.minecraft.chisel.block.BlockMarblePillar; import info.jbcs.minecraft.chisel.carving.CarvableHelper; import info.jbcs.minecraft.chisel.utils.Drawing; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.world.IBlockAccess; + import org.lwjgl.opengl.GL11; +import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; +import cpw.mods.fml.client.registry.RenderingRegistry; + public class BlockMarblePillarRenderer implements ISimpleBlockRenderingHandler { public static int id; diff --git a/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockMarbleStairsRenderer.java b/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockMarbleStairsRenderer.java index 03aea24a..5157a25d 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockMarbleStairsRenderer.java +++ b/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockMarbleStairsRenderer.java @@ -1,14 +1,16 @@ package info.jbcs.minecraft.chisel.client.render; -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; -import cpw.mods.fml.client.registry.RenderingRegistry; import info.jbcs.minecraft.chisel.block.BlockMarbleStairs; import info.jbcs.minecraft.chisel.utils.Drawing; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.world.IBlockAccess; + import org.lwjgl.opengl.GL11; +import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; +import cpw.mods.fml.client.registry.RenderingRegistry; + public class BlockMarbleStairsRenderer implements ISimpleBlockRenderingHandler { public static int id; diff --git a/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockNoCTMRenderer.java b/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockNoCTMRenderer.java index ecd6768f..06579385 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockNoCTMRenderer.java +++ b/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockNoCTMRenderer.java @@ -1,13 +1,15 @@ package info.jbcs.minecraft.chisel.client.render; -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; -import cpw.mods.fml.client.registry.RenderingRegistry; import info.jbcs.minecraft.chisel.utils.Drawing; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.world.IBlockAccess; + import org.lwjgl.opengl.GL11; +import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; +import cpw.mods.fml.client.registry.RenderingRegistry; + public class BlockNoCTMRenderer implements ISimpleBlockRenderingHandler { static int id; diff --git a/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockRoadLineRenderer.java b/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockRoadLineRenderer.java index ae11ff60..9cf0f1e1 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockRoadLineRenderer.java +++ b/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockRoadLineRenderer.java @@ -1,7 +1,5 @@ package info.jbcs.minecraft.chisel.client.render; -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; -import cpw.mods.fml.client.registry.RenderingRegistry; import info.jbcs.minecraft.chisel.block.BlockRoadLine; import info.jbcs.minecraft.chisel.utils.Drawing; import net.minecraft.block.Block; @@ -10,6 +8,8 @@ import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.Tessellator; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; +import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; +import cpw.mods.fml.client.registry.RenderingRegistry; public class BlockRoadLineRenderer implements ISimpleBlockRenderingHandler { diff --git a/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockSnakeStoneRenderer.java b/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockSnakeStoneRenderer.java index b5515313..5193cbdc 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockSnakeStoneRenderer.java +++ b/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockSnakeStoneRenderer.java @@ -1,14 +1,16 @@ package info.jbcs.minecraft.chisel.client.render; -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; -import cpw.mods.fml.client.registry.RenderingRegistry; import info.jbcs.minecraft.chisel.block.BlockSnakestone; import info.jbcs.minecraft.chisel.utils.Drawing; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.world.IBlockAccess; + import org.lwjgl.opengl.GL11; +import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; +import cpw.mods.fml.client.registry.RenderingRegistry; + public class BlockSnakeStoneRenderer implements ISimpleBlockRenderingHandler { public static int id; diff --git a/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockSpikesRenderer.java b/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockSpikesRenderer.java index cc396f77..a998d977 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockSpikesRenderer.java +++ b/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockSpikesRenderer.java @@ -1,16 +1,17 @@ package info.jbcs.minecraft.chisel.client.render; -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; -import cpw.mods.fml.client.registry.RenderingRegistry; import info.jbcs.minecraft.chisel.init.ModBlocks; import info.jbcs.minecraft.chisel.utils.Drawing; + +import java.util.Random; + import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.Tessellator; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; - -import java.util.Random; +import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; +import cpw.mods.fml.client.registry.RenderingRegistry; public class BlockSpikesRenderer implements ISimpleBlockRenderingHandler { diff --git a/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockTexturedOreRenderer.java b/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockTexturedOreRenderer.java index d8f4f612..f92011d3 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockTexturedOreRenderer.java +++ b/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockTexturedOreRenderer.java @@ -1,15 +1,17 @@ package info.jbcs.minecraft.chisel.client.render; -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; -import cpw.mods.fml.client.registry.RenderingRegistry; import info.jbcs.minecraft.chisel.block.BlockTexturedOre; import info.jbcs.minecraft.chisel.utils.Drawing; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.init.Blocks; import net.minecraft.world.IBlockAccess; + import org.lwjgl.opengl.GL11; +import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; +import cpw.mods.fml.client.registry.RenderingRegistry; + public class BlockTexturedOreRenderer implements ISimpleBlockRenderingHandler { float bot = -0.001f, top = 1.0f - bot; diff --git a/src/main/java/info/jbcs/minecraft/chisel/client/render/TextureSubmap.java b/src/main/java/info/jbcs/minecraft/chisel/client/render/TextureSubmap.java index ea5f0f49..6f1220e1 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/client/render/TextureSubmap.java +++ b/src/main/java/info/jbcs/minecraft/chisel/client/render/TextureSubmap.java @@ -1,9 +1,9 @@ package info.jbcs.minecraft.chisel.client.render; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; import net.minecraft.util.IIcon; import net.minecraftforge.client.event.TextureStitchEvent; import net.minecraftforge.common.MinecraftForge; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; public class TextureSubmap { diff --git a/src/main/java/info/jbcs/minecraft/chisel/client/render/TextureVirtual.java b/src/main/java/info/jbcs/minecraft/chisel/client/render/TextureVirtual.java index 75b72670..e24ee64b 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/client/render/TextureVirtual.java +++ b/src/main/java/info/jbcs/minecraft/chisel/client/render/TextureVirtual.java @@ -1,8 +1,8 @@ package info.jbcs.minecraft.chisel.client.render; +import net.minecraft.util.IIcon; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.util.IIcon; public class TextureVirtual implements IIcon { diff --git a/src/main/java/info/jbcs/minecraft/chisel/client/render/item/ItemAutoChiselRenderer.java b/src/main/java/info/jbcs/minecraft/chisel/client/render/item/ItemAutoChiselRenderer.java index 2f0ee2bf..d8669c65 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/client/render/item/ItemAutoChiselRenderer.java +++ b/src/main/java/info/jbcs/minecraft/chisel/client/render/item/ItemAutoChiselRenderer.java @@ -1,12 +1,14 @@ package info.jbcs.minecraft.chisel.client.render.item; -import cpw.mods.fml.client.FMLClientHandler; import info.jbcs.minecraft.chisel.client.model.ModelAutoChisel; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.IItemRenderer; + import org.lwjgl.opengl.GL11; +import cpw.mods.fml.client.FMLClientHandler; + public class ItemAutoChiselRenderer implements IItemRenderer{ private final ModelAutoChisel model = new ModelAutoChisel(); diff --git a/src/main/java/info/jbcs/minecraft/chisel/client/render/item/ItemChiselRenderer.java b/src/main/java/info/jbcs/minecraft/chisel/client/render/item/ItemChiselRenderer.java index b0be09d7..5a845e8e 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/client/render/item/ItemChiselRenderer.java +++ b/src/main/java/info/jbcs/minecraft/chisel/client/render/item/ItemChiselRenderer.java @@ -6,6 +6,7 @@ import net.minecraft.client.renderer.RenderHelper; import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.item.ItemStack; import net.minecraftforge.client.IItemRenderer; + import org.lwjgl.opengl.GL11; public class ItemChiselRenderer implements IItemRenderer diff --git a/src/main/java/info/jbcs/minecraft/chisel/client/render/item/ItemPresentRenderer.java b/src/main/java/info/jbcs/minecraft/chisel/client/render/item/ItemPresentRenderer.java index b190b6bf..55717226 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/client/render/item/ItemPresentRenderer.java +++ b/src/main/java/info/jbcs/minecraft/chisel/client/render/item/ItemPresentRenderer.java @@ -1,13 +1,15 @@ package info.jbcs.minecraft.chisel.client.render.item; -import cpw.mods.fml.client.FMLClientHandler; import info.jbcs.minecraft.chisel.Chisel; import net.minecraft.client.model.ModelChest; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.IItemRenderer; + import org.lwjgl.opengl.GL11; +import cpw.mods.fml.client.FMLClientHandler; + public class ItemPresentRenderer implements IItemRenderer { private final ModelChest model = new ModelChest(); diff --git a/src/main/java/info/jbcs/minecraft/chisel/client/render/tile/RenderAutoChisel.java b/src/main/java/info/jbcs/minecraft/chisel/client/render/tile/RenderAutoChisel.java index 8a38a9af..f27e72be 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/client/render/tile/RenderAutoChisel.java +++ b/src/main/java/info/jbcs/minecraft/chisel/client/render/tile/RenderAutoChisel.java @@ -1,7 +1,10 @@ package info.jbcs.minecraft.chisel.client.render.tile; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import static org.lwjgl.opengl.GL11.glPopMatrix; +import static org.lwjgl.opengl.GL11.glPushMatrix; +import static org.lwjgl.opengl.GL11.glRotatef; +import static org.lwjgl.opengl.GL11.glScalef; +import static org.lwjgl.opengl.GL11.glTranslatef; import info.jbcs.minecraft.chisel.block.tileentity.TileEntityAutoChisel; import info.jbcs.minecraft.chisel.client.model.ModelAutoChisel; import net.minecraft.client.renderer.entity.RenderItem; @@ -12,9 +15,11 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; + import org.lwjgl.opengl.GL11; -import static org.lwjgl.opengl.GL11.*; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; public class RenderAutoChisel extends TileEntitySpecialRenderer { diff --git a/src/main/java/info/jbcs/minecraft/chisel/client/render/tile/RenderPresent.java b/src/main/java/info/jbcs/minecraft/chisel/client/render/tile/RenderPresent.java index c8923ee0..db558990 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/client/render/tile/RenderPresent.java +++ b/src/main/java/info/jbcs/minecraft/chisel/client/render/tile/RenderPresent.java @@ -1,6 +1,5 @@ package info.jbcs.minecraft.chisel.client.render.tile; -import cpw.mods.fml.common.FMLLog; import info.jbcs.minecraft.chisel.block.BlockPresent; import info.jbcs.minecraft.chisel.block.tileentity.TileEntityPresent; import net.minecraft.block.Block; @@ -9,9 +8,12 @@ import net.minecraft.client.model.ModelChest; import net.minecraft.client.model.ModelLargeChest; import net.minecraft.client.renderer.tileentity.TileEntityChestRenderer; import net.minecraft.tileentity.TileEntity; + import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; +import cpw.mods.fml.common.FMLLog; + public class RenderPresent extends TileEntityChestRenderer { private ModelChest chest = new ModelChest(); private ModelChest doubleChest = new ModelLargeChest(); diff --git a/src/main/java/info/jbcs/minecraft/chisel/compat/Compatibility.java b/src/main/java/info/jbcs/minecraft/chisel/compat/Compatibility.java index 727b0c7d..2289cca1 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/compat/Compatibility.java +++ b/src/main/java/info/jbcs/minecraft/chisel/compat/Compatibility.java @@ -1,9 +1,9 @@ package info.jbcs.minecraft.chisel.compat; +import info.jbcs.minecraft.chisel.carving.Carving; import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.registry.GameRegistry; -import info.jbcs.minecraft.chisel.carving.Carving; public class Compatibility { diff --git a/src/main/java/info/jbcs/minecraft/chisel/compat/FMPIntegration.java b/src/main/java/info/jbcs/minecraft/chisel/compat/FMPIntegration.java index dcf5d679..52c1ac0e 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/compat/FMPIntegration.java +++ b/src/main/java/info/jbcs/minecraft/chisel/compat/FMPIntegration.java @@ -1,10 +1,10 @@ package info.jbcs.minecraft.chisel.compat; -import cpw.mods.fml.common.event.FMLInterModComms; import info.jbcs.minecraft.chisel.compat.ModIntegration.IModIntegration; import info.jbcs.minecraft.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{ @Override diff --git a/src/main/java/info/jbcs/minecraft/chisel/compat/MarbleCompatibility.java b/src/main/java/info/jbcs/minecraft/chisel/compat/MarbleCompatibility.java index 7ec41e4e..0890be05 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/compat/MarbleCompatibility.java +++ b/src/main/java/info/jbcs/minecraft/chisel/compat/MarbleCompatibility.java @@ -1,8 +1,8 @@ package info.jbcs.minecraft.chisel.compat; -import cpw.mods.fml.common.event.FMLPostInitializationEvent; import info.jbcs.minecraft.chisel.carving.Carving; import net.minecraft.block.Block; +import cpw.mods.fml.common.event.FMLPostInitializationEvent; public class MarbleCompatibility { diff --git a/src/main/java/info/jbcs/minecraft/chisel/compat/ModIntegration.java b/src/main/java/info/jbcs/minecraft/chisel/compat/ModIntegration.java index 2a6bbe08..66bb8435 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/compat/ModIntegration.java +++ b/src/main/java/info/jbcs/minecraft/chisel/compat/ModIntegration.java @@ -1,10 +1,10 @@ package info.jbcs.minecraft.chisel.compat; -import cpw.mods.fml.common.Loader; - import java.util.ArrayList; import java.util.List; +import cpw.mods.fml.common.Loader; + public class ModIntegration { private static List integratedMods = new ArrayList(); diff --git a/src/main/java/info/jbcs/minecraft/chisel/entity/EntityCloudInABottle.java b/src/main/java/info/jbcs/minecraft/chisel/entity/EntityCloudInABottle.java index e1dec8e7..0144d928 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/entity/EntityCloudInABottle.java +++ b/src/main/java/info/jbcs/minecraft/chisel/entity/EntityCloudInABottle.java @@ -1,13 +1,14 @@ package info.jbcs.minecraft.chisel.entity; import info.jbcs.minecraft.chisel.init.ModBlocks; + +import java.util.Random; + import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.projectile.EntityThrowable; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; -import java.util.Random; - public class EntityCloudInABottle extends EntityThrowable { Random rand = new Random(); diff --git a/src/main/java/info/jbcs/minecraft/chisel/entity/fx/EntityBallOMossFX.java b/src/main/java/info/jbcs/minecraft/chisel/entity/fx/EntityBallOMossFX.java index b16e8c12..0efac068 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/entity/fx/EntityBallOMossFX.java +++ b/src/main/java/info/jbcs/minecraft/chisel/entity/fx/EntityBallOMossFX.java @@ -1,7 +1,5 @@ package info.jbcs.minecraft.chisel.entity.fx; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import info.jbcs.minecraft.chisel.block.BlockSnakestoneObsidian; import info.jbcs.minecraft.chisel.init.ModItems; import info.jbcs.minecraft.chisel.utils.General; @@ -9,8 +7,12 @@ import net.minecraft.client.particle.EntityFX; import net.minecraft.client.renderer.Tessellator; import net.minecraft.util.IIcon; import net.minecraft.world.World; + import org.lwjgl.opengl.GL11; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class EntityBallOMossFX extends EntityFX { BlockSnakestoneObsidian block; diff --git a/src/main/java/info/jbcs/minecraft/chisel/entity/fx/EntitySnakestoneObsidianFX.java b/src/main/java/info/jbcs/minecraft/chisel/entity/fx/EntitySnakestoneObsidianFX.java index 607763f3..58fb6bf2 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/entity/fx/EntitySnakestoneObsidianFX.java +++ b/src/main/java/info/jbcs/minecraft/chisel/entity/fx/EntitySnakestoneObsidianFX.java @@ -5,6 +5,7 @@ import info.jbcs.minecraft.chisel.utils.General; import net.minecraft.client.particle.EntityFX; import net.minecraft.client.renderer.Tessellator; import net.minecraft.world.World; + import org.lwjgl.opengl.GL11; public class EntitySnakestoneObsidianFX extends EntityFX diff --git a/src/main/java/info/jbcs/minecraft/chisel/init/ModBlocks.java b/src/main/java/info/jbcs/minecraft/chisel/init/ModBlocks.java index 3b0170c9..6c55b448 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/init/ModBlocks.java +++ b/src/main/java/info/jbcs/minecraft/chisel/init/ModBlocks.java @@ -1,9 +1,40 @@ package info.jbcs.minecraft.chisel.init; -import cpw.mods.fml.common.registry.GameRegistry; import info.jbcs.minecraft.chisel.Chisel; import info.jbcs.minecraft.chisel.Configurations; -import info.jbcs.minecraft.chisel.block.*; +import info.jbcs.minecraft.chisel.block.BlockAutoChisel; +import info.jbcs.minecraft.chisel.block.BlockBeaconBase; +import info.jbcs.minecraft.chisel.block.BlockCarvable; +import info.jbcs.minecraft.chisel.block.BlockCarvableGlass; +import info.jbcs.minecraft.chisel.block.BlockCarvablePane; +import info.jbcs.minecraft.chisel.block.BlockCarvablePowered; +import info.jbcs.minecraft.chisel.block.BlockCloud; +import info.jbcs.minecraft.chisel.block.BlockConcrete; +import info.jbcs.minecraft.chisel.block.BlockEldritch; +import info.jbcs.minecraft.chisel.block.BlockGrimstone; +import info.jbcs.minecraft.chisel.block.BlockHolystone; +import info.jbcs.minecraft.chisel.block.BlockLavastone; +import info.jbcs.minecraft.chisel.block.BlockLeaf; +import info.jbcs.minecraft.chisel.block.BlockLightstoneCarvable; +import info.jbcs.minecraft.chisel.block.BlockMarbleBookshelf; +import info.jbcs.minecraft.chisel.block.BlockMarbleCarpet; +import info.jbcs.minecraft.chisel.block.BlockMarbleIce; +import info.jbcs.minecraft.chisel.block.BlockMarbleIceStairs; +import info.jbcs.minecraft.chisel.block.BlockMarblePillar; +import info.jbcs.minecraft.chisel.block.BlockMarbleSlab; +import info.jbcs.minecraft.chisel.block.BlockMarbleStairs; +import info.jbcs.minecraft.chisel.block.BlockMarbleStairsMaker; +import info.jbcs.minecraft.chisel.block.BlockMarbleStairsMakerCreator; +import info.jbcs.minecraft.chisel.block.BlockMarbleWall; +import info.jbcs.minecraft.chisel.block.BlockPresent; +import info.jbcs.minecraft.chisel.block.BlockRoadLine; +import info.jbcs.minecraft.chisel.block.BlockSnakestone; +import info.jbcs.minecraft.chisel.block.BlockSnakestoneObsidian; +import info.jbcs.minecraft.chisel.block.BlockSpikes; +import info.jbcs.minecraft.chisel.block.BlockVoidstone; +import info.jbcs.minecraft.chisel.block.BlockVoidstonePillar; +import info.jbcs.minecraft.chisel.block.BlockWaterstone; +import info.jbcs.minecraft.chisel.block.ItemBlockAutoChisel; import info.jbcs.minecraft.chisel.carving.CarvableHelper; import info.jbcs.minecraft.chisel.carving.CarvableVariation; import info.jbcs.minecraft.chisel.carving.Carving; @@ -15,6 +46,7 @@ import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; import net.minecraftforge.oredict.OreDictionary; +import cpw.mods.fml.common.registry.GameRegistry; public class ModBlocks { public static BlockCarvable marble; diff --git a/src/main/java/info/jbcs/minecraft/chisel/init/ModItems.java b/src/main/java/info/jbcs/minecraft/chisel/init/ModItems.java index 18de8a1a..81278be6 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/init/ModItems.java +++ b/src/main/java/info/jbcs/minecraft/chisel/init/ModItems.java @@ -1,13 +1,17 @@ package info.jbcs.minecraft.chisel.init; -import cpw.mods.fml.common.registry.EntityRegistry; -import cpw.mods.fml.common.registry.GameRegistry; import info.jbcs.minecraft.chisel.Chisel; import info.jbcs.minecraft.chisel.Configurations; import info.jbcs.minecraft.chisel.entity.EntityBallOMoss; import info.jbcs.minecraft.chisel.entity.EntityCloudInABottle; import info.jbcs.minecraft.chisel.entity.EntitySmashingRock; -import info.jbcs.minecraft.chisel.item.*; +import info.jbcs.minecraft.chisel.item.ItemBallOMoss; +import info.jbcs.minecraft.chisel.item.ItemChisel; +import info.jbcs.minecraft.chisel.item.ItemCloudInABottle; +import info.jbcs.minecraft.chisel.item.ItemSmashingRock; +import info.jbcs.minecraft.chisel.item.ItemUpgrade; +import cpw.mods.fml.common.registry.EntityRegistry; +import cpw.mods.fml.common.registry.GameRegistry; public class ModItems { public static ItemChisel chisel; diff --git a/src/main/java/info/jbcs/minecraft/chisel/inventory/InventoryChiselSelection.java b/src/main/java/info/jbcs/minecraft/chisel/inventory/InventoryChiselSelection.java index 4f212aff..d77cff9e 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/inventory/InventoryChiselSelection.java +++ b/src/main/java/info/jbcs/minecraft/chisel/inventory/InventoryChiselSelection.java @@ -1,14 +1,15 @@ package info.jbcs.minecraft.chisel.inventory; import info.jbcs.minecraft.chisel.item.ItemChisel; + +import java.util.ArrayList; + 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 java.util.ArrayList; - public class InventoryChiselSelection implements IInventory { ItemStack chisel = null; diff --git a/src/main/java/info/jbcs/minecraft/chisel/item/ItemCarvable.java b/src/main/java/info/jbcs/minecraft/chisel/item/ItemCarvable.java index 74a419e6..b72de686 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/item/ItemCarvable.java +++ b/src/main/java/info/jbcs/minecraft/chisel/item/ItemCarvable.java @@ -4,6 +4,9 @@ import info.jbcs.minecraft.chisel.Configurations; import info.jbcs.minecraft.chisel.api.ICarvable; import info.jbcs.minecraft.chisel.carving.CarvableVariation; import info.jbcs.minecraft.chisel.utils.General; + +import java.util.List; + import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -11,8 +14,6 @@ import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; -import java.util.List; - public class ItemCarvable extends ItemBlock { diff --git a/src/main/java/info/jbcs/minecraft/chisel/item/ItemChisel.java b/src/main/java/info/jbcs/minecraft/chisel/item/ItemChisel.java index 3a4f8428..4bed6b23 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/item/ItemChisel.java +++ b/src/main/java/info/jbcs/minecraft/chisel/item/ItemChisel.java @@ -5,14 +5,15 @@ import info.jbcs.minecraft.chisel.api.ChiselMode; import info.jbcs.minecraft.chisel.api.IChiselMode; import info.jbcs.minecraft.chisel.carving.CarvableHelper; import info.jbcs.minecraft.chisel.carving.Carving; + +import java.util.HashSet; +import java.util.Set; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.item.ItemTool; import net.minecraft.world.World; -import java.util.HashSet; -import java.util.Set; - public class ItemChisel extends ItemTool implements IChiselMode { private static final HashSet toolSet = new HashSet(); public static Carving carving = Carving.chisel; diff --git a/src/main/java/info/jbcs/minecraft/chisel/item/ItemUpgrade.java b/src/main/java/info/jbcs/minecraft/chisel/item/ItemUpgrade.java index ca16b893..ed9c00b8 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/item/ItemUpgrade.java +++ b/src/main/java/info/jbcs/minecraft/chisel/item/ItemUpgrade.java @@ -2,6 +2,9 @@ package info.jbcs.minecraft.chisel.item; import info.jbcs.minecraft.chisel.Chisel; import info.jbcs.minecraft.chisel.block.tileentity.TileEntityAutoChisel; + +import java.util.List; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; @@ -12,8 +15,6 @@ import net.minecraft.util.IIcon; import net.minecraft.util.StatCollector; import net.minecraft.world.World; -import java.util.List; - public class ItemUpgrade extends Item{ public IIcon[] icons = new IIcon[6]; diff --git a/src/main/java/info/jbcs/minecraft/chisel/proxy/ClientProxy.java b/src/main/java/info/jbcs/minecraft/chisel/proxy/ClientProxy.java index 34e1c166..df990b86 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/proxy/ClientProxy.java +++ b/src/main/java/info/jbcs/minecraft/chisel/proxy/ClientProxy.java @@ -1,10 +1,18 @@ package info.jbcs.minecraft.chisel.proxy; -import cpw.mods.fml.client.registry.ClientRegistry; -import cpw.mods.fml.client.registry.RenderingRegistry; import info.jbcs.minecraft.chisel.block.tileentity.TileEntityAutoChisel; import info.jbcs.minecraft.chisel.block.tileentity.TileEntityPresent; -import info.jbcs.minecraft.chisel.client.render.*; +import info.jbcs.minecraft.chisel.client.render.BlockAdvancedMarbleRenderer; +import info.jbcs.minecraft.chisel.client.render.BlockCarpetRenderer; +import info.jbcs.minecraft.chisel.client.render.BlockEldritchRenderer; +import info.jbcs.minecraft.chisel.client.render.BlockMarblePaneRenderer; +import info.jbcs.minecraft.chisel.client.render.BlockMarblePillarRenderer; +import info.jbcs.minecraft.chisel.client.render.BlockMarbleStairsRenderer; +import info.jbcs.minecraft.chisel.client.render.BlockNoCTMRenderer; +import info.jbcs.minecraft.chisel.client.render.BlockRoadLineRenderer; +import info.jbcs.minecraft.chisel.client.render.BlockSnakeStoneRenderer; +import info.jbcs.minecraft.chisel.client.render.BlockSpikesRenderer; +import info.jbcs.minecraft.chisel.client.render.BlockTexturedOreRenderer; import info.jbcs.minecraft.chisel.client.render.item.ItemAutoChiselRenderer; import info.jbcs.minecraft.chisel.client.render.item.ItemChiselRenderer; import info.jbcs.minecraft.chisel.client.render.item.ItemPresentRenderer; @@ -18,6 +26,8 @@ import info.jbcs.minecraft.chisel.init.ModItems; import net.minecraft.client.renderer.entity.RenderSnowball; import net.minecraft.item.Item; import net.minecraftforge.client.MinecraftForgeClient; +import cpw.mods.fml.client.registry.ClientRegistry; +import cpw.mods.fml.client.registry.RenderingRegistry; public class ClientProxy extends CommonProxy { diff --git a/src/main/java/info/jbcs/minecraft/chisel/proxy/CommonProxy.java b/src/main/java/info/jbcs/minecraft/chisel/proxy/CommonProxy.java index 3310e9eb..c4dde346 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/proxy/CommonProxy.java +++ b/src/main/java/info/jbcs/minecraft/chisel/proxy/CommonProxy.java @@ -1,8 +1,8 @@ package info.jbcs.minecraft.chisel.proxy; -import cpw.mods.fml.common.registry.GameRegistry; import info.jbcs.minecraft.chisel.block.tileentity.TileEntityAutoChisel; import info.jbcs.minecraft.chisel.block.tileentity.TileEntityPresent; +import cpw.mods.fml.common.registry.GameRegistry; public class CommonProxy { diff --git a/src/main/java/info/jbcs/minecraft/chisel/utils/BlockTexturedOreRenderer.java b/src/main/java/info/jbcs/minecraft/chisel/utils/BlockTexturedOreRenderer.java index af923911..a00a22b7 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/utils/BlockTexturedOreRenderer.java +++ b/src/main/java/info/jbcs/minecraft/chisel/utils/BlockTexturedOreRenderer.java @@ -1,13 +1,15 @@ package info.jbcs.minecraft.chisel.utils; -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; -import cpw.mods.fml.client.registry.RenderingRegistry; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.init.Blocks; import net.minecraft.world.IBlockAccess; + import org.lwjgl.opengl.GL11; +import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; +import cpw.mods.fml.client.registry.RenderingRegistry; + public class BlockTexturedOreRenderer implements ISimpleBlockRenderingHandler { float bot = -0.001f, top = 1.0f - bot; diff --git a/src/main/java/info/jbcs/minecraft/chisel/utils/General.java b/src/main/java/info/jbcs/minecraft/chisel/utils/General.java index 0e403ed3..4bc6dedd 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/utils/General.java +++ b/src/main/java/info/jbcs/minecraft/chisel/utils/General.java @@ -1,5 +1,7 @@ package info.jbcs.minecraft.chisel.utils; +import java.util.Random; + import net.minecraft.block.Block; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; @@ -11,8 +13,6 @@ import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.Vec3; import net.minecraft.world.World; -import java.util.Random; - public class General { public static Random rand = new Random(); diff --git a/src/main/java/info/jbcs/minecraft/chisel/utils/GeneralClient.java b/src/main/java/info/jbcs/minecraft/chisel/utils/GeneralClient.java index b4553df3..11f74e79 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/utils/GeneralClient.java +++ b/src/main/java/info/jbcs/minecraft/chisel/utils/GeneralClient.java @@ -1,5 +1,8 @@ package info.jbcs.minecraft.chisel.utils; +import java.util.HashMap; +import java.util.Random; + import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.entity.item.EntityItem; @@ -7,9 +10,6 @@ import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; -import java.util.HashMap; -import java.util.Random; - public class GeneralClient { public static Random rand = new Random(); diff --git a/src/main/java/info/jbcs/minecraft/chisel/utils/GuiHandler.java b/src/main/java/info/jbcs/minecraft/chisel/utils/GuiHandler.java index eabdfa81..0dbb157d 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/utils/GuiHandler.java +++ b/src/main/java/info/jbcs/minecraft/chisel/utils/GuiHandler.java @@ -1,13 +1,13 @@ package info.jbcs.minecraft.chisel.utils; -import cpw.mods.fml.common.network.IGuiHandler; -import cpw.mods.fml.common.network.NetworkRegistry; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.world.World; - import java.util.ArrayList; import java.util.Collections; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.world.World; +import cpw.mods.fml.common.network.IGuiHandler; +import cpw.mods.fml.common.network.NetworkRegistry; + public abstract class GuiHandler implements Comparable { static ArrayList items = new ArrayList(); diff --git a/src/main/java/info/jbcs/minecraft/chisel/world/GeneratorLimestone.java b/src/main/java/info/jbcs/minecraft/chisel/world/GeneratorLimestone.java index 5b66c927..7e809401 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/world/GeneratorLimestone.java +++ b/src/main/java/info/jbcs/minecraft/chisel/world/GeneratorLimestone.java @@ -1,12 +1,12 @@ package info.jbcs.minecraft.chisel.world; -import cpw.mods.fml.common.IWorldGenerator; +import java.util.Random; + import net.minecraft.block.Block; import net.minecraft.world.World; import net.minecraft.world.chunk.IChunkProvider; import net.minecraft.world.gen.feature.WorldGenMinable; - -import java.util.Random; +import cpw.mods.fml.common.IWorldGenerator; public class GeneratorLimestone implements IWorldGenerator { diff --git a/src/main/java/info/jbcs/minecraft/chisel/world/GeneratorMarble.java b/src/main/java/info/jbcs/minecraft/chisel/world/GeneratorMarble.java index 52393b8f..1916fa8b 100644 --- a/src/main/java/info/jbcs/minecraft/chisel/world/GeneratorMarble.java +++ b/src/main/java/info/jbcs/minecraft/chisel/world/GeneratorMarble.java @@ -1,12 +1,12 @@ package info.jbcs.minecraft.chisel.world; -import cpw.mods.fml.common.IWorldGenerator; +import java.util.Random; + import net.minecraft.block.Block; import net.minecraft.world.World; import net.minecraft.world.chunk.IChunkProvider; import net.minecraft.world.gen.feature.WorldGenMinable; - -import java.util.Random; +import cpw.mods.fml.common.IWorldGenerator; public class GeneratorMarble implements IWorldGenerator {