diff --git a/src/main/java/com/cricketcraft/chisel/BlockNameConversion.java b/src/main/java/team/chisel/BlockNameConversion.java similarity index 98% rename from src/main/java/com/cricketcraft/chisel/BlockNameConversion.java rename to src/main/java/team/chisel/BlockNameConversion.java index d791cd62..fd543ba8 100644 --- a/src/main/java/com/cricketcraft/chisel/BlockNameConversion.java +++ b/src/main/java/team/chisel/BlockNameConversion.java @@ -1,12 +1,10 @@ -package com.cricketcraft.chisel; +package team.chisel; import java.util.HashMap; +import team.chisel.utils.General; import net.minecraft.block.Block; import net.minecraft.item.Item; - -import com.cricketcraft.chisel.utils.General; - import cpw.mods.fml.common.FMLLog; import cpw.mods.fml.common.registry.GameRegistry; diff --git a/src/main/java/com/cricketcraft/chisel/Chisel.java b/src/main/java/team/chisel/Chisel.java similarity index 88% rename from src/main/java/com/cricketcraft/chisel/Chisel.java rename to src/main/java/team/chisel/Chisel.java index fb030926..562e5663 100644 --- a/src/main/java/com/cricketcraft/chisel/Chisel.java +++ b/src/main/java/team/chisel/Chisel.java @@ -1,4 +1,4 @@ -package com.cricketcraft.chisel; +package team.chisel; import java.io.File; @@ -13,23 +13,23 @@ import org.apache.logging.log4j.Logger; import com.cricketcraft.chisel.api.ChiselAPIProps; import com.cricketcraft.chisel.api.Statistics; import com.cricketcraft.chisel.api.carving.CarvableHelper; -import com.cricketcraft.chisel.block.BlockCarvable; -import com.cricketcraft.chisel.carving.Carving; -import com.cricketcraft.chisel.compat.Compatibility; -import com.cricketcraft.chisel.compat.IMCHandler; -import com.cricketcraft.chisel.compat.fmp.FMPCompat; -import com.cricketcraft.chisel.config.Configurations; -import com.cricketcraft.chisel.entity.EntityChiselSnowman; -import com.cricketcraft.chisel.init.ChiselBlocks; -import com.cricketcraft.chisel.init.ChiselTabs; -import com.cricketcraft.chisel.item.ItemCarvable; -import com.cricketcraft.chisel.item.chisel.ChiselController; -import com.cricketcraft.chisel.network.ChiselGuiHandler; -import com.cricketcraft.chisel.network.PacketHandler; -import com.cricketcraft.chisel.proxy.CommonProxy; -import com.cricketcraft.chisel.utils.General; -import com.cricketcraft.chisel.world.GeneratorChisel; +import team.chisel.block.BlockCarvable; +import team.chisel.carving.Carving; +import team.chisel.compat.Compatibility; +import team.chisel.compat.IMCHandler; +import team.chisel.compat.fmp.FMPCompat; +import team.chisel.config.Configurations; +import team.chisel.entity.EntityChiselSnowman; +import team.chisel.init.ChiselBlocks; +import team.chisel.init.ChiselTabs; +import team.chisel.item.ItemCarvable; +import team.chisel.item.chisel.ChiselController; +import team.chisel.network.ChiselGuiHandler; +import team.chisel.network.PacketHandler; +import team.chisel.proxy.CommonProxy; +import team.chisel.utils.General; +import team.chisel.world.GeneratorChisel; import cpw.mods.fml.client.event.ConfigChangedEvent; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.FMLLog; diff --git a/src/main/java/com/cricketcraft/chisel/Features.java b/src/main/java/team/chisel/Features.java similarity index 99% rename from src/main/java/com/cricketcraft/chisel/Features.java rename to src/main/java/team/chisel/Features.java index 05f08c4b..1d5e1142 100644 --- a/src/main/java/com/cricketcraft/chisel/Features.java +++ b/src/main/java/team/chisel/Features.java @@ -1,7 +1,33 @@ -package com.cricketcraft.chisel; +package team.chisel; import java.util.List; +import team.chisel.block.*; +import team.chisel.carving.Carving; +import team.chisel.client.render.SubmapManagerAntiblock; +import team.chisel.client.render.SubmapManagerCarpetFloor; +import team.chisel.client.render.SubmapManagerCombinedCTM; +import team.chisel.client.render.SubmapManagerFakeController; +import team.chisel.client.render.SubmapManagerLeaves; +import team.chisel.client.render.SubmapManagerSlab; +import team.chisel.client.render.SubmapManagerVoidstone; +import team.chisel.compat.fmp.ItemBlockChiselTorchPart; +import team.chisel.config.Configurations; +import team.chisel.entity.EntityBallOMoss; +import team.chisel.entity.EntityCloudInABottle; +import team.chisel.entity.EntitySmashingRock; +import team.chisel.init.ChiselBlocks; +import team.chisel.init.ChiselItems; +import team.chisel.init.ChiselTabs; +import team.chisel.item.ItemBallOMoss; +import team.chisel.item.ItemBlockPresent; +import team.chisel.item.ItemCarvable; +import team.chisel.item.ItemCarvablePumpkin; +import team.chisel.item.ItemCarvableSlab; +import team.chisel.item.ItemCloudInABottle; +import team.chisel.item.ItemSmashingRock; +import team.chisel.item.ItemUpgrade; +import team.chisel.item.chisel.ItemChisel; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.init.Blocks; @@ -17,45 +43,18 @@ import net.minecraftforge.oredict.ShapedOreRecipe; import net.minecraftforge.oredict.ShapelessOreRecipe; import com.cricketcraft.chisel.api.carving.CarvableHelper; -import com.cricketcraft.chisel.api.carving.CarvingUtils.SimpleCarvingGroup; import com.cricketcraft.chisel.api.carving.ICarvingVariation; import com.cricketcraft.chisel.api.carving.IVariationInfo; +import com.cricketcraft.chisel.api.carving.CarvingUtils.SimpleCarvingGroup; import com.cricketcraft.chisel.api.rendering.TextureType; -import com.cricketcraft.chisel.block.*; -import com.cricketcraft.chisel.carving.Carving; -import com.cricketcraft.chisel.client.render.SubmapManagerAntiblock; -import com.cricketcraft.chisel.client.render.SubmapManagerCarpetFloor; -import com.cricketcraft.chisel.client.render.SubmapManagerCombinedCTM; -import com.cricketcraft.chisel.client.render.SubmapManagerFakeController; -import com.cricketcraft.chisel.client.render.SubmapManagerLeaves; -import com.cricketcraft.chisel.client.render.SubmapManagerSlab; -import com.cricketcraft.chisel.client.render.SubmapManagerVoidstone; -import com.cricketcraft.chisel.compat.fmp.ItemBlockChiselTorchPart; -import com.cricketcraft.chisel.config.Configurations; -import com.cricketcraft.chisel.entity.EntityBallOMoss; -import com.cricketcraft.chisel.entity.EntityCloudInABottle; -import com.cricketcraft.chisel.entity.EntitySmashingRock; -import com.cricketcraft.chisel.init.ChiselBlocks; -import com.cricketcraft.chisel.init.ChiselItems; -import com.cricketcraft.chisel.init.ChiselTabs; -import com.cricketcraft.chisel.item.ItemBallOMoss; -import com.cricketcraft.chisel.item.ItemBlockPresent; -import com.cricketcraft.chisel.item.ItemCarvable; -import com.cricketcraft.chisel.item.ItemCarvablePumpkin; -import com.cricketcraft.chisel.item.ItemCarvableSlab; -import com.cricketcraft.chisel.item.ItemCloudInABottle; -import com.cricketcraft.chisel.item.ItemSmashingRock; -import com.cricketcraft.chisel.item.ItemUpgrade; -import com.cricketcraft.chisel.item.chisel.ItemChisel; import com.google.common.collect.Lists; +import static team.chisel.init.ChiselBlocks.*; +import static team.chisel.utils.General.*; import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.registry.EntityRegistry; import cpw.mods.fml.common.registry.GameRegistry; -import static com.cricketcraft.chisel.init.ChiselBlocks.*; -import static com.cricketcraft.chisel.utils.General.*; - public enum Features { AE_CERTUS_QUARTZ("appliedenergistics2") { diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockAutoChisel.java b/src/main/java/team/chisel/block/BlockAutoChisel.java similarity index 92% rename from src/main/java/com/cricketcraft/chisel/block/BlockAutoChisel.java rename to src/main/java/team/chisel/block/BlockAutoChisel.java index 6ade4931..21f38b70 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockAutoChisel.java +++ b/src/main/java/team/chisel/block/BlockAutoChisel.java @@ -1,5 +1,7 @@ -package com.cricketcraft.chisel.block; +package team.chisel.block; +import team.chisel.Chisel; +import team.chisel.block.tileentity.TileEntityAutoChisel; import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; @@ -8,9 +10,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import com.cricketcraft.chisel.Chisel; -import com.cricketcraft.chisel.block.tileentity.TileEntityAutoChisel; - public class BlockAutoChisel extends BlockContainer { public BlockAutoChisel() { diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockBeaconBase.java b/src/main/java/team/chisel/block/BlockBeaconBase.java similarity index 91% rename from src/main/java/com/cricketcraft/chisel/block/BlockBeaconBase.java rename to src/main/java/team/chisel/block/BlockBeaconBase.java index 6abf5196..3bfecfda 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockBeaconBase.java +++ b/src/main/java/team/chisel/block/BlockBeaconBase.java @@ -1,4 +1,4 @@ -package com.cricketcraft.chisel.block; +package team.chisel.block; import net.minecraft.block.material.Material; import net.minecraft.world.IBlockAccess; diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockCarvable.java b/src/main/java/team/chisel/block/BlockCarvable.java similarity index 97% rename from src/main/java/com/cricketcraft/chisel/block/BlockCarvable.java rename to src/main/java/team/chisel/block/BlockCarvable.java index af0ca33e..dd2a7df9 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockCarvable.java +++ b/src/main/java/team/chisel/block/BlockCarvable.java @@ -1,7 +1,14 @@ -package com.cricketcraft.chisel.block; +package team.chisel.block; import java.util.List; +import com.cricketcraft.chisel.api.ICarvable; +import com.cricketcraft.chisel.api.carving.CarvableHelper; +import com.cricketcraft.chisel.api.carving.IVariationInfo; +import com.cricketcraft.chisel.api.rendering.ClientUtils; + +import team.chisel.Chisel; +import team.chisel.init.ChiselTabs; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -9,14 +16,6 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; - -import com.cricketcraft.chisel.Chisel; -import com.cricketcraft.chisel.api.ICarvable; -import com.cricketcraft.chisel.api.carving.CarvableHelper; -import com.cricketcraft.chisel.api.carving.IVariationInfo; -import com.cricketcraft.chisel.api.rendering.ClientUtils; -import com.cricketcraft.chisel.init.ChiselTabs; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableAntiBlock.java b/src/main/java/team/chisel/block/BlockCarvableAntiBlock.java similarity index 92% rename from src/main/java/com/cricketcraft/chisel/block/BlockCarvableAntiBlock.java rename to src/main/java/team/chisel/block/BlockCarvableAntiBlock.java index 7c4b5a39..2ac77918 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableAntiBlock.java +++ b/src/main/java/team/chisel/block/BlockCarvableAntiBlock.java @@ -1,11 +1,11 @@ -package com.cricketcraft.chisel.block; +package team.chisel.block; + +import com.cricketcraft.chisel.api.ICarvable; import net.minecraft.block.material.Material; import net.minecraft.entity.EnumCreatureType; import net.minecraft.world.IBlockAccess; -import com.cricketcraft.chisel.api.ICarvable; - public class BlockCarvableAntiBlock extends BlockCarvableColor implements ICarvable { public BlockCarvableAntiBlock() { diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableBeacon.java b/src/main/java/team/chisel/block/BlockCarvableBeacon.java similarity index 92% rename from src/main/java/com/cricketcraft/chisel/block/BlockCarvableBeacon.java rename to src/main/java/team/chisel/block/BlockCarvableBeacon.java index 143fc093..b0ee3f4d 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableBeacon.java +++ b/src/main/java/team/chisel/block/BlockCarvableBeacon.java @@ -1,5 +1,11 @@ -package com.cricketcraft.chisel.block; +package team.chisel.block; +import com.cricketcraft.chisel.api.ICarvable; +import com.cricketcraft.chisel.api.carving.CarvableHelper; +import com.cricketcraft.chisel.api.carving.IVariationInfo; + +import team.chisel.block.tileentity.TileEntityCarvableBeacon; +import team.chisel.init.ChiselTabs; import net.minecraft.block.BlockBeacon; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -8,12 +14,6 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import com.cricketcraft.chisel.api.ICarvable; -import com.cricketcraft.chisel.api.carving.CarvableHelper; -import com.cricketcraft.chisel.api.carving.IVariationInfo; -import com.cricketcraft.chisel.block.tileentity.TileEntityCarvableBeacon; -import com.cricketcraft.chisel.init.ChiselTabs; - public class BlockCarvableBeacon extends BlockBeacon implements ICarvable { public static int renderId; diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableBookshelf.java b/src/main/java/team/chisel/block/BlockCarvableBookshelf.java similarity index 97% rename from src/main/java/com/cricketcraft/chisel/block/BlockCarvableBookshelf.java rename to src/main/java/team/chisel/block/BlockCarvableBookshelf.java index d3418ec4..0d940f7d 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableBookshelf.java +++ b/src/main/java/team/chisel/block/BlockCarvableBookshelf.java @@ -1,4 +1,4 @@ -package com.cricketcraft.chisel.block; +package team.chisel.block; import java.util.Random; diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableCarpet.java b/src/main/java/team/chisel/block/BlockCarvableCarpet.java similarity index 97% rename from src/main/java/com/cricketcraft/chisel/block/BlockCarvableCarpet.java rename to src/main/java/team/chisel/block/BlockCarvableCarpet.java index 6e9dce42..1700e870 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableCarpet.java +++ b/src/main/java/team/chisel/block/BlockCarvableCarpet.java @@ -1,7 +1,12 @@ -package com.cricketcraft.chisel.block; +package team.chisel.block; import java.util.List; +import com.cricketcraft.chisel.api.ICarvable; +import com.cricketcraft.chisel.api.carving.CarvableHelper; +import com.cricketcraft.chisel.api.carving.IVariationInfo; +import com.cricketcraft.chisel.api.rendering.ClientUtils; + import net.minecraft.block.BlockCarpet; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -10,11 +15,6 @@ import net.minecraft.item.Item; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; -import com.cricketcraft.chisel.api.ICarvable; -import com.cricketcraft.chisel.api.carving.CarvableHelper; -import com.cricketcraft.chisel.api.carving.IVariationInfo; -import com.cricketcraft.chisel.api.rendering.ClientUtils; - public class BlockCarvableCarpet extends BlockCarpet implements ICarvable { public CarvableHelper carverHelper; diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableColor.java b/src/main/java/team/chisel/block/BlockCarvableColor.java similarity index 93% rename from src/main/java/com/cricketcraft/chisel/block/BlockCarvableColor.java rename to src/main/java/team/chisel/block/BlockCarvableColor.java index 9bdd7d84..1d63b8c1 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableColor.java +++ b/src/main/java/team/chisel/block/BlockCarvableColor.java @@ -1,4 +1,4 @@ -package com.cricketcraft.chisel.block; +package team.chisel.block; import net.minecraft.block.material.Material; import net.minecraft.world.World; diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableGlass.java b/src/main/java/team/chisel/block/BlockCarvableGlass.java similarity index 95% rename from src/main/java/com/cricketcraft/chisel/block/BlockCarvableGlass.java rename to src/main/java/team/chisel/block/BlockCarvableGlass.java index d717320f..ced2665a 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableGlass.java +++ b/src/main/java/team/chisel/block/BlockCarvableGlass.java @@ -1,7 +1,13 @@ -package com.cricketcraft.chisel.block; +package team.chisel.block; import java.util.List; +import com.cricketcraft.chisel.api.ICarvable; +import com.cricketcraft.chisel.api.carving.CarvableHelper; +import com.cricketcraft.chisel.api.carving.IVariationInfo; +import com.cricketcraft.chisel.api.rendering.ClientUtils; + +import team.chisel.init.ChiselTabs; import net.minecraft.block.BlockGlass; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -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.chisel.api.ICarvable; -import com.cricketcraft.chisel.api.carving.CarvableHelper; -import com.cricketcraft.chisel.api.carving.IVariationInfo; -import com.cricketcraft.chisel.api.rendering.ClientUtils; -import com.cricketcraft.chisel.init.ChiselTabs; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableGlow.java b/src/main/java/team/chisel/block/BlockCarvableGlow.java similarity index 90% rename from src/main/java/com/cricketcraft/chisel/block/BlockCarvableGlow.java rename to src/main/java/team/chisel/block/BlockCarvableGlow.java index c6e0ec41..e1cead80 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableGlow.java +++ b/src/main/java/team/chisel/block/BlockCarvableGlow.java @@ -1,12 +1,10 @@ -package com.cricketcraft.chisel.block; +package team.chisel.block; +import team.chisel.Chisel; +import team.chisel.client.render.SubmapManagerBase; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.IIcon; - -import com.cricketcraft.chisel.Chisel; -import com.cricketcraft.chisel.client.render.SubmapManagerBase; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableGlowstone.java b/src/main/java/team/chisel/block/BlockCarvableGlowstone.java similarity index 96% rename from src/main/java/com/cricketcraft/chisel/block/BlockCarvableGlowstone.java rename to src/main/java/team/chisel/block/BlockCarvableGlowstone.java index e5cbece4..731e6047 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableGlowstone.java +++ b/src/main/java/team/chisel/block/BlockCarvableGlowstone.java @@ -1,4 +1,4 @@ -package com.cricketcraft.chisel.block; +package team.chisel.block; import java.util.Random; diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableIce.java b/src/main/java/team/chisel/block/BlockCarvableIce.java similarity index 98% rename from src/main/java/com/cricketcraft/chisel/block/BlockCarvableIce.java rename to src/main/java/team/chisel/block/BlockCarvableIce.java index df1d801e..6986d082 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableIce.java +++ b/src/main/java/team/chisel/block/BlockCarvableIce.java @@ -1,7 +1,12 @@ -package com.cricketcraft.chisel.block; +package team.chisel.block; import java.util.List; +import com.cricketcraft.chisel.api.ICarvable; +import com.cricketcraft.chisel.api.carving.CarvableHelper; +import com.cricketcraft.chisel.api.carving.IVariationInfo; +import com.cricketcraft.chisel.api.rendering.ClientUtils; + import net.minecraft.block.Block; import net.minecraft.block.BlockIce; import net.minecraft.client.renderer.texture.IIconRegister; @@ -13,11 +18,6 @@ import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import com.cricketcraft.chisel.api.ICarvable; -import com.cricketcraft.chisel.api.carving.CarvableHelper; -import com.cricketcraft.chisel.api.carving.IVariationInfo; -import com.cricketcraft.chisel.api.rendering.ClientUtils; - public class BlockCarvableIce extends BlockIce implements ICarvable { public CarvableHelper carverHelper; diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableIceStairs.java b/src/main/java/team/chisel/block/BlockCarvableIceStairs.java similarity index 92% rename from src/main/java/com/cricketcraft/chisel/block/BlockCarvableIceStairs.java rename to src/main/java/team/chisel/block/BlockCarvableIceStairs.java index 4f954edf..cc2cf87d 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableIceStairs.java +++ b/src/main/java/team/chisel/block/BlockCarvableIceStairs.java @@ -1,14 +1,14 @@ -package com.cricketcraft.chisel.block; +package team.chisel.block; import java.util.Random; +import com.cricketcraft.chisel.api.carving.CarvableHelper; + +import team.chisel.init.ChiselBlocks; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; -import com.cricketcraft.chisel.api.carving.CarvableHelper; -import com.cricketcraft.chisel.init.ChiselBlocks; - public class BlockCarvableIceStairs extends BlockCarvableStairs { public BlockCarvableIceStairs(Block block, int meta, CarvableHelper helper) { diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableLamp.java b/src/main/java/team/chisel/block/BlockCarvableLamp.java similarity index 98% rename from src/main/java/com/cricketcraft/chisel/block/BlockCarvableLamp.java rename to src/main/java/team/chisel/block/BlockCarvableLamp.java index 559f125a..806e5283 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableLamp.java +++ b/src/main/java/team/chisel/block/BlockCarvableLamp.java @@ -1,4 +1,4 @@ -package com.cricketcraft.chisel.block; +package team.chisel.block; import java.util.Random; diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableLayered.java b/src/main/java/team/chisel/block/BlockCarvableLayered.java similarity index 91% rename from src/main/java/com/cricketcraft/chisel/block/BlockCarvableLayered.java rename to src/main/java/team/chisel/block/BlockCarvableLayered.java index bd4da53f..02889ac7 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableLayered.java +++ b/src/main/java/team/chisel/block/BlockCarvableLayered.java @@ -1,11 +1,9 @@ -package com.cricketcraft.chisel.block; +package team.chisel.block; +import team.chisel.Chisel; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.IIcon; - -import com.cricketcraft.chisel.Chisel; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockCarvablePackedIce.java b/src/main/java/team/chisel/block/BlockCarvablePackedIce.java similarity index 98% rename from src/main/java/com/cricketcraft/chisel/block/BlockCarvablePackedIce.java rename to src/main/java/team/chisel/block/BlockCarvablePackedIce.java index 1dfeb858..22c97afe 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockCarvablePackedIce.java +++ b/src/main/java/team/chisel/block/BlockCarvablePackedIce.java @@ -1,8 +1,13 @@ -package com.cricketcraft.chisel.block; +package team.chisel.block; import java.util.List; import java.util.Random; +import com.cricketcraft.chisel.api.ICarvable; +import com.cricketcraft.chisel.api.carving.CarvableHelper; +import com.cricketcraft.chisel.api.carving.IVariationInfo; +import com.cricketcraft.chisel.api.rendering.ClientUtils; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -15,11 +20,6 @@ import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import com.cricketcraft.chisel.api.ICarvable; -import com.cricketcraft.chisel.api.carving.CarvableHelper; -import com.cricketcraft.chisel.api.carving.IVariationInfo; -import com.cricketcraft.chisel.api.rendering.ClientUtils; - public class BlockCarvablePackedIce extends Block implements ICarvable { public CarvableHelper carverHelper; diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockCarvablePackedIceStairs.java b/src/main/java/team/chisel/block/BlockCarvablePackedIceStairs.java similarity index 92% rename from src/main/java/com/cricketcraft/chisel/block/BlockCarvablePackedIceStairs.java rename to src/main/java/team/chisel/block/BlockCarvablePackedIceStairs.java index 2cd199dd..d3d1cf3a 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockCarvablePackedIceStairs.java +++ b/src/main/java/team/chisel/block/BlockCarvablePackedIceStairs.java @@ -1,14 +1,14 @@ -package com.cricketcraft.chisel.block; +package team.chisel.block; import java.util.Random; +import com.cricketcraft.chisel.api.carving.CarvableHelper; + +import team.chisel.init.ChiselBlocks; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; -import com.cricketcraft.chisel.api.carving.CarvableHelper; -import com.cricketcraft.chisel.init.ChiselBlocks; - public class BlockCarvablePackedIceStairs extends BlockCarvableStairs { public BlockCarvablePackedIceStairs(Block block, int meta, CarvableHelper helper) { diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockCarvablePane.java b/src/main/java/team/chisel/block/BlockCarvablePane.java similarity index 92% rename from src/main/java/com/cricketcraft/chisel/block/BlockCarvablePane.java rename to src/main/java/team/chisel/block/BlockCarvablePane.java index f5f9d430..e4e9f63c 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockCarvablePane.java +++ b/src/main/java/team/chisel/block/BlockCarvablePane.java @@ -1,7 +1,13 @@ -package com.cricketcraft.chisel.block; +package team.chisel.block; import java.util.List; +import com.cricketcraft.chisel.api.ICarvable; +import com.cricketcraft.chisel.api.carving.CarvableHelper; +import com.cricketcraft.chisel.api.carving.IVariationInfo; + +import team.chisel.client.render.RendererCTMPane; +import team.chisel.init.ChiselTabs; import net.minecraft.block.BlockPane; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -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.chisel.api.ICarvable; -import com.cricketcraft.chisel.api.carving.CarvableHelper; -import com.cricketcraft.chisel.api.carving.IVariationInfo; -import com.cricketcraft.chisel.client.render.RendererCTMPane; -import com.cricketcraft.chisel.init.ChiselTabs; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockCarvablePowered.java b/src/main/java/team/chisel/block/BlockCarvablePowered.java similarity index 95% rename from src/main/java/com/cricketcraft/chisel/block/BlockCarvablePowered.java rename to src/main/java/team/chisel/block/BlockCarvablePowered.java index 1bf29818..b6f7fa43 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockCarvablePowered.java +++ b/src/main/java/team/chisel/block/BlockCarvablePowered.java @@ -1,4 +1,4 @@ -package com.cricketcraft.chisel.block; +package team.chisel.block; import net.minecraft.block.material.Material; import net.minecraft.world.IBlockAccess; diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockCarvablePumpkin.java b/src/main/java/team/chisel/block/BlockCarvablePumpkin.java similarity index 97% rename from src/main/java/com/cricketcraft/chisel/block/BlockCarvablePumpkin.java rename to src/main/java/team/chisel/block/BlockCarvablePumpkin.java index f3237ccc..5af4e17b 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockCarvablePumpkin.java +++ b/src/main/java/team/chisel/block/BlockCarvablePumpkin.java @@ -1,5 +1,11 @@ -package com.cricketcraft.chisel.block; +package team.chisel.block; +import com.cricketcraft.chisel.api.ICarvable; +import com.cricketcraft.chisel.api.carving.CarvableHelper; +import com.cricketcraft.chisel.api.carving.IVariationInfo; + +import team.chisel.Chisel; +import team.chisel.entity.EntityChiselSnowman; import net.minecraft.block.Block; import net.minecraft.block.BlockPumpkin; import net.minecraft.client.renderer.texture.IIconRegister; @@ -9,13 +15,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; - -import com.cricketcraft.chisel.Chisel; -import com.cricketcraft.chisel.api.ICarvable; -import com.cricketcraft.chisel.api.carving.CarvableHelper; -import com.cricketcraft.chisel.api.carving.IVariationInfo; -import com.cricketcraft.chisel.entity.EntityChiselSnowman; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableSand.java b/src/main/java/team/chisel/block/BlockCarvableSand.java similarity index 97% rename from src/main/java/com/cricketcraft/chisel/block/BlockCarvableSand.java rename to src/main/java/team/chisel/block/BlockCarvableSand.java index 629fcfa6..4968828b 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableSand.java +++ b/src/main/java/team/chisel/block/BlockCarvableSand.java @@ -1,7 +1,14 @@ -package com.cricketcraft.chisel.block; +package team.chisel.block; import java.util.List; +import com.cricketcraft.chisel.api.ICarvable; +import com.cricketcraft.chisel.api.carving.CarvableHelper; +import com.cricketcraft.chisel.api.carving.IVariationInfo; +import com.cricketcraft.chisel.api.rendering.ClientUtils; + +import team.chisel.Chisel; +import team.chisel.init.ChiselTabs; import net.minecraft.block.Block; import net.minecraft.block.BlockSand; import net.minecraft.client.renderer.texture.IIconRegister; @@ -9,14 +16,6 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; - -import com.cricketcraft.chisel.Chisel; -import com.cricketcraft.chisel.api.ICarvable; -import com.cricketcraft.chisel.api.carving.CarvableHelper; -import com.cricketcraft.chisel.api.carving.IVariationInfo; -import com.cricketcraft.chisel.api.rendering.ClientUtils; -import com.cricketcraft.chisel.init.ChiselTabs; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableSlab.java b/src/main/java/team/chisel/block/BlockCarvableSlab.java similarity index 98% rename from src/main/java/com/cricketcraft/chisel/block/BlockCarvableSlab.java rename to src/main/java/team/chisel/block/BlockCarvableSlab.java index a6404099..cc25e8d3 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableSlab.java +++ b/src/main/java/team/chisel/block/BlockCarvableSlab.java @@ -1,4 +1,4 @@ -package com.cricketcraft.chisel.block; +package team.chisel.block; import java.util.List; import java.util.Random; diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableStairs.java b/src/main/java/team/chisel/block/BlockCarvableStairs.java similarity index 96% rename from src/main/java/com/cricketcraft/chisel/block/BlockCarvableStairs.java rename to src/main/java/team/chisel/block/BlockCarvableStairs.java index 9cf27ff6..48d23e36 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableStairs.java +++ b/src/main/java/team/chisel/block/BlockCarvableStairs.java @@ -1,7 +1,12 @@ -package com.cricketcraft.chisel.block; +package team.chisel.block; import java.util.List; +import com.cricketcraft.chisel.api.ICarvable; +import com.cricketcraft.chisel.api.carving.CarvableHelper; +import com.cricketcraft.chisel.api.carving.IVariationInfo; + +import team.chisel.client.render.RendererStairs; import net.minecraft.block.Block; import net.minecraft.block.BlockStairs; import net.minecraft.client.renderer.texture.IIconRegister; @@ -14,11 +19,6 @@ import net.minecraft.util.MathHelper; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import com.cricketcraft.chisel.api.ICarvable; -import com.cricketcraft.chisel.api.carving.CarvableHelper; -import com.cricketcraft.chisel.api.carving.IVariationInfo; -import com.cricketcraft.chisel.client.render.RendererStairs; - public class BlockCarvableStairs extends BlockStairs implements ICarvable { CarvableHelper carverHelper; diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableTorch.java b/src/main/java/team/chisel/block/BlockCarvableTorch.java similarity index 95% rename from src/main/java/com/cricketcraft/chisel/block/BlockCarvableTorch.java rename to src/main/java/team/chisel/block/BlockCarvableTorch.java index 8cfc1fe5..1e3ac285 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableTorch.java +++ b/src/main/java/team/chisel/block/BlockCarvableTorch.java @@ -1,18 +1,17 @@ -package com.cricketcraft.chisel.block; +package team.chisel.block; import java.util.Random; +import com.cricketcraft.chisel.api.ICarvable; +import com.cricketcraft.chisel.api.carving.CarvableHelper; +import com.cricketcraft.chisel.api.carving.IVariationInfo; + +import team.chisel.Chisel; +import team.chisel.init.ChiselTabs; import net.minecraft.block.BlockTorch; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; - -import com.cricketcraft.chisel.Chisel; -import com.cricketcraft.chisel.api.ICarvable; -import com.cricketcraft.chisel.api.carving.CarvableHelper; -import com.cricketcraft.chisel.api.carving.IVariationInfo; -import com.cricketcraft.chisel.init.ChiselTabs; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableWall.java b/src/main/java/team/chisel/block/BlockCarvableWall.java similarity index 96% rename from src/main/java/com/cricketcraft/chisel/block/BlockCarvableWall.java rename to src/main/java/team/chisel/block/BlockCarvableWall.java index 128000d6..ae89959a 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockCarvableWall.java +++ b/src/main/java/team/chisel/block/BlockCarvableWall.java @@ -1,7 +1,9 @@ -package com.cricketcraft.chisel.block; +package team.chisel.block; import java.util.List; +import com.cricketcraft.chisel.api.carving.CarvableHelper; + import net.minecraft.block.Block; import net.minecraft.block.BlockWall; import net.minecraft.client.renderer.texture.IIconRegister; @@ -9,8 +11,6 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.util.IIcon; -import com.cricketcraft.chisel.api.carving.CarvableHelper; - public class BlockCarvableWall extends BlockWall { CarvableHelper carverHelper; diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockCloud.java b/src/main/java/team/chisel/block/BlockCloud.java similarity index 94% rename from src/main/java/com/cricketcraft/chisel/block/BlockCloud.java rename to src/main/java/team/chisel/block/BlockCloud.java index 9fb9d2d9..928c5cdd 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockCloud.java +++ b/src/main/java/team/chisel/block/BlockCloud.java @@ -1,7 +1,8 @@ -package com.cricketcraft.chisel.block; +package team.chisel.block; import java.util.Random; +import team.chisel.config.Configurations; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.entity.Entity; @@ -9,9 +10,6 @@ import net.minecraft.item.Item; import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; - -import com.cricketcraft.chisel.config.Configurations; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockConcrete.java b/src/main/java/team/chisel/block/BlockConcrete.java similarity index 86% rename from src/main/java/com/cricketcraft/chisel/block/BlockConcrete.java rename to src/main/java/team/chisel/block/BlockConcrete.java index fa17d88a..32ba888e 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockConcrete.java +++ b/src/main/java/team/chisel/block/BlockConcrete.java @@ -1,12 +1,10 @@ -package com.cricketcraft.chisel.block; +package team.chisel.block; +import team.chisel.client.GeneralChiselClient; +import team.chisel.config.Configurations; import net.minecraft.entity.Entity; import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.World; - -import com.cricketcraft.chisel.client.GeneralChiselClient; -import com.cricketcraft.chisel.config.Configurations; - import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockEldritch.java b/src/main/java/team/chisel/block/BlockEldritch.java similarity index 69% rename from src/main/java/com/cricketcraft/chisel/block/BlockEldritch.java rename to src/main/java/team/chisel/block/BlockEldritch.java index 6d3366b9..9063b2fa 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockEldritch.java +++ b/src/main/java/team/chisel/block/BlockEldritch.java @@ -1,6 +1,6 @@ -package com.cricketcraft.chisel.block; +package team.chisel.block; -import com.cricketcraft.chisel.Chisel; +import team.chisel.Chisel; public class BlockEldritch extends BlockCarvable { diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockGrimstone.java b/src/main/java/team/chisel/block/BlockGrimstone.java similarity index 80% rename from src/main/java/com/cricketcraft/chisel/block/BlockGrimstone.java rename to src/main/java/team/chisel/block/BlockGrimstone.java index decf4cdf..14f6b597 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockGrimstone.java +++ b/src/main/java/team/chisel/block/BlockGrimstone.java @@ -1,16 +1,15 @@ -package com.cricketcraft.chisel.block; +package team.chisel.block; import java.util.Random; +import team.chisel.Chisel; +import team.chisel.client.GeneralChiselClient; +import team.chisel.utils.General; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.IIcon; import net.minecraft.world.World; -import com.cricketcraft.chisel.Chisel; -import com.cricketcraft.chisel.client.GeneralChiselClient; -import com.cricketcraft.chisel.utils.General; - public class BlockGrimstone extends BlockCarvable { public IIcon iconStar; diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockHolystone.java b/src/main/java/team/chisel/block/BlockHolystone.java similarity index 83% rename from src/main/java/com/cricketcraft/chisel/block/BlockHolystone.java rename to src/main/java/team/chisel/block/BlockHolystone.java index 4d937ea0..652e8029 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockHolystone.java +++ b/src/main/java/team/chisel/block/BlockHolystone.java @@ -1,15 +1,14 @@ -package com.cricketcraft.chisel.block; +package team.chisel.block; import java.util.Random; +import team.chisel.client.GeneralChiselClient; +import team.chisel.utils.General; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.IIcon; import net.minecraft.world.World; -import com.cricketcraft.chisel.client.GeneralChiselClient; -import com.cricketcraft.chisel.utils.General; - public class BlockHolystone extends BlockCarvable { public IIcon iconStar; diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockLavastone.java b/src/main/java/team/chisel/block/BlockLavastone.java similarity index 84% rename from src/main/java/com/cricketcraft/chisel/block/BlockLavastone.java rename to src/main/java/team/chisel/block/BlockLavastone.java index b212e9e0..e7740042 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockLavastone.java +++ b/src/main/java/team/chisel/block/BlockLavastone.java @@ -1,12 +1,11 @@ -package com.cricketcraft.chisel.block; +package team.chisel.block; import java.util.Random; +import team.chisel.client.GeneralChiselClient; import net.minecraft.block.material.Material; import net.minecraft.world.World; -import com.cricketcraft.chisel.client.GeneralChiselClient; - public class BlockLavastone extends BlockMultiLayer { public BlockLavastone(Material mat, String baseIcon) { diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockLeaf.java b/src/main/java/team/chisel/block/BlockLeaf.java similarity index 87% rename from src/main/java/com/cricketcraft/chisel/block/BlockLeaf.java rename to src/main/java/team/chisel/block/BlockLeaf.java index 00ecc295..ea523fd1 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockLeaf.java +++ b/src/main/java/team/chisel/block/BlockLeaf.java @@ -1,4 +1,4 @@ -package com.cricketcraft.chisel.block; +package team.chisel.block; import net.minecraft.block.material.Material; import net.minecraft.init.Blocks; diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockMultiLayer.java b/src/main/java/team/chisel/block/BlockMultiLayer.java similarity index 97% rename from src/main/java/com/cricketcraft/chisel/block/BlockMultiLayer.java rename to src/main/java/team/chisel/block/BlockMultiLayer.java index 74dd0e3b..3161dd68 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockMultiLayer.java +++ b/src/main/java/team/chisel/block/BlockMultiLayer.java @@ -1,7 +1,11 @@ -package com.cricketcraft.chisel.block; +package team.chisel.block; import java.util.List; +import com.cricketcraft.chisel.api.ICarvable; +import com.cricketcraft.chisel.api.carving.CarvableHelper; +import com.cricketcraft.chisel.api.carving.IVariationInfo; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -10,10 +14,6 @@ import net.minecraft.item.Item; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; -import com.cricketcraft.chisel.api.ICarvable; -import com.cricketcraft.chisel.api.carving.CarvableHelper; -import com.cricketcraft.chisel.api.carving.IVariationInfo; - public class BlockMultiLayer extends BlockMultiLayerBase implements ICarvable { public CarvableHelper carverHelper; diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockMultiLayerBase.java b/src/main/java/team/chisel/block/BlockMultiLayerBase.java similarity index 90% rename from src/main/java/com/cricketcraft/chisel/block/BlockMultiLayerBase.java rename to src/main/java/team/chisel/block/BlockMultiLayerBase.java index 1ff637ef..45dd2a6e 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockMultiLayerBase.java +++ b/src/main/java/team/chisel/block/BlockMultiLayerBase.java @@ -1,13 +1,12 @@ -package com.cricketcraft.chisel.block; +package team.chisel.block; +import team.chisel.client.render.RendererMultiLayer; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.IIcon; import net.minecraftforge.client.ForgeHooksClient; -import com.cricketcraft.chisel.client.render.RendererMultiLayer; - public abstract class BlockMultiLayerBase extends Block { public Block base; diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockPresent.java b/src/main/java/team/chisel/block/BlockPresent.java similarity index 97% rename from src/main/java/com/cricketcraft/chisel/block/BlockPresent.java rename to src/main/java/team/chisel/block/BlockPresent.java index 57e2aa7b..0a6653ea 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockPresent.java +++ b/src/main/java/team/chisel/block/BlockPresent.java @@ -1,7 +1,13 @@ -package com.cricketcraft.chisel.block; +package team.chisel.block; import java.util.List; +import com.cricketcraft.chisel.api.ICarvable; +import com.cricketcraft.chisel.api.carving.CarvableHelper; +import com.cricketcraft.chisel.api.carving.IVariationInfo; + +import team.chisel.Chisel; +import team.chisel.block.tileentity.TileEntityPresent; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -18,13 +24,6 @@ import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; - -import com.cricketcraft.chisel.Chisel; -import com.cricketcraft.chisel.api.ICarvable; -import com.cricketcraft.chisel.api.carving.CarvableHelper; -import com.cricketcraft.chisel.api.carving.IVariationInfo; -import com.cricketcraft.chisel.block.tileentity.TileEntityPresent; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockRoadLine.java b/src/main/java/team/chisel/block/BlockRoadLine.java similarity index 95% rename from src/main/java/com/cricketcraft/chisel/block/BlockRoadLine.java rename to src/main/java/team/chisel/block/BlockRoadLine.java index 5d0ffec9..09366bda 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockRoadLine.java +++ b/src/main/java/team/chisel/block/BlockRoadLine.java @@ -1,5 +1,7 @@ -package com.cricketcraft.chisel.block; +package team.chisel.block; +import team.chisel.Chisel; +import team.chisel.config.Configurations; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -8,10 +10,6 @@ import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; - -import com.cricketcraft.chisel.Chisel; -import com.cricketcraft.chisel.config.Configurations; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockSnakestone.java b/src/main/java/team/chisel/block/BlockSnakestone.java similarity index 99% rename from src/main/java/com/cricketcraft/chisel/block/BlockSnakestone.java rename to src/main/java/team/chisel/block/BlockSnakestone.java index 999971c5..b2e25408 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockSnakestone.java +++ b/src/main/java/team/chisel/block/BlockSnakestone.java @@ -1,7 +1,8 @@ -package com.cricketcraft.chisel.block; +package team.chisel.block; import java.util.List; +import team.chisel.client.render.RendererSnakeStone; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -13,8 +14,6 @@ import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; import net.minecraft.world.World; -import com.cricketcraft.chisel.client.render.RendererSnakeStone; - public class BlockSnakestone extends Block { static final int SEC_HEAD = 0; diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockSnakestoneObsidian.java b/src/main/java/team/chisel/block/BlockSnakestoneObsidian.java similarity index 88% rename from src/main/java/com/cricketcraft/chisel/block/BlockSnakestoneObsidian.java rename to src/main/java/team/chisel/block/BlockSnakestoneObsidian.java index 8983fed7..a81cb56b 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockSnakestoneObsidian.java +++ b/src/main/java/team/chisel/block/BlockSnakestoneObsidian.java @@ -1,13 +1,12 @@ -package com.cricketcraft.chisel.block; +package team.chisel.block; import java.util.Random; +import team.chisel.client.GeneralChiselClient; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.IIcon; import net.minecraft.world.World; -import com.cricketcraft.chisel.client.GeneralChiselClient; - public class BlockSnakestoneObsidian extends BlockSnakestone { public static IIcon[] particles = new IIcon[8]; diff --git a/src/main/java/com/cricketcraft/chisel/block/BlockWaterstone.java b/src/main/java/team/chisel/block/BlockWaterstone.java similarity index 86% rename from src/main/java/com/cricketcraft/chisel/block/BlockWaterstone.java rename to src/main/java/team/chisel/block/BlockWaterstone.java index 0af23f16..c17d73c8 100644 --- a/src/main/java/com/cricketcraft/chisel/block/BlockWaterstone.java +++ b/src/main/java/team/chisel/block/BlockWaterstone.java @@ -1,4 +1,4 @@ -package com.cricketcraft.chisel.block; +package team.chisel.block; import net.minecraft.block.material.Material; diff --git a/src/main/java/com/cricketcraft/chisel/block/CarvableStairsMaker.java b/src/main/java/team/chisel/block/CarvableStairsMaker.java similarity index 90% rename from src/main/java/com/cricketcraft/chisel/block/CarvableStairsMaker.java rename to src/main/java/team/chisel/block/CarvableStairsMaker.java index fe39d3cd..43006219 100644 --- a/src/main/java/com/cricketcraft/chisel/block/CarvableStairsMaker.java +++ b/src/main/java/team/chisel/block/CarvableStairsMaker.java @@ -1,13 +1,12 @@ -package com.cricketcraft.chisel.block; - -import net.minecraft.block.Block; -import net.minecraft.item.ItemStack; +package team.chisel.block; import com.cricketcraft.chisel.api.carving.CarvableHelper; import com.cricketcraft.chisel.api.carving.IVariationInfo; -import com.cricketcraft.chisel.init.ChiselTabs; -import com.cricketcraft.chisel.item.ItemCarvable; +import team.chisel.init.ChiselTabs; +import team.chisel.item.ItemCarvable; +import net.minecraft.block.Block; +import net.minecraft.item.ItemStack; import cpw.mods.fml.common.registry.GameRegistry; public class CarvableStairsMaker { diff --git a/src/main/java/com/cricketcraft/chisel/block/IStairsCreator.java b/src/main/java/team/chisel/block/IStairsCreator.java similarity index 84% rename from src/main/java/com/cricketcraft/chisel/block/IStairsCreator.java rename to src/main/java/team/chisel/block/IStairsCreator.java index 8d5d1641..160b9a35 100644 --- a/src/main/java/com/cricketcraft/chisel/block/IStairsCreator.java +++ b/src/main/java/team/chisel/block/IStairsCreator.java @@ -1,9 +1,9 @@ -package com.cricketcraft.chisel.block; - -import net.minecraft.block.Block; +package team.chisel.block; import com.cricketcraft.chisel.api.carving.CarvableHelper; +import net.minecraft.block.Block; + public interface IStairsCreator { public BlockCarvableStairs create(Block block, int meta, CarvableHelper helper); diff --git a/src/main/java/com/cricketcraft/chisel/block/tileentity/IDoubleChest.java b/src/main/java/team/chisel/block/tileentity/IDoubleChest.java similarity index 92% rename from src/main/java/com/cricketcraft/chisel/block/tileentity/IDoubleChest.java rename to src/main/java/team/chisel/block/tileentity/IDoubleChest.java index 90ded712..12083d26 100644 --- a/src/main/java/com/cricketcraft/chisel/block/tileentity/IDoubleChest.java +++ b/src/main/java/team/chisel/block/tileentity/IDoubleChest.java @@ -1,4 +1,4 @@ -package com.cricketcraft.chisel.block.tileentity; +package team.chisel.block.tileentity; import net.minecraft.item.ItemStack; diff --git a/src/main/java/com/cricketcraft/chisel/block/tileentity/TileEntityAutoChisel.java b/src/main/java/team/chisel/block/tileentity/TileEntityAutoChisel.java similarity index 96% rename from src/main/java/com/cricketcraft/chisel/block/tileentity/TileEntityAutoChisel.java rename to src/main/java/team/chisel/block/tileentity/TileEntityAutoChisel.java index 36eabe85..e279fecf 100644 --- a/src/main/java/com/cricketcraft/chisel/block/tileentity/TileEntityAutoChisel.java +++ b/src/main/java/team/chisel/block/tileentity/TileEntityAutoChisel.java @@ -1,7 +1,16 @@ -package com.cricketcraft.chisel.block.tileentity; +package team.chisel.block.tileentity; import java.util.List; +import com.cricketcraft.chisel.api.IChiselItem; + +import team.chisel.carving.Carving; +import team.chisel.client.GeneralChiselClient; +import team.chisel.init.ChiselItems; +import team.chisel.network.PacketHandler; +import team.chisel.network.message.MessageAutoChisel; +import team.chisel.network.message.MessageSlotUpdate; +import team.chisel.utils.General; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.ISidedInventory; @@ -13,16 +22,6 @@ import net.minecraft.network.Packet; import net.minecraft.network.play.server.S35PacketUpdateTileEntity; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.StatCollector; - -import com.cricketcraft.chisel.api.IChiselItem; -import com.cricketcraft.chisel.carving.Carving; -import com.cricketcraft.chisel.client.GeneralChiselClient; -import com.cricketcraft.chisel.init.ChiselItems; -import com.cricketcraft.chisel.network.PacketHandler; -import com.cricketcraft.chisel.network.message.MessageAutoChisel; -import com.cricketcraft.chisel.network.message.MessageSlotUpdate; -import com.cricketcraft.chisel.utils.General; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/com/cricketcraft/chisel/block/tileentity/TileEntityCarvableBeacon.java b/src/main/java/team/chisel/block/tileentity/TileEntityCarvableBeacon.java similarity index 87% rename from src/main/java/com/cricketcraft/chisel/block/tileentity/TileEntityCarvableBeacon.java rename to src/main/java/team/chisel/block/tileentity/TileEntityCarvableBeacon.java index e57284a3..ec52c06f 100644 --- a/src/main/java/com/cricketcraft/chisel/block/tileentity/TileEntityCarvableBeacon.java +++ b/src/main/java/team/chisel/block/tileentity/TileEntityCarvableBeacon.java @@ -1,4 +1,4 @@ -package com.cricketcraft.chisel.block.tileentity; +package team.chisel.block.tileentity; import net.minecraft.tileentity.TileEntityBeacon; import net.minecraft.util.AxisAlignedBB; diff --git a/src/main/java/com/cricketcraft/chisel/block/tileentity/TileEntityPresent.java b/src/main/java/team/chisel/block/tileentity/TileEntityPresent.java similarity index 97% rename from src/main/java/com/cricketcraft/chisel/block/tileentity/TileEntityPresent.java rename to src/main/java/team/chisel/block/tileentity/TileEntityPresent.java index 40ca0ff5..09bce79e 100644 --- a/src/main/java/com/cricketcraft/chisel/block/tileentity/TileEntityPresent.java +++ b/src/main/java/team/chisel/block/tileentity/TileEntityPresent.java @@ -1,5 +1,8 @@ -package com.cricketcraft.chisel.block.tileentity; +package team.chisel.block.tileentity; +import team.chisel.init.ChiselBlocks; +import team.chisel.network.PacketHandler; +import team.chisel.network.message.MessagePresentConnect; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; @@ -14,10 +17,6 @@ import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import com.cricketcraft.chisel.init.ChiselBlocks; -import com.cricketcraft.chisel.network.PacketHandler; -import com.cricketcraft.chisel.network.message.MessagePresentConnect; - public class TileEntityPresent extends TileEntity implements IInventory, IDoubleChest { private TileEntityPresent connection = null; diff --git a/src/main/java/com/cricketcraft/chisel/carving/Carving.java b/src/main/java/team/chisel/carving/Carving.java similarity index 98% rename from src/main/java/com/cricketcraft/chisel/carving/Carving.java rename to src/main/java/team/chisel/carving/Carving.java index 6ed636e3..d7cb498b 100644 --- a/src/main/java/com/cricketcraft/chisel/carving/Carving.java +++ b/src/main/java/team/chisel/carving/Carving.java @@ -1,21 +1,21 @@ -package com.cricketcraft.chisel.carving; +package team.chisel.carving; import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; import java.util.List; -import net.minecraft.block.Block; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraftforge.oredict.OreDictionary; - -import com.cricketcraft.chisel.Chisel; import com.cricketcraft.chisel.api.carving.CarvingUtils; import com.cricketcraft.chisel.api.carving.ICarvingGroup; import com.cricketcraft.chisel.api.carving.ICarvingRegistry; import com.cricketcraft.chisel.api.carving.ICarvingVariation; +import team.chisel.Chisel; +import net.minecraft.block.Block; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraftforge.oredict.OreDictionary; + public class Carving implements ICarvingRegistry { GroupList groups = new GroupList(); diff --git a/src/main/java/com/cricketcraft/chisel/carving/GroupList.java b/src/main/java/team/chisel/carving/GroupList.java similarity index 99% rename from src/main/java/com/cricketcraft/chisel/carving/GroupList.java rename to src/main/java/team/chisel/carving/GroupList.java index f4f9560d..aede0369 100644 --- a/src/main/java/com/cricketcraft/chisel/carving/GroupList.java +++ b/src/main/java/team/chisel/carving/GroupList.java @@ -1,4 +1,4 @@ -package com.cricketcraft.chisel.carving; +package team.chisel.carving; import java.util.Collection; import java.util.HashMap; diff --git a/src/main/java/com/cricketcraft/chisel/client/GeneralChiselClient.java b/src/main/java/team/chisel/client/GeneralChiselClient.java similarity index 92% rename from src/main/java/com/cricketcraft/chisel/client/GeneralChiselClient.java rename to src/main/java/team/chisel/client/GeneralChiselClient.java index 56bda997..bd54ea65 100644 --- a/src/main/java/com/cricketcraft/chisel/client/GeneralChiselClient.java +++ b/src/main/java/team/chisel/client/GeneralChiselClient.java @@ -1,7 +1,19 @@ -package com.cricketcraft.chisel.client; +package team.chisel.client; import java.util.Random; +import team.chisel.block.BlockGrimstone; +import team.chisel.block.BlockHolystone; +import team.chisel.block.BlockLavastone; +import team.chisel.block.BlockSnakestoneObsidian; +import team.chisel.block.tileentity.TileEntityAutoChisel; +import team.chisel.carving.Carving; +import team.chisel.config.Configurations; +import team.chisel.entity.fx.EntityBallOMossFX; +import team.chisel.entity.fx.EntityGrimstoneFX; +import team.chisel.entity.fx.EntityHolystoneFX; +import team.chisel.entity.fx.EntitySnakestoneObsidianFX; +import team.chisel.utils.GeneralClient; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.entity.EntityPlayerSP; @@ -12,19 +24,6 @@ import net.minecraft.entity.Entity; import net.minecraft.item.ItemStack; import net.minecraft.world.World; -import com.cricketcraft.chisel.block.BlockGrimstone; -import com.cricketcraft.chisel.block.BlockHolystone; -import com.cricketcraft.chisel.block.BlockLavastone; -import com.cricketcraft.chisel.block.BlockSnakestoneObsidian; -import com.cricketcraft.chisel.block.tileentity.TileEntityAutoChisel; -import com.cricketcraft.chisel.carving.Carving; -import com.cricketcraft.chisel.config.Configurations; -import com.cricketcraft.chisel.entity.fx.EntityBallOMossFX; -import com.cricketcraft.chisel.entity.fx.EntityGrimstoneFX; -import com.cricketcraft.chisel.entity.fx.EntityHolystoneFX; -import com.cricketcraft.chisel.entity.fx.EntitySnakestoneObsidianFX; -import com.cricketcraft.chisel.utils.GeneralClient; - public class GeneralChiselClient { public static Random rand = new Random(); diff --git a/src/main/java/com/cricketcraft/chisel/client/gui/GuiAutoChisel.java b/src/main/java/team/chisel/client/gui/GuiAutoChisel.java similarity index 93% rename from src/main/java/com/cricketcraft/chisel/client/gui/GuiAutoChisel.java rename to src/main/java/team/chisel/client/gui/GuiAutoChisel.java index 6d20815f..c18d778e 100644 --- a/src/main/java/com/cricketcraft/chisel/client/gui/GuiAutoChisel.java +++ b/src/main/java/team/chisel/client/gui/GuiAutoChisel.java @@ -1,4 +1,4 @@ -package com.cricketcraft.chisel.client.gui; +package team.chisel.client.gui; import java.util.List; @@ -11,8 +11,9 @@ import net.minecraft.util.StatCollector; import org.lwjgl.opengl.GL11; -import com.cricketcraft.chisel.block.tileentity.TileEntityAutoChisel; -import com.cricketcraft.chisel.inventory.ContainerAutoChisel; +import team.chisel.block.tileentity.TileEntityAutoChisel; +import team.chisel.inventory.ContainerAutoChisel; + import com.google.common.base.Strings; import com.google.common.collect.Lists; diff --git a/src/main/java/com/cricketcraft/chisel/client/gui/GuiChisel.java b/src/main/java/team/chisel/client/gui/GuiChisel.java similarity index 89% rename from src/main/java/com/cricketcraft/chisel/client/gui/GuiChisel.java rename to src/main/java/team/chisel/client/gui/GuiChisel.java index 91fa00f3..4392e14b 100644 --- a/src/main/java/com/cricketcraft/chisel/client/gui/GuiChisel.java +++ b/src/main/java/team/chisel/client/gui/GuiChisel.java @@ -1,4 +1,4 @@ -package com.cricketcraft.chisel.client.gui; +package team.chisel.client.gui; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.inventory.GuiContainer; @@ -13,14 +13,15 @@ import org.lwjgl.opengl.GL11; import com.cricketcraft.chisel.api.IAdvancedChisel; import com.cricketcraft.chisel.api.IChiselItem; import com.cricketcraft.chisel.api.carving.IChiselMode; -import com.cricketcraft.chisel.inventory.ContainerChisel; -import com.cricketcraft.chisel.inventory.InventoryChiselSelection; -import com.cricketcraft.chisel.inventory.SlotChiselInput; -import com.cricketcraft.chisel.item.chisel.ChiselMode; -import com.cricketcraft.chisel.network.PacketHandler; -import com.cricketcraft.chisel.network.message.MessageChiselMode; -import com.cricketcraft.chisel.utils.General; -import com.cricketcraft.chisel.utils.GeneralClient; + +import team.chisel.inventory.ContainerChisel; +import team.chisel.inventory.InventoryChiselSelection; +import team.chisel.inventory.SlotChiselInput; +import team.chisel.item.chisel.ChiselMode; +import team.chisel.network.PacketHandler; +import team.chisel.network.message.MessageChiselMode; +import team.chisel.utils.General; +import team.chisel.utils.GeneralClient; public class GuiChisel extends GuiContainer { diff --git a/src/main/java/com/cricketcraft/chisel/client/gui/GuiChiselConfig.java b/src/main/java/team/chisel/client/gui/GuiChiselConfig.java similarity index 81% rename from src/main/java/com/cricketcraft/chisel/client/gui/GuiChiselConfig.java rename to src/main/java/team/chisel/client/gui/GuiChiselConfig.java index b29e10d7..818c1282 100644 --- a/src/main/java/com/cricketcraft/chisel/client/gui/GuiChiselConfig.java +++ b/src/main/java/team/chisel/client/gui/GuiChiselConfig.java @@ -1,13 +1,11 @@ -package com.cricketcraft.chisel.client.gui; +package team.chisel.client.gui; +import team.chisel.Chisel; +import team.chisel.config.Configurations; import net.minecraft.client.gui.GuiScreen; import net.minecraftforge.common.config.ConfigCategory; import net.minecraftforge.common.config.ConfigElement; import net.minecraftforge.common.config.Configuration; - -import com.cricketcraft.chisel.Chisel; -import com.cricketcraft.chisel.config.Configurations; - import cpw.mods.fml.client.config.GuiConfig; public class GuiChiselConfig extends GuiConfig { diff --git a/src/main/java/com/cricketcraft/chisel/client/gui/GuiFactory.java b/src/main/java/team/chisel/client/gui/GuiFactory.java similarity index 93% rename from src/main/java/com/cricketcraft/chisel/client/gui/GuiFactory.java rename to src/main/java/team/chisel/client/gui/GuiFactory.java index cda1e647..f5b2464c 100644 --- a/src/main/java/com/cricketcraft/chisel/client/gui/GuiFactory.java +++ b/src/main/java/team/chisel/client/gui/GuiFactory.java @@ -1,4 +1,4 @@ -package com.cricketcraft.chisel.client.gui; +package team.chisel.client.gui; import java.util.Set; diff --git a/src/main/java/com/cricketcraft/chisel/client/gui/GuiPresent.java b/src/main/java/team/chisel/client/gui/GuiPresent.java similarity index 86% rename from src/main/java/com/cricketcraft/chisel/client/gui/GuiPresent.java rename to src/main/java/team/chisel/client/gui/GuiPresent.java index dea00f6d..6b31b054 100644 --- a/src/main/java/com/cricketcraft/chisel/client/gui/GuiPresent.java +++ b/src/main/java/team/chisel/client/gui/GuiPresent.java @@ -1,4 +1,4 @@ -package com.cricketcraft.chisel.client.gui; +package team.chisel.client.gui; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; @@ -6,8 +6,8 @@ import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; -import com.cricketcraft.chisel.block.tileentity.TileEntityPresent; -import com.cricketcraft.chisel.inventory.ContainerPresent; +import team.chisel.block.tileentity.TileEntityPresent; +import team.chisel.inventory.ContainerPresent; public class GuiPresent extends GuiContainer { diff --git a/src/main/java/com/cricketcraft/chisel/client/render/RenderBlocksEldritch.java b/src/main/java/team/chisel/client/render/RenderBlocksEldritch.java similarity index 99% rename from src/main/java/com/cricketcraft/chisel/client/render/RenderBlocksEldritch.java rename to src/main/java/team/chisel/client/render/RenderBlocksEldritch.java index c8e82e0c..44a48ac0 100644 --- a/src/main/java/com/cricketcraft/chisel/client/render/RenderBlocksEldritch.java +++ b/src/main/java/team/chisel/client/render/RenderBlocksEldritch.java @@ -1,4 +1,4 @@ -package com.cricketcraft.chisel.client.render; +package team.chisel.client.render; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; diff --git a/src/main/java/com/cricketcraft/chisel/client/render/RenderChiselSnowman.java b/src/main/java/team/chisel/client/render/RenderChiselSnowman.java similarity index 95% rename from src/main/java/com/cricketcraft/chisel/client/render/RenderChiselSnowman.java rename to src/main/java/team/chisel/client/render/RenderChiselSnowman.java index 700b176d..9471f3dd 100644 --- a/src/main/java/com/cricketcraft/chisel/client/render/RenderChiselSnowman.java +++ b/src/main/java/team/chisel/client/render/RenderChiselSnowman.java @@ -1,4 +1,4 @@ -package com.cricketcraft.chisel.client.render; +package team.chisel.client.render; import net.minecraft.block.Block; import net.minecraft.client.model.ModelSnowMan; @@ -14,8 +14,7 @@ import net.minecraftforge.client.MinecraftForgeClient; import org.lwjgl.opengl.GL11; -import com.cricketcraft.chisel.entity.EntityChiselSnowman; - +import team.chisel.entity.EntityChiselSnowman; import static net.minecraftforge.client.IItemRenderer.ItemRenderType.EQUIPPED; import static net.minecraftforge.client.IItemRenderer.ItemRendererHelper.BLOCK_3D; diff --git a/src/main/java/com/cricketcraft/chisel/client/render/RendererCTM.java b/src/main/java/team/chisel/client/render/RendererCTM.java similarity index 87% rename from src/main/java/com/cricketcraft/chisel/client/render/RendererCTM.java rename to src/main/java/team/chisel/client/render/RendererCTM.java index db0f9095..79ce0d66 100644 --- a/src/main/java/com/cricketcraft/chisel/client/render/RendererCTM.java +++ b/src/main/java/team/chisel/client/render/RendererCTM.java @@ -1,4 +1,4 @@ -package com.cricketcraft.chisel.client.render; +package team.chisel.client.render; import com.cricketcraft.chisel.api.rendering.ClientUtils; import com.cricketcraft.ctmlib.CTMRenderer; diff --git a/src/main/java/com/cricketcraft/chisel/client/render/RendererCTMPane.java b/src/main/java/team/chisel/client/render/RendererCTMPane.java similarity index 99% rename from src/main/java/com/cricketcraft/chisel/client/render/RendererCTMPane.java rename to src/main/java/team/chisel/client/render/RendererCTMPane.java index bd3f9edf..31e4be49 100644 --- a/src/main/java/com/cricketcraft/chisel/client/render/RendererCTMPane.java +++ b/src/main/java/team/chisel/client/render/RendererCTMPane.java @@ -1,4 +1,4 @@ -package com.cricketcraft.chisel.client.render; +package team.chisel.client.render; import net.minecraft.block.Block; import net.minecraft.block.BlockPane; diff --git a/src/main/java/com/cricketcraft/chisel/client/render/RendererEldritch.java b/src/main/java/team/chisel/client/render/RendererEldritch.java similarity index 96% rename from src/main/java/com/cricketcraft/chisel/client/render/RendererEldritch.java rename to src/main/java/team/chisel/client/render/RendererEldritch.java index d1638f5e..38be1206 100644 --- a/src/main/java/com/cricketcraft/chisel/client/render/RendererEldritch.java +++ b/src/main/java/team/chisel/client/render/RendererEldritch.java @@ -1,4 +1,4 @@ -package com.cricketcraft.chisel.client.render; +package team.chisel.client.render; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; @@ -6,7 +6,8 @@ import net.minecraft.world.IBlockAccess; import org.lwjgl.opengl.GL11; -import com.cricketcraft.chisel.Chisel; +import team.chisel.Chisel; + import com.cricketcraft.ctmlib.Drawing; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; diff --git a/src/main/java/com/cricketcraft/chisel/client/render/RendererLayeredGlow.java b/src/main/java/team/chisel/client/render/RendererLayeredGlow.java similarity index 87% rename from src/main/java/com/cricketcraft/chisel/client/render/RendererLayeredGlow.java rename to src/main/java/team/chisel/client/render/RendererLayeredGlow.java index 88df45eb..1da8f717 100644 --- a/src/main/java/com/cricketcraft/chisel/client/render/RendererLayeredGlow.java +++ b/src/main/java/team/chisel/client/render/RendererLayeredGlow.java @@ -1,4 +1,4 @@ -package com.cricketcraft.chisel.client.render; +package team.chisel.client.render; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; @@ -7,10 +7,11 @@ import net.minecraft.world.IBlockAccess; import org.lwjgl.opengl.GL11; -import com.cricketcraft.chisel.Chisel; -import com.cricketcraft.chisel.block.BlockCarvableGlow; -import com.cricketcraft.chisel.config.Configurations; -import com.cricketcraft.chisel.utils.GeneralClient; +import team.chisel.Chisel; +import team.chisel.block.BlockCarvableGlow; +import team.chisel.config.Configurations; +import team.chisel.utils.GeneralClient; + import com.cricketcraft.ctmlib.Drawing; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; diff --git a/src/main/java/com/cricketcraft/chisel/client/render/RendererMultiLayer.java b/src/main/java/team/chisel/client/render/RendererMultiLayer.java similarity index 95% rename from src/main/java/com/cricketcraft/chisel/client/render/RendererMultiLayer.java rename to src/main/java/team/chisel/client/render/RendererMultiLayer.java index 415c9fd5..acf6bbf7 100644 --- a/src/main/java/com/cricketcraft/chisel/client/render/RendererMultiLayer.java +++ b/src/main/java/team/chisel/client/render/RendererMultiLayer.java @@ -1,17 +1,16 @@ -package com.cricketcraft.chisel.client.render; +package team.chisel.client.render; +import team.chisel.block.BlockMultiLayerBase; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.init.Blocks; import net.minecraft.world.IBlockAccess; import net.minecraftforge.client.MinecraftForgeClient; -import com.cricketcraft.chisel.block.BlockMultiLayerBase; import com.cricketcraft.ctmlib.Drawing; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import cpw.mods.fml.client.registry.RenderingRegistry; - import static org.lwjgl.opengl.GL11.*; public class RendererMultiLayer implements ISimpleBlockRenderingHandler { diff --git a/src/main/java/com/cricketcraft/chisel/client/render/RendererRoadLine.java b/src/main/java/team/chisel/client/render/RendererRoadLine.java similarity index 96% rename from src/main/java/com/cricketcraft/chisel/client/render/RendererRoadLine.java rename to src/main/java/team/chisel/client/render/RendererRoadLine.java index 0227317c..bd14d639 100644 --- a/src/main/java/com/cricketcraft/chisel/client/render/RendererRoadLine.java +++ b/src/main/java/team/chisel/client/render/RendererRoadLine.java @@ -1,5 +1,7 @@ -package com.cricketcraft.chisel.client.render; +package team.chisel.client.render; +import team.chisel.Chisel; +import team.chisel.block.BlockRoadLine; import net.minecraft.block.Block; import net.minecraft.client.renderer.EntityRenderer; import net.minecraft.client.renderer.RenderBlocks; @@ -7,8 +9,6 @@ import net.minecraft.client.renderer.Tessellator; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; -import com.cricketcraft.chisel.Chisel; -import com.cricketcraft.chisel.block.BlockRoadLine; import com.cricketcraft.ctmlib.Drawing; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; diff --git a/src/main/java/com/cricketcraft/chisel/client/render/RendererSimpleLayered.java b/src/main/java/team/chisel/client/render/RendererSimpleLayered.java similarity index 90% rename from src/main/java/com/cricketcraft/chisel/client/render/RendererSimpleLayered.java rename to src/main/java/team/chisel/client/render/RendererSimpleLayered.java index 2d783065..f7524283 100644 --- a/src/main/java/com/cricketcraft/chisel/client/render/RendererSimpleLayered.java +++ b/src/main/java/team/chisel/client/render/RendererSimpleLayered.java @@ -1,4 +1,4 @@ -package com.cricketcraft.chisel.client.render; +package team.chisel.client.render; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; @@ -6,8 +6,9 @@ import net.minecraft.world.IBlockAccess; import org.lwjgl.opengl.GL11; -import com.cricketcraft.chisel.Chisel; -import com.cricketcraft.chisel.block.BlockCarvableLayered; +import team.chisel.Chisel; +import team.chisel.block.BlockCarvableLayered; + import com.cricketcraft.ctmlib.Drawing; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; diff --git a/src/main/java/com/cricketcraft/chisel/client/render/RendererSnakeStone.java b/src/main/java/team/chisel/client/render/RendererSnakeStone.java similarity index 96% rename from src/main/java/com/cricketcraft/chisel/client/render/RendererSnakeStone.java rename to src/main/java/team/chisel/client/render/RendererSnakeStone.java index 54939ff8..a04c0c5a 100644 --- a/src/main/java/com/cricketcraft/chisel/client/render/RendererSnakeStone.java +++ b/src/main/java/team/chisel/client/render/RendererSnakeStone.java @@ -1,4 +1,4 @@ -package com.cricketcraft.chisel.client.render; +package team.chisel.client.render; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; @@ -6,7 +6,8 @@ import net.minecraft.world.IBlockAccess; import org.lwjgl.opengl.GL11; -import com.cricketcraft.chisel.block.BlockSnakestone; +import team.chisel.block.BlockSnakestone; + import com.cricketcraft.ctmlib.Drawing; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; diff --git a/src/main/java/com/cricketcraft/chisel/client/render/RendererStairs.java b/src/main/java/team/chisel/client/render/RendererStairs.java similarity index 93% rename from src/main/java/com/cricketcraft/chisel/client/render/RendererStairs.java rename to src/main/java/team/chisel/client/render/RendererStairs.java index e835c47c..c2c2a9ae 100644 --- a/src/main/java/com/cricketcraft/chisel/client/render/RendererStairs.java +++ b/src/main/java/team/chisel/client/render/RendererStairs.java @@ -1,4 +1,4 @@ -package com.cricketcraft.chisel.client.render; +package team.chisel.client.render; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; @@ -6,7 +6,8 @@ import net.minecraft.world.IBlockAccess; import org.lwjgl.opengl.GL11; -import com.cricketcraft.chisel.block.BlockCarvableStairs; +import team.chisel.block.BlockCarvableStairs; + import com.cricketcraft.ctmlib.Drawing; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; diff --git a/src/main/java/com/cricketcraft/chisel/client/render/SubmapManagerAntiblock.java b/src/main/java/team/chisel/client/render/SubmapManagerAntiblock.java similarity index 97% rename from src/main/java/com/cricketcraft/chisel/client/render/SubmapManagerAntiblock.java rename to src/main/java/team/chisel/client/render/SubmapManagerAntiblock.java index 969411bd..abf361c9 100644 --- a/src/main/java/com/cricketcraft/chisel/client/render/SubmapManagerAntiblock.java +++ b/src/main/java/team/chisel/client/render/SubmapManagerAntiblock.java @@ -1,4 +1,4 @@ -package com.cricketcraft.chisel.client.render; +package team.chisel.client.render; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; diff --git a/src/main/java/com/cricketcraft/chisel/client/render/SubmapManagerBase.java b/src/main/java/team/chisel/client/render/SubmapManagerBase.java similarity index 95% rename from src/main/java/com/cricketcraft/chisel/client/render/SubmapManagerBase.java rename to src/main/java/team/chisel/client/render/SubmapManagerBase.java index 426c3d39..0d483f58 100644 --- a/src/main/java/com/cricketcraft/chisel/client/render/SubmapManagerBase.java +++ b/src/main/java/team/chisel/client/render/SubmapManagerBase.java @@ -1,4 +1,4 @@ -package com.cricketcraft.chisel.client.render; +package team.chisel.client.render; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; diff --git a/src/main/java/com/cricketcraft/chisel/client/render/SubmapManagerCarpetFloor.java b/src/main/java/team/chisel/client/render/SubmapManagerCarpetFloor.java similarity index 97% rename from src/main/java/com/cricketcraft/chisel/client/render/SubmapManagerCarpetFloor.java rename to src/main/java/team/chisel/client/render/SubmapManagerCarpetFloor.java index 54e76af5..25a248f3 100644 --- a/src/main/java/com/cricketcraft/chisel/client/render/SubmapManagerCarpetFloor.java +++ b/src/main/java/team/chisel/client/render/SubmapManagerCarpetFloor.java @@ -1,4 +1,4 @@ -package com.cricketcraft.chisel.client.render; +package team.chisel.client.render; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; diff --git a/src/main/java/com/cricketcraft/chisel/client/render/SubmapManagerCombinedCTM.java b/src/main/java/team/chisel/client/render/SubmapManagerCombinedCTM.java similarity index 99% rename from src/main/java/com/cricketcraft/chisel/client/render/SubmapManagerCombinedCTM.java rename to src/main/java/team/chisel/client/render/SubmapManagerCombinedCTM.java index 3406a02d..5d721825 100644 --- a/src/main/java/com/cricketcraft/chisel/client/render/SubmapManagerCombinedCTM.java +++ b/src/main/java/team/chisel/client/render/SubmapManagerCombinedCTM.java @@ -1,4 +1,4 @@ -package com.cricketcraft.chisel.client.render; +package team.chisel.client.render; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; diff --git a/src/main/java/com/cricketcraft/chisel/client/render/SubmapManagerFakeController.java b/src/main/java/team/chisel/client/render/SubmapManagerFakeController.java similarity index 93% rename from src/main/java/com/cricketcraft/chisel/client/render/SubmapManagerFakeController.java rename to src/main/java/team/chisel/client/render/SubmapManagerFakeController.java index fe5138a3..45388ded 100644 --- a/src/main/java/com/cricketcraft/chisel/client/render/SubmapManagerFakeController.java +++ b/src/main/java/team/chisel/client/render/SubmapManagerFakeController.java @@ -1,19 +1,18 @@ -package com.cricketcraft.chisel.client.render; +package team.chisel.client.render; +import team.chisel.Chisel; +import team.chisel.init.ChiselBlocks; import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; -import com.cricketcraft.chisel.Chisel; -import com.cricketcraft.chisel.init.ChiselBlocks; import com.cricketcraft.ctmlib.CTM; import com.cricketcraft.ctmlib.TextureSubmap; import com.google.common.base.Optional; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; - import static com.cricketcraft.ctmlib.Dir.*; public class SubmapManagerFakeController extends SubmapManagerBase { diff --git a/src/main/java/com/cricketcraft/chisel/client/render/SubmapManagerLeaves.java b/src/main/java/team/chisel/client/render/SubmapManagerLeaves.java similarity index 93% rename from src/main/java/com/cricketcraft/chisel/client/render/SubmapManagerLeaves.java rename to src/main/java/team/chisel/client/render/SubmapManagerLeaves.java index 6a289c73..91b4b2c5 100644 --- a/src/main/java/com/cricketcraft/chisel/client/render/SubmapManagerLeaves.java +++ b/src/main/java/team/chisel/client/render/SubmapManagerLeaves.java @@ -1,4 +1,4 @@ -package com.cricketcraft.chisel.client.render; +package team.chisel.client.render; import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; diff --git a/src/main/java/com/cricketcraft/chisel/client/render/SubmapManagerSlab.java b/src/main/java/team/chisel/client/render/SubmapManagerSlab.java similarity index 98% rename from src/main/java/com/cricketcraft/chisel/client/render/SubmapManagerSlab.java rename to src/main/java/team/chisel/client/render/SubmapManagerSlab.java index c258d7fd..3351a9f8 100644 --- a/src/main/java/com/cricketcraft/chisel/client/render/SubmapManagerSlab.java +++ b/src/main/java/team/chisel/client/render/SubmapManagerSlab.java @@ -1,4 +1,4 @@ -package com.cricketcraft.chisel.client.render; +package team.chisel.client.render; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; diff --git a/src/main/java/com/cricketcraft/chisel/client/render/SubmapManagerVoidstone.java b/src/main/java/team/chisel/client/render/SubmapManagerVoidstone.java similarity index 98% rename from src/main/java/com/cricketcraft/chisel/client/render/SubmapManagerVoidstone.java rename to src/main/java/team/chisel/client/render/SubmapManagerVoidstone.java index 48884c88..d5484ccb 100644 --- a/src/main/java/com/cricketcraft/chisel/client/render/SubmapManagerVoidstone.java +++ b/src/main/java/team/chisel/client/render/SubmapManagerVoidstone.java @@ -1,4 +1,4 @@ -package com.cricketcraft.chisel.client.render; +package team.chisel.client.render; import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; diff --git a/src/main/java/com/cricketcraft/chisel/client/render/item/ItemChiselRenderer.java b/src/main/java/team/chisel/client/render/item/ItemChiselRenderer.java similarity index 96% rename from src/main/java/com/cricketcraft/chisel/client/render/item/ItemChiselRenderer.java rename to src/main/java/team/chisel/client/render/item/ItemChiselRenderer.java index 3e5e4f47..0cdf0a90 100644 --- a/src/main/java/com/cricketcraft/chisel/client/render/item/ItemChiselRenderer.java +++ b/src/main/java/team/chisel/client/render/item/ItemChiselRenderer.java @@ -1,4 +1,4 @@ -package com.cricketcraft.chisel.client.render.item; +package team.chisel.client.render.item; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.RenderBlocks; diff --git a/src/main/java/com/cricketcraft/chisel/client/render/tile/RenderAutoChisel.java b/src/main/java/team/chisel/client/render/tile/RenderAutoChisel.java similarity index 97% rename from src/main/java/com/cricketcraft/chisel/client/render/tile/RenderAutoChisel.java rename to src/main/java/team/chisel/client/render/tile/RenderAutoChisel.java index 8c4317c1..f4a82a39 100644 --- a/src/main/java/com/cricketcraft/chisel/client/render/tile/RenderAutoChisel.java +++ b/src/main/java/team/chisel/client/render/tile/RenderAutoChisel.java @@ -1,7 +1,9 @@ -package com.cricketcraft.chisel.client.render.tile; +package team.chisel.client.render.tile; import java.util.Random; +import team.chisel.Chisel; +import team.chisel.block.tileentity.TileEntityAutoChisel; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.RenderBlocks; @@ -22,13 +24,8 @@ import net.minecraftforge.client.model.obj.GroupObject; import net.minecraftforge.client.model.obj.TextureCoordinate; import net.minecraftforge.client.model.obj.Vertex; import net.minecraftforge.client.model.obj.WavefrontObject; - -import com.cricketcraft.chisel.Chisel; -import com.cricketcraft.chisel.block.tileentity.TileEntityAutoChisel; - import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import cpw.mods.fml.client.registry.RenderingRegistry; - import static org.lwjgl.opengl.GL11.*; public class RenderAutoChisel extends TileEntitySpecialRenderer implements ISimpleBlockRenderingHandler, IItemRenderer { diff --git a/src/main/java/com/cricketcraft/chisel/client/render/tile/RenderCarvableBeacon.java b/src/main/java/team/chisel/client/render/tile/RenderCarvableBeacon.java similarity index 98% rename from src/main/java/com/cricketcraft/chisel/client/render/tile/RenderCarvableBeacon.java rename to src/main/java/team/chisel/client/render/tile/RenderCarvableBeacon.java index 28e1c208..f86b765f 100644 --- a/src/main/java/com/cricketcraft/chisel/client/render/tile/RenderCarvableBeacon.java +++ b/src/main/java/team/chisel/client/render/tile/RenderCarvableBeacon.java @@ -1,4 +1,4 @@ -package com.cricketcraft.chisel.client.render.tile; +package team.chisel.client.render.tile; import java.awt.Color; @@ -16,8 +16,7 @@ import net.minecraft.world.IBlockAccess; import org.lwjgl.opengl.GL11; -import com.cricketcraft.chisel.block.tileentity.TileEntityCarvableBeacon; - +import team.chisel.block.tileentity.TileEntityCarvableBeacon; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import cpw.mods.fml.client.registry.RenderingRegistry; diff --git a/src/main/java/com/cricketcraft/chisel/client/render/tile/RenderPresent.java b/src/main/java/team/chisel/client/render/tile/RenderPresent.java similarity index 95% rename from src/main/java/com/cricketcraft/chisel/client/render/tile/RenderPresent.java rename to src/main/java/team/chisel/client/render/tile/RenderPresent.java index 3b7154b4..3bd0977a 100644 --- a/src/main/java/com/cricketcraft/chisel/client/render/tile/RenderPresent.java +++ b/src/main/java/team/chisel/client/render/tile/RenderPresent.java @@ -1,4 +1,4 @@ -package com.cricketcraft.chisel.client.render.tile; +package team.chisel.client.render.tile; import java.util.HashMap; @@ -14,9 +14,10 @@ import net.minecraftforge.common.util.ForgeDirection; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; -import com.cricketcraft.chisel.Chisel; -import com.cricketcraft.chisel.block.tileentity.TileEntityPresent; -import com.cricketcraft.chisel.init.ChiselBlocks; +import team.chisel.Chisel; +import team.chisel.block.tileentity.TileEntityPresent; +import team.chisel.init.ChiselBlocks; + import com.google.common.collect.Maps; import cpw.mods.fml.client.FMLClientHandler; diff --git a/src/main/java/com/cricketcraft/chisel/compat/Compatibility.java b/src/main/java/team/chisel/compat/Compatibility.java similarity index 98% rename from src/main/java/com/cricketcraft/chisel/compat/Compatibility.java rename to src/main/java/team/chisel/compat/Compatibility.java index 48ad6c28..2a83dae9 100644 --- a/src/main/java/com/cricketcraft/chisel/compat/Compatibility.java +++ b/src/main/java/team/chisel/compat/Compatibility.java @@ -1,23 +1,25 @@ -package com.cricketcraft.chisel.compat; +package team.chisel.compat; import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.Map; -import com.cricketcraft.chisel.api.carving.ICarvingGroup; -import com.cricketcraft.chisel.api.carving.ICarvingVariation; -import com.cricketcraft.chisel.utils.RecipeUtil; import com.pahimar.ee3.api.exchange.RecipeRegistryProxy; + import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import org.apache.logging.log4j.Level; -import com.cricketcraft.chisel.Chisel; -import com.cricketcraft.chisel.carving.Carving; -import com.cricketcraft.chisel.init.ChiselBlocks; -import com.cricketcraft.chisel.init.ChiselItems; +import team.chisel.Chisel; +import team.chisel.carving.Carving; +import team.chisel.init.ChiselBlocks; +import team.chisel.init.ChiselItems; +import team.chisel.utils.RecipeUtil; + +import com.cricketcraft.chisel.api.carving.ICarvingGroup; +import com.cricketcraft.chisel.api.carving.ICarvingVariation; import com.google.common.collect.Maps; import com.pahimar.ee3.api.exchange.EnergyValueRegistryProxy; diff --git a/src/main/java/com/cricketcraft/chisel/compat/IMCHandler.java b/src/main/java/team/chisel/compat/IMCHandler.java similarity index 92% rename from src/main/java/com/cricketcraft/chisel/compat/IMCHandler.java rename to src/main/java/team/chisel/compat/IMCHandler.java index 49963686..1349b408 100644 --- a/src/main/java/com/cricketcraft/chisel/compat/IMCHandler.java +++ b/src/main/java/team/chisel/compat/IMCHandler.java @@ -1,12 +1,11 @@ -package com.cricketcraft.chisel.compat; +package team.chisel.compat; -import net.minecraft.block.Block; - -import com.cricketcraft.chisel.Chisel; import com.cricketcraft.chisel.api.IMC; import com.cricketcraft.chisel.api.carving.ICarvingRegistry; -import com.cricketcraft.chisel.carving.Carving; +import team.chisel.Chisel; +import team.chisel.carving.Carving; +import net.minecraft.block.Block; import cpw.mods.fml.common.event.FMLInterModComms.IMCMessage; public class IMCHandler { diff --git a/src/main/java/com/cricketcraft/chisel/compat/WailaCompat.java b/src/main/java/team/chisel/compat/WailaCompat.java similarity index 97% rename from src/main/java/com/cricketcraft/chisel/compat/WailaCompat.java rename to src/main/java/team/chisel/compat/WailaCompat.java index f33c2b03..910889a7 100644 --- a/src/main/java/com/cricketcraft/chisel/compat/WailaCompat.java +++ b/src/main/java/team/chisel/compat/WailaCompat.java @@ -1,7 +1,9 @@ -package com.cricketcraft.chisel.compat; +package team.chisel.compat; import java.util.List; +import com.cricketcraft.chisel.api.ICarvable; + import mcp.mobius.waila.api.IWailaConfigHandler; import mcp.mobius.waila.api.IWailaDataAccessor; import mcp.mobius.waila.api.IWailaDataProvider; @@ -13,8 +15,6 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; -import com.cricketcraft.chisel.api.ICarvable; - public class WailaCompat implements IWailaDataProvider { private WailaCompat() { diff --git a/src/main/java/com/cricketcraft/chisel/compat/fmp/FMPCompat.java b/src/main/java/team/chisel/compat/fmp/FMPCompat.java similarity index 92% rename from src/main/java/com/cricketcraft/chisel/compat/fmp/FMPCompat.java rename to src/main/java/team/chisel/compat/fmp/FMPCompat.java index 2081d8d2..a39af9e6 100644 --- a/src/main/java/com/cricketcraft/chisel/compat/fmp/FMPCompat.java +++ b/src/main/java/team/chisel/compat/fmp/FMPCompat.java @@ -1,5 +1,6 @@ -package com.cricketcraft.chisel.compat.fmp; +package team.chisel.compat.fmp; +import team.chisel.init.ChiselBlocks; import net.minecraft.block.Block; import net.minecraft.world.World; import codechicken.lib.vec.BlockCoord; @@ -8,7 +9,6 @@ import codechicken.multipart.MultiPartRegistry.IPartConverter; import codechicken.multipart.MultiPartRegistry.IPartFactory; import codechicken.multipart.TMultiPart; -import com.cricketcraft.chisel.init.ChiselBlocks; import com.google.common.collect.Lists; public class FMPCompat implements IPartFactory, IPartConverter { diff --git a/src/main/java/com/cricketcraft/chisel/compat/fmp/ItemBlockChiselTorchPart.java b/src/main/java/team/chisel/compat/fmp/ItemBlockChiselTorchPart.java similarity index 95% rename from src/main/java/com/cricketcraft/chisel/compat/fmp/ItemBlockChiselTorchPart.java rename to src/main/java/team/chisel/compat/fmp/ItemBlockChiselTorchPart.java index e744caa0..fb91cdd6 100644 --- a/src/main/java/com/cricketcraft/chisel/compat/fmp/ItemBlockChiselTorchPart.java +++ b/src/main/java/team/chisel/compat/fmp/ItemBlockChiselTorchPart.java @@ -1,5 +1,6 @@ -package com.cricketcraft.chisel.compat.fmp; +package team.chisel.compat.fmp; +import team.chisel.block.BlockCarvableTorch; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemBlock; @@ -9,9 +10,6 @@ import codechicken.lib.vec.BlockCoord; import codechicken.multipart.TMultiPart; import codechicken.multipart.TileMultipart; import codechicken.multipart.minecraft.TorchPart; - -import com.cricketcraft.chisel.block.BlockCarvableTorch; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/com/cricketcraft/chisel/compat/fmp/PartChiselTorch.java b/src/main/java/team/chisel/compat/fmp/PartChiselTorch.java similarity index 91% rename from src/main/java/com/cricketcraft/chisel/compat/fmp/PartChiselTorch.java rename to src/main/java/team/chisel/compat/fmp/PartChiselTorch.java index 45072d9e..4d89c25b 100644 --- a/src/main/java/com/cricketcraft/chisel/compat/fmp/PartChiselTorch.java +++ b/src/main/java/team/chisel/compat/fmp/PartChiselTorch.java @@ -1,13 +1,12 @@ -package com.cricketcraft.chisel.compat.fmp; +package team.chisel.compat.fmp; +import team.chisel.init.ChiselBlocks; import net.minecraft.block.Block; import net.minecraft.nbt.NBTTagCompound; import codechicken.lib.data.MCDataInput; import codechicken.lib.data.MCDataOutput; import codechicken.multipart.minecraft.TorchPart; -import com.cricketcraft.chisel.init.ChiselBlocks; - public class PartChiselTorch extends TorchPart { private int idx; diff --git a/src/main/java/com/cricketcraft/chisel/compat/nei/NEIChiselConfig.java b/src/main/java/team/chisel/compat/nei/NEIChiselConfig.java similarity index 85% rename from src/main/java/com/cricketcraft/chisel/compat/nei/NEIChiselConfig.java rename to src/main/java/team/chisel/compat/nei/NEIChiselConfig.java index f67a892f..88a1e1c0 100644 --- a/src/main/java/com/cricketcraft/chisel/compat/nei/NEIChiselConfig.java +++ b/src/main/java/team/chisel/compat/nei/NEIChiselConfig.java @@ -1,12 +1,10 @@ -package com.cricketcraft.chisel.compat.nei; +package team.chisel.compat.nei; +import team.chisel.Chisel; +import team.chisel.client.gui.GuiChisel; import net.minecraft.item.ItemStack; import codechicken.nei.api.API; import codechicken.nei.api.IConfigureNEI; - -import com.cricketcraft.chisel.Chisel; -import com.cricketcraft.chisel.client.gui.GuiChisel; - import cpw.mods.fml.common.registry.GameRegistry; public class NEIChiselConfig implements IConfigureNEI { diff --git a/src/main/java/com/cricketcraft/chisel/compat/nei/RecipeHandlerChisel.java b/src/main/java/team/chisel/compat/nei/RecipeHandlerChisel.java similarity index 97% rename from src/main/java/com/cricketcraft/chisel/compat/nei/RecipeHandlerChisel.java rename to src/main/java/team/chisel/compat/nei/RecipeHandlerChisel.java index 83a5124b..01e47b72 100644 --- a/src/main/java/com/cricketcraft/chisel/compat/nei/RecipeHandlerChisel.java +++ b/src/main/java/team/chisel/compat/nei/RecipeHandlerChisel.java @@ -1,4 +1,4 @@ -package com.cricketcraft.chisel.compat.nei; +package team.chisel.compat.nei; import java.awt.Point; import java.awt.Rectangle; @@ -11,17 +11,17 @@ import net.minecraftforge.oredict.OreDictionary; import org.lwjgl.opengl.GL11; +import com.cricketcraft.chisel.api.carving.CarvingUtils; +import com.cricketcraft.chisel.api.carving.ICarvingGroup; +import com.cricketcraft.chisel.api.carving.ICarvingVariation; + +import team.chisel.carving.Carving; +import team.chisel.client.gui.GuiChisel; import codechicken.lib.gui.GuiDraw; import codechicken.nei.NEIServerUtils; import codechicken.nei.PositionedStack; import codechicken.nei.recipe.TemplateRecipeHandler; -import com.cricketcraft.chisel.api.carving.CarvingUtils; -import com.cricketcraft.chisel.api.carving.ICarvingGroup; -import com.cricketcraft.chisel.api.carving.ICarvingVariation; -import com.cricketcraft.chisel.carving.Carving; -import com.cricketcraft.chisel.client.gui.GuiChisel; - public class RecipeHandlerChisel extends TemplateRecipeHandler { private static final int SLOTS_PER_PAGE = 45; diff --git a/src/main/java/com/cricketcraft/chisel/config/Configurations.java b/src/main/java/team/chisel/config/Configurations.java similarity index 98% rename from src/main/java/com/cricketcraft/chisel/config/Configurations.java rename to src/main/java/team/chisel/config/Configurations.java index 3bc7b9fb..0d21b44b 100644 --- a/src/main/java/com/cricketcraft/chisel/config/Configurations.java +++ b/src/main/java/team/chisel/config/Configurations.java @@ -1,4 +1,4 @@ -package com.cricketcraft.chisel.config; +package team.chisel.config; import java.util.Locale; @@ -7,8 +7,9 @@ import net.minecraftforge.common.config.Configuration; import org.apache.commons.lang3.StringUtils; -import com.cricketcraft.chisel.Chisel; -import com.cricketcraft.chisel.Features; +import team.chisel.Chisel; +import team.chisel.Features; + import com.cricketcraft.ctmlib.CTM; public class Configurations { diff --git a/src/main/java/com/cricketcraft/chisel/entity/EntityBallOMoss.java b/src/main/java/team/chisel/entity/EntityBallOMoss.java similarity index 91% rename from src/main/java/com/cricketcraft/chisel/entity/EntityBallOMoss.java rename to src/main/java/team/chisel/entity/EntityBallOMoss.java index 3aa727f4..5d4ae5a0 100644 --- a/src/main/java/com/cricketcraft/chisel/entity/EntityBallOMoss.java +++ b/src/main/java/team/chisel/entity/EntityBallOMoss.java @@ -1,5 +1,9 @@ -package com.cricketcraft.chisel.entity; +package team.chisel.entity; +import team.chisel.Chisel; +import team.chisel.client.GeneralChiselClient; +import team.chisel.init.ChiselBlocks; +import team.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.chisel.Chisel; -import com.cricketcraft.chisel.client.GeneralChiselClient; -import com.cricketcraft.chisel.init.ChiselBlocks; -import com.cricketcraft.chisel.utils.General; - public class EntityBallOMoss extends EntityThrowable { public EntityBallOMoss(World par1World) { diff --git a/src/main/java/com/cricketcraft/chisel/entity/EntityChiselSnowman.java b/src/main/java/team/chisel/entity/EntityChiselSnowman.java similarity index 87% rename from src/main/java/com/cricketcraft/chisel/entity/EntityChiselSnowman.java rename to src/main/java/team/chisel/entity/EntityChiselSnowman.java index 9a4eb2ec..799037de 100644 --- a/src/main/java/com/cricketcraft/chisel/entity/EntityChiselSnowman.java +++ b/src/main/java/team/chisel/entity/EntityChiselSnowman.java @@ -1,4 +1,4 @@ -package com.cricketcraft.chisel.entity; +package team.chisel.entity; import net.minecraft.entity.monster.EntitySnowman; import net.minecraft.world.World; diff --git a/src/main/java/com/cricketcraft/chisel/entity/EntityCloudInABottle.java b/src/main/java/team/chisel/entity/EntityCloudInABottle.java similarity index 96% rename from src/main/java/com/cricketcraft/chisel/entity/EntityCloudInABottle.java rename to src/main/java/team/chisel/entity/EntityCloudInABottle.java index 6dacbf43..bbaef2e3 100644 --- a/src/main/java/com/cricketcraft/chisel/entity/EntityCloudInABottle.java +++ b/src/main/java/team/chisel/entity/EntityCloudInABottle.java @@ -1,14 +1,13 @@ -package com.cricketcraft.chisel.entity; +package team.chisel.entity; import java.util.Random; +import team.chisel.init.ChiselBlocks; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.projectile.EntityThrowable; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; -import com.cricketcraft.chisel.init.ChiselBlocks; - public class EntityCloudInABottle extends EntityThrowable { Random rand = new Random(); diff --git a/src/main/java/com/cricketcraft/chisel/entity/EntitySmashingRock.java b/src/main/java/team/chisel/entity/EntitySmashingRock.java similarity index 96% rename from src/main/java/com/cricketcraft/chisel/entity/EntitySmashingRock.java rename to src/main/java/team/chisel/entity/EntitySmashingRock.java index 11828eed..5a8976aa 100644 --- a/src/main/java/com/cricketcraft/chisel/entity/EntitySmashingRock.java +++ b/src/main/java/team/chisel/entity/EntitySmashingRock.java @@ -1,5 +1,6 @@ -package com.cricketcraft.chisel.entity; +package team.chisel.entity; +import team.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.chisel.utils.General; - public class EntitySmashingRock extends EntityThrowable { public EntitySmashingRock(World par1World) { diff --git a/src/main/java/com/cricketcraft/chisel/entity/fx/EntityBallOMossFX.java b/src/main/java/team/chisel/entity/fx/EntityBallOMossFX.java similarity index 93% rename from src/main/java/com/cricketcraft/chisel/entity/fx/EntityBallOMossFX.java rename to src/main/java/team/chisel/entity/fx/EntityBallOMossFX.java index d4caf24b..33291149 100644 --- a/src/main/java/com/cricketcraft/chisel/entity/fx/EntityBallOMossFX.java +++ b/src/main/java/team/chisel/entity/fx/EntityBallOMossFX.java @@ -1,4 +1,4 @@ -package com.cricketcraft.chisel.entity.fx; +package team.chisel.entity.fx; import net.minecraft.client.particle.EntityFX; import net.minecraft.client.renderer.Tessellator; @@ -7,10 +7,9 @@ import net.minecraft.world.World; import org.lwjgl.opengl.GL11; -import com.cricketcraft.chisel.block.BlockSnakestoneObsidian; -import com.cricketcraft.chisel.init.ChiselItems; -import com.cricketcraft.chisel.utils.General; - +import team.chisel.block.BlockSnakestoneObsidian; +import team.chisel.init.ChiselItems; +import team.chisel.utils.General; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/com/cricketcraft/chisel/entity/fx/EntityGrimstoneFX.java b/src/main/java/team/chisel/entity/fx/EntityGrimstoneFX.java similarity index 90% rename from src/main/java/com/cricketcraft/chisel/entity/fx/EntityGrimstoneFX.java rename to src/main/java/team/chisel/entity/fx/EntityGrimstoneFX.java index e44864b2..585980ee 100644 --- a/src/main/java/com/cricketcraft/chisel/entity/fx/EntityGrimstoneFX.java +++ b/src/main/java/team/chisel/entity/fx/EntityGrimstoneFX.java @@ -1,12 +1,11 @@ -package com.cricketcraft.chisel.entity.fx; +package team.chisel.entity.fx; +import team.chisel.block.BlockGrimstone; +import team.chisel.utils.General; import net.minecraft.client.particle.EntityFX; import net.minecraft.client.renderer.Tessellator; import net.minecraft.world.World; -import com.cricketcraft.chisel.block.BlockGrimstone; -import com.cricketcraft.chisel.utils.General; - public class EntityGrimstoneFX extends EntityFX { float initialScale; diff --git a/src/main/java/com/cricketcraft/chisel/entity/fx/EntityHolystoneFX.java b/src/main/java/team/chisel/entity/fx/EntityHolystoneFX.java similarity index 90% rename from src/main/java/com/cricketcraft/chisel/entity/fx/EntityHolystoneFX.java rename to src/main/java/team/chisel/entity/fx/EntityHolystoneFX.java index 5bd79a61..d2d79c15 100644 --- a/src/main/java/com/cricketcraft/chisel/entity/fx/EntityHolystoneFX.java +++ b/src/main/java/team/chisel/entity/fx/EntityHolystoneFX.java @@ -1,12 +1,11 @@ -package com.cricketcraft.chisel.entity.fx; +package team.chisel.entity.fx; +import team.chisel.block.BlockHolystone; +import team.chisel.utils.General; import net.minecraft.client.particle.EntityFX; import net.minecraft.client.renderer.Tessellator; import net.minecraft.world.World; -import com.cricketcraft.chisel.block.BlockHolystone; -import com.cricketcraft.chisel.utils.General; - public class EntityHolystoneFX extends EntityFX { float initialScale; diff --git a/src/main/java/com/cricketcraft/chisel/entity/fx/EntitySnakestoneObsidianFX.java b/src/main/java/team/chisel/entity/fx/EntitySnakestoneObsidianFX.java similarity index 94% rename from src/main/java/com/cricketcraft/chisel/entity/fx/EntitySnakestoneObsidianFX.java rename to src/main/java/team/chisel/entity/fx/EntitySnakestoneObsidianFX.java index 99aa017b..43bb7af5 100644 --- a/src/main/java/com/cricketcraft/chisel/entity/fx/EntitySnakestoneObsidianFX.java +++ b/src/main/java/team/chisel/entity/fx/EntitySnakestoneObsidianFX.java @@ -1,4 +1,4 @@ -package com.cricketcraft.chisel.entity.fx; +package team.chisel.entity.fx; import net.minecraft.client.particle.EntityFX; import net.minecraft.client.renderer.Tessellator; @@ -6,8 +6,8 @@ import net.minecraft.world.World; import org.lwjgl.opengl.GL11; -import com.cricketcraft.chisel.block.BlockSnakestoneObsidian; -import com.cricketcraft.chisel.utils.General; +import team.chisel.block.BlockSnakestoneObsidian; +import team.chisel.utils.General; public class EntitySnakestoneObsidianFX extends EntityFX { diff --git a/src/main/java/com/cricketcraft/chisel/init/ChiselBlocks.java b/src/main/java/team/chisel/init/ChiselBlocks.java similarity index 98% rename from src/main/java/com/cricketcraft/chisel/init/ChiselBlocks.java rename to src/main/java/team/chisel/init/ChiselBlocks.java index c9dbce6f..98e86a58 100644 --- a/src/main/java/com/cricketcraft/chisel/init/ChiselBlocks.java +++ b/src/main/java/team/chisel/init/ChiselBlocks.java @@ -1,10 +1,8 @@ -package com.cricketcraft.chisel.init; +package team.chisel.init; +import team.chisel.Chisel; +import team.chisel.block.*; import net.minecraft.block.Block; - -import com.cricketcraft.chisel.Chisel; -import com.cricketcraft.chisel.block.*; - import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder; @ObjectHolder(Chisel.MOD_ID) diff --git a/src/main/java/com/cricketcraft/chisel/init/ChiselItems.java b/src/main/java/team/chisel/init/ChiselItems.java similarity index 61% rename from src/main/java/com/cricketcraft/chisel/init/ChiselItems.java rename to src/main/java/team/chisel/init/ChiselItems.java index 7ae2e22d..1809e04d 100644 --- a/src/main/java/com/cricketcraft/chisel/init/ChiselItems.java +++ b/src/main/java/team/chisel/init/ChiselItems.java @@ -1,12 +1,11 @@ -package com.cricketcraft.chisel.init; - -import com.cricketcraft.chisel.Chisel; -import com.cricketcraft.chisel.item.ItemBallOMoss; -import com.cricketcraft.chisel.item.ItemCloudInABottle; -import com.cricketcraft.chisel.item.ItemSmashingRock; -import com.cricketcraft.chisel.item.ItemUpgrade; -import com.cricketcraft.chisel.item.chisel.ItemChisel; +package team.chisel.init; +import team.chisel.Chisel; +import team.chisel.item.ItemBallOMoss; +import team.chisel.item.ItemCloudInABottle; +import team.chisel.item.ItemSmashingRock; +import team.chisel.item.ItemUpgrade; +import team.chisel.item.chisel.ItemChisel; import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder; @ObjectHolder(Chisel.MOD_ID) diff --git a/src/main/java/com/cricketcraft/chisel/init/ChiselTabs.java b/src/main/java/team/chisel/init/ChiselTabs.java similarity index 97% rename from src/main/java/com/cricketcraft/chisel/init/ChiselTabs.java rename to src/main/java/team/chisel/init/ChiselTabs.java index 24064a51..1ae29836 100644 --- a/src/main/java/com/cricketcraft/chisel/init/ChiselTabs.java +++ b/src/main/java/team/chisel/init/ChiselTabs.java @@ -1,13 +1,11 @@ -package com.cricketcraft.chisel.init; +package team.chisel.init; +import team.chisel.Features; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; - -import com.cricketcraft.chisel.Features; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/com/cricketcraft/chisel/inventory/ContainerAutoChisel.java b/src/main/java/team/chisel/inventory/ContainerAutoChisel.java similarity index 96% rename from src/main/java/com/cricketcraft/chisel/inventory/ContainerAutoChisel.java rename to src/main/java/team/chisel/inventory/ContainerAutoChisel.java index 6a6f409e..91b906f6 100644 --- a/src/main/java/com/cricketcraft/chisel/inventory/ContainerAutoChisel.java +++ b/src/main/java/team/chisel/inventory/ContainerAutoChisel.java @@ -1,5 +1,8 @@ -package com.cricketcraft.chisel.inventory; +package team.chisel.inventory; +import team.chisel.block.tileentity.TileEntityAutoChisel; +import team.chisel.network.PacketHandler; +import team.chisel.network.message.MessageAutoChisel; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; @@ -7,10 +10,6 @@ import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; -import com.cricketcraft.chisel.block.tileentity.TileEntityAutoChisel; -import com.cricketcraft.chisel.network.PacketHandler; -import com.cricketcraft.chisel.network.message.MessageAutoChisel; - public class ContainerAutoChisel extends Container { public TileEntityAutoChisel autoChisel; diff --git a/src/main/java/com/cricketcraft/chisel/inventory/ContainerChisel.java b/src/main/java/team/chisel/inventory/ContainerChisel.java similarity index 95% rename from src/main/java/com/cricketcraft/chisel/inventory/ContainerChisel.java rename to src/main/java/team/chisel/inventory/ContainerChisel.java index 114b11cb..2288f6b9 100644 --- a/src/main/java/com/cricketcraft/chisel/inventory/ContainerChisel.java +++ b/src/main/java/team/chisel/inventory/ContainerChisel.java @@ -1,5 +1,10 @@ -package com.cricketcraft.chisel.inventory; +package team.chisel.inventory; +import com.cricketcraft.chisel.api.carving.ICarvingRegistry; + +import team.chisel.carving.Carving; +import team.chisel.item.chisel.ItemChisel; +import team.chisel.utils.General; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; @@ -7,11 +12,6 @@ import net.minecraft.inventory.Slot; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import com.cricketcraft.chisel.api.carving.ICarvingRegistry; -import com.cricketcraft.chisel.carving.Carving; -import com.cricketcraft.chisel.item.chisel.ItemChisel; -import com.cricketcraft.chisel.utils.General; - public class ContainerChisel extends Container { public final InventoryChiselSelection inventory; diff --git a/src/main/java/com/cricketcraft/chisel/inventory/ContainerPresent.java b/src/main/java/team/chisel/inventory/ContainerPresent.java similarity index 97% rename from src/main/java/com/cricketcraft/chisel/inventory/ContainerPresent.java rename to src/main/java/team/chisel/inventory/ContainerPresent.java index a39203be..cb200884 100644 --- a/src/main/java/com/cricketcraft/chisel/inventory/ContainerPresent.java +++ b/src/main/java/team/chisel/inventory/ContainerPresent.java @@ -1,4 +1,4 @@ -package com.cricketcraft.chisel.inventory; +package team.chisel.inventory; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/com/cricketcraft/chisel/inventory/InventoryChiselSelection.java b/src/main/java/team/chisel/inventory/InventoryChiselSelection.java similarity index 96% rename from src/main/java/com/cricketcraft/chisel/inventory/InventoryChiselSelection.java rename to src/main/java/team/chisel/inventory/InventoryChiselSelection.java index bb5a9c09..a5c9c115 100644 --- a/src/main/java/com/cricketcraft/chisel/inventory/InventoryChiselSelection.java +++ b/src/main/java/team/chisel/inventory/InventoryChiselSelection.java @@ -1,7 +1,11 @@ -package com.cricketcraft.chisel.inventory; +package team.chisel.inventory; import java.util.List; +import com.cricketcraft.chisel.api.IChiselItem; + +import team.chisel.item.chisel.ItemChisel; +import team.chisel.utils.General; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; @@ -9,10 +13,6 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.ItemTool; -import com.cricketcraft.chisel.api.IChiselItem; -import com.cricketcraft.chisel.item.chisel.ItemChisel; -import com.cricketcraft.chisel.utils.General; - public class InventoryChiselSelection implements IInventory { ItemStack chisel = null; diff --git a/src/main/java/com/cricketcraft/chisel/inventory/SlotChiselInput.java b/src/main/java/team/chisel/inventory/SlotChiselInput.java similarity index 95% rename from src/main/java/com/cricketcraft/chisel/inventory/SlotChiselInput.java rename to src/main/java/team/chisel/inventory/SlotChiselInput.java index 77e3ad4e..39b742d1 100644 --- a/src/main/java/com/cricketcraft/chisel/inventory/SlotChiselInput.java +++ b/src/main/java/team/chisel/inventory/SlotChiselInput.java @@ -1,4 +1,4 @@ -package com.cricketcraft.chisel.inventory; +package team.chisel.inventory; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Slot; diff --git a/src/main/java/com/cricketcraft/chisel/inventory/SlotChiselPlayer.java b/src/main/java/team/chisel/inventory/SlotChiselPlayer.java similarity index 94% rename from src/main/java/com/cricketcraft/chisel/inventory/SlotChiselPlayer.java rename to src/main/java/team/chisel/inventory/SlotChiselPlayer.java index ae416653..384bb7b0 100644 --- a/src/main/java/com/cricketcraft/chisel/inventory/SlotChiselPlayer.java +++ b/src/main/java/team/chisel/inventory/SlotChiselPlayer.java @@ -1,4 +1,4 @@ -package com.cricketcraft.chisel.inventory; +package team.chisel.inventory; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; diff --git a/src/main/java/com/cricketcraft/chisel/inventory/SlotChiselSelection.java b/src/main/java/team/chisel/inventory/SlotChiselSelection.java similarity index 92% rename from src/main/java/com/cricketcraft/chisel/inventory/SlotChiselSelection.java rename to src/main/java/team/chisel/inventory/SlotChiselSelection.java index e1013216..56c88745 100644 --- a/src/main/java/com/cricketcraft/chisel/inventory/SlotChiselSelection.java +++ b/src/main/java/team/chisel/inventory/SlotChiselSelection.java @@ -1,17 +1,17 @@ -package com.cricketcraft.chisel.inventory; +package team.chisel.inventory; +import com.cricketcraft.chisel.api.IChiselItem; +import com.cricketcraft.chisel.api.Statistics; + +import team.chisel.carving.Carving; +import team.chisel.utils.General; +import team.chisel.utils.GeneralClient; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; import net.minecraft.util.MathHelper; -import com.cricketcraft.chisel.api.IChiselItem; -import com.cricketcraft.chisel.api.Statistics; -import com.cricketcraft.chisel.carving.Carving; -import com.cricketcraft.chisel.utils.General; -import com.cricketcraft.chisel.utils.GeneralClient; - public class SlotChiselSelection extends Slot { private final ContainerChisel container; diff --git a/src/main/java/com/cricketcraft/chisel/item/BaseItem.java b/src/main/java/team/chisel/item/BaseItem.java similarity index 98% rename from src/main/java/com/cricketcraft/chisel/item/BaseItem.java rename to src/main/java/team/chisel/item/BaseItem.java index 8b870cb7..192ebd85 100644 --- a/src/main/java/com/cricketcraft/chisel/item/BaseItem.java +++ b/src/main/java/team/chisel/item/BaseItem.java @@ -1,4 +1,4 @@ -package com.cricketcraft.chisel.item; +package team.chisel.item; import java.util.Enumeration; import java.util.List; diff --git a/src/main/java/com/cricketcraft/chisel/item/ItemBallOMoss.java b/src/main/java/team/chisel/item/ItemBallOMoss.java similarity index 88% rename from src/main/java/com/cricketcraft/chisel/item/ItemBallOMoss.java rename to src/main/java/team/chisel/item/ItemBallOMoss.java index 0446e3be..1e105bbd 100644 --- a/src/main/java/com/cricketcraft/chisel/item/ItemBallOMoss.java +++ b/src/main/java/team/chisel/item/ItemBallOMoss.java @@ -1,11 +1,10 @@ -package com.cricketcraft.chisel.item; +package team.chisel.item; +import team.chisel.entity.EntityBallOMoss; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.world.World; -import com.cricketcraft.chisel.entity.EntityBallOMoss; - public class ItemBallOMoss extends BaseItem { public ItemBallOMoss() { diff --git a/src/main/java/com/cricketcraft/chisel/item/ItemBlockPresent.java b/src/main/java/team/chisel/item/ItemBlockPresent.java similarity index 84% rename from src/main/java/com/cricketcraft/chisel/item/ItemBlockPresent.java rename to src/main/java/team/chisel/item/ItemBlockPresent.java index 87213e2a..45e20deb 100644 --- a/src/main/java/com/cricketcraft/chisel/item/ItemBlockPresent.java +++ b/src/main/java/team/chisel/item/ItemBlockPresent.java @@ -1,4 +1,4 @@ -package com.cricketcraft.chisel.item; +package team.chisel.item; import net.minecraft.block.Block; diff --git a/src/main/java/com/cricketcraft/chisel/item/ItemCarvable.java b/src/main/java/team/chisel/item/ItemCarvable.java similarity index 90% rename from src/main/java/com/cricketcraft/chisel/item/ItemCarvable.java rename to src/main/java/team/chisel/item/ItemCarvable.java index 51ae041d..ee5aa126 100644 --- a/src/main/java/com/cricketcraft/chisel/item/ItemCarvable.java +++ b/src/main/java/team/chisel/item/ItemCarvable.java @@ -1,7 +1,12 @@ -package com.cricketcraft.chisel.item; +package team.chisel.item; import java.util.List; +import com.cricketcraft.chisel.api.ICarvable; +import com.cricketcraft.chisel.api.carving.IVariationInfo; + +import team.chisel.config.Configurations; +import team.chisel.utils.General; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -9,11 +14,6 @@ import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; -import com.cricketcraft.chisel.api.ICarvable; -import com.cricketcraft.chisel.api.carving.IVariationInfo; -import com.cricketcraft.chisel.config.Configurations; -import com.cricketcraft.chisel.utils.General; - public class ItemCarvable extends ItemBlock { public ItemCarvable(Block block) { diff --git a/src/main/java/com/cricketcraft/chisel/item/ItemCarvablePumpkin.java b/src/main/java/team/chisel/item/ItemCarvablePumpkin.java similarity index 90% rename from src/main/java/com/cricketcraft/chisel/item/ItemCarvablePumpkin.java rename to src/main/java/team/chisel/item/ItemCarvablePumpkin.java index 6fe1beec..c105f923 100644 --- a/src/main/java/com/cricketcraft/chisel/item/ItemCarvablePumpkin.java +++ b/src/main/java/team/chisel/item/ItemCarvablePumpkin.java @@ -1,4 +1,4 @@ -package com.cricketcraft.chisel.item; +package team.chisel.item; import net.minecraft.block.Block; import net.minecraft.entity.Entity; diff --git a/src/main/java/com/cricketcraft/chisel/item/ItemCarvableSlab.java b/src/main/java/team/chisel/item/ItemCarvableSlab.java similarity index 96% rename from src/main/java/com/cricketcraft/chisel/item/ItemCarvableSlab.java rename to src/main/java/team/chisel/item/ItemCarvableSlab.java index 668d45ed..dbee69de 100644 --- a/src/main/java/com/cricketcraft/chisel/item/ItemCarvableSlab.java +++ b/src/main/java/team/chisel/item/ItemCarvableSlab.java @@ -1,13 +1,12 @@ -package com.cricketcraft.chisel.item; +package team.chisel.item; +import team.chisel.block.BlockCarvableSlab; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import com.cricketcraft.chisel.block.BlockCarvableSlab; - public class ItemCarvableSlab extends ItemCarvable { public ItemCarvableSlab(Block block) { diff --git a/src/main/java/com/cricketcraft/chisel/item/ItemCloudInABottle.java b/src/main/java/team/chisel/item/ItemCloudInABottle.java similarity index 88% rename from src/main/java/com/cricketcraft/chisel/item/ItemCloudInABottle.java rename to src/main/java/team/chisel/item/ItemCloudInABottle.java index 729a5406..51f477fc 100644 --- a/src/main/java/com/cricketcraft/chisel/item/ItemCloudInABottle.java +++ b/src/main/java/team/chisel/item/ItemCloudInABottle.java @@ -1,11 +1,10 @@ -package com.cricketcraft.chisel.item; +package team.chisel.item; +import team.chisel.entity.EntityCloudInABottle; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.world.World; -import com.cricketcraft.chisel.entity.EntityCloudInABottle; - public class ItemCloudInABottle extends BaseItem { public ItemCloudInABottle() { diff --git a/src/main/java/com/cricketcraft/chisel/item/ItemSmashingRock.java b/src/main/java/team/chisel/item/ItemSmashingRock.java similarity index 88% rename from src/main/java/com/cricketcraft/chisel/item/ItemSmashingRock.java rename to src/main/java/team/chisel/item/ItemSmashingRock.java index 1f75cdfd..d726db82 100644 --- a/src/main/java/com/cricketcraft/chisel/item/ItemSmashingRock.java +++ b/src/main/java/team/chisel/item/ItemSmashingRock.java @@ -1,11 +1,10 @@ -package com.cricketcraft.chisel.item; +package team.chisel.item; +import team.chisel.entity.EntitySmashingRock; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.world.World; -import com.cricketcraft.chisel.entity.EntitySmashingRock; - public class ItemSmashingRock extends BaseItem { public ItemSmashingRock() { diff --git a/src/main/java/com/cricketcraft/chisel/item/ItemUpgrade.java b/src/main/java/team/chisel/item/ItemUpgrade.java similarity index 89% rename from src/main/java/com/cricketcraft/chisel/item/ItemUpgrade.java rename to src/main/java/team/chisel/item/ItemUpgrade.java index 5cbafc12..55dd320c 100644 --- a/src/main/java/com/cricketcraft/chisel/item/ItemUpgrade.java +++ b/src/main/java/team/chisel/item/ItemUpgrade.java @@ -1,16 +1,15 @@ -package com.cricketcraft.chisel.item; +package team.chisel.item; import java.util.List; +import team.chisel.Chisel; +import team.chisel.block.tileentity.TileEntityAutoChisel.Upgrade; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; -import com.cricketcraft.chisel.Chisel; -import com.cricketcraft.chisel.block.tileentity.TileEntityAutoChisel.Upgrade; - public class ItemUpgrade extends BaseItem { public IIcon[] icons = new IIcon[4]; diff --git a/src/main/java/com/cricketcraft/chisel/item/chisel/ChiselController.java b/src/main/java/team/chisel/item/chisel/ChiselController.java similarity index 95% rename from src/main/java/com/cricketcraft/chisel/item/chisel/ChiselController.java rename to src/main/java/team/chisel/item/chisel/ChiselController.java index c0aa31d3..b4e586b4 100644 --- a/src/main/java/com/cricketcraft/chisel/item/chisel/ChiselController.java +++ b/src/main/java/team/chisel/item/chisel/ChiselController.java @@ -1,22 +1,21 @@ -package com.cricketcraft.chisel.item.chisel; +package team.chisel.item.chisel; import java.util.List; +import com.cricketcraft.chisel.api.IChiselItem; +import com.cricketcraft.chisel.api.carving.ICarvingGroup; +import com.cricketcraft.chisel.api.carving.ICarvingVariation; +import com.cricketcraft.chisel.api.carving.IChiselMode; + +import team.chisel.Chisel; +import team.chisel.carving.Carving; +import team.chisel.utils.General; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.event.entity.player.PlayerInteractEvent; import net.minecraftforge.oredict.OreDictionary; - -import com.cricketcraft.chisel.Chisel; -import com.cricketcraft.chisel.api.IChiselItem; -import com.cricketcraft.chisel.api.carving.ICarvingGroup; -import com.cricketcraft.chisel.api.carving.ICarvingVariation; -import com.cricketcraft.chisel.api.carving.IChiselMode; -import com.cricketcraft.chisel.carving.Carving; -import com.cricketcraft.chisel.utils.General; - import cpw.mods.fml.common.eventhandler.SubscribeEvent; public final class ChiselController { diff --git a/src/main/java/com/cricketcraft/chisel/item/chisel/ChiselMode.java b/src/main/java/team/chisel/item/chisel/ChiselMode.java similarity index 96% rename from src/main/java/com/cricketcraft/chisel/item/chisel/ChiselMode.java rename to src/main/java/team/chisel/item/chisel/ChiselMode.java index 47283f97..97686fc5 100644 --- a/src/main/java/com/cricketcraft/chisel/item/chisel/ChiselMode.java +++ b/src/main/java/team/chisel/item/chisel/ChiselMode.java @@ -1,5 +1,12 @@ -package com.cricketcraft.chisel.item.chisel; +package team.chisel.item.chisel; +import com.cricketcraft.chisel.api.IChiselItem; +import com.cricketcraft.chisel.api.Statistics; +import com.cricketcraft.chisel.api.carving.ICarvingVariation; +import com.cricketcraft.chisel.api.carving.IChiselMode; + +import team.chisel.network.PacketHandler; +import team.chisel.network.message.MessageChiselSound; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; @@ -8,13 +15,6 @@ import net.minecraft.util.MathHelper; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import com.cricketcraft.chisel.api.IChiselItem; -import com.cricketcraft.chisel.api.Statistics; -import com.cricketcraft.chisel.api.carving.ICarvingVariation; -import com.cricketcraft.chisel.api.carving.IChiselMode; -import com.cricketcraft.chisel.network.PacketHandler; -import com.cricketcraft.chisel.network.message.MessageChiselSound; - public enum ChiselMode implements IChiselMode { SINGLE { diff --git a/src/main/java/com/cricketcraft/chisel/item/chisel/ItemChisel.java b/src/main/java/team/chisel/item/chisel/ItemChisel.java similarity index 96% rename from src/main/java/com/cricketcraft/chisel/item/chisel/ItemChisel.java rename to src/main/java/team/chisel/item/chisel/ItemChisel.java index 9183c7ca..2a564760 100644 --- a/src/main/java/com/cricketcraft/chisel/item/chisel/ItemChisel.java +++ b/src/main/java/team/chisel/item/chisel/ItemChisel.java @@ -1,8 +1,11 @@ -package com.cricketcraft.chisel.item.chisel; +package team.chisel.item.chisel; import java.util.List; import java.util.Locale; +import team.chisel.Chisel; +import team.chisel.carving.Carving; +import team.chisel.config.Configurations; import net.minecraft.block.Block; import net.minecraft.client.resources.I18n; import net.minecraft.entity.EntityLivingBase; @@ -16,12 +19,9 @@ import net.minecraft.item.ItemStack; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; -import com.cricketcraft.chisel.Chisel; import com.cricketcraft.chisel.api.IChiselItem; import com.cricketcraft.chisel.api.carving.ICarvingRegistry; import com.cricketcraft.chisel.api.carving.ICarvingVariation; -import com.cricketcraft.chisel.carving.Carving; -import com.cricketcraft.chisel.config.Configurations; import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; diff --git a/src/main/java/com/cricketcraft/chisel/network/ChiselGuiHandler.java b/src/main/java/team/chisel/network/ChiselGuiHandler.java similarity index 72% rename from src/main/java/com/cricketcraft/chisel/network/ChiselGuiHandler.java rename to src/main/java/team/chisel/network/ChiselGuiHandler.java index 002b357a..da3999d1 100644 --- a/src/main/java/com/cricketcraft/chisel/network/ChiselGuiHandler.java +++ b/src/main/java/team/chisel/network/ChiselGuiHandler.java @@ -1,19 +1,17 @@ -package com.cricketcraft.chisel.network; +package team.chisel.network; +import team.chisel.block.tileentity.TileEntityAutoChisel; +import team.chisel.block.tileentity.TileEntityPresent; +import team.chisel.client.gui.GuiAutoChisel; +import team.chisel.client.gui.GuiChisel; +import team.chisel.client.gui.GuiPresent; +import team.chisel.inventory.ContainerAutoChisel; +import team.chisel.inventory.ContainerChisel; +import team.chisel.inventory.ContainerPresent; +import team.chisel.inventory.InventoryChiselSelection; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; - -import com.cricketcraft.chisel.block.tileentity.TileEntityAutoChisel; -import com.cricketcraft.chisel.block.tileentity.TileEntityPresent; -import com.cricketcraft.chisel.client.gui.GuiAutoChisel; -import com.cricketcraft.chisel.client.gui.GuiChisel; -import com.cricketcraft.chisel.client.gui.GuiPresent; -import com.cricketcraft.chisel.inventory.ContainerAutoChisel; -import com.cricketcraft.chisel.inventory.ContainerChisel; -import com.cricketcraft.chisel.inventory.ContainerPresent; -import com.cricketcraft.chisel.inventory.InventoryChiselSelection; - import cpw.mods.fml.common.network.IGuiHandler; public class ChiselGuiHandler implements IGuiHandler { diff --git a/src/main/java/com/cricketcraft/chisel/network/PacketHandler.java b/src/main/java/team/chisel/network/PacketHandler.java similarity index 66% rename from src/main/java/com/cricketcraft/chisel/network/PacketHandler.java rename to src/main/java/team/chisel/network/PacketHandler.java index 290e2cd9..b95ebe31 100644 --- a/src/main/java/com/cricketcraft/chisel/network/PacketHandler.java +++ b/src/main/java/team/chisel/network/PacketHandler.java @@ -1,12 +1,11 @@ -package com.cricketcraft.chisel.network; - -import com.cricketcraft.chisel.Chisel; -import com.cricketcraft.chisel.network.message.MessageAutoChisel; -import com.cricketcraft.chisel.network.message.MessageChiselMode; -import com.cricketcraft.chisel.network.message.MessageChiselSound; -import com.cricketcraft.chisel.network.message.MessagePresentConnect; -import com.cricketcraft.chisel.network.message.MessageSlotUpdate; +package team.chisel.network; +import team.chisel.Chisel; +import team.chisel.network.message.MessageAutoChisel; +import team.chisel.network.message.MessageChiselMode; +import team.chisel.network.message.MessageChiselSound; +import team.chisel.network.message.MessagePresentConnect; +import team.chisel.network.message.MessageSlotUpdate; import cpw.mods.fml.common.network.simpleimpl.SimpleNetworkWrapper; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/com/cricketcraft/chisel/network/message/MessageAutoChisel.java b/src/main/java/team/chisel/network/message/MessageAutoChisel.java similarity index 89% rename from src/main/java/com/cricketcraft/chisel/network/message/MessageAutoChisel.java rename to src/main/java/team/chisel/network/message/MessageAutoChisel.java index 0024c06c..b7564561 100644 --- a/src/main/java/com/cricketcraft/chisel/network/message/MessageAutoChisel.java +++ b/src/main/java/team/chisel/network/message/MessageAutoChisel.java @@ -1,12 +1,10 @@ -package com.cricketcraft.chisel.network.message; +package team.chisel.network.message; +import team.chisel.block.tileentity.TileEntityAutoChisel; +import team.chisel.network.message.base.MessageCoords; import io.netty.buffer.ByteBuf; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; - -import com.cricketcraft.chisel.block.tileentity.TileEntityAutoChisel; -import com.cricketcraft.chisel.network.message.base.MessageCoords; - import cpw.mods.fml.common.network.ByteBufUtils; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; diff --git a/src/main/java/com/cricketcraft/chisel/network/message/MessageChiselMode.java b/src/main/java/team/chisel/network/message/MessageChiselMode.java similarity index 90% rename from src/main/java/com/cricketcraft/chisel/network/message/MessageChiselMode.java rename to src/main/java/team/chisel/network/message/MessageChiselMode.java index e549b835..fd2e1bc9 100644 --- a/src/main/java/com/cricketcraft/chisel/network/message/MessageChiselMode.java +++ b/src/main/java/team/chisel/network/message/MessageChiselMode.java @@ -1,14 +1,13 @@ -package com.cricketcraft.chisel.network.message; - -import io.netty.buffer.ByteBuf; -import net.minecraft.item.ItemStack; +package team.chisel.network.message; import com.cricketcraft.chisel.api.IAdvancedChisel; import com.cricketcraft.chisel.api.IChiselItem; import com.cricketcraft.chisel.api.carving.IChiselMode; -import com.cricketcraft.chisel.item.chisel.ChiselMode; -import com.cricketcraft.chisel.utils.General; +import team.chisel.item.chisel.ChiselMode; +import team.chisel.utils.General; +import io.netty.buffer.ByteBuf; +import net.minecraft.item.ItemStack; import cpw.mods.fml.common.network.ByteBufUtils; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; diff --git a/src/main/java/com/cricketcraft/chisel/network/message/MessageChiselSound.java b/src/main/java/team/chisel/network/message/MessageChiselSound.java similarity index 85% rename from src/main/java/com/cricketcraft/chisel/network/message/MessageChiselSound.java rename to src/main/java/team/chisel/network/message/MessageChiselSound.java index a910eda5..1c2db9a7 100644 --- a/src/main/java/com/cricketcraft/chisel/network/message/MessageChiselSound.java +++ b/src/main/java/team/chisel/network/message/MessageChiselSound.java @@ -1,15 +1,14 @@ -package com.cricketcraft.chisel.network.message; +package team.chisel.network.message; +import com.cricketcraft.chisel.api.carving.ICarvingVariation; + +import team.chisel.Chisel; +import team.chisel.client.GeneralChiselClient; +import team.chisel.item.chisel.ItemChisel; +import team.chisel.network.message.base.MessageCoords; import io.netty.buffer.ByteBuf; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; - -import com.cricketcraft.chisel.Chisel; -import com.cricketcraft.chisel.api.carving.ICarvingVariation; -import com.cricketcraft.chisel.client.GeneralChiselClient; -import com.cricketcraft.chisel.item.chisel.ItemChisel; -import com.cricketcraft.chisel.network.message.base.MessageCoords; - import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; diff --git a/src/main/java/com/cricketcraft/chisel/network/message/MessagePresentConnect.java b/src/main/java/team/chisel/network/message/MessagePresentConnect.java similarity index 90% rename from src/main/java/com/cricketcraft/chisel/network/message/MessagePresentConnect.java rename to src/main/java/team/chisel/network/message/MessagePresentConnect.java index 6f775f7e..b266c28d 100644 --- a/src/main/java/com/cricketcraft/chisel/network/message/MessagePresentConnect.java +++ b/src/main/java/team/chisel/network/message/MessagePresentConnect.java @@ -1,12 +1,10 @@ -package com.cricketcraft.chisel.network.message; +package team.chisel.network.message; +import team.chisel.block.tileentity.TileEntityPresent; +import team.chisel.network.message.base.MessageCoords; import io.netty.buffer.ByteBuf; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; - -import com.cricketcraft.chisel.block.tileentity.TileEntityPresent; -import com.cricketcraft.chisel.network.message.base.MessageCoords; - import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; diff --git a/src/main/java/com/cricketcraft/chisel/network/message/MessageSlotUpdate.java b/src/main/java/team/chisel/network/message/MessageSlotUpdate.java similarity index 89% rename from src/main/java/com/cricketcraft/chisel/network/message/MessageSlotUpdate.java rename to src/main/java/team/chisel/network/message/MessageSlotUpdate.java index 47a74d85..0f9cab22 100644 --- a/src/main/java/com/cricketcraft/chisel/network/message/MessageSlotUpdate.java +++ b/src/main/java/team/chisel/network/message/MessageSlotUpdate.java @@ -1,13 +1,11 @@ -package com.cricketcraft.chisel.network.message; +package team.chisel.network.message; +import team.chisel.Chisel; +import team.chisel.network.message.base.MessageCoords; import io.netty.buffer.ByteBuf; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; - -import com.cricketcraft.chisel.Chisel; -import com.cricketcraft.chisel.network.message.base.MessageCoords; - import cpw.mods.fml.common.network.ByteBufUtils; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; diff --git a/src/main/java/com/cricketcraft/chisel/network/message/base/MessageCoords.java b/src/main/java/team/chisel/network/message/base/MessageCoords.java similarity index 92% rename from src/main/java/com/cricketcraft/chisel/network/message/base/MessageCoords.java rename to src/main/java/team/chisel/network/message/base/MessageCoords.java index 0bf50c3f..ed2170b2 100644 --- a/src/main/java/com/cricketcraft/chisel/network/message/base/MessageCoords.java +++ b/src/main/java/team/chisel/network/message/base/MessageCoords.java @@ -1,12 +1,10 @@ -package com.cricketcraft.chisel.network.message.base; +package team.chisel.network.message.base; +import team.chisel.Chisel; import io.netty.buffer.ByteBuf; import net.minecraft.block.Block; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; - -import com.cricketcraft.chisel.Chisel; - import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/com/cricketcraft/chisel/proxy/ClientProxy.java b/src/main/java/team/chisel/proxy/ClientProxy.java similarity index 63% rename from src/main/java/com/cricketcraft/chisel/proxy/ClientProxy.java rename to src/main/java/team/chisel/proxy/ClientProxy.java index 70950a78..450986a4 100644 --- a/src/main/java/com/cricketcraft/chisel/proxy/ClientProxy.java +++ b/src/main/java/team/chisel/proxy/ClientProxy.java @@ -1,37 +1,35 @@ -package com.cricketcraft.chisel.proxy; +package team.chisel.proxy; +import team.chisel.block.BlockCarvableBeacon; +import team.chisel.block.tileentity.TileEntityAutoChisel; +import team.chisel.block.tileentity.TileEntityCarvableBeacon; +import team.chisel.block.tileentity.TileEntityPresent; +import team.chisel.client.render.RenderChiselSnowman; +import team.chisel.client.render.RendererCTM; +import team.chisel.client.render.RendererCTMPane; +import team.chisel.client.render.RendererEldritch; +import team.chisel.client.render.RendererLayeredGlow; +import team.chisel.client.render.RendererMultiLayer; +import team.chisel.client.render.RendererRoadLine; +import team.chisel.client.render.RendererSimpleLayered; +import team.chisel.client.render.RendererSnakeStone; +import team.chisel.client.render.RendererStairs; +import team.chisel.client.render.item.ItemChiselRenderer; +import team.chisel.client.render.tile.RenderAutoChisel; +import team.chisel.client.render.tile.RenderCarvableBeacon; +import team.chisel.client.render.tile.RenderPresent; +import team.chisel.entity.EntityBallOMoss; +import team.chisel.entity.EntityChiselSnowman; +import team.chisel.entity.EntityCloudInABottle; +import team.chisel.entity.EntitySmashingRock; +import team.chisel.init.ChiselBlocks; +import team.chisel.init.ChiselItems; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.entity.RenderSnowball; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.world.World; import net.minecraftforge.client.MinecraftForgeClient; - -import com.cricketcraft.chisel.block.BlockCarvableBeacon; -import com.cricketcraft.chisel.block.tileentity.TileEntityAutoChisel; -import com.cricketcraft.chisel.block.tileentity.TileEntityCarvableBeacon; -import com.cricketcraft.chisel.block.tileentity.TileEntityPresent; -import com.cricketcraft.chisel.client.render.RenderChiselSnowman; -import com.cricketcraft.chisel.client.render.RendererCTM; -import com.cricketcraft.chisel.client.render.RendererCTMPane; -import com.cricketcraft.chisel.client.render.RendererEldritch; -import com.cricketcraft.chisel.client.render.RendererLayeredGlow; -import com.cricketcraft.chisel.client.render.RendererMultiLayer; -import com.cricketcraft.chisel.client.render.RendererRoadLine; -import com.cricketcraft.chisel.client.render.RendererSimpleLayered; -import com.cricketcraft.chisel.client.render.RendererSnakeStone; -import com.cricketcraft.chisel.client.render.RendererStairs; -import com.cricketcraft.chisel.client.render.item.ItemChiselRenderer; -import com.cricketcraft.chisel.client.render.tile.RenderAutoChisel; -import com.cricketcraft.chisel.client.render.tile.RenderCarvableBeacon; -import com.cricketcraft.chisel.client.render.tile.RenderPresent; -import com.cricketcraft.chisel.entity.EntityBallOMoss; -import com.cricketcraft.chisel.entity.EntityChiselSnowman; -import com.cricketcraft.chisel.entity.EntityCloudInABottle; -import com.cricketcraft.chisel.entity.EntitySmashingRock; -import com.cricketcraft.chisel.init.ChiselBlocks; -import com.cricketcraft.chisel.init.ChiselItems; - import cpw.mods.fml.client.registry.ClientRegistry; import cpw.mods.fml.client.registry.RenderingRegistry; diff --git a/src/main/java/com/cricketcraft/chisel/proxy/CommonProxy.java b/src/main/java/team/chisel/proxy/CommonProxy.java similarity index 71% rename from src/main/java/com/cricketcraft/chisel/proxy/CommonProxy.java rename to src/main/java/team/chisel/proxy/CommonProxy.java index d7004566..c50e8ce8 100644 --- a/src/main/java/com/cricketcraft/chisel/proxy/CommonProxy.java +++ b/src/main/java/team/chisel/proxy/CommonProxy.java @@ -1,12 +1,10 @@ -package com.cricketcraft.chisel.proxy; +package team.chisel.proxy; +import team.chisel.block.tileentity.TileEntityAutoChisel; +import team.chisel.block.tileentity.TileEntityCarvableBeacon; +import team.chisel.block.tileentity.TileEntityPresent; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; - -import com.cricketcraft.chisel.block.tileentity.TileEntityAutoChisel; -import com.cricketcraft.chisel.block.tileentity.TileEntityCarvableBeacon; -import com.cricketcraft.chisel.block.tileentity.TileEntityPresent; - import cpw.mods.fml.common.registry.GameRegistry; public class CommonProxy { diff --git a/src/main/java/com/cricketcraft/chisel/utils/General.java b/src/main/java/team/chisel/utils/General.java similarity index 97% rename from src/main/java/com/cricketcraft/chisel/utils/General.java rename to src/main/java/team/chisel/utils/General.java index cf13cf81..5e5f405d 100644 --- a/src/main/java/com/cricketcraft/chisel/utils/General.java +++ b/src/main/java/team/chisel/utils/General.java @@ -1,7 +1,14 @@ -package com.cricketcraft.chisel.utils; +package team.chisel.utils; import java.util.Random; +import com.cricketcraft.chisel.api.IAdvancedChisel; +import com.cricketcraft.chisel.api.carving.CarvingUtils; +import com.cricketcraft.chisel.api.carving.ICarvingVariation; +import com.cricketcraft.chisel.api.carving.IChiselMode; + +import team.chisel.carving.Carving; +import team.chisel.item.chisel.ChiselMode; import joptsimple.internal.Strings; import net.minecraft.block.Block; import net.minecraft.entity.Entity; @@ -15,13 +22,6 @@ import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.Vec3; import net.minecraft.world.World; -import com.cricketcraft.chisel.api.IAdvancedChisel; -import com.cricketcraft.chisel.api.carving.CarvingUtils; -import com.cricketcraft.chisel.api.carving.ICarvingVariation; -import com.cricketcraft.chisel.api.carving.IChiselMode; -import com.cricketcraft.chisel.carving.Carving; -import com.cricketcraft.chisel.item.chisel.ChiselMode; - public class General { public static Random rand = new Random(); diff --git a/src/main/java/com/cricketcraft/chisel/utils/GeneralClient.java b/src/main/java/team/chisel/utils/GeneralClient.java similarity index 96% rename from src/main/java/com/cricketcraft/chisel/utils/GeneralClient.java rename to src/main/java/team/chisel/utils/GeneralClient.java index 7790c5f3..c83aceb4 100644 --- a/src/main/java/com/cricketcraft/chisel/utils/GeneralClient.java +++ b/src/main/java/team/chisel/utils/GeneralClient.java @@ -1,4 +1,4 @@ -package com.cricketcraft.chisel.utils; +package team.chisel.utils; import java.util.HashMap; import java.util.Random; diff --git a/src/main/java/com/cricketcraft/chisel/utils/RecipeUtil.java b/src/main/java/team/chisel/utils/RecipeUtil.java similarity index 96% rename from src/main/java/com/cricketcraft/chisel/utils/RecipeUtil.java rename to src/main/java/team/chisel/utils/RecipeUtil.java index 20187c61..a0e55afb 100644 --- a/src/main/java/com/cricketcraft/chisel/utils/RecipeUtil.java +++ b/src/main/java/team/chisel/utils/RecipeUtil.java @@ -1,4 +1,4 @@ -package com.cricketcraft.chisel.utils; +package team.chisel.utils; import cpw.mods.fml.common.registry.GameRegistry; import net.minecraft.item.ItemStack; diff --git a/src/main/java/com/cricketcraft/chisel/world/GeneratorChisel.java b/src/main/java/team/chisel/world/GeneratorChisel.java similarity index 98% rename from src/main/java/com/cricketcraft/chisel/world/GeneratorChisel.java rename to src/main/java/team/chisel/world/GeneratorChisel.java index 75e9b5e2..ad5de157 100644 --- a/src/main/java/com/cricketcraft/chisel/world/GeneratorChisel.java +++ b/src/main/java/team/chisel/world/GeneratorChisel.java @@ -1,4 +1,4 @@ -package com.cricketcraft.chisel.world; +package team.chisel.world; import java.util.Map; import java.util.Random;