diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/api/ICarvable.java b/src/main/java/com/cricketcraft/minecraft/chisel/api/ICarvable.java deleted file mode 100644 index 6bc5c312..00000000 --- a/src/main/java/com/cricketcraft/minecraft/chisel/api/ICarvable.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.cricketcraft.minecraft.chisel.api; - -import com.cricketcraft.minecraft.chisel.carving.CarvableVariation; - -public interface ICarvable -{ - public CarvableVariation getVariation(int metadata); -} diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/BlockNameConversion.java b/src/main/java/info/jbcs/minecraft/chisel/BlockNameConversion.java similarity index 98% rename from src/main/java/com/cricketcraft/minecraft/chisel/BlockNameConversion.java rename to src/main/java/info/jbcs/minecraft/chisel/BlockNameConversion.java index 02548e87..d3bacc48 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/BlockNameConversion.java +++ b/src/main/java/info/jbcs/minecraft/chisel/BlockNameConversion.java @@ -1,12 +1,11 @@ -package com.cricketcraft.minecraft.chisel; +package info.jbcs.minecraft.chisel; + +import info.jbcs.minecraft.chisel.utils.General; import java.util.HashMap; import net.minecraft.block.Block; import net.minecraft.item.Item; - -import com.cricketcraft.minecraft.chisel.utils.General; - import cpw.mods.fml.common.FMLLog; import cpw.mods.fml.common.registry.GameRegistry; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/Chisel.java b/src/main/java/info/jbcs/minecraft/chisel/Chisel.java similarity index 79% rename from src/main/java/com/cricketcraft/minecraft/chisel/Chisel.java rename to src/main/java/info/jbcs/minecraft/chisel/Chisel.java index a2a4beae..9c79d11d 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/Chisel.java +++ b/src/main/java/info/jbcs/minecraft/chisel/Chisel.java @@ -1,4 +1,25 @@ -package com.cricketcraft.minecraft.chisel; +package info.jbcs.minecraft.chisel; + +import info.jbcs.minecraft.chisel.block.BlockCarvable; +import info.jbcs.minecraft.chisel.block.tileentity.TileEntityAutoChisel; +import info.jbcs.minecraft.chisel.block.tileentity.TileEntityPresent; +import info.jbcs.minecraft.chisel.client.gui.GuiAutoChisel; +import info.jbcs.minecraft.chisel.client.gui.GuiChisel; +import info.jbcs.minecraft.chisel.client.gui.GuiPresent; +import info.jbcs.minecraft.chisel.compat.Compatibility; +import info.jbcs.minecraft.chisel.compat.FMPIntegration; +import info.jbcs.minecraft.chisel.compat.ModIntegration; +import info.jbcs.minecraft.chisel.init.ModBlocks; +import info.jbcs.minecraft.chisel.init.ModItems; +import info.jbcs.minecraft.chisel.init.ModTabs; +import info.jbcs.minecraft.chisel.inventory.ContainerAutoChisel; +import info.jbcs.minecraft.chisel.inventory.ContainerChisel; +import info.jbcs.minecraft.chisel.inventory.ContainerPresent; +import info.jbcs.minecraft.chisel.inventory.InventoryChiselSelection; +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; @@ -9,28 +30,6 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.config.Configuration; - -import com.cricketcraft.minecraft.chisel.block.BlockCarvable; -import com.cricketcraft.minecraft.chisel.block.tileentity.TileEntityAutoChisel; -import com.cricketcraft.minecraft.chisel.block.tileentity.TileEntityPresent; -import com.cricketcraft.minecraft.chisel.client.gui.GuiAutoChisel; -import com.cricketcraft.minecraft.chisel.client.gui.GuiChisel; -import com.cricketcraft.minecraft.chisel.client.gui.GuiPresent; -import com.cricketcraft.minecraft.chisel.compat.Compatibility; -import com.cricketcraft.minecraft.chisel.compat.FMPIntegration; -import com.cricketcraft.minecraft.chisel.compat.ModIntegration; -import com.cricketcraft.minecraft.chisel.init.ModBlocks; -import com.cricketcraft.minecraft.chisel.init.ModItems; -import com.cricketcraft.minecraft.chisel.init.ModTabs; -import com.cricketcraft.minecraft.chisel.inventory.ContainerAutoChisel; -import com.cricketcraft.minecraft.chisel.inventory.ContainerChisel; -import com.cricketcraft.minecraft.chisel.inventory.ContainerPresent; -import com.cricketcraft.minecraft.chisel.inventory.InventoryChiselSelection; -import com.cricketcraft.minecraft.chisel.proxy.CommonProxy; -import com.cricketcraft.minecraft.chisel.utils.General; -import com.cricketcraft.minecraft.chisel.world.GeneratorLimestone; -import com.cricketcraft.minecraft.chisel.world.GeneratorMarble; - import cpw.mods.fml.client.event.ConfigChangedEvent; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.FMLLog; @@ -53,11 +52,11 @@ 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 = "com.cricketcraft.minecraft.chisel.client.gui.GuiFactory", dependencies = "after:ForgeMultipart;") +@Mod(modid = Chisel.MOD_ID, name = Chisel.MOD_NAME, version = Chisel.VERSION, guiFactory = "info.jbcs.minecraft.chisel.client.gui.GuiFactory", dependencies = "after:ForgeMultipart;") public class Chisel { public static final String MOD_ID = "chisel"; - public static final BlockCarvable.SoundType soundTempleFootstep = new com.cricketcraft.minecraft.chisel.block.BlockCarvable.SoundType("dig.stone", MOD_ID + ":step.templeblock", 1.0f, 1.0f); + public static final BlockCarvable.SoundType soundTempleFootstep = new BlockCarvable.SoundType("dig.stone", MOD_ID + ":step.templeblock", 1.0f, 1.0f); public static final String MOD_NAME = "Chisel 2"; public static final String VERSION = "2.1.3"; public static final BlockCarvable.SoundType soundHolystoneFootstep = new BlockCarvable.SoundType("holystone", 1.0f, 1.0f); @@ -70,7 +69,7 @@ public class Chisel @Instance(MOD_ID) public static Chisel instance; - @SidedProxy(clientSide = "com.cricketcraft.minecraft.chisel.proxy.ClientProxy", serverSide = "com.cricketcraft.minecraft.chisel.proxy.CommonProxy") + @SidedProxy(clientSide = "info.jbcs.minecraft.chisel.proxy.ClientProxy", serverSide = "info.jbcs.minecraft.chisel.proxy.CommonProxy") public static CommonProxy proxy; @SideOnly(Side.CLIENT) @@ -186,7 +185,7 @@ public class Chisel MinecraftForge.EVENT_BUS.register(new ChiselLeftClick()); FMLCommonHandler.instance().bus().register(instance); - FMLInterModComms.sendMessage("Waila", "register", "com.cricketcraft.minecraft.chisel.Waila.register"); + FMLInterModComms.sendMessage("Waila", "register", "info.jbcs.minecraft.chisel.Waila.register"); } @EventHandler diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/ChiselLeftClick.java b/src/main/java/info/jbcs/minecraft/chisel/ChiselLeftClick.java similarity index 94% rename from src/main/java/com/cricketcraft/minecraft/chisel/ChiselLeftClick.java rename to src/main/java/info/jbcs/minecraft/chisel/ChiselLeftClick.java index 2a84c318..4d8b442f 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/ChiselLeftClick.java +++ b/src/main/java/info/jbcs/minecraft/chisel/ChiselLeftClick.java @@ -1,4 +1,11 @@ -package com.cricketcraft.minecraft.chisel; +package info.jbcs.minecraft.chisel; + +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; @@ -12,14 +19,6 @@ import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.event.entity.player.PlayerInteractEvent; import net.minecraftforge.event.world.BlockEvent; - -import com.cricketcraft.minecraft.chisel.api.ChiselMode; -import com.cricketcraft.minecraft.chisel.carving.CarvingVariation; -import com.cricketcraft.minecraft.chisel.client.GeneralChiselClient; -import com.cricketcraft.minecraft.chisel.init.ModBlocks; -import com.cricketcraft.minecraft.chisel.init.ModItems; -import com.cricketcraft.minecraft.chisel.item.ItemChisel; - import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.eventhandler.SubscribeEvent; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/Configurations.java b/src/main/java/info/jbcs/minecraft/chisel/Configurations.java similarity index 98% rename from src/main/java/com/cricketcraft/minecraft/chisel/Configurations.java rename to src/main/java/info/jbcs/minecraft/chisel/Configurations.java index 7d9ad0cc..2918f600 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/Configurations.java +++ b/src/main/java/info/jbcs/minecraft/chisel/Configurations.java @@ -1,4 +1,4 @@ -package com.cricketcraft.minecraft.chisel; +package info.jbcs.minecraft.chisel; import net.minecraftforge.common.config.Configuration; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/Crafting.java b/src/main/java/info/jbcs/minecraft/chisel/Crafting.java similarity index 98% rename from src/main/java/com/cricketcraft/minecraft/chisel/Crafting.java rename to src/main/java/info/jbcs/minecraft/chisel/Crafting.java index fd381add..b2bd25c4 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/Crafting.java +++ b/src/main/java/info/jbcs/minecraft/chisel/Crafting.java @@ -1,5 +1,7 @@ -package com.cricketcraft.minecraft.chisel; +package info.jbcs.minecraft.chisel; +import info.jbcs.minecraft.chisel.init.ModBlocks; +import info.jbcs.minecraft.chisel.init.ModItems; import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.init.Items; @@ -8,10 +10,6 @@ import net.minecraft.item.crafting.FurnaceRecipes; import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.oredict.ShapedOreRecipe; import net.minecraftforge.oredict.ShapelessOreRecipe; - -import com.cricketcraft.minecraft.chisel.init.ModBlocks; -import com.cricketcraft.minecraft.chisel.init.ModItems; - import cpw.mods.fml.common.registry.GameRegistry; public class Crafting { diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/Packets.java b/src/main/java/info/jbcs/minecraft/chisel/Packets.java similarity index 96% rename from src/main/java/com/cricketcraft/minecraft/chisel/Packets.java rename to src/main/java/info/jbcs/minecraft/chisel/Packets.java index bb663f29..abe3899c 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/Packets.java +++ b/src/main/java/info/jbcs/minecraft/chisel/Packets.java @@ -1,4 +1,4 @@ -package com.cricketcraft.minecraft.chisel; +package info.jbcs.minecraft.chisel; public class Packets// extends MessageHandlerBase { diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/Waila.java b/src/main/java/info/jbcs/minecraft/chisel/Waila.java similarity index 93% rename from src/main/java/com/cricketcraft/minecraft/chisel/Waila.java rename to src/main/java/info/jbcs/minecraft/chisel/Waila.java index 6bbe52aa..caed69eb 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/Waila.java +++ b/src/main/java/info/jbcs/minecraft/chisel/Waila.java @@ -1,4 +1,6 @@ -package com.cricketcraft.minecraft.chisel; +package info.jbcs.minecraft.chisel; + +import info.jbcs.minecraft.chisel.block.BlockCarvable; import java.util.List; @@ -8,8 +10,6 @@ import mcp.mobius.waila.api.IWailaDataProvider; import mcp.mobius.waila.api.IWailaRegistrar; import net.minecraft.item.ItemStack; -import com.cricketcraft.minecraft.chisel.block.BlockCarvable; - public class Waila implements IWailaDataProvider { diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/api/ChiselMode.java b/src/main/java/info/jbcs/minecraft/chisel/api/ChiselMode.java similarity index 63% rename from src/main/java/com/cricketcraft/minecraft/chisel/api/ChiselMode.java rename to src/main/java/info/jbcs/minecraft/chisel/api/ChiselMode.java index e24651bc..186803e6 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/api/ChiselMode.java +++ b/src/main/java/info/jbcs/minecraft/chisel/api/ChiselMode.java @@ -1,4 +1,4 @@ -package com.cricketcraft.minecraft.chisel.api; +package info.jbcs.minecraft.chisel.api; public enum ChiselMode { diff --git a/src/main/java/info/jbcs/minecraft/chisel/api/ICarvable.java b/src/main/java/info/jbcs/minecraft/chisel/api/ICarvable.java new file mode 100644 index 00000000..9f42de61 --- /dev/null +++ b/src/main/java/info/jbcs/minecraft/chisel/api/ICarvable.java @@ -0,0 +1,8 @@ +package info.jbcs.minecraft.chisel.api; + +import info.jbcs.minecraft.chisel.carving.CarvableVariation; + +public interface ICarvable +{ + public CarvableVariation getVariation(int metadata); +} diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/api/IChiselMode.java b/src/main/java/info/jbcs/minecraft/chisel/api/IChiselMode.java similarity index 73% rename from src/main/java/com/cricketcraft/minecraft/chisel/api/IChiselMode.java rename to src/main/java/info/jbcs/minecraft/chisel/api/IChiselMode.java index dc610112..1e86535f 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/api/IChiselMode.java +++ b/src/main/java/info/jbcs/minecraft/chisel/api/IChiselMode.java @@ -1,4 +1,4 @@ -package com.cricketcraft.minecraft.chisel.api; +package info.jbcs.minecraft.chisel.api; import net.minecraft.item.ItemStack; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/api/IFacade.java b/src/main/java/info/jbcs/minecraft/chisel/api/IFacade.java similarity index 84% rename from src/main/java/com/cricketcraft/minecraft/chisel/api/IFacade.java rename to src/main/java/info/jbcs/minecraft/chisel/api/IFacade.java index f104c364..de49cf38 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/api/IFacade.java +++ b/src/main/java/info/jbcs/minecraft/chisel/api/IFacade.java @@ -1,4 +1,4 @@ -package com.cricketcraft.minecraft.chisel.api; +package info.jbcs.minecraft.chisel.api; import net.minecraft.block.Block; import net.minecraft.world.IBlockAccess; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockAutoChisel.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockAutoChisel.java similarity index 93% rename from src/main/java/com/cricketcraft/minecraft/chisel/block/BlockAutoChisel.java rename to src/main/java/info/jbcs/minecraft/chisel/block/BlockAutoChisel.java index 14e390b8..8899a5aa 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockAutoChisel.java +++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockAutoChisel.java @@ -1,4 +1,9 @@ -package com.cricketcraft.minecraft.chisel.block; +package info.jbcs.minecraft.chisel.block; + +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; @@ -14,12 +19,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; - -import com.cricketcraft.minecraft.chisel.Chisel; -import com.cricketcraft.minecraft.chisel.block.tileentity.TileEntityAutoChisel; -import com.cricketcraft.minecraft.chisel.init.ModBlocks; -import com.cricketcraft.minecraft.chisel.init.ModItems; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockBeaconBase.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockBeaconBase.java similarity index 85% rename from src/main/java/com/cricketcraft/minecraft/chisel/block/BlockBeaconBase.java rename to src/main/java/info/jbcs/minecraft/chisel/block/BlockBeaconBase.java index 2294de03..ee889ea5 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockBeaconBase.java +++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockBeaconBase.java @@ -1,4 +1,4 @@ -package com.cricketcraft.minecraft.chisel.block; +package info.jbcs.minecraft.chisel.block; import net.minecraft.world.IBlockAccess; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockCarvable.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockCarvable.java similarity index 93% rename from src/main/java/com/cricketcraft/minecraft/chisel/block/BlockCarvable.java rename to src/main/java/info/jbcs/minecraft/chisel/block/BlockCarvable.java index b2dd4126..30d565f3 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockCarvable.java +++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockCarvable.java @@ -1,4 +1,10 @@ -package com.cricketcraft.minecraft.chisel.block; +package info.jbcs.minecraft.chisel.block; + +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; @@ -9,13 +15,6 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; - -import com.cricketcraft.minecraft.chisel.Chisel; -import com.cricketcraft.minecraft.chisel.api.ICarvable; -import com.cricketcraft.minecraft.chisel.carving.CarvableHelper; -import com.cricketcraft.minecraft.chisel.carving.CarvableVariation; -import com.cricketcraft.minecraft.chisel.init.ModTabs; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockCarvableGlass.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockCarvableGlass.java similarity index 83% rename from src/main/java/com/cricketcraft/minecraft/chisel/block/BlockCarvableGlass.java rename to src/main/java/info/jbcs/minecraft/chisel/block/BlockCarvableGlass.java index 0297acc5..489fa921 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockCarvableGlass.java +++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockCarvableGlass.java @@ -1,4 +1,10 @@ -package com.cricketcraft.minecraft.chisel.block; +package info.jbcs.minecraft.chisel.block; + +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; @@ -8,13 +14,6 @@ import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.util.IIcon; - -import com.cricketcraft.minecraft.chisel.Chisel; -import com.cricketcraft.minecraft.chisel.api.ICarvable; -import com.cricketcraft.minecraft.chisel.carving.CarvableHelper; -import com.cricketcraft.minecraft.chisel.carving.CarvableVariation; -import com.cricketcraft.minecraft.chisel.init.ModTabs; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockCarvablePane.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockCarvablePane.java similarity index 81% rename from src/main/java/com/cricketcraft/minecraft/chisel/block/BlockCarvablePane.java rename to src/main/java/info/jbcs/minecraft/chisel/block/BlockCarvablePane.java index 69dc0b15..2aa8627d 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockCarvablePane.java +++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockCarvablePane.java @@ -1,4 +1,10 @@ -package com.cricketcraft.minecraft.chisel.block; +package info.jbcs.minecraft.chisel.block; + +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; @@ -8,13 +14,6 @@ import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.util.IIcon; - -import com.cricketcraft.minecraft.chisel.api.ICarvable; -import com.cricketcraft.minecraft.chisel.carving.CarvableHelper; -import com.cricketcraft.minecraft.chisel.carving.CarvableVariation; -import com.cricketcraft.minecraft.chisel.client.render.BlockMarblePaneRenderer; -import com.cricketcraft.minecraft.chisel.init.ModTabs; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockCarvablePowered.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockCarvablePowered.java similarity index 95% rename from src/main/java/com/cricketcraft/minecraft/chisel/block/BlockCarvablePowered.java rename to src/main/java/info/jbcs/minecraft/chisel/block/BlockCarvablePowered.java index 4d36d58c..97864ce2 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockCarvablePowered.java +++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockCarvablePowered.java @@ -1,4 +1,4 @@ -package com.cricketcraft.minecraft.chisel.block; +package info.jbcs.minecraft.chisel.block; import net.minecraft.block.material.Material; import net.minecraft.world.IBlockAccess; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockCarvablePumpkin.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockCarvablePumpkin.java similarity index 84% rename from src/main/java/com/cricketcraft/minecraft/chisel/block/BlockCarvablePumpkin.java rename to src/main/java/info/jbcs/minecraft/chisel/block/BlockCarvablePumpkin.java index b8367422..301452c0 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockCarvablePumpkin.java +++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockCarvablePumpkin.java @@ -1,13 +1,11 @@ -package com.cricketcraft.minecraft.chisel.block; +package info.jbcs.minecraft.chisel.block; +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 com.cricketcraft.minecraft.chisel.api.ICarvable; -import com.cricketcraft.minecraft.chisel.carving.CarvableHelper; -import com.cricketcraft.minecraft.chisel.carving.CarvableVariation; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockCloud.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockCloud.java similarity index 93% rename from src/main/java/com/cricketcraft/minecraft/chisel/block/BlockCloud.java rename to src/main/java/info/jbcs/minecraft/chisel/block/BlockCloud.java index 3d84d354..391b10ee 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockCloud.java +++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockCloud.java @@ -1,6 +1,8 @@ -package com.cricketcraft.minecraft.chisel.block; +package info.jbcs.minecraft.chisel.block; +import info.jbcs.minecraft.chisel.Configurations; + import java.util.Random; import net.minecraft.block.material.Material; @@ -10,8 +12,6 @@ import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import com.cricketcraft.minecraft.chisel.Configurations; - public class BlockCloud extends BlockCarvable { public BlockCloud() { diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockConcrete.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockConcrete.java similarity index 84% rename from src/main/java/com/cricketcraft/minecraft/chisel/block/BlockConcrete.java rename to src/main/java/info/jbcs/minecraft/chisel/block/BlockConcrete.java index 5e06a332..8d5e6f65 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockConcrete.java +++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockConcrete.java @@ -1,12 +1,10 @@ -package com.cricketcraft.minecraft.chisel.block; +package info.jbcs.minecraft.chisel.block; +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 com.cricketcraft.minecraft.chisel.Configurations; -import com.cricketcraft.minecraft.chisel.client.GeneralChiselClient; - import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockEldritch.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockEldritch.java similarity index 68% rename from src/main/java/com/cricketcraft/minecraft/chisel/block/BlockEldritch.java rename to src/main/java/info/jbcs/minecraft/chisel/block/BlockEldritch.java index 6134ec7a..32d47a1f 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockEldritch.java +++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockEldritch.java @@ -1,6 +1,6 @@ -package com.cricketcraft.minecraft.chisel.block; +package info.jbcs.minecraft.chisel.block; -import com.cricketcraft.minecraft.chisel.Chisel; +import info.jbcs.minecraft.chisel.Chisel; public class BlockEldritch extends BlockCarvable diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockGrimstone.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockGrimstone.java similarity index 75% rename from src/main/java/com/cricketcraft/minecraft/chisel/block/BlockGrimstone.java rename to src/main/java/info/jbcs/minecraft/chisel/block/BlockGrimstone.java index d52ef090..30ce6540 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockGrimstone.java +++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockGrimstone.java @@ -1,4 +1,9 @@ -package com.cricketcraft.minecraft.chisel.block; +package info.jbcs.minecraft.chisel.block; + +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; @@ -7,11 +12,6 @@ import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.IIcon; import net.minecraft.world.World; -import com.cricketcraft.minecraft.chisel.Chisel; -import com.cricketcraft.minecraft.chisel.client.GeneralChiselClient; -import com.cricketcraft.minecraft.chisel.init.ModTabs; -import com.cricketcraft.minecraft.chisel.utils.General; - public class BlockGrimstone extends BlockCarvable { public IIcon iconStar; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockHolystone.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockHolystone.java similarity index 82% rename from src/main/java/com/cricketcraft/minecraft/chisel/block/BlockHolystone.java rename to src/main/java/info/jbcs/minecraft/chisel/block/BlockHolystone.java index 2625b84e..359a6e0c 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockHolystone.java +++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockHolystone.java @@ -1,4 +1,7 @@ -package com.cricketcraft.minecraft.chisel.block; +package info.jbcs.minecraft.chisel.block; + +import info.jbcs.minecraft.chisel.client.GeneralChiselClient; +import info.jbcs.minecraft.chisel.utils.General; import java.util.Random; @@ -7,9 +10,6 @@ import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.IIcon; import net.minecraft.world.World; -import com.cricketcraft.minecraft.chisel.client.GeneralChiselClient; -import com.cricketcraft.minecraft.chisel.utils.General; - public class BlockHolystone extends BlockCarvable { public IIcon iconStar; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockLavastone.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockLavastone.java similarity index 84% rename from src/main/java/com/cricketcraft/minecraft/chisel/block/BlockLavastone.java rename to src/main/java/info/jbcs/minecraft/chisel/block/BlockLavastone.java index 13f7fe3a..d5a74dca 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockLavastone.java +++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockLavastone.java @@ -1,13 +1,13 @@ -package com.cricketcraft.minecraft.chisel.block; +package info.jbcs.minecraft.chisel.block; +import info.jbcs.minecraft.chisel.client.GeneralChiselClient; + import java.util.Random; import net.minecraft.block.material.Material; import net.minecraft.world.World; -import com.cricketcraft.minecraft.chisel.client.GeneralChiselClient; - public class BlockLavastone extends BlockMarbleTexturedOre { public BlockLavastone(Material mat, String baseIcon) diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockLeaf.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockLeaf.java similarity index 83% rename from src/main/java/com/cricketcraft/minecraft/chisel/block/BlockLeaf.java rename to src/main/java/info/jbcs/minecraft/chisel/block/BlockLeaf.java index d7ccef65..d32db7ec 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockLeaf.java +++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockLeaf.java @@ -1,4 +1,4 @@ -package com.cricketcraft.minecraft.chisel.block; +package info.jbcs.minecraft.chisel.block; import net.minecraft.block.material.Material; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockLightstoneCarvable.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockLightstoneCarvable.java similarity index 92% rename from src/main/java/com/cricketcraft/minecraft/chisel/block/BlockLightstoneCarvable.java rename to src/main/java/info/jbcs/minecraft/chisel/block/BlockLightstoneCarvable.java index b516fb67..2bd4af4f 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockLightstoneCarvable.java +++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockLightstoneCarvable.java @@ -1,4 +1,4 @@ -package com.cricketcraft.minecraft.chisel.block; +package info.jbcs.minecraft.chisel.block; import java.util.Random; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockMarbleBookshelf.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleBookshelf.java similarity index 96% rename from src/main/java/com/cricketcraft/minecraft/chisel/block/BlockMarbleBookshelf.java rename to src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleBookshelf.java index 13df7981..60faf177 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockMarbleBookshelf.java +++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleBookshelf.java @@ -1,4 +1,4 @@ -package com.cricketcraft.minecraft.chisel.block; +package info.jbcs.minecraft.chisel.block; import java.util.Random; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockMarbleCarpet.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleCarpet.java similarity index 81% rename from src/main/java/com/cricketcraft/minecraft/chisel/block/BlockMarbleCarpet.java rename to src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleCarpet.java index 3e154cc1..006a081c 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockMarbleCarpet.java +++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleCarpet.java @@ -1,4 +1,10 @@ -package com.cricketcraft.minecraft.chisel.block; +package info.jbcs.minecraft.chisel.block; + +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; @@ -10,12 +16,6 @@ import net.minecraft.item.Item; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; -import com.cricketcraft.minecraft.chisel.Chisel; -import com.cricketcraft.minecraft.chisel.api.ICarvable; -import com.cricketcraft.minecraft.chisel.carving.CarvableHelper; -import com.cricketcraft.minecraft.chisel.carving.CarvableVariation; -import com.cricketcraft.minecraft.chisel.init.ModTabs; - public class BlockMarbleCarpet extends BlockCarpet implements ICarvable { public CarvableHelper carverHelper; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockMarbleIce.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleIce.java similarity index 87% rename from src/main/java/com/cricketcraft/minecraft/chisel/block/BlockMarbleIce.java rename to src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleIce.java index a548fed8..ebad141a 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockMarbleIce.java +++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleIce.java @@ -1,4 +1,9 @@ -package com.cricketcraft.minecraft.chisel.block; +package info.jbcs.minecraft.chisel.block; + +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; @@ -12,11 +17,6 @@ import net.minecraft.stats.StatList; import net.minecraft.util.IIcon; import net.minecraft.world.World; -import com.cricketcraft.minecraft.chisel.api.ICarvable; -import com.cricketcraft.minecraft.chisel.carving.CarvableHelper; -import com.cricketcraft.minecraft.chisel.carving.CarvableVariation; -import com.cricketcraft.minecraft.chisel.init.ModTabs; - public class BlockMarbleIce extends BlockIce implements ICarvable { public CarvableHelper carverHelper; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockMarbleIceStairs.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleIceStairs.java similarity index 86% rename from src/main/java/com/cricketcraft/minecraft/chisel/block/BlockMarbleIceStairs.java rename to src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleIceStairs.java index c9d4558e..e1b8262b 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockMarbleIceStairs.java +++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleIceStairs.java @@ -1,4 +1,7 @@ -package com.cricketcraft.minecraft.chisel.block; +package info.jbcs.minecraft.chisel.block; + +import info.jbcs.minecraft.chisel.carving.CarvableHelper; +import info.jbcs.minecraft.chisel.init.ModBlocks; import java.util.Random; @@ -6,9 +9,6 @@ import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; -import com.cricketcraft.minecraft.chisel.carving.CarvableHelper; -import com.cricketcraft.minecraft.chisel.init.ModBlocks; - public class BlockMarbleIceStairs extends BlockMarbleStairs { public BlockMarbleIceStairs(Block block, int meta, CarvableHelper helper) diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockMarbleLamp.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleLamp.java similarity index 97% rename from src/main/java/com/cricketcraft/minecraft/chisel/block/BlockMarbleLamp.java rename to src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleLamp.java index caebac85..335ef726 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockMarbleLamp.java +++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleLamp.java @@ -1,4 +1,4 @@ -package com.cricketcraft.minecraft.chisel.block; +package info.jbcs.minecraft.chisel.block; import java.util.Random; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockMarblePillar.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarblePillar.java similarity index 81% rename from src/main/java/com/cricketcraft/minecraft/chisel/block/BlockMarblePillar.java rename to src/main/java/info/jbcs/minecraft/chisel/block/BlockMarblePillar.java index ad1a660d..029fa4d5 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockMarblePillar.java +++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarblePillar.java @@ -1,12 +1,11 @@ -package com.cricketcraft.minecraft.chisel.block; +package info.jbcs.minecraft.chisel.block; +import info.jbcs.minecraft.chisel.carving.CarvableVariation; +import info.jbcs.minecraft.chisel.client.render.BlockMarblePillarRenderer; import net.minecraft.block.material.Material; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; -import com.cricketcraft.minecraft.chisel.carving.CarvableVariation; -import com.cricketcraft.minecraft.chisel.client.render.BlockMarblePillarRenderer; - public class BlockMarblePillar extends BlockCarvable { public IIcon sides[] = new IIcon[6]; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockMarbleSlab.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleSlab.java similarity index 98% rename from src/main/java/com/cricketcraft/minecraft/chisel/block/BlockMarbleSlab.java rename to src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleSlab.java index 0cc9b46c..e0df6d64 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockMarbleSlab.java +++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleSlab.java @@ -1,4 +1,4 @@ -package com.cricketcraft.minecraft.chisel.block; +package info.jbcs.minecraft.chisel.block; import java.util.List; import java.util.Random; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockMarbleStairs.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleStairs.java similarity index 88% rename from src/main/java/com/cricketcraft/minecraft/chisel/block/BlockMarbleStairs.java rename to src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleStairs.java index b0da3649..9e538780 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockMarbleStairs.java +++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleStairs.java @@ -1,4 +1,10 @@ -package com.cricketcraft.minecraft.chisel.block; +package info.jbcs.minecraft.chisel.block; + +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.BlockMarbleStairsRenderer; +import info.jbcs.minecraft.chisel.init.ModTabs; import java.util.List; @@ -13,12 +19,6 @@ import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; import net.minecraft.world.World; -import com.cricketcraft.minecraft.chisel.api.ICarvable; -import com.cricketcraft.minecraft.chisel.carving.CarvableHelper; -import com.cricketcraft.minecraft.chisel.carving.CarvableVariation; -import com.cricketcraft.minecraft.chisel.client.render.BlockMarbleStairsRenderer; -import com.cricketcraft.minecraft.chisel.init.ModTabs; - public class BlockMarbleStairs extends BlockStairs implements ICarvable { CarvableHelper carverHelper; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockMarbleStairsMaker.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleStairsMaker.java similarity index 87% rename from src/main/java/com/cricketcraft/minecraft/chisel/block/BlockMarbleStairsMaker.java rename to src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleStairsMaker.java index ec1b76a9..9a29b102 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockMarbleStairsMaker.java +++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleStairsMaker.java @@ -1,13 +1,11 @@ -package com.cricketcraft.minecraft.chisel.block; +package info.jbcs.minecraft.chisel.block; +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 com.cricketcraft.minecraft.chisel.carving.CarvableHelper; -import com.cricketcraft.minecraft.chisel.carving.CarvableVariation; -import com.cricketcraft.minecraft.chisel.item.ItemCarvable; - import cpw.mods.fml.common.registry.GameRegistry; public class BlockMarbleStairsMaker diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockMarbleStairsMakerCreator.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleStairsMakerCreator.java similarity index 59% rename from src/main/java/com/cricketcraft/minecraft/chisel/block/BlockMarbleStairsMakerCreator.java rename to src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleStairsMakerCreator.java index f242cae8..418cfe2e 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockMarbleStairsMakerCreator.java +++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleStairsMakerCreator.java @@ -1,9 +1,8 @@ -package com.cricketcraft.minecraft.chisel.block; +package info.jbcs.minecraft.chisel.block; +import info.jbcs.minecraft.chisel.carving.CarvableHelper; import net.minecraft.block.Block; -import com.cricketcraft.minecraft.chisel.carving.CarvableHelper; - public interface BlockMarbleStairsMakerCreator { public BlockMarbleStairs create(Block block, int meta, CarvableHelper helper); diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockMarbleTexturedOre.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleTexturedOre.java similarity index 83% rename from src/main/java/com/cricketcraft/minecraft/chisel/block/BlockMarbleTexturedOre.java rename to src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleTexturedOre.java index 7fdb2578..b11d2d32 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockMarbleTexturedOre.java +++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleTexturedOre.java @@ -1,4 +1,9 @@ -package com.cricketcraft.minecraft.chisel.block; +package info.jbcs.minecraft.chisel.block; + +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; @@ -9,11 +14,6 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.util.IIcon; -import com.cricketcraft.minecraft.chisel.api.ICarvable; -import com.cricketcraft.minecraft.chisel.carving.CarvableHelper; -import com.cricketcraft.minecraft.chisel.carving.CarvableVariation; -import com.cricketcraft.minecraft.chisel.init.ModTabs; - public class BlockMarbleTexturedOre extends BlockTexturedOre implements ICarvable { public CarvableHelper carverHelper; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockMarbleWall.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleWall.java similarity index 86% rename from src/main/java/com/cricketcraft/minecraft/chisel/block/BlockMarbleWall.java rename to src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleWall.java index 25c34399..67c0bf0b 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockMarbleWall.java +++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockMarbleWall.java @@ -1,4 +1,7 @@ -package com.cricketcraft.minecraft.chisel.block; +package info.jbcs.minecraft.chisel.block; + +import info.jbcs.minecraft.chisel.carving.CarvableHelper; +import info.jbcs.minecraft.chisel.init.ModTabs; import java.util.List; @@ -9,9 +12,6 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.util.IIcon; -import com.cricketcraft.minecraft.chisel.carving.CarvableHelper; -import com.cricketcraft.minecraft.chisel.init.ModTabs; - public class BlockMarbleWall extends BlockWall { CarvableHelper carverHelper; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockPresent.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockPresent.java similarity index 96% rename from src/main/java/com/cricketcraft/minecraft/chisel/block/BlockPresent.java rename to src/main/java/info/jbcs/minecraft/chisel/block/BlockPresent.java index 8dd8cd6e..9d00a212 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockPresent.java +++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockPresent.java @@ -1,4 +1,12 @@ -package com.cricketcraft.minecraft.chisel.block; +package info.jbcs.minecraft.chisel.block; + +import info.jbcs.minecraft.chisel.Chisel; +import info.jbcs.minecraft.chisel.api.ICarvable; +import info.jbcs.minecraft.chisel.block.tileentity.TileEntityPresent; +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; @@ -24,15 +32,6 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; - -import com.cricketcraft.minecraft.chisel.Chisel; -import com.cricketcraft.minecraft.chisel.api.ICarvable; -import com.cricketcraft.minecraft.chisel.block.tileentity.TileEntityPresent; -import com.cricketcraft.minecraft.chisel.carving.CarvableHelper; -import com.cricketcraft.minecraft.chisel.carving.CarvableVariation; -import com.cricketcraft.minecraft.chisel.init.ModTabs; -import com.cricketcraft.minecraft.chisel.inventory.InventoryLargePresent; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -391,14 +390,13 @@ public class BlockPresent extends BlockContainer implements ICarvable { return Container.calcRedstoneFromInventory(getInventory(world, x, y, z)); } - @Override - @SideOnly(Side.CLIENT) + @SideOnly(Side.CLIENT) public void registerBlockIcons(IIconRegister register) { this.blockIcon = register.registerIcon("planks_oak"); } public IInventory getInventory(World world, int x, int y, int z) { - Object object = world.getTileEntity(x, y, z); + Object object = (TileEntityPresent) world.getTileEntity(x, y, z); if (object == null) { return null; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockRoadLine.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockRoadLine.java similarity index 85% rename from src/main/java/com/cricketcraft/minecraft/chisel/block/BlockRoadLine.java rename to src/main/java/info/jbcs/minecraft/chisel/block/BlockRoadLine.java index dc5c5e13..1466b25d 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockRoadLine.java +++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockRoadLine.java @@ -1,5 +1,7 @@ -package com.cricketcraft.minecraft.chisel.block; +package info.jbcs.minecraft.chisel.block; +import info.jbcs.minecraft.chisel.client.render.BlockRoadLineRenderer; +import info.jbcs.minecraft.chisel.init.ModTabs; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -8,9 +10,6 @@ import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.IIcon; import net.minecraft.world.World; -import com.cricketcraft.minecraft.chisel.client.render.BlockRoadLineRenderer; -import com.cricketcraft.minecraft.chisel.init.ModTabs; - public class BlockRoadLine extends Block { public IIcon aloneIcon; @@ -54,7 +53,7 @@ public class BlockRoadLine extends Block @Override public boolean canPlaceBlockAt(World par1World, int par2, int par3, int par4) { - return World.doesBlockHaveSolidTopSurface(par1World, par2, par3 - 1, par4) || par1World.getBlock(par2, par3 - 1, par4).equals(Blocks.glowstone); + return par1World.doesBlockHaveSolidTopSurface(par1World, par2, par3 - 1, par4) || par1World.getBlock(par2, par3 - 1, par4).equals(Blocks.glowstone); } @Override diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockSnakestone.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockSnakestone.java similarity index 98% rename from src/main/java/com/cricketcraft/minecraft/chisel/block/BlockSnakestone.java rename to src/main/java/info/jbcs/minecraft/chisel/block/BlockSnakestone.java index e8565119..5997eacd 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockSnakestone.java +++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockSnakestone.java @@ -1,4 +1,7 @@ -package com.cricketcraft.minecraft.chisel.block; +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; @@ -13,9 +16,6 @@ import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; import net.minecraft.world.World; -import com.cricketcraft.minecraft.chisel.client.render.BlockSnakeStoneRenderer; -import com.cricketcraft.minecraft.chisel.init.ModTabs; - public class BlockSnakestone extends Block { static final int SEC_HEAD = 0; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockSnakestoneObsidian.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockSnakestoneObsidian.java similarity index 87% rename from src/main/java/com/cricketcraft/minecraft/chisel/block/BlockSnakestoneObsidian.java rename to src/main/java/info/jbcs/minecraft/chisel/block/BlockSnakestoneObsidian.java index a96cb769..05cf10fc 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockSnakestoneObsidian.java +++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockSnakestoneObsidian.java @@ -1,14 +1,14 @@ -package com.cricketcraft.minecraft.chisel.block; +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 com.cricketcraft.minecraft.chisel.client.GeneralChiselClient; - public class BlockSnakestoneObsidian extends BlockSnakestone { public IIcon[] particles = new IIcon[8]; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockSpikes.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockSpikes.java similarity index 85% rename from src/main/java/com/cricketcraft/minecraft/chisel/block/BlockSpikes.java rename to src/main/java/info/jbcs/minecraft/chisel/block/BlockSpikes.java index 8ec7ee62..65b0f0fe 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockSpikes.java +++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockSpikes.java @@ -1,5 +1,9 @@ -package com.cricketcraft.minecraft.chisel.block; +package info.jbcs.minecraft.chisel.block; +import info.jbcs.minecraft.chisel.Configurations; +import info.jbcs.minecraft.chisel.client.GeneralChiselClient; +import info.jbcs.minecraft.chisel.client.render.BlockSpikesRenderer; +import info.jbcs.minecraft.chisel.utils.General; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -8,12 +12,6 @@ import net.minecraft.entity.Entity; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.IIcon; import net.minecraft.world.World; - -import com.cricketcraft.minecraft.chisel.Configurations; -import com.cricketcraft.minecraft.chisel.client.GeneralChiselClient; -import com.cricketcraft.minecraft.chisel.client.render.BlockSpikesRenderer; -import com.cricketcraft.minecraft.chisel.utils.General; - import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockTexturedOre.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockTexturedOre.java similarity index 89% rename from src/main/java/com/cricketcraft/minecraft/chisel/block/BlockTexturedOre.java rename to src/main/java/info/jbcs/minecraft/chisel/block/BlockTexturedOre.java index cd1de5d8..ca9fa5f8 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockTexturedOre.java +++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockTexturedOre.java @@ -1,13 +1,11 @@ -package com.cricketcraft.minecraft.chisel.block; - +package info.jbcs.minecraft.chisel.block; +import info.jbcs.minecraft.chisel.client.render.BlockTexturedOreRenderer; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.IIcon; -import com.cricketcraft.minecraft.chisel.client.render.BlockTexturedOreRenderer; - public class BlockTexturedOre extends Block { public int currentPass; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockVoidstone.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockVoidstone.java similarity index 72% rename from src/main/java/com/cricketcraft/minecraft/chisel/block/BlockVoidstone.java rename to src/main/java/info/jbcs/minecraft/chisel/block/BlockVoidstone.java index a424d01d..0edfc2bf 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockVoidstone.java +++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockVoidstone.java @@ -1,4 +1,11 @@ -package com.cricketcraft.minecraft.chisel.block; +package info.jbcs.minecraft.chisel.block; + +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.client.GeneralChiselClient; +import info.jbcs.minecraft.chisel.utils.General; import java.util.Random; @@ -8,13 +15,6 @@ import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.IIcon; import net.minecraft.world.World; -import com.cricketcraft.minecraft.chisel.Chisel; -import com.cricketcraft.minecraft.chisel.api.ICarvable; -import com.cricketcraft.minecraft.chisel.carving.CarvableHelper; -import com.cricketcraft.minecraft.chisel.carving.CarvableVariation; -import com.cricketcraft.minecraft.chisel.client.GeneralChiselClient; -import com.cricketcraft.minecraft.chisel.utils.General; - public class BlockVoidstone extends Block implements ICarvable{ public CarvableHelper carverHelper; public IIcon iconParticle; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockVoidstonePillar.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockVoidstonePillar.java similarity index 79% rename from src/main/java/com/cricketcraft/minecraft/chisel/block/BlockVoidstonePillar.java rename to src/main/java/info/jbcs/minecraft/chisel/block/BlockVoidstonePillar.java index 4d84bcfa..0cd9ea95 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockVoidstonePillar.java +++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockVoidstonePillar.java @@ -1,15 +1,14 @@ -package com.cricketcraft.minecraft.chisel.block; +package info.jbcs.minecraft.chisel.block; +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 net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.IIcon; -import com.cricketcraft.minecraft.chisel.api.ICarvable; -import com.cricketcraft.minecraft.chisel.carving.CarvableHelper; -import com.cricketcraft.minecraft.chisel.carving.CarvableVariation; -import com.cricketcraft.minecraft.chisel.init.ModTabs; - public class BlockVoidstonePillar extends Block implements ICarvable{ public static IIcon topBottom, pillarSide; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockWaterstone.java b/src/main/java/info/jbcs/minecraft/chisel/block/BlockWaterstone.java similarity index 85% rename from src/main/java/com/cricketcraft/minecraft/chisel/block/BlockWaterstone.java rename to src/main/java/info/jbcs/minecraft/chisel/block/BlockWaterstone.java index 9306a2fd..58bee7dd 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/block/BlockWaterstone.java +++ b/src/main/java/info/jbcs/minecraft/chisel/block/BlockWaterstone.java @@ -1,4 +1,4 @@ -package com.cricketcraft.minecraft.chisel.block; +package info.jbcs.minecraft.chisel.block; import net.minecraft.block.material.Material; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/block/ItemBlockAutoChisel.java b/src/main/java/info/jbcs/minecraft/chisel/block/ItemBlockAutoChisel.java similarity index 95% rename from src/main/java/com/cricketcraft/minecraft/chisel/block/ItemBlockAutoChisel.java rename to src/main/java/info/jbcs/minecraft/chisel/block/ItemBlockAutoChisel.java index 53868f74..2b020471 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/block/ItemBlockAutoChisel.java +++ b/src/main/java/info/jbcs/minecraft/chisel/block/ItemBlockAutoChisel.java @@ -1,4 +1,4 @@ -package com.cricketcraft.minecraft.chisel.block; +package info.jbcs.minecraft.chisel.block; import java.util.List; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/block/tileentity/TileEntityAutoChisel.java b/src/main/java/info/jbcs/minecraft/chisel/block/tileentity/TileEntityAutoChisel.java similarity index 99% rename from src/main/java/com/cricketcraft/minecraft/chisel/block/tileentity/TileEntityAutoChisel.java rename to src/main/java/info/jbcs/minecraft/chisel/block/tileentity/TileEntityAutoChisel.java index 89cf037d..d55f37dc 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/block/tileentity/TileEntityAutoChisel.java +++ b/src/main/java/info/jbcs/minecraft/chisel/block/tileentity/TileEntityAutoChisel.java @@ -1,4 +1,4 @@ -package com.cricketcraft.minecraft.chisel.block.tileentity; +package info.jbcs.minecraft.chisel.block.tileentity; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/block/tileentity/TileEntityPresent.java b/src/main/java/info/jbcs/minecraft/chisel/block/tileentity/TileEntityPresent.java similarity index 96% rename from src/main/java/com/cricketcraft/minecraft/chisel/block/tileentity/TileEntityPresent.java rename to src/main/java/info/jbcs/minecraft/chisel/block/tileentity/TileEntityPresent.java index ce0c85c5..662419be 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/block/tileentity/TileEntityPresent.java +++ b/src/main/java/info/jbcs/minecraft/chisel/block/tileentity/TileEntityPresent.java @@ -1,4 +1,8 @@ -package com.cricketcraft.minecraft.chisel.block.tileentity; +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; @@ -9,10 +13,6 @@ import net.minecraft.inventory.IInventory; import net.minecraft.tileentity.TileEntityChest; import net.minecraft.util.AxisAlignedBB; -import com.cricketcraft.minecraft.chisel.block.BlockPresent; -import com.cricketcraft.minecraft.chisel.inventory.ContainerPresent; -import com.cricketcraft.minecraft.chisel.inventory.InventoryLargePresent; - public class TileEntityPresent extends TileEntityChest { public TileEntityPresent() { diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/carving/CarvableHelper.java b/src/main/java/info/jbcs/minecraft/chisel/carving/CarvableHelper.java similarity index 96% rename from src/main/java/com/cricketcraft/minecraft/chisel/carving/CarvableHelper.java rename to src/main/java/info/jbcs/minecraft/chisel/carving/CarvableHelper.java index 7bd86c59..1b5e6caa 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/carving/CarvableHelper.java +++ b/src/main/java/info/jbcs/minecraft/chisel/carving/CarvableHelper.java @@ -1,4 +1,13 @@ -package com.cricketcraft.minecraft.chisel.carving; +package info.jbcs.minecraft.chisel.carving; + +import info.jbcs.minecraft.chisel.Chisel; +import info.jbcs.minecraft.chisel.Configurations; +import info.jbcs.minecraft.chisel.block.BlockMarbleSlab; +import info.jbcs.minecraft.chisel.carving.CarvableVariation.CarvableVariationCTM; +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; @@ -13,16 +22,6 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; - -import com.cricketcraft.minecraft.chisel.Chisel; -import com.cricketcraft.minecraft.chisel.Configurations; -import com.cricketcraft.minecraft.chisel.block.BlockMarbleSlab; -import com.cricketcraft.minecraft.chisel.carving.CarvableVariation.CarvableVariationCTM; -import com.cricketcraft.minecraft.chisel.client.render.CTM; -import com.cricketcraft.minecraft.chisel.client.render.TextureSubmap; -import com.cricketcraft.minecraft.chisel.item.ItemCarvable; -import com.cricketcraft.minecraft.chisel.utils.GeneralClient; - import cpw.mods.fml.common.registry.GameRegistry; public class CarvableHelper diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/carving/CarvableVariation.java b/src/main/java/info/jbcs/minecraft/chisel/carving/CarvableVariation.java similarity index 84% rename from src/main/java/com/cricketcraft/minecraft/chisel/carving/CarvableVariation.java rename to src/main/java/info/jbcs/minecraft/chisel/carving/CarvableVariation.java index 4d0d04c7..b1858777 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/carving/CarvableVariation.java +++ b/src/main/java/info/jbcs/minecraft/chisel/carving/CarvableVariation.java @@ -1,10 +1,9 @@ -package com.cricketcraft.minecraft.chisel.carving; +package info.jbcs.minecraft.chisel.carving; +import info.jbcs.minecraft.chisel.client.render.TextureSubmap; import net.minecraft.block.Block; import net.minecraft.util.IIcon; -import com.cricketcraft.minecraft.chisel.client.render.TextureSubmap; - public class CarvableVariation { public String blockName; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/carving/Carving.java b/src/main/java/info/jbcs/minecraft/chisel/carving/Carving.java similarity index 98% rename from src/main/java/com/cricketcraft/minecraft/chisel/carving/Carving.java rename to src/main/java/info/jbcs/minecraft/chisel/carving/Carving.java index 345acc11..70b34bb1 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/carving/Carving.java +++ b/src/main/java/info/jbcs/minecraft/chisel/carving/Carving.java @@ -1,4 +1,6 @@ -package com.cricketcraft.minecraft.chisel.carving; +package info.jbcs.minecraft.chisel.carving; + +import info.jbcs.minecraft.chisel.Chisel; import java.util.ArrayList; import java.util.Collections; @@ -10,8 +12,6 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; -import com.cricketcraft.minecraft.chisel.Chisel; - public class Carving { HashMap carvingGroupsByName = new HashMap(); diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/carving/CarvingGroup.java b/src/main/java/info/jbcs/minecraft/chisel/carving/CarvingGroup.java similarity index 84% rename from src/main/java/com/cricketcraft/minecraft/chisel/carving/CarvingGroup.java rename to src/main/java/info/jbcs/minecraft/chisel/carving/CarvingGroup.java index a2e81a95..a45a3935 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/carving/CarvingGroup.java +++ b/src/main/java/info/jbcs/minecraft/chisel/carving/CarvingGroup.java @@ -1,4 +1,4 @@ -package com.cricketcraft.minecraft.chisel.carving; +package info.jbcs.minecraft.chisel.carving; import java.util.ArrayList; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/carving/CarvingVariation.java b/src/main/java/info/jbcs/minecraft/chisel/carving/CarvingVariation.java similarity index 90% rename from src/main/java/com/cricketcraft/minecraft/chisel/carving/CarvingVariation.java rename to src/main/java/info/jbcs/minecraft/chisel/carving/CarvingVariation.java index f846ea39..37d33136 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/carving/CarvingVariation.java +++ b/src/main/java/info/jbcs/minecraft/chisel/carving/CarvingVariation.java @@ -1,4 +1,4 @@ -package com.cricketcraft.minecraft.chisel.carving; +package info.jbcs.minecraft.chisel.carving; import net.minecraft.block.Block; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/client/GeneralChiselClient.java b/src/main/java/info/jbcs/minecraft/chisel/client/GeneralChiselClient.java similarity index 92% rename from src/main/java/com/cricketcraft/minecraft/chisel/client/GeneralChiselClient.java rename to src/main/java/info/jbcs/minecraft/chisel/client/GeneralChiselClient.java index 7031e741..45ee1528 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/client/GeneralChiselClient.java +++ b/src/main/java/info/jbcs/minecraft/chisel/client/GeneralChiselClient.java @@ -1,4 +1,17 @@ -package com.cricketcraft.minecraft.chisel.client; +package info.jbcs.minecraft.chisel.client; + +import info.jbcs.minecraft.chisel.Configurations; +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; @@ -11,19 +24,6 @@ import net.minecraft.client.particle.EntityLavaFX; import net.minecraft.entity.Entity; import net.minecraft.world.World; -import com.cricketcraft.minecraft.chisel.Configurations; -import com.cricketcraft.minecraft.chisel.block.BlockGrimstone; -import com.cricketcraft.minecraft.chisel.block.BlockHolystone; -import com.cricketcraft.minecraft.chisel.block.BlockLavastone; -import com.cricketcraft.minecraft.chisel.block.BlockSnakestoneObsidian; -import com.cricketcraft.minecraft.chisel.block.BlockVoidstone; -import com.cricketcraft.minecraft.chisel.entity.fx.EntityBallOMossFX; -import com.cricketcraft.minecraft.chisel.entity.fx.EntityGrimstoneFX; -import com.cricketcraft.minecraft.chisel.entity.fx.EntityHolystoneFX; -import com.cricketcraft.minecraft.chisel.entity.fx.EntitySnakestoneObsidianFX; -import com.cricketcraft.minecraft.chisel.entity.fx.EntityVoidstoneFX; -import com.cricketcraft.minecraft.chisel.utils.GeneralClient; - public class GeneralChiselClient { public static Random rand = new Random(); diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/client/gui/GuiAutoChisel.java b/src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiAutoChisel.java similarity index 80% rename from src/main/java/com/cricketcraft/minecraft/chisel/client/gui/GuiAutoChisel.java rename to src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiAutoChisel.java index ec267d65..54ff085f 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/client/gui/GuiAutoChisel.java +++ b/src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiAutoChisel.java @@ -1,14 +1,13 @@ -package com.cricketcraft.minecraft.chisel.client.gui; +package info.jbcs.minecraft.chisel.client.gui; +import info.jbcs.minecraft.chisel.block.tileentity.TileEntityAutoChisel; +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; -import com.cricketcraft.minecraft.chisel.block.tileentity.TileEntityAutoChisel; -import com.cricketcraft.minecraft.chisel.inventory.ContainerAutoChisel; - public class GuiAutoChisel extends GuiContainer { private static final ResourceLocation gui = new ResourceLocation("chisel:textures/autochisel-gui.png"); diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/client/gui/GuiChisel.java b/src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiChisel.java similarity index 87% rename from src/main/java/com/cricketcraft/minecraft/chisel/client/gui/GuiChisel.java rename to src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiChisel.java index 40f5e881..950d3002 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/client/gui/GuiChisel.java +++ b/src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiChisel.java @@ -1,5 +1,8 @@ -package com.cricketcraft.minecraft.chisel.client.gui; +package info.jbcs.minecraft.chisel.client.gui; +import info.jbcs.minecraft.chisel.inventory.ContainerChisel; +import info.jbcs.minecraft.chisel.inventory.InventoryChiselSelection; +import info.jbcs.minecraft.chisel.utils.GeneralClient; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.EntityPlayer; @@ -7,10 +10,6 @@ import net.minecraft.entity.player.InventoryPlayer; import org.lwjgl.opengl.GL11; -import com.cricketcraft.minecraft.chisel.inventory.ContainerChisel; -import com.cricketcraft.minecraft.chisel.inventory.InventoryChiselSelection; -import com.cricketcraft.minecraft.chisel.utils.GeneralClient; - public class GuiChisel extends GuiContainer { public EntityPlayer player; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/client/gui/GuiChiselConfig.java b/src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiChiselConfig.java similarity index 76% rename from src/main/java/com/cricketcraft/minecraft/chisel/client/gui/GuiChiselConfig.java rename to src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiChiselConfig.java index 27b8071b..847b9084 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/client/gui/GuiChiselConfig.java +++ b/src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiChiselConfig.java @@ -1,12 +1,10 @@ -package com.cricketcraft.minecraft.chisel.client.gui; +package info.jbcs.minecraft.chisel.client.gui; +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 com.cricketcraft.minecraft.chisel.Chisel; -import com.cricketcraft.minecraft.chisel.Configurations; - import cpw.mods.fml.client.config.GuiConfig; public class GuiChiselConfig extends GuiConfig diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/client/gui/GuiEdit.java b/src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiEdit.java similarity index 95% rename from src/main/java/com/cricketcraft/minecraft/chisel/client/gui/GuiEdit.java rename to src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiEdit.java index 042a6c4c..86735a53 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/client/gui/GuiEdit.java +++ b/src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiEdit.java @@ -1,4 +1,4 @@ -package com.cricketcraft.minecraft.chisel.client.gui; +package info.jbcs.minecraft.chisel.client.gui; import net.minecraft.client.gui.GuiTextField; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/client/gui/GuiElement.java b/src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiElement.java similarity index 98% rename from src/main/java/com/cricketcraft/minecraft/chisel/client/gui/GuiElement.java rename to src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiElement.java index 8fced107..15908121 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/client/gui/GuiElement.java +++ b/src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiElement.java @@ -1,4 +1,4 @@ -package com.cricketcraft.minecraft.chisel.client.gui; +package info.jbcs.minecraft.chisel.client.gui; import java.util.ArrayList; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/client/gui/GuiExButton.java b/src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiExButton.java similarity index 97% rename from src/main/java/com/cricketcraft/minecraft/chisel/client/gui/GuiExButton.java rename to src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiExButton.java index 6b104095..a986cc16 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/client/gui/GuiExButton.java +++ b/src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiExButton.java @@ -1,4 +1,4 @@ -package com.cricketcraft.minecraft.chisel.client.gui; +package info.jbcs.minecraft.chisel.client.gui; public class GuiExButton extends GuiElement { diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/client/gui/GuiFactory.java b/src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiFactory.java similarity index 92% rename from src/main/java/com/cricketcraft/minecraft/chisel/client/gui/GuiFactory.java rename to src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiFactory.java index 657df7dc..344f36de 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/client/gui/GuiFactory.java +++ b/src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiFactory.java @@ -1,4 +1,4 @@ -package com.cricketcraft.minecraft.chisel.client.gui; +package info.jbcs.minecraft.chisel.client.gui; import java.util.Set; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/client/gui/GuiLabel.java b/src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiLabel.java similarity index 88% rename from src/main/java/com/cricketcraft/minecraft/chisel/client/gui/GuiLabel.java rename to src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiLabel.java index 323d291a..fc4d2330 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/client/gui/GuiLabel.java +++ b/src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiLabel.java @@ -1,4 +1,4 @@ -package com.cricketcraft.minecraft.chisel.client.gui; +package info.jbcs.minecraft.chisel.client.gui; public class GuiLabel extends GuiElement { diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/client/gui/GuiPresent.java b/src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiPresent.java similarity index 85% rename from src/main/java/com/cricketcraft/minecraft/chisel/client/gui/GuiPresent.java rename to src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiPresent.java index 5362c916..a50a41a7 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/client/gui/GuiPresent.java +++ b/src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiPresent.java @@ -1,5 +1,7 @@ -package com.cricketcraft.minecraft.chisel.client.gui; +package info.jbcs.minecraft.chisel.client.gui; +import info.jbcs.minecraft.chisel.block.tileentity.TileEntityPresent; +import info.jbcs.minecraft.chisel.inventory.ContainerPresent; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.IInventory; @@ -7,9 +9,6 @@ import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; -import com.cricketcraft.minecraft.chisel.block.tileentity.TileEntityPresent; -import com.cricketcraft.minecraft.chisel.inventory.ContainerPresent; - public class GuiPresent extends GuiContainer { private static final ResourceLocation gui = new ResourceLocation("chisel:textures/present-gui.png"); private IInventory upper, lower; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/client/gui/GuiScreenPlus.java b/src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiScreenPlus.java similarity index 97% rename from src/main/java/com/cricketcraft/minecraft/chisel/client/gui/GuiScreenPlus.java rename to src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiScreenPlus.java index 38cb0bad..8112be99 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/client/gui/GuiScreenPlus.java +++ b/src/main/java/info/jbcs/minecraft/chisel/client/gui/GuiScreenPlus.java @@ -1,5 +1,7 @@ -package com.cricketcraft.minecraft.chisel.client.gui; +package info.jbcs.minecraft.chisel.client.gui; +import info.jbcs.minecraft.chisel.utils.DummyContainer; +import info.jbcs.minecraft.chisel.utils.GeneralClient; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.gui.inventory.GuiContainer; @@ -10,9 +12,6 @@ import org.lwjgl.input.Keyboard; import org.lwjgl.input.Mouse; import org.lwjgl.opengl.GL11; -import com.cricketcraft.minecraft.chisel.utils.DummyContainer; -import com.cricketcraft.minecraft.chisel.utils.GeneralClient; - public class GuiScreenPlus extends GuiContainer { public int screenW; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/client/gui/GuilScrolledBox.java b/src/main/java/info/jbcs/minecraft/chisel/client/gui/GuilScrolledBox.java similarity index 98% rename from src/main/java/com/cricketcraft/minecraft/chisel/client/gui/GuilScrolledBox.java rename to src/main/java/info/jbcs/minecraft/chisel/client/gui/GuilScrolledBox.java index 781022cb..aa1a8a8e 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/client/gui/GuilScrolledBox.java +++ b/src/main/java/info/jbcs/minecraft/chisel/client/gui/GuilScrolledBox.java @@ -1,4 +1,4 @@ -package com.cricketcraft.minecraft.chisel.client.gui; +package info.jbcs.minecraft.chisel.client.gui; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Gui; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/client/gui/InputEvent.java b/src/main/java/info/jbcs/minecraft/chisel/client/gui/InputEvent.java similarity index 51% rename from src/main/java/com/cricketcraft/minecraft/chisel/client/gui/InputEvent.java rename to src/main/java/info/jbcs/minecraft/chisel/client/gui/InputEvent.java index af073437..bccd1dd5 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/client/gui/InputEvent.java +++ b/src/main/java/info/jbcs/minecraft/chisel/client/gui/InputEvent.java @@ -1,4 +1,4 @@ -package com.cricketcraft.minecraft.chisel.client.gui; +package info.jbcs.minecraft.chisel.client.gui; public class InputEvent { diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/client/gui/InputKeyboardEvent.java b/src/main/java/info/jbcs/minecraft/chisel/client/gui/InputKeyboardEvent.java similarity index 65% rename from src/main/java/com/cricketcraft/minecraft/chisel/client/gui/InputKeyboardEvent.java rename to src/main/java/info/jbcs/minecraft/chisel/client/gui/InputKeyboardEvent.java index 61dd7052..4869df9c 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/client/gui/InputKeyboardEvent.java +++ b/src/main/java/info/jbcs/minecraft/chisel/client/gui/InputKeyboardEvent.java @@ -1,4 +1,4 @@ -package com.cricketcraft.minecraft.chisel.client.gui; +package info.jbcs.minecraft.chisel.client.gui; public class InputKeyboardEvent extends InputEvent { diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/client/gui/InputMouseEvent.java b/src/main/java/info/jbcs/minecraft/chisel/client/gui/InputMouseEvent.java similarity index 78% rename from src/main/java/com/cricketcraft/minecraft/chisel/client/gui/InputMouseEvent.java rename to src/main/java/info/jbcs/minecraft/chisel/client/gui/InputMouseEvent.java index 9677dd60..da47d9d7 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/client/gui/InputMouseEvent.java +++ b/src/main/java/info/jbcs/minecraft/chisel/client/gui/InputMouseEvent.java @@ -1,4 +1,4 @@ -package com.cricketcraft.minecraft.chisel.client.gui; +package info.jbcs.minecraft.chisel.client.gui; public class InputMouseEvent extends InputEvent { diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/client/gui/Scrollbar.java b/src/main/java/info/jbcs/minecraft/chisel/client/gui/Scrollbar.java similarity index 95% rename from src/main/java/com/cricketcraft/minecraft/chisel/client/gui/Scrollbar.java rename to src/main/java/info/jbcs/minecraft/chisel/client/gui/Scrollbar.java index 94290a50..1d89172f 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/client/gui/Scrollbar.java +++ b/src/main/java/info/jbcs/minecraft/chisel/client/gui/Scrollbar.java @@ -1,12 +1,11 @@ -package com.cricketcraft.minecraft.chisel.client.gui; +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; -import com.cricketcraft.minecraft.chisel.utils.GeneralClient; - public abstract class Scrollbar extends GuiButton { public boolean active; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/client/gui/TexturedBox.java b/src/main/java/info/jbcs/minecraft/chisel/client/gui/TexturedBox.java similarity index 97% rename from src/main/java/com/cricketcraft/minecraft/chisel/client/gui/TexturedBox.java rename to src/main/java/info/jbcs/minecraft/chisel/client/gui/TexturedBox.java index 3e234205..04d5dc98 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/client/gui/TexturedBox.java +++ b/src/main/java/info/jbcs/minecraft/chisel/client/gui/TexturedBox.java @@ -1,4 +1,4 @@ -package com.cricketcraft.minecraft.chisel.client.gui; +package info.jbcs.minecraft.chisel.client.gui; public class TexturedBox { diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/client/model/ModelAutoChisel.java b/src/main/java/info/jbcs/minecraft/chisel/client/model/ModelAutoChisel.java similarity index 96% rename from src/main/java/com/cricketcraft/minecraft/chisel/client/model/ModelAutoChisel.java rename to src/main/java/info/jbcs/minecraft/chisel/client/model/ModelAutoChisel.java index 82703b75..962acd37 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/client/model/ModelAutoChisel.java +++ b/src/main/java/info/jbcs/minecraft/chisel/client/model/ModelAutoChisel.java @@ -1,4 +1,4 @@ -package com.cricketcraft.minecraft.chisel.client.model; +package info.jbcs.minecraft.chisel.client.model; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; @@ -99,8 +99,7 @@ public class ModelAutoChisel extends ModelBase setRotation(Shape12, 0F, 0F, 0F); } - @Override -public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) + public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) { super.render(entity, f, f1, f2, f3, f4, f5); setRotationAngles(f, f1, f2, f3, f4, f5); diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/client/render/BlockAdvancedMarbleRenderer.java b/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockAdvancedMarbleRenderer.java similarity index 87% rename from src/main/java/com/cricketcraft/minecraft/chisel/client/render/BlockAdvancedMarbleRenderer.java rename to src/main/java/info/jbcs/minecraft/chisel/client/render/BlockAdvancedMarbleRenderer.java index eecfb177..f2e91dcd 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/client/render/BlockAdvancedMarbleRenderer.java +++ b/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockAdvancedMarbleRenderer.java @@ -1,17 +1,16 @@ -package com.cricketcraft.minecraft.chisel.client.render; +package info.jbcs.minecraft.chisel.client.render; +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.utils.Drawing; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.world.IBlockAccess; import org.lwjgl.opengl.GL11; -import com.cricketcraft.minecraft.chisel.Chisel; -import com.cricketcraft.minecraft.chisel.api.ICarvable; -import com.cricketcraft.minecraft.chisel.carving.CarvableHelper; -import com.cricketcraft.minecraft.chisel.carving.CarvableVariation; -import com.cricketcraft.minecraft.chisel.utils.Drawing; - import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import cpw.mods.fml.client.registry.RenderingRegistry; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/client/render/BlockCarpetRenderer.java b/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockCarpetRenderer.java similarity index 79% rename from src/main/java/com/cricketcraft/minecraft/chisel/client/render/BlockCarpetRenderer.java rename to src/main/java/info/jbcs/minecraft/chisel/client/render/BlockCarpetRenderer.java index 4f35fbdf..c2ead782 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/client/render/BlockCarpetRenderer.java +++ b/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockCarpetRenderer.java @@ -1,7 +1,6 @@ -package com.cricketcraft.minecraft.chisel.client.render; - -import com.cricketcraft.minecraft.chisel.Chisel; +package info.jbcs.minecraft.chisel.client.render; +import info.jbcs.minecraft.chisel.Chisel; import cpw.mods.fml.client.registry.RenderingRegistry; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/client/render/BlockEldritchRenderer.java b/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockEldritchRenderer.java similarity index 93% rename from src/main/java/com/cricketcraft/minecraft/chisel/client/render/BlockEldritchRenderer.java rename to src/main/java/info/jbcs/minecraft/chisel/client/render/BlockEldritchRenderer.java index b24d6968..3866114d 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/client/render/BlockEldritchRenderer.java +++ b/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockEldritchRenderer.java @@ -1,14 +1,13 @@ -package com.cricketcraft.minecraft.chisel.client.render; +package info.jbcs.minecraft.chisel.client.render; +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 com.cricketcraft.minecraft.chisel.Chisel; -import com.cricketcraft.minecraft.chisel.utils.Drawing; - import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import cpw.mods.fml.client.registry.RenderingRegistry; @@ -51,8 +50,8 @@ public class BlockEldritchRenderer implements ISimpleBlockRenderingHandler double v1 = icon.getMinV(); double uu = icon.getInterpolatedU(8.0D); double vv = icon.getInterpolatedV(8.0D); - - + + int lyp=block.getMixedBrightnessForBlock(world, x, y+1, z); int lym=block.getMixedBrightnessForBlock(world, x, y-1, z); int lxp=block.getMixedBrightnessForBlock(world, x+1, y, z); @@ -62,11 +61,11 @@ public class BlockEldritchRenderer implements ISimpleBlockRenderingHandler - - - - - + + + + + @@ -77,14 +76,14 @@ public class BlockEldritchRenderer implements ISimpleBlockRenderingHandler u1 = icon.getMaxU(); v1 = icon.getMaxV(); vertex(1,u0,v0); vertex(5,u1,v0); vertex(6,u1,v1); vertex(2,u0,v1); - + icon = block.getIcon(1, meta); u0 = icon.getMinU(); v0 = icon.getMinV(); u1 = icon.getMaxU(); v1 = icon.getMaxV(); vertex(0,u0,v0); vertex(3,u0,v1); vertex(7,u1,v1); vertex(4,u1,v0); - + */ renderer.blockAccess = world; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/client/render/BlockMarblePaneRenderer.java b/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockMarblePaneRenderer.java similarity index 99% rename from src/main/java/com/cricketcraft/minecraft/chisel/client/render/BlockMarblePaneRenderer.java rename to src/main/java/info/jbcs/minecraft/chisel/client/render/BlockMarblePaneRenderer.java index e7288ad3..12e1b0d8 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/client/render/BlockMarblePaneRenderer.java +++ b/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockMarblePaneRenderer.java @@ -1,5 +1,6 @@ -package com.cricketcraft.minecraft.chisel.client.render; +package info.jbcs.minecraft.chisel.client.render; +import info.jbcs.minecraft.chisel.utils.Drawing; import net.minecraft.block.Block; import net.minecraft.block.BlockPane; import net.minecraft.client.renderer.EntityRenderer; @@ -10,8 +11,6 @@ import net.minecraft.world.IBlockAccess; import org.lwjgl.opengl.GL11; -import com.cricketcraft.minecraft.chisel.utils.Drawing; - import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import cpw.mods.fml.client.registry.RenderingRegistry; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/client/render/BlockMarblePillarRenderer.java b/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockMarblePillarRenderer.java similarity index 96% rename from src/main/java/com/cricketcraft/minecraft/chisel/client/render/BlockMarblePillarRenderer.java rename to src/main/java/info/jbcs/minecraft/chisel/client/render/BlockMarblePillarRenderer.java index 7e6ef3b2..9f4b2c04 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/client/render/BlockMarblePillarRenderer.java +++ b/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockMarblePillarRenderer.java @@ -1,15 +1,14 @@ -package com.cricketcraft.minecraft.chisel.client.render; +package info.jbcs.minecraft.chisel.client.render; +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 com.cricketcraft.minecraft.chisel.block.BlockMarblePillar; -import com.cricketcraft.minecraft.chisel.carving.CarvableHelper; -import com.cricketcraft.minecraft.chisel.utils.Drawing; - import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import cpw.mods.fml.client.registry.RenderingRegistry; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/client/render/BlockMarbleStairsRenderer.java b/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockMarbleStairsRenderer.java similarity index 89% rename from src/main/java/com/cricketcraft/minecraft/chisel/client/render/BlockMarbleStairsRenderer.java rename to src/main/java/info/jbcs/minecraft/chisel/client/render/BlockMarbleStairsRenderer.java index 3657cd32..5157a25d 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/client/render/BlockMarbleStairsRenderer.java +++ b/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockMarbleStairsRenderer.java @@ -1,14 +1,13 @@ -package com.cricketcraft.minecraft.chisel.client.render; +package info.jbcs.minecraft.chisel.client.render; +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 com.cricketcraft.minecraft.chisel.block.BlockMarbleStairs; -import com.cricketcraft.minecraft.chisel.utils.Drawing; - import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import cpw.mods.fml.client.registry.RenderingRegistry; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/client/render/BlockNoCTMRenderer.java b/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockNoCTMRenderer.java similarity index 92% rename from src/main/java/com/cricketcraft/minecraft/chisel/client/render/BlockNoCTMRenderer.java rename to src/main/java/info/jbcs/minecraft/chisel/client/render/BlockNoCTMRenderer.java index e28429b9..06579385 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/client/render/BlockNoCTMRenderer.java +++ b/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockNoCTMRenderer.java @@ -1,13 +1,12 @@ -package com.cricketcraft.minecraft.chisel.client.render; +package info.jbcs.minecraft.chisel.client.render; +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 com.cricketcraft.minecraft.chisel.utils.Drawing; - import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import cpw.mods.fml.client.registry.RenderingRegistry; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/client/render/BlockRoadLineRenderer.java b/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockRoadLineRenderer.java similarity index 95% rename from src/main/java/com/cricketcraft/minecraft/chisel/client/render/BlockRoadLineRenderer.java rename to src/main/java/info/jbcs/minecraft/chisel/client/render/BlockRoadLineRenderer.java index cf4f0a44..9cf0f1e1 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/client/render/BlockRoadLineRenderer.java +++ b/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockRoadLineRenderer.java @@ -1,15 +1,13 @@ -package com.cricketcraft.minecraft.chisel.client.render; +package info.jbcs.minecraft.chisel.client.render; +import info.jbcs.minecraft.chisel.block.BlockRoadLine; +import info.jbcs.minecraft.chisel.utils.Drawing; import net.minecraft.block.Block; import net.minecraft.client.renderer.EntityRenderer; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.Tessellator; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; - -import com.cricketcraft.minecraft.chisel.block.BlockRoadLine; -import com.cricketcraft.minecraft.chisel.utils.Drawing; - import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import cpw.mods.fml.client.registry.RenderingRegistry; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/client/render/BlockSnakeStoneRenderer.java b/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockSnakeStoneRenderer.java similarity index 95% rename from src/main/java/com/cricketcraft/minecraft/chisel/client/render/BlockSnakeStoneRenderer.java rename to src/main/java/info/jbcs/minecraft/chisel/client/render/BlockSnakeStoneRenderer.java index d0cd0f2d..5193cbdc 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/client/render/BlockSnakeStoneRenderer.java +++ b/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockSnakeStoneRenderer.java @@ -1,14 +1,13 @@ -package com.cricketcraft.minecraft.chisel.client.render; +package info.jbcs.minecraft.chisel.client.render; +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 com.cricketcraft.minecraft.chisel.block.BlockSnakestone; -import com.cricketcraft.minecraft.chisel.utils.Drawing; - import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import cpw.mods.fml.client.registry.RenderingRegistry; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/client/render/BlockSpikesRenderer.java b/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockSpikesRenderer.java similarity index 95% rename from src/main/java/com/cricketcraft/minecraft/chisel/client/render/BlockSpikesRenderer.java rename to src/main/java/info/jbcs/minecraft/chisel/client/render/BlockSpikesRenderer.java index 78b31654..a998d977 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/client/render/BlockSpikesRenderer.java +++ b/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockSpikesRenderer.java @@ -1,4 +1,7 @@ -package com.cricketcraft.minecraft.chisel.client.render; +package info.jbcs.minecraft.chisel.client.render; + +import info.jbcs.minecraft.chisel.init.ModBlocks; +import info.jbcs.minecraft.chisel.utils.Drawing; import java.util.Random; @@ -7,10 +10,6 @@ import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.Tessellator; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; - -import com.cricketcraft.minecraft.chisel.init.ModBlocks; -import com.cricketcraft.minecraft.chisel.utils.Drawing; - import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import cpw.mods.fml.client.registry.RenderingRegistry; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/client/render/BlockTexturedOreRenderer.java b/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockTexturedOreRenderer.java similarity index 93% rename from src/main/java/com/cricketcraft/minecraft/chisel/client/render/BlockTexturedOreRenderer.java rename to src/main/java/info/jbcs/minecraft/chisel/client/render/BlockTexturedOreRenderer.java index a4c05c95..f92011d3 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/client/render/BlockTexturedOreRenderer.java +++ b/src/main/java/info/jbcs/minecraft/chisel/client/render/BlockTexturedOreRenderer.java @@ -1,5 +1,7 @@ -package com.cricketcraft.minecraft.chisel.client.render; +package info.jbcs.minecraft.chisel.client.render; +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; @@ -7,9 +9,6 @@ import net.minecraft.world.IBlockAccess; import org.lwjgl.opengl.GL11; -import com.cricketcraft.minecraft.chisel.block.BlockTexturedOre; -import com.cricketcraft.minecraft.chisel.utils.Drawing; - import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import cpw.mods.fml.client.registry.RenderingRegistry; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/client/render/CTM.java b/src/main/java/info/jbcs/minecraft/chisel/client/render/CTM.java similarity index 99% rename from src/main/java/com/cricketcraft/minecraft/chisel/client/render/CTM.java rename to src/main/java/info/jbcs/minecraft/chisel/client/render/CTM.java index 300e23f9..4c63058e 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/client/render/CTM.java +++ b/src/main/java/info/jbcs/minecraft/chisel/client/render/CTM.java @@ -1,10 +1,9 @@ -package com.cricketcraft.minecraft.chisel.client.render; +package info.jbcs.minecraft.chisel.client.render; +import info.jbcs.minecraft.chisel.api.IFacade; import net.minecraft.block.Block; import net.minecraft.world.IBlockAccess; -import com.cricketcraft.minecraft.chisel.api.IFacade; - public class CTM { static int submaps[][] = { diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/client/render/RenderBlocksCTM.java b/src/main/java/info/jbcs/minecraft/chisel/client/render/RenderBlocksCTM.java similarity index 99% rename from src/main/java/com/cricketcraft/minecraft/chisel/client/render/RenderBlocksCTM.java rename to src/main/java/info/jbcs/minecraft/chisel/client/render/RenderBlocksCTM.java index 21567991..14844492 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/client/render/RenderBlocksCTM.java +++ b/src/main/java/info/jbcs/minecraft/chisel/client/render/RenderBlocksCTM.java @@ -1,4 +1,4 @@ -package com.cricketcraft.minecraft.chisel.client.render; +package info.jbcs.minecraft.chisel.client.render; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/client/render/RenderBlocksCTMCarpet.java b/src/main/java/info/jbcs/minecraft/chisel/client/render/RenderBlocksCTMCarpet.java similarity index 95% rename from src/main/java/com/cricketcraft/minecraft/chisel/client/render/RenderBlocksCTMCarpet.java rename to src/main/java/info/jbcs/minecraft/chisel/client/render/RenderBlocksCTMCarpet.java index 10b40e3b..0232d4fc 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/client/render/RenderBlocksCTMCarpet.java +++ b/src/main/java/info/jbcs/minecraft/chisel/client/render/RenderBlocksCTMCarpet.java @@ -1,4 +1,4 @@ -package com.cricketcraft.minecraft.chisel.client.render; +package info.jbcs.minecraft.chisel.client.render; import net.minecraft.block.Block; import net.minecraft.util.IIcon; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/client/render/RenderBlocksColumn.java b/src/main/java/info/jbcs/minecraft/chisel/client/render/RenderBlocksColumn.java similarity index 98% rename from src/main/java/com/cricketcraft/minecraft/chisel/client/render/RenderBlocksColumn.java rename to src/main/java/info/jbcs/minecraft/chisel/client/render/RenderBlocksColumn.java index c5817803..0cf034fa 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/client/render/RenderBlocksColumn.java +++ b/src/main/java/info/jbcs/minecraft/chisel/client/render/RenderBlocksColumn.java @@ -1,4 +1,4 @@ -package com.cricketcraft.minecraft.chisel.client.render; +package info.jbcs.minecraft.chisel.client.render; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/client/render/RenderBlocksEldritch.java b/src/main/java/info/jbcs/minecraft/chisel/client/render/RenderBlocksEldritch.java similarity index 99% rename from src/main/java/com/cricketcraft/minecraft/chisel/client/render/RenderBlocksEldritch.java rename to src/main/java/info/jbcs/minecraft/chisel/client/render/RenderBlocksEldritch.java index eed380f7..6fc9a115 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/client/render/RenderBlocksEldritch.java +++ b/src/main/java/info/jbcs/minecraft/chisel/client/render/RenderBlocksEldritch.java @@ -1,4 +1,4 @@ -package com.cricketcraft.minecraft.chisel.client.render; +package info.jbcs.minecraft.chisel.client.render; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/client/render/TextureSubmap.java b/src/main/java/info/jbcs/minecraft/chisel/client/render/TextureSubmap.java similarity index 93% rename from src/main/java/com/cricketcraft/minecraft/chisel/client/render/TextureSubmap.java rename to src/main/java/info/jbcs/minecraft/chisel/client/render/TextureSubmap.java index 41f6d2cb..6f1220e1 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/client/render/TextureSubmap.java +++ b/src/main/java/info/jbcs/minecraft/chisel/client/render/TextureSubmap.java @@ -1,4 +1,4 @@ -package com.cricketcraft.minecraft.chisel.client.render; +package info.jbcs.minecraft.chisel.client.render; import net.minecraft.util.IIcon; import net.minecraftforge.client.event.TextureStitchEvent; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/client/render/TextureVirtual.java b/src/main/java/info/jbcs/minecraft/chisel/client/render/TextureVirtual.java similarity index 96% rename from src/main/java/com/cricketcraft/minecraft/chisel/client/render/TextureVirtual.java rename to src/main/java/info/jbcs/minecraft/chisel/client/render/TextureVirtual.java index 5a6e79ef..e24ee64b 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/client/render/TextureVirtual.java +++ b/src/main/java/info/jbcs/minecraft/chisel/client/render/TextureVirtual.java @@ -1,4 +1,4 @@ -package com.cricketcraft.minecraft.chisel.client.render; +package info.jbcs.minecraft.chisel.client.render; import net.minecraft.util.IIcon; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/client/render/item/ItemAutoChiselRenderer.java b/src/main/java/info/jbcs/minecraft/chisel/client/render/item/ItemAutoChiselRenderer.java similarity index 95% rename from src/main/java/com/cricketcraft/minecraft/chisel/client/render/item/ItemAutoChiselRenderer.java rename to src/main/java/info/jbcs/minecraft/chisel/client/render/item/ItemAutoChiselRenderer.java index 24c63ce4..d8669c65 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/client/render/item/ItemAutoChiselRenderer.java +++ b/src/main/java/info/jbcs/minecraft/chisel/client/render/item/ItemAutoChiselRenderer.java @@ -1,13 +1,12 @@ -package com.cricketcraft.minecraft.chisel.client.render.item; +package info.jbcs.minecraft.chisel.client.render.item; +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 com.cricketcraft.minecraft.chisel.client.model.ModelAutoChisel; - import cpw.mods.fml.client.FMLClientHandler; public class ItemAutoChiselRenderer implements IItemRenderer{ diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/client/render/item/ItemChiselRenderer.java b/src/main/java/info/jbcs/minecraft/chisel/client/render/item/ItemChiselRenderer.java similarity index 96% rename from src/main/java/com/cricketcraft/minecraft/chisel/client/render/item/ItemChiselRenderer.java rename to src/main/java/info/jbcs/minecraft/chisel/client/render/item/ItemChiselRenderer.java index 78e6cfeb..5a845e8e 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/client/render/item/ItemChiselRenderer.java +++ b/src/main/java/info/jbcs/minecraft/chisel/client/render/item/ItemChiselRenderer.java @@ -1,4 +1,4 @@ -package com.cricketcraft.minecraft.chisel.client.render.item; +package info.jbcs.minecraft.chisel.client.render.item; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.RenderBlocks; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/client/render/item/ItemPresentRenderer.java b/src/main/java/info/jbcs/minecraft/chisel/client/render/item/ItemPresentRenderer.java similarity index 94% rename from src/main/java/com/cricketcraft/minecraft/chisel/client/render/item/ItemPresentRenderer.java rename to src/main/java/info/jbcs/minecraft/chisel/client/render/item/ItemPresentRenderer.java index c6e4b95e..55717226 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/client/render/item/ItemPresentRenderer.java +++ b/src/main/java/info/jbcs/minecraft/chisel/client/render/item/ItemPresentRenderer.java @@ -1,5 +1,6 @@ -package com.cricketcraft.minecraft.chisel.client.render.item; +package info.jbcs.minecraft.chisel.client.render.item; +import info.jbcs.minecraft.chisel.Chisel; import net.minecraft.client.model.ModelChest; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; @@ -7,8 +8,6 @@ import net.minecraftforge.client.IItemRenderer; import org.lwjgl.opengl.GL11; -import com.cricketcraft.minecraft.chisel.Chisel; - import cpw.mods.fml.client.FMLClientHandler; public class ItemPresentRenderer implements IItemRenderer { diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/client/render/tile/RenderAutoChisel.java b/src/main/java/info/jbcs/minecraft/chisel/client/render/tile/RenderAutoChisel.java similarity index 95% rename from src/main/java/com/cricketcraft/minecraft/chisel/client/render/tile/RenderAutoChisel.java rename to src/main/java/info/jbcs/minecraft/chisel/client/render/tile/RenderAutoChisel.java index 5e489764..f27e72be 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/client/render/tile/RenderAutoChisel.java +++ b/src/main/java/info/jbcs/minecraft/chisel/client/render/tile/RenderAutoChisel.java @@ -1,10 +1,12 @@ -package com.cricketcraft.minecraft.chisel.client.render.tile; +package info.jbcs.minecraft.chisel.client.render.tile; 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; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; @@ -16,9 +18,6 @@ import net.minecraft.world.World; import org.lwjgl.opengl.GL11; -import com.cricketcraft.minecraft.chisel.block.tileentity.TileEntityAutoChisel; -import com.cricketcraft.minecraft.chisel.client.model.ModelAutoChisel; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/client/render/tile/RenderPresent.java b/src/main/java/info/jbcs/minecraft/chisel/client/render/tile/RenderPresent.java similarity index 94% rename from src/main/java/com/cricketcraft/minecraft/chisel/client/render/tile/RenderPresent.java rename to src/main/java/info/jbcs/minecraft/chisel/client/render/tile/RenderPresent.java index d7c65d91..e08f5487 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/client/render/tile/RenderPresent.java +++ b/src/main/java/info/jbcs/minecraft/chisel/client/render/tile/RenderPresent.java @@ -1,5 +1,7 @@ -package com.cricketcraft.minecraft.chisel.client.render.tile; +package info.jbcs.minecraft.chisel.client.render.tile; +import info.jbcs.minecraft.chisel.block.BlockPresent; +import info.jbcs.minecraft.chisel.block.tileentity.TileEntityPresent; import net.minecraft.block.Block; import net.minecraft.block.BlockChest; import net.minecraft.client.model.ModelChest; @@ -10,9 +12,6 @@ import net.minecraft.tileentity.TileEntity; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; -import com.cricketcraft.minecraft.chisel.block.BlockPresent; -import com.cricketcraft.minecraft.chisel.block.tileentity.TileEntityPresent; - import cpw.mods.fml.common.FMLLog; public class RenderPresent extends TileEntityChestRenderer { @@ -91,7 +90,7 @@ public class RenderPresent extends TileEntityChestRenderer { GL11.glTranslatef(0.0F, 0.0F, -1.0F); } - GL11.glRotatef(short1, 0.0F, 1.0F, 0.0F); + GL11.glRotatef((float) short1, 0.0F, 1.0F, 0.0F); GL11.glTranslatef(-0.5F, -0.5F, -0.5F); float f1 = present.prevLidAngle + (present.lidAngle - present.prevLidAngle) * partialTicks; float f2; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/compat/Compatibility.java b/src/main/java/info/jbcs/minecraft/chisel/compat/Compatibility.java similarity index 93% rename from src/main/java/com/cricketcraft/minecraft/chisel/compat/Compatibility.java rename to src/main/java/info/jbcs/minecraft/chisel/compat/Compatibility.java index 3e83423b..2289cca1 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/compat/Compatibility.java +++ b/src/main/java/info/jbcs/minecraft/chisel/compat/Compatibility.java @@ -1,7 +1,6 @@ -package com.cricketcraft.minecraft.chisel.compat; - -import com.cricketcraft.minecraft.chisel.carving.Carving; +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; @@ -15,7 +14,7 @@ public class Compatibility addSupport("ProjRed|Exploration", "projectred.exploration.stone", "marble", 0, 99); addSupport("bluepower", "marble", "marble", 0, 99); - + addSupport("PFAAGeologica", "strongStone", "marble", 5, 99); addSupport("PFAAGeologica", "strongStoneSlab", "marbleSlab", 5, 99); addSupport("PFAAGeologica", "strongStoneBrickStairs.marble", "marbleStairs", 0, 99); diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/compat/FMPIntegration.java b/src/main/java/info/jbcs/minecraft/chisel/compat/FMPIntegration.java similarity index 95% rename from src/main/java/com/cricketcraft/minecraft/chisel/compat/FMPIntegration.java rename to src/main/java/info/jbcs/minecraft/chisel/compat/FMPIntegration.java index c692349a..52c1ac0e 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/compat/FMPIntegration.java +++ b/src/main/java/info/jbcs/minecraft/chisel/compat/FMPIntegration.java @@ -1,11 +1,9 @@ -package com.cricketcraft.minecraft.chisel.compat; +package info.jbcs.minecraft.chisel.compat; +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 com.cricketcraft.minecraft.chisel.compat.ModIntegration.IModIntegration; -import com.cricketcraft.minecraft.chisel.init.ModBlocks; - import cpw.mods.fml.common.event.FMLInterModComms; public class FMPIntegration implements IModIntegration{ diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/compat/MarbleCompatibility.java b/src/main/java/info/jbcs/minecraft/chisel/compat/MarbleCompatibility.java similarity index 97% rename from src/main/java/com/cricketcraft/minecraft/chisel/compat/MarbleCompatibility.java rename to src/main/java/info/jbcs/minecraft/chisel/compat/MarbleCompatibility.java index 87bc3da7..7712f15d 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/compat/MarbleCompatibility.java +++ b/src/main/java/info/jbcs/minecraft/chisel/compat/MarbleCompatibility.java @@ -1,9 +1,7 @@ -package com.cricketcraft.minecraft.chisel.compat; +package info.jbcs.minecraft.chisel.compat; +import info.jbcs.minecraft.chisel.carving.Carving; import net.minecraft.block.Block; - -import com.cricketcraft.minecraft.chisel.carving.Carving; - import cpw.mods.fml.common.event.FMLPostInitializationEvent; public class MarbleCompatibility diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/compat/ModIntegration.java b/src/main/java/info/jbcs/minecraft/chisel/compat/ModIntegration.java similarity index 95% rename from src/main/java/com/cricketcraft/minecraft/chisel/compat/ModIntegration.java rename to src/main/java/info/jbcs/minecraft/chisel/compat/ModIntegration.java index e46f37fe..66bb8435 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/compat/ModIntegration.java +++ b/src/main/java/info/jbcs/minecraft/chisel/compat/ModIntegration.java @@ -1,4 +1,4 @@ -package com.cricketcraft.minecraft.chisel.compat; +package info.jbcs.minecraft.chisel.compat; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/entity/EntityBallOMoss.java b/src/main/java/info/jbcs/minecraft/chisel/entity/EntityBallOMoss.java similarity index 91% rename from src/main/java/com/cricketcraft/minecraft/chisel/entity/EntityBallOMoss.java rename to src/main/java/info/jbcs/minecraft/chisel/entity/EntityBallOMoss.java index bfda35cb..adc8ca1f 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/entity/EntityBallOMoss.java +++ b/src/main/java/info/jbcs/minecraft/chisel/entity/EntityBallOMoss.java @@ -1,5 +1,9 @@ -package com.cricketcraft.minecraft.chisel.entity; +package info.jbcs.minecraft.chisel.entity; +import info.jbcs.minecraft.chisel.Chisel; +import info.jbcs.minecraft.chisel.client.GeneralChiselClient; +import info.jbcs.minecraft.chisel.init.ModBlocks; +import info.jbcs.minecraft.chisel.utils.General; import net.minecraft.block.Block; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.projectile.EntityThrowable; @@ -7,11 +11,6 @@ import net.minecraft.init.Blocks; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; -import com.cricketcraft.minecraft.chisel.Chisel; -import com.cricketcraft.minecraft.chisel.client.GeneralChiselClient; -import com.cricketcraft.minecraft.chisel.init.ModBlocks; -import com.cricketcraft.minecraft.chisel.utils.General; - public class EntityBallOMoss extends EntityThrowable { diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/entity/EntityCloudInABottle.java b/src/main/java/info/jbcs/minecraft/chisel/entity/EntityCloudInABottle.java similarity index 96% rename from src/main/java/com/cricketcraft/minecraft/chisel/entity/EntityCloudInABottle.java rename to src/main/java/info/jbcs/minecraft/chisel/entity/EntityCloudInABottle.java index 9d7bf6e7..0144d928 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/entity/EntityCloudInABottle.java +++ b/src/main/java/info/jbcs/minecraft/chisel/entity/EntityCloudInABottle.java @@ -1,4 +1,6 @@ -package com.cricketcraft.minecraft.chisel.entity; +package info.jbcs.minecraft.chisel.entity; + +import info.jbcs.minecraft.chisel.init.ModBlocks; import java.util.Random; @@ -7,8 +9,6 @@ import net.minecraft.entity.projectile.EntityThrowable; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; -import com.cricketcraft.minecraft.chisel.init.ModBlocks; - public class EntityCloudInABottle extends EntityThrowable { Random rand = new Random(); diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/entity/EntitySmashingRock.java b/src/main/java/info/jbcs/minecraft/chisel/entity/EntitySmashingRock.java similarity index 96% rename from src/main/java/com/cricketcraft/minecraft/chisel/entity/EntitySmashingRock.java rename to src/main/java/info/jbcs/minecraft/chisel/entity/EntitySmashingRock.java index 9357b963..656535e3 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/entity/EntitySmashingRock.java +++ b/src/main/java/info/jbcs/minecraft/chisel/entity/EntitySmashingRock.java @@ -1,5 +1,6 @@ -package com.cricketcraft.minecraft.chisel.entity; +package info.jbcs.minecraft.chisel.entity; +import info.jbcs.minecraft.chisel.utils.General; import net.minecraft.block.Block; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.projectile.EntityThrowable; @@ -7,8 +8,6 @@ import net.minecraft.init.Blocks; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; -import com.cricketcraft.minecraft.chisel.utils.General; - public class EntitySmashingRock extends EntityThrowable { diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/entity/fx/EntityBallOMossFX.java b/src/main/java/info/jbcs/minecraft/chisel/entity/fx/EntityBallOMossFX.java similarity index 93% rename from src/main/java/com/cricketcraft/minecraft/chisel/entity/fx/EntityBallOMossFX.java rename to src/main/java/info/jbcs/minecraft/chisel/entity/fx/EntityBallOMossFX.java index 9d927da4..0efac068 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/entity/fx/EntityBallOMossFX.java +++ b/src/main/java/info/jbcs/minecraft/chisel/entity/fx/EntityBallOMossFX.java @@ -1,5 +1,8 @@ -package com.cricketcraft.minecraft.chisel.entity.fx; +package info.jbcs.minecraft.chisel.entity.fx; +import info.jbcs.minecraft.chisel.block.BlockSnakestoneObsidian; +import info.jbcs.minecraft.chisel.init.ModItems; +import info.jbcs.minecraft.chisel.utils.General; import net.minecraft.client.particle.EntityFX; import net.minecraft.client.renderer.Tessellator; import net.minecraft.util.IIcon; @@ -7,10 +10,6 @@ import net.minecraft.world.World; import org.lwjgl.opengl.GL11; -import com.cricketcraft.minecraft.chisel.block.BlockSnakestoneObsidian; -import com.cricketcraft.minecraft.chisel.init.ModItems; -import com.cricketcraft.minecraft.chisel.utils.General; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/entity/fx/EntityGrimstoneFX.java b/src/main/java/info/jbcs/minecraft/chisel/entity/fx/EntityGrimstoneFX.java similarity index 90% rename from src/main/java/com/cricketcraft/minecraft/chisel/entity/fx/EntityGrimstoneFX.java rename to src/main/java/info/jbcs/minecraft/chisel/entity/fx/EntityGrimstoneFX.java index ffd64d58..4f822557 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/entity/fx/EntityGrimstoneFX.java +++ b/src/main/java/info/jbcs/minecraft/chisel/entity/fx/EntityGrimstoneFX.java @@ -1,12 +1,11 @@ -package com.cricketcraft.minecraft.chisel.entity.fx; +package info.jbcs.minecraft.chisel.entity.fx; +import info.jbcs.minecraft.chisel.block.BlockGrimstone; +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 com.cricketcraft.minecraft.chisel.block.BlockGrimstone; -import com.cricketcraft.minecraft.chisel.utils.General; - public class EntityGrimstoneFX extends EntityFX { float initialScale; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/entity/fx/EntityHolystoneFX.java b/src/main/java/info/jbcs/minecraft/chisel/entity/fx/EntityHolystoneFX.java similarity index 90% rename from src/main/java/com/cricketcraft/minecraft/chisel/entity/fx/EntityHolystoneFX.java rename to src/main/java/info/jbcs/minecraft/chisel/entity/fx/EntityHolystoneFX.java index c7fc09b7..5b7d9ba5 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/entity/fx/EntityHolystoneFX.java +++ b/src/main/java/info/jbcs/minecraft/chisel/entity/fx/EntityHolystoneFX.java @@ -1,12 +1,11 @@ -package com.cricketcraft.minecraft.chisel.entity.fx; +package info.jbcs.minecraft.chisel.entity.fx; +import info.jbcs.minecraft.chisel.block.BlockHolystone; +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 com.cricketcraft.minecraft.chisel.block.BlockHolystone; -import com.cricketcraft.minecraft.chisel.utils.General; - public class EntityHolystoneFX extends EntityFX { float initialScale; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/entity/fx/EntitySnakestoneObsidianFX.java b/src/main/java/info/jbcs/minecraft/chisel/entity/fx/EntitySnakestoneObsidianFX.java similarity index 94% rename from src/main/java/com/cricketcraft/minecraft/chisel/entity/fx/EntitySnakestoneObsidianFX.java rename to src/main/java/info/jbcs/minecraft/chisel/entity/fx/EntitySnakestoneObsidianFX.java index 6c07e517..58fb6bf2 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/entity/fx/EntitySnakestoneObsidianFX.java +++ b/src/main/java/info/jbcs/minecraft/chisel/entity/fx/EntitySnakestoneObsidianFX.java @@ -1,14 +1,13 @@ -package com.cricketcraft.minecraft.chisel.entity.fx; +package info.jbcs.minecraft.chisel.entity.fx; +import info.jbcs.minecraft.chisel.block.BlockSnakestoneObsidian; +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; -import com.cricketcraft.minecraft.chisel.block.BlockSnakestoneObsidian; -import com.cricketcraft.minecraft.chisel.utils.General; - public class EntitySnakestoneObsidianFX extends EntityFX { BlockSnakestoneObsidian block; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/entity/fx/EntityVoidstoneFX.java b/src/main/java/info/jbcs/minecraft/chisel/entity/fx/EntityVoidstoneFX.java similarity index 90% rename from src/main/java/com/cricketcraft/minecraft/chisel/entity/fx/EntityVoidstoneFX.java rename to src/main/java/info/jbcs/minecraft/chisel/entity/fx/EntityVoidstoneFX.java index a01b1740..6d903bfe 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/entity/fx/EntityVoidstoneFX.java +++ b/src/main/java/info/jbcs/minecraft/chisel/entity/fx/EntityVoidstoneFX.java @@ -1,12 +1,11 @@ -package com.cricketcraft.minecraft.chisel.entity.fx; +package info.jbcs.minecraft.chisel.entity.fx; +import info.jbcs.minecraft.chisel.block.BlockVoidstone; +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 com.cricketcraft.minecraft.chisel.block.BlockVoidstone; -import com.cricketcraft.minecraft.chisel.utils.General; - public class EntityVoidstoneFX extends EntityFX { static final float fadetime = 20F; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/init/ModBlocks.java b/src/main/java/info/jbcs/minecraft/chisel/init/ModBlocks.java similarity index 98% rename from src/main/java/com/cricketcraft/minecraft/chisel/init/ModBlocks.java rename to src/main/java/info/jbcs/minecraft/chisel/init/ModBlocks.java index 457ca1a0..10fdb231 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/init/ModBlocks.java +++ b/src/main/java/info/jbcs/minecraft/chisel/init/ModBlocks.java @@ -1,53 +1,51 @@ -package com.cricketcraft.minecraft.chisel.init; +package info.jbcs.minecraft.chisel.init; +import info.jbcs.minecraft.chisel.Chisel; +import info.jbcs.minecraft.chisel.Configurations; +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; +import info.jbcs.minecraft.chisel.item.ItemCarvable; +import info.jbcs.minecraft.chisel.item.ItemMarbleSlab; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; import net.minecraftforge.oredict.OreDictionary; - -import com.cricketcraft.minecraft.chisel.Chisel; -import com.cricketcraft.minecraft.chisel.Configurations; -import com.cricketcraft.minecraft.chisel.block.BlockAutoChisel; -import com.cricketcraft.minecraft.chisel.block.BlockBeaconBase; -import com.cricketcraft.minecraft.chisel.block.BlockCarvable; -import com.cricketcraft.minecraft.chisel.block.BlockCarvableGlass; -import com.cricketcraft.minecraft.chisel.block.BlockCarvablePane; -import com.cricketcraft.minecraft.chisel.block.BlockCarvablePowered; -import com.cricketcraft.minecraft.chisel.block.BlockCloud; -import com.cricketcraft.minecraft.chisel.block.BlockConcrete; -import com.cricketcraft.minecraft.chisel.block.BlockEldritch; -import com.cricketcraft.minecraft.chisel.block.BlockGrimstone; -import com.cricketcraft.minecraft.chisel.block.BlockHolystone; -import com.cricketcraft.minecraft.chisel.block.BlockLavastone; -import com.cricketcraft.minecraft.chisel.block.BlockLeaf; -import com.cricketcraft.minecraft.chisel.block.BlockLightstoneCarvable; -import com.cricketcraft.minecraft.chisel.block.BlockMarbleBookshelf; -import com.cricketcraft.minecraft.chisel.block.BlockMarbleCarpet; -import com.cricketcraft.minecraft.chisel.block.BlockMarbleIce; -import com.cricketcraft.minecraft.chisel.block.BlockMarbleIceStairs; -import com.cricketcraft.minecraft.chisel.block.BlockMarblePillar; -import com.cricketcraft.minecraft.chisel.block.BlockMarbleSlab; -import com.cricketcraft.minecraft.chisel.block.BlockMarbleStairs; -import com.cricketcraft.minecraft.chisel.block.BlockMarbleStairsMaker; -import com.cricketcraft.minecraft.chisel.block.BlockMarbleStairsMakerCreator; -import com.cricketcraft.minecraft.chisel.block.BlockMarbleWall; -import com.cricketcraft.minecraft.chisel.block.BlockPresent; -import com.cricketcraft.minecraft.chisel.block.BlockRoadLine; -import com.cricketcraft.minecraft.chisel.block.BlockSnakestone; -import com.cricketcraft.minecraft.chisel.block.BlockSnakestoneObsidian; -import com.cricketcraft.minecraft.chisel.block.BlockSpikes; -import com.cricketcraft.minecraft.chisel.block.BlockVoidstone; -import com.cricketcraft.minecraft.chisel.block.BlockVoidstonePillar; -import com.cricketcraft.minecraft.chisel.block.BlockWaterstone; -import com.cricketcraft.minecraft.chisel.block.ItemBlockAutoChisel; -import com.cricketcraft.minecraft.chisel.carving.CarvableHelper; -import com.cricketcraft.minecraft.chisel.carving.CarvableVariation; -import com.cricketcraft.minecraft.chisel.carving.Carving; -import com.cricketcraft.minecraft.chisel.item.ItemCarvable; -import com.cricketcraft.minecraft.chisel.item.ItemMarbleSlab; - import cpw.mods.fml.common.registry.GameRegistry; public class ModBlocks { diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/init/ModItems.java b/src/main/java/info/jbcs/minecraft/chisel/init/ModItems.java similarity index 75% rename from src/main/java/com/cricketcraft/minecraft/chisel/init/ModItems.java rename to src/main/java/info/jbcs/minecraft/chisel/init/ModItems.java index 682ff1a9..81278be6 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/init/ModItems.java +++ b/src/main/java/info/jbcs/minecraft/chisel/init/ModItems.java @@ -1,16 +1,15 @@ -package com.cricketcraft.minecraft.chisel.init; - -import com.cricketcraft.minecraft.chisel.Chisel; -import com.cricketcraft.minecraft.chisel.Configurations; -import com.cricketcraft.minecraft.chisel.entity.EntityBallOMoss; -import com.cricketcraft.minecraft.chisel.entity.EntityCloudInABottle; -import com.cricketcraft.minecraft.chisel.entity.EntitySmashingRock; -import com.cricketcraft.minecraft.chisel.item.ItemBallOMoss; -import com.cricketcraft.minecraft.chisel.item.ItemChisel; -import com.cricketcraft.minecraft.chisel.item.ItemCloudInABottle; -import com.cricketcraft.minecraft.chisel.item.ItemSmashingRock; -import com.cricketcraft.minecraft.chisel.item.ItemUpgrade; +package info.jbcs.minecraft.chisel.init; +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.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; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/init/ModTabs.java b/src/main/java/info/jbcs/minecraft/chisel/init/ModTabs.java similarity index 93% rename from src/main/java/com/cricketcraft/minecraft/chisel/init/ModTabs.java rename to src/main/java/info/jbcs/minecraft/chisel/init/ModTabs.java index a4f1275b..7c0fef9d 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/init/ModTabs.java +++ b/src/main/java/info/jbcs/minecraft/chisel/init/ModTabs.java @@ -1,4 +1,4 @@ -package com.cricketcraft.minecraft.chisel.init; +package info.jbcs.minecraft.chisel.init; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/inventory/ContainerAutoChisel.java b/src/main/java/info/jbcs/minecraft/chisel/inventory/ContainerAutoChisel.java similarity index 94% rename from src/main/java/com/cricketcraft/minecraft/chisel/inventory/ContainerAutoChisel.java rename to src/main/java/info/jbcs/minecraft/chisel/inventory/ContainerAutoChisel.java index aafd0e80..2ea78121 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/inventory/ContainerAutoChisel.java +++ b/src/main/java/info/jbcs/minecraft/chisel/inventory/ContainerAutoChisel.java @@ -1,13 +1,12 @@ -package com.cricketcraft.minecraft.chisel.inventory; +package info.jbcs.minecraft.chisel.inventory; +import info.jbcs.minecraft.chisel.block.tileentity.TileEntityAutoChisel; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; -import com.cricketcraft.minecraft.chisel.block.tileentity.TileEntityAutoChisel; - public class ContainerAutoChisel extends Container { public static TileEntityAutoChisel autoChisel; @@ -15,7 +14,7 @@ public class ContainerAutoChisel extends Container { public ContainerAutoChisel(InventoryPlayer player, TileEntityAutoChisel tileEntityAutoChisel) { - ContainerAutoChisel.player = player.player; + this.player = player.player; autoChisel = tileEntityAutoChisel; addSlotToContainer(new Slot(tileEntityAutoChisel, 0, 53, 15)); diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/inventory/ContainerChisel.java b/src/main/java/info/jbcs/minecraft/chisel/inventory/ContainerChisel.java similarity index 94% rename from src/main/java/com/cricketcraft/minecraft/chisel/inventory/ContainerChisel.java rename to src/main/java/info/jbcs/minecraft/chisel/inventory/ContainerChisel.java index f022ed77..dff2f7b0 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/inventory/ContainerChisel.java +++ b/src/main/java/info/jbcs/minecraft/chisel/inventory/ContainerChisel.java @@ -1,5 +1,8 @@ -package com.cricketcraft.minecraft.chisel.inventory; +package info.jbcs.minecraft.chisel.inventory; +import info.jbcs.minecraft.chisel.carving.Carving; +import info.jbcs.minecraft.chisel.item.ItemChisel; +import info.jbcs.minecraft.chisel.utils.General; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; @@ -8,10 +11,6 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import com.cricketcraft.minecraft.chisel.carving.Carving; -import com.cricketcraft.minecraft.chisel.item.ItemChisel; -import com.cricketcraft.minecraft.chisel.utils.General; - public class ContainerChisel extends Container { public final InventoryChiselSelection inventory; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/inventory/ContainerPresent.java b/src/main/java/info/jbcs/minecraft/chisel/inventory/ContainerPresent.java similarity index 95% rename from src/main/java/com/cricketcraft/minecraft/chisel/inventory/ContainerPresent.java rename to src/main/java/info/jbcs/minecraft/chisel/inventory/ContainerPresent.java index 45ce6585..eee7e9ca 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/inventory/ContainerPresent.java +++ b/src/main/java/info/jbcs/minecraft/chisel/inventory/ContainerPresent.java @@ -1,4 +1,4 @@ -package com.cricketcraft.minecraft.chisel.inventory; +package info.jbcs.minecraft.chisel.inventory; import net.minecraft.inventory.ContainerChest; import net.minecraft.inventory.IInventory; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/inventory/InventoryChiselSelection.java b/src/main/java/info/jbcs/minecraft/chisel/inventory/InventoryChiselSelection.java similarity index 97% rename from src/main/java/com/cricketcraft/minecraft/chisel/inventory/InventoryChiselSelection.java rename to src/main/java/info/jbcs/minecraft/chisel/inventory/InventoryChiselSelection.java index 77331a4c..d77cff9e 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/inventory/InventoryChiselSelection.java +++ b/src/main/java/info/jbcs/minecraft/chisel/inventory/InventoryChiselSelection.java @@ -1,4 +1,6 @@ -package com.cricketcraft.minecraft.chisel.inventory; +package info.jbcs.minecraft.chisel.inventory; + +import info.jbcs.minecraft.chisel.item.ItemChisel; import java.util.ArrayList; @@ -8,8 +10,6 @@ import net.minecraft.inventory.IInventory; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import com.cricketcraft.minecraft.chisel.item.ItemChisel; - public class InventoryChiselSelection implements IInventory { ItemStack chisel = null; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/inventory/InventoryLargePresent.java b/src/main/java/info/jbcs/minecraft/chisel/inventory/InventoryLargePresent.java similarity index 98% rename from src/main/java/com/cricketcraft/minecraft/chisel/inventory/InventoryLargePresent.java rename to src/main/java/info/jbcs/minecraft/chisel/inventory/InventoryLargePresent.java index d729ee01..3cac0ee4 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/inventory/InventoryLargePresent.java +++ b/src/main/java/info/jbcs/minecraft/chisel/inventory/InventoryLargePresent.java @@ -1,4 +1,4 @@ -package com.cricketcraft.minecraft.chisel.inventory; +package info.jbcs.minecraft.chisel.inventory; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/inventory/SlotChiselInput.java b/src/main/java/info/jbcs/minecraft/chisel/inventory/SlotChiselInput.java similarity index 94% rename from src/main/java/com/cricketcraft/minecraft/chisel/inventory/SlotChiselInput.java rename to src/main/java/info/jbcs/minecraft/chisel/inventory/SlotChiselInput.java index 85928f9e..31e6d595 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/inventory/SlotChiselInput.java +++ b/src/main/java/info/jbcs/minecraft/chisel/inventory/SlotChiselInput.java @@ -1,4 +1,4 @@ -package com.cricketcraft.minecraft.chisel.inventory; +package info.jbcs.minecraft.chisel.inventory; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Slot; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/inventory/SlotChiselPlayer.java b/src/main/java/info/jbcs/minecraft/chisel/inventory/SlotChiselPlayer.java similarity index 94% rename from src/main/java/com/cricketcraft/minecraft/chisel/inventory/SlotChiselPlayer.java rename to src/main/java/info/jbcs/minecraft/chisel/inventory/SlotChiselPlayer.java index 09e1649c..08875d62 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/inventory/SlotChiselPlayer.java +++ b/src/main/java/info/jbcs/minecraft/chisel/inventory/SlotChiselPlayer.java @@ -1,4 +1,4 @@ -package com.cricketcraft.minecraft.chisel.inventory; +package info.jbcs.minecraft.chisel.inventory; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/inventory/SlotChiselSelection.java b/src/main/java/info/jbcs/minecraft/chisel/inventory/SlotChiselSelection.java similarity index 96% rename from src/main/java/com/cricketcraft/minecraft/chisel/inventory/SlotChiselSelection.java rename to src/main/java/info/jbcs/minecraft/chisel/inventory/SlotChiselSelection.java index 112cba2c..b9a82192 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/inventory/SlotChiselSelection.java +++ b/src/main/java/info/jbcs/minecraft/chisel/inventory/SlotChiselSelection.java @@ -1,12 +1,11 @@ -package com.cricketcraft.minecraft.chisel.inventory; +package info.jbcs.minecraft.chisel.inventory; +import info.jbcs.minecraft.chisel.utils.General; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; -import com.cricketcraft.minecraft.chisel.utils.General; - public class SlotChiselSelection extends Slot { public SlotChiselSelection(ContainerChisel container, InventoryChiselSelection inv, IInventory iinventory, int i, int j, int k) @@ -61,7 +60,7 @@ public class SlotChiselSelection extends Slot String sound = container.carving.getVariationSound(itemstack.getItem(), itemstack.getItemDamage()); player.worldObj.playSoundAtEntity(player, sound, 0.3f + 0.7f * General.rand.nextFloat(), 0.6f + 0.4f * General.rand.nextFloat()); - + /* ItemStack stack=player.inventory.getItemStack(); putStack(new ItemStack(itemstack.itemID, itemstack.stackSize, itemstack.getItemDamage())); diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/item/ItemBallOMoss.java b/src/main/java/info/jbcs/minecraft/chisel/item/ItemBallOMoss.java similarity index 88% rename from src/main/java/com/cricketcraft/minecraft/chisel/item/ItemBallOMoss.java rename to src/main/java/info/jbcs/minecraft/chisel/item/ItemBallOMoss.java index e50f111b..908ac98c 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/item/ItemBallOMoss.java +++ b/src/main/java/info/jbcs/minecraft/chisel/item/ItemBallOMoss.java @@ -1,12 +1,11 @@ -package com.cricketcraft.minecraft.chisel.item; +package info.jbcs.minecraft.chisel.item; +import info.jbcs.minecraft.chisel.entity.EntityBallOMoss; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.world.World; -import com.cricketcraft.minecraft.chisel.entity.EntityBallOMoss; - public class ItemBallOMoss extends Item { diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/item/ItemCarvable.java b/src/main/java/info/jbcs/minecraft/chisel/item/ItemCarvable.java similarity index 81% rename from src/main/java/com/cricketcraft/minecraft/chisel/item/ItemCarvable.java rename to src/main/java/info/jbcs/minecraft/chisel/item/ItemCarvable.java index 42f8d2ca..b72de686 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/item/ItemCarvable.java +++ b/src/main/java/info/jbcs/minecraft/chisel/item/ItemCarvable.java @@ -1,4 +1,9 @@ -package com.cricketcraft.minecraft.chisel.item; +package info.jbcs.minecraft.chisel.item; + +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; @@ -9,11 +14,6 @@ import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; -import com.cricketcraft.minecraft.chisel.Configurations; -import com.cricketcraft.minecraft.chisel.api.ICarvable; -import com.cricketcraft.minecraft.chisel.carving.CarvableVariation; -import com.cricketcraft.minecraft.chisel.utils.General; - public class ItemCarvable extends ItemBlock { diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/item/ItemChisel.java b/src/main/java/info/jbcs/minecraft/chisel/item/ItemChisel.java similarity index 78% rename from src/main/java/com/cricketcraft/minecraft/chisel/item/ItemChisel.java rename to src/main/java/info/jbcs/minecraft/chisel/item/ItemChisel.java index 27d0d99f..4bed6b23 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/item/ItemChisel.java +++ b/src/main/java/info/jbcs/minecraft/chisel/item/ItemChisel.java @@ -1,4 +1,10 @@ -package com.cricketcraft.minecraft.chisel.item; +package info.jbcs.minecraft.chisel.item; + +import info.jbcs.minecraft.chisel.Chisel; +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; @@ -8,12 +14,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.ItemTool; import net.minecraft.world.World; -import com.cricketcraft.minecraft.chisel.Chisel; -import com.cricketcraft.minecraft.chisel.api.ChiselMode; -import com.cricketcraft.minecraft.chisel.api.IChiselMode; -import com.cricketcraft.minecraft.chisel.carving.CarvableHelper; -import com.cricketcraft.minecraft.chisel.carving.Carving; - 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/com/cricketcraft/minecraft/chisel/item/ItemCloudInABottle.java b/src/main/java/info/jbcs/minecraft/chisel/item/ItemCloudInABottle.java similarity index 88% rename from src/main/java/com/cricketcraft/minecraft/chisel/item/ItemCloudInABottle.java rename to src/main/java/info/jbcs/minecraft/chisel/item/ItemCloudInABottle.java index 6c734110..0ecfa8a1 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/item/ItemCloudInABottle.java +++ b/src/main/java/info/jbcs/minecraft/chisel/item/ItemCloudInABottle.java @@ -1,12 +1,11 @@ -package com.cricketcraft.minecraft.chisel.item; +package info.jbcs.minecraft.chisel.item; +import info.jbcs.minecraft.chisel.entity.EntityCloudInABottle; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.world.World; -import com.cricketcraft.minecraft.chisel.entity.EntityCloudInABottle; - public class ItemCloudInABottle extends Item { diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/item/ItemMarbleSlab.java b/src/main/java/info/jbcs/minecraft/chisel/item/ItemMarbleSlab.java similarity index 96% rename from src/main/java/com/cricketcraft/minecraft/chisel/item/ItemMarbleSlab.java rename to src/main/java/info/jbcs/minecraft/chisel/item/ItemMarbleSlab.java index 14dcb453..5b7724a6 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/item/ItemMarbleSlab.java +++ b/src/main/java/info/jbcs/minecraft/chisel/item/ItemMarbleSlab.java @@ -1,13 +1,12 @@ -package com.cricketcraft.minecraft.chisel.item; +package info.jbcs.minecraft.chisel.item; +import info.jbcs.minecraft.chisel.block.BlockMarbleSlab; import net.minecraft.block.Block; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.world.World; -import com.cricketcraft.minecraft.chisel.block.BlockMarbleSlab; - public class ItemMarbleSlab extends ItemCarvable { diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/item/ItemSmashingRock.java b/src/main/java/info/jbcs/minecraft/chisel/item/ItemSmashingRock.java similarity index 88% rename from src/main/java/com/cricketcraft/minecraft/chisel/item/ItemSmashingRock.java rename to src/main/java/info/jbcs/minecraft/chisel/item/ItemSmashingRock.java index ee0fee66..b744dfb3 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/item/ItemSmashingRock.java +++ b/src/main/java/info/jbcs/minecraft/chisel/item/ItemSmashingRock.java @@ -1,12 +1,11 @@ -package com.cricketcraft.minecraft.chisel.item; +package info.jbcs.minecraft.chisel.item; +import info.jbcs.minecraft.chisel.entity.EntitySmashingRock; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.world.World; -import com.cricketcraft.minecraft.chisel.entity.EntitySmashingRock; - public class ItemSmashingRock extends Item { diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/item/ItemUpgrade.java b/src/main/java/info/jbcs/minecraft/chisel/item/ItemUpgrade.java similarity index 92% rename from src/main/java/com/cricketcraft/minecraft/chisel/item/ItemUpgrade.java rename to src/main/java/info/jbcs/minecraft/chisel/item/ItemUpgrade.java index a02f08b0..f25e73e7 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/item/ItemUpgrade.java +++ b/src/main/java/info/jbcs/minecraft/chisel/item/ItemUpgrade.java @@ -1,4 +1,7 @@ -package com.cricketcraft.minecraft.chisel.item; +package info.jbcs.minecraft.chisel.item; + +import info.jbcs.minecraft.chisel.Chisel; +import info.jbcs.minecraft.chisel.block.tileentity.TileEntityAutoChisel; import java.util.List; @@ -12,9 +15,6 @@ import net.minecraft.util.IIcon; import net.minecraft.util.StatCollector; import net.minecraft.world.World; -import com.cricketcraft.minecraft.chisel.Chisel; -import com.cricketcraft.minecraft.chisel.block.tileentity.TileEntityAutoChisel; - public class ItemUpgrade extends Item{ public IIcon[] icons = new IIcon[6]; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/proxy/ClientProxy.java b/src/main/java/info/jbcs/minecraft/chisel/proxy/ClientProxy.java similarity index 55% rename from src/main/java/com/cricketcraft/minecraft/chisel/proxy/ClientProxy.java rename to src/main/java/info/jbcs/minecraft/chisel/proxy/ClientProxy.java index afe53001..df990b86 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/proxy/ClientProxy.java +++ b/src/main/java/info/jbcs/minecraft/chisel/proxy/ClientProxy.java @@ -1,33 +1,31 @@ -package com.cricketcraft.minecraft.chisel.proxy; +package info.jbcs.minecraft.chisel.proxy; +import info.jbcs.minecraft.chisel.block.tileentity.TileEntityAutoChisel; +import info.jbcs.minecraft.chisel.block.tileentity.TileEntityPresent; +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; +import info.jbcs.minecraft.chisel.client.render.tile.RenderAutoChisel; +import info.jbcs.minecraft.chisel.client.render.tile.RenderPresent; +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.init.ModBlocks; +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 com.cricketcraft.minecraft.chisel.block.tileentity.TileEntityAutoChisel; -import com.cricketcraft.minecraft.chisel.block.tileentity.TileEntityPresent; -import com.cricketcraft.minecraft.chisel.client.render.BlockAdvancedMarbleRenderer; -import com.cricketcraft.minecraft.chisel.client.render.BlockCarpetRenderer; -import com.cricketcraft.minecraft.chisel.client.render.BlockEldritchRenderer; -import com.cricketcraft.minecraft.chisel.client.render.BlockMarblePaneRenderer; -import com.cricketcraft.minecraft.chisel.client.render.BlockMarblePillarRenderer; -import com.cricketcraft.minecraft.chisel.client.render.BlockMarbleStairsRenderer; -import com.cricketcraft.minecraft.chisel.client.render.BlockNoCTMRenderer; -import com.cricketcraft.minecraft.chisel.client.render.BlockRoadLineRenderer; -import com.cricketcraft.minecraft.chisel.client.render.BlockSnakeStoneRenderer; -import com.cricketcraft.minecraft.chisel.client.render.BlockSpikesRenderer; -import com.cricketcraft.minecraft.chisel.client.render.BlockTexturedOreRenderer; -import com.cricketcraft.minecraft.chisel.client.render.item.ItemAutoChiselRenderer; -import com.cricketcraft.minecraft.chisel.client.render.item.ItemChiselRenderer; -import com.cricketcraft.minecraft.chisel.client.render.item.ItemPresentRenderer; -import com.cricketcraft.minecraft.chisel.client.render.tile.RenderAutoChisel; -import com.cricketcraft.minecraft.chisel.client.render.tile.RenderPresent; -import com.cricketcraft.minecraft.chisel.entity.EntityBallOMoss; -import com.cricketcraft.minecraft.chisel.entity.EntityCloudInABottle; -import com.cricketcraft.minecraft.chisel.entity.EntitySmashingRock; -import com.cricketcraft.minecraft.chisel.init.ModBlocks; -import com.cricketcraft.minecraft.chisel.init.ModItems; - import cpw.mods.fml.client.registry.ClientRegistry; import cpw.mods.fml.client.registry.RenderingRegistry; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/proxy/CommonProxy.java b/src/main/java/info/jbcs/minecraft/chisel/proxy/CommonProxy.java similarity index 64% rename from src/main/java/com/cricketcraft/minecraft/chisel/proxy/CommonProxy.java rename to src/main/java/info/jbcs/minecraft/chisel/proxy/CommonProxy.java index 040953c0..c4dde346 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/proxy/CommonProxy.java +++ b/src/main/java/info/jbcs/minecraft/chisel/proxy/CommonProxy.java @@ -1,8 +1,7 @@ -package com.cricketcraft.minecraft.chisel.proxy; - -import com.cricketcraft.minecraft.chisel.block.tileentity.TileEntityAutoChisel; -import com.cricketcraft.minecraft.chisel.block.tileentity.TileEntityPresent; +package info.jbcs.minecraft.chisel.proxy; +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/com/cricketcraft/minecraft/chisel/utils/BlockTexturedOre.java b/src/main/java/info/jbcs/minecraft/chisel/utils/BlockTexturedOre.java similarity index 95% rename from src/main/java/com/cricketcraft/minecraft/chisel/utils/BlockTexturedOre.java rename to src/main/java/info/jbcs/minecraft/chisel/utils/BlockTexturedOre.java index 78ee24b9..f1522da7 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/utils/BlockTexturedOre.java +++ b/src/main/java/info/jbcs/minecraft/chisel/utils/BlockTexturedOre.java @@ -1,4 +1,4 @@ -package com.cricketcraft.minecraft.chisel.utils; +package info.jbcs.minecraft.chisel.utils; import net.minecraft.block.Block; import net.minecraft.block.material.Material; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/utils/BlockTexturedOreRenderer.java b/src/main/java/info/jbcs/minecraft/chisel/utils/BlockTexturedOreRenderer.java similarity index 98% rename from src/main/java/com/cricketcraft/minecraft/chisel/utils/BlockTexturedOreRenderer.java rename to src/main/java/info/jbcs/minecraft/chisel/utils/BlockTexturedOreRenderer.java index 23ef0aa0..a00a22b7 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/utils/BlockTexturedOreRenderer.java +++ b/src/main/java/info/jbcs/minecraft/chisel/utils/BlockTexturedOreRenderer.java @@ -1,4 +1,4 @@ -package com.cricketcraft.minecraft.chisel.utils; +package info.jbcs.minecraft.chisel.utils; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/utils/Drawing.java b/src/main/java/info/jbcs/minecraft/chisel/utils/Drawing.java similarity index 98% rename from src/main/java/com/cricketcraft/minecraft/chisel/utils/Drawing.java rename to src/main/java/info/jbcs/minecraft/chisel/utils/Drawing.java index 341b5e20..881f8fc8 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/utils/Drawing.java +++ b/src/main/java/info/jbcs/minecraft/chisel/utils/Drawing.java @@ -1,4 +1,4 @@ -package com.cricketcraft.minecraft.chisel.utils; +package info.jbcs.minecraft.chisel.utils; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/utils/DummyContainer.java b/src/main/java/info/jbcs/minecraft/chisel/utils/DummyContainer.java similarity index 83% rename from src/main/java/com/cricketcraft/minecraft/chisel/utils/DummyContainer.java rename to src/main/java/info/jbcs/minecraft/chisel/utils/DummyContainer.java index a12abb7c..57dbac59 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/utils/DummyContainer.java +++ b/src/main/java/info/jbcs/minecraft/chisel/utils/DummyContainer.java @@ -1,4 +1,4 @@ -package com.cricketcraft.minecraft.chisel.utils; +package info.jbcs.minecraft.chisel.utils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/utils/General.java b/src/main/java/info/jbcs/minecraft/chisel/utils/General.java similarity index 98% rename from src/main/java/com/cricketcraft/minecraft/chisel/utils/General.java rename to src/main/java/info/jbcs/minecraft/chisel/utils/General.java index c4880673..4bc6dedd 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/utils/General.java +++ b/src/main/java/info/jbcs/minecraft/chisel/utils/General.java @@ -1,4 +1,4 @@ -package com.cricketcraft.minecraft.chisel.utils; +package info.jbcs.minecraft.chisel.utils; import java.util.Random; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/utils/GeneralClient.java b/src/main/java/info/jbcs/minecraft/chisel/utils/GeneralClient.java similarity index 96% rename from src/main/java/com/cricketcraft/minecraft/chisel/utils/GeneralClient.java rename to src/main/java/info/jbcs/minecraft/chisel/utils/GeneralClient.java index 50e99239..4c1bccc8 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/utils/GeneralClient.java +++ b/src/main/java/info/jbcs/minecraft/chisel/utils/GeneralClient.java @@ -1,4 +1,4 @@ -package com.cricketcraft.minecraft.chisel.utils; +package info.jbcs.minecraft.chisel.utils; import java.util.HashMap; import java.util.Random; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/utils/GuiHandler.java b/src/main/java/info/jbcs/minecraft/chisel/utils/GuiHandler.java similarity index 97% rename from src/main/java/com/cricketcraft/minecraft/chisel/utils/GuiHandler.java rename to src/main/java/info/jbcs/minecraft/chisel/utils/GuiHandler.java index 83c33041..d5532d7a 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/utils/GuiHandler.java +++ b/src/main/java/info/jbcs/minecraft/chisel/utils/GuiHandler.java @@ -1,4 +1,4 @@ -package com.cricketcraft.minecraft.chisel.utils; +package info.jbcs.minecraft.chisel.utils; import java.util.ArrayList; import java.util.Collections; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/utils/ItemMetaBlock.java b/src/main/java/info/jbcs/minecraft/chisel/utils/ItemMetaBlock.java similarity index 92% rename from src/main/java/com/cricketcraft/minecraft/chisel/utils/ItemMetaBlock.java rename to src/main/java/info/jbcs/minecraft/chisel/utils/ItemMetaBlock.java index 5b18d9c2..5874d40f 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/utils/ItemMetaBlock.java +++ b/src/main/java/info/jbcs/minecraft/chisel/utils/ItemMetaBlock.java @@ -1,4 +1,4 @@ -package com.cricketcraft.minecraft.chisel.utils; +package info.jbcs.minecraft.chisel.utils; import net.minecraft.block.Block; import net.minecraft.item.ItemBlock; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/world/GeneratorLimestone.java b/src/main/java/info/jbcs/minecraft/chisel/world/GeneratorLimestone.java similarity index 95% rename from src/main/java/com/cricketcraft/minecraft/chisel/world/GeneratorLimestone.java rename to src/main/java/info/jbcs/minecraft/chisel/world/GeneratorLimestone.java index b2270f00..7e809401 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/world/GeneratorLimestone.java +++ b/src/main/java/info/jbcs/minecraft/chisel/world/GeneratorLimestone.java @@ -1,4 +1,4 @@ -package com.cricketcraft.minecraft.chisel.world; +package info.jbcs.minecraft.chisel.world; import java.util.Random; diff --git a/src/main/java/com/cricketcraft/minecraft/chisel/world/GeneratorMarble.java b/src/main/java/info/jbcs/minecraft/chisel/world/GeneratorMarble.java similarity index 95% rename from src/main/java/com/cricketcraft/minecraft/chisel/world/GeneratorMarble.java rename to src/main/java/info/jbcs/minecraft/chisel/world/GeneratorMarble.java index 97ea6844..1916fa8b 100644 --- a/src/main/java/com/cricketcraft/minecraft/chisel/world/GeneratorMarble.java +++ b/src/main/java/info/jbcs/minecraft/chisel/world/GeneratorMarble.java @@ -1,4 +1,4 @@ -package com.cricketcraft.minecraft.chisel.world; +package info.jbcs.minecraft.chisel.world; import java.util.Random;