diff --git a/src/main/java/com/cricketcraft/chisel/Chisel.java b/src/main/java/com/cricketcraft/chisel/Chisel.java index 91ca3b0c..3e660b10 100644 --- a/src/main/java/com/cricketcraft/chisel/Chisel.java +++ b/src/main/java/com/cricketcraft/chisel/Chisel.java @@ -3,10 +3,7 @@ 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; @@ -14,21 +11,12 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import com.cricketcraft.chisel.block.BlockCarvable; -import com.cricketcraft.chisel.block.tileentity.TileEntityAutoChisel; -import com.cricketcraft.chisel.block.tileentity.TileEntityPresent; -import com.cricketcraft.chisel.client.gui.GuiAutoChisel; -import com.cricketcraft.chisel.client.gui.GuiChisel; -import com.cricketcraft.chisel.client.gui.GuiPresent; import com.cricketcraft.chisel.compat.Compatibility; import com.cricketcraft.chisel.config.Configurations; import com.cricketcraft.chisel.init.ChiselBlocks; import com.cricketcraft.chisel.init.ChiselTabs; -import com.cricketcraft.chisel.init.Features; -import com.cricketcraft.chisel.inventory.ContainerAutoChisel; -import com.cricketcraft.chisel.inventory.ContainerChisel; -import com.cricketcraft.chisel.inventory.ContainerPresent; -import com.cricketcraft.chisel.inventory.InventoryChiselSelection; import com.cricketcraft.chisel.item.chisel.ChiselController; +import com.cricketcraft.chisel.network.ChiselGuiHandler; import com.cricketcraft.chisel.network.PacketHandler; import com.cricketcraft.chisel.proxy.CommonProxy; import com.cricketcraft.chisel.utils.General; @@ -48,7 +36,6 @@ 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; @@ -119,7 +106,7 @@ public class Chisel { @EventHandler public void preInit(FMLPreInitializationEvent event) { - + File configFile = event.getSuggestedConfigurationFile(); Configurations.configExists = configFile.exists(); Configurations.config = new Configuration(configFile); @@ -139,44 +126,7 @@ public class Chisel { public void init(FMLInitializationEvent event) { Features.init(); - NetworkRegistry.INSTANCE.registerGuiHandler(this, new IGuiHandler() { - - @Override - public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { - switch (ID) { - case 0: - return new ContainerChisel(player.inventory, new InventoryChiselSelection(null)); - case 1: - TileEntity tileentity = world.getTileEntity(x, y, z); - if (tileentity instanceof TileEntityAutoChisel) - return new ContainerAutoChisel(player.inventory, (TileEntityAutoChisel) tileentity); - case 2: - TileEntity tileEntity = world.getTileEntity(x, y, z); - if (tileEntity instanceof TileEntityPresent) - return new ContainerPresent(player.inventory, (TileEntityPresent) tileEntity); - default: - return null; - } - } - - @Override - public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { - switch (ID) { - case 0: - return new GuiChisel(player.inventory, new InventoryChiselSelection(null)); - case 1: - TileEntity tileentity = world.getTileEntity(x, y, z); - if (tileentity instanceof TileEntityAutoChisel) - return new GuiAutoChisel(player.inventory, (TileEntityAutoChisel) tileentity); - case 2: - TileEntity tileEntity = world.getTileEntity(x, y, z); - if (tileEntity instanceof TileEntityPresent) - return new GuiPresent(player.inventory, (TileEntityPresent) tileEntity); - default: - return null; - } - } - }); + NetworkRegistry.INSTANCE.registerGuiHandler(this, new ChiselGuiHandler()); registerWorldgen(Features.MARBLE, ChiselBlocks.marble, Configurations.marbleAmount); registerWorldgen(Features.LIMESTONE, ChiselBlocks.limestone, Configurations.limestoneAmount); diff --git a/src/main/java/com/cricketcraft/chisel/init/Features.java b/src/main/java/com/cricketcraft/chisel/Features.java similarity index 99% rename from src/main/java/com/cricketcraft/chisel/init/Features.java rename to src/main/java/com/cricketcraft/chisel/Features.java index 95b8e29a..b916e08a 100644 --- a/src/main/java/com/cricketcraft/chisel/init/Features.java +++ b/src/main/java/com/cricketcraft/chisel/Features.java @@ -1,4 +1,4 @@ -package com.cricketcraft.chisel.init; +package com.cricketcraft.chisel; import net.minecraft.block.Block; import net.minecraft.block.material.Material; @@ -12,7 +12,6 @@ import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.oredict.ShapedOreRecipe; import net.minecraftforge.oredict.ShapelessOreRecipe; -import com.cricketcraft.chisel.Chisel; import com.cricketcraft.chisel.block.BlockAutoChisel; import com.cricketcraft.chisel.block.BlockBeaconBase; import com.cricketcraft.chisel.block.BlockCarvable; @@ -59,6 +58,9 @@ import com.cricketcraft.chisel.config.Configurations; import com.cricketcraft.chisel.entity.EntityBallOMoss; import com.cricketcraft.chisel.entity.EntityCloudInABottle; import com.cricketcraft.chisel.entity.EntitySmashingRock; +import com.cricketcraft.chisel.init.ChiselBlocks; +import com.cricketcraft.chisel.init.ChiselItems; +import com.cricketcraft.chisel.init.ChiselTabs; import com.cricketcraft.chisel.item.ItemBallOMoss; import com.cricketcraft.chisel.item.ItemCarvable; import com.cricketcraft.chisel.item.ItemCloudInABottle; @@ -135,8 +137,7 @@ public enum Features { final String blockName = "antiBlock" + ItemDye.field_150921_b[i]; String oreName = "antiBlock" + ItemDye.field_150921_b[i]; - antiBlock.carverHelper - .addVariation("tile.antiBlock." + ItemDye.field_150921_b[i] + ".desc", i, "antiblock/" + ItemDye.field_150921_b[i] + "-antiBlock"); + antiBlock.carverHelper.addVariation("tile.antiBlock." + ItemDye.field_150921_b[i] + ".desc", i, "antiblock/" + ItemDye.field_150921_b[i] + "-antiBlock"); Carving.chisel.registerOre(blockName, oreName); } @@ -145,7 +146,7 @@ public enum Features { @Override void addRecipes() { - // TODO: Add a recipe + // TODO Add a recipe } @Override @@ -2456,9 +2457,9 @@ public enum Features { ; - static int meta = 0; + private static int meta = 0; - public static void init() { + static void init() { loadRecipes(); } @@ -2504,7 +2505,7 @@ public enum Features { return false; } - public static void preInit() { + static void preInit() { loadBlocks(); loadItems(); } diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableAntiBlock.java b/src/main/java/com/cricketcraft/chisel/block/BlockCarvableAntiBlock.java index 8b3bea59..6dbfbc28 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableAntiBlock.java +++ b/src/main/java/com/cricketcraft/chisel/block/BlockCarvableAntiBlock.java @@ -1,20 +1,10 @@ package com.cricketcraft.chisel.block; +import net.minecraft.block.material.Material; + import com.cricketcraft.chisel.Chisel; import com.cricketcraft.chisel.api.ICarvable; import com.cricketcraft.chisel.carving.CarvableHelper; -import com.cricketcraft.chisel.carving.CarvableVariation; -import net.minecraft.block.Block; -import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.stats.StatList; -import net.minecraft.util.IIcon; -import net.minecraft.world.World; - -import java.util.List; public class BlockCarvableAntiBlock extends BlockCarvable implements ICarvable { diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockCloud.java b/src/main/java/com/cricketcraft/chisel/block/BlockCloud.java index ab63a737..7a644302 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockCloud.java +++ b/src/main/java/com/cricketcraft/chisel/block/BlockCloud.java @@ -9,7 +9,6 @@ import net.minecraft.item.Item; import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; import com.cricketcraft.chisel.config.Configurations; diff --git a/src/main/java/com/cricketcraft/chisel/carving/CarvableHelper.java b/src/main/java/com/cricketcraft/chisel/carving/CarvableHelper.java index fc5e3215..b495773b 100644 --- a/src/main/java/com/cricketcraft/chisel/carving/CarvableHelper.java +++ b/src/main/java/com/cricketcraft/chisel/carving/CarvableHelper.java @@ -276,10 +276,6 @@ public class CarvableHelper { public void register(Block block, String name, Class cl) { registerBlock(block, name, cl); - if (block instanceof BlockCarvableSlab) { - BlockCarvableSlab slab = (BlockCarvableSlab) block; - } - for (CarvableVariation variation : variations) { registerVariation(name, variation, block, variation.metadata); diff --git a/src/main/java/com/cricketcraft/chisel/carving/CarvingGroup.java b/src/main/java/com/cricketcraft/chisel/carving/CarvingGroup.java index d90ea6bd..90507d54 100644 --- a/src/main/java/com/cricketcraft/chisel/carving/CarvingGroup.java +++ b/src/main/java/com/cricketcraft/chisel/carving/CarvingGroup.java @@ -1,6 +1,7 @@ package com.cricketcraft.chisel.carving; import java.util.ArrayList; +import java.util.List; public class CarvingGroup { @@ -13,5 +14,5 @@ public class CarvingGroup { String sound; String oreName; - ArrayList variations = new ArrayList(); + List variations = new ArrayList(); } \ No newline at end of file diff --git a/src/main/java/com/cricketcraft/chisel/carving/CarvingVariation.java b/src/main/java/com/cricketcraft/chisel/carving/CarvingVariation.java index e5bac0a9..20fa16ca 100644 --- a/src/main/java/com/cricketcraft/chisel/carving/CarvingVariation.java +++ b/src/main/java/com/cricketcraft/chisel/carving/CarvingVariation.java @@ -2,7 +2,7 @@ package com.cricketcraft.chisel.carving; import net.minecraft.block.Block; -public class CarvingVariation implements Comparable { +public class CarvingVariation implements Comparable { public CarvingVariation(Block block, int metadata, int ord) { this.order = ord; @@ -12,8 +12,8 @@ public class CarvingVariation implements Comparable { } @Override - public int compareTo(Object a) { - return order - ((CarvingVariation) a).order; + public int compareTo(CarvingVariation a) { + return order - a.order; } public int order; 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 f64ef0b4..b29e10d7 100644 --- a/src/main/java/com/cricketcraft/chisel/client/gui/GuiChiselConfig.java +++ b/src/main/java/com/cricketcraft/chisel/client/gui/GuiChiselConfig.java @@ -1,6 +1,7 @@ package com.cricketcraft.chisel.client.gui; import net.minecraft.client.gui.GuiScreen; +import net.minecraftforge.common.config.ConfigCategory; import net.minecraftforge.common.config.ConfigElement; import net.minecraftforge.common.config.Configuration; @@ -12,7 +13,7 @@ import cpw.mods.fml.client.config.GuiConfig; public class GuiChiselConfig extends GuiConfig { public GuiChiselConfig(GuiScreen parent) { - super(parent, new ConfigElement(Configurations.config.getCategory(Configuration.CATEGORY_GENERAL)).getChildElements(), Chisel.MOD_ID, false, false, GuiConfig + super(parent, new ConfigElement(Configurations.config.getCategory(Configuration.CATEGORY_GENERAL)).getChildElements(), Chisel.MOD_ID, false, false, GuiConfig .getAbridgedConfigPath(Configurations.config.toString())); } } diff --git a/src/main/java/com/cricketcraft/chisel/client/gui/GuiPresent.java b/src/main/java/com/cricketcraft/chisel/client/gui/GuiPresent.java index 10f93d52..dea00f6d 100644 --- a/src/main/java/com/cricketcraft/chisel/client/gui/GuiPresent.java +++ b/src/main/java/com/cricketcraft/chisel/client/gui/GuiPresent.java @@ -2,7 +2,6 @@ package com.cricketcraft.chisel.client.gui; 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; @@ -13,7 +12,6 @@ import com.cricketcraft.chisel.inventory.ContainerPresent; public class GuiPresent extends GuiContainer { private static final ResourceLocation gui = new ResourceLocation("chisel:textures/present-gui.png"); - private IInventory upper, lower; private int rows; public GuiPresent(InventoryPlayer inventoryPlayer, TileEntityPresent tileEntityPresent) { diff --git a/src/main/java/com/cricketcraft/chisel/client/gui/Scrollbar.java b/src/main/java/com/cricketcraft/chisel/client/gui/Scrollbar.java index 6be1eaeb..f8e4f11e 100644 --- a/src/main/java/com/cricketcraft/chisel/client/gui/Scrollbar.java +++ b/src/main/java/com/cricketcraft/chisel/client/gui/Scrollbar.java @@ -28,8 +28,7 @@ public abstract class Scrollbar extends GuiButton { } /** - * Returns true if the mouse has been pressed on this control. Equivalent of - * MouseListener.mousePressed(MouseEvent e). + * Returns true if the mouse has been pressed on this control. Equivalent of MouseListener.mousePressed(MouseEvent e). */ @Override public boolean mousePressed(Minecraft mc, int x, int y) { @@ -71,7 +70,6 @@ public abstract class Scrollbar extends GuiButton { } } - int bottom = yPosition + height; GeneralClient.bind("/gui/allitems.png"); drawTexturedModalRect(xPosition, yPosition + (int) ((height - elementHeight) * offset), active ? 232 : 244, 0, 12, elementHeight); } diff --git a/src/main/java/com/cricketcraft/chisel/client/gui/TexturedBox.java b/src/main/java/com/cricketcraft/chisel/client/gui/TexturedBox.java index 655d3fc5..b1f7de7a 100644 --- a/src/main/java/com/cricketcraft/chisel/client/gui/TexturedBox.java +++ b/src/main/java/com/cricketcraft/chisel/client/gui/TexturedBox.java @@ -49,9 +49,7 @@ public class TexturedBox { int u3 = u1 + texw - borderRight; int v2 = v1 + borderTop; int v3 = v1 + texh - borderBottom; - int texw1 = borderLeft; int texw2 = tw - borderLeft - borderRight; - int texw3 = borderRight; int texh1 = borderTop; int texh2 = th - borderTop - borderBottom; int texh3 = borderBottom; diff --git a/src/main/java/com/cricketcraft/chisel/client/render/BlockCTMNoLightRenderer.java b/src/main/java/com/cricketcraft/chisel/client/render/BlockCTMNoLightRenderer.java index d7dade4e..6c28c4f1 100644 --- a/src/main/java/com/cricketcraft/chisel/client/render/BlockCTMNoLightRenderer.java +++ b/src/main/java/com/cricketcraft/chisel/client/render/BlockCTMNoLightRenderer.java @@ -1,20 +1,19 @@ package com.cricketcraft.chisel.client.render; +import net.minecraft.block.Block; +import net.minecraft.client.renderer.RenderBlocks; +import net.minecraft.world.IBlockAccess; + +import org.lwjgl.opengl.GL11; + import com.cricketcraft.chisel.Chisel; import com.cricketcraft.chisel.api.ICarvable; -import com.cricketcraft.chisel.block.BlockCarvableGlow; import com.cricketcraft.chisel.carving.CarvableHelper; import com.cricketcraft.chisel.carving.CarvableVariation; import com.cricketcraft.chisel.utils.Drawing; -import com.cricketcraft.chisel.utils.GeneralClient; + 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.client.renderer.Tessellator; -import net.minecraft.item.ItemDye; -import net.minecraft.world.IBlockAccess; -import org.lwjgl.opengl.GL11; public class BlockCTMNoLightRenderer implements ISimpleBlockRenderingHandler { diff --git a/src/main/java/com/cricketcraft/chisel/client/render/BlockEldritchRenderer.java b/src/main/java/com/cricketcraft/chisel/client/render/BlockEldritchRenderer.java index d723fb0d..01acad86 100644 --- a/src/main/java/com/cricketcraft/chisel/client/render/BlockEldritchRenderer.java +++ b/src/main/java/com/cricketcraft/chisel/client/render/BlockEldritchRenderer.java @@ -29,7 +29,6 @@ public class BlockEldritchRenderer implements ISimpleBlockRenderingHandler { @Override public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks rendererOld) { - int meta = world.getBlockMetadata(x, y, z); // tessellator.setBrightness(block.getMixedBrightnessForBlock(world, x, // y, z)); diff --git a/src/main/java/com/cricketcraft/chisel/client/render/BlockLayeredRenderer.java b/src/main/java/com/cricketcraft/chisel/client/render/BlockLayeredRenderer.java index 3d900a2d..f374a161 100644 --- a/src/main/java/com/cricketcraft/chisel/client/render/BlockLayeredRenderer.java +++ b/src/main/java/com/cricketcraft/chisel/client/render/BlockLayeredRenderer.java @@ -2,7 +2,6 @@ package com.cricketcraft.chisel.client.render; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.client.renderer.Tessellator; import net.minecraft.world.IBlockAccess; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/com/cricketcraft/chisel/client/render/BlockMarblePaneRenderer.java b/src/main/java/com/cricketcraft/chisel/client/render/BlockMarblePaneRenderer.java index cda75e2c..f813eded 100644 --- a/src/main/java/com/cricketcraft/chisel/client/render/BlockMarblePaneRenderer.java +++ b/src/main/java/com/cricketcraft/chisel/client/render/BlockMarblePaneRenderer.java @@ -204,7 +204,6 @@ public class BlockMarblePaneRenderer implements ISimpleBlockRenderingHandler { BlockPane block = (BlockPane) b; Tessellator tessellator = Tessellator.instance; - int worldHeight = world.getHeight(); tessellator.setBrightness(block.getMixedBrightnessForBlock(world, x, y, z)); float f = 1.0F; diff --git a/src/main/java/com/cricketcraft/chisel/Waila.java b/src/main/java/com/cricketcraft/chisel/compat/Waila.java similarity index 97% rename from src/main/java/com/cricketcraft/chisel/Waila.java rename to src/main/java/com/cricketcraft/chisel/compat/Waila.java index cf6a1461..f93f162a 100644 --- a/src/main/java/com/cricketcraft/chisel/Waila.java +++ b/src/main/java/com/cricketcraft/chisel/compat/Waila.java @@ -1,4 +1,4 @@ -package com.cricketcraft.chisel; +package com.cricketcraft.chisel.compat; import java.util.List; diff --git a/src/main/java/com/cricketcraft/chisel/config/Configurations.java b/src/main/java/com/cricketcraft/chisel/config/Configurations.java index f064eca4..06b9d95a 100644 --- a/src/main/java/com/cricketcraft/chisel/config/Configurations.java +++ b/src/main/java/com/cricketcraft/chisel/config/Configurations.java @@ -6,7 +6,7 @@ import net.minecraftforge.common.config.Configuration; import org.apache.commons.lang3.StringUtils; -import com.cricketcraft.chisel.init.Features; +import com.cricketcraft.chisel.Features; public class Configurations { diff --git a/src/main/java/com/cricketcraft/chisel/init/ChiselBlocks.java b/src/main/java/com/cricketcraft/chisel/init/ChiselBlocks.java index cf594abf..12da929e 100644 --- a/src/main/java/com/cricketcraft/chisel/init/ChiselBlocks.java +++ b/src/main/java/com/cricketcraft/chisel/init/ChiselBlocks.java @@ -1,10 +1,42 @@ package com.cricketcraft.chisel.init; -import com.cricketcraft.chisel.Chisel; -import com.cricketcraft.chisel.block.*; -import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder; import net.minecraft.block.Block; +import com.cricketcraft.chisel.Chisel; +import com.cricketcraft.chisel.block.BlockCarvable; +import com.cricketcraft.chisel.block.BlockCarvableGlass; +import com.cricketcraft.chisel.block.BlockCarvableGlowstone; +import com.cricketcraft.chisel.block.BlockCarvableIce; +import com.cricketcraft.chisel.block.BlockCarvableIcePillar; +import com.cricketcraft.chisel.block.BlockCarvableIceStairs; +import com.cricketcraft.chisel.block.BlockCarvableLayered; +import com.cricketcraft.chisel.block.BlockCarvablePackedIce; +import com.cricketcraft.chisel.block.BlockCarvablePackedIcePillar; +import com.cricketcraft.chisel.block.BlockCarvablePackedIceStairs; +import com.cricketcraft.chisel.block.BlockCarvablePane; +import com.cricketcraft.chisel.block.BlockCarvablePillar; +import com.cricketcraft.chisel.block.BlockCarvablePowered; +import com.cricketcraft.chisel.block.BlockCarvablePumpkin; +import com.cricketcraft.chisel.block.BlockCarvableSand; +import com.cricketcraft.chisel.block.BlockCarvableSlab; +import com.cricketcraft.chisel.block.BlockCarvableStairs; +import com.cricketcraft.chisel.block.BlockCarvableTorch; +import com.cricketcraft.chisel.block.BlockCloud; +import com.cricketcraft.chisel.block.BlockConcrete; +import com.cricketcraft.chisel.block.BlockGrimstone; +import com.cricketcraft.chisel.block.BlockHolystone; +import com.cricketcraft.chisel.block.BlockLavastone; +import com.cricketcraft.chisel.block.BlockMarbleCarpet; +import com.cricketcraft.chisel.block.BlockMarbleTexturedOre; +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.BlockWaterstone; + +import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder; + @ObjectHolder(Chisel.MOD_ID) public final class ChiselBlocks { diff --git a/src/main/java/com/cricketcraft/chisel/init/ChiselTabs.java b/src/main/java/com/cricketcraft/chisel/init/ChiselTabs.java index 26089813..abe7eed5 100644 --- a/src/main/java/com/cricketcraft/chisel/init/ChiselTabs.java +++ b/src/main/java/com/cricketcraft/chisel/init/ChiselTabs.java @@ -4,6 +4,8 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import com.cricketcraft.chisel.Features; + public class ChiselTabs { private static class CustomCreativeTab extends CreativeTabs { diff --git a/src/main/java/com/cricketcraft/chisel/proxy/ClientProxy.java b/src/main/java/com/cricketcraft/chisel/proxy/ClientProxy.java index d634fd6d..9a57427d 100644 --- a/src/main/java/com/cricketcraft/chisel/proxy/ClientProxy.java +++ b/src/main/java/com/cricketcraft/chisel/proxy/ClientProxy.java @@ -1,8 +1,27 @@ package com.cricketcraft.chisel.proxy; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.entity.RenderSnowball; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.world.World; +import net.minecraftforge.client.MinecraftForgeClient; + import com.cricketcraft.chisel.block.tileentity.TileEntityAutoChisel; import com.cricketcraft.chisel.block.tileentity.TileEntityPresent; -import com.cricketcraft.chisel.client.render.*; +import com.cricketcraft.chisel.client.render.BlockAdvancedMarbleRenderer; +import com.cricketcraft.chisel.client.render.BlockCTMNoLightRenderer; +import com.cricketcraft.chisel.client.render.BlockCarpetRenderer; +import com.cricketcraft.chisel.client.render.BlockEldritchRenderer; +import com.cricketcraft.chisel.client.render.BlockGlowRenderer; +import com.cricketcraft.chisel.client.render.BlockLayeredRenderer; +import com.cricketcraft.chisel.client.render.BlockMarblePaneRenderer; +import com.cricketcraft.chisel.client.render.BlockMarblePillarRenderer; +import com.cricketcraft.chisel.client.render.BlockMarbleStairsRenderer; +import com.cricketcraft.chisel.client.render.BlockRoadLineRenderer; +import com.cricketcraft.chisel.client.render.BlockSnakeStoneRenderer; +import com.cricketcraft.chisel.client.render.BlockTexturedOreRenderer; +import com.cricketcraft.chisel.client.render.RenderStandardBlockNoSunlight; import com.cricketcraft.chisel.client.render.item.ItemChiselRenderer; import com.cricketcraft.chisel.client.render.item.ItemPresentRenderer; import com.cricketcraft.chisel.client.render.tile.RenderAutoChisel; @@ -12,14 +31,9 @@ import com.cricketcraft.chisel.entity.EntityCloudInABottle; import com.cricketcraft.chisel.entity.EntitySmashingRock; import com.cricketcraft.chisel.init.ChiselBlocks; import com.cricketcraft.chisel.init.ChiselItems; + import cpw.mods.fml.client.registry.ClientRegistry; import cpw.mods.fml.client.registry.RenderingRegistry; -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.entity.RenderSnowball; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.world.World; -import net.minecraftforge.client.MinecraftForgeClient; public class ClientProxy extends CommonProxy {